update dependencies and fix logging

Author: clouless

package.json

@@ -1,7 +1,7 @@
 {
   "name": "kartoffelstampf-server",
   "description": "stampf it!",
-  "version": "2.1.2",
+  "version": "2.2.0",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -21,15 +21,15 @@
     "cookie-parser": "~1.4.3",
     "cors": "^2.8.5",
     "debug": "~2.6.0",
-    "express": "~4.14.1",
+    "express": "~4.16.4",
     "file-type": "^4.1.0",
-    "morgan": "~1.7.0",
-    "multer": "^1.3.0",
+    "morgan": "~1.9.1",
+    "multer": "^1.4.1",
     "read-chunk": "^2.0.0",
     "serve-favicon": "~2.3.2",
     "ts-node": "^7.0.1",
-    "winston": "^2.3.1",
-    "ws": "^2.2.0"
+    "winston": "^3.1.0",
+    "ws": "^6.1.2"
   },
   "devDependencies": {
     "@types/chai": "^4.1.7",
@@ -41,7 +41,6 @@
     "@types/method-override": "0.0.29",
     "@types/morgan": "^1.7.32",
     "@types/serve-favicon": "^2.2.28",
-    "@types/winston": "^2.2.0",
     "@types/ws": "0.0.39",
     "chai": "^4.2.0",
     "mocha": "^5.2.0",

src/express.app.ts

@@ -7,7 +7,7 @@ import * as bodyParser from 'body-parser';
 import * as cookieParser from 'cookie-parser';
 import * as cors from 'cors';
 import * as express from 'express';
-import * as logger from 'morgan';
+import * as morgan from 'morgan';
 import * as path from 'path';
 import * as favicon from 'serve-favicon';
 
@@ -26,7 +26,7 @@ export class Server {
     // INIT
     this.app.use(cors());
     this.app.use(favicon(path.join(__dirname, '../public', 'favicon.ico')));
-    this.app.use(logger('dev'));
+    this.app.use(morgan('dev'));
     this.app.use(bodyParser.json({limit: '200mb'}));
     this.app.use(bodyParser.urlencoded({ extended: false}));
     this.app.use(cookieParser());

src/express.server.ts

@@ -8,6 +8,7 @@
 import * as http from 'http';
 import { IExpressError } from './error/IExpressError';
 import { Server } from './express.app';
+import { logger } from './services/LogService';
 import { WebSocketCommandService } from './services/WebSocketCommandService';
 
 const onError = (error: IExpressError) => {
@@ -18,11 +19,11 @@ const onError = (error: IExpressError) => {
 
   switch (error.code) {
     case 'EACCES':
-      console.error(bind + ' requires elevated privileges');
+      logger.log('error', bind + ' requires elevated privileges');
       process.exit(1);
       break;
     case 'EADDRINUSE':
-      console.error(bind + ' is already in use');
+      logger.log('error', ' is already in use');
       process.exit(1);
       break;
     default:

src/services/LogService.ts

@@ -0,0 +1,9 @@
+import * as winston from 'winston';
+
+export const logger = winston.createLogger({
+  level: 'info',
+  format: winston.format.json(),
+  transports: [
+    new winston.transports.Console({ format: winston.format.simple() }),
+  ],
+});

src/services/UploadFileHelper.ts

@@ -6,6 +6,7 @@
 import * as crypto from 'crypto';
 import * as fs from 'fs';
 import { IntermediateImage } from '../data/IntermediateImage';
+import { logger } from './LogService';
 
 export class UploadFileHelper {
 
@@ -58,9 +59,9 @@ export class UploadFileHelper {
       setTimeout(() => {
         try {
           fs.unlinkSync(this.TEMPORARY_FILE_PATH + fileName);
-          console.log('deleted uploaded file: ', fileName);
+          logger.log('info', 'deleted uploaded file: ', fileName);
         } catch (error) {
-          console.log('failed to uploaded file: ', fileName);
+          logger.log('info', 'failed to uploaded file: ', fileName);
         }
       }, 3600000); // 1h
       // -

src/services/WebSocketCommandService.ts

@@ -6,12 +6,12 @@
 import { spawn } from 'child_process';
 import { Server } from 'http';
 import * as url from 'url';
-import * as winston from 'winston';
 import * as WebSocket from 'ws';
 import { IServerOptions, Server as WsServer } from 'ws';
 import { CommandInstruction } from '../data/CommandInstruction';
 import { CompressInstruction } from '../data/CompressInstruction';
 import { UploadFileHelper } from './UploadFileHelper';
+import { logger } from './LogService';
 
 export class WebSocketCommandService {
 
@@ -45,15 +45,15 @@ export class WebSocketCommandService {
       server: httpServer,
     };
     this.wss = new WsServer(options);
+    logger.log('info', 'init logging');
     this.init();
   }
 
   private init() {
     const self = this;
     self.wss.on('connection', (ws: WebSocket) => {
-      const location = url.parse(ws.upgradeReq.url, true);
       ws.on('message', (message) => {
-        winston.log('debug', 'received command instruction', message);
+        logger.log('debug', 'received command instruction', message);
         // Interpret which command to execute => Prevent XSS Injects!
         const compressInstruction = JSON.parse(message) as CompressInstruction;
         const commandInstruction = this.compressCommandInstruction(compressInstruction);
@@ -82,7 +82,7 @@ export class WebSocketCommandService {
           type: 'stderr',
         }));
       } catch (error) {
-        winston.log('debug', 'failed to send ws', error);
+        logger.log('error', 'failed to send ws', error);
       }
     });
     cmd.stdout.on('data', (data: any) => {
@@ -94,7 +94,7 @@ export class WebSocketCommandService {
           type: 'stdout',
         }));
       } catch (error) {
-        winston.log('debug', 'failed to send ws', error);
+        logger.log('error', 'failed to send ws', error);
       }
     });
     cmd.stderr.on('data', (data: any) => {
@@ -106,7 +106,7 @@ export class WebSocketCommandService {
           type: 'stderr',
         }));
       } catch (error) {
-        winston.log('debug', 'failed to send ws', error);
+        logger.log('error', 'failed to send ws', error);
       }
     });
     cmd.on('exit', (code: Number) => {
@@ -122,7 +122,7 @@ export class WebSocketCommandService {
         // close after command is done
         ws.close();
       } catch (error) {
-        winston.log('debug', 'failed to send ws', error);
+        logger.log('error', 'failed to send ws', error);
       }
     });
   }