@pandablessing/dsh-user-sync 1.0.12 → 1.0.15

package/lib/client.js

@@ -147,6 +147,7 @@ if (typeof window !== 'undefined' && window.__ModuleLoader__) {
                     'remote-missing': '远端无包',
                 };
                 /** 最近一次同步的摘要：上传 / 应用 / 检查。 */
+                /** 最近一次同步的摘要：上传 / 应用 / 检查。 */
                 function lastSyncSummary(status) {
                     if (!status)
                         return '尚未同步';
@@ -158,7 +159,12 @@ if (typeof window !== 'undefined' && window.__ModuleLoader__) {
                     if (status.scheduler?.lastCheckAt) {
                         const decision = status.scheduler.lastDecision;
                         const label = decision?.action && DECISION_LABELS[decision.action] ? DECISION_LABELS[decision.action] : '';
-                        parts.push(`上次检查 ${fmtTime(status.scheduler.lastCheckAt)}${label ? `（${label}）` : ''}`);
+                        // 检查结论只在「没有比它更新的上传/应用」时才算数：否则显示「发现更新」会与上传时间矛盾
+                        const checkAt = Date.parse(status.scheduler.lastCheckAt);
+                        const newerAt = Math.max(status.lastUploaded?.createdAt ? Date.parse(status.lastUploaded.createdAt) : Number.NEGATIVE_INFINITY, status.lastApplied?.createdAt ? Date.parse(status.lastApplied.createdAt) : Number.NEGATIVE_INFINITY);
+                        const stale = Number.isFinite(checkAt) && newerAt > checkAt;
+                        const suffix = label && !stale ? `（${label}）` : '';
+                        parts.push(`上次检查 ${fmtTime(status.scheduler.lastCheckAt)}${suffix}`);
                     }
                     return parts.length > 0 ? parts.join(' · ') : '尚未同步';
                 }
@@ -421,7 +427,19 @@ if (typeof window !== 'undefined' && window.__ModuleLoader__) {
                                 });
                             }
                             else {
-                                setNotice({ kind: 'error', data: result });
+                                // 常见失败给出可操作的提示（服务端错误码透传到 result.code）
+                                const friendly = {
+                                    'quota-exceeded': '远端配额已满：请联系维护者清理旧包，或稍后再试。',
+                                    'package-too-large': '包超过 10 MiB 上限：请减少同步范围（取消项目记忆/大文件）后重试。',
+                                    'E_LOCKED': '另一台设备正在同步，请稍后再试。',
+                                };
+                                const hint = typeof result.code === 'string' ? friendly[result.code] : undefined;
+                                setNotice({
+                                    kind: 'error',
+                                    data: hint
+                                        ? { ...result, detail: `${hint}（${result.detail ?? result.code}）` }
+                                        : { ...result, detail: result.detail ?? '上传失败：远端存储可能空间不足或不可用，请联系维护者。' },
+                                });
                             }
                             refresh();
                         }

package/lib/index.js

@@ -410,14 +410,11 @@ export function apply(ctx) {
                 },
             },
             {
-                // 一键更新：走 DSH 官方安装器（与插件页安装同一路径），只允许本插件自身
+                // 一键更新：在 profile 里用 pnpm add 真实更新安装包（installBundle 只登记 bundle、不改安装包）
                 path: '/api/dsh-user-sync/update',
                 methods: ['POST'],
                 requestBody: 'buffered',
                 fetch: async (request) => {
-                    const pm = pluginManager;
-                    if (!pm)
-                        return json({ ok: false, error: 'E_NO_PLUGIN_MANAGER' }, 503);
                     let version = '';
                     try {
                         const body = (await request.json());
@@ -430,7 +427,13 @@ export function apply(ctx) {
                         return json({ ok: false, error: 'E_BAD_VERSION' }, 400);
                     const spec = `@pandablessing/dsh-user-sync@${version}`;
                     try {
-                        await pm.installBundle(spec);
+                        const rt = pnpmRuntime();
+                        if (!rt)
+                            return json({ ok: false, error: 'E_NO_PNPM' }, 503);
+                        await runCommand(rt.node, [rt.pnpmCjs, 'add', spec], {
+                            cwd: paths.profileDir,
+                            timeout: 240_000,
+                        });
                     }
                     catch (error) {
                         recordHandlerError('update', error);

package/lib/sync.js

@@ -216,7 +216,8 @@ export function createSync({ dshHome, userHome, profileName = 'desktop', transpo
         }
         catch (error) {
             appendHistory(paths.history, { at: new Date().toISOString(), action: 'backup', ok: false, ms: Date.now() - started });
-            return { ok: false, code: 'E_UPLOAD_FAILED', detail: error.message };
+            const code = error?.code ?? 'E_UPLOAD_FAILED';
+            return { ok: false, code, detail: error.message };
         }
         finally {
             releaseLock({ lockPath: paths.lock });

package/lib/transport/api.js

@@ -1,175 +1,175 @@
-import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
-import { dirname } from 'node:path';
-import { isPackageId } from '../archive.js';
-const OFFICIAL_HOST = /(^|\.)deepseek\.com$/i;
-export class ApiError extends Error {
-    code;
-    status;
-    constructor(code, message, status) {
-        super(message);
-        this.code = code;
-        this.status = status;
-    }
-}
-/**
- * 运营方 API 传输（B 模型）。插件侧只持有用户自己的 token，不接触存储凭据。
- * 认证：register 首次建账号，login 取回同一 token；token 存 auth.json（0600）。
- */
-export function createApiTransport({ baseUrl, authPath, token: initialToken, fetchImpl = globalThis.fetch, timeoutMs = 30_000, retries = 3, }) {
-    if (!baseUrl)
-        throw new Error('缺少 baseUrl');
-    const host = new URL(baseUrl).hostname;
-    if (OFFICIAL_HOST.test(host)) {
-        throw new ApiError('E_OFFICIAL_HOST', `拒绝官方域名: ${host}`);
-    }
-    let token = initialToken ?? null;
-    if (!token && authPath && existsSync(authPath)) {
-        try {
-            token = JSON.parse(readFileSync(authPath, 'utf8')).token ?? null;
-        }
-        catch {
-            token = null;
-        }
-    }
-    function persistAuth(next) {
-        token = next.token;
-        if (!authPath)
-            return;
-        mkdirSync(dirname(authPath), { recursive: true });
-        writeFileSync(authPath, `${JSON.stringify(next, null, 2)}\n`, { mode: 0o600 });
-    }
-    function clearAuth() {
-        token = null;
-        if (authPath)
-            rmSync(authPath, { force: true });
-    }
-    const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
-    async function request(method, path, { body, headers = {}, expectBytes = false } = {}) {
-        const url = `${baseUrl.replace(/\/$/, '')}${path}`;
-        let lastError;
-        for (let attempt = 0; attempt <= retries; attempt++) {
-            try {
-                const response = await fetchImpl(url, {
-                    method,
-                    headers: {
-                        ...(token ? { authorization: `Bearer ${token}` } : {}),
-                        ...(body && !expectBytes ? { 'content-type': 'application/json' } : {}),
-                        ...headers,
-                    },
-                    body: body,
-                    signal: AbortSignal.timeout(timeoutMs),
-                });
-                if (response.status === 401 || response.status === 403) {
-                    throw new ApiError('E_REMOTE_AUTH', `认证失败（${response.status}）`, response.status);
-                }
-                if (response.status >= 400 && response.status < 500) {
-                    const detail = await response.text().catch(() => '');
-                    throw new ApiError(`E_HTTP_${response.status}`, detail.slice(0, 200) || `HTTP ${response.status}`, response.status);
-                }
-                if (!response.ok) {
-                    throw new ApiError('E_REMOTE_5XX', `服务端错误（${response.status}）`, response.status);
-                }
-                return expectBytes ? Buffer.from(await response.arrayBuffer()) : response;
-            }
-            catch (error) {
-                lastError = error;
-                const retryable = !(error instanceof ApiError) || error.code === 'E_REMOTE_5XX';
-                if (!retryable || attempt === retries)
-                    throw error;
-                await sleep(200 * 2 ** attempt);
-            }
-        }
-        throw lastError;
-    }
-    const parseJson = async (response) => {
-        const text = await response.text();
-        return text ? JSON.parse(text) : null;
-    };
-    /**
-     * 用同一 accountKey 取回同一个 token（不签发新 token）。
-     * 抽成独立函数：register 里改走 login 时不依赖 `this`，解构调用也不会炸。
-     */
-    async function loginWith(accountKey) {
-        const response = await request('POST', '/v1/auth/login', { body: JSON.stringify({ accountKey }) });
-        const data = await parseJson(response);
-        const token = String(data?.token ?? '');
-        persistAuth({ token, accountKeyHint: accountKey.slice(0, 6), registeredAt: new Date().toISOString() });
-        return { ok: true, token };
-    }
-    return {
-        id: 'api',
-        baseUrl,
-        get token() {
-            return token;
-        },
-        /** 首次注册；已存在（409）时改走 login，取回同一个 token。 */
-        async register(accountKey) {
-            try {
-                const response = await request('POST', '/v1/auth/register', { body: JSON.stringify({ accountKey }) });
-                const data = await parseJson(response);
-                const token = String(data?.token ?? '');
-                persistAuth({ token, accountKeyHint: accountKey.slice(0, 6), registeredAt: new Date().toISOString() });
-                return { ok: true, token };
-            }
-            catch (error) {
-                if (error.code === 'E_HTTP_409')
-                    return loginWith(accountKey);
-                throw error;
-            }
-        },
-        login: loginWith,
-        async reset() {
-            await request('POST', '/v1/auth/reset');
-            clearAuth();
-            return { ok: true };
-        },
-        async test() {
-            try {
-                const response = await request('GET', '/v1/quota');
-                const data = await parseJson(response);
-                return { ok: true, detail: `配额 ${data?.used ?? 0}/${data?.limit ?? 0} 字节` };
-            }
-            catch (error) {
-                return { ok: false, detail: error.message };
-            }
-        },
-        async list() {
-            const response = await request('GET', '/v1/packages');
-            const data = await parseJson(response);
-            return (data?.packages ?? []).map((item) => ({
-                name: item.id,
-                size: item.size,
-                modifiedAt: item.createdAt,
-            }));
-        },
-        async meta(id) {
-            if (!isPackageId(id))
-                throw new ApiError('E_BAD_NAME', `非法包名: ${id}`);
-            const response = await request('GET', `/v1/packages/${encodeURIComponent(id)}/meta`);
-            return parseJson(response);
-        },
-        async get(id) {
-            if (!isPackageId(id))
-                throw new ApiError('E_BAD_NAME', `非法包名: ${id}`);
-            return request('GET', `/v1/packages/${encodeURIComponent(id)}`, { expectBytes: true });
-        },
-        async put(id, data) {
-            if (!isPackageId(id))
-                throw new ApiError('E_BAD_NAME', `非法包名: ${id}`);
-            await request('PUT', `/v1/packages/${encodeURIComponent(id)}`, {
-                body: data,
-                expectBytes: true,
-                headers: { 'content-type': 'application/octet-stream' },
-            });
-        },
-        async remove(id) {
-            if (!isPackageId(id))
-                throw new ApiError('E_BAD_NAME', `非法包名: ${id}`);
-            await request('DELETE', `/v1/packages/${encodeURIComponent(id)}`);
-        },
-        /** 导出我的全部数据（服务端打包当前包 + 元数据）。 */
-        async exportPackage() {
-            return request('GET', '/v1/export', { expectBytes: true });
-        },
-    };
-}
+import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
+import { dirname } from 'node:path';
+import { isPackageId } from '../archive.js';
+const OFFICIAL_HOST = /(^|\.)deepseek\.com$/i;
+export class ApiError extends Error {
+    code;
+    status;
+    constructor(code, message, status) {
+        super(message);
+        this.code = code;
+        this.status = status;
+    }
+}
+/**
+ * 运营方 API 传输（B 模型）。插件侧只持有用户自己的 token，不接触存储凭据。
+ * 认证：register 首次建账号，login 取回同一 token；token 存 auth.json（0600）。
+ */
+export function createApiTransport({ baseUrl, authPath, token: initialToken, fetchImpl = globalThis.fetch, timeoutMs = 30_000, retries = 3, }) {
+    if (!baseUrl)
+        throw new Error('缺少 baseUrl');
+    const host = new URL(baseUrl).hostname;
+    if (OFFICIAL_HOST.test(host)) {
+        throw new ApiError('E_OFFICIAL_HOST', `拒绝官方域名: ${host}`);
+    }
+    let token = initialToken ?? null;
+    if (!token && authPath && existsSync(authPath)) {
+        try {
+            token = JSON.parse(readFileSync(authPath, 'utf8')).token ?? null;
+        }
+        catch {
+            token = null;
+        }
+    }
+    function persistAuth(next) {
+        token = next.token;
+        if (!authPath)
+            return;
+        mkdirSync(dirname(authPath), { recursive: true });
+        writeFileSync(authPath, `${JSON.stringify(next, null, 2)}\n`, { mode: 0o600 });
+    }
+    function clearAuth() {
+        token = null;
+        if (authPath)
+            rmSync(authPath, { force: true });
+    }
+    const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+    async function request(method, path, { body, headers = {}, expectBytes = false } = {}) {
+        const url = `${baseUrl.replace(/\/$/, '')}${path}`;
+        let lastError;
+        for (let attempt = 0; attempt <= retries; attempt++) {
+            try {
+                const response = await fetchImpl(url, {
+                    method,
+                    headers: {
+                        ...(token ? { authorization: `Bearer ${token}` } : {}),
+                        ...(body && !expectBytes ? { 'content-type': 'application/json' } : {}),
+                        ...headers,
+                    },
+                    body: body,
+                    signal: AbortSignal.timeout(timeoutMs),
+                });
+                if (response.status === 401 || response.status === 403) {
+                    throw new ApiError('E_REMOTE_AUTH', `认证失败（${response.status}）`, response.status);
+                }
+                if (response.status >= 400 && response.status < 500) {
+                    const detail = await response.text().catch(() => '');
+                    throw new ApiError(`E_HTTP_${response.status}`, detail.slice(0, 200) || `HTTP ${response.status}`, response.status);
+                }
+                if (!response.ok) {
+                    throw new ApiError('E_REMOTE_5XX', `服务端错误（${response.status}）`, response.status);
+                }
+                return expectBytes ? Buffer.from(await response.arrayBuffer()) : response;
+            }
+            catch (error) {
+                lastError = error;
+                const retryable = !(error instanceof ApiError) || error.code === 'E_REMOTE_5XX';
+                if (!retryable || attempt === retries)
+                    throw error;
+                await sleep(200 * 2 ** attempt);
+            }
+        }
+        throw lastError;
+    }
+    const parseJson = async (response) => {
+        const text = await response.text();
+        return text ? JSON.parse(text) : null;
+    };
+    /**
+     * 用同一 accountKey 取回同一个 token（不签发新 token）。
+     * 抽成独立函数：register 里改走 login 时不依赖 `this`，解构调用也不会炸。
+     */
+    async function loginWith(accountKey) {
+        const response = await request('POST', '/v1/auth/login', { body: JSON.stringify({ accountKey }) });
+        const data = await parseJson(response);
+        const token = String(data?.token ?? '');
+        persistAuth({ token, accountKeyHint: accountKey.slice(0, 6), registeredAt: new Date().toISOString() });
+        return { ok: true, token };
+    }
+    return {
+        id: 'api',
+        baseUrl,
+        get token() {
+            return token;
+        },
+        /** 首次注册；已存在（409）时改走 login，取回同一个 token。 */
+        async register(accountKey) {
+            try {
+                const response = await request('POST', '/v1/auth/register', { body: JSON.stringify({ accountKey }) });
+                const data = await parseJson(response);
+                const token = String(data?.token ?? '');
+                persistAuth({ token, accountKeyHint: accountKey.slice(0, 6), registeredAt: new Date().toISOString() });
+                return { ok: true, token };
+            }
+            catch (error) {
+                if (error.code === 'E_HTTP_409')
+                    return loginWith(accountKey);
+                throw error;
+            }
+        },
+        login: loginWith,
+        async reset() {
+            await request('POST', '/v1/auth/reset');
+            clearAuth();
+            return { ok: true };
+        },
+        async test() {
+            try {
+                const response = await request('GET', '/v1/quota');
+                const data = await parseJson(response);
+                return { ok: true, detail: `配额 ${data?.used ?? 0}/${data?.limit ?? 0} 字节` };
+            }
+            catch (error) {
+                return { ok: false, detail: error.message };
+            }
+        },
+        async list() {
+            const response = await request('GET', '/v1/packages');
+            const data = await parseJson(response);
+            return (data?.packages ?? []).map((item) => ({
+                name: item.id,
+                size: item.size,
+                modifiedAt: item.createdAt,
+            }));
+        },
+        async meta(id) {
+            if (!isPackageId(id))
+                throw new ApiError('E_BAD_NAME', `非法包名: ${id}`);
+            const response = await request('GET', `/v1/packages/${encodeURIComponent(id)}/meta`);
+            return parseJson(response);
+        },
+        async get(id) {
+            if (!isPackageId(id))
+                throw new ApiError('E_BAD_NAME', `非法包名: ${id}`);
+            return request('GET', `/v1/packages/${encodeURIComponent(id)}`, { expectBytes: true });
+        },
+        async put(id, data) {
+            if (!isPackageId(id))
+                throw new ApiError('E_BAD_NAME', `非法包名: ${id}`);
+            await request('PUT', `/v1/packages/${encodeURIComponent(id)}`, {
+                body: data,
+                expectBytes: true,
+                headers: { 'content-type': 'application/octet-stream' },
+            });
+        },
+        async remove(id) {
+            if (!isPackageId(id))
+                throw new ApiError('E_BAD_NAME', `非法包名: ${id}`);
+            await request('DELETE', `/v1/packages/${encodeURIComponent(id)}`);
+        },
+        /** 导出我的全部数据（服务端打包当前包 + 元数据）。 */
+        async exportPackage() {
+            return request('GET', '/v1/export', { expectBytes: true });
+        },
+    };
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pandablessing/dsh-user-sync",
-  "version": "1.0.12",
-  "description": "DeepSeek Harness 用户级配置同步插件",
+  "version": "1.0.15",
+  "description": "DSH用户级配置同步插件，更新需重启DSH",
   "type": "module",
   "main": "lib/index.js",
   "exports": {