removed idleTimeout, better error reporting

marcj · Oct 10, 2019 · 3f82b5e · 3f82b5e
1 parent 82cf46c
commit 3f82b5e
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 17 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,6 @@ node_js:
 
 services:
 - mongodb
-- redis-server
 
 sudo: false
 

diff --git a/packages/server/package.json b/packages/server/package.json
@@ -23,7 +23,8 @@
     "mongodb": "^3.3.2",
     "reflect-metadata": "^0.1.12",
     "rxjs": "~6.5.3",
-    "typeorm": "^0.2.18"
+    "typeorm": "^0.2.18",
+    "uWebSockets.js": "github:uNetworking/uWebSockets.js#v16.0.0"
   },
   "dependencies": {
     "@marcj/estdlib": "^0.1.11",
@@ -36,7 +37,6 @@
     "redis": "^2.8.0",
     "redlock": "^3.1.2",
     "sift": "^7.0.1",
-    "uWebSockets.js": "github:uNetworking/uWebSockets.js#v16.0.0",
     "ws": "^6.1.2"
   },
   "devDependencies": {
@@ -57,6 +57,7 @@
     "reflect-metadata": "^0.1.12",
     "rxjs": "~6.5.3",
     "source-map": "^0.7.3",
+    "uWebSockets.js": "github:uNetworking/uWebSockets.js#v16.0.0",
     "source-map-support": "^0.5.9",
     "typeorm": "^0.2.18"
   },

diff --git a/packages/server/src/application-server.ts b/packages/server/src/application-server.ts
@@ -38,9 +38,7 @@ export class ApplicationServerConfig {
      */
     mongoSynchronize: boolean = false;
 
-    redisHost: string = 'localhost';
-
-    redisPort: number = 6379;
+    exchangePort: number = 8561;
 
     redisPrefix: string = 'glut';
 
@@ -149,9 +147,7 @@ export class ApplicationServer {
             {provide: Application, useClass: this.application},
             {provide: ApplicationServerConfig, useValue: this.config},
             {provide: 'fs.path', useValue: this.config.fsPath},
-            {provide: 'redis.host', useValue: this.config.redisHost},
-            {provide: 'redis.port', useValue: this.config.redisPort},
-            {provide: 'redis.prefix', useValue: this.config.redisPrefix},
+            {provide: 'exchange.port', useValue: this.config.exchangePort},
             {provide: 'mongo.dbName', useValue: this.config.mongoDbName},
             {provide: 'mongo.host', useValue: this.config.mongoHost + ':' + this.config.mongoPort},
             {
@@ -162,13 +158,13 @@ export class ApplicationServer {
             {provide: Connection, useValue: this.connection},
             {
                 provide: Exchange,
-                deps: [],
-                useFactory: () => new Exchange()
+                deps: ['exchange.port'],
+                useFactory: (port: number) => new Exchange(port)
             },
             {
                 provide: ExchangeServer,
-                deps: [],
-                useFactory: () => new ExchangeServer()
+                deps: ['exchange.port'],
+                useFactory: (port: number) => new ExchangeServer('127.0.0.1', port)
             },
             {
                 provide: Database, deps: [Connection, 'mongo.dbName'], useFactory: (connection: Connection, dbName: string) => {

diff --git a/packages/server/src/exchange-server.ts b/packages/server/src/exchange-server.ts
@@ -31,7 +31,7 @@ export class ExchangeServer {
             /* Options */
             compression: 0,
             maxPayloadLength: 50 * 1024 * 1024, //50mb
-            idleTimeout: 10,
+            idleTimeout: 0,
             /* Handlers */
             open: (ws, req) => {
                 console.log('new exchange client');

diff --git a/packages/server/src/exchange.ts b/packages/server/src/exchange.ts
@@ -69,9 +69,9 @@ export class Exchange {
         return new Promise<void>((resolve, reject) => {
             this.socket = new WebSocket('ws://' + this.host + ':' + this.port);
 
-            this.socket.onerror = () => {
+            this.socket.onerror = (error: any) => {
                 this.socket = undefined;
-                reject(new Error('Error websocket'));
+                reject(new Error(`Could not connect to ${this.host + ':' + this.port}. Reason: ${error.message || error}`));
             };
 
             this.socket.onclose = () => {

diff --git a/packages/server/src/worker.ts b/packages/server/src/worker.ts
@@ -34,7 +34,7 @@ export class Worker {
                 /* Options */
                 compression: 0,
                 maxPayloadLength: 2 * 100 * 1024 * 1024, //200mb
-                idleTimeout: 10,
+                idleTimeout: 0,
                 /* Handlers */
                 open: (ws, req) => {
                     const ip = Buffer.from(ws.getRemoteAddress());