wip

Author: mattsroufe

.gitignore

@@ -14,3 +14,4 @@ npm-debug.log
 tags
 cpplint.py
 generated
+package-lock.json

examples/html/client.html

@@ -36,7 +36,12 @@
   });
 
   // Create a connection to the rosbridge WebSocket server.
-  ros.connect('ws://localhost:9090');
+  if (window.location.protocol == "https:") {
+    var ws_scheme = "wss://";
+  } else {
+    var ws_scheme = "ws://"
+  };
+  ros.connect(ws_scheme + window.location.hostname + ':9090');
 
   // Create a Service client with details of the service's name and service type.
   var addTwoInts = new ROSLIB.Service({

examples/html/publisher.html

@@ -36,7 +36,12 @@
   });
 
   // Create a connection to the rosbridge WebSocket server.
-  ros.connect('ws://localhost:9090');
+  if (window.location.protocol == "https:") {
+    var ws_scheme = "wss://";
+  } else {
+    var ws_scheme = "ws://"
+  };
+  ros.connect(ws_scheme + window.location.hostname + ':9090');
 
   // Publish a Topic
   var example = new ROSLIB.Topic({

examples/html/service.html

@@ -36,7 +36,12 @@
   });
 
   // Create a connection to the rosbridge WebSocket server.
-  ros.connect('ws://localhost:9090');
+  if (window.location.protocol == "https:") {
+    var ws_scheme = "wss://";
+  } else {
+    var ws_scheme = "ws://"
+  };
+  ros.connect(ws_scheme + window.location.hostname + ':9090');
 
   // Create a Service client with details of the service's name and service type.
   var addTwoInts = new ROSLIB.Service({

examples/index.js

@@ -17,7 +17,7 @@
 const express = require('express');
 const app = express();
 
-app.use(express.static('.'));
+app.use(express.static('html'));
 
-app.listen(3000);
-console.log('The web server started on http://localhost:3000');
+app.listen(3000, '0.0.0.0');
+console.log('The web server started on http://0.0.0.0:3000');

index.js

@@ -55,6 +55,8 @@ function createServer(options) {
     debug('Application will exit.');
     shutDown();
   });
+  process.on('SIGINT', process.exit);
+
   return rclnodejs.init()
     .then(() => {
       node = rclnodejs.createNode('ros2_web_bridge');

lib/bridge.js

@@ -17,7 +17,7 @@
 const ResourceProvider = require('./resource_provider.js');
 const debug = require('debug')('ros2-web-bridge:Bridge');
 const EventEmitter = require('events');
-const uuidv4 = require('uuid/v4');
+const { v4: uuidv4 } = require('uuid');
 const {validator} = require('rclnodejs');
 
 const STATUS_LEVELS = ['error', 'warning', 'info', 'none'];

package.json

@@ -33,18 +33,18 @@
   ],
   "devDependencies": {
     "async": "^3.2.0",
-    "express": "^4.16.2",
     "eslint": "^6.8.0",
+    "express": "^4.17.1",
     "js-sha512": "^0.8.0",
-    "mocha": "^7.1.1",
     "jsdom": "^16.2.1",
+    "mocha": "^7.1.1",
     "puppeteer": "^2.1.1"
   },
   "dependencies": {
-    "commander": "^5.0.0",
-    "debug": "^4.1.1",
-    "rclnodejs": "^0.x.1",
-    "uuid": "^7.0.2",
-    "ws": "^7.1.1"
+    "commander": "^6.2.1",
+    "debug": "^4.3.1",
+    "rclnodejs": "^0.17.0",
+    "uuid": "^8.3.2",
+    "ws": "^7.4.1"
   }
 }