@awiki/dsh-plugin 0.3.3 → 0.3.4

package/lib/provider.js

@@ -1,26 +1,62 @@
-import { t as RustSdkAdapter } from "./sdk-adapter-CDLTgHJA.mjs";
+import { t as RustSdkAdapter } from "./sdk-adapter-BeJakxLP.mjs";
 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"
+];
 /** 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");
+	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,
+					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");
 }
 //#endregion
 export { apply, inject, name };

package/lib/{sdk-adapter-CDLTgHJA.mjs → sdk-adapter-BeJakxLP.mjs}

@@ -20,7 +20,7 @@ const RUST_FAILURE_CODES = {
 	auth_revoked: "identity-recovery-required",
 	conflict: "conflict",
 	join_required: "handle-unavailable",
-	state_in_use: "state-in-use",
+	state_in_use: "conflict",
 	rate_limited: "rate-limited",
 	timeout: "network",
 	transport_unavailable: "network",
@@ -197,6 +197,26 @@ function identity(value) {
 		registeredAt: safeInteger(value.registeredAtMs)
 	};
 }
+function joinProgress(value) {
+	return {
+		joinSessionId: required(value.joinSessionId),
+		localPhase: value.localPhase,
+		remoteState: value.remoteState,
+		expiresAt: required(value.expiresAt),
+		...value.sas === void 0 ? {} : { sas: required(value.sas) },
+		completed: boolean(value.completed),
+		...value.identity === void 0 ? {} : { identity: identity(value.identity) }
+	};
+}
+function adminJoinProgress(value) {
+	return {
+		joinSessionId: required(value.joinSessionId),
+		localPhase: value.localPhase,
+		remoteState: value.remoteState,
+		expiresAt: required(value.expiresAt),
+		...value.sas === void 0 ? {} : { sas: required(value.sas) }
+	};
+}
 function profile(value) {
 	return {
 		did: required(value.did),
@@ -307,17 +327,25 @@ var RustSdkAdapter = class {
 	client;
 	attachmentConversations = /* @__PURE__ */ new Map();
 	disposal;
+	realtime;
+	agentInbox;
 	listener;
 	constructor(client) {
 		this.client = Promise.resolve(client);
-		this.listener = {
+		this.realtime = {
 			syncNow: (reason) => this.listenerSyncNow(reason),
-			startRealtime: () => this.listenerStartRealtime(),
+			startRealtime: () => this.listenerStartRealtime()
+		};
+		this.agentInbox = {
 			listConversations: (request) => this.listenerConversations(request),
 			getHistory: (request) => this.listenerHistory(request),
 			markConversationRead: (conversationId) => this.markConversationRead(conversationId),
 			sendText: (request) => this.sendText(request)
 		};
+		this.listener = {
+			...this.realtime,
+			...this.agentInbox
+		};
 	}
 	async run(operation, ambiguousSend = false) {
 		try {
@@ -529,6 +557,9 @@ var RustSdkAdapter = class {
 			const session = await client.startRealtime();
 			return {
 				nextEvent: () => this.run(() => session.nextEvent()),
+				getStatus: () => this.run(async () => {
+					return { connected: (await session.getStatus()).connected };
+				}),
 				stop: () => this.run(() => session.stop())
 			};
 		});
@@ -591,7 +622,114 @@ var RustSdkAdapter = class {
 		});
 	}
 	registerIdentity(request) {
-		return this.run(async (client) => identity(await client.completeRegistration(request)));
+		return this.run(async (client) => {
+			const value = await client.completeRegistrationWithOutcome(request);
+			if (value.status === "registered") return {
+				status: "registered",
+				identity: identity(value.identity)
+			};
+			return {
+				status: "join-required",
+				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)
+			};
+		});
+	}
+	beginDeviceJoin(request) {
+		return this.run(async (client) => joinProgress(await client.beginPreparedRegistrationJoin(request)));
+	}
+	getDeviceJoinStatus(joinSessionId) {
+		return this.run(async (client) => joinProgress(await client.resumePreparedRegistrationJoin({ joinSessionId })));
+	}
+	listLocalDeviceJoinSessions() {
+		return this.run(async (client) => (await client.listLocalDeviceJoinSessions()).map((value) => ({
+			joinSessionId: required(value.joinSessionId),
+			side: value.side,
+			localPhase: value.localPhase,
+			expiresAt: required(value.expiresAt)
+		})));
+	}
+	cancelDeviceJoin(joinSessionId) {
+		return this.run(async (client) => {
+			const value = await client.cancelPreparedRegistrationJoin({ joinSessionId });
+			return {
+				joinSessionId: required(value.joinSessionId),
+				side: value.side,
+				localPhase: value.localPhase,
+				expiresAt: required(value.expiresAt)
+			};
+		});
+	}
+	getCurrentDeviceSummary() {
+		return this.run(async (client) => {
+			const value = await client.getCurrentDeviceSummary();
+			return {
+				...value.role === void 0 ? {} : { role: value.role },
+				readiness: value.readiness,
+				canManage: boolean(value.canManage)
+			};
+		});
+	}
+	syncDeviceManagement() {
+		return this.run(async (client) => {
+			await client.syncNow({ reason: "foreground_reconcile" });
+		});
+	}
+	getDeviceRegistry() {
+		return this.run(async (client) => (await client.getDeviceRegistry()).devices.map((value) => ({
+			deviceId: required(value.protocolDeviceId),
+			status: value.status,
+			role: value.role,
+			managementReady: boolean(value.managementReady),
+			isCurrent: boolean(value.isCurrent)
+		})));
+	}
+	listLocalDeviceJoinRequests() {
+		return this.run(async (client) => (await client.listLocalDeviceJoinRequests()).map((value) => ({
+			joinSessionId: required(value.joinSessionId),
+			candidateKeyFingerprint: required(value.candidateKeyFingerprint),
+			issuedAt: required(value.issuedAt),
+			expiresAt: required(value.expiresAt),
+			state: value.state,
+			claimedByCurrentDevice: boolean(value.claimedByCurrentDevice),
+			canStartVerification: boolean(value.canStartVerification)
+		})));
+	}
+	startDeviceJoinVerification(request) {
+		return this.run(async (client) => adminJoinProgress(await client.startDeviceJoinVerification(request)));
+	}
+	getLocalDeviceJoinVerificationProgress(joinSessionId) {
+		return this.run(async (client) => adminJoinProgress(await client.getLocalDeviceJoinVerificationProgress({ joinSessionId })));
+	}
+	prepareDeviceJoinApproval(joinSessionId) {
+		return this.run(async (client) => {
+			return { approvalHandle: required((await client.prepareDeviceJoinApproval({
+				joinSessionId,
+				sasConfirmed: true
+			})).approvalHandle) };
+		});
+	}
+	confirmDeviceJoinApproval(approvalHandle) {
+		return this.run(async (client) => adminJoinProgress(await client.confirmDeviceJoinApproval({
+			approvalHandle,
+			userPresenceConfirmed: true
+		})));
+	}
+	rejectDeviceJoin(joinSessionId, reason) {
+		return this.run(async (client) => adminJoinProgress(await client.rejectDeviceJoin({
+			joinSessionId,
+			reason
+		})));
+	}
+	revokeDevice(deviceId) {
+		return this.run(async (client) => {
+			await client.revokeDevice({
+				targetDeviceId: deviceId,
+				userPresenceConfirmed: true
+			});
+		});
 	}
 	updateDisplayName(request) {
 		return this.run(async (client) => identity(await client.updateDisplayName(request.displayName)));