dsh-clean-desktop-shell 0.1.11 → 0.1.13

package/package.json

@@ -1,127 +1,140 @@
-{
-  "name": "dsh-clean-desktop-shell",
-  "version": "0.1.11",
-  "description": "Clean desktop shell for DeepSeek Harness (DSH) as a DSH plugin — wraps your web profile in a native window, tray-managed backend, offline auto-reconnect, zero visual changes. DSH 插件形态的纯净桌面壳：复用现有 web profile，托盘管理后端，零视觉改造。",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/Icather/dsh-clean-desktop-shell.git"
-  },
-  "homepage": "https://github.com/Icather/dsh-clean-desktop-shell#readme",
-  "bugs": {
-    "url": "https://github.com/Icather/dsh-clean-desktop-shell/issues"
-  },
-  "type": "module",
-  "main": "lib/index.js",
-  "files": [
-    "lib/",
-    "electron/",
-    "src/",
-    "scripts/",
-    "build/icon.png",
-    "build/icon.ico",
-    "cordis.patch.yml",
-    "README.md",
-    "README.en.md",
-    "CONTRIBUTORS.md",
-    "LICENSE",
-    "version.txt"
-  ],
-  "exports": {
-    ".": "./lib/index.js",
-    "./client": "./lib/client.js",
-    "./package.json": "./package.json"
-  },
-  "scripts": {
-    "build": "node scripts/build.mjs",
-    "check": "node scripts/check-syntax.mjs && node scripts/selftest-runtime.mjs",
-    "dev": "electron electron/main.js",
-    "icons": "node scripts/gen-icons.mjs",
-    "pack": "electron-builder --win nsis",
-    "pack:mac": "electron-builder --mac dmg"
-  },
-  "dsh": {
-    "bundle": {
-      "patch": "./cordis.patch.yml"
-    },
-    "client": {
-      "inject": [
-        "@deepseek-ai/dsh-client-runtime",
-        "@deepseek-ai/dsh-client-locale",
-        "@deepseek-ai/dsh-client-ui-settings",
-        "@deepseek-ai/dsh-client-ui-theme"
-      ],
-      "platform": "web"
-    }
-  },
-  "peerDependencies": {
-    "@deepseek-ai/dsh": "*"
-  },
-  "peerDependenciesMeta": {
-    "@deepseek-ai/dsh": {
-      "optional": true
-    }
-  },
-  "devDependencies": {
-    "electron": "^33.0.0",
-    "electron-builder": "^25.0.0",
-    "png-to-ico": "^3.0.2",
-    "sharp": "^0.35.3"
-  },
-  "build": {
-    "appId": "com.icather.dsh-clean-desktop-shell",
-    "productName": "DSH Clean Desktop Shell",
-    "asar": true,
-    "files": [
-      "electron/**/*",
-      "lib/**/*",
-      "src/**/*",
-      "build/icon.png",
-      "package.json",
-      "cordis.patch.yml"
-    ],
-    "extraMetadata": {
-      "main": "electron/main.js"
-    },
-    "win": {
-      "target": [
-        {
-          "target": "nsis",
-          "arch": [
-            "x64"
-          ]
-        }
-      ],
-      "icon": "build/icon.ico",
-      "signAndEditExecutable": false
-    },
-    "mac": {
-      "target": [
-        "dmg"
-      ],
-      "category": "public.app-category.developer-tools",
-      "icon": "build/icon.png"
-    },
-    "nsis": {
-      "oneClick": true,
-      "perMachine": false,
-      "createDesktopShortcut": true,
-      "createStartMenuShortcut": true
-    },
-    "publish": {
-      "provider": "github",
-      "owner": "Icather",
-      "repo": "dsh-clean-desktop-shell"
-    }
-  },
-  "license": "MIT",
-  "allowScripts": {
-    "electron@33.4.11": true
-  },
-  "dependencies": {
-    "electron-updater": "^6.8.9",
-    "semver": "^7.7.2"
-  },
-  "desktopShell": {
-    "electronVersion": "33.4.11"
-  }
-}
+{
+  "name": "dsh-clean-desktop-shell",
+  "version": "0.1.13",
+  "description": "Clean desktop shell for DeepSeek Harness (DSH) as a DSH plugin — wraps your web profile in a native window, tray-managed backend, offline auto-reconnect, zero visual changes. DSH 插件形态的纯净桌面壳：复用现有 web profile，托盘管理后端，零视觉改造。",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/Icather/dsh-clean-desktop-shell.git"
+  },
+  "homepage": "https://github.com/Icather/dsh-clean-desktop-shell#readme",
+  "bugs": {
+    "url": "https://github.com/Icather/dsh-clean-desktop-shell/issues"
+  },
+  "type": "module",
+  "main": "lib/index.js",
+  "engines": {
+    "node": ">=20.0.0"
+  },
+  "files": [
+    "lib/",
+    "electron/",
+    "src/",
+    "scripts/",
+    "build/icon.png",
+    "build/icon.ico",
+    "cordis.patch.yml",
+    "README.md",
+    "README.en.md",
+    "CONTRIBUTORS.md",
+    "LICENSE",
+    "version.txt"
+  ],
+  "exports": {
+    ".": "./lib/index.js",
+    "./client": "./lib/client.js",
+    "./package.json": "./package.json"
+  },
+  "scripts": {
+    "build": "node scripts/build.mjs",
+    "check": "node scripts/check-syntax.mjs && node scripts/selftest-runtime.mjs && node scripts/selftest-recovery.mjs",
+    "dev": "electron electron/main.js",
+    "icons": "node scripts/gen-icons.mjs",
+    "pack": "electron-builder --win nsis",
+    "pack:mac": "electron-builder --mac dmg"
+  },
+  "dsh": {
+    "bundle": {
+      "patch": "./cordis.patch.yml"
+    },
+    "compatibility": {
+      "dsh": ">=0.1.1 <0.2.0",
+      "dshReleases": {
+        "0.1.1-rc.2": "unknown",
+        "0.1.5-rc.1": "compatible",
+        "0.1.5-rc.2": "unknown",
+        "0.1.5-alpha.2": "unknown"
+      }
+    },
+    "client": {
+      "inject": [
+        "@deepseek-ai/dsh-client-connection",
+        "@deepseek-ai/dsh-client-runtime",
+        "@deepseek-ai/dsh-client-locale",
+        "@deepseek-ai/dsh-client-ui-settings",
+        "@deepseek-ai/dsh-client-ui-theme"
+      ],
+      "platform": "web"
+    }
+  },
+  "peerDependencies": {
+    "@deepseek-ai/dsh": "*"
+  },
+  "peerDependenciesMeta": {
+    "@deepseek-ai/dsh": {
+      "optional": true
+    }
+  },
+  "devDependencies": {
+    "electron": "^33.0.0",
+    "electron-builder": "^25.0.0",
+    "png-to-ico": "^3.0.2",
+    "sharp": "^0.35.3"
+  },
+  "build": {
+    "appId": "com.icather.dsh-clean-desktop-shell",
+    "productName": "DSH Clean Desktop Shell",
+    "asar": true,
+    "files": [
+      "electron/**/*",
+      "lib/**/*",
+      "src/**/*",
+      "build/icon.png",
+      "package.json",
+      "cordis.patch.yml"
+    ],
+    "extraMetadata": {
+      "main": "electron/main.js"
+    },
+    "win": {
+      "target": [
+        {
+          "target": "nsis",
+          "arch": [
+            "x64"
+          ]
+        }
+      ],
+      "icon": "build/icon.ico",
+      "signAndEditExecutable": false
+    },
+    "mac": {
+      "target": [
+        "dmg"
+      ],
+      "category": "public.app-category.developer-tools",
+      "icon": "build/icon.png"
+    },
+    "nsis": {
+      "oneClick": true,
+      "perMachine": false,
+      "createDesktopShortcut": true,
+      "createStartMenuShortcut": true
+    },
+    "publish": {
+      "provider": "github",
+      "owner": "Icather",
+      "repo": "dsh-clean-desktop-shell"
+    }
+  },
+  "license": "MIT",
+  "allowScripts": {
+    "electron@33.4.11": true
+  },
+  "dependencies": {
+    "electron-updater": "^6.8.9",
+    "semver": "^7.7.2"
+  },
+  "desktopShell": {
+    "electronVersion": "33.4.11"
+  }
+}

package/scripts/check-syntax.mjs

@@ -1,54 +1,54 @@
-/**
- * Syntax gate: `node --check` every JS file that ships in the package
- * (electron/ main-process modules + lib/ host/client bundle). Previously
- * only lib/index.js was checked — a syntax slip in any other file shipped
- * unnoticed.
- *
- * The two sandboxed preloads are CommonJS (require/module.exports) while
- * package.json declares "type": "module", so plain --check on them fails
- * spuriously; they are validated through a temporary .cjs copy instead.
- */
-import { spawnSync } from 'node:child_process'
-import { readdirSync, readFileSync, statSync, rmSync, writeFileSync, mkdtempSync } from 'node:fs'
-import { dirname, join } from 'node:path'
-import { tmpdir } from 'node:os'
-import { fileURLToPath } from 'node:url'
-
-const root = dirname(dirname(fileURLToPath(import.meta.url)))
-// CJS files relative to electron/ — parsed as CommonJS despite the ESM package.
-const CJS_FILES = new Set(['preload.js', 'progress-preload.js'])
-
-function listJs(dir) {
-  return readdirSync(join(root, dir)).filter((f) => f.endsWith('.js'))
-}
-
-const scratch = mkdtempSync(join(tmpdir(), 'dsh-shell-check-'))
-let bad = 0
-let checked = 0
-
-try {
-  for (const dir of ['electron', 'lib']) {
-    for (const f of listJs(dir)) {
-      const full = join(root, dir, f)
-      if (!statSync(full).isFile()) continue
-      const cjs = CJS_FILES.has(f)
-      const target = cjs ? join(scratch, `${dir}-${f}.cjs`) : full
-      if (cjs) writeFileSync(target, readFileSync(full))
-      const r = spawnSync(process.execPath, ['--check', target], { stdio: 'pipe' })
-      const ok = r.status === 0
-      checked++
-      if (!ok) {
-        bad++
-        console.log(`  FAIL ${dir}/${f}${cjs ? ' (checked as CJS)' : ''}`)
-        if (r.stderr) console.error(r.stderr.toString().trim())
-      } else {
-        console.log(`  ok   ${dir}/${f}${cjs ? ' (checked as CJS)' : ''}`)
-      }
-    }
-  }
-} finally {
-  rmSync(scratch, { recursive: true, force: true })
-}
-
-console.log(bad === 0 ? `PASS (${checked} files)` : `FAIL (${bad}/${checked} file(s))`)
-process.exit(bad === 0 ? 0 : 1)
+/**
+ * Syntax gate: `node --check` every JS file that ships in the package
+ * (electron/ main-process modules + lib/ host/client bundle). Previously
+ * only lib/index.js was checked — a syntax slip in any other file shipped
+ * unnoticed.
+ *
+ * The two sandboxed preloads are CommonJS (require/module.exports) while
+ * package.json declares "type": "module", so plain --check on them fails
+ * spuriously; they are validated through a temporary .cjs copy instead.
+ */
+import { spawnSync } from 'node:child_process'
+import { readdirSync, readFileSync, statSync, rmSync, writeFileSync, mkdtempSync } from 'node:fs'
+import { dirname, join } from 'node:path'
+import { tmpdir } from 'node:os'
+import { fileURLToPath } from 'node:url'
+
+const root = dirname(dirname(fileURLToPath(import.meta.url)))
+// CJS files relative to electron/ — parsed as CommonJS despite the ESM package.
+const CJS_FILES = new Set(['preload.js', 'progress-preload.js'])
+
+function listJs(dir) {
+  return readdirSync(join(root, dir)).filter((f) => f.endsWith('.js'))
+}
+
+const scratch = mkdtempSync(join(tmpdir(), 'dsh-shell-check-'))
+let bad = 0
+let checked = 0
+
+try {
+  for (const dir of ['electron', 'lib']) {
+    for (const f of listJs(dir)) {
+      const full = join(root, dir, f)
+      if (!statSync(full).isFile()) continue
+      const cjs = CJS_FILES.has(f)
+      const target = cjs ? join(scratch, `${dir}-${f}.cjs`) : full
+      if (cjs) writeFileSync(target, readFileSync(full))
+      const r = spawnSync(process.execPath, ['--check', target], { stdio: 'pipe' })
+      const ok = r.status === 0
+      checked++
+      if (!ok) {
+        bad++
+        console.log(`  FAIL ${dir}/${f}${cjs ? ' (checked as CJS)' : ''}`)
+        if (r.stderr) console.error(r.stderr.toString().trim())
+      } else {
+        console.log(`  ok   ${dir}/${f}${cjs ? ' (checked as CJS)' : ''}`)
+      }
+    }
+  }
+} finally {
+  rmSync(scratch, { recursive: true, force: true })
+}
+
+console.log(bad === 0 ? `PASS (${checked} files)` : `FAIL (${bad}/${checked} file(s))`)
+process.exit(bad === 0 ? 0 : 1)

package/scripts/selftest-recovery.mjs

@@ -0,0 +1,140 @@
+/**
+ * Self-check for the backend-outage run (electron/outage.js).
+ *
+ * Defends the phase-1 recovery transitions, not threshold constants alone:
+ *  - consecutive probe failures escalate the in-page notice from transient
+ *    to persistent/unavailable only after the agreed boundary, and a single
+ *    success resets the run (a one-off slow response can never escalate a
+ *    loaded session);
+ *  - the navigation token discards probe results that finish after the
+ *    window navigated or was disposed — a stale result (success or failure)
+ *    must never mutate the run nor produce a notice payload.
+ *
+ * Run: node scripts/selftest-recovery.mjs
+ * Electron additionally checks that a real failed spawn remains retryable.
+ */
+import { OutageRun, PERSISTENT_AFTER_FAILURES } from '../electron/outage.js'
+
+let failures = 0
+
+function check(label, cond) {
+  console.log(`  ${cond ? 'ok  ' : 'FAIL'} ${label}`)
+  if (!cond) failures++
+}
+
+function same(a, b) {
+  return JSON.stringify(a) === JSON.stringify(b)
+}
+
+console.log('[escalation: transient → persistent → recovery]')
+const run = new OutageRun()
+check('a healthy probe yields the ok payload', same(run.apply(run.checkpoint(), true), { state: 'ok' }))
+for (let i = 1; i < PERSISTENT_AFTER_FAILURES; i++) {
+  const out = run.apply(run.checkpoint(), false)
+  check(
+    `failure ${i} stays transient (failures=${run.failures})`,
+    same(out, { state: 'degraded', persistent: false }) && run.failures === i,
+  )
+}
+const escalated = run.apply(run.checkpoint(), false)
+check(
+  `failure ${PERSISTENT_AFTER_FAILURES} escalates to persistent`,
+  same(escalated, { state: 'degraded', persistent: true }) &&
+    run.failures === PERSISTENT_AFTER_FAILURES,
+)
+check(
+  'further failures stay persistent',
+  same(run.apply(run.checkpoint(), false), { state: 'degraded', persistent: true }),
+)
+const recovered = run.apply(run.checkpoint(), true)
+check('a success recovers and resets the run', same(recovered, { state: 'ok' }) && run.failures === 0)
+check(
+  'a failure after recovery is transient again',
+  same(run.apply(run.checkpoint(), false), { state: 'degraded', persistent: false }) &&
+    run.failures === 1,
+)
+
+console.log('[stale results after navigation are discarded]')
+const run2 = new OutageRun()
+const t1 = run2.checkpoint()
+const t2 = run2.checkpoint()
+check('checkpoints stay valid while no navigation happens', run2.isCurrent(t1) && run2.isCurrent(t2))
+run2.apply(t1, false)
+run2.reset() // e.g. showOffline / reload / fresh page load
+check('reset invalidates outstanding checkpoints', !run2.isCurrent(t1) && !run2.isCurrent(t2))
+check('a stale failure result is discarded (no payload)', run2.apply(t1, false) === null)
+check('a stale success result is discarded too', run2.apply(t2, true) === null)
+check('discards did not mutate the fresh run', run2.failures === 0)
+check(
+  'a fresh probe after the reset starts over at failure 1',
+  same(run2.apply(run2.checkpoint(), false), { state: 'degraded', persistent: false }) &&
+    run2.failures === 1,
+)
+
+if (process.versions.electron) {
+  const { default: assert } = await import('node:assert/strict')
+  const { mkdtempSync, writeFileSync, unlinkSync, rmdirSync } = await import('node:fs')
+  const { tmpdir } = await import('node:os')
+  const { join } = await import('node:path')
+  const service = await import('../electron/service.js')
+  const folder = mkdtempSync(join(tmpdir(), 'dsh-failed-spawn-'))
+  const command = join(folder, 'dsh')
+  const fetch = globalThis.fetch
+  // Keep the probe isolated from any real backend; process spawning stays real.
+  globalThis.fetch = async () => { throw new Error('isolated unreachable backend') }
+  try {
+    writeFileSync(command, 'not an executable', { mode: 0o600 })
+    await assert.rejects(service.start({ backendPath: folder }))
+    await assert.rejects(service.start({ backendPath: folder }))
+    check('a failed spawn rejects again instead of reporting a live backend', true)
+  } catch (error) {
+    console.error(error)
+    check('a failed spawn rejects again instead of reporting a live backend', false)
+  } finally {
+    globalThis.fetch = fetch
+    unlinkSync(command)
+    rmdirSync(folder)
+  }
+
+  const { app, ipcMain } = await import('electron')
+  const { createServer } = await import('node:http')
+  const { once } = await import('node:events')
+  const { createMainWindow } = await import('../electron/window.js')
+  const server = createServer((_request, response) => response.end('<!doctype html><title>Recovery check</title>'))
+  app.whenReady().then(async () => {
+    let window
+    try {
+      await new Promise(resolve => server.listen(0, '127.0.0.1', resolve))
+      window = createMainWindow({ target: `http://127.0.0.1:${server.address().port}/?dsh-desktop-mode=advanced` })
+      window.hide()
+      await once(window.webContents, 'did-finish-load')
+      await window.webContents.executeJavaScript(`
+        window.attempts = 0
+        window.shellAPI.onReconnectRequest(() => {
+          if (++window.attempts > 5) return
+          window.shellAPI.connectionReport('connecting')
+          window.shellAPI.connectionReport('disconnected')
+        })
+        window.shellAPI.connectionReport('disconnected')
+      `)
+      for (let i = 0; i < 5; i++) ipcMain.emit('shell:retry-connection', { sender: window.webContents })
+      await new Promise(resolve => setTimeout(resolve, 500))
+      assert.equal(await window.webContents.executeJavaScript('window.attempts'), 1)
+      check('burst retries share one attempt and immediate failure does not feed back', true)
+    } catch (error) {
+      console.error(error)
+      check('burst retries share one attempt and immediate failure does not feed back', false)
+    } finally {
+      window?.destroy()
+      server.close()
+    }
+    finish()
+  })
+}
+
+function finish() {
+  console.log(`\n${failures === 0 ? 'PASS' : `FAIL (${failures} check(s))`}`)
+  process.exit(failures === 0 ? 0 : 1)
+}
+
+if (!process.versions.electron) finish()