dshmarket 1.2.3 → 1.2.4

package/src/dsh-cli.ts

@@ -14,7 +14,9 @@ import { logEvent } from './log.ts'
 import { pluginArgsFor } from './pnpm-compat.ts'
 import { profileDir } from './profile.ts'
 
-const INSTALL_TIMEOUT_MS = 5 * 60 * 1000
+// 15 min default (slow networks + git installs), overridable for CI/tests.
+// (#6 by @qichuang321.)
+const INSTALL_TIMEOUT_MS = Number(process.env.DSH_MARKET_INSTALL_TIMEOUT_MS) || 15 * 60 * 1000
 
 /**
  * Windows npm/corepack/pnpm are `.cmd` shims. Node's `spawn` without a shell
@@ -47,6 +49,8 @@ export interface InstallResult {
   timedOut: boolean
   stdout: string
   stderr: string
+  /** True when the run ended because the user cancelled it. */
+  cancelled: boolean
 }
 
 /** The shape every orchestration function takes to run plugin commands (injectable in tests). */
@@ -67,6 +71,49 @@ export function killChild(child: ChildProcess): void {
   child.kill('SIGKILL')
 }
 
+/** The child of the operation currently running, for /dsh-market/cancel. */
+let activeChild: ChildProcess | null = null
+let cancelRequested = false
+
+/**
+ * Kill a child and its whole tree, gracefully where the platform allows:
+ * taskkill /T /F on Windows (plain kill() leaves pnpm children running),
+ * SIGTERM with a 5s SIGKILL escalation elsewhere so pnpm can clean up.
+ * (Cancel flow contributed in #6 by @qichuang321.)
+ */
+function killTree(child: ChildProcess): void {
+  if (process.platform === 'win32' && child.pid !== undefined) {
+    try {
+      spawn('taskkill', ['/pid', String(child.pid), '/t', '/f'], { stdio: 'ignore' })
+      return
+    } catch { /* fall through */ }
+  }
+  // POSIX: the dsh wrapper runs pnpm as a grandchild (spawnSync), which a
+  // plain child.kill() leaves running — it keeps our stdio pipes open, so
+  // the close event never fires and the market looks stuck "installing".
+  // The child is spawned detached as its own process GROUP; kill the group.
+  const signalTree = (signal: NodeJS.Signals): void => {
+    if (child.pid === undefined) return
+    try { process.kill(-child.pid, signal) } catch {
+      try { child.kill(signal) } catch { /* already gone */ }
+    }
+  }
+  signalTree('SIGTERM')
+  const escalate = setTimeout(() => signalTree('SIGKILL'), 5000)
+  escalate.unref?.()
+}
+
+/**
+ * Cancel the plugin command currently running.
+ * @returns true when there was one to cancel.
+ */
+export function cancelActive(): boolean {
+  if (activeChild === null) return false
+  cancelRequested = true
+  killTree(activeChild)
+  return true
+}
+
 /** Whether `pnpm` resolves on PATH; success is cached, absence is re-probed. */
 let pnpmReady = false
 
@@ -147,7 +194,7 @@ export function runDshPlugin(profile: string, pluginArgs: string[]): Promise<Ins
   const target = pluginArgs[pluginArgs.length - 1] ?? ''
   if (!TARGET_RE.test(target)) {
     logEvent('error', 'install', `unsafe plugin target rejected: ${JSON.stringify(target)}`)
-    return Promise.resolve({ exitCode: 1, timedOut: false, stdout: '', stderr: `unsafe plugin target rejected: ${JSON.stringify(target)}` })
+    return Promise.resolve({ exitCode: 1, timedOut: false, stdout: '', stderr: `unsafe plugin target rejected: ${JSON.stringify(target)}`, cancelled: false })
   }
   progress.active = true
   progress.target = target
@@ -162,13 +209,18 @@ export function runDshPlugin(profile: string, pluginArgs: string[]): Promise<Ins
       env: { ...process.env, CI: 'true' },
       stdio: ['ignore', 'pipe', 'pipe'],
       shell: viaShell,
+      // Own process group on POSIX so cancel/timeout can kill the whole
+      // tree (dsh wrapper + pnpm grandchild) with one group signal.
+      detached: process.platform !== 'win32',
     })
+    activeChild = child
+    cancelRequested = false
     let stdout = ''
     let stderr = ''
     let timedOut = false
     const timer = setTimeout(() => {
       timedOut = true
-      killChild(child)
+      killTree(child)
     }, INSTALL_TIMEOUT_MS)
     child.stdout.on('data', (chunk: Buffer) => {
       const text = chunk.toString()
@@ -183,12 +235,14 @@ export function runDshPlugin(profile: string, pluginArgs: string[]): Promise<Ins
     child.on('error', (error) => {
       clearTimeout(timer)
       progress.active = false
-      resolvePromise({ exitCode: 127, timedOut: false, stdout, stderr: `${stderr}\n${error.message}` })
+      if (activeChild === child) activeChild = null
+      resolvePromise({ exitCode: 127, timedOut: false, stdout, stderr: `${stderr}\n${error.message}`, cancelled: false })
     })
     child.on('close', (code) => {
       clearTimeout(timer)
       progress.active = false
-      resolvePromise({ exitCode: code, timedOut, stdout, stderr })
+      if (activeChild === child) activeChild = null
+      resolvePromise({ exitCode: code, timedOut, stdout, stderr, cancelled: cancelRequested })
     })
   })
 }

package/src/install.ts

@@ -22,7 +22,7 @@ import { logEvent } from './log.ts'
  */
 export async function withHoistRecovery(run: PluginRunner, profile: string, pluginArgs: string[]): Promise<InstallResult> {
   let result = await run(profile, pluginArgs)
-  const ok = (r: InstallResult): boolean => r.exitCode === 0 && !r.timedOut
+  const ok = (r: InstallResult): boolean => r.exitCode === 0 && !r.timedOut && !r.cancelled
   if (!ok(result) && classifyPnpmFailure(`${result.stderr}\n${result.stdout}`)?.code === 'hoist-pattern-diff') {
     logEvent('warn', 'install', `modules dir was built by a different pnpm major — rebuilding (pnpm install) and retrying once`)
     // --no-frozen-lockfile: the market runs pnpm with CI=true (TTY hangs),
@@ -30,7 +30,7 @@ export async function withHoistRecovery(run: PluginRunner, profile: string, plug
     const rebuild = await run(profile, ['install', '--no-frozen-lockfile'])
     if (ok(rebuild)) result = await run(profile, pluginArgs)
   }
-  if (!ok(result)) {
+  if (!ok(result) && !result.cancelled) {
     const failure = classifyPnpmFailure(`${result.stderr}\n${result.stdout}`)
     if (failure !== null) result = { ...result, stderr: `${result.stderr}\n\n${failure.message}` }
   }
@@ -119,3 +119,23 @@ export function isStaleUpdate(check: {
     ? check.beforeCommit !== null && check.afterCommit === check.beforeCommit
     : check.beforeVersion !== null && check.afterVersion === check.beforeVersion
 }
+
+/**
+ * Package names pnpm reported as having their build scripts ignored
+ * ("Ignored build scripts: esbuild, koffi."). Empty when none.
+ * (#6 by @qichuang321.)
+ */
+export function parseIgnoredBuilds(stdout: string, stderr: string): string[] {
+  const m = /Ignored build scripts:?\s*([^\n]+)/i.exec(`${stdout}\n${stderr}`)
+  if (m === null) return []
+  const found: string[] = []
+  for (const chunk of m[1].split(',')) {
+    // Entries may carry a version suffix and the sentence's final period.
+    const trimmed = chunk.trim().replace(/\.$/, '')
+    if (trimmed === '') continue
+    const at = trimmed.lastIndexOf('@')
+    const name = at > 0 ? trimmed.slice(0, at) : trimmed
+    if (name !== '' && !found.includes(name)) found.push(name)
+  }
+  return found
+}

package/src/profile.ts

@@ -4,7 +4,7 @@
  * functions of the directory contents; no processes, no network.
  */
 
-import { existsSync, readdirSync, readFileSync } from 'node:fs'
+import { existsSync, readdirSync, readFileSync, writeFileSync } from 'node:fs'
 import { homedir } from 'node:os'
 import { join } from 'node:path'
 
@@ -14,7 +14,20 @@ export function profileDir(profile: string): string {
   return join(home, 'profiles', profile)
 }
 
-/** Community dependencies of the profile (official in-box scope filtered out). */
+/**
+ * The in-box bundles dsh's profile templates install themselves — the ONLY
+ * names the market hides from the installed list. Community plugins may
+ * legitimately publish under the official scope (#28), so a whole-scope
+ * filter would make them invisible and fail install validation.
+ * (Diagnosis and fix proposed in #28 by @Lograthmic.)
+ */
+const INBOX_BUNDLES = new Set([
+  '@deepseek-ai/dsh-base',
+  '@deepseek-ai/dsh-web-app',
+  '@deepseek-ai/dsh-headless',
+])
+
+/** Community dependencies of the profile (in-box bundles filtered out). */
 export function readInstalled(profile: string): Record<string, string> {
   try {
     const manifest = JSON.parse(readFileSync(join(profileDir(profile), 'package.json'), 'utf8')) as {
@@ -22,7 +35,7 @@ export function readInstalled(profile: string): Record<string, string> {
     }
     const installed: Record<string, string> = {}
     for (const [name, spec] of Object.entries(manifest.dependencies ?? {})) {
-      if (!name.startsWith('@deepseek-ai/')) installed[name] = spec
+      if (!INBOX_BUNDLES.has(name)) installed[name] = spec
     }
     return installed
   } catch {
@@ -118,3 +131,32 @@ export function pluginSubdirs(root: string): string[] {
   }
   return found.slice(0, 8)
 }
+
+/**
+ * Allow the given packages' build scripts in the profile's
+ * pnpm-workspace.yaml `allowBuilds` block (the key dsh profiles use),
+ * merging with existing entries and leaving the rest of the yaml intact.
+ * (#6 by @qichuang321.)
+ * @returns every package now allowed.
+ */
+export function setAllowBuilds(profile: string, packages: string[]): string[] {
+  const file = join(profileDir(profile), 'pnpm-workspace.yaml')
+  let yaml = ''
+  try { yaml = readFileSync(file, 'utf8') } catch { /* created below */ }
+  const blockRe = /allowBuilds:\n((?:[ \t]+[^\n]*\n?)*)/
+  const map: Record<string, string> = {}
+  const blockMatch = blockRe.exec(yaml)
+  if (blockMatch !== null) {
+    for (const line of blockMatch[1].split('\n')) {
+      const m = /^[ \t]+([^:\s]+(?:\/[^:\s]+)?)\s*:\s*(\S.*)?$/.exec(line)
+      if (m !== null) map[m[1]] = m[2] ?? 'true'
+    }
+  }
+  for (const pkg of packages) {
+    if (/^[A-Za-z0-9@/_.-]+$/.test(pkg)) map[pkg] = 'true'
+  }
+  const block = Object.entries(map).map(([k, v]) => `  ${k}: ${v}`).join('\n')
+  const blockText = `allowBuilds:\n${block}\n`
+  writeFileSync(file, blockMatch !== null ? yaml.replace(blockRe, blockText) : `${yaml.replace(/\n?$/, '\n')}${blockText}`)
+  return Object.keys(map)
+}

package/src/routes.ts

@@ -8,7 +8,8 @@
  * same-origin POSTs and only sources present in the curated registry.
  */
 
-import { readFileSync } from 'node:fs'
+import { existsSync, readFileSync } from 'node:fs'
+import { join } from 'node:path'
 import type { IncomingMessage, ServerResponse } from 'node:http'
 import { loadRegistry } from './registry.ts'
 import {
@@ -16,10 +17,10 @@ import {
   mountClientOnlyDeps, readDisabledThemes,
 } from './hot.ts'
 import { exportLogs, logEvent } from './log.ts'
-import { BOOT_ID, probePnpm, progress, provisionPnpm, runDshPlugin } from './dsh-cli.ts'
-import { profileDir, readInstalled, readInstalledVersion, readLockCommits } from './profile.ts'
+import { BOOT_ID, cancelActive, probePnpm, progress, provisionPnpm, runDshPlugin } from './dsh-cli.ts'
+import { profileDir, readInstalled, readInstalledVersion, readLockCommits, setAllowBuilds } from './profile.ts'
 import { findInstalledAlias, installTargetFor } from './sources.ts'
-import { isStaleUpdate, retargetCollections, validateAddedPlugins, withHoistRecovery } from './install.ts'
+import { isStaleUpdate, parseIgnoredBuilds, retargetCollections, validateAddedPlugins, withHoistRecovery } from './install.ts'
 import { checkUpdates, invalidateUpdates } from './updates.ts'
 import { createThemeManager, type LoaderEntry } from './themes.ts'
 import { readJsonBody, sameOrigin, sendJson } from './http.ts'
@@ -89,6 +90,20 @@ export function mountMarketRoutes(host: MarketHost, config: MarketConfig): () =>
   })
   let installing = false
 
+  /**
+   * Drop live hot mounts whose package was removed outside the market
+   * (e.g. `dsh plugin remove` in a terminal): the stale mount would keep
+   * serving a client bundle that 404s after refresh, wedging the page
+   * until a restart (#29 by @SunYanbox).
+   */
+  async function dropStaleHotMounts(): Promise<void> {
+    for (const name of listHotMounts()) {
+      if (existsSync(join(profileDir(config.profile), 'node_modules', name, 'package.json'))) continue
+      await hotUnmount(name)
+      logEvent('warn', 'hot-sweep', `${name}: package removed outside the market — live mount dropped`)
+    }
+  }
+
   /** Every plugin command goes through the pnpm-drift recovery wrapper (#20). */
   const runPlugin = (profile: string, args: string[]) => withHoistRecovery(runDshPlugin, profile, args)
 
@@ -114,12 +129,13 @@ export function mountMarketRoutes(host: MarketHost, config: MarketConfig): () =>
     host.webServer.register({
       kind: 'exact',
       path: '/dsh-market/installed',
-      handler: (request, response) => {
+      handler: async (request, response) => {
         if (request.method !== 'GET') {
           response.writeHead(405, { allow: 'GET' })
           response.end()
           return
         }
+        await dropStaleHotMounts()
         sendJson(response, 200, {
           profile: config.profile,
           installed: readInstalled(config.profile),
@@ -170,6 +186,7 @@ export function mountMarketRoutes(host: MarketHost, config: MarketConfig): () =>
           response.end()
           return
         }
+        await dropStaleHotMounts()
         sendJson(response, 200, {
           active: progress.active,
           target: progress.target,
@@ -270,7 +287,8 @@ export function mountMarketRoutes(host: MarketHost, config: MarketConfig): () =>
             // default one-day safety wait; scoped to this single command.
             const addArgs = force ? ['add', '--config.minimumReleaseAge=0', target] : ['add', target]
             const result = await runPlugin(config.profile, addArgs)
-            let ok = result.exitCode === 0 && !result.timedOut
+            const cancelled = result.cancelled
+            let ok = result.exitCode === 0 && !result.timedOut && !cancelled
             let stale = false
             if (ok) {
               stale = isStaleUpdate({
@@ -286,10 +304,12 @@ export function mountMarketRoutes(host: MarketHost, config: MarketConfig): () =>
             const staleError = stale
               ? '这个新版本刚发布不久。为了安全，系统默认会等它发布满一天后再安装——刚发布的版本偶尔会被发现问题然后撤回。可以明天再试，或点「立即更新」不再等待。 / This version was just released; for safety, installs normally wait about a day after a release. Try again tomorrow, or click "Update now" to install it right away.'
               : null
-            logEvent(ok ? 'info' : 'error', 'update',
-              `${name} -> ${target} exit=${String(result.exitCode)}${result.timedOut ? ' TIMEOUT' : ''}${stale ? ' STALE(minimumReleaseAge?)' : ''}${ok ? '' : ` stderr=${result.stderr.slice(-300)}`}`)
-            sendJson(response, ok ? 200 : 502, {
+            logEvent(ok || cancelled ? 'info' : 'error', 'update',
+              `${name} -> ${target} exit=${String(result.exitCode)}${result.timedOut ? ' TIMEOUT' : ''}${cancelled ? ' CANCELLED' : ''}${stale ? ' STALE(minimumReleaseAge?)' : ''}${ok || cancelled ? '' : ` stderr=${result.stderr.slice(-300)}`}`)
+            // A user-cancelled run is a quiet outcome, not an error.
+            sendJson(response, ok || cancelled ? 200 : 502, {
               ok,
+              cancelled: cancelled || undefined,
               stale: stale || undefined,
               error: staleError ?? undefined,
               exitCode: result.exitCode,
@@ -331,6 +351,65 @@ export function mountMarketRoutes(host: MarketHost, config: MarketConfig): () =>
       },
     }),
 
+    host.webServer.register({
+      kind: 'exact',
+      path: '/dsh-market/approve-builds',
+      handler: async (request, response) => {
+        if (request.method !== 'POST') {
+          response.writeHead(405, { allow: 'POST' })
+          response.end()
+          return
+        }
+        if (!sameOrigin(request)) {
+          sendJson(response, 403, { error: 'untrusted origin' })
+          return
+        }
+        try {
+          // One-click build-script approval (#6 by @qichuang321): only
+          // packages ALREADY installed in the profile can be allowed — the
+          // list is not free input.
+          const body = (await readJsonBody(request)) as { packages?: unknown }
+          const installed = readInstalled(config.profile)
+          const packages = (Array.isArray(body.packages) ? body.packages.map(String) : [])
+            .filter(name => installed[name] !== undefined)
+          if (packages.length === 0) {
+            sendJson(response, 400, { error: 'no installed packages given' })
+            return
+          }
+          const approved = setAllowBuilds(config.profile, packages)
+          logEvent('info', 'approve-builds', `allowed build scripts: ${approved.join(', ')}`)
+          sendJson(response, 200, { ok: true, approved })
+        } catch (error) {
+          const message = error instanceof Error ? error.message : String(error)
+          logEvent('error', 'approve-builds', `route error: ${message}`)
+          sendJson(response, 500, { error: message })
+        }
+      },
+    }),
+
+    host.webServer.register({
+      kind: 'exact',
+      path: '/dsh-market/cancel',
+      handler: async (request, response) => {
+        if (request.method !== 'POST') {
+          response.writeHead(405, { allow: 'POST' })
+          response.end()
+          return
+        }
+        if (!sameOrigin(request)) {
+          sendJson(response, 403, { error: 'untrusted origin' })
+          return
+        }
+        // Cancel flow contributed in #6 by @qichuang321.
+        if (!cancelActive()) {
+          sendJson(response, 400, { error: 'no operation is running' })
+          return
+        }
+        logEvent('info', 'cancel', `cancelled ${progress.target || 'operation'}`)
+        sendJson(response, 200, { ok: true, cancelled: true, target: progress.target })
+      },
+    }),
+
     host.webServer.register({
       kind: 'exact',
       path: '/dsh-market/uninstall',
@@ -362,16 +441,18 @@ export function mountMarketRoutes(host: MarketHost, config: MarketConfig): () =>
           installing = true
           try {
             const result = await runPlugin(config.profile, ['remove', name])
-            const ok = result.exitCode === 0 && !result.timedOut
+            const cancelled = result.cancelled
+            const ok = result.exitCode === 0 && !result.timedOut && !cancelled
             let hot = false
             if (ok) {
               invalidateUpdates()
               hot = await hotUnmount(name)
             }
-            logEvent(ok ? 'info' : 'error', 'uninstall',
-              `${name} exit=${String(result.exitCode)}${ok ? ` live-removed=${String(hot)}` : ` stderr=${result.stderr.slice(-300)}`}`)
-            sendJson(response, ok ? 200 : 502, {
+            logEvent(ok || cancelled ? 'info' : 'error', 'uninstall',
+              `${name} exit=${String(result.exitCode)}${cancelled ? ' CANCELLED' : ''}${ok ? ` live-removed=${String(hot)}` : cancelled ? '' : ` stderr=${result.stderr.slice(-300)}`}`)
+            sendJson(response, ok || cancelled ? 200 : 502, {
               ok,
+              cancelled: cancelled || undefined,
               hot,
               exitCode: result.exitCode,
               stdout: result.stdout,
@@ -437,7 +518,8 @@ export function mountMarketRoutes(host: MarketHost, config: MarketConfig): () =>
           try {
             const before = new Set(Object.keys(readInstalled(config.profile)))
             const result = await runPlugin(config.profile, ['add', target])
-            let ok = result.exitCode === 0 && !result.timedOut
+            const cancelled = result.cancelled
+            let ok = result.exitCode === 0 && !result.timedOut && !cancelled
             if (ok) invalidateUpdates()
             if (ok) {
               // Collection repos (e.g. skin monorepos) install as a junk
@@ -451,7 +533,7 @@ export function mountMarketRoutes(host: MarketHost, config: MarketConfig): () =>
             // must never survive to brick the next boot.
             let notAPlugin = false
             let removedBroken: string[] = []
-            if (result.exitCode === 0 && !result.timedOut) {
+            if (result.exitCode === 0 && !result.timedOut && !cancelled) {
               const validated = await validateAddedPlugins(runPlugin, config.profile, before)
               removedBroken = validated.removedBroken
               if (removedBroken.length > 0) {
@@ -482,11 +564,13 @@ export function mountMarketRoutes(host: MarketHost, config: MarketConfig): () =>
                 }
               }
             }
-            logEvent(ok ? 'info' : 'error', 'install',
-              `${target} exit=${String(result.exitCode)}${result.timedOut ? ' TIMEOUT' : ''}${ok ? ` hot=${String(hot)}` : ` stderr=${result.stderr.slice(-300)}`}`)
-            sendJson(response, ok ? 200 : 502, {
+            logEvent(ok || cancelled ? 'info' : 'error', 'install',
+              `${target} exit=${String(result.exitCode)}${result.timedOut ? ' TIMEOUT' : ''}${cancelled ? ' CANCELLED' : ''}${ok ? ` hot=${String(hot)}` : cancelled ? '' : ` stderr=${result.stderr.slice(-300)}`}`)
+            sendJson(response, ok || cancelled ? 200 : 502, {
               ok,
+              cancelled: cancelled || undefined,
               hot,
+              ignoredBuilds: (() => { const list = parseIgnoredBuilds(result.stdout, result.stderr); return list.length > 0 ? list : undefined })(),
               error: notAPlugin ? 'nothing installable: the plugin(s) need a build step (blocked by default, see allowBuilds) or ship no prebuilt artifacts / 没有可安装的内容：插件需要构建授权（allowBuilds，默认拦截）或未附带构建产物，详见导出日志' : undefined,
               exitCode: result.exitCode,
               timedOut: result.timedOut,