@awiki/dsh-plugin 0.3.7 → 0.3.11-rc.1

package/lib/model-proxy-contract.js

@@ -1,14 +1,14 @@
 //#region lib/types/model-proxy-contract.js
 /** Browser-safe contracts for the loopback AWiki-hosted DeepSeek proxy channel. */
-const AWIKI_MODEL_PROXY_RPC_CHANNEL = "/awiki-model-proxy";
+const AWIKI_MODEL_PROXY_RPC_CHANNEL = "/api";
 const AWIKI_MODEL_PROXY_RPC_ENDPOINTS = {
-	capability: "capability",
-	status: "status",
-	usage: "usage",
-	setEnabled: "set-enabled",
-	createRecharge: "create-recharge",
-	rechargeStatus: "recharge-status",
-	closeRecharge: "close-recharge"
+	capability: "awiki-model-proxy/capability",
+	status: "awiki-model-proxy/status",
+	usage: "awiki-model-proxy/usage",
+	setEnabled: "awiki-model-proxy/set-enabled",
+	createRecharge: "awiki-model-proxy/create-recharge",
+	rechargeStatus: "awiki-model-proxy/recharge-status",
+	closeRecharge: "awiki-model-proxy/close-recharge"
 };
 function decodeModelProxyCapability(value) {
 	return isRecord(value) && value.available === true && value.protocol === 1 ? {
@@ -37,7 +37,7 @@ function decodeModelProxyUsage(value) {
 	return usage.every((item) => item !== void 0) ? usage : void 0;
 }
 function decodeRechargeOrder(value) {
-	if (!isRecord(value) || typeof value.out_trade_no !== "string" || !Number.isSafeInteger(value.amount_cents) || ![
+	if (!isRecord(value) || containsPrivateIdentityOwner(value) || typeof value.out_trade_no !== "string" || !Number.isSafeInteger(value.amount_cents) || ![
 		"pending",
 		"paid",
 		"closed"
@@ -61,7 +61,7 @@ function decodeCloseRechargeResult(value) {
 	return isRecord(value) && value.closed === true ? { closed: true } : void 0;
 }
 function decodeAccount(value) {
-	if (!(isRecord(value) && typeof value.did === "string" && Number.isSafeInteger(value.balance_cents) && typeof value.balance === "string" && value.currency === "CNY" && typeof value.model_access_available === "boolean" && (value.model_access_reason === null || typeof value.model_access_reason === "string") && ["strict", "development_bypass"].includes(String(value.billing_mode)) && typeof value.payments_available === "boolean")) return void 0;
+	if (!(isRecord(value) && !containsPrivateIdentityOwner(value) && typeof value.did === "string" && Number.isSafeInteger(value.balance_cents) && typeof value.balance === "string" && value.currency === "CNY" && typeof value.model_access_available === "boolean" && (value.model_access_reason === null || typeof value.model_access_reason === "string") && ["strict", "development_bypass"].includes(String(value.billing_mode)) && typeof value.payments_available === "boolean")) return void 0;
 	return {
 		did: value.did,
 		balance_cents: value.balance_cents,
@@ -74,7 +74,7 @@ function decodeAccount(value) {
 	};
 }
 function decodeUsage(value) {
-	if (!(isRecord(value) && Number.isSafeInteger(value.id) && typeof value.endpoint === "string" && typeof value.model === "string" && Number.isSafeInteger(value.cache_hit_tokens) && Number.isSafeInteger(value.cache_miss_tokens) && Number.isSafeInteger(value.completion_tokens) && ["strict", "development_bypass"].includes(String(value.billing_mode)) && (value.calculated_cost_micros === null || Number.isSafeInteger(value.calculated_cost_micros)) && Number.isSafeInteger(value.charged_micros) && typeof value.estimated === "boolean" && typeof value.created_at === "string")) return void 0;
+	if (!(isRecord(value) && !containsPrivateIdentityOwner(value) && Number.isSafeInteger(value.id) && typeof value.endpoint === "string" && typeof value.model === "string" && Number.isSafeInteger(value.cache_hit_tokens) && Number.isSafeInteger(value.cache_miss_tokens) && Number.isSafeInteger(value.completion_tokens) && ["strict", "development_bypass"].includes(String(value.billing_mode)) && (value.calculated_cost_micros === null || Number.isSafeInteger(value.calculated_cost_micros)) && Number.isSafeInteger(value.charged_micros) && typeof value.estimated === "boolean" && typeof value.created_at === "string")) return void 0;
 	return {
 		id: value.id,
 		endpoint: value.endpoint,
@@ -89,6 +89,14 @@ function decodeUsage(value) {
 		created_at: value.created_at
 	};
 }
+function containsPrivateIdentityOwner(value) {
+	return [
+		"canonical_did",
+		"stable_subject_hash",
+		"path",
+		"proof"
+	].some((key) => key in value) || "did" in value && !("balance_cents" in value);
+}
 function isRecord(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }

package/lib/provider.js

@@ -1,26 +1,82 @@
-import { t as RustSdkAdapter } from "./sdk-adapter--trNlr-T.mjs";
+import { n as RustSdkAdapter } from "./sdk-adapter-CYcJH7sM.mjs";
+import { setTimeout } from "node:timers/promises";
 import { openImCoreNodeClient } from "@awiki/im-core-node";
 //#region lib/types/provider.js
 /** Production AWiki provider backed by the versioned Rust IM Core Node bridge. */
 /** Cordis plugin name used by Loader diagnostics. */
 const name = "awiki-rust-sdk-provider";
-/** The AWiki service must own its provider registry before this plugin loads. */
-const inject = ["awiki"];
+/** AWiki orchestration and the independent identity service must load first. */
+const inject = ["awiki", "anpIdentity"];
+const IDENTITY_PROVIDER_CAPABILITIES = [
+	"IDENTITY_READ",
+	"IDENTITY_CREATE",
+	"IDENTITY_IMPORT",
+	"IDENTITY_SIGN",
+	"IDENTITY_ECDH_SEALED",
+	"IDENTITY_DOCUMENT_UPDATE",
+	"IDENTITY_KEY_LIFECYCLE",
+	"IDENTITY_DELETE",
+	"IDENTITY_HTTP_SIGNATURE",
+	"AWIKI_LEGACY_ROOT_TRANSFER_V1"
+];
+const IDENTITY_PROVIDER_READY_TIMEOUT_MS = 1e4;
+const IDENTITY_PROVIDER_READY_POLL_MS = 50;
 /** Register one SDK client whose disposal follows this provider's fiber. */
-function apply(ctx) {
-	ctx.effect(() => ctx.awiki.registerClientFactory((options) => new RustSdkAdapter(openImCoreNodeClient({
-		stateRoot: options.stateRoot,
-		serviceBaseUrl: options.userServiceUrl,
-		didDomain: options.userServiceDomain,
-		userServiceEndpoint: options.userServiceUrl,
-		messageServiceEndpoint: options.messageServiceUrl,
-		mailServiceEndpoint: options.mailServiceUrl,
-		anpServiceEndpoint: options.messageServiceUrl,
-		anpServiceDid: options.messageServiceDid,
-		multiDeviceHandleRecoveryEnabled: true,
-		multiDeviceAudience: "awiki-user-service",
-		externalHttpAllowInsecureLoopbackForTesting: options.allowInsecureLoopbackForTesting
-	}))), "awiki Rust SDK client");
+async function apply(ctx) {
+	await waitForIdentityProvider(ctx.anpIdentity);
+	ctx.effect(() => {
+		const lease = ctx.anpIdentity.acquireProvider({
+			consumer: "@awiki/dsh-plugin",
+			capabilities: [...IDENTITY_PROVIDER_CAPABILITIES],
+			ttlSeconds: 3600
+		});
+		try {
+			const unregister = ctx.awiki.registerClientFactory((options) => {
+				const openOptions = {
+					stateRoot: options.stateRoot,
+					serviceBaseUrl: options.userServiceUrl,
+					didDomain: options.userServiceDomain,
+					userServiceEndpoint: options.userServiceUrl,
+					messageServiceEndpoint: options.messageServiceUrl,
+					mailServiceEndpoint: options.mailServiceUrl,
+					anpServiceEndpoint: options.messageServiceUrl,
+					anpServiceDid: options.messageServiceDid,
+					clientVersionInfo: {
+						product: "awiki-daemon",
+						release: "0815",
+						version: "0.1.93"
+					},
+					multiDeviceHandleRecoveryEnabled: true,
+					multiDeviceDeviceRevokeEnabled: true,
+					multiDeviceAudience: "awiki-user-service",
+					externalHttpAllowInsecureLoopbackForTesting: options.allowInsecureLoopbackForTesting,
+					identityProvider: lease
+				};
+				return new RustSdkAdapter(openImCoreNodeClient(openOptions));
+			});
+			return async () => {
+				try {
+					await unregister();
+				} finally {
+					lease.dispose();
+				}
+			};
+		} catch (error) {
+			lease.dispose();
+			throw error;
+		}
+	}, "awiki Rust SDK client");
+}
+async function waitForIdentityProvider(identity) {
+	const deadline = Date.now() + IDENTITY_PROVIDER_READY_TIMEOUT_MS;
+	while (!providerIsReady(await identity.health())) {
+		const remaining = deadline - Date.now();
+		if (remaining <= 0) throw new Error(`awiki: ANP Identity provider did not become ready within ${IDENTITY_PROVIDER_READY_TIMEOUT_MS}ms`);
+		await setTimeout(Math.min(IDENTITY_PROVIDER_READY_POLL_MS, remaining));
+	}
+}
+function providerIsReady(health) {
+	return health.status !== "unavailable" && health.providerProtocol !== void 0;
 }
 //#endregion
 export { apply, inject, name };