@dsh-plus/access-gate 0.1.3 → 0.1.4

package/lib/client.js

@@ -196,14 +196,15 @@ window.__ModuleLoader__.load({
 		//#endregion
 		//#region ../shared/src/client/scope.ts
 		/**
-		* api 直连实现的命名空间 scope（官方配置页 tab 同款模式）。
+		* remote.settings 直连实现的命名空间 scope（官方配置页 tab 同款模式）。
 		* 读：describe 取命名空间视图（脱敏 value/revision + 顶层 writable）；
 		* 刷新：remote `settings/document-updated`（按命名空间过滤）与
 		* `connection/reset`；generation 防旧读覆盖新发布。任何页面 origin
 		* （loopback 或 tailnet 信任域名）下行为一致。
 		* effect 归属调用方 fiber（label 需含插件名以便诊断）。
 		*/
-		function createApiScope(api, ns, c, label) {
+		function createSettingsScope(c, ns, label) {
+			const remote = c.get("remote");
 			let state = {
 				status: "loading",
 				value: void 0,
@@ -218,36 +219,37 @@ window.__ModuleLoader__.load({
 			};
 			const load = async () => {
 				const gen = ++generation;
-				let response;
+				let view;
 				try {
-					response = await api.describe({});
+					const response = await remote.settings.describe();
+					if (!response.ok) return;
+					view = response.value;
 				} catch {
 					return;
 				}
-				if (gen !== generation || !response.result.ok) return;
-				const writable = response.result.value?.writable ?? false;
-				const view = response.result.value?.namespaces.find((candidate) => candidate.ns === ns);
-				if (view === void 0) {
+				if (gen !== generation) return;
+				const namespace = view.namespaces.find((candidate) => candidate.ns === ns);
+				if (namespace === void 0) {
 					publish({
 						status: "unavailable",
 						value: void 0,
 						revision: void 0,
-						writable
+						writable: view.writable
 					});
 					return;
 				}
 				publish({
 					status: "ready",
-					value: view.value,
-					revision: view.revision,
-					writable
+					value: namespace.value,
+					revision: namespace.revision,
+					writable: view.writable
 				});
 			};
 			const refresh = (namespace) => {
 				if (namespace !== void 0 && namespace !== ns) return;
 				load();
 			};
-			const disposers = [c.get("remote").$on("settings/document-updated", refresh), c.on("connection/reset", () => {
+			const disposers = [remote.$on("settings/document-updated", refresh), c.on("connection/reset", () => {
 				load();
 			})];
 			c.effect(() => () => {
@@ -265,6 +267,20 @@ window.__ModuleLoader__.load({
 				load
 			};
 		}
+		/** 以 remote.settings 构造命名空间绑定的 api 面。 */
+		function createNamespaceApi(remote, ns) {
+			return {
+				update: async (patch, expectedRevision) => {
+					const response = await remote.update(ns, patch, expectedRevision);
+					if (!response.ok) throw new Error(response.error.message ?? "settings update failed");
+				},
+				describe: async () => {
+					const response = await remote.describe();
+					if (!response.ok) throw new Error(response.error.message ?? "settings describe failed");
+					return response.value;
+				}
+			};
+		}
 		//#endregion
 		//#region ../shared/src/client/styles.ts
 		/**
@@ -438,10 +454,10 @@ ${extra}
 			}, [value, draft]);
 			(0, react.useEffect)(() => {
 				let alive = true;
-				api.describe({}).then((response) => {
-					if (!alive || !response.result.ok) return;
-					const view = response.result.value?.namespaces.find((ns) => ns.ns === SETTINGS_NS);
-					setTokenConfigured(view?.secrets.some((secret) => secret.path.join(".") === "token" && secret.set) ?? false);
+				api.describe().then((view) => {
+					if (!alive) return;
+					const ns = view.namespaces.find((candidate) => candidate.ns === SETTINGS_NS);
+					setTokenConfigured(ns?.secrets.some((secret) => secret.path.join(".") === "token" && secret.set) ?? false);
 				}).catch(() => {});
 				return () => {
 					alive = false;
@@ -478,12 +494,7 @@ ${extra}
 				const patch = toPatch(draft);
 				if (draft.token !== "") patch.token = draft.token;
 				const revision = scope.getSnapshot().revision;
-				api.update({
-					ns: SETTINGS_NS,
-					patch,
-					...revision !== void 0 ? { expectedRevision: revision } : {}
-				}).then(async (response) => {
-					if (!response.result.ok) throw new Error(response.result.error?.message ?? t("saveFailed"));
+				api.update(patch, revision).then(async () => {
 					await scope.load();
 					const next = scope.getSnapshot().value;
 					if (next !== void 0) setDraft(draftFromValue(next));
@@ -787,8 +798,8 @@ ${extra}
 		const inject = [
 			"slots",
 			"locale",
-			"connection",
-			"remote"
+			"remote",
+			"remote.settings"
 		];
 		function apply(ctx) {
 			const c = ctx;
@@ -800,8 +811,8 @@ ${extra}
 				zh,
 				en
 			}), "access-gate: locale");
-			const api = c.get("connection").api.settings;
-			const scope = createApiScope(api, SETTINGS_NS, c, "access-gate: settings scope");
+			const scope = createSettingsScope(c, SETTINGS_NS, "access-gate: settings scope");
+			const api = createNamespaceApi(c.get("remote").settings, SETTINGS_NS);
 			c.slots.inject("settings.plugin.item", () => c.slots.register({
 				name: "settings.plugin.item",
 				key: SETTINGS_NS,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dsh-plus/access-gate",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "dsh-plus service+ui plugin: dsh web 全量访问围栏——本机直连永久放行，远程按白名单 IP（XFF 还原）或 token（登录页 + cookie）放行",
   "type": "module",
   "main": "lib/index.js",
@@ -23,28 +23,27 @@
   "dsh": {
     "client": {
       "inject": [
-        "@deepseek-ai/dsh-client-runtime",
         "@deepseek-ai/dsh-client-locale",
-        "@deepseek-ai/dsh-client-connection",
+        "@deepseek-ai/dsh-client-ui-renderer",
         "@deepseek-ai/dsh-api-remotes"
       ],
       "platform": "web"
     }
   },
   "dependencies": {
-    "@dsh-plus/shared": "0.1.5"
+    "@dsh-plus/shared": "0.1.6"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-home-paths": "^0.1.0-rc.8",
-    "@deepseek-ai/dsh-settings": "^0.1.0-rc.8",
+    "@deepseek-ai/dsh-home-paths": "^0.1.2-alpha.1",
+    "@deepseek-ai/dsh-settings": "^0.1.2-alpha.1",
     "@deepseek-ai/schemastery": "^3.18.1"
   },
   "devDependencies": {
     "@deepseek-ai/cordis": "4.0.1",
-    "@deepseek-ai/dsh-home-paths": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-settings": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-host-webserver": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-home-paths": "0.1.2-alpha.1",
+    "@deepseek-ai/dsh-settings": "0.1.2-alpha.1",
+    "@deepseek-ai/dsh-host-webserver": "0.1.2-alpha.1",
     "@deepseek-ai/schemastery": "3.18.1",
     "@types/react": "~18.3.1",
     "react": "^18.2.0"

package/src/client/card.tsx

@@ -14,8 +14,8 @@ import {
   type CardStatusState,
   CheckRow,
   IDLE_STATUS,
+  type NamespaceSettingsApi,
   type Scope,
-  type SettingsApi,
   TextField,
 } from '@dsh-plus/shared/client'
 import { type ReactElement, useEffect, useMemo, useState, useSyncExternalStore } from 'react'
@@ -24,7 +24,7 @@ import { SETTINGS_NS } from '../ns.ts'
 export interface CardProps {
   t(key: string): string
   scope: Scope
-  api: SettingsApi
+  api: NamespaceSettingsApi
 }
 
 /** settings 命名空间的脱敏解析值（token 被脱敏剥除）。 */
@@ -126,12 +126,12 @@ export function AccessGateCard(props: CardProps): ReactElement | null {
   useEffect(() => {
     let alive = true
     api
-      .describe({})
-      .then((response) => {
-        if (!alive || !response.result.ok) return
-        const view = response.result.value?.namespaces.find((ns) => ns.ns === SETTINGS_NS)
+      .describe()
+      .then((view) => {
+        if (!alive) return
+        const ns = view.namespaces.find((candidate) => candidate.ns === SETTINGS_NS)
         setTokenConfigured(
-          view?.secrets.some((secret) => secret.path.join('.') === 'token' && secret.set) ?? false,
+          ns?.secrets.some((secret) => secret.path.join('.') === 'token' && secret.set) ?? false,
         )
       })
       .catch(() => {})
@@ -192,15 +192,8 @@ export function AccessGateCard(props: CardProps): ReactElement | null {
     if (draft.token !== '') patch.token = draft.token
     const revision = scope.getSnapshot().revision
     api
-      .update({
-        ns: SETTINGS_NS,
-        patch,
-        ...(revision !== undefined ? { expectedRevision: revision } : {}),
-      })
-      .then(async (response) => {
-        if (!response.result.ok) {
-          throw new Error(response.result.error?.message ?? t('saveFailed'))
-        }
+      .update(patch, revision)
+      .then(async () => {
         await scope.load()
         const next = scope.getSnapshot().value as ConfigValue | undefined
         if (next !== undefined) setDraft(draftFromValue(next))

package/src/client/client.ts

@@ -3,17 +3,21 @@
  * 构建产物为 window.__ModuleLoader__.load({id, factory}) 形式的 CJS factory
  * （包装见 tsdown.config.ts）；样式沿用官方 data-plugin-css 约定，HMR 据此卸载。
  *
- * 类型说明：浏览器半只用到 slots/locale/connection/remote 的很窄一面，
+ * 类型说明：浏览器半只用到 slots/locale/remote 的很窄一面，
  * scope 与基础控件走 @dsh-plus/shared/client 套件（收编自本插件原实现）。
- * rc7 起该插槽为 keyed 槽位：key 必须是卡片编辑的 settings 命名空间
+ * 该插槽为 keyed 槽位：key 必须是卡片编辑的 settings 命名空间
  * （即服务端 settingsNamespace() 注册的同一字面量，见 ../ns.ts），
  * 官方配置页按此 key 与 Host 已注册命名空间配对分发。
- * 配置读写经官方 settings RPC 直连（rc7 起第三方命名空间全量开放；
- * 不复用 settingsScope 服务——非 loopback 页面下它无数据）。
+ * 配置读写经 ctx.remote.settings 直连（0.1.2-alpha.1 起 connection.api.settings
+ * 已移除；不复用 settingsScope 服务——非 loopback 页面下它固定 memory 模式无数据）。
  * @module @dsh-plus/access-gate/client
  */
 import type { Context } from '@deepseek-ai/cordis'
-import { createApiScope } from '@dsh-plus/shared/client'
+import {
+  createNamespaceApi,
+  createSettingsScope,
+  type SettingsRemoteFace,
+} from '@dsh-plus/shared/client'
 import { SETTINGS_NS } from '../ns.ts'
 import { AccessGateCard } from './card.tsx'
 import { en, NS, zh } from './i18n.ts'
@@ -22,7 +26,7 @@ import { injectStyle } from './styles.ts'
 export const name = 'dsh-plus-access-gate'
 
 /** 浏览器半需要的 cordis 服务 key（loader 据此注入；package.json 的 dsh.client.inject 管包加载顺序）。 */
-export const inject = ['slots', 'locale', 'connection', 'remote'] as const
+export const inject = ['slots', 'locale', 'remote', 'remote.settings'] as const
 
 interface SlotsLike {
   inject(key: string, callback: () => unknown): unknown
@@ -35,17 +39,13 @@ interface LocaleLike {
 }
 
 interface RemoteLike {
+  settings: SettingsRemoteFace
   $on(event: string, listener: (payload?: unknown) => void): () => void
 }
 
-interface ConnectionLike {
-  api: { settings: Parameters<typeof createApiScope>[0] }
-}
-
 interface ClientContext {
   slots: SlotsLike
   locale: LocaleLike
-  get(key: 'connection'): ConnectionLike
   get(key: 'remote'): RemoteLike
   on(event: string, listener: () => void): () => void
   effect(execute: () => () => void, label?: string): unknown
@@ -61,8 +61,8 @@ export function apply(ctx: Context): void {
     'access-gate: style',
   )
   c.effect(() => c.locale.register(NS, { zh, en }), 'access-gate: locale')
-  const api = c.get('connection').api.settings
-  const scope = createApiScope(api, SETTINGS_NS, c, 'access-gate: settings scope')
+  const scope = createSettingsScope(c, SETTINGS_NS, 'access-gate: settings scope')
+  const api = createNamespaceApi(c.get('remote').settings, SETTINGS_NS)
   c.slots.inject('settings.plugin.item', () =>
     c.slots.register(
       {