UPDATE: block UJSONRPC processing

tuftsceeo · Dec 10, 2020 · ee1261d · ee1261d
1 parent a58250e
commit ee1261d
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/server/examples/modules/ServiceDock_SPIKE.js b/server/examples/modules/ServiceDock_SPIKE.js
@@ -2991,7 +2991,7 @@ function Service_SPIKE() {
                         if ( i < conjoinedPacketsArray.length -1 ) {
                             lastUJSONRPC = conjoinedPacketsArray[i];
 
-                            processFullUJSONRPC(lastUJSONRPC, json_string, testing, callback);
+                            await processFullUJSONRPC(lastUJSONRPC, json_string, testing, callback);
                         }
                         else {
                             jsonline = conjoinedPacketsArray[i];
@@ -3002,18 +3002,18 @@ function Service_SPIKE() {
                 else {
                     lastUJSONRPC = jsonline.substring(0, carriageReIndex);
 
-                    processFullUJSONRPC(lastUJSONRPC, json_string, testing, callback);
+                    await processFullUJSONRPC(lastUJSONRPC, json_string, testing, callback);
 
                     jsonline = jsonline.substring(carriageReIndex + 2, jsonline.length);
                 }
 
             }
             else {
-                // console.log("%cTuftsCEEO ", "color: #3ba336;", "jsonline needs reset: ", jsonline);
+                console.log("%cTuftsCEEO ", "color: #3ba336;", "jsonline needs reset: ", jsonline);
 
                 jsonline = jsonline.substring(carriageReIndex + 2, jsonline.length);
 
-                // console.log("%cTuftsCEEO ", "color: #3ba336;", "jsonline was reset to:" + jsonline);
+                console.log("%cTuftsCEEO ", "color: #3ba336;", "jsonline was reset to:" + jsonline);
 
                 // reset jsonline for next concatenation
                 // jsonline = "";
@@ -3064,7 +3064,7 @@ function Service_SPIKE() {
 
                         //concatenate UJSONRPC packets into complete JSON objects
                         if (value) {
-                            parsePacket(value);
+                            await parsePacket(value);
                         }
                         if (done) {
                             serviceActive = false;
@@ -3604,7 +3604,7 @@ function Service_SPIKE() {
             // check if the program should write packages for a program
             if (writePackageInformation != undefined) {
 
-                console.log("%cTuftsCEEO ", "color: #3ba336;", "writePackageInformation is defined. Looking for matching mesasage id...")
+                console.log("%cTuftsCEEO ", "color: #3ba336;", "writePackageInformation is defined. Looking for matching mesasage id: ", writePackageInformation[0]);
 
                 // check if the message id of UJSONRPC corresponds to that of the first write_package script that was sent
                 if (writePackageInformation[0] == parsedUJSON["i"]) {