Child process termination alert, references #93

Author: nikitaeverywhere

package.json

@@ -5,7 +5,7 @@
   "printableName": "Cache Web Terminal",
   "description": "Web-based terminal emulator for Caché administering.",
   "author": "ZitRo",
-  "version": "4.2.6",
+  "version": "4.2.7",
   "gaID": "UA-83005064-2",
   "releaseNumber": 26,
   "scripts": {

src/client/js/localization/dictionary.js

@@ -356,5 +356,9 @@ export default {
     "unNS": {
         en: "Unable to change namespace to %s.",
         ru: "Не получается поменять область на %s."
+    },
+    "cpTerm": {
+        en: "Terminal process was terminated.",
+        ru: "Процесс терминала был завершён."
     }
 };

src/cls/WebTerminal/Common.cls

@@ -33,14 +33,23 @@ ClassMethod ReceiveChunk(timeout As %Numeric = -1) As %String
 {
     set flag = ""
     set str = ""
+    set status = -1
     for {
         set message = $system.Event.WaitMsg("", $Case(timeout = -1, 1: 1, :timeout))
+        set status = $LISTGET(message, 1)
         set data = $LISTGET(message, 2)
+        if (status <= 0) {
+            if ($ZPARENT '= 0) && ('$data(^$Job($ZPARENT))) {
+                do $system.Process.Terminate($JOB, 0)
+                return $LISTBUILD(flag, str, -1)
+            }
+            if ($ZCHILD '= 0) && ('$data(^$Job($ZCHILD))) {
+                return $LISTBUILD(flag, str, -1)
+            }
+        }
         if (data = "") && (timeout = 0) quit
-        set status = $LISTGET(message, 1)
         if (status <= 0) {
-            do:'$data(^$Job($ZPARENT)) $system.Process.Terminate($JOB, 0)
-            if (timeout = 0) set timeout = 1
+            set:(timeout = 0) timeout = 1
             continue
         }
         set flag = $LISTGET(data, 1)
@@ -49,7 +58,7 @@ ClassMethod ReceiveChunk(timeout As %Numeric = -1) As %String
         if (timeout = 0) set timeout = 1
         quit:($LENGTH(m) '= ..#ChunkSize)
     }
-    return $LISTBUILD(flag, str)
+    return $LISTBUILD(flag, str, status)
 }
 
 /// Returns the contents of the proxy object to the current device in JSON format.<br/>

src/cls/WebTerminal/Engine.cls

@@ -189,7 +189,7 @@ Method ClientLoop() As %Status [ Private ]
         set ..echo = 1
         if (status '= "") && (status '= $$$OK) {
             set eType = $EXTRACT(status, 1, 1)
-            do ..Send("execError", $case(eType = 0, 1: $System.Status.GetErrorText(status), :status))
+            do ..Send("oLocalized", $C(13,10) _ $case(eType = 0, 1: $System.Status.GetErrorText(status), :status))
             continue
         }
     }

src/cls/WebTerminal/Handlers.cls

@@ -27,6 +27,9 @@ ClassMethod Execute (client As WebTerminal.Engine, data, bareStart As %Boolean =
 loop
     for {
         set message = client.ReceiveChunk(0) // we need to read from WebSocket as well: timeout = 0
+        if ($LISTGET(message, 3) < 0) {
+            return $$$ERROR($$$GeneralError, "%cpTerm")
+        }
         set flag = $LISTGET(message, 1)
         if (flag = "") { // if there is no messages from the child process executing the task,
             set mes = client.GetMessage(0) // look at the incoming WebSocket messages