dshmarket 1.2.4 → 1.3.0

package/lib/index.js

@@ -22,7 +22,10 @@ function argvProfile() {
     return undefined;
 }
 export function apply(ctx, config) {
-    const resolved = { profile: config?.profile ?? argvProfile() ?? 'web' };
+    const resolved = {
+        profile: config?.profile ?? argvProfile() ?? 'web',
+        allowRestart: config?.allowRestart ?? true,
+    };
     ctx.inject(['webServer', 'loader'], (hostCtx) => {
         const host = hostCtx;
         host.effect(() => mountMarketRoutes(host, resolved), 'dsh-market: http routes');

package/lib/restart.js

@@ -0,0 +1,86 @@
+/**
+ * Self-restart: relaunch the exact DSH invocation that booted this host so
+ * pending (non-hot) plugin changes take effect without the user leaving the
+ * UI. Contributed in #14 by @ysyyhhh; ported onto the layered architecture.
+ *
+ * Safety model: the endpoint accepts only direct same-origin loopback
+ * requests (no forwarding headers), refuses while a plugin operation runs,
+ * and deployments under a supervisor (systemd/launchd/pm2) can disable the
+ * whole feature with `allowRestart: false` — the supervisor owns restarts.
+ */
+import { spawn } from 'node:child_process';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { dshArgv } from './dsh-cli.js';
+/** Self-restart is enabled by default and disabled only by an explicit false. */
+export function restartAllowed(config) {
+    return config.allowRestart !== false;
+}
+/** Whether a process-control request came from this Web host on loopback. */
+export function trustedRestartRequest(request) {
+    const address = request.socket.remoteAddress;
+    if (address !== '127.0.0.1' && address !== '::1' && address !== '::ffff:127.0.0.1')
+        return false;
+    // Any forwarding trace means the loopback peer is a proxy, not the user.
+    if (request.headers.forwarded !== undefined
+        || request.headers['x-forwarded-for'] !== undefined
+        || request.headers['x-real-ip'] !== undefined)
+        return false;
+    const origin = request.headers.origin;
+    const host = request.headers.host;
+    if (origin === undefined || host === undefined)
+        return false;
+    try {
+        const parsed = new URL(origin);
+        return (parsed.protocol === 'http:' || parsed.protocol === 'https:') && parsed.host === host;
+    }
+    catch {
+        return false;
+    }
+}
+/** The exact boot invocation the detached restart helper replays. */
+export function restartLaunch() {
+    const launch = dshArgv();
+    return {
+        ...launch,
+        args: [...launch.args, ...process.argv.slice(2)],
+        cwd: launch.cwd ?? process.cwd(),
+    };
+}
+/**
+ * Relaunch this exact DSH entry after a short detached handoff, then stop
+ * this process. The helper outlives us (detached + unref), waits for our
+ * port to free up, and logs the replacement's output under tmpdir.
+ */
+export function scheduleRestart() {
+    const launch = restartLaunch();
+    const stamp = new Date().toISOString().replace(/[:.]/g, '-').slice(0, 19);
+    const logOut = join(tmpdir(), `dsh-market-restart-${stamp}.out.log`);
+    const logErr = join(tmpdir(), `dsh-market-restart-${stamp}.err.log`);
+    const helperCode = [
+        "const { spawn } = require('node:child_process')",
+        "const fs = require('node:fs')",
+        `const file = ${JSON.stringify(launch.file)}`,
+        `const args = ${JSON.stringify(launch.args)}`,
+        `const cwd = ${JSON.stringify(launch.cwd)}`,
+        `const viaShell = ${JSON.stringify(launch.viaShell)}`,
+        `const logOut = ${JSON.stringify(logOut)}`,
+        `const logErr = ${JSON.stringify(logErr)}`,
+        'setTimeout(() => {',
+        '  try {',
+        '    const out = fs.openSync(logOut, "a")',
+        '    const err = fs.openSync(logErr, "a")',
+        '    const child = spawn(file, args, { cwd, detached: true, stdio: ["ignore", out, err], env: process.env, shell: viaShell })',
+        '    child.unref()',
+        '  } catch {}',
+        '}, 1500)',
+    ].join('\n');
+    const helper = spawn(process.execPath, ['-e', helperCode], {
+        detached: true,
+        stdio: 'ignore',
+        env: process.env,
+    });
+    helper.unref();
+    setTimeout(() => process.kill(process.pid, 'SIGTERM'), 500);
+    return { pid: process.pid, helperPid: helper.pid, logOut, logErr };
+}

package/lib/routes.js

@@ -19,6 +19,7 @@ import { isStaleUpdate, parseIgnoredBuilds, retargetCollections, validateAddedPl
 import { checkUpdates, invalidateUpdates } from './updates.js';
 import { createThemeManager } from './themes.js';
 import { readJsonBody, sameOrigin, sendJson } from './http.js';
+import { restartAllowed, scheduleRestart, trustedRestartRequest } from './restart.js';
 const PROFILE_RE = /^[A-Za-z0-9_-]+$/;
 /**
  * Register the market's HTTP routes.
@@ -59,6 +60,7 @@ export function mountMarketRoutes(host, config) {
             void themes.setEntryDisabled(name, true);
     });
     let installing = false;
+    let restarting = 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
@@ -161,6 +163,7 @@ export function mountMarketRoutes(host, config) {
                     lastLine: progress.lastLine,
                     pnpm: await probePnpm(),
                     boot: BOOT_ID,
+                    restart: restartAllowed(config),
                     installed: readInstalled(config.profile),
                 });
             },
@@ -319,6 +322,46 @@ export function mountMarketRoutes(host, config) {
                 }
             },
         }),
+        host.webServer.register({
+            kind: 'exact',
+            path: '/dsh-market/restart',
+            handler: (request, response) => {
+                if (request.method !== 'POST') {
+                    response.writeHead(405, { allow: 'POST' });
+                    response.end();
+                    return;
+                }
+                // One-click restart contributed in #14 by @ysyyhhh.
+                if (!restartAllowed(config)) {
+                    sendJson(response, 403, { error: 'self-restart is disabled for this host' });
+                    return;
+                }
+                if (!trustedRestartRequest(request)) {
+                    sendJson(response, 403, { error: 'restart is limited to same-origin loopback requests' });
+                    return;
+                }
+                if (installing) {
+                    sendJson(response, 409, { error: 'cannot restart while a plugin operation is running' });
+                    return;
+                }
+                if (restarting) {
+                    sendJson(response, 409, { error: 'restart already scheduled' });
+                    return;
+                }
+                restarting = true;
+                try {
+                    const result = scheduleRestart();
+                    logEvent('info', 'restart', `scheduled pid=${String(result.pid)} helper=${String(result.helperPid)}`);
+                    sendJson(response, 202, { ok: true, boot: BOOT_ID, ...result });
+                }
+                catch (error) {
+                    restarting = false;
+                    const message = error instanceof Error ? error.message : String(error);
+                    logEvent('error', 'restart', message);
+                    sendJson(response, 500, { error: message });
+                }
+            },
+        }),
         host.webServer.register({
             kind: 'exact',
             path: '/dsh-market/approve-builds',

package/lib/types/restart.d.ts

@@ -0,0 +1,37 @@
+/**
+ * Self-restart: relaunch the exact DSH invocation that booted this host so
+ * pending (non-hot) plugin changes take effect without the user leaving the
+ * UI. Contributed in #14 by @ysyyhhh; ported onto the layered architecture.
+ *
+ * Safety model: the endpoint accepts only direct same-origin loopback
+ * requests (no forwarding headers), refuses while a plugin operation runs,
+ * and deployments under a supervisor (systemd/launchd/pm2) can disable the
+ * whole feature with `allowRestart: false` — the supervisor owns restarts.
+ */
+import type { IncomingMessage } from 'node:http';
+/** Self-restart is enabled by default and disabled only by an explicit false. */
+export declare function restartAllowed(config: {
+    allowRestart?: boolean;
+}): boolean;
+/** Whether a process-control request came from this Web host on loopback. */
+export declare function trustedRestartRequest(request: Pick<IncomingMessage, 'headers' | 'socket'>): boolean;
+/** The exact boot invocation the detached restart helper replays. */
+export declare function restartLaunch(): {
+    file: string;
+    args: string[];
+    cwd: string;
+    viaShell: boolean;
+};
+/** What scheduleRestart reports back to the caller for logging/response. */
+export interface RestartResult {
+    pid: number;
+    helperPid: number | undefined;
+    logOut: string;
+    logErr: string;
+}
+/**
+ * Relaunch this exact DSH entry after a short detached handoff, then stop
+ * this process. The helper outlives us (detached + unref), waits for our
+ * port to free up, and logs the replacement's output under tmpdir.
+ */
+export declare function scheduleRestart(): RestartResult;

package/lib/types/routes.d.ts

@@ -42,6 +42,8 @@ export interface MarketHost {
 export interface MarketConfig {
     /** Profile the market installs into; matches the profile serving this UI. */
     profile: string;
+    /** Detached self-restart is unsafe under systemd/launchd/pm2; operators can disable it (#14). */
+    allowRestart?: boolean;
 }
 /**
  * Register the market's HTTP routes.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dshmarket",
   "description": "Visual plugin market inside DeepSeek Harness — browse, search, and one-click install community plugins. · DSH 可视化插件市场：逛一逛，点一下，装好。",
-  "version": "1.2.4",
+  "version": "1.3.0",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/types/index.d.ts",
@@ -24,7 +24,7 @@
     "typecheck": "tsc -p tsconfig.json --noEmit && tsc -p tsconfig.client.json --noEmit",
     "build": "tsc -p tsconfig.json && npm run build:client",
     "build:client": "tsdown && node scripts/normalize-client-banner.mjs",
-    "check": "npm run typecheck && npm run build",
+    "check": "npm run typecheck && npm run build && node scripts/restart-smoke.mjs",
     "test": "vitest run",
     "test:compat": "vitest run --config vitest.compat.config.ts",
     "prepack": "npm run build && node scripts/preflight.mjs",

package/src/client/MarketSection.tsx

@@ -123,6 +123,9 @@ export function MarketSection(props: MarketSectionProps) {
   const [envFixing, setEnvFixing] = useState(false)
   const [envFailed, setEnvFailed] = useState(false)
   const [bootId, setBootId] = useState<string | null>(null)
+  /** One-click restart (#14 by @ysyyhhh): server capability + in-flight state. */
+  const [restartEnabled, setRestartEnabled] = useState(false)
+  const [restarting, setRestarting] = useState(false)
   const [showTop, setShowTop] = useState(false)
   const bodyRef = useRef<HTMLDivElement | null>(null)
   const [sort, setSort] = useState('hot')
@@ -157,6 +160,7 @@ export function MarketSection(props: MarketSectionProps) {
       .then(status => {
         setEnvReady(status.pnpm !== false)
         if (typeof status.boot === 'string') setBootId(status.boot)
+        setRestartEnabled(status.restart === true)
       })
       .catch(() => {})
     refreshInstalled()
@@ -309,6 +313,53 @@ export function MarketSection(props: MarketSectionProps) {
       .finally(() => setBusyUrl(null))
   }, [refreshInstalled, t])
 
+  /**
+   * Restart the host and reload once the boot id changes (#14 by @ysyyhhh).
+   * The 202 races the process's SIGTERM, so network errors on the initial
+   * request are expected and treated as "restart under way".
+   */
+  const doRestart = useCallback(() => {
+    if (bootId === null || restarting) return
+    const previousBoot = bootId
+    setRestarting(true)
+    setInstallError(null)
+    const awaitNewBoot = () => {
+      const deadline = Date.now() + 60000
+      const poll = () => {
+        fetch('/dsh-market/status', { cache: 'no-store' })
+          .then(res => res.json())
+          .then((next) => {
+            if (typeof next.boot === 'string' && next.boot !== previousBoot) {
+              location.reload()
+              return
+            }
+            retry()
+          })
+          .catch(retry)
+      }
+      const retry = () => {
+        if (Date.now() > deadline) {
+          setRestarting(false)
+          setInstallError(t('restartTimeout'))
+          return
+        }
+        setTimeout(poll, 1500)
+      }
+      poll()
+    }
+    fetch('/dsh-market/restart', { method: 'POST', headers: { 'content-type': 'application/json' }, body: '{}' })
+      .then(res => res.json().then(body => ({ status: res.status, body })))
+      .then(({ status, body }) => {
+        if (status !== 202 || body.ok !== true) {
+          setRestarting(false)
+          setInstallError(t('restartFail') + ': ' + String(body.error || ('HTTP ' + String(status))))
+          return
+        }
+        awaitNewBoot()
+      })
+      .catch(awaitNewBoot) // the host may die mid-response; keep polling
+  }, [bootId, restarting, t])
+
   /** Cancel the running plugin command (#6 by @qichuang321). */
   const doCancel = useCallback(() => {
     fetch('/dsh-market/cancel', { method: 'POST', headers: { 'content-type': 'application/json' }, body: '{}' })
@@ -638,6 +689,14 @@ export function MarketSection(props: MarketSectionProps) {
             <span>🔄</span>
             <span className={css.grow}><b>{pendingRestart}</b> {t('restartBanner')}</span>
             <span title={t('restartHint')}>ℹ️</span>
+            {restartEnabled && (
+              <Button
+                variant="primary"
+                size="sm"
+                disabled={restarting || busyUrl !== null || updatingName !== null || removingName !== null}
+                onClick={doRestart}
+              >{restarting ? t('restarting') : t('restartNow')}</Button>
+            )}
           </div>
         )}
       </div>

package/src/client/locales.ts

@@ -34,6 +34,10 @@ export const zh = {
   busyWait: '已有操作正在进行，请等它结束（同一时间只执行一个安装/更新/卸载）',
   approveBuilds: '放行构建脚本并重试',
   buildsSkipped: '该插件需要运行构建脚本才能工作，出于安全默认被拦下。点击下方按钮为它放行并重装：',
+  restartNow: '立即重启',
+  restarting: '正在重启…',
+  restartFail: '重启失败',
+  restartTimeout: '等待 DeepSeek Harness 启动超时',
   updateNow: '立即更新',
   updateFail: '更新失败',
   upToDate: '已是最新',
@@ -102,6 +106,10 @@ export const en: Record<MarketKey, string> = {
   busyWait: 'Another operation is already running — please wait for it to finish (one install/update/uninstall at a time)',
   approveBuilds: 'Allow build scripts and retry',
   buildsSkipped: 'This plugin needs its build scripts to run; they are blocked by default for safety. Click below to allow them and reinstall:',
+  restartNow: 'Restart now',
+  restarting: 'Restarting…',
+  restartFail: 'Restart failed',
+  restartTimeout: 'Timed out waiting for DeepSeek Harness to start',
   updateNow: 'Update now',
   updateFail: 'Update failed',
   upToDate: 'Up to date',

package/src/index.ts

@@ -29,7 +29,10 @@ function argvProfile(): string | undefined {
 }
 
 export function apply(ctx: Context, config?: Config): void {
-  const resolved: MarketConfig = { profile: config?.profile ?? argvProfile() ?? 'web' }
+  const resolved: MarketConfig = {
+    profile: config?.profile ?? argvProfile() ?? 'web',
+    allowRestart: config?.allowRestart ?? true,
+  }
   ctx.inject(['webServer', 'loader'], (hostCtx: Context) => {
     const host = hostCtx as unknown as MarketHost & {
       effect(callback: () => () => void, label: string): void

package/src/restart.ts

@@ -0,0 +1,96 @@
+/**
+ * Self-restart: relaunch the exact DSH invocation that booted this host so
+ * pending (non-hot) plugin changes take effect without the user leaving the
+ * UI. Contributed in #14 by @ysyyhhh; ported onto the layered architecture.
+ *
+ * Safety model: the endpoint accepts only direct same-origin loopback
+ * requests (no forwarding headers), refuses while a plugin operation runs,
+ * and deployments under a supervisor (systemd/launchd/pm2) can disable the
+ * whole feature with `allowRestart: false` — the supervisor owns restarts.
+ */
+
+import { spawn } from 'node:child_process'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import type { IncomingMessage } from 'node:http'
+import { dshArgv } from './dsh-cli.ts'
+
+/** Self-restart is enabled by default and disabled only by an explicit false. */
+export function restartAllowed(config: { allowRestart?: boolean }): boolean {
+  return config.allowRestart !== false
+}
+
+/** Whether a process-control request came from this Web host on loopback. */
+export function trustedRestartRequest(request: Pick<IncomingMessage, 'headers' | 'socket'>): boolean {
+  const address = request.socket.remoteAddress
+  if (address !== '127.0.0.1' && address !== '::1' && address !== '::ffff:127.0.0.1') return false
+  // Any forwarding trace means the loopback peer is a proxy, not the user.
+  if (request.headers.forwarded !== undefined
+    || request.headers['x-forwarded-for'] !== undefined
+    || request.headers['x-real-ip'] !== undefined) return false
+  const origin = request.headers.origin
+  const host = request.headers.host
+  if (origin === undefined || host === undefined) return false
+  try {
+    const parsed = new URL(origin)
+    return (parsed.protocol === 'http:' || parsed.protocol === 'https:') && parsed.host === host
+  } catch {
+    return false
+  }
+}
+
+/** The exact boot invocation the detached restart helper replays. */
+export function restartLaunch(): { file: string; args: string[]; cwd: string; viaShell: boolean } {
+  const launch = dshArgv()
+  return {
+    ...launch,
+    args: [...launch.args, ...process.argv.slice(2)],
+    cwd: launch.cwd ?? process.cwd(),
+  }
+}
+
+/** What scheduleRestart reports back to the caller for logging/response. */
+export interface RestartResult {
+  pid: number
+  helperPid: number | undefined
+  logOut: string
+  logErr: string
+}
+
+/**
+ * Relaunch this exact DSH entry after a short detached handoff, then stop
+ * this process. The helper outlives us (detached + unref), waits for our
+ * port to free up, and logs the replacement's output under tmpdir.
+ */
+export function scheduleRestart(): RestartResult {
+  const launch = restartLaunch()
+  const stamp = new Date().toISOString().replace(/[:.]/g, '-').slice(0, 19)
+  const logOut = join(tmpdir(), `dsh-market-restart-${stamp}.out.log`)
+  const logErr = join(tmpdir(), `dsh-market-restart-${stamp}.err.log`)
+  const helperCode = [
+    "const { spawn } = require('node:child_process')",
+    "const fs = require('node:fs')",
+    `const file = ${JSON.stringify(launch.file)}`,
+    `const args = ${JSON.stringify(launch.args)}`,
+    `const cwd = ${JSON.stringify(launch.cwd)}`,
+    `const viaShell = ${JSON.stringify(launch.viaShell)}`,
+    `const logOut = ${JSON.stringify(logOut)}`,
+    `const logErr = ${JSON.stringify(logErr)}`,
+    'setTimeout(() => {',
+    '  try {',
+    '    const out = fs.openSync(logOut, "a")',
+    '    const err = fs.openSync(logErr, "a")',
+    '    const child = spawn(file, args, { cwd, detached: true, stdio: ["ignore", out, err], env: process.env, shell: viaShell })',
+    '    child.unref()',
+    '  } catch {}',
+    '}, 1500)',
+  ].join('\n')
+  const helper = spawn(process.execPath, ['-e', helperCode], {
+    detached: true,
+    stdio: 'ignore',
+    env: process.env,
+  })
+  helper.unref()
+  setTimeout(() => process.kill(process.pid, 'SIGTERM'), 500)
+  return { pid: process.pid, helperPid: helper.pid, logOut, logErr }
+}

package/src/routes.ts

@@ -24,6 +24,7 @@ import { isStaleUpdate, parseIgnoredBuilds, retargetCollections, validateAddedPl
 import { checkUpdates, invalidateUpdates } from './updates.ts'
 import { createThemeManager, type LoaderEntry } from './themes.ts'
 import { readJsonBody, sameOrigin, sendJson } from './http.ts'
+import { restartAllowed, scheduleRestart, trustedRestartRequest } from './restart.ts'
 
 export type { LoaderEntry } from './themes.ts'
 export type { UpdateStatus } from './updates.ts'
@@ -47,6 +48,8 @@ export interface MarketHost {
 export interface MarketConfig {
   /** Profile the market installs into; matches the profile serving this UI. */
   profile: string
+  /** Detached self-restart is unsafe under systemd/launchd/pm2; operators can disable it (#14). */
+  allowRestart?: boolean
 }
 
 const PROFILE_RE = /^[A-Za-z0-9_-]+$/
@@ -89,6 +92,7 @@ export function mountMarketRoutes(host: MarketHost, config: MarketConfig): () =>
     if (name !== undefined && disabledThemes.has(name)) void themes.setEntryDisabled(name, true)
   })
   let installing = false
+  let restarting = false
 
   /**
    * Drop live hot mounts whose package was removed outside the market
@@ -194,6 +198,7 @@ export function mountMarketRoutes(host: MarketHost, config: MarketConfig): () =>
           lastLine: progress.lastLine,
           pnpm: await probePnpm(),
           boot: BOOT_ID,
+          restart: restartAllowed(config),
           installed: readInstalled(config.profile),
         })
       },
@@ -351,6 +356,46 @@ export function mountMarketRoutes(host: MarketHost, config: MarketConfig): () =>
       },
     }),
 
+    host.webServer.register({
+      kind: 'exact',
+      path: '/dsh-market/restart',
+      handler: (request, response) => {
+        if (request.method !== 'POST') {
+          response.writeHead(405, { allow: 'POST' })
+          response.end()
+          return
+        }
+        // One-click restart contributed in #14 by @ysyyhhh.
+        if (!restartAllowed(config)) {
+          sendJson(response, 403, { error: 'self-restart is disabled for this host' })
+          return
+        }
+        if (!trustedRestartRequest(request)) {
+          sendJson(response, 403, { error: 'restart is limited to same-origin loopback requests' })
+          return
+        }
+        if (installing) {
+          sendJson(response, 409, { error: 'cannot restart while a plugin operation is running' })
+          return
+        }
+        if (restarting) {
+          sendJson(response, 409, { error: 'restart already scheduled' })
+          return
+        }
+        restarting = true
+        try {
+          const result = scheduleRestart()
+          logEvent('info', 'restart', `scheduled pid=${String(result.pid)} helper=${String(result.helperPid)}`)
+          sendJson(response, 202, { ok: true, boot: BOOT_ID, ...result })
+        } catch (error) {
+          restarting = false
+          const message = error instanceof Error ? error.message : String(error)
+          logEvent('error', 'restart', message)
+          sendJson(response, 500, { error: message })
+        }
+      },
+    }),
+
     host.webServer.register({
       kind: 'exact',
       path: '/dsh-market/approve-builds',