@awiki/dsh-plugin 0.3.11 → 0.3.16

package/lib/provider.js

@@ -1,4 +1,4 @@
-import { n as RustSdkAdapter } from "./sdk-adapter-DpqT2en9.mjs";
+import { n as RustSdkAdapter } from "./sdk-adapter-DGcTiEZz.mjs";
 import { setTimeout } from "node:timers/promises";
 import { openImCoreNodeClient } from "@awiki/im-core-node";
 import { AnpIdentityPluginError } from "@agent-network-protocol/dsh-anp-identity";
@@ -57,12 +57,13 @@ async function apply(ctx) {
 			const unregister = ctx.awiki.registerClientFactory((options) => {
 				const openOptions = {
 					stateRoot: options.stateRoot,
+					...options.caBundle === void 0 ? {} : { caBundle: options.caBundle },
 					serviceBaseUrl: options.userServiceUrl,
 					didDomain: options.userServiceDomain,
 					userServiceEndpoint: options.userServiceUrl,
 					messageServiceEndpoint: options.messageServiceUrl,
 					mailServiceEndpoint: options.mailServiceUrl,
-					anpServiceEndpoint: options.messageServiceUrl,
+					anpServiceEndpoint: new URL("/anp-im/rpc", options.messageServicePublicUrl).href,
 					anpServiceDid: options.messageServiceDid,
 					clientVersionInfo: {
 						product: "awiki-daemon",

package/lib/{sdk-adapter-DpqT2en9.mjs → sdk-adapter-DGcTiEZz.mjs}

@@ -1,3 +1,16 @@
+//#region lib/types/message-target.js
+/** Validate the public target shape; Core alone validates conversation ownership and routing. */
+function isMessageTarget(value) {
+	if (typeof value !== "object" || value === null) return false;
+	const target = value;
+	const nonempty = (field) => typeof field === "string" && field.trim() !== "";
+	if (target.kind === "direct") {
+		if ("conversationId" in target) return !("peer" in target) && nonempty(target.conversationId);
+		return nonempty(target.peer);
+	}
+	return target.kind === "group" && nonempty(target.group);
+}
+//#endregion
 //#region lib/types/mail-recovery-observability.js
 const MAIL_INGRESS_CLASSIFICATIONS = /* @__PURE__ */ new Set([
 	"reached",
@@ -104,6 +117,30 @@ function fencedMailRecoveryObservability(currentPrincipalMatchesRecovery, reques
 /** Rust IM Core adapter that copies native values into Host-owned public DTOs. */
 const GROUP_LOOKUP_LIMIT = 100;
 const MAX_GROUP_LOOKUP_PAGES = 20;
+function methodCapabilities(value) {
+	return {
+		method: value.method,
+		handleRecovery: boolean(value.handleRecovery),
+		rootImport: boolean(value.rootImport),
+		rootTransfer: boolean(value.rootTransfer),
+		servicesUpdate: boolean(value.servicesUpdate)
+	};
+}
+function publicDocumentService(raw) {
+	if (typeof raw !== "object" || raw === null || Array.isArray(raw)) fail("invalid-request");
+	const value = raw;
+	if (typeof value.id !== "string" || typeof value.type !== "string" || typeof value.serviceEndpoint !== "string") fail("invalid-request");
+	if (value.serviceDid !== void 0 && typeof value.serviceDid !== "string") fail("invalid-request");
+	for (const field of ["profiles", "securityProfiles"]) if (value[field] !== void 0 && (!Array.isArray(value[field]) || !value[field].every((item) => typeof item === "string"))) fail("invalid-request");
+	return {
+		id: value.id,
+		type: value.type,
+		serviceEndpoint: value.serviceEndpoint,
+		...value.serviceDid === void 0 ? {} : { serviceDid: value.serviceDid },
+		...value.profiles === void 0 ? {} : { profiles: [...value.profiles] },
+		...value.securityProfiles === void 0 ? {} : { securityProfiles: [...value.securityProfiles] }
+	};
+}
 const RUST_FAILURE_CODES = {
 	invalid_input: "invalid-request",
 	invalid_state_root: "invalid-request",
@@ -466,6 +503,7 @@ var RustSdkAdapter = class {
 	onIdentity;
 	trustedUserPresenceSupported = process.platform === "darwin" && process.arch === "x64";
 	client;
+	approvalManagement = /* @__PURE__ */ new Map();
 	refreshingDisplayPeers = /* @__PURE__ */ new Set();
 	scheduleDisplayRefresh(client, peers) {
 		if (this.disposal !== void 0) return;
@@ -750,7 +788,11 @@ var RustSdkAdapter = class {
 		});
 	}
 	async conversationId(client, target) {
-		if (target.kind === "direct") return required((await client.resolvePeer(target.peer)).conversationId);
+		if (!isMessageTarget(target)) fail("invalid-request");
+		if (target.kind === "direct") {
+			if ("conversationId" in target) return target.conversationId;
+			return required((await client.resolvePeer(target.peer)).conversationId);
+		}
 		let cursor;
 		for (let index = 0; index < MAX_GROUP_LOOKUP_PAGES; index += 1) {
 			const result = await client.listConversations({
@@ -784,6 +826,48 @@ var RustSdkAdapter = class {
 			return result;
 		});
 	}
+	identityCreationMethods() {
+		return this.run(async (client) => [...await client.identityCreationMethods()]);
+	}
+	pendingIdentityRegistrations() {
+		return this.run(async (client) => (await client.pendingIdentityRegistrations()).map((value) => ({
+			did: value.did,
+			fullHandle: value.fullHandle,
+			method: value.method,
+			displayName: value.displayName,
+			verificationKind: value.verificationKind,
+			phase: value.phase
+		})));
+	}
+	identityMethodCapabilities(did) {
+		return this.run(async (client) => methodCapabilities(await client.identityMethodCapabilities(did)));
+	}
+	getIdentityServices() {
+		return this.run(async (client) => {
+			const currentIdentity = await client.getDefaultIdentity();
+			if (currentIdentity === null) fail("not-registered");
+			const capabilities = await client.identityMethodCapabilities(currentIdentity.did);
+			const current = await client.getCurrentDeviceSummary();
+			const document = await client.identityDocument();
+			if (document.id !== currentIdentity.did || !Array.isArray(document.service)) fail("remote");
+			return {
+				did: currentIdentity.did,
+				canManage: capabilities.servicesUpdate && current.canManage && current.role === "admin" && current.readiness === "admin_ready",
+				pending: await client.identityServicesUpdatePending(),
+				services: document.service.map(publicDocumentService)
+			};
+		});
+	}
+	updateIdentityServices(request) {
+		return this.run(async (client) => {
+			await client.updateIdentityServices(request.services.map(publicDocumentService));
+		});
+	}
+	resumeIdentityServicesUpdate() {
+		return this.run(async (client) => {
+			await client.resumeIdentityServicesUpdate();
+		});
+	}
 	sendRegistrationOtp(request) {
 		return this.run(async (client) => {
 			const value = await client.requestRegistrationOtp(request);
@@ -809,7 +893,8 @@ var RustSdkAdapter = class {
 				continuationId: required(value.existingHandle.continuationId),
 				fullHandle: required(value.existingHandle.fullHandle),
 				mode: value.existingHandle.mode === "handle_recovery_rebind" ? "handle-recovery-rebind" : "ordinary",
-				requiresUserPresence: boolean(value.existingHandle.requiresUserPresence)
+				requiresUserPresence: boolean(value.existingHandle.requiresUserPresence),
+				methodCapabilities: methodCapabilities(await client.identityMethodCapabilities(value.existingHandle.expectedDid))
 			};
 		});
 	}
@@ -882,17 +967,33 @@ var RustSdkAdapter = class {
 	}
 	prepareDeviceJoinApproval(joinSessionId) {
 		return this.run(async (client) => {
-			return { approvalHandle: required((await client.prepareDeviceJoinApproval({
+			const identity = await client.getDefaultIdentity();
+			if (identity === null) fail("not-registered");
+			const capabilities = await client.identityMethodCapabilities(identity.did);
+			const value = await client.prepareDeviceJoinApproval({
 				joinSessionId,
 				sasConfirmed: true
-			})).approvalHandle) };
+			});
+			this.approvalManagement.set(value.approvalHandle, capabilities.rootTransfer);
+			return { approvalHandle: required(value.approvalHandle) };
 		});
 	}
+	deviceJoinManagementStatus() {
+		return this.run((client) => client.deviceJoinManagementStatus());
+	}
+	retryDeviceJoinManagement(joinSessionId) {
+		return this.run((client) => client.retryDeviceJoinManagement({ joinSessionId }));
+	}
 	confirmDeviceJoinApproval(approvalHandle) {
-		return this.run(async (client) => adminJoinProgress(await client.confirmDeviceJoinApproval({
-			approvalHandle,
-			userPresenceConfirmed: true
-		})));
+		return this.run(async (client) => {
+			const request = {
+				approvalHandle,
+				userPresenceConfirmed: true
+			};
+			const result = this.approvalManagement.get(approvalHandle) === false ? await client.confirmDeviceJoinApproval(request) : await client.confirmDeviceJoinWithManagement(request);
+			this.approvalManagement.delete(approvalHandle);
+			return adminJoinProgress(result);
+		});
 	}
 	rejectDeviceJoin(joinSessionId, reason) {
 		return this.run(async (client) => adminJoinProgress(await client.rejectDeviceJoin({
@@ -1234,4 +1335,4 @@ function downloadedAttachment(value) {
 	};
 }
 //#endregion
-export { fencedMailRecoveryObservability as a, failedMailRecoveryObservability as i, RustSdkAdapter as n, successfulMailRecoveryObservability as o, downloadedAttachment as r, AwikiSdkError as t };
+export { fencedMailRecoveryObservability as a, failedMailRecoveryObservability as i, RustSdkAdapter as n, successfulMailRecoveryObservability as o, downloadedAttachment as r, isMessageTarget as s, AwikiSdkError as t };