Update package.json and copy ioquake3.js from quakejs.com

bin/web.js

@@ -1,7 +1,7 @@
 var _ = require('underscore');
 var express = require('express');
 var http = require('http');
-var logger = require('winston');
+const { createLogger, format, transports } = require('winston');
 var opt = require('optimist');
 var path = require('path');
 
@@ -14,7 +14,10 @@ if (argv.h || argv.help) {
 	return;
 }
 
-logger.cli();
+const logger = createLogger({
+  format: format.simple(),
+  transports: [new transports.Console()]
+});
 logger.level = 'debug';
 
 var config = loadConfig(argv.config);
@@ -50,7 +53,7 @@ function loadConfig(configPath) {
 
 	var server = http.createServer(app);
 	server.listen(config.port, function () {
-		logger.info('web server is now listening on port', server.address().address, server.address().port);
+		logger.info('web server is now listening on ' +  server.address().address + ":" + server.address().port);
 	});
 
 	return server;

build/ioquake3.js

@@ -18945,7 +18945,7 @@ function copyTempDouble(ptr) {
             panner.maxDistance = src.maxDistance;
             panner.rolloffFactor = src.rolloffFactor;
             panner.setPosition(src.position[0], src.position[1], src.position[2]);
-            panner.setVelocity(src.velocity[0], src.velocity[1], src.velocity[2]);
+            //panner.setVelocity(src.velocity[0], src.velocity[1], src.velocity[2]);
             panner.connect(AL.currentContext.ctx.destination);
 
             // Disconnect from the default source.
@@ -19120,7 +19120,7 @@ function copyTempDouble(ptr) {
         var y = HEAPF32[(((values)+(4))>>2)];
         var z = HEAPF32[(((values)+(8))>>2)];
         AL.currentContext.ctx.listener._velocity = [x, y, z];
-        AL.currentContext.ctx.listener.setVelocity(x, y, z);
+        //AL.currentContext.ctx.listener.setVelocity(x, y, z);
         break;
       case 0x100F /* AL_ORIENTATION */:
         var x = HEAPF32[((values)>>2)];
@@ -19198,7 +19198,7 @@ function copyTempDouble(ptr) {
           },
           set velocity(val) {
             this._velocity = val;
-            if (this.panner) this.panner.setVelocity(val[0], val[1], val[2]);
+            //if (this.panner) this.panner.setVelocity(val[0], val[1], val[2]);
           },
           get direction() {
             return this._direction || [0, 0, 0];
@@ -20216,7 +20216,8 @@ function copyTempDouble(ptr) {
   			var start = Date.now();
 
   			var module = VM.CompileModule(name, instructionCount, headerp + codeOffset, dataBase);
-  			vm = eval(module)();
+  			var indirectEval = eval;
+  			vm = indirectEval(module)();
 
   			SYSC.Print('VM file ' + name + ' compiled in ' + (Date.now() - start) + ' milliseconds');
   		} catch (e) {
@@ -21119,7 +21120,7 @@ function copyTempDouble(ptr) {
       var gamepads = SDL.getGamepads();
       // The length is not the number of gamepads; check which ones are defined.
       for (var i = 0; i < gamepads.length; i++) {
-        if (gamepads[i] !== undefined) count++;
+        if (gamepads[i] !== undefined && gamepads[i] !== null) count++;
       }
       return count;
     }

package.json

@@ -15,17 +15,17 @@
   "readmeFilename": "README.md",
   "dependencies": {
     "async": "~0.2.9",
+    "buffer-crc32": "~0.2.1",
+    "ejs": "~0.8.4",
     "execSync": "~1.0.1-pre",
+    "express": "^4.16.4",
+    "optimist": "~0.6.0",
     "quakejs-files": "0.0.3",
+    "send": "^0.16.2",
     "temp": "~0.5.1",
     "underscore": "~1.5.1",
-    "express": "~3.3.5",
-    "optimist": "~0.6.0",
-    "ejs": "~0.8.4",
-    "ws": "~0.4.29",
-    "winston": "~0.7.2",
+    "winston": "^3.1.0",
     "wrench": "~1.5.4",
-    "buffer-crc32": "~0.2.1",
-    "send": "~0.2.0"
+    "ws": "^6.1.2"
   }
 }