hsync 0.9.0 → 0.11.0

package/Readme.md

@@ -5,7 +5,6 @@
 Client for the ([hsync-server](https://github.com/monteslu/hsync-server)).
 Share your local webserver as a secure public URL, and more.
 
-
 ## basic usage
 
 clone repo
@@ -27,6 +26,3 @@ set enviroment:
 ### run
 `node index`
 
-
-
-

package/cli.js

@@ -0,0 +1,43 @@
+#!/usr/bin/env node
+
+const { program, Option } = require('commander');
+const pack = require('./package.json');
+const config = require('./config');
+const { createConnection } = require('./hsync');
+
+program
+  .name(pack.name)
+  .description(pack.description)
+  .version(pack.version)
+  .addOption(new Option('-p, --port <number>', 'port for local webserver', 3000).env('PORT'))
+  .addOption(new Option('-d, --dynamic-host <url>', 'host to get a dynamic connection from').env('HSYNC_DYNAMIC_HOST'))
+  .addOption(new Option('-s, --hsync-server <url>', 'hsync-server location ex: wss://sub.mydomain.com').env('HSYNC_SERVER'))
+  .addOption(new Option('-hs, --hsync-secret <url>', 'password to connect to hsync-server').env('HSYNC_SECRET'));
+
+program.parse();
+
+const options = program.opts();
+
+
+if(options.port) {
+  options.port = Number(options.port);
+}
+
+let [defaultCon] = config.connections;
+defaultCon = {...defaultCon, ...options};
+
+if (!defaultCon.hsyncServer && !defaultCon.dynamicHost) {
+  defaultCon.dynamicHost = config.defaultDynamicHost;
+}
+
+config.connections[0] = defaultCon;
+
+config.connections.forEach(async (conConfig) => {
+  const con = await createConnection(conConfig);
+  console.log();
+  console.log('Listening for requests on: ', con.webUrl);
+  console.log('And forwarding to: ', 'http://localhost:' + con.port);
+  console.log();
+  console.log('Admin ui at: ', con.webAdmin);
+  console.log('Secret: ', con.hsyncSecret);
+});

package/config.js

@@ -1,10 +1,12 @@
 const baseConfig = {
-  hsyncServer: process.env.HSYNC_SERVER || 'ws://localhost:3101',
+  hsyncServer: process.env.HSYNC_SERVER, // something like 'wss://mydevice.mydomain.com'
   hsyncSecret: process.env.HSYNC_SECRET, // keep it secret, keep it safe!
   localHost: process.env.LOCAL_HOST || 'localhost', // host of local server
   port: process.env.PORT || 3000, // port of local server
   hsyncBase: process.env.HSYNC_BASE || '_hs',
-  keepalive: parseInt(process.env.HSYNC_KEEP_ALIVE) || 60,
+  keepalive: parseInt(process.env.HSYNC_KEEP_ALIVE) || 300,
+  dynamicHost: process.env.HSYNC_DYNAMIC_HOST,
+  defaultDynamicHost: 'https://demo.hsync.tech',
 };
 
 
@@ -23,7 +25,8 @@ keys.forEach((k) => {
         port: process.env['PORT_' + name] || baseConfig.port,
         hsyncBase: process.env['HSYNC_BASE_' + name] || baseConfig.hsyncBase,
         keepalive: parseInt(process.env['HSYNC_KEEP_ALIVE_' + name]) || baseConfig.keepalive,
-      })
+        dynamicHost: process.env['HSYNC_DYNAMIC_HOST_' + name],
+      });
     }
   }
 })

package/connection.js

@@ -1,27 +1,61 @@
-const mqtt = require('mqtt');
+const fetch = require('isomorphic-fetch');
 const EventEmitter = require('events').EventEmitter;
 const b64id = require('b64id');
 const debug = require('debug')('hsync:info');
 const debugVerbose = require('debug')('hsync:verbose');
 const debugError = require('debug')('hsync:error');
 const { createRPCPeer, createServerReplyPeer } = require('./lib/rpc');
-const createWebHandler = require('./lib/web-handler');
-const createSocketListenHandler = require('./lib/socket-listen-handler');
+const { createWebHandler, setNet: webSetNet } = require('./lib/web-handler');
+const { createSocketListenHandler, setNet: listenSetNet } = require('./lib/socket-listen-handler');
 
 debug.color = 3;
 debugVerbose.color = 2;
 debugError.color = 1;
 
-function createHsync(config) {
-  const {
+let mqtt;
+
+function setNet(netImpl) {
+  webSetNet(netImpl);
+  listenSetNet(netImpl);
+}
+
+function setMqtt(mqttImpl) {
+  mqtt = mqttImpl;
+}
+
+async function createHsync(config) {
+  let {
     hsyncServer,
     hsyncSecret,
     localHost,
     port,
     hsyncBase,
-    keepalive
+    keepalive,
+    dynamicHost,
   } = config;
 
+  let dynamicTimeout;
+
+  if (dynamicHost) {
+    const options = {
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      method: 'POST',
+      body: '{}',
+    };
+    const resp = await fetch(`${dynamicHost}/${hsyncBase}/dyn`, options);
+    const result = await resp.json();
+    // console.log('resutl', result);
+    if (dynamicHost.toLowerCase().startsWith('https')) {
+      hsyncServer = `wss://${result.url}`;
+    } else {
+      hsyncServer = `ws://${result.url}`;
+    }
+    hsyncSecret = result.secret;
+    dynamicTimeout = result.timeout;
+  }
+
   const hsyncClient = {};
   hsyncClient.config = config;
   const peers = {};
@@ -53,7 +87,11 @@ function createHsync(config) {
   });
 
   mqConn.on('error', (error) => {
-    debugError('error on mqConn', myHostName, error);
+    debugError('error on mqConn', myHostName, error.code, error);
+    if ((error.code === 4) || (error.code === 5)) {
+      debug('ending');
+      mqConn.end();
+    }
   });
 
   mqConn.on('message', (topic, message) => {
@@ -180,10 +218,22 @@ function createHsync(config) {
   hsyncClient.serverReplyMethods = serverReplyMethods;
   hsyncClient.getPeer = getPeer;
   hsyncClient.peerMethods = peerMethods;
+  hsyncClient.hsyncSecret = hsyncSecret;
+  hsyncClient.hsyncServer = hsyncServer;
+  hsyncClient.dynamicTimeout = dynamicTimeout;
+  if (hsyncServer.toLowerCase().startsWith('wss://')) {
+    hsyncClient.webUrl = `https://${myHostName}`;
+  } else {
+    hsyncClient.webUrl = `https://${myHostName}`;
+  }
+  hsyncClient.webAdmin = `${hsyncClient.webUrl}/${hsyncBase}/admin`;
+  hsyncClient.port = port;
 
   return hsyncClient;
 }
 
 module.exports = {
   createHsync,
+  setNet,
+  setMqtt,
 };