@pandablessing/dsh-user-sync 1.0.4 → 1.0.6

package/lib/index.js

@@ -1,5 +1,5 @@
 import { spawn } from 'node:child_process';
-import { appendFileSync, existsSync, mkdirSync, readFileSync, readdirSync } from 'node:fs';
+import { appendFileSync, existsSync, mkdirSync, readFileSync, readdirSync, writeFileSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
@@ -201,6 +201,117 @@ export function apply(ctx) {
             }
         };
         let pluginManager = null;
+        /** 运行时 pnpm 的 node + pnpm.cjs 路径；找不到时返回 null。 */
+        const pnpmRuntime = () => {
+            const runtime = findRuntimeNode();
+            if (!runtime)
+                return null;
+            const pnpmCjs = join(dirname(runtime), '..', '..', 'pnpm', 'bin', 'pnpm.cjs');
+            return existsSync(pnpmCjs) ? { node: runtime, pnpmCjs } : null;
+        };
+        /**
+         * 按 profile 的 package.json 安装依赖。
+         * `link:` / `file:` 指向不存在的本地路径时，pnpm install 会整体失败（连带普通包也装不上），
+         * 因此安装期间临时把这些坏 link 从 package.json 摘掉，装完原样恢复。
+         */
+        const installProfileDependencies = async () => {
+            const rt = pnpmRuntime();
+            if (!rt)
+                throw new Error('runtime node/pnpm not found');
+            const pkgPath = join(paths.profileDir, 'package.json');
+            const workspacePath = join(paths.profileDir, 'pnpm-workspace.yaml');
+            const raw = readFileSync(pkgPath, 'utf8');
+            const removedLinks = [];
+            let workspaceRaw = null;
+            const missingPatchLines = [];
+            try {
+                const pkg = JSON.parse(raw);
+                const dependencies = pkg.dependencies ?? {};
+                // pnpm-workspace.yaml 的 patchedDependencies 指向 patches/*.patch；文件缺失时 pnpm install 会整体失败
+                try {
+                    workspaceRaw = readFileSync(workspacePath, 'utf8');
+                    for (const line of workspaceRaw.split('\n')) {
+                        const match = line.match(/^\s+'?([^':]+)'?@[^:]+:\s*patches\/(.+?)\s*$/);
+                        if (match && !existsSync(join(paths.profileDir, 'patches', match[2])))
+                            missingPatchLines.push(line);
+                    }
+                    if (missingPatchLines.length > 0) {
+                        const patched = workspaceRaw
+                            .split('\n')
+                            .filter((line) => !missingPatchLines.includes(line))
+                            .join('\n');
+                        writeFileSync(workspacePath, patched, 'utf8');
+                    }
+                }
+                catch {
+                    workspaceRaw = null;
+                }
+                const brokenLinks = Object.entries(dependencies).filter(([, spec]) => {
+                    if (!spec.startsWith('link:') && !spec.startsWith('file:'))
+                        return false;
+                    const target = join(paths.profileDir, spec.slice(5));
+                    return !existsSync(target);
+                });
+                if (brokenLinks.length > 0) {
+                    const patched = { ...pkg, dependencies: { ...dependencies } };
+                    for (const [name] of brokenLinks) {
+                        delete patched.dependencies[name];
+                        removedLinks.push(name);
+                    }
+                    writeFileSync(pkgPath, `${JSON.stringify(patched, null, 2)}\n`, 'utf8');
+                }
+                await runCommand(rt.node, [rt.pnpmCjs, 'install', '--force'], { cwd: paths.profileDir, timeout: 300_000 });
+            }
+            finally {
+                if (removedLinks.length > 0)
+                    writeFileSync(pkgPath, raw, 'utf8');
+                if (workspaceRaw !== null && missingPatchLines?.length > 0)
+                    writeFileSync(join(paths.profileDir, 'pnpm-workspace.yaml'), workspaceRaw, 'utf8');
+            }
+            return { removedLinks };
+        };
+        /** 缺失插件落盘校验：pnpm 的 .modules.yaml 可能残留记录，缺失时再跑一次 pnpm install。 */
+        const forceReinstallIfMissing = async (names) => {
+            const missing = names.filter((name) => !existsSync(join(paths.profileDir, 'node_modules', name)));
+            if (missing.length === 0)
+                return;
+            try {
+                await installProfileDependencies();
+            }
+            catch (error) {
+                log('pnpm-force', error);
+            }
+        };
+        /** 把远端包声明的依赖装上：先按 package.json 整体安装，再逐个 installBundle 兜底，link/file 依赖只提示手动处理。 */
+        const ensurePluginsInstalled = async (pm, dependencies) => {
+            const plan = planPluginRecovery({ dependencies, installed: [] });
+            let removedLinks = [];
+            try {
+                const result = await installProfileDependencies();
+                removedLinks = result.removedLinks;
+            }
+            catch (error) {
+                log('install-dependencies', error);
+            }
+            // 安装后重新判定：DSH 的 listBundles 只要声明在就算 installed，实际落盘要看 node_modules
+            const bundles = await pm.listBundles();
+            const installedNow = bundles
+                .filter((bundle) => bundle.installed)
+                .map((bundle) => bundle.name)
+                .filter((name) => existsSync(join(paths.profileDir, 'node_modules', name)));
+            const stillMissing = planPluginRecovery({ dependencies, installed: installedNow }).missing;
+            const results = await installMissing({
+                plan: { missing: stillMissing },
+                installBundle: (spec) => pm.installBundle(spec),
+            });
+            await forceReinstallIfMissing(stillMissing.map((item) => item.name));
+            const installed = plan.missing.map((item) => ({
+                name: item.name,
+                ok: existsSync(join(paths.profileDir, 'node_modules', item.name)),
+                error: results.find((result) => result.name === item.name)?.error,
+            }));
+            return { installed, linkDeps: plan.linkDeps.map(({ name, spec }) => ({ name, spec })) };
+        };
         const routes = [
             {
                 // 最小同步路由：用于区分「同步 handler 本身不可用」与「status/scan 具体逻辑抛错」
@@ -484,7 +595,24 @@ export function apply(ctx) {
                     const body = (await request.json());
                     if (!isPackageId(String(body?.name ?? '')))
                         return json({ error: 'E_BAD_NAME' }, 400);
-                    return json(await sync.applyRemote(String(body.name)));
+                    const result = (await sync.applyRemote(String(body.name)));
+                    // 同步只恢复声明文件；应用后必须真正把插件装上，否则「清单同步了却没装」
+                    const pm = pluginManager;
+                    const manifest = result.manifest;
+                    const dependencies = manifest?.dependencies ?? null;
+                    if (pm && result.ok && dependencies && Object.keys(dependencies).length > 0) {
+                        try {
+                            const { installed, linkDeps } = await ensurePluginsInstalled(pm, dependencies);
+                            result.installed = installed;
+                            result.linkDeps = linkDeps;
+                        }
+                        catch (error) {
+                            log('apply-install', error);
+                            result.installed = [];
+                            result.installError = error?.message ?? String(error);
+                        }
+                    }
+                    return json(result);
                 },
             },
         ];

package/lib/scan.js

@@ -155,6 +155,19 @@ function collectProfileFiles({ dshHome, profileName, modules, ctx, }) {
     if (modules.includes('plugins')) {
         for (const name of ['package.json', 'pnpm-lock.yaml', 'pnpm-workspace.yaml', 'cordis.yml'])
             push(name, 'plugins');
+        // pnpm-workspace.yaml 的 patchedDependencies 指向 patches/*.patch；
+        // 少了这些文件，换机后 pnpm install 会报 ERR_PNPM_PATCH_NOT_FOUND，插件全部装不上
+        let patchFiles = [];
+        try {
+            patchFiles = readdirSync(join(profileDir, 'patches'), { withFileTypes: true })
+                .filter((dirent) => dirent.isFile() && dirent.name.endsWith('.patch'))
+                .map((dirent) => dirent.name);
+        }
+        catch {
+            patchFiles = [];
+        }
+        for (const name of patchFiles)
+            push(`patches/${name}`, 'plugins');
     }
     if (modules.includes('config')) {
         push('cordis.patch.yml', 'config');

package/lib/sync.js

@@ -97,6 +97,15 @@ export function createSync({ dshHome, userHome, profileName = 'desktop', transpo
         }
         if (hits.length > 0)
             return { ok: false, code: 'E_SENSITIVE', hits };
+        // 把 profile 的依赖声明写进 manifest：目标机应用后据此自动安装缺失插件
+        let dependencies = {};
+        try {
+            const pkg = JSON.parse(readFileSync(join(dshHome, 'profiles', profileName, 'package.json'), 'utf8'));
+            dependencies = pkg.dependencies ?? {};
+        }
+        catch {
+            dependencies = {};
+        }
         const packageId = makePackageId({ deviceId: currentDeviceId() });
         const manifest = buildManifest(files, {
             packageId,
@@ -106,6 +115,7 @@ export function createSync({ dshHome, userHome, profileName = 'desktop', transpo
             arch: process.arch,
             profile: profileName,
             modules: modulesNow(),
+            dependencies,
         });
         const tarEntries = [
             { path: MANIFEST_PATH, data: Buffer.from(`${JSON.stringify(manifest, null, 2)}\n`, 'utf8') },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pandablessing/dsh-user-sync",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "DeepSeek Harness 用户级配置同步插件",
   "type": "module",
   "main": "lib/index.js",
@@ -31,11 +31,6 @@
       "platform": "web"
     }
   },
-  "scripts": {
-    "build": "tsc -p tsconfig.json",
-    "build:server": "tsc -p server/tsconfig.json",
-    "test": "node --test test/*.test.js"
-  },
   "license": "MulanPSL-2.0",
   "keywords": [
     "dsh",
@@ -59,5 +54,12 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "scripts": {
+    "build": "tsc -p tsconfig.json",
+    "build:server": "tsc -p server/tsconfig.json",
+    "test": "node --test test/*.test.js",
+    "publish:npm": "node scripts/publish.mjs",
+    "publish:dry": "node scripts/publish.mjs --dry-run"
   }
-}
+}