From bd5ee84e258a2ca4c66e22873ee9c5fff9aab0c7 Mon Sep 17 00:00:00 2001
From: AJ ONeal <coolaj86@gmail.com>
Date: Tue, 5 Nov 2019 11:50:38 -0700
Subject: [PATCH] allow without callbacks, issue #9

---
 greenlock-express.js |  9 +++++++--
 master.js            |  6 ++++--
 single.js            | 11 +++++++++++
 worker.js            | 11 +++++++++++
 4 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/greenlock-express.js b/greenlock-express.js
index 58aa37a..04c31f0 100644
--- a/greenlock-express.js
+++ b/greenlock-express.js
@@ -22,9 +22,14 @@ GLE.init = function(fn) {
         return require("./worker.js").create();
     }
 
-    var opts = fn();
+    var opts;
+    if ("function" === typeof fn) {
+        opts = fn();
+    } else if ("object" === typeof fn) {
+        opts = fn;
+    }
     if (!opts || "object" !== typeof opts) {
-        throw new Error("the `Greenlock.init(fn)` function should return an object `{ greenlock, cluster }`");
+        throw new Error("the `Greenlock.init(fn)` function should return an object `{ packageRoot, cluster }`");
     }
 
     // just for ironic humor
diff --git a/master.js b/master.js
index d2d4b3d..0c1b4ec 100644
--- a/master.js
+++ b/master.js
@@ -48,10 +48,12 @@ Master.create = function(opts) {
             kickoff();
             resolveCb(fn);
             return master;
+        },
+        serve: function(fn) {
+            // ignore
+            master.ready(fn);
         }
     };
-    // backwards compat starts early...
-    master.serve = master.ready;
     return master;
 };
 
diff --git a/single.js b/single.js
index e3264bc..9f35a7c 100644
--- a/single.js
+++ b/single.js
@@ -19,6 +19,17 @@ Single.create = function(opts) {
             // ignore
             //fn(master);
             return single;
+        },
+        serve: function(fn) {
+            // keeping backwards compat
+            if (1 === fn.length) {
+                single.ready(fn);
+                return;
+            }
+            // serving the app, right away
+            single.ready(function(glx) {
+                glx.serveApp(fn);
+            });
         }
     };
     // backwards compat starts now
diff --git a/worker.js b/worker.js
index 10e53d1..286e0a8 100644
--- a/worker.js
+++ b/worker.js
@@ -22,6 +22,17 @@ Worker.create = function() {
         master: function() {
             // ignore
             return worker;
+        },
+        serve: function(fn) {
+            // keeping backwards compat
+            if (1 === fn.length) {
+                worker.ready(fn);
+                return;
+            }
+            // serving the express app, right away
+            worker.ready(function(glx) {
+                glx.serveApp(fn);
+            });
         }
     };
     // backwards compat starts early...