pinokiod 7.5.23 → 7.5.24

package/kernel/api/index.js

@@ -575,20 +575,32 @@ class Api {
     // 1. if the scropt has 'on.stop', run it when stopping
     let requestPath = this.filePath(req.params.uri)
     this.clearResolvedAction(requestPath)
-    let { cwd, script } = await this.resolveScript(requestPath)
-    if (script.on) {
+    let cwd
+    let script
+    try {
+      const resolved = await this.resolveScript(requestPath)
+      cwd = resolved.cwd
+      script = resolved.script
+    } catch (e) {
+      if (!e || e.code !== "ENOENT") {
+        throw e
+      }
+    }
+    if (script && script.on) {
       if (script.on.stop) {
         await this.process(script.on.stop) 
       }
     }
     // reset modules
-    let modpath = this.resolvePath(cwd, req.params.uri)
-    if (this.child_procs[modpath]) {
-      let child_procs = Array.from(this.child_procs[modpath])
-      for(let proc of child_procs) {
-        delete this.mods[proc]
+    if (cwd) {
+      let modpath = this.resolvePath(cwd, req.params.uri)
+      if (this.child_procs[modpath]) {
+        let child_procs = Array.from(this.child_procs[modpath])
+        for(let proc of child_procs) {
+          delete this.mods[proc]
+        }
+        delete this.child_procs[modpath]
       }
-      delete this.child_procs[modpath]
     }
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "7.5.23",
+  "version": "7.5.24",
   "description": "",
   "main": "index.js",
   "scripts": {

package/test/launch-requirements.test.js

@@ -1153,6 +1153,33 @@ test("api.stop stops the canonical script path when the visible run id is decora
   })
 })
 
+test("api.stop disconnects when the script was deleted before stop cleanup", async () => {
+  await withApiStopFixture(async ({ api, launchPath, killedGroups, stopped, packets }) => {
+    const decoratedId = `${launchPath}?cwd=undefined`
+    api.resolveScript = async () => {
+      const error = new Error("missing script")
+      error.code = "ENOENT"
+      throw error
+    }
+    api.running[launchPath] = true
+    api.running[decoratedId] = true
+    api.kernel.memory.local[launchPath] = { live: true }
+    api.kernel.memory.local[decoratedId] = { live: true }
+
+    await api.stop({ params: { id: decoratedId } })
+
+    assert.equal(api.running[launchPath], undefined)
+    assert.equal(api.running[decoratedId], undefined)
+    assert.equal(api.kernel.memory.local[launchPath], undefined)
+    assert.equal(api.kernel.memory.local[decoratedId], undefined)
+    assert.ok(killedGroups.includes(launchPath), "canonical script group must be killed")
+    assert.ok(killedGroups.includes(decoratedId), "visible run id group must remain stopped")
+    assert.equal(stopped.length, 1)
+    assert.equal(stopped[0].scriptPath, launchPath)
+    assert.ok(packets.some((packet) => packet.type === "disconnect" && packet.id === decoratedId))
+  })
+})
+
 test("startup launch request does not block on its own startup status row", async () => {
   await withFixtureApps({
     target: {}