Merge pull request #236 from leapmotion/test-updates

Update packages to address security vulnerabilities and deprecations
leapmotion · Dec 10, 2019 · a3d8605 · a3d8605
2 parents 31b0072 + f2e2791
commit a3d8605
Show file tree

Hide file tree

Showing 23 changed files with 21,580 additions and 9,475 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 language: node_js
 node_js:
-  - "0.10"
+  - "12"
 before_install: npm install -g grunt-cli
 script: grunt test
diff --git a/bower.json b/bower.json
@@ -1,9 +1,9 @@
 {
   "name": "leapjs",
-  "version": "0.6.4",
+  "version": "1.0.0",
   "homepage": "https://github.com/leapmotion/leapjs",
   "description": "JavaScript client for the Leap Motion Controller",
-  "main": "leap-0.6.4.js",
+  "main": "leap-1.0.0.js",
   "keywords": [
     "leap",
     "leapmotion"

diff --git a/examples/css-visualizer.html b/examples/css-visualizer.html
@@ -1,7 +1,7 @@
 <html>
   <head>
     <title>DOM Visualizer - Leap</title>
-    <script src="../leap-0.6.4.js"></script>
+    <script src="../leap-1.0.0.js"></script>
     <script>
       function moveFinger(Finger, posX, posY, posZ) {
         Finger.style.webkitTransform = "translate3d("+posX+"px, "+posY+"px, "+posZ+"px)";

diff --git a/examples/dialog.html b/examples/dialog.html
@@ -11,7 +11,7 @@
         }
       </style>
     -->
-    <script src="../leap-0.6.4.js"></script>
+    <script src="../leap-1.0.0.js"></script>
     <script>
 
       var controller = (new Leap.Controller);

diff --git a/examples/dumper.html b/examples/dumper.html
@@ -1,7 +1,7 @@
 <html>
   <head>
     <title>Dumper - Leap</title>
-    <script src="../leap-0.6.4.js"></script>
+    <script src="../leap-1.0.0.js"></script>
     <script>
       console.log("LeapJS v" + Leap.version.full);
       var state = 'play';

diff --git a/examples/gestures.html b/examples/gestures.html
@@ -2,7 +2,7 @@
 <head>
   <script src="http://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.5.2/underscore-min.js"></script>
   <script src="http://cdnjs.cloudflare.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script>
-  <script src="../leap-0.6.4.js"></script>
+  <script src="../leap-1.0.0.js"></script>
   <script>
 
   $(document).ready(function() {

diff --git a/examples/iframe.html b/examples/iframe.html
@@ -1,7 +1,7 @@
 <html>
   <head>
     <title>iFrame - Leap</title>
-    <script src="../leap-0.6.4.js"></script>
+    <script src="../leap-1.0.0.js"></script>
    </head>
   <body>
   <!-- Demonstrates https://github.com/leapmotion/leapjs/issues/176  -->

diff --git a/examples/loop.html b/examples/loop.html
@@ -3,7 +3,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <title>Loop - Leap</title>
 
-    <script src="../leap-0.6.4.js"></script>
+    <script src="../leap-1.0.0.js"></script>
 
     <script>
 

diff --git a/examples/math.html b/examples/math.html
@@ -3,7 +3,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <title>Math - Leap</title>
 
-    <script src="../leap-0.6.4.js"></script>
+    <script src="../leap-1.0.0.js"></script>
 
     <script>
 

diff --git a/examples/optimizeHMD.html b/examples/optimizeHMD.html
@@ -1,7 +1,7 @@
 <html>
   <head>
     <title>HMD Optimization - Leap</title>
-    <script src="../leap-0.6.4.js"></script>
+    <script src="../leap-1.0.0.js"></script>
     <script>
       var controller = new Leap.Controller({optimizeHMD: true}).connect();
     </script>

diff --git a/examples/plugins.html b/examples/plugins.html
@@ -1,7 +1,7 @@
 <html>
   <head>
     <title>Plugins - Leap</title>
-    <script src="../leap-0.6.4.js"></script>
+    <script src="../leap-1.0.0.js"></script>
     <script>
       Leap.Controller.plugin('test', function(){
 

diff --git a/examples/roll-pitch-yaw.html b/examples/roll-pitch-yaw.html
@@ -1,7 +1,7 @@
 <html>
   <head>
     <title>Dumper - Leap</title>
-    <script src="../leap-0.6.4.js"></script>
+    <script src="../leap-1.0.0.js"></script>
     <script>
       var paused = false;
       window.onkeypress = function(e) {

diff --git a/examples/threejs-bones-arrows.html b/examples/threejs-bones-arrows.html
@@ -1,7 +1,7 @@
 <html>
 <head>
   <title>Bone Hands - Leap</title>
-  <script src="../leap-0.6.4.js"></script>
+  <script src="../leap-1.0.0.js"></script>
   <script src="lib/leap-plugins-0.1.6.js"></script>
   <script src="lib/three.js"></script>
 

diff --git a/examples/threejs-bones.html b/examples/threejs-bones.html
@@ -1,7 +1,7 @@
 <html>
 <head>
   <title>Bone Hands - Leap</title>
-  <script src="../leap-0.6.4.js"></script>
+  <script src="../leap-1.0.0.js"></script>
   <script src="lib/leap-plugins-0.1.6.js"></script>
   <script src="lib/three.js"></script>
 

diff --git a/integration_test/protocol_versions.js b/integration_test/protocol_versions.js
@@ -14,7 +14,10 @@ downgradeProtocol = function(){
   var expected = ['/v6.json', '/v5.json', '/v4.json', '/v3.json', '/v2.json', '/v1.json'];
 
   var wss = new WebSocketServer({port: 9494})
-  wss.on('connection', function(ws) {
+  // https://github.com/websockets/ws/issues/1114
+  // https://github.com/websockets/ws/pull/1099
+  wss.on('connection', function(ws, req) {
+    ws.upgradeReq = req
     if (passed) return;
     console.log("connected to socket with "+ws.upgradeReq.url)
     if (expected.length == 0) {
@@ -41,7 +44,8 @@ saveGoodProtocol = function(){
 
   var wss = new WebSocketServer({port: 9495})
   var origUrl;
-  wss.on('connection', function(ws) {
+  wss.on('connection', function(ws, req) {
+    ws.upgradeReq = req
     console.log("connected to socket with "+ws.upgradeReq.url)
 
     ws.send('{"version": 4}');
@@ -80,7 +84,8 @@ disconnectAfterConnect = function () {
   var wss = new WebSocketServer({port: 9496})
 
 
-  wss.on('connection', function (ws) {
+  wss.on('connection', function (ws, req) {
+    ws.upgradeReq = req
     timesConnected++;
     console.log("connected to socket with "+ws.upgradeReq.url)