@mangoc/dsh-sub2api-sync 0.2.8 → 0.2.9

package/lib/client.js

@@ -40,15 +40,17 @@ const PKG_NAME = "@mangoc/dsh-sub2api-sync";
 const NS = "sub2api-sync";
 const zh = {
 	nav: "Sub2API 同步",
-	localOnlyWarning: "当前页面进程本地，配置仅本页生效",
+	localOnlyWarning: "当前为跨设备连接：配置只读，仅本页生效",
 	configUnavailable: "配置暂不可用：宿主未连接或未暴露该设置条目",
+	routesUnreachableWarning: "动作路由不可达：当前连接可能经 DSH Remote 中继，或宿主半侧未就绪——登录、勾选与同步请回到电脑上的 DSH Web",
 	nameLine: "sub2api · {instance}",
 	nameLineSite: "{name} · {instance}",
 	balanceLabel: "余额 {amount}",
 	balanceTitle: "面板账号余额（同步结束自动刷新）",
-	signedOut: "未登录",
+	signedOut: "未连接面板",
 	signedInAs: "已登录：{email}",
 	signIn: "登录",
+	connectPanel: "连接面板",
 	signOut: "登出",
 	signOutDone: "已登出",
 	baseURLLabel: "实例地址",
@@ -57,8 +59,8 @@ const zh = {
 	savedNotice: "已保存",
 	writeRefused: "写入未被接受，已恢复为最新状态",
 	accountTitle: "面板账号",
-	accountSignedOutHint: "登录后可发现分组、勾选同步，自动为每个分组准备 key",
-	signInTitle: "登录 sub2api 面板",
+	accountSignedOutHint: "连接面板后自动发现分组并准备 key，勾选即可同步",
+	signInTitle: "连接 sub2api 面板",
 	channelLabel: "登录方式",
 	channelPassword: "密码登录",
 	channelOAuth: "网页授权",
@@ -72,7 +74,7 @@ const zh = {
 	signedInOAuthAccount: "{account} · 已通过网页授权登录",
 	emailPlaceholder: "you@example.com",
 	passwordLabel: "密码",
-	passwordHint: "留空则使用宿主已保存的密码重新登录",
+	passwordHint: "留空则使用已保存的密码重新登录",
 	twoFactorPlaceholder: "6 位数字验证码",
 	twoFactorSubmit: "验证",
 	back: "返回",
@@ -100,7 +102,7 @@ const zh = {
 	actionFailed: "失败",
 	actionFailedLabel: "操作失败：{message}",
 	bundleTemplateLabel: "供应商名模板",
-	bundleTemplateHint: "displayName 模板，必须包含 {keyName} 占位符",
+	bundleTemplateHint: "供应商显示名模板，须包含 {keyName} 占位符",
 	bundleTemplateInvalid: "模板必须包含 {keyName} 占位符",
 	bundleKeyQuotaLabel: "新建 key 配额（USD）",
 	bundleKeyQuotaHint: "自动建 key 时应用；留空不设置",
@@ -114,7 +116,7 @@ const zh = {
 	bundleDeleteOrphanHint: "仅对记录过 keyId 的分组生效",
 	bundleEnrichLabel: "补全模型元数据",
 	bundleEnrichHint: "同步时按模型 id 从 models.dev 补全容量元数据；关闭则仅用内置快照（离线）",
-	bundleAllowRemoteLabel: "允许私网设备调用动作接口",
+	bundleAllowRemoteLabel: "允许私网设备调用动作路由",
 	bundleAllowRemoteWarning: "开启后同源或私网页面可改写模型路由与凭据——仅在可信内网开启",
 	bundleAdvancedHint: "protocolOverrides / compatTemplate 高级字段请编辑 cordis.patch.yml",
 	badgeManagedTag: "Sub2API 同步",
@@ -128,7 +130,9 @@ const zh = {
 	detailBadgeSynced: "已同步 {count} 组",
 	detailBadgeSignedOut: "未连接面板",
 	detailSectionTitle: "最近同步",
-	detailSectionEmpty: "还没有同步过——在设置 → Sub2API 同步 完成首次同步",
+	detailSectionEmpty: "还没有同步过",
+	detailConnectTitle: "面板连接",
+	detailConnectHint: "连接面板后即可勾选 key 并同步，无需前往设置页",
 	activationTitle: "开始使用 Sub2API 同步",
 	activationStep1: "1. 在设置中连接面板（账号密码或网页授权）",
 	activationStep2: "2. 在 Keys 卡勾选要同步的 key（可跨分组）",
@@ -143,9 +147,9 @@ const zh = {
 	keyNameLabel: "Key 名称",
 	keyNameHint: "默认与分组同名",
 	keyGroupPlaceholder: "选择分组",
-	keyCreated: "已创建并绑定：{name}",
+	keyCreated: "已创建并勾选：{name}",
 	keysListEmpty: "还没有 key",
-	keysListLoading: "正在读取 keys…",
+	keysListLoading: "正在读取 key…",
 	keysSearchPlaceholder: "搜索 key…",
 	keysSearchEmpty: "没有匹配的 key",
 	syncSelected: "同步所选（{count}）",
@@ -156,15 +160,17 @@ const zh = {
 };
 const en = {
 	nav: "Sub2API Sync",
-	localOnlyWarning: "This page runs process-local; configuration applies to this page only",
+	localOnlyWarning: "Cross-device connection: configuration is read-only and applies to this page only",
 	configUnavailable: "Configuration is unavailable: the host is not connected or does not expose this entry",
+	routesUnreachableWarning: "Action routes are unreachable: this connection may go through a DSH-Remote relay or the host half is not ready — sign in, select keys and sync from the desktop DSH Web",
 	nameLine: "sub2api · {instance}",
 	nameLineSite: "{name} · {instance}",
 	balanceLabel: "Balance {amount}",
 	balanceTitle: "Panel account balance (refreshed after each sync)",
-	signedOut: "Signed out",
+	signedOut: "Not connected",
 	signedInAs: "Signed in as {email}",
 	signIn: "Sign in",
+	connectPanel: "Connect panel",
 	signOut: "Sign out",
 	signOutDone: "Signed out",
 	baseURLLabel: "Instance address",
@@ -173,8 +179,8 @@ const en = {
 	savedNotice: "Saved",
 	writeRefused: "The write was not accepted; the latest state was restored",
 	accountTitle: "Panel account",
-	accountSignedOutHint: "Sign in to discover groups, pick the ones to sync, and let each group get its key prepared",
-	signInTitle: "Sign in to the sub2api panel",
+	accountSignedOutHint: "Connect the panel to discover its groups and prepare a key per group; tick the ones to sync",
+	signInTitle: "Connect to the sub2api panel",
 	channelLabel: "Sign-in channel",
 	channelPassword: "Password",
 	channelOAuth: "Web authorization",
@@ -188,7 +194,7 @@ const en = {
 	signedInOAuthAccount: "{account} · Signed in via web authorization",
 	emailPlaceholder: "you@example.com",
 	passwordLabel: "Password",
-	passwordHint: "Leave empty to re-login with the password the host already stored",
+	passwordHint: "Leave empty to sign in again with the stored password",
 	twoFactorPlaceholder: "6-digit code",
 	twoFactorSubmit: "Verify",
 	back: "Back",
@@ -216,7 +222,7 @@ const en = {
 	actionFailed: "failed",
 	actionFailedLabel: "Operation failed: {message}",
 	bundleTemplateLabel: "Provider name template",
-	bundleTemplateHint: "displayName template; must contain the {keyName} placeholder",
+	bundleTemplateHint: "Provider display-name template; must contain the {keyName} placeholder",
 	bundleTemplateInvalid: "The template must contain the {keyName} placeholder",
 	bundleKeyQuotaLabel: "Created key quota (USD)",
 	bundleKeyQuotaHint: "Applied to auto-created keys; empty leaves it unset",
@@ -244,7 +250,9 @@ const en = {
 	detailBadgeSynced: "{count} group(s) synced",
 	detailBadgeSignedOut: "Panel not connected",
 	detailSectionTitle: "Last sync",
-	detailSectionEmpty: "Never synced — finish the first sync in Settings → Sub2API Sync",
+	detailSectionEmpty: "Never synced",
+	detailConnectTitle: "Panel connection",
+	detailConnectHint: "Connect the panel to pick keys and sync — no need to visit the settings page",
 	activationTitle: "Get started with Sub2API Sync",
 	activationStep1: "1. Connect the panel in Settings (account password or web authorization)",
 	activationStep2: "2. Tick the keys to sync on the Keys card (cross-group)",
@@ -259,7 +267,7 @@ const en = {
 	keyNameLabel: "Key name",
 	keyNameHint: "Defaults to the group name",
 	keyGroupPlaceholder: "Pick a group",
-	keyCreated: "Created and bound: {name}",
+	keyCreated: "Created and ticked: {name}",
 	keysListEmpty: "No keys yet",
 	keysListLoading: "Loading keys…",
 	keysSearchPlaceholder: "Search keys…",
@@ -439,9 +447,20 @@ function createPluginApi() {
 //#endregion
 //#region src/client/status.ts
 const POLL_MS = 5e3;
+/** Consecutive failed rounds before the card shows the unreachable banner. */
+const DEGRADED_AFTER = 2;
 let snapshot;
 let timer;
 const listeners = new Set();
+/** Reachability of the plugin's action routes, as observed by the poller. */
+let reachable = true;
+let failures = 0;
+const healthListeners = new Set();
+function publishHealth(next) {
+	if (next === reachable) return;
+	reachable = next;
+	for (const listener of healthListeners) listener();
+}
 function publish(next) {
 	if (next === snapshot) return;
 	snapshot = next;
@@ -451,7 +470,12 @@ function publish(next) {
 async function poll() {
 	try {
 		publish(await callJson(ROUTES.status));
-	} catch {}
+		failures = 0;
+		publishHealth(true);
+	} catch {
+		failures += 1;
+		if (failures >= DEGRADED_AFTER) publishHealth(false);
+	}
 }
 function subscribe(listener) {
 	listeners.add(listener);
@@ -476,6 +500,18 @@ const statusSource = {
 function useStatus() {
 	return (0, react.useSyncExternalStore)(subscribe, getSnapshot);
 }
+const statusHealthSource = {
+	getSnapshot: () => reachable,
+	subscribe(fn) {
+		healthListeners.add(fn);
+		return () => {
+			healthListeners.delete(fn);
+		};
+	}
+};
+function useStatusHealth() {
+	return (0, react.useSyncExternalStore)(statusHealthSource.subscribe, statusHealthSource.getSnapshot);
+}
 function getSnapshot() {
 	return snapshot;
 }
@@ -940,6 +976,88 @@ const CSS = `
   font-size: 13px;
   line-height: 22px;
 }
+
+/* Mobile (dsh-Go web island / narrow windows): stack the row layouts, keep
+   interactive rows at Android's 44dp touch floor, and let the anchored group
+   panel clear the soft keyboard. The desktop spec above is untouched — every
+   rule here is scoped to the narrow viewport. */
+@media (max-width: 640px) {
+  .s2s-section {
+    gap: 12px;
+  }
+
+  .s2s-row,
+  .s2s-inline {
+    flex-direction: column;
+    align-items: stretch;
+    gap: 8px;
+  }
+
+  .s2s-actions {
+    justify-content: flex-start;
+  }
+
+  .s2s-actions .s2s-feedback {
+    white-space: normal;
+  }
+
+  .s2s-keyRow {
+    grid-template-columns: minmax(0, 1fr);
+    min-height: 44px;
+    padding: 8px 10px;
+  }
+
+  .s2s-keyRow > :last-child {
+    justify-self: start;
+    text-align: left;
+  }
+
+  .s2s-selectField,
+  .s2s-groupOption {
+    min-height: 44px;
+  }
+
+  .s2s-input,
+  .s2s-groupPicker {
+    flex-basis: 100%;
+  }
+
+  .s2s-searchInput {
+    width: 100%;
+    flex: 1 1 auto;
+  }
+
+  .s2s-pager {
+    justify-content: center;
+  }
+
+  .s2s-footerStrip {
+    flex-direction: column;
+    align-items: flex-start;
+    gap: 6px;
+  }
+
+  .s2s-reportRemove {
+    margin-left: 0;
+    align-self: flex-end;
+  }
+
+  /* Keyboard clearance: the fixed-position panel must not run under the
+     soft keyboard; dvh tracks the visual viewport on Android WebViews. */
+  .s2s-groupPanel {
+    max-height: 60dvh;
+  }
+}
+
+/* Notch and gesture-bar insets on standalone web islands. */
+@supports (padding: max(0px)) {
+  @media (max-width: 640px) {
+    .s2s-section {
+      padding-left: max(8px, env(safe-area-inset-left));
+      padding-right: max(8px, env(safe-area-inset-right));
+    }
+  }
+}
 `;
 function ensureCss() {
 	if (document.querySelector("style[data-plugin=\"dsh-sub2api-sync\"]") !== null) return;
@@ -1830,6 +1948,7 @@ function actionToneOf(action) {
 }
 function Sub2apiSyncSection({ t, api, config, useStatus: useStatus$1 }) {
 	const status = useStatus$1((value) => value);
+	const routesReachable = useStatusHealth();
 	const snapshot$1 = useConfigForm(config);
 	const configValues = snapshot$1.value;
 	const writable = snapshot$1.writable;
@@ -2025,6 +2144,10 @@ function Sub2apiSyncSection({ t, api, config, useStatus: useStatus$1 }) {
 				className: "s2s-warn",
 				children: t("configUnavailable")
 			}),
+			!routesReachable && (0, react_jsx_runtime.jsx)("p", {
+				className: "s2s-warn",
+				children: t("routesUnreachableWarning")
+			}),
 			(0, react_jsx_runtime.jsx)("section", {
 				className: "s2s-card",
 				children: (0, react_jsx_runtime.jsxs)("div", {
@@ -2078,7 +2201,7 @@ function Sub2apiSyncSection({ t, api, config, useStatus: useStatus$1 }) {
 								onClick: () => {
 									setSignInOpen(true);
 								},
-								children: t("signIn")
+								children: t("connectPanel")
 							})
 						]
 					})]
@@ -2254,22 +2377,32 @@ function parseNumber(text) {
 function messageOf(error) {
 	return error instanceof Error ? error.message : String(error);
 }
-function BundleConfigCard({ view, form, t }) {
-	if (view !== "page" || form === undefined) return null;
+function BundleConfigCard({ view, t, config }) {
+	if (view !== "page") return null;
 	return (0, react_jsx_runtime.jsx)(BundleConfigFields, {
-		form,
+		config,
 		t
 	});
 }
-function BundleConfigFields({ form, t }) {
-	const values = form.state.value ?? {};
-	const writable = form.state.writable;
+function BundleConfigFields({ config, t }) {
+	const snapshot$1 = useConfigForm(config);
+	const values = snapshot$1.value ?? {};
+	const writable = snapshot$1.writable;
 	const [busy, setBusy] = (0, react.useState)(false);
 	const [feedback, setFeedback] = (0, react.useState)(undefined);
 	const run = (ops) => {
 		setBusy(true);
 		setFeedback(undefined);
-		form.mutate(ops).then((accepted) => {
+		const apply$1 = async () => {
+			for (const op of ops) {
+				const field = op.path[0];
+				if (field === undefined || field === "") return false;
+				const accepted = op.op === "set" ? await setField(config, field, op.value) : await unsetField(config, field);
+				if (!accepted) return false;
+			}
+			return true;
+		};
+		apply$1().then((accepted) => {
 			setFeedback(accepted ? {
 				tone: "ok",
 				text: t("savedNotice")
@@ -2529,6 +2662,9 @@ function footerModel(status) {
 		...status?.lastReportAt !== undefined ? { lastReportAt: status.lastReportAt } : {}
 	};
 }
+function detailCardModel(status) {
+	return status?.auth?.signedIn === true ? "report" : "connect";
+}
 function relativeMinutes(at, now) {
 	const minutes = Math.max(0, Math.floor((now - at) / 6e4));
 	if (minutes < 1) return { key: "footerJustNow" };
@@ -2614,11 +2750,64 @@ function DetailBadgeBody({ t }) {
 	});
 }
 function DetailSection(props) {
-	const { subject, t } = props;
+	const { subject, t, api, config } = props;
 	if (!isOwnBundle(subject)) return null;
-	return (0, react_jsx_runtime.jsx)(DetailSectionBody, { t });
+	return (0, react_jsx_runtime.jsx)(DetailSectionBody, {
+		t,
+		api,
+		config
+	});
 }
-function DetailSectionBody({ t }) {
+function DetailSectionBody({ t, api, config }) {
+	const status = useStatus();
+	const reachable$1 = useStatusHealth();
+	const snapshot$1 = useConfigForm(config);
+	const [signInOpen, setSignInOpen] = (0, react.useState)(false);
+	if (detailCardModel(status) === "connect") return (0, react_jsx_runtime.jsxs)("section", {
+		className: "s2s-card",
+		children: [
+			(0, react_jsx_runtime.jsx)("span", {
+				className: "s2s-name",
+				children: t("detailConnectTitle")
+			}),
+			(0, react_jsx_runtime.jsx)("p", {
+				className: "s2s-hint",
+				children: t("detailConnectHint")
+			}),
+			(0, react_jsx_runtime.jsx)("div", {
+				className: "s2s-actions",
+				children: (0, react_jsx_runtime.jsx)(__deepseek_ai_dsh_client_ui_primitives.Button, {
+					variant: "primary",
+					disabled: !reachable$1,
+					onClick: () => {
+						setSignInOpen(true);
+					},
+					children: t("connectPanel")
+				})
+			}),
+			!reachable$1 && (0, react_jsx_runtime.jsx)("p", {
+				className: "s2s-warn",
+				children: t("routesUnreachableWarning")
+			}),
+			(0, react_jsx_runtime.jsx)(SignInDialog, {
+				open: signInOpen,
+				onClose: () => {
+					setSignInOpen(false);
+				},
+				api,
+				config,
+				baseURL: snapshot$1.value?.baseURL,
+				writable: snapshot$1.writable,
+				onSignedIn: () => {
+					void refreshStatus();
+				},
+				t
+			})
+		]
+	});
+	return (0, react_jsx_runtime.jsx)(DetailReportCard, { t });
+}
+function DetailReportCard({ t }) {
 	const status = useStatus();
 	const report = status?.lastReport;
 	return (0, react_jsx_runtime.jsxs)("section", {
@@ -2708,10 +2897,12 @@ function mount(ctx) {
 		locale: NS,
 		inject: () => sectionOps
 	}, Sub2apiSyncSection));
+	const bundleConfigOps = { config };
 	ctx.slots.inject("plugins.bundle.config", () => ctx.slots.register({
 		name: "plugins.bundle.config",
 		key: PKG_NAME,
-		locale: NS
+		locale: NS,
+		inject: () => bundleConfigOps
 	}, BundleConfigCard));
 	ctx.slots.inject("settings.models.provider-card", () => ctx.slots.register({
 		name: "settings.models.provider-card",
@@ -2729,10 +2920,15 @@ function mount(ctx) {
 		id: "sub2api-sync",
 		locale: NS
 	}, DetailBadge));
+	const detailOps = {
+		api: sectionOps.api,
+		config
+	};
 	ctx.slots.inject("plugins.detail.section", () => ctx.slots.register({
 		name: "plugins.detail.section",
 		id: "sub2api-sync",
-		locale: NS
+		locale: NS,
+		inject: () => detailOps
 	}, DetailSection));
 	const activationOps = { openBundleDetails: () => {
 		const nav = ctx.pluginNavigation;

package/lib/config.d.ts

@@ -25,7 +25,7 @@
  */
 import z from '@deepseek-ai/schemastery';
 import type { ModelTemplate, PiAiRetryPolicy } from './protocols.ts';
-./protocols.jsApiProtocol } from './types.ts';
+./protocols.jsE_PANEL_PASSWORD_REF, type ApiProtocol } from './types.ts';
 /** ./types.jsn overrides over the plugin's built-in lenient retry policy
  * (`SUB2API_RETRY_POLICY`): an absent key inherits the built-in value.
  * YAML-only advanced field (一字段一写面 — the tuning card does not render it). */
@@ -80,12 +80,22 @@ export interface Sub2apiSyncConfig {
     defaultMaxTokens?: number;
     /** Escape hatch: allow action routes from private-network peers (§11). Default false. */
     allowRemoteActions?: boolean;
+    /** dsh-Go native-settings credential slot for the panel password (fixed
+     * ref). The secret value itself lives in the credential store — the
+     * schema only carries the binding and a write-refusing sentinel. */
+    panelCredential?: {
+        /** Mirrors the schema's const projection — the slot ref is fixed. */
+        credentialRef?: typeof NATIVE_PANEL_PASSWORD_REF | null;
+        /** Sentinel input side: the transform refuses any non-empty value, so
+         * this only ever carries the empty default in the config document. */
+        password?: any;
+    };
 }
 export declare const Config: z<Sub2apiSyncConfig, any>;
 /** The default provider-name template — owned by `types.ts` (browser-safe), re-exported here. */
 export { DEFAULT_PROVIDER_NAME_TEMPLATE } from './types.ts';
 /**
- * One resolved volatile field: a stable refe./types.jse `get()` yields the
+ * One resolved volatile field: a stable referenc./types.jset()` yields the
  * current immutable snapshot. Structurally `cosmokit`'s `Volatile<T>`; kept
  * local so this package need not depend on it.
  */

package/lib/dshgo.d.ts

@@ -0,0 +1,35 @@
+/**
+ * dsh-Go native surfaces (NA protocol v1): a 'sync-status' panel plus a
+ * 'sync-strip' composer strip, declared in package.json 'dshGo' and fed
+ * here from the same RouteDeps face the web card's action routes use —
+ * one contract, no duplicated host logic.
+ *
+ * Registration is inert without the dsh-go bridge: ctx.inject(['dshGo'], …)
+ * simply never fires on a host without one (desktop), and 'dshGo' is NOT in
+ * the plugin's top-level 'inject' (per the NA protocol — a top-level entry
+ * would keep the whole plugin from booting there). Do not write ['dshGo?']
+ * either: cordis 4.0.5 has no optional-dependency syntax and treats it as a
+ * permanently-absent service name.
+ *
+ * Long actions are deliberately fire-and-forget: sync/login/logout start in
+ * the background while the invoke answers with a toast immediately. That
+ * keeps the 3-second invoke window irrelevant and behaves identically on
+ * v1.0 Apps (no v1.1 pending channel needed). Fresh state reaches the App
+ * through the data sources' interval re-emit (credential-store reads only —
+ * no network on the tick) plus an immediate publish when a background
+ * action settles; failures surface in the panel's callout instead of a
+ * late toast the v1 effect whitelist cannot deliver.
+ *
+ * @module sub2api-sync/dshgo
+ */
+import type { Context } from '@deepseek-ai/cordis';
+import type { RouteDeps } from './routes./routes.jsxtra host half the RouteDeps face does not carry. */
+export interface DshGoHooks {
+    /** The configured panel email (login needs it; deps only closes over it). */
+    email(): string | undefined;
+}
+/**
+ * Register the native panel and strip. No-op without the bridge; the
+ * callback body only runs on hosts that provide the 'dshGo' service.
+ */
+export declare function registerDshGo(ctx: Context, deps: RouteDeps, hooks: DshGoHooks): void;