hsync 0.9.0 → 0.11.0

package/dist/hsync.min.js.LICENSE.txt

@@ -0,0 +1,10 @@
+/*!
+ * The buffer module from node.js, for the browser.
+ *
+ * @author   Feross Aboukhadijeh <https://feross.org>
+ * @license  MIT
+ */
+
+/*! For license information please see mqtt.browser.js.LICENSE.txt */
+
+/*! ieee754. BSD-3-Clause License. Feross Aboukhadijeh <https://feross.org/opensource> */

package/hsync-web.js

@@ -0,0 +1,60 @@
+const mqtt = require('precompiled-mqtt');
+const buffer = require('buffer');
+const net = require('net-web');
+const { createHsync, setNet, setMqtt } = require('./connection');
+const config = require('./config');
+
+// TODO need to make this work with web/service workers
+window.Buffer = buffer.Buffer;
+
+setNet(net);
+setMqtt(mqtt);
+
+async function dynamicConnect(dynamicHost, useLocalStorage) {
+  let con;
+  if (useLocalStorage) {
+    const localConfigStr = localStorage.getItem('hsyncConfig');
+    if (localConfigStr) {
+      const localConfig = JSON.parse(localConfigStr);
+      if ((Date.now() - localConfig.created) < (localConfig.timeout * 0.66)) {
+        config.hsyncSecret = localConfig.hsyncSecret;
+        config.hsyncServer = localConfig.hsyncServer;
+      }
+    }
+  
+    if (!config.hsyncSecret) {
+      config.dynamicHost = dynamicHost || config.defaultDynamicHost;
+    }
+  
+    con = await createHsync(config);
+  
+    if (config.dynamicHost) {
+      const storeConfig = {
+        hsyncSecret: con.hsyncSecret,
+        hsyncServer: con.hsyncServer,
+        timeout: con.dynamicTimeout,
+        created: Date.now(),
+      };
+      localStorage.setItem('hsyncConfig', JSON.stringify(storeConfig));
+    }
+
+    return con;
+  }
+
+  config.dynamicHost = dynamicHost || config.defaultDynamicHost;
+  con = await createHsync(config);
+
+  return con;
+  
+}
+
+
+const hsync = globalThis.hsync || {
+  createConnection: createHsync,
+  dynamicConnect,
+  net,
+  config,
+};
+globalThis.hsync = hsync;
+
+module.exports = hsync;

package/hsync.js

@@ -0,0 +1,23 @@
+const net = require('net');
+const mqtt = require('mqtt');
+const { createHsync, setNet, setMqtt } = require('./connection');
+const config = require('./config');
+
+setNet(net);
+setMqtt(mqtt);
+
+async function dynamicConnect(dynamicHost) {
+  let con;
+
+  config.dynamicHost = dynamicHost || config.defaultDynamicHost;
+  con = await createHsync(config);
+
+  return con;
+}
+
+module.exports = {
+  createConnection: createHsync,
+  dynamicConnect,
+  config,
+};
+

package/index.js

@@ -1,7 +1,11 @@
-
 const config = require('./config');
-const { createHsync } = require('./connection');
+const { createConnection } = require('./hsync');
+
+const [defaultCon] = config.connections;
+if (!defaultCon.hsyncServer && !defaultCon.dynamicHost) {
+  defaultCon.dynamicHost = config.defaultDynamicHost;
+}
 
 config.connections.forEach((conConfig) => {
-  const con = createHsync(conConfig);
-});
+  const con = createConnection(conConfig);
+});

package/lib/socket-listen-handler.js

@@ -1,12 +1,16 @@
-const net = require('net');
 const debug = require('debug')('hsync:listener');
 const debugError = require('debug')('hsync:error');
 
 const { createRPCPeer } = require('./rpc');
 
 debugError.color = 1;
+let net;
 
-function createHandler({hostName, port, targetPort, targetHost, hsyncClient}) {
+function setNet(netImpl) {
+  net = netImpl;
+}
+
+function createSocketListenHandler({hostName, port, targetPort, targetHost, hsyncClient}) {
   debug('creating handler', hostName, port, targetPort, targetHost);
 
   const sockets = {};
@@ -63,7 +67,6 @@ function createHandler({hostName, port, targetPort, targetHost, hsyncClient}) {
       socket.end();
     }
     
-
   });
 
   socketServer.listen(port);
@@ -89,4 +92,7 @@ function createHandler({hostName, port, targetPort, targetHost, hsyncClient}) {
   };
 }
 
-module.exports = createHandler;
+module.exports = {
+  createSocketListenHandler,
+  setNet,
+};

package/lib/socket-relay-handler.js

@@ -1,4 +1,3 @@
-const net = require('net');
 const debug = require('debug')('hsync:relay');
 const debugError = require('debug')('hsync:error');
 
@@ -6,13 +5,19 @@ const { createRPCPeer } = require('./rpc');
 
 debugError.color = 1;
 
+let net;
+
+function setNet(netImpl) {
+  net = netImpl;
+}
+
 function createHandler({hostName, port, targetPort, targetHost, hsyncClient}) {
 
   const sockets = {};
   
   const peer = createRPCPeer({hostName, hsyncClient});
 
-  const socketServer = net.createServer((socket) => {
+  const socketServer = net.createServer(async (socket) => {
 
     socket.socketId = b64id.generateId();
     sockets[socket.socketId] = socket;
@@ -85,4 +90,7 @@ function createHandler({hostName, port, targetPort, targetHost, hsyncClient}) {
   };
 }
 
-module.exports = createHandler;
+module.exports = {
+  createHandler,
+  setNet,
+};

package/lib/web-handler.js

@@ -1,10 +1,15 @@
-const net = require('net');
 const debug = require('debug')('hsync:web');
 const debugError = require('debug')('hsync:error');
 
 debugError.color = 1;
 
-function createHanlder({myHostName, localHost, port, mqConn}) {
+let net;
+
+function setNet(netImpl) {
+  net = netImpl;
+}
+
+function createWebHandler({myHostName, localHost, port, mqConn}) {
 
   const sockets = {};
 
@@ -26,11 +31,6 @@ function createHanlder({myHostName, localHost, port, mqConn}) {
         socket = new net.Socket();
         socket.socketId = socketId;
         sockets[socketId] = socket;
-        socket.connect(port, localHost, () => {
-          debug(`\nCONNECTED TO ${localHost}:${port}`, socket.socketId);
-          debug('← ' + message.slice(0, 200).toString().split('\r\n')[0], message.length);
-          socket.write(message);
-        });
         socket.on('data', (data) => {
           if (!socket.dataRecieved) {
             const logData = data.slice(0, 200).toString().split('\r\n')[0];
@@ -51,6 +51,11 @@ function createHanlder({myHostName, localHost, port, mqConn}) {
           delete sockets[socket.socketId];
           debugError('error connecting', localHost, port, err);
         });
+        socket.connect(port, localHost, () => {
+          debug(`\nCONNECTED TO ${localHost}:${port}`, socket.socketId);
+          debug('← ' + message.slice(0, 200).toString().split('\r\n')[0], message.length);
+          socket.write(message);
+        });
         return;
       }
 
@@ -80,4 +85,7 @@ function createHanlder({myHostName, localHost, port, mqConn}) {
   };
 }
 
-module.exports = createHanlder;
+module.exports = { 
+  createWebHandler,
+  setNet,
+};

package/lib/web-net.js

@@ -0,0 +1,67 @@
+const EventEmitter = require('events').EventEmitter;
+
+const events = new EventEmitter();
+
+const listeners = {};
+
+function Socket() {
+  const socket = new EventEmitter();
+  
+  socket.connect = function(port, host, clientCallback) {
+    events.emit(('socket_connect_' + port), {
+      port,
+      host,
+      clientSocket: socket,
+      clientCallback,
+    });  
+  }
+
+  socket.write = function(message) {
+    if (socket.serverSocket) {
+      socket.serverSocket.emit('data', message);
+    }
+  };
+
+  socket.end = function() {
+    if (socket.serverSocket) {
+      socket.serverSocket.emit('close');
+    }
+    
+  }
+
+  return socket;
+}
+
+function createServer(cb) {
+  const server = new EventEmitter();
+  server.listen = (port) => {
+    console.log('server.listen', port);
+    listeners['l' + port] = server;
+    events.on('socket_connect_' + port, ({ clientSocket, clientCallback }) => {
+      console.log('socket_connect_' + port, clientSocket);
+      const serverSocket = new EventEmitter();
+      clientSocket.serverSocket = serverSocket;
+      if (server.cb) {
+        server.cb(serverSocket);
+      }
+      serverSocket.write = (data) => {
+        clientSocket.emit('data', data);
+      }
+      serverSocket.end = () => {
+        clientSocket.emit('close');
+      }
+      
+      if (clientCallback) {
+        clientCallback();
+      }
+    });
+  };
+  server.cb = cb;
+  return server;
+}
+
+module.exports = {
+  Socket,
+  createServer,
+  events,
+};

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "hsync",
-  "version": "0.9.0",
+  "version": "0.11.0",
   "description": "client for hsync-server",
-  "main": "index.js",
+  "main": "hsync.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "dev": "nodemon --inspect index.js",
-    "start": "node index.js"
+    "start": "node index.js",
+    "build": "webpack && BUILD_MODE=production webpack"
   },
   "repository": {
     "type": "git",
@@ -19,15 +20,28 @@
     "websocket",
     "mqtt"
   ],
+  "browser": {
+    "./hsync": "./hsync-web"
+  },
+  "bin": {
+    "hsync": "./cli.js"
+  },
   "author": "Luis Montes",
   "license": "ISC",
   "dependencies": {
     "b64id": "^1.0.0",
+    "buffer": "^6.0.3",
+    "commander": "^10.0.0",
     "debug": "^4.3.1",
+    "isomorphic-fetch": "^3.0.0",
     "mqtt": "^4.2.6",
+    "net-web": "^0.2.0",
+    "precompiled-mqtt": "^4.3.14-beta",
     "rawr": "^0.14.0"
   },
   "devDependencies": {
-    "nodemon": "^2.0.7"
+    "nodemon": "^2.0.20",
+    "webpack": "^5.75.0",
+    "webpack-cli": "^5.0.1"
   }
 }

package/webpack.config.js

@@ -0,0 +1,16 @@
+const path = require('path');
+
+const mode = process.env.BUILD_MODE || 'development';
+
+module.exports = {
+  entry: "./hsync-web.js",
+  output: {
+    path: path.resolve(__dirname, 'dist'),
+    filename: mode === 'development' ? 'hsync.js' : 'hsync.min.js'
+  },
+  mode,
+  resolve: {
+    alias: {
+    }
+  },
+};