hsync 0.18.3 → 0.20.0

package/shell.js

@@ -0,0 +1,33 @@
+const net = require('net');
+
+function run(port = 2323) {
+  process.stdin.setRawMode( true );
+  console.log('connecting to localhost:', port, ' ...');
+
+  const client = net.createConnection({ port }, () => {
+    client.on('data', (data) => {
+      process.stdout.write(data);
+    });
+
+    process.stdin.on('data', (data) => {
+      client.write(data);
+      // ctrl-c ( end of text )
+      if ( String(data) === '\u0003' ) {
+        process.exit();
+      }
+    });
+
+    client.on('end', () => {
+      console.log('disconnected from server');
+      process.exit();
+    });
+
+    client.on('error', (err) => {
+      console.error(err);
+    });
+    
+  });
+}
+
+module.exports = run;
+

package/lib/socket-listen-handler.js

@@ -1,135 +0,0 @@
-const b64id = require('b64id');
-const debug = require('debug')('hsync:listener');
-const debugError = require('debug')('hsync:error');
-
-const { getRPCPeer } = require('./peers');
-const { sockets } = require('./socket-map');
-
-let net;
-
-function setNet(netImpl) {
-  net = netImpl;
-}
-
-debugError.color = 1;
-
-function receiveRelayData(remotePeer, { socketId, data }) {
-  debug('receiveRelayData', socketId, data, 'sockets', Object.keys(sockets));
-  if (!sockets[socketId]) {
-    throw new Error('listener has no matching socket for relay: ' + socketId);
-  }
-  let dataBuffer = data;
-  if (typeof dataBuffer === 'string') {
-    dataBuffer = Buffer.from(dataBuffer, 'base64');
-  }
-  sockets[socketId].write(dataBuffer);
-  return 'receiveRelayData ok';
-}
-
-function createSocketListenHandler(options = {}) {
-  const { hostName, port, targetPort, targetHost, hsyncClient } = options;
-  debug('creating handler', port, targetHost);
-  
-  const rpcPeer = getRPCPeer({hostName: targetHost, hsyncClient});
-
-  const socketServer = net.createServer(async (socket) => {
-
-    if (!rpcPeer.rtcCon) {
-      await rpcPeer.connectRTC();
-    }
-
-    socket.socketId = b64id.generateId();
-    sockets[socket.socketId] = socket;
-    rpcPeer.sockets[socket.socketId] = socket;
-    socket.listenerSocket = true;
-    debug('connected to local listener', port, socket.socketId);
-    socket.peerConnected = false;
-    const pubTopic = `msg/${hostName}/${hsyncClient.myHostName}/socketData/${socket.socketId}`;
-    const closeTopic = `msg/${hostName}/${hsyncClient.myHostName}/socketClose/${socket.socketId}`;
-    const dataQueue = [];
-
-    async function sendData(data) {
-      if (rpcPeer.packAndSend) {
-        debug('sending data via rtc', hostName, socket.socketId, data.length);
-        rpcPeer.packAndSend(`socketData/${socket.socketId}`, data);
-        return;
-      }
-      debug('sending data via rpc', hostName, data.length);
-      // hsyncClient.mqConn.publish(pubTopic, data);
-      const result = await rpcPeer.methods.receiveListenerData({
-        socketId: socket.socketId,
-        data: Buffer.from(data).toString('base64'),
-      });
-      debug('sendData from Listener', result);
-    }
-
-    socket.on('data', async (data) => {
-      debug('socket data', data ? data.length : '');
-      // if (!socket.peerConnected) {
-      //   dataQueue.push(data);
-      //   return;
-      // }
-      sendData(data);
-    });
-  
-    socket.on('close', () => {
-      debug('listener socket closed', port, socket.socketId);
-      if (sockets[socket.socketId]) {
-        delete sockets[socket.socketId];
-      }
-    });
-  
-    socket.on('error', (error) => {
-      debug('socket error', hostName, socket.socketId, error);
-      if (sockets[socket.socketId]) {
-        delete sockets[socket.socketId];
-      }
-    });
-  
-    try {
-      debug('connecting remotely', socket.socketId, targetPort, rpcPeer.hostName, targetHost);
-      const result = await rpcPeer.methods.connectSocket({
-        socketId: socket.socketId,
-        port: targetPort,
-        hostName: rpcPeer.hostName,
-        wut: 'huh',
-      });
-      debug('connect result', result);
-      socket.peerConnected = true;
-      dataQueue.forEach(sendData);      
-    } catch (e) {
-      debugError('cant connect remotely', hostName, targetPort, e);
-      if (sockets[socket.socketId]) {
-        delete sockets[socket.socketId];
-      }
-      socket.end();
-    }
-  });
-
-  socketServer.listen(port);
-
-  function end() {
-    const sockKeys = Object.keys(sockets);
-    sockKeys.forEach((sk) => {
-      try {
-        sockets[sk].end();
-        delete sockets[sk];
-      }
-      catch(e) {
-        debug('error closing socket', e);
-      }
-    });
-  }
-
-  return {
-    socketServer,
-    sockets,
-    end,
-  };
-}
-
-module.exports = { 
-  createSocketListenHandler,
-  receiveRelayData,
-  setNet,
-};

package/lib/socket-relay-handler.js

@@ -1,105 +0,0 @@
-const debug = require('debug')('hsync:relay');
-const debugError = require('debug')('hsync:error');
-const { getRPCPeer } = require('./peers');
-const { sockets } = require('./socket-map');
-
-debugError.color = 1;
-
-let net;
-
-function setNet(netImpl) {
-  net = netImpl;
-}
-
-const relays = {};
-
-function receiveListenerData(remotePeer, { socketId, data }) {
-  debug('receiveListenerData', socketId, data, 'sockets', Object.keys(sockets));
-  if (!sockets[socketId]) {
-    throw new Error('relay has no matching socket for listener : ' + socketId);
-  }
-  let dataBuffer = data;
-  if (typeof dataBuffer === 'string') {
-    dataBuffer = Buffer.from(dataBuffer, 'base64');
-  }
-  sockets[socketId].write(dataBuffer);
-  return 'receiveListenerData ok';
-}
-
-function connectSocket(remotePeer, { hsyncClient, fromHost, port, socketId}) {
-  const relay = relays['p' + port];
-  debug('connect relay', port, socketId);
-  if (!relay) {
-    throw new Error('no relay found for port: ' + port);
-  }
-  // const rpcPeer = getRPCPeer({hostName: fromHost, hsyncClient});
-  // const relayDataTopic = `msg/${hostName}/${hsyncClient.myHostName}/relayData/${socketId}`;
-  return new Promise((resolve, reject) => {
-    const socket = new net.Socket();
-    socket.socketId = socketId;
-    sockets[socketId] = socket;
-    socket.connect(relay.targetPort, relay.targetHost, () => {
-      debug(`CONNECTED TO LOCAL SERVER`, socket.socketId, socket.hostName);
-      resolve({socketId, targetHost: relay.targetHost, targetPort: relay.targetPort});
-    });
-
-    socket.on('data', async (data) => {
-      debug(`data in ${socket.socketId}`, relay.targetPort, relay.targetHost, data.length);
-      if (remotePeer.packAndSend) {
-        debug('sending relay data via rtc', socket.socketId, data.length);
-        remotePeer.packAndSend(`socketData/${socket.socketId}`, Buffer.from(data));
-        return;
-      }
-      const result = await remotePeer.methods.receiveRelayData({
-        socketId,
-        data: Buffer.from(data).toString('base64'),
-      });
-      // const p = getRTCPeer(hostName, hsyncClient);
-      // if (p.connected) {
-      //   p.send(`relayData/${socketId}`, data);
-      //   return;
-      // }
-      // hsyncClient.mqConn.publish(relayDataTopic, data);
-    });
-    socket.on('close', () => {
-      debug(`LOCAL CONNECTION CLOSED`, socket.socketId, targetHost, targetPort);
-      delete sockets[socket.socketId];
-    });
-
-    socket.on('error', (e) => {
-      debugError(`LOCAL CONNECTION ERROR`, socket.socketId, targetHost, targetPort, e);
-      delete sockets[socket.socketId];
-      reject(e);
-    });
-  
-  });
-
-}
-
-// function receiveSocketData(socketId, data) {
-//   if (sockets[socketId]) {
-//     debug('receiveSocketData', socketId, data.length);
-//     sockets[socketId].write(data);
-//     return 'ok';
-//   }
-
-//   throw new Error('socket not found: ' + socketId);
-// }
-
-function createSocketRelayHandler({hostName, port, targetPort, targetHost, hsyncClient}) {
-  debug('creating relay', hostName, port, targetPort, targetHost);
-  relays['p' + port] = {
-    hostName,
-    port,
-    targetPort,
-    targetHost,
-  };
-}
-
-module.exports = {
-  createSocketRelayHandler,
-  connectSocket,
-  // receiveSocketData,
-  setNet,
-  receiveListenerData,
-};

package/tn.js

@@ -1,34 +0,0 @@
-const net = require('net');
-
-process.stdin.setRawMode( true );
-
-const client = net.createConnection({ port: 2323 }, () => {
-  // 'connect' listener.
-  // console.log('connected to server!');
-  // client.write('world!\r\n');
-  client.on('data', (data) => {
-    process.stdout.write(data);
-  });
-
-  process.stdin.on('data', (data) => {
-    client.write(data);
-    // ctrl-c ( end of text )
-    if ( String(data) === '\u0003' ) {
-      process.exit();
-    }
-  });
-
-  // on any data into stdin
-// 
-
-
-  client.on('end', () => {
-    console.log('disconnected from server');
-    process.exit();
-  });
-
-  client.on('error', (err) => {
-    console.error(err);
-  });
-  
-});