rb-homer 1.7.3 → 1.7.4

package/index.js

@@ -62,20 +62,21 @@ else if (validCommand(commands.first, "listen", "l") || validCommand(commands.fi
         if (validCommand(commands.first, "serve", "serve")) {
             console.log("live reload started");
 
-            var server = require('websocket').server;
-            var http = require('http');
-            var socket = new server({
-                httpServer: http.createServer().listen(31415).on('error', function (err) { console.log("Port 31415 is busy, defaulting to rb listen. Maybe you are running rb serve in another instance?"); })
-            });
-            var connection = {};
+            const WebSocket = require('ws');
+            const wss = new WebSocket.Server({ port: 31415 })
+                .on('error', function (err) { 
+                    console.log("Port 31415 is busy, defaulting to rb listen. Maybe you are running rb serve in another instance?"); 
+                });
+
+            let activeConnection = null;
 
-            socket.on('request', function (request) {
-                connection = request.accept(null, request.origin);
+            wss.on('connection', function(ws) {
+                activeConnection = ws;
             });
 
             global.sendUTF = function () {
-                if (connection.connected) {
-                    connection.sendUTF("reload");
+                if (activeConnection && activeConnection.readyState === WebSocket.OPEN) {
+                    activeConnection.send("reload");
                 }
             }
         }
@@ -291,51 +292,47 @@ else if (validCommand(commands.first, "app", "a") && commands.second) {
         });
 
     function createApp(rbConfigMod) {
-        var q = require("q");
-        var deferred = q.defer();
-        console.log(rbConfigMod);
-
-        fetch("https://api.rambase.net/system/applications/api-operations/100385/instances?$access_token=" + rbConfigMod.access_token,
-        {
-            method: "POST",
-            headers: {
-                "Content-Type": "application/json"
-            },
-            body: JSON.stringify({ parameters: { lookupKey: componentName, description: componentName, namespace:'', contentType: 'component/html5' } })
-        })
-        .then(response => { 
-            if (response.status !== 200) {
-                deferred.reject();    
-                return;               
-            }
-            return response.json();            
-        })
-        .then(body => { 
-            if (body && body.operationInstance && body.operationInstance.objectReference && body.operationInstance.objectReference.objectId) {
-                deferred.resolve({ appNo: body.operationInstance.objectReference.objectId, rbConfigMod: rbConfigMod });
-            }
-            else if (body && body.operationInstance && body.operationInstance.systemJob && body.operationInstance.systemJob.objectId > 0) {      
-                console.log("polling...");
-                pollForStatus(body.operationInstance.operationInstanceLink, deferred);
-            }
-            else {
-                console.log(body.message);
-                console.log("Error creating component.");
-                if (body && body.operationInstance.error) {
-                    console.log(body.operationInstance.error.message);
-                    console.log(body.operationInstance.error.stackTrace);
+        return new Promise((resolve, reject) => {
+            console.log(rbConfigMod);
+
+            fetch("https://api.rambase.net/system/applications/api-operations/100385/instances?$access_token=" + rbConfigMod.access_token,
+            {
+                method: "POST",
+                headers: {
+                    "Content-Type": "application/json"
+                },
+                body: JSON.stringify({ parameters: { lookupKey: componentName, description: componentName, namespace:'', contentType: 'component/html5' } })
+            })
+            .then(response => { 
+                if (response.status !== 200) {
+                    reject();    
+                    return;               
                 }
-                deferred.reject();
-            }
-        })
-        .catch(error => {
-            console.error('Error:', error);
-            deferred.reject();
+                return response.json();            
+            })
+            .then(body => { 
+                if (body && body.operationInstance && body.operationInstance.objectReference && body.operationInstance.objectReference.objectId) {
+                    resolve({ appNo: body.operationInstance.objectReference.objectId, rbConfigMod: rbConfigMod });
+                }
+                else if (body && body.operationInstance && body.operationInstance.systemJob && body.operationInstance.systemJob.objectId > 0) {      
+                    console.log("polling...");
+                    pollForStatus(body.operationInstance.operationInstanceLink, resolve, reject);
+                }
+                else {
+                    console.log(body.message);
+                    console.log("Error creating component.");
+                    if (body && body.operationInstance.error) {
+                        console.log(body.operationInstance.error.message);
+                        console.log(body.operationInstance.error.stackTrace);
+                    }
+                    reject();
+                }
+            })
+            .catch(error => {
+                console.error('Error:', error);
+                reject();
+            });
         });
-
- 
-
-        return deferred.promise;
     }
 }
 else if (validCommand(commands.first, "app", "a") && !commands.second) {
@@ -403,7 +400,7 @@ else if (validCommand(commands.first, "run", "run") && !commands.second) {
             rambaseUrl = "https://www.rambase.net/Default.aspx?target=" + rbConfig.ramBaseName + "&debug=true#/" + compInfo.appName + "/";
         }        
         
-        const opn = require('opn');
+        const opn = require('open');
         opn(rambaseUrl).catch(() => {    
             opn(rambaseUrl);
         });    
@@ -415,7 +412,7 @@ else if (validCommand(commands.first, "run", "run") && commands.second) {
         rambaseUrl = "https://www.rambase.net/Default.aspx?target=" + rbConfig.ramBaseName + "&debug=true#/" + commands.second + "/";
     }        
     
-    const opn = require('opn');
+    const opn = require('open');
     opn(rambaseUrl).catch(() => {    
         opn(rambaseUrl);
     });    
@@ -613,7 +610,7 @@ function getComponentNameAndNo(path) {
 
 }
 
-async function pollForStatus(link, deferred, firstTimeStamp) {
+async function pollForStatus(link, resolve, reject, firstTimeStamp) {
     if (!firstTimeStamp) {
         firstTimeStamp = Date.now();
     }
@@ -623,22 +620,22 @@ async function pollForStatus(link, deferred, firstTimeStamp) {
 
         if (!data || !data.operationInstance || data.operationInstance.error) {
             console.log(data.operationInstance.error.message, 'Operation Failed');            
-            deferred.reject(data);            
+            reject(data);            
         } 
         else {
             const pollStatus = data.operationInstance.status;
             if (!pollStatus || (pollStatus !== 7 && pollStatus !== 9)) {
                 if ((Date.now() - firstTimeStamp) / 1000 < 120) { //Poll for 2 min
                     // Not finished, poll again
-                    setTimeout(() => pollForStatus(link, deferred), 2000);
+                    setTimeout(() => pollForStatus(link, resolve, reject, firstTimeStamp), 2000);
                 }
                 else {
-                    deferred.reject();
+                    reject();
                 }
             } 
             else if (pollStatus === 9) {
                 // Finished
-                deferred.resolve({ appNo: data.operationInstance.objectReference.objectId });
+                resolve({ appNo: data.operationInstance.objectReference.objectId });
             } 
             else {
                 console.log("Error creating component.");
@@ -646,12 +643,12 @@ async function pollForStatus(link, deferred, firstTimeStamp) {
                     console.log(data.operationInstance.error.message);
                     console.log(data.operationInstance.error.stackTrace);
                 }
-                deferred.reject();
+                reject();
             }
         }
     } catch (error) {
         console.log(error.message);        
-        deferred.reject(error);        
+        reject(error);        
     }
 }