@tinycloud/node-sdk 3.8.0-beta.19 → 3.8.0-beta.20

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-DLuN31i0.cjs';
+import { T as TinyCloudNode } from './TinyCloudNode-NrmztjDd.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-DfuhkGz7.js';
+import { T as TinyCloudNode } from './TinyCloudNode-BRyeZas2.js';
 import '@tinycloud/sdk-core';
 import '@tinycloud/sdk-services/kv/replication';
 import '@tinycloud/sdk-services';

package/dist/index.cjs

@@ -19659,8 +19659,7 @@ var NodeUserAuthorization = class {
   /**
    * Build SIWE overrides from the top-level nonce and siweConfig.
    * - Top-level `nonce` is seeded first so `siweConfig.nonce` wins if both are set.
-   * - statement is prepended to the default statement
-   * - resources are appended to the default resources
+   * - resources are inserted after WASM preparation, before the final ReCap
    * - uri triggers a warning (overwriting delegation target)
    * - all other fields override directly
    * - per-call nonce overrides siweConfig.nonce when provided
@@ -19678,9 +19677,6 @@ var NodeUserAuthorization = class {
     if (statement) {
       overrides.statement = this.statement ? `${statement} ${this.statement}` : statement;
     }
-    if (resources && resources.length > 0) {
-      overrides.resources = resources;
-    }
     if (uri) {
       console.warn(
         "[tinycloud] siweConfig.uri is overwriting the delegation target URI. This may break delegation chain validation if the URI does not match the session key DID."
@@ -19692,6 +19688,29 @@ var NodeUserAuthorization = class {
     }
     return overrides;
   }
+  prepareSessionWithResources(params) {
+    const resources = this.siweConfig?.resources;
+    if (resources?.some((resource) => typeof resource !== "string" || !/^urn:tinycloud:recipients:[A-Za-z0-9_-]+$/.test(resource))) {
+      throw new Error("SIWE metadata resources must be base64url recipients URIs");
+    }
+    const prepared = this.wasm.prepareSession(params);
+    if (!resources?.length) return prepared;
+    const recapLines = /^- urn:recap:[^\r\n]+$/gim;
+    const recaps = prepared.siwe.match(recapLines);
+    const recap = recaps?.[0];
+    if (recaps?.length !== 1 || !prepared.siwe.endsWith(recap)) {
+      throw new Error("Prepared SIWE must end with exactly one ReCap");
+    }
+    const insertedLines = resources.map((resource) => `- ${resource}`);
+    const siwe = prepared.siwe.slice(0, -recap.length) + insertedLines.join("\n") + "\n" + recap;
+    const expectedFields = (0, import_sdk_core5.extractImmutableSiweFields)(prepared.siwe);
+    expectedFields.nonRecapResources = [expectedFields.nonRecapResources, ...insertedLines].filter(Boolean).join("\n");
+    const actualRecaps = siwe.match(recapLines);
+    if (actualRecaps?.length !== 1 || actualRecaps[0] !== recap || (0, import_sdk_core5.diffImmutableSiweFields)(expectedFields, (0, import_sdk_core5.extractImmutableSiweFields)(siwe)).length) {
+      throw new Error("SIWE metadata insertion changed the prepared message");
+    }
+    return { ...prepared, siwe };
+  }
   /**
    * Add an extension to the authorization flow.
    */
@@ -19939,7 +19958,7 @@ var NodeUserAuthorization = class {
       spaceAbilities[spaceId] = (0, import_sdk_core5.resourceCapabilitiesToAbilitiesMap)(resources);
     }
     const abilities = spaceAbilities[options.spaceId] ?? (0, import_sdk_core5.resourceCapabilitiesToAbilitiesMap)([]);
-    const prepared = this.wasm.prepareSession({
+    const prepared = this.prepareSessionWithResources({
       abilities,
       spaceAbilities,
       ...options.rawAbilities !== void 0 ? { rawAbilities: options.rawAbilities } : {},
@@ -20032,7 +20051,7 @@ var NodeUserAuthorization = class {
     const spaceId = capabilityPlan.spaceId;
     const now = /* @__PURE__ */ new Date();
     const expirationTime = new Date(now.getTime() + this.sessionExpirationMs);
-    const prepared = this.wasm.prepareSession({
+    const prepared = this.prepareSessionWithResources({
       abilities: capabilityPlan.abilities,
       ...capabilityPlan.spaceAbilities !== void 0 ? { spaceAbilities: capabilityPlan.spaceAbilities } : {},
       ...capabilityPlan.rawAbilities !== void 0 ? { rawAbilities: capabilityPlan.rawAbilities } : {},
@@ -20178,7 +20197,7 @@ var NodeUserAuthorization = class {
     const spaceId = capabilityPlan.spaceId;
     const now = /* @__PURE__ */ new Date();
     const expirationTime = new Date(now.getTime() + this.sessionExpirationMs);
-    const prepared = this.wasm.prepareSession({
+    const prepared = this.prepareSessionWithResources({
       abilities: capabilityPlan.abilities,
       ...capabilityPlan.spaceAbilities !== void 0 ? { spaceAbilities: capabilityPlan.spaceAbilities } : {},
       ...capabilityPlan.rawAbilities !== void 0 ? { rawAbilities: capabilityPlan.rawAbilities } : {},