hsync 0.15.0 → 0.16.0

package/cli.js

@@ -12,7 +12,13 @@ program
   .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'));
+  .addOption(new Option('-hs, --hsync-secret <string>', 'password to connect to hsync-server').env('HSYNC_SECRET'))
+  .addOption(new Option('-llp, --listener-local-port <number>', 'local port to open for listener').env('HSYNC_LLP'))
+  .addOption(new Option('-lth, --listener-target-host <url>', 'target host for listener').env('HSYNC_LTH'))
+  .addOption(new Option('-ltp, --listener-target-port <number>', 'target port for listener').env('HSYNC_LTP'))
+  .addOption(new Option('-rip, --relay-inbound-port <number>', 'inbound port to open for relay').env('HSYNC_RIP'))
+  .addOption(new Option('-rth, --relay-target-host <string>', 'target host for relay').env('HSYNC_RTH'))
+  .addOption(new Option('-rtp, --relay-target-port <number>', 'target port for relay').env('HSYNC_RTP'));
 
 program.parse();
 
@@ -23,6 +29,30 @@ if(options.port) {
   options.port = Number(options.port);
 }
 
+if(options.listenerLocalPort) {
+  options.listenerLocalPort = options.listenerLocalPort.split(',').map((p) => Number(p));
+}
+if (options.listenerTargetHost) {
+  options.listenerTargetHost = options.listenerTargetHost.split(',');
+}
+if (options.listenerTargetPort) {
+  options.listenerTargetPort = options.listenerTargetPort.split(',').map((p) => Number(p));
+}
+
+
+if (options.relayInboundPort) {
+  options.relayInboundPort = options.relayInboundPort.split(',').map((p) => Number(p));
+}
+if (options.relayTargetHost) {
+  options.relayTargetHost = options.relayTargetHost.split(',');
+}
+if (options.relayTargetPort) {
+  options.relayTargetPort = options.relayTargetPort.split(',').map((p) => Number(p));
+}
+
+// console.log('options', options);
+
+
 let [defaultCon] = config.connections;
 defaultCon = {...defaultCon, ...options};
 

package/connection.js

@@ -34,8 +34,16 @@ async function createHsync(config) {
     hsyncBase,
     keepalive,
     dynamicHost,
+    listenerLocalPort,
+    listenerTargetHost,
+    listenerTargetPort,
+    relayInboundPort,
+    relayTargetHost,
+    relayTargetPort,
   } = config;
 
+  // console.log('config', config);
+
   let dynamicTimeout;
 
   if (dynamicHost) {
@@ -197,7 +205,8 @@ async function createHsync(config) {
     });
   }
 
-  function addSocketListener (port, hostName, targetPort, targetHost = 'localhost') {
+  function addSocketListener (port, hostName, targetPort, targetHost) {
+    console.log('addSocketListener', port, hostName, targetPort, targetHost);
     const handler = createSocketListenHandler({port, hostName, targetPort, targetHost, hsyncClient});
     const id = b64id.generateId();
     socketListeners[id] = {handler, info: {port, hostName, targetPort, targetHost}, id};
@@ -277,6 +286,17 @@ async function createHsync(config) {
   hsyncClient.webBase = `${hsyncClient.webUrl}/${hsyncBase}`;
   hsyncClient.port = port;
 
+  if (listenerLocalPort) {
+    listenerLocalPort.forEach((llp, i) => {
+      const lth = listenerTargetHost ? listenerTargetHost[i] : null;
+      if (lth) {
+        const ltp = listenerTargetPort ? listenerTargetPort[i] : llp;
+        addSocketListener(llp, myHostName, ltp, lth);
+        console.log('relaying local', llp, 'to', lth, ltp);
+      }
+    });
+  }
+
   return hsyncClient;
 }
 

package/lib/socket-listen-handler.js

@@ -37,9 +37,10 @@ function receiveRelayData(requestInfo, { socketId, data }) {
 }
 
 function createSocketListenHandler({hostName, port, targetPort, targetHost, hsyncClient}) {
-  debug('creating handler', hostName, port, targetPort, targetHost);
+  debug('creating handler', { hostName, port, targetPort, targetHost });
   
-  const rpcPeer = getRPCPeer({hostName, hsyncClient});
+  // const rpcPeer = getRPCPeer({hostName, hsyncClient});
+  const rpcPeer = getRPCPeer({hostName: targetHost, hsyncClient});
 
   debug('peer crated');
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hsync",
-  "version": "0.15.0",
+  "version": "0.16.0",
   "description": "client for hsync-server",
   "main": "hsync.js",
   "scripts": {