prepare for more dynamic nodered launching

Author: skadefro

OpenFlowNodeRED/src/Config.ts

@@ -31,7 +31,9 @@ export class Config {
 
     public static baseurl(): string {
         var matches = Config.nodered_id.match(/\d+/);
-        Config.nodered_id = matches[matches.length - 1]; // Just grab the last number
+        if (matches.length > 0) {
+            Config.nodered_id = matches[matches.length - 1]; // Just grab the last number
+        }
         if (Config.nodered_domain_schema != "") {
             Config.domain = Config.nodered_domain_schema.replace("$nodered_id$", Config.nodered_id)
         }

OpenFlowNodeRED/src/index.ts

@@ -32,14 +32,21 @@ process.on('unhandledRejection', up => {
     console.error(up);
     throw up
 });
-
+function isNumeric(n) {
+    return !isNaN(parseFloat(n)) && isFinite(n);
+}
 (async function (): Promise<void> {
     try {
         var socket: WebSocketClient = new WebSocketClient(logger, Config.api_ws_url);
         socket.events.on("onopen", async () => {
 
             var q: SigninMessage = new SigninMessage();
-            var user = new TokenUser(); user.name = "nodered" + Config.nodered_id; user.username = user.name;
+            var user = new TokenUser();
+            user.name = "nodered" + Config.nodered_id;
+            if (!isNumeric(Config.nodered_id)) {
+                user.name = Config.nodered_id;
+            }
+            user.username = user.name;
             q.jwt = Crypt.createToken(user);
             var msg: Message = new Message(); msg.command = "signin"; msg.data = JSON.stringify(q);
             var result: SigninMessage = await socket.Send<SigninMessage>(msg);

VERSION

@@ -1 +1 @@
-0.0.170
+0.0.171