@jingyi0605/codingns4dsh 0.1.0 → 0.1.1

package/data/build/dist/client/account-bar.d.ts

@@ -1,9 +1,9 @@
 import type { CodingNsSettings } from '../shared/contracts/config.js';
 import type { CodingNsRpcClient } from './features/types.js';
-import type { SettingsScope } from '@deepseek-ai/dsh-client-ui-settings/client';
+import type { CodingNsSettingsStore } from '../dsh-capabilities/settings-store.js';
 export interface AccountBarController {
     dispose(): void;
 }
 /** 在 DSH 设置触发器旁挂载统一账户入口，兼容侧栏横排与收起竖排。 */
-export declare function startCodingNsAccountBar(rpc: CodingNsRpcClient, dom?: Document, settings?: SettingsScope<CodingNsSettings>): AccountBarController;
+export declare function startCodingNsAccountBar(rpc: CodingNsRpcClient, dom?: Document, _settings?: CodingNsSettingsStore<CodingNsSettings>): AccountBarController;
 //# sourceMappingURL=account-bar.d.ts.map

package/data/build/dist/client/account-bar.js

@@ -1,10 +1,12 @@
 import { CODINGNS_RPC_CHANNEL } from '../shared/contracts/transport.js';
+import { LOGIN_PROTECTION_SESSION_EVENT, readLoginProtectionSession, writeLoginProtectionSession } from './features/login-protection-session.js';
+import { dshThemeColor } from './theme.js';
 const SETTINGS_BUTTON_SELECTOR = 'button[aria-label="设置"]';
 const ACCOUNT_ATTRIBUTE = 'data-codingns-account-button';
 const MENU_ATTRIBUTE = 'data-codingns-account-menu';
 const POLL_MS = 5_000;
 /** 在 DSH 设置触发器旁挂载统一账户入口，兼容侧栏横排与收起竖排。 */
-export function startCodingNsAccountBar(rpc, dom, settings) {
+export function startCodingNsAccountBar(rpc, dom, _settings) {
     const currentDocument = dom ?? (typeof document === 'undefined' ? undefined : document);
     if (currentDocument === undefined)
         return { dispose() { } };
@@ -18,8 +20,8 @@ export function startCodingNsAccountBar(rpc, dom, settings) {
     let rendering = false;
     let closeMenuListener;
     let auth = loggedOutSnapshot();
-    let local = { username: '', enabled: false };
-    let relayAccessEnabled = false;
+    let local = null;
+    let localRelay = readRelayLoginIdentity();
     let status;
     let latency;
     let busy = false;
@@ -44,14 +46,13 @@ export function startCodingNsAccountBar(rpc, dom, settings) {
         const started = performance.now();
         const [nextAuth, nextLocal, nextStatus] = await Promise.allSettled([
             call('auth/snapshot', {}),
-            call('lanAccessDsh/login/get', {}),
+            fetchLocalIdentity(root),
             call('host/status', {}),
         ]);
         if (nextAuth.status === 'fulfilled')
             auth = nextAuth.value;
-        if (nextLocal.status === 'fulfilled')
-            local = nextLocal.value;
-        relayAccessEnabled = settings?.getSnapshot().value?.modules?.reverseProxy === true;
+        local = nextLocal.status === 'fulfilled' ? nextLocal.value : null;
+        localRelay = readRelayLoginIdentity();
         if (nextStatus.status === 'fulfilled') {
             status = nextStatus.value;
             latency = Math.max(0, Math.round(performance.now() - started));
@@ -68,7 +69,7 @@ export function startCodingNsAccountBar(rpc, dom, settings) {
     const scan = () => {
         if (disposed)
             return;
-        if (!local.enabled && !relayAccessEnabled) {
+        if (!isAccountAuthenticated()) {
             removeAccountBar();
             observeDom = true;
             return;
@@ -100,6 +101,8 @@ export function startCodingNsAccountBar(rpc, dom, settings) {
             display: 'flex',
             alignItems: 'center',
             gap: '4px',
+            width: '100%',
+            boxSizing: 'border-box',
         });
         updateAccountLayout(parent, settings, button);
         resizeObserver?.disconnect();
@@ -119,7 +122,8 @@ export function startCodingNsAccountBar(rpc, dom, settings) {
             return;
         button.dataset.codingnsWide = mode;
         parent.style.flexDirection = wide ? 'row' : 'column';
-        parent.style.justifyContent = wide ? 'flex-start' : 'flex-end';
+        parent.style.justifyContent = 'flex-end';
+        button.style.marginLeft = wide ? 'auto' : '0';
         button.style.order = wide ? '2' : '1';
         settings.style.order = wide ? '1' : '2';
     };
@@ -155,10 +159,11 @@ export function startCodingNsAccountBar(rpc, dom, settings) {
     };
     observer = typeof MutationObserver === 'undefined' ? undefined : new MutationObserver(observerCallback);
     observer?.observe(root.documentElement, { childList: true, subtree: true, attributes: true, attributeFilter: ['aria-expanded'] });
-    const unsubscribeSettings = settings?.subscribe(() => {
-        relayAccessEnabled = settings.getSnapshot().value?.modules?.reverseProxy === true;
+    const onLoginProtectionSessionChanged = () => {
+        localRelay = readRelayLoginIdentity();
         renderAll();
-    });
+    };
+    root.defaultView?.addEventListener(LOGIN_PROTECTION_SESSION_EVENT, onLoginProtectionSessionChanged);
     timer = setInterval(() => { void refresh(); }, POLL_MS);
     void refresh();
     return {
@@ -168,9 +173,9 @@ export function startCodingNsAccountBar(rpc, dom, settings) {
             disposed = true;
             if (timer !== undefined)
                 clearInterval(timer);
-            unsubscribeSettings?.();
             observer?.disconnect();
             resizeObserver?.disconnect();
+            root.defaultView?.removeEventListener(LOGIN_PROTECTION_SESSION_EVENT, onLoginProtectionSessionChanged);
             if (closeMenuListener !== undefined) {
                 root.removeEventListener('click', closeMenuListener, true);
                 closeMenuListener = undefined;
@@ -188,19 +193,36 @@ export function startCodingNsAccountBar(rpc, dom, settings) {
         root.querySelectorAll(`button[${ACCOUNT_ATTRIBUTE}]`).forEach((node) => node.remove());
     }
     function renderButton(button) {
-        const identity = auth.account !== null
-            ? auth.account.email
-            : auth.status === 'authenticated' ? 'Codingns4DSH'
-                : local.enabled && local.username ? local.username : '用户';
+        const account = activeAccount();
+        const identity = account?.identity ?? '用户';
         button.title = `${identity} · 点击管理登录`;
         button.setAttribute('aria-label', `用户：${identity}`);
-        const authKind = auth.account !== null || auth.status === 'authenticated' ? 'codingns' : local.enabled ? 'local' : 'unknown';
-        button.dataset.codingnsAuth = authKind;
+        button.dataset.codingnsAuth = account?.kind ?? 'unknown';
         const statusDot = button.querySelector('[data-codingns-account-status]');
         if (statusDot !== null)
-            statusDot.style.background = authKind === 'unknown'
-                ? 'var(--dsw-alias-label-tertiary, #8b8d91)'
-                : 'var(--dsw-alias-state-success-primary, #35b66b)';
+            statusDot.style.background = 'var(--dsw-alias-state-success-primary, #35b66b)';
+    }
+    function activeAccount() {
+        const remote = isRemoteContext();
+        if (isLoopbackPage() && !remote)
+            return null;
+        if (local !== null)
+            return { kind: 'local', identity: local.username, scope: 'lan' };
+        if (!remote)
+            return null;
+        if (auth.status === 'authenticated' && auth.account !== null) {
+            return { kind: 'codingns', identity: auth.account.email };
+        }
+        if (localRelay !== null)
+            return { kind: 'local', identity: localRelay.username, scope: 'relay' };
+        return null;
+    }
+    function isAccountAuthenticated() {
+        return activeAccount() !== null;
+    }
+    function isLoopbackPage() {
+        const hostname = root.defaultView?.location.hostname.toLowerCase().replace(/\.$/u, '').replace(/^\[|\]$/gu, '') ?? '';
+        return hostname === 'localhost' || hostname === '127.0.0.1' || hostname === '::1' || hostname === '::ffff:127.0.0.1';
     }
     function toggleMenu(button) {
         const existing = root.querySelector(`[${MENU_ATTRIBUTE}]`);
@@ -248,10 +270,10 @@ export function startCodingNsAccountBar(rpc, dom, settings) {
         });
     }
     function renderMenu(menu) {
-        const identity = auth.account !== null
-            ? auth.account.email
-            : auth.status === 'authenticated' ? 'Codingns4DSH 账号'
-                : local.enabled && local.username ? `${local.username}（本地账号）` : '未识别账号';
+        const account = activeAccount();
+        const identity = account?.kind === 'codingns' ? account.identity
+            : account !== null ? `${account.identity}（本地账号）`
+                : '未识别账号';
         const access = relayModeLabel();
         menu.innerHTML = '';
         menu.append(textNode(root, identity, 'strong'));
@@ -273,12 +295,21 @@ export function startCodingNsAccountBar(rpc, dom, settings) {
         busy = true;
         renderMenu(menu);
         try {
-            // 注销目标由当前访问入口决定；LAN 页面上的 Host 可能仍保留中继站
-            // 会话，但不能因为注销本地登录而一并清掉它。
-            if (resolveAccountLogoutTarget() === 'relay')
-                await call('auth/logout', {});
-            else
+            const account = activeAccount();
+            if (account?.kind === 'codingns') {
+                if (!isRemoteContext() || typeof window === 'undefined' || window.parent === window) {
+                    throw new Error('Codingns Connect 账号只能从远程访问页面注销');
+                }
+                // srcdoc 沙箱中的 location.origin 可能为 "null"；父页面会按 iframe 窗口校验来源。
+                window.parent.postMessage({ kind: 'codingns4dsh:remote-logout' }, '*');
+                return;
+            }
+            else if (account?.scope === 'relay')
+                writeLoginProtectionSession(undefined);
+            else if (account?.scope === 'lan')
                 await fetch('/__codingns/logout', { credentials: 'include', redirect: 'manual' });
+            else
+                throw new Error('当前页面没有可注销的账号会话');
             if (typeof location !== 'undefined')
                 location.reload();
         }
@@ -289,6 +320,39 @@ export function startCodingNsAccountBar(rpc, dom, settings) {
         }
     }
 }
+async function fetchLocalIdentity(dom) {
+    const response = await (dom.defaultView?.fetch.bind(dom.defaultView) ?? fetch)('/__codingns/session', {
+        credentials: 'same-origin',
+        cache: 'no-store',
+        headers: { Accept: 'application/json' },
+    });
+    if (!response.ok || !response.headers.get('content-type')?.includes('application/json'))
+        return null;
+    const value = await response.json();
+    return value.authenticated === true && typeof value.username === 'string'
+        ? { username: value.username }
+        : null;
+}
+function readRelayLoginIdentity() {
+    const token = readLoginProtectionSession();
+    if (token === undefined)
+        return null;
+    try {
+        const encoded = token.split('.', 1)[0];
+        if (encoded === undefined)
+            return null;
+        const padded = encoded.replace(/-/gu, '+').replace(/_/gu, '/');
+        const binary = atob(padded.padEnd(Math.ceil(padded.length / 4) * 4, '='));
+        const bytes = Uint8Array.from(binary, (character) => character.charCodeAt(0));
+        const payload = JSON.parse(new TextDecoder().decode(bytes));
+        if (payload.scope !== 'relay' || typeof payload.username !== 'string' || typeof payload.expiresAt !== 'number' || payload.expiresAt <= Date.now())
+            return null;
+        return { username: payload.username };
+    }
+    catch {
+        return null;
+    }
+}
 function createAccountButton(dom) {
     const button = dom.createElement('button');
     button.type = 'button';
@@ -350,7 +414,7 @@ function createAccountIcon(dom) {
 function createMenu(dom) {
     const menu = dom.createElement('div');
     menu.setAttribute(MENU_ATTRIBUTE, '');
-    Object.assign(menu.style, { position: 'fixed', zIndex: '10000', width: '260px', display: 'flex', flexDirection: 'column', gap: '8px', padding: '12px', boxSizing: 'border-box', color: 'var(--dsw-alias-label-primary, CanvasText)', background: 'var(--dsw-specific-menu, Canvas)', border: '1px solid var(--dsw-alias-border-l2, #d9d9d9)', borderRadius: '8px', boxShadow: 'var(--dsw-elevation-prominent, 0 12px 40px rgba(0,0,0,.25))', fontSize: '12px' });
+    Object.assign(menu.style, { position: 'fixed', zIndex: '10000', width: '260px', display: 'flex', flexDirection: 'column', gap: '8px', padding: '12px', boxSizing: 'border-box', color: dshThemeColor.labelPrimary, background: dshThemeColor.menuBackground, border: `1px solid ${dshThemeColor.border}`, borderRadius: '8px', boxShadow: dshThemeColor.prominentShadow, fontSize: '12px' });
     return menu;
 }
 function menuButtonStyle() { return { marginTop: '4px', minHeight: '30px', border: '1px solid var(--dsw-alias-border-l2, #d9d9d9)', borderRadius: '6px', color: 'inherit', background: 'transparent', cursor: 'pointer' }; }
@@ -379,13 +443,6 @@ function formatPercent(value) { return `${Math.round(value)}%`; }
 function formatBytes(value) { if (value < 1024 ** 3)
     return `${Math.round(value / 1024 ** 2)} MB`; return `${(value / 1024 ** 3).toFixed(1)} GB`; }
 function isRemoteContext() { return globalThis.__CODINGNS4DSH_REMOTE_WEB_CONTEXT__ === true; }
-function resolveAccountLogoutTarget() {
-    if (isRemoteContext())
-        return 'relay';
-    if (typeof location !== 'undefined' && location.hostname.replace(/\.$/u, '').toLowerCase() === 'dsh.codingns.com')
-        return 'relay';
-    return 'local';
-}
 function relayModeLabel() {
     const state = globalThis;
     if (state.__CODINGNS4DSH_RELAY_MODE__ === 'relay')