Merge branch 'master' of github.com:Jlavatai/strapp

diff --git a/client.js b/client.js
index 4d1bf9a..6cdf150 100644 (file)
--- a/client.js
+++ b/client.js
@@ -53,8 +53,8 @@ function requestHostAnswer(url, data) {
     /* But there is no JSON? */\r
     request.setRequestHeader('Content-Type', 'application/json' )\r
     request.setRequestHeader('X-Strapp-Type', 'client-sdp-offer')\r
-    request.setRequestHeader('X-Strapp-Pubkey', data.pubKey)\r
-    request.onreadystatechange = () => {\r
+    request.setRequestHeader('X-Strapp-Pubkey', data.pubKey)
+    request.onreadystatechange = () => {
       if (request.status === 200) {\r
         if(request.readyState === 4) {\r
           console.log('Client: Recieved Answer from Host')\r

diff --git a/opts.js b/opts.js
index 5767cf6..d930e79 100644 (file)
--- a/opts.js
+++ b/opts.js
@@ -13,20 +13,19 @@ const path = require('path')
  */
 exports = require('minimist')(process.argv.slice(2), {
   string:  [ 'config', 'client-js', 'host-js', 'ca-cert', 'ca-key',
-            'port', 'index', 'bind', 'electron', 'dedicated'
+            'port', 'bind', 'electron', 'file-dir', 'dedicated'
           ],
   boolean: [ 'no-tls', 'legacy-socket' ],
   alias:   { c: 'config',
             j: 'client-js',
             J: 'host-js',
-            T: 'no-tls',
             C: 'ca-cert',
             K: 'ca-key',
             p: 'port',
-            i: 'index',
             b: 'bind',
             e: 'electron',
-            d: 'dedicated'
+            d: 'file-dir',
+             D: 'dedicated'
           },
   stopEarly: true,
   unknown: (opt) => {
@@ -48,9 +47,9 @@ exports['defaults'] = {
   'ca-cert':   '../certs/cert.pem',
   'ca-key':    '../certs/key.pem',
   port:        2443,
-  index:       './index.html',
   bind:        'www:./www',
   electron:    undefined,
+  'file-dir':  undefined,
   dedicated:   undefined,
   'legacy-socket': false
 }

diff --git a/router.js b/router.js
index 411c488..da32c95 100644 (file)
--- a/router.js
+++ b/router.js
@@ -83,7 +83,11 @@ exports = {
         console.log(err)
       })
     console.log(`HTTP${(conf.tls == undefined) ? '' : 'S'} ` +
+<<<<<<< HEAD
                 `Server Started on port ${conf.port}${this.httpdRoot ?
+=======
+                `Server Started on port ${conf.port}${this.httpdRoot ? 
+>>>>>>> 3f5fce84645ec2c59aec0908807d1e9cb3e05e2d
                 `, serving files from ${this.httpdRoot}`:''}`)
   },
 
@@ -127,7 +131,10 @@ exports = {
     let htArgv = request.url.slice(1).split('?')
     const routeName = htArgv[0].split('/')[0]
     let route = this.routes[routeName]
+<<<<<<< HEAD
     console.log(`route is ${route}`)
+=======
+>>>>>>> 3f5fce84645ec2c59aec0908807d1e9cb3e05e2d
     /* If the route exists, check if we are a returning host or a new client */
     if (route) {
       if (route.bind) {
@@ -143,7 +150,10 @@ exports = {
                          request.connection.remoteAddress))
         this.serveHost(response, route, htArgv)
       else */
+<<<<<<< HEAD
       else {
+=======
+>>>>>>> 3f5fce84645ec2c59aec0908807d1e9cb3e05e2d
         this.serveClient(request, response, route)
       }
     }
@@ -252,7 +262,11 @@ exports = {
     }
   },
 
+<<<<<<< HEAD
   /** @func
+=======
+  /** @func    
+>>>>>>> 3f5fce84645ec2c59aec0908807d1e9cb3e05e2d
    * @summary Create a new route for a host
    * @desc    makes a new route for the given route name
    * @arg     {string} routeName - name of the new route
@@ -287,14 +301,22 @@ exports = {
       })
     route.pendingResponses.addResponse = function (key, response_p) {
       let responses = this.get(key) || []
+<<<<<<< HEAD
       responses.push(response_p)
       this.set(key, responses)
+=======
+      this.set(key, responses.push(response_p))
+>>>>>>> 3f5fce84645ec2c59aec0908807d1e9cb3e05e2d
     }
     this.routes[routeName] = route
     this.serveHost(response, route, argv)
   },
 
+<<<<<<< HEAD
   /** @func
+=======
+  /** @func    
+>>>>>>> 3f5fce84645ec2c59aec0908807d1e9cb3e05e2d
    * @summary Serve a route to an authorized http host
    * @desc    services host application to the client, establishing a socket
    * @arg     {http.ServerResponse} response - response object to use

diff --git a/strapp.js b/strapp.js
index ebca88d..dc95479 100644 (file)
--- a/strapp.js
+++ b/strapp.js
@@ -11,7 +11,7 @@ const opts = require('./opts.js')
 const router = require('./router.js')
 
 Object.keys(opts['bindings']).forEach((key) => {
-  router.createBind(key, opts['bindings'].key)
+  router.createBind(key, opts['bindings'][key])
 })
 
 router.startHttpServer({

diff --git a/usage b/usage
index 25b4715..c138a5c 100644 (file)
--- a/usage
+++ b/usage
@@ -38,7 +38,7 @@ ROUTING
                           window which will be launched on execution (nil)
                           - enables optional electron dependency
 
-  -d, --dedicated=string  Route all incoming connections to this route (nil)
+  -D, --dedicated=string  Route all incoming connections to this route (nil)
                           - can be used in conjunction with '-e' for single-user
                           e.g. Create a dedicated electron listener
                             $ strapp -e default -d default