From b7b14b3ef7f0eee15e70bae6c47a752c6a0163b9 Mon Sep 17 00:00:00 2001
From: Michal Kochel <gavoja@gmail.com>
Date: Tue, 4 Apr 2017 13:13:46 +0200
Subject: [PATCH] Server is started before the build.

---
 package.json  |  2 +-
 src/webski.js | 38 ++++++++++++++++++++------------------
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/package.json b/package.json
index ea0c756..5d48e29 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "webski",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "description": "Minimalist website builder",
   "main": "index.js",
   "repository": {
diff --git a/src/webski.js b/src/webski.js
index 47967fa..717e8bc 100644
--- a/src/webski.js
+++ b/src/webski.js
@@ -27,6 +27,7 @@ class Webski {
     this.app = args.app || express()
     this.hostname = args.hostname || 'localhost'
     this.port = args.port || 8000
+    this.initialPort = this.port
     this.builders = []
     this.queue = []
     this.lock = true
@@ -74,22 +75,22 @@ class Webski {
     })
     console.log(`Watching: ${chalk.gray(this.src)}`)
 
-    // Do the initial build.
-    this.buildAll(result => {
-      this.lock = false
-      callback && callback(result)
-    })
-
     // Serve content.
-    let wss = this.serve()
+    this.serve(() => {
+      // Do the initial build.
+      this.buildAll(result => {
+        this.lock = false
+        callback && callback(result)
+      })
+    })
 
     // Handle queue.
     setInterval(() => {
-      this.processQueue(wss, callback)
+      this.processQueue(callback)
     }, INTERVAL)
   }
 
-  processQueue (wss, callback) {
+  processQueue (callback) {
     if (this.lock) {
       return
     }
@@ -115,7 +116,7 @@ class Webski {
     // Build.
     this.build(files, changed => {
       if (changed) {
-        this.reloadClient(wss)
+        this.reloadClient()
       }
 
       callback && callback(changed)
@@ -154,18 +155,19 @@ class Webski {
     })
   }
 
-  listen (port, callback) {
-    if (port - this.port > PORT_RANGE) {
+  listen (callback) {
+    if (this.port - this.initialPort > PORT_RANGE) {
       return console.error('Unable to start the server.')
     }
 
     this.app
     this.app
-      .listen(port, this.hostname, () => callback(port))
+      .listen(this.port, this.hostname, callback)
       .on('error', err => {
         if (err.message.indexOf('EADDRINUSE') !== -1) {
-          console.log(`Unable to start server on port ${port}.`)
-          this.listen(port + 1, callback)
+          console.log(`Unable to start server on port ${this.port}.`)
+          ++this.port
+          this.listen(callback)
         }
       })
   }
@@ -193,12 +195,12 @@ class Webski {
         })
       })
 
-    this.listen(this.port, (port) => {
-      let host = `${this.hostname}:${port}`
+    this.listen(() => {
+      let host = `${this.hostname}:${this.port}`
       console.log(`Listening: ${chalk.blue(host)}`)
       this.wss = new WebSocket.Server({
         host: this.hostname,
-        port: port + 1
+        port: this.port + 1
       })
       callback && callback()
     })