From: jordan lavatai <jordanlavatai@gmail.com>
Date: Wed, 12 Jul 2017 19:13:29 +0000 (-0700)
Subject: Merge branch 'master' of github.com:Jlavatai/strapp
X-Git-Url: https://git.kengrimes.com/?p=henge%2Fkiak.git;a=commitdiff_plain;h=a8bdc6c150c4f3417b2f18a480552a4015c248b1

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

a8bdc6c150c4f3417b2f18a480552a4015c248b1
diff --cc client.js
index 4d1bf9a,c1956a7..6cdf150
--- a/client.js
+++ b/client.js
@@@ -53,8 -55,8 +53,8 @@@ function requestHostAnswer(url, data) 
      /* But there is no JSON? */
      request.setRequestHeader('Content-Type', 'application/json' )
      request.setRequestHeader('X-Strapp-Type', 'client-sdp-offer')
-     request.setRequestHeader('X-Strapp-Pubkey', data.pubKey)
 -    request.setRequestHeader('X-Strapp-Pubkey', data.pubKey)    
--    request.onreadystatechange = () => {
++    request.setRequestHeader('X-Strapp-Pubkey', data.pubKey)
++    request.onreadystatechange = () => {
        if (request.status === 200) {
          if(request.readyState === 4) {
            console.log('Client: Recieved Answer from Host')
diff --cc router.js
index 411c488,8fe5235..da32c95
--- a/router.js
+++ b/router.js
@@@ -83,7 -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 -127,6 +131,10 @@@
      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,9 -142,7 +150,12 @@@
                           request.connection.remoteAddress))
          this.serveHost(response, route, htArgv)
        else */
++<<<<<<< HEAD
 +      else {
++=======
++>>>>>>> 3f5fce84645ec2c59aec0908807d1e9cb3e05e2d
          this.serveClient(request, response, route)
 +      }
      }
      /* If it's a valid routename that doesn't exist, make this client a host */
      else if (this.validRoutes.test(routeName)) {
@@@ -252,7 -249,7 +262,11 @@@
      }
    },
  
++<<<<<<< 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 -284,13 +301,22 @@@
        })
      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