bump to 0.0.76

Author: skadefro

OpenFlowNodeRED/src/WebServer.ts

@@ -2,7 +2,7 @@ import * as path from "path";
 import * as winston from "winston";
 import * as http from "http";
 import * as https from "https";
-import * as express  from "express";
+import * as express from "express";
 import * as compression from "compression";
 import * as bodyParser from "body-parser";
 import * as cookieParser from "cookie-parser";
@@ -20,28 +20,28 @@ import { noderedcontribmiddlewareauth } from "./node-red-contrib-middleware-auth
 
 export class WebServer {
     private static _logger: winston.Logger;
-    private static app:express.Express = null;
+    private static app: express.Express = null;
 
-    private static settings:nodered_settings = null;
-    static async configure(logger: winston.Logger, socket:WebSocketClient): Promise<http.Server> {
+    private static settings: nodered_settings = null;
+    static async configure(logger: winston.Logger, socket: WebSocketClient): Promise<http.Server> {
         this._logger = logger;
 
-        var options:any = null;
-        var RED:nodered.Red = nodered;
+        var options: any = null;
+        var RED: nodered.Red = nodered;
 
-        if(this.app!== null) { return; }
+        if (this.app !== null) { return; }
 
         try {
-            if(this.app=== null) {
+            if (this.app === null) {
                 this.app = express();
                 this.app.use(compression());
-                this.app.use(bodyParser.urlencoded({limit: '10mb', extended: true}))
-                this.app.use(bodyParser.json({limit: '10mb'}))
+                this.app.use(bodyParser.urlencoded({ limit: '10mb', extended: true }))
+                this.app.use(bodyParser.json({ limit: '10mb' }))
                 this.app.use(cookieParser());
                 this.app.use("/", express.static(path.join(__dirname, "/public")));
-                var server:http.Server = null;
+                var server: http.Server = null;
                 if (Config.tls_crt != '' && Config.tls_key != '') {
-                    var options:any = {
+                    var options: any = {
                         cert: Config.tls_crt,
                         key: Config.tls_key
                     };
@@ -51,18 +51,17 @@ export class WebServer {
                             key: Buffer.from(Config.tls_key, 'base64').toString('ascii')
                         };
                     }
-                    var ca:string = Config.tls_ca;
-                    if (ca!== "") {
-                        if(ca.indexOf("---") === -1) {
+                    var ca: string = Config.tls_ca;
+                    if (ca !== "") {
+                        if (ca.indexOf("---") === -1) {
                             ca = Buffer.from(ca, 'base64').toString('ascii');
                         }
-                        if(ca.indexOf("---") > -1) {
-                            console.log(ca);
+                        if (ca.indexOf("---") > -1) {
                             options.ca = ca;
                         }
                         // options.cert += "\n" + ca;
                     }
-                    if(Config.tls_passphrase!=="") {
+                    if (Config.tls_passphrase !== "") {
                         options.passphrase = Config.tls_passphrase;
                     }
                     server = https.createServer(options, this.app);
@@ -74,70 +73,70 @@ export class WebServer {
                     console.error(error);
                     process.exit(404);
                 });
-    
+
                 this.settings = new nodered_settings();
                 this.settings.userDir = path.join(__dirname, "./nodered");
                 this.settings.nodesDir = path.join(__dirname, "./nodered");
-    
+
 
                 // this.settings.adminAuth = new googleauth.noderedcontribauthgoogle(Config.baseurl(), Config.consumer_key, Config.consumer_secret, 
                 // (profile:string | any, done:any)=> {
                 //     profile.permissions = "*";
                 //     done(profile);
                 // });
-                this.settings.adminAuth = await samlauth.noderedcontribauthsaml.configure(Config.baseurl(), Config.saml_federation_metadata, Config.saml_issuer, 
-                (profile:string | any, done:any)=> {
-                    // profile.permissions = "*";
-                    done(profile);
-                }, "");
+                this.settings.adminAuth = await samlauth.noderedcontribauthsaml.configure(Config.baseurl(), Config.saml_federation_metadata, Config.saml_issuer,
+                    (profile: string | any, done: any) => {
+                        // profile.permissions = "*";
+                        done(profile);
+                    }, "");
                 // this.settings.adminAuth = await noderedcontribauthsaml.configure(this._logger, Config.baseurl());clear
 
                 // settings.adminAuth = new noderedcontribauthopenid(this._logger, Config.baseurl());
 
-                this.settings.httpNodeMiddleware = (req:express.Request,res:express.Response,next:express.NextFunction) => {
-                     noderedcontribmiddlewareauth.process(socket, req, res, next);
+                this.settings.httpNodeMiddleware = (req: express.Request, res: express.Response, next: express.NextFunction) => {
+                    noderedcontribmiddlewareauth.process(socket, req, res, next);
                 };
 
                 this.settings.storageModule = new noderedcontribopenflowstorage(logger, socket);
-    
+
                 // initialise the runtime with a server and settings
-                await (RED as any).init(server,this.settings);
-    
+                await (RED as any).init(server, this.settings);
+
                 // serve the editor UI from /red
-                this.app.use(this.settings.httpAdminRoot,RED.httpAdmin);
-    
+                this.app.use(this.settings.httpAdminRoot, RED.httpAdmin);
+
                 // serve the http nodes UI from /api
-                this.app.use(this.settings.httpNodeRoot,RED.httpNode);
+                this.app.use(this.settings.httpNodeRoot, RED.httpNode);
 
                 server.listen(Config.port);
             } else {
                 await RED.stop();
                 // initialise the runtime with a server and settings
-                await (RED as any).init(server,this.settings);
-    
+                await (RED as any).init(server, this.settings);
+
                 // serve the editor UI from /red
-                this.app.use(this.settings.httpAdminRoot,RED.httpAdmin);
-    
+                this.app.use(this.settings.httpAdminRoot, RED.httpAdmin);
+
                 // serve the http nodes UI from /api
-                this.app.use(this.settings.httpNodeRoot,RED.httpNode);
+                this.app.use(this.settings.httpNodeRoot, RED.httpNode);
             }
 
-            var hasErrors:boolean = true; var errorCounter:number = 0;
-            var err:any;
-            while(hasErrors) {
+            var hasErrors: boolean = true; var errorCounter: number = 0;
+            var err: any;
+            while (hasErrors) {
                 try {
                     RED.start();
                     hasErrors = false;
                 } catch (error) {
-                    err=error;
+                    err = error;
                     errorCounter++;
                     hasErrors = true;
                     console.error(error);
                 }
-                if(errorCounter==10) {
-                    throw err; 
-                } else if(hasErrors) {
-                    var wait = ms => new Promise((r, j)=>setTimeout(r, ms));
+                if (errorCounter == 10) {
+                    throw err;
+                } else if (hasErrors) {
+                    var wait = ms => new Promise((r, j) => setTimeout(r, ms));
                     await wait(2000);
                 }
             }

VERSION

@@ -1 +1 @@
-0.0.75
+0.0.76