dsh-image-gen 0.5.0 → 0.5.1

package/lib/client.js

@@ -6560,6 +6560,8 @@ window.__ModuleLoader__.load({
 				apiKeyPlaceholder: "留空即可保留已配置的 Key",
 				apiKeyHint: "安全保存为 {key}；页面不会读回明文。",
 				keyReadOnly: "Key 由 {source} 提供且只读；请在该来源中修改。",
+				credentialsUnavailable: "凭据服务不可用，无法保存 API Key；建议升级 DSH 到稳定版本。",
+				badgeUnavailable: "凭据服务不可用",
 				badgeChecking: "检查中…",
 				badgeConfigured: "Key 已配置",
 				badgeMissing: "Key 未配置",
@@ -6658,6 +6660,8 @@ window.__ModuleLoader__.load({
 				apiKeyPlaceholder: "Leave empty to keep configured key",
 				apiKeyHint: "Securely saved as {key}; never read back in plaintext.",
 				keyReadOnly: "Key is supplied read-only by {source}; update it there.",
+				credentialsUnavailable: "Credentials service unavailable: API keys cannot be saved; please upgrade DSH to a stable release.",
+				badgeUnavailable: "Credentials unavailable",
 				badgeChecking: "Checking…",
 				badgeConfigured: "Key set",
 				badgeMissing: "Key missing",
@@ -7074,20 +7078,21 @@ window.__ModuleLoader__.load({
 					credentialListeners.delete(callback);
 				};
 			} };
-			const injectSettingsItem = (owner, credentials) => {
+			const injectSettingsItem = (owner) => {
 				const ownerRegister = owner.slots.register.bind(owner.slots);
 				owner.slots.inject("settings.plugin.item", () => ownerRegister({
 					name: "settings.plugin.item",
 					key: IMAGE_GENERATION_NAMESPACE,
 					inject: () => ({
 						scope,
-						credentials,
+						credentials: credentialsProxy,
+						credentialsAvailable,
 						locale,
 						credentialEvents
 					})
 				}, ImageGenerationSettingsCard));
 			};
-			const injectComposerPill = (owner, credentials) => {
+			const injectComposerPill = (owner) => {
 				const ownerRegister = owner.slots.register.bind(owner.slots);
 				owner.slots.inject("conversation.input.right", () => ownerRegister({
 					name: "conversation.input.right",
@@ -7095,25 +7100,43 @@ window.__ModuleLoader__.load({
 					order: 10,
 					inject: () => ({
 						scope,
-						credentials,
+						credentials: credentialsProxy,
 						locale,
 						credentialEvents
 					})
 				}, ImageProviderPill));
 			};
-			const remoteCredentials = asCredentialsRemote(ctx.get("remote.credentials"));
-			const legacyCredentials = credentialsFromLegacyConnection(ctx.get("connection"));
-			if (remoteCredentials !== void 0) {
-				injectSettingsItem(ctx, remoteCredentials);
-				injectComposerPill(ctx, remoteCredentials);
-			} else if (legacyCredentials !== void 0) {
-				injectSettingsItem(ctx, legacyCredentials);
-				injectComposerPill(ctx, legacyCredentials);
-			} else ctx.inject(["remote.credentials"], (remoteCtx) => {
+			const credentialsRef = { current: asCredentialsRemote(ctx.get("remote.credentials")) ?? credentialsFromLegacyConnection(ctx.get("connection")) };
+			/** Stable delegating remote so the host-cached inject face never goes stale. */
+			const credentialsProxy = {
+				describe(refs) {
+					const remote = credentialsRef.current;
+					return remote === void 0 ? Promise.resolve({ ok: false }) : remote.describe(refs);
+				},
+				set(ref, value) {
+					const remote = credentialsRef.current;
+					return remote === void 0 ? Promise.resolve({
+						ok: false,
+						error: { message: "credentials service unavailable" }
+					}) : remote.set(ref, value);
+				},
+				get unset() {
+					const remote = credentialsRef.current;
+					return remote?.unset?.bind(remote);
+				}
+			};
+			/** False while the host core exposes no credentials service (preview cores). */
+			const credentialsAvailable = () => credentialsRef.current !== void 0;
+			injectSettingsItem(ctx);
+			injectComposerPill(ctx);
+			ctx.inject(["remote.credentials"], (remoteCtx) => {
 				const credentials = asCredentialsRemote(remoteCtx.get("remote.credentials"));
-				if (credentials === void 0) throw new Error("dsh-image-gen: remote.credentials has an incompatible interface");
-				injectSettingsItem(remoteCtx, credentials);
-				injectComposerPill(remoteCtx, credentials);
+				if (credentials === void 0) {
+					console.warn("dsh-image-gen: remote.credentials resolved with an incompatible interface; key settings stay degraded");
+					return;
+				}
+				credentialsRef.current = credentials;
+				notifyCredentialsUpdated();
 			});
 			ctx.slots.inject("tool.call.toolview", () => register({
 				name: "tool.call.toolview",
@@ -7322,8 +7345,23 @@ window.__ModuleLoader__.load({
 				});
 			}, [snapshot]);
 			const credentials = props.credentials;
+			const credentialsAvailable = props.credentialsAvailable;
 			(0, react.useEffect)(() => {
 				let active = true;
+				if (!credentialsAvailable()) {
+					setRows((current) => {
+						const next = { ...current };
+						for (const provider of CLOUD_IMAGE_PROVIDERS) next[provider] = {
+							...current[provider],
+							keyStatus: "unavailable",
+							keyInfo: void 0
+						};
+						return next;
+					});
+					return () => {
+						active = false;
+					};
+				}
 				for (const provider of CLOUD_IMAGE_PROVIDERS) {
 					const keyRef = cloudCredentialRef(provider);
 					if (keyRef === void 0) continue;
@@ -7359,7 +7397,11 @@ window.__ModuleLoader__.load({
 				return () => {
 					active = false;
 				};
-			}, [credentials, keyTick]);
+			}, [
+				credentials,
+				credentialsAvailable,
+				keyTick
+			]);
 			const updateRow = (provider, patch) => {
 				setRows((current) => ({
 					...current,
@@ -7412,6 +7454,7 @@ window.__ModuleLoader__.load({
 						if (row.keyInput.trim().length > 0) {
 							const keyRef = cloudCredentialRef(provider);
 							if (keyRef === void 0) throw new Error(t("comfyuiNoKey"));
+							if (!credentialsAvailable()) throw new Error(t("credentialsUnavailable"));
 							const response = await props.credentials.set(keyRef, row.keyInput.trim());
 							if (!response.ok) throw new Error(response.error?.message ?? t("saveKeyFailed"));
 							updateRow(provider, {
@@ -7564,6 +7607,10 @@ window.__ModuleLoader__.load({
 					text: t("badgeMissing"),
 					className: "dsh-ig-badge dsh-ig-badge-missing"
 				};
+				if (status === "unavailable") return {
+					text: t("badgeUnavailable"),
+					className: "dsh-ig-badge dsh-ig-badge-neutral"
+				};
 				return {
 					text: t("badgeUnknown"),
 					className: "dsh-ig-badge dsh-ig-badge-neutral"
@@ -7695,6 +7742,7 @@ window.__ModuleLoader__.load({
 				const row = rows[provider];
 				const keyRef = cloudCredentialRef(provider) ?? "";
 				const keyReadOnly = row.keyInfo?.writable === false;
+				const keyUnavailable = !credentialsAvailable();
 				return (0, react_jsx_runtime.jsx)("div", {
 					className: "dsh-ig-provider-body",
 					children: (0, react_jsx_runtime.jsxs)("form", {
@@ -7719,11 +7767,11 @@ window.__ModuleLoader__.load({
 											updateRow(provider, { keyInput: event.target.value });
 										},
 										placeholder: row.keyStatus === "configured" ? t("apiKeyPlaceholder") : "",
-										disabled: !snapshot.writable || keyReadOnly
+										disabled: !snapshot.writable || keyReadOnly || keyUnavailable
 									}),
 									(0, react_jsx_runtime.jsx)("span", {
 										className: "dsh-ig-hint",
-										children: keyReadOnly ? t("keyReadOnly", { source: row.keyInfo?.source ?? "" }) : t("apiKeyHint", { key: keyRef })
+										children: keyUnavailable ? t("credentialsUnavailable") : keyReadOnly ? t("keyReadOnly", { source: row.keyInfo?.source ?? "" }) : t("apiKeyHint", { key: keyRef })
 									})
 								]
 							}),