sha bang deleted

diff --git a/client/revprox b/client/revprox
deleted file mode 100755 (executable)
index 9b31761..0000000
--- a/client/revprox
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/nodejs
-
-const io = require("socket.io-client");
-const ss = require('socket.io-stream');
-const net = require('net');
-const log = require('./../logger')(__filename.slice(__dirname.length + 1));
-
-const proxydestination = { host: "localhost", port: 3000 };
-const remoteserver = 'http://192.168.1.3:8088';
-const socket = io(remoteserver, { transports:["websocket"] });
-
-socket.on('servereventtest', function (data) {
-  log.info('connection test succeeded');
-  socket.emit('clienteventtest', { data: 'clienteventtestdata' });
-});
-
-ss(socket).on('proxy', function(stream, data) {
-  log.info("stream created");
-
-  var client = net.connect(proxydestination,  function() {
-    log.info('connected to garnod web server');
-    stream.pipe(client);
-    client.pipe(stream);
-  });
-
-  client.on('end', function() {
-    log.info('disconnected from garnod web server');
-    stream.unpipe(client);
-    client.unpipe(stream);
-  });
-
-  client.on('error', function(err) {
-    log.error('web socket error:', JSON.stringify(err));
-               socket.emit('destinationerror', err);
-  });
-});

diff --git a/client/revprox.js b/client/revprox.js
new file mode 100644 (file)
index 0000000..e053fe2
--- /dev/null
+++ b/client/revprox.js
@@ -0,0 +1,34 @@
+const io = require("socket.io-client");
+const ss = require('socket.io-stream');
+const net = require('net');
+const log = require('./../logger')(__filename.slice(__dirname.length + 1));
+
+const proxydestination = { host: "localhost", port: 3000 };
+const remoteserver = 'http://192.168.1.3:8088';
+const socket = io(remoteserver, { transports:["websocket"] });
+
+socket.on('servereventtest', function (data) {
+  log.info('connection test succeeded');
+  socket.emit('clienteventtest', { data: 'clienteventtestdata' });
+});
+
+ss(socket).on('proxy', function(stream, data) {
+  log.info("stream created");
+
+  var client = net.connect(proxydestination,  function() {
+    log.info('connected to garnod web server');
+    stream.pipe(client);
+    client.pipe(stream);
+  });
+
+  client.on('end', function() {
+    log.info('disconnected from garnod web server');
+    stream.unpipe(client);
+    client.unpipe(stream);
+  });
+
+  client.on('error', function(err) {
+    log.error('web socket error:', JSON.stringify(err));
+               socket.emit('destinationerror', err);
+  });
+});

diff --git a/server/revprox b/server/revprox
deleted file mode 100755 (executable)
index 081ebbe..0000000
--- a/server/revprox
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/usr/bin/nodejs
-
-const app = require('http').createServer();
-const io = require('socket.io')(app);
-const ss = require('socket.io-stream');
-const net = require('net');
-const log = require('./../logger')(__filename.slice(__dirname.length + 1));
-
-var lastsocket = null;
-var websocket = null;
-const socketioport = 8087;
-const revproxport = 8089;
-
-app.listen(socketioport, 'localhost');
-log.info('socket.io server bound to port ' + socketioport);
-
-io.on('connection', function (iosocket) {
-  lastsocket = iosocket;
-  log.info('socket.io client connected');
-  iosocket.emit('servereventtest', { data: 'servereventtestdata' });
-
-  iosocket.on('disconnect', function () {
-    log.info("socket.io client disconnected");
-               lastsocket = null;
-  })
-
-  iosocket.on('clienteventtest', function (data) {
-    log.info('socket.io client connection test succeeded');
-  });
-
-  iosocket.on('destinationerror', function (err) {
-    if (websocket != null) {
-      log.warn('destination error, closing web socket');
-                       websocket.end();
-               }
-  });
-
-  iosocket.on('error', function (err) {
-    log.error('socket.io error:', JSON.stringify(err));
-  });
-});
-
-var server = net.createServer(function(sock) {
-  log.info('web client connected');
-  websocket = sock;
-
-  if (null != lastsocket) {
-    var stream = ss.createStream();
-    ss(lastsocket).emit('proxy', stream);
-    log.debug('stream created');
-
-    websocket.on('error', function(err) {
-      log.error('web socket error:', JSON.stringify(err));
-    })
-    .on('data', function(data) {
-      log.debug('web socket data, port ' + websocket.remotePort + ', size: ' + data.length);
-    })
-    .on('end', function() {
-      websocket.unpipe(stream);
-      stream.unpipe(websocket);
-                       websocket = null;
-      log.info('web client disconnect');
-    });
-
-    stream.on('error', function() {
-      log.error('stream error, id ' + stream.id);
-    })
-    .on('data', function(data) {
-      log.debug('stream data, id ' + stream.id + ', size: ' + data.length);
-    })
-    .on('end', function() {
-      log.debug('stream destroyed');
-    });
-
-    websocket.pipe(stream);
-    stream.pipe(websocket);
-  } else {
-    log.warn('web client connection refused due to missing socket.io connection');
-    websocket.end();
-  }
-});
-
-server.listen(revproxport, 'localhost', function() {
-  log.info('reverse proxy bound to port ' + revproxport);
-});

diff --git a/server/revprox.js b/server/revprox.js
new file mode 100644 (file)
index 0000000..d359338
--- /dev/null
+++ b/server/revprox.js
@@ -0,0 +1,83 @@
+const app = require('http').createServer();
+const io = require('socket.io')(app);
+const ss = require('socket.io-stream');
+const net = require('net');
+const log = require('./../logger')(__filename.slice(__dirname.length + 1));
+
+var lastsocket = null;
+var websocket = null;
+const socketioport = 8087;
+const revproxport = 8089;
+
+app.listen(socketioport, 'localhost');
+log.info('socket.io server bound to port ' + socketioport);
+
+io.on('connection', function (iosocket) {
+  lastsocket = iosocket;
+  log.info('socket.io client connected');
+  iosocket.emit('servereventtest', { data: 'servereventtestdata' });
+
+  iosocket.on('disconnect', function () {
+    log.info("socket.io client disconnected");
+               lastsocket = null;
+  })
+
+  iosocket.on('clienteventtest', function (data) {
+    log.info('socket.io client connection test succeeded');
+  });
+
+  iosocket.on('destinationerror', function (err) {
+    if (websocket != null) {
+      log.warn('destination error, closing web socket');
+                       websocket.end();
+               }
+  });
+
+  iosocket.on('error', function (err) {
+    log.error('socket.io error:', JSON.stringify(err));
+  });
+});
+
+var server = net.createServer(function(sock) {
+  log.info('web client connected');
+  websocket = sock;
+
+  if (null != lastsocket) {
+    var stream = ss.createStream();
+    ss(lastsocket).emit('proxy', stream);
+    log.debug('stream created');
+
+    websocket.on('error', function(err) {
+      log.error('web socket error:', JSON.stringify(err));
+    })
+    .on('data', function(data) {
+      log.debug('web socket data, port ' + websocket.remotePort + ', size: ' + data.length);
+    })
+    .on('end', function() {
+      websocket.unpipe(stream);
+      stream.unpipe(websocket);
+                       websocket = null;
+      log.info('web client disconnect');
+    });
+
+    stream.on('error', function() {
+      log.error('stream error, id ' + stream.id);
+    })
+    .on('data', function(data) {
+      log.debug('stream data, id ' + stream.id + ', size: ' + data.length);
+    })
+    .on('end', function() {
+      log.debug('stream destroyed');
+    });
+
+    websocket.pipe(stream);
+    stream.pipe(websocket);
+  } else {
+    log.warn('web client connection refused due to missing socket.io connection');
+    websocket.end();
+  }
+});
+
+server.listen(revproxport, 'localhost', function() {
+  log.info('reverse proxy bound to port ' + revproxport);
+});