@tinycloud/node-sdk 3.8.0-beta.10 → 3.8.0-beta.11

package/dist/encryption-keys.d.cts

@@ -1,6 +1,6 @@
 import { NamedKeyClient } from '@tinycloud/sdk-services/encryption/named-keys';
 export { DecryptManyResult, KeyCallOptions, KeyDescriptor, KeyEncryptOptions, NamedKeyClient, NamedKeyEnvelope, NamedKeyError, NamedKeyErrorCode, PublicKeyDescriptor, buildKeyAdminFacts, buildKeyDescribeFacts } from '@tinycloud/sdk-services/encryption/named-keys';
-import { T as TinyCloudNode } from './TinyCloudNode-Dy65bxqs.cjs';
+import { T as TinyCloudNode } from './TinyCloudNode-BVDUdEcf.cjs';
 import '@tinycloud/sdk-core';
 import '@tinycloud/sdk-services/kv/replication';
 import '@tinycloud/sdk-services';

package/dist/encryption-keys.d.ts

@@ -1,6 +1,6 @@
 import { NamedKeyClient } from '@tinycloud/sdk-services/encryption/named-keys';
 export { DecryptManyResult, KeyCallOptions, KeyDescriptor, KeyEncryptOptions, NamedKeyClient, NamedKeyEnvelope, NamedKeyError, NamedKeyErrorCode, PublicKeyDescriptor, buildKeyAdminFacts, buildKeyDescribeFacts } from '@tinycloud/sdk-services/encryption/named-keys';
-import { T as TinyCloudNode } from './TinyCloudNode-DnD-SH6t.js';
+import { T as TinyCloudNode } from './TinyCloudNode-jMK_2Uj8.js';
 import '@tinycloud/sdk-core';
 import '@tinycloud/sdk-services/kv/replication';
 import '@tinycloud/sdk-services';

package/dist/index.cjs

@@ -19019,6 +19019,7 @@ function cloneAbilitiesMap(actions) {
 var NodeUserAuthorization = class {
   constructor(config) {
     this.activeSessionKeyId = "default";
+    this.preparedSessionCounter = 0;
     /** Incremented by resetSession; a sign-in started earlier publishes nothing. */
     this.sessionGeneration = 0;
     /**
@@ -20152,9 +20153,8 @@ var NodeUserAuthorization = class {
     const address = (0, import_sdk_core5.canonicalizeAddress)(await this.signer.getAddress());
     const chainId = await this.signer.getChainId();
     await this.refreshNamedKeyFeatureForSignIn(address, chainId);
-    const keyId = `session-${Date.now()}`;
-    this.sessionManager.renameSessionKeyId(this.activeSessionKeyId, keyId);
-    this.activeSessionKeyId = keyId;
+    const keyId = `openkey-session-${Date.now()}-${++this.preparedSessionCounter}`;
+    this.sessionManager.createSessionKey(keyId);
     const jwkString = this.sessionManager.jwk(keyId);
     if (!jwkString) {
       throw new Error("Failed to create session key");
@@ -20235,6 +20235,7 @@ var NodeUserAuthorization = class {
     await this.sessionStorage.save(address, persistedData);
     this._session = clientSession;
     this._tinyCloudSession = tinyCloudSession;
+    this.activeSessionKeyId = keyId;
     this._address = address;
     this._chainId = chainId;
     await this.refreshNodeInfo();
@@ -20281,6 +20282,11 @@ var NodeUserAuthorization = class {
    * @param options Optional overrides for the OpenKey request.
    */
   async signInWithOpenKey(authorizeFn, options) {
+    const pending = await this.prepareOpenKeySignIn(options);
+    return this.completeOpenKeySignIn(pending, authorizeFn(pending.request), options);
+  }
+  /** Finish address, host and SIWE preparation before an approval click. */
+  async prepareOpenKeySignIn(options) {
     refuseCaveated(this.getCapabilityRequest()?.manifests);
     if (options?.host !== void 0) {
       const overrideHost = options.host.trim();
@@ -20292,7 +20298,7 @@ var NodeUserAuthorization = class {
     const signingAddress = (0, import_sdk_core5.canonicalizeAddress)(await this.signer.getAddress());
     const signingChainId = await this.signer.getChainId();
     await this.resolveTinyCloudHostsForSignIn(signingAddress, signingChainId);
-    const { prepared, keyId, jwk } = await this.prepareSessionForSigning();
+    const { prepared, keyId, jwk, address, chainId } = await this.prepareSessionForSigning();
     const presentation = this.buildPresentationEnvelope(options?.reason);
     const hostHint = this.primaryTinyCloudHost;
     const originalRequest = {
@@ -20304,12 +20310,32 @@ var NodeUserAuthorization = class {
       keyId: options?.openkeyKeyId,
       presentation
     };
+    return {
+      request: originalRequest,
+      prepared,
+      keyId,
+      jwk,
+      address,
+      chainId,
+      generation: this.sessionGeneration,
+      createdAt: Date.now()
+    };
+  }
+  /** Complete a prepared approval. The caller starts authorization before awaiting this method. */
+  async completeOpenKeySignIn(pending, authorization, options) {
+    if (Date.now() - pending.createdAt > 5 * 6e4) {
+      throw new Error("Prepared OpenKey sign-in expired; prepare again");
+    }
+    if (pending.generation !== this.sessionGeneration) {
+      throw new Error("Prepared OpenKey sign-in expired after sign-out");
+    }
+    const { request: originalRequest, prepared, keyId, jwk } = pending;
     let result;
     let signed2;
     let signature2;
     for (let attempt = 0; ; ) {
       try {
-        result ?? (result = await authorizeFn(originalRequest));
+        result ?? (result = await authorization);
         signed2 = await this.verifyOpenKeyResult(result, prepared);
         signature2 = result.signature;
         break;
@@ -21703,6 +21729,7 @@ var _TinyCloudNode = class _TinyCloudNode {
   constructor(config = {}) {
     this.signer = null;
     this.auth = null;
+    this.consumedOpenKeyPendings = /* @__PURE__ */ new WeakSet();
     this.tc = null;
     this._chainId = 1;
     this.replicaPurgeFailedHandlers = /* @__PURE__ */ new Set();
@@ -22643,6 +22670,37 @@ var _TinyCloudNode = class _TinyCloudNode {
     }
     await this.signInWith(() => this.auth.signInWithOpenKey(authorizeFn, options));
   }
+  /** Prepare the OpenKey request before the approval click. */
+  async prepareOpenKeySignIn() {
+    if (!this.signer || !this.tc || !this.auth) {
+      throw new Error("Cannot prepare OpenKey sign-in in session-only mode. Provide a signer in config.");
+    }
+    await this.signOutInFlight;
+    await this.accountRegistryTail;
+    await this.wasmBindings.ensureInitialized?.();
+    return this.auth.prepareOpenKeySignIn();
+  }
+  /** Start OpenKey authorization synchronously, then complete normal session setup. */
+  signInWithPreparedOpenKey(pending, authorizeFn) {
+    if (!this.signer || !this.tc || !this.auth || this.signOutInFlight) {
+      throw new Error("Prepared OpenKey sign-in is unavailable");
+    }
+    if (this.consumedOpenKeyPendings.has(pending)) {
+      throw new Error("Prepared OpenKey sign-in was already used");
+    }
+    if (Date.now() - pending.createdAt > 5 * 6e4) {
+      throw new Error("Prepared OpenKey sign-in expired; prepare again");
+    }
+    this.consumedOpenKeyPendings.add(pending);
+    const authorization = authorizeFn(pending.request);
+    void authorization.catch(() => void 0);
+    return this.signInWith(() => {
+      if (this._address !== pending.address || this._chainId !== pending.chainId) {
+        throw new Error("OpenKey account changed after sign-in preparation");
+      }
+      return this.auth.completeOpenKeySignIn(pending, authorization);
+    });
+  }
   async signInWith(performSignIn) {
     refuseCaveated(this.auth?.capabilityRequest?.manifests);
     const epoch = this.sessionEpoch;
@@ -28141,7 +28199,7 @@ var FileSessionStorage = class {
 };
 
 // src/authorization/openKeyBridge.ts
-function wireOpenKeyAuthorize(openkey) {
+function wireOpenKeyAuthorize(openkey, opts) {
   return async (input) => {
     const result = await openkey.authorizeTinyCloud({
       protocolVersion: 1,
@@ -28152,7 +28210,7 @@ function wireOpenKeyAuthorize(openkey) {
       // Forward the presentation envelope verbatim — the OpenKey SDK
       // validates and size-bounds it before use.
       presentation: input.presentation
-    });
+    }, opts);
     if (result.protocolVersion !== 1) {
       throw new Error(
         `wireOpenKeyAuthorize: OpenKey returned unsupported protocolVersion ${result.protocolVersion}`