pinokiod 7.5.23 → 7.5.25

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/kernel/procs.js

@@ -73,13 +73,15 @@ class Procs {
     let pids = new Set()
     let s = stdout.trim()
     const lines = s.split('\n');
+    const listeningForeignAddresses = new Set(['0.0.0.0:0', '[::]:0', '*:*', '*:0'])
     for(let line of lines) {
       if (isWin) {
         // Skip headers
         try {
           if (!line.startsWith('  TCP')) continue;
           const parts = line.trim().split(/\s+/);
-          const [ , localAddress, , state, pid ] = parts;
+          const [ , localAddress, foreignAddress ] = parts;
+          const pid = parts[parts.length - 1]
 
           let pid_int = parseInt(pid)
           if (pid_int === 0 || pid_int === 4) {
@@ -88,7 +90,7 @@ class Procs {
             continue
           }
 
-          if (state !== 'LISTENING') continue;
+          if (!listeningForeignAddresses.has(foreignAddress)) continue;
           const chunks = /(.+):([0-9]+)/.exec(localAddress)
           let host = chunks[1]
           let port = chunks[2]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "7.5.23",
+  "version": "7.5.25",
   "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: {}

package/test/procs.test.js

@@ -16,7 +16,7 @@ function loadProcsForPlatform(platform) {
   }
 }
 
-test("Windows process parser only probes listening TCP rows", async () => {
+test("Windows process parser only probes listening TCP rows without relying on localized state text", async () => {
   const Procs = loadProcsForPlatform("win32")
   const procs = new Procs({})
   const probed = []
@@ -28,8 +28,8 @@ test("Windows process parser only probes listening TCP rows", async () => {
 
   const stdout = [
     "  Proto  Local Address          Foreign Address        State           PID",
-    "  TCP    127.0.0.1:5173         0.0.0.0:0              LISTENING       1111",
-    "  TCP    127.0.0.1:49153        127.0.0.1:5173         ESTABLISHED     2222",
+    "  TCP    127.0.0.1:5173         0.0.0.0:0              ABHOEREN        1111",
+    "  TCP    127.0.0.1:49153        127.0.0.1:5173         HERGESTELLT     2222",
     "  TCP    0.0.0.0:7860           0.0.0.0:0              LISTENING       3333",
     "  TCP    [::1]:11434            [::]:0                 LISTENING       4444"
   ].join("\n")