@yielded/crypto 0.1.0-beta.28 → 0.1.0-beta.29

package/README.md

@@ -23,16 +23,16 @@ Full backend Layers require one shared `KdfAdmission` Layer. The focused
 `WebCrypto.layerHmac(subtle)` and global `layerWebCrypto` adapters need no KDF
 admission. Waiting for derivation is bounded;
 once admitted, derivation retains its permit until actual work and cleanup finish,
-including interruption. Portable Argon2id yields through Effect between batches,
+including interruption. Portable Argon2id yields through Effect between time slices,
 accepts interruption, and clears its work buffers before releasing admission. It
 still runs on the calling thread. JavaScript cannot guarantee zeroization or
 constant-time execution.
 
 Secret inputs, derived bytes and decrypted plaintext use `Redacted`. Backend
 errors contain classifications without native causes or secret payloads. Keep
-each AEAD nonce unique for its key. `Hmac.importKey` snapshots a reusable,
-nonextractable key in the caller's Scope; closure joins native work and prevents
-further use. Signature operations use PKCS8/SPKI DER keys;
+each AEAD nonce unique for its key. HMAC, AES-GCM and signature services offer
+scoped imports for repeated key use. Handles snapshot nonextractable native keys;
+closure joins native work and prevents further use. Signature operations use PKCS8/SPKI DER keys;
 raw key components can be encoded through the native key parser.
 [JOSE](../jose/README.md) and password-hash serialization belong to other layers.
 

package/dist/Aead.d.mts

@@ -1,5 +1,5 @@
 import { AuthenticationFailed, OperationError } from "./Errors.mjs";
-import { Context, Effect, Redacted, Schema } from "effect";
+import { Context, Effect, Redacted, Schema, Scope } from "effect";
 //#region src/Aead.d.ts
 export declare const Algorithm: Schema.Literals<readonly ["AES-256-GCM", "XChaCha20-Poly1305"]>;
 export type Algorithm = typeof Algorithm.Type;
@@ -19,7 +19,32 @@ export declare const DecryptInput: Schema.Struct<{
   readonly ciphertext: Schema.Uint8Array;
 }>;
 export type DecryptInput = typeof DecryptInput.Type;
+/** Native AES keys can be imported once for repeated encryption and decryption. */
+export declare const KeyInput: Schema.Struct<{
+  readonly algorithm: Schema.Literal<"AES-256-GCM">;
+  readonly key: Schema.Redacted<Schema.Uint8Array>;
+}>;
+export type KeyInput = typeof KeyInput.Type;
+export declare const KeyEncryptInput: Schema.Struct<{
+  readonly nonce: Schema.Uint8Array;
+  readonly additionalData: Schema.optionalKey<Schema.Uint8Array>;
+  readonly plaintext: Schema.Redacted<Schema.Uint8Array>;
+}>;
+export type KeyEncryptInput = typeof KeyEncryptInput.Type;
+export declare const KeyDecryptInput: Schema.Struct<{
+  readonly nonce: Schema.Uint8Array;
+  readonly additionalData: Schema.optionalKey<Schema.Uint8Array>;
+  readonly ciphertext: Schema.Uint8Array;
+}>;
+export type KeyDecryptInput = typeof KeyDecryptInput.Type;
+/** A nonextractable AES-256-GCM key owned by the import's Scope. */
+export interface Key {
+  readonly encrypt: (input: KeyEncryptInput) => Effect.Effect<Uint8Array, OperationError>;
+  readonly decrypt: (input: KeyDecryptInput) => Effect.Effect<Redacted.Redacted<Uint8Array>, OperationError | AuthenticationFailed>;
+}
 declare const Aead_base: Context.ServiceClass<Aead, "@yielded/crypto/Aead", {
+  /** Snapshot once; scope closure joins native work and rejects later use. */
+  readonly importKey: (input: KeyInput) => Effect.Effect<Key, OperationError, Scope.Scope>;
   readonly encrypt: (input: EncryptInput) => Effect.Effect<Uint8Array, OperationError>;
   readonly decrypt: (input: DecryptInput) => Effect.Effect<Redacted.Redacted<Uint8Array>, OperationError | AuthenticationFailed>;
 }>;

package/dist/Aead.mjs

@@ -15,6 +15,21 @@ const DecryptInput = Schema.Struct({
 	...context,
 	ciphertext: Schema.Uint8Array
 });
+/** Native AES keys can be imported once for repeated encryption and decryption. */
+const KeyInput = Schema.Struct({
+	algorithm: Schema.Literal("AES-256-GCM"),
+	key: context.key
+});
+const KeyEncryptInput = Schema.Struct({
+	nonce: context.nonce,
+	additionalData: context.additionalData,
+	plaintext: EncryptInput.fields.plaintext
+});
+const KeyDecryptInput = Schema.Struct({
+	nonce: context.nonce,
+	additionalData: context.additionalData,
+	ciphertext: DecryptInput.fields.ciphertext
+});
 /**
 * Both algorithms use a 32-byte key and append a 16-byte tag to ciphertext.
 * AES-GCM uses a 12-byte nonce; XChaCha uses 24. The caller MUST supply a unique
@@ -23,6 +38,6 @@ const DecryptInput = Schema.Struct({
 */
 var Aead = class extends Context.Service()("@yielded/crypto/Aead") {};
 //#endregion
-export { Aead, Algorithm, DecryptInput, EncryptInput };
+export { Aead, Algorithm, DecryptInput, EncryptInput, KeyDecryptInput, KeyEncryptInput, KeyInput };
 
 //# sourceMappingURL=Aead.mjs.map

package/dist/Aead.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"Aead.mjs","names":[],"sources":["../src/Aead.ts"],"sourcesContent":["import { Context, type Effect, type Redacted, Schema } from \"effect\";\n\nimport type { AuthenticationFailed, OperationError } from \"./Errors\";\n\nexport const Algorithm = Schema.Literals([\"AES-256-GCM\", \"XChaCha20-Poly1305\"]);\nexport type Algorithm = typeof Algorithm.Type;\n\nconst context = {\n  algorithm: Algorithm,\n  key: Schema.Redacted(Schema.Uint8Array, { disallowJsonEncode: true }),\n  nonce: Schema.Uint8Array,\n  additionalData: Schema.optionalKey(Schema.Uint8Array),\n};\n\nexport const EncryptInput = Schema.Struct({\n  ...context,\n  plaintext: Schema.Redacted(Schema.Uint8Array, { disallowJsonEncode: true }),\n});\n\nexport type EncryptInput = typeof EncryptInput.Type;\n\nexport const DecryptInput = Schema.Struct({ ...context, ciphertext: Schema.Uint8Array });\nexport type DecryptInput = typeof DecryptInput.Type;\n\n/**\n * Both algorithms use a 32-byte key and append a 16-byte tag to ciphertext.\n * AES-GCM uses a 12-byte nonce; XChaCha uses 24. The caller MUST supply a unique\n * nonce for each encryption with a key. Obtain entropy from Effect Crypto.\n * Envelope serialization and key selection belong to the caller.\n */\nexport class Aead extends Context.Service<\n  Aead,\n  {\n    readonly encrypt: (input: EncryptInput) => Effect.Effect<Uint8Array, OperationError>;\n    readonly decrypt: (\n      input: DecryptInput,\n    ) => Effect.Effect<Redacted.Redacted<Uint8Array>, OperationError | AuthenticationFailed>;\n  }\n>()(\"@yielded/crypto/Aead\") {}\n"],"mappings":";;AAIA,MAAa,YAAY,OAAO,SAAS,CAAC,eAAe,oBAAoB,CAAC;AAG9E,MAAM,UAAU;CACd,WAAW;CACX,KAAK,OAAO,SAAS,OAAO,YAAY,EAAE,oBAAoB,KAAK,CAAC;CACpE,OAAO,OAAO;CACd,gBAAgB,OAAO,YAAY,OAAO,UAAU;AACtD;AAEA,MAAa,eAAe,OAAO,OAAO;CACxC,GAAG;CACH,WAAW,OAAO,SAAS,OAAO,YAAY,EAAE,oBAAoB,KAAK,CAAC;AAC5E,CAAC;AAID,MAAa,eAAe,OAAO,OAAO;CAAE,GAAG;CAAS,YAAY,OAAO;AAAW,CAAC;;;;;;;AASvF,IAAa,OAAb,cAA0B,QAAQ,QAQhC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC"}
+{"version":3,"file":"Aead.mjs","names":[],"sources":["../src/Aead.ts"],"sourcesContent":["import { Context, type Effect, type Redacted, Schema, type Scope } from \"effect\";\n\nimport type { AuthenticationFailed, OperationError } from \"./Errors\";\n\nexport const Algorithm = Schema.Literals([\"AES-256-GCM\", \"XChaCha20-Poly1305\"]);\nexport type Algorithm = typeof Algorithm.Type;\n\nconst context = {\n  algorithm: Algorithm,\n  key: Schema.Redacted(Schema.Uint8Array, { disallowJsonEncode: true }),\n  nonce: Schema.Uint8Array,\n  additionalData: Schema.optionalKey(Schema.Uint8Array),\n};\n\nexport const EncryptInput = Schema.Struct({\n  ...context,\n  plaintext: Schema.Redacted(Schema.Uint8Array, { disallowJsonEncode: true }),\n});\n\nexport type EncryptInput = typeof EncryptInput.Type;\n\nexport const DecryptInput = Schema.Struct({ ...context, ciphertext: Schema.Uint8Array });\nexport type DecryptInput = typeof DecryptInput.Type;\n\n/** Native AES keys can be imported once for repeated encryption and decryption. */\nexport const KeyInput = Schema.Struct({\n  algorithm: Schema.Literal(\"AES-256-GCM\"),\n  key: context.key,\n});\n\nexport type KeyInput = typeof KeyInput.Type;\n\nexport const KeyEncryptInput = Schema.Struct({\n  nonce: context.nonce,\n  additionalData: context.additionalData,\n  plaintext: EncryptInput.fields.plaintext,\n});\n\nexport type KeyEncryptInput = typeof KeyEncryptInput.Type;\n\nexport const KeyDecryptInput = Schema.Struct({\n  nonce: context.nonce,\n  additionalData: context.additionalData,\n  ciphertext: DecryptInput.fields.ciphertext,\n});\n\nexport type KeyDecryptInput = typeof KeyDecryptInput.Type;\n\n/** A nonextractable AES-256-GCM key owned by the import's Scope. */\nexport interface Key {\n  readonly encrypt: (input: KeyEncryptInput) => Effect.Effect<Uint8Array, OperationError>;\n  readonly decrypt: (\n    input: KeyDecryptInput,\n  ) => Effect.Effect<Redacted.Redacted<Uint8Array>, OperationError | AuthenticationFailed>;\n}\n\n/**\n * Both algorithms use a 32-byte key and append a 16-byte tag to ciphertext.\n * AES-GCM uses a 12-byte nonce; XChaCha uses 24. The caller MUST supply a unique\n * nonce for each encryption with a key. Obtain entropy from Effect Crypto.\n * Envelope serialization and key selection belong to the caller.\n */\nexport class Aead extends Context.Service<\n  Aead,\n  {\n    /** Snapshot once; scope closure joins native work and rejects later use. */\n    readonly importKey: (input: KeyInput) => Effect.Effect<Key, OperationError, Scope.Scope>;\n    readonly encrypt: (input: EncryptInput) => Effect.Effect<Uint8Array, OperationError>;\n    readonly decrypt: (\n      input: DecryptInput,\n    ) => Effect.Effect<Redacted.Redacted<Uint8Array>, OperationError | AuthenticationFailed>;\n  }\n>()(\"@yielded/crypto/Aead\") {}\n"],"mappings":";;AAIA,MAAa,YAAY,OAAO,SAAS,CAAC,eAAe,oBAAoB,CAAC;AAG9E,MAAM,UAAU;CACd,WAAW;CACX,KAAK,OAAO,SAAS,OAAO,YAAY,EAAE,oBAAoB,KAAK,CAAC;CACpE,OAAO,OAAO;CACd,gBAAgB,OAAO,YAAY,OAAO,UAAU;AACtD;AAEA,MAAa,eAAe,OAAO,OAAO;CACxC,GAAG;CACH,WAAW,OAAO,SAAS,OAAO,YAAY,EAAE,oBAAoB,KAAK,CAAC;AAC5E,CAAC;AAID,MAAa,eAAe,OAAO,OAAO;CAAE,GAAG;CAAS,YAAY,OAAO;AAAW,CAAC;;AAIvF,MAAa,WAAW,OAAO,OAAO;CACpC,WAAW,OAAO,QAAQ,aAAa;CACvC,KAAK,QAAQ;AACf,CAAC;AAID,MAAa,kBAAkB,OAAO,OAAO;CAC3C,OAAO,QAAQ;CACf,gBAAgB,QAAQ;CACxB,WAAW,aAAa,OAAO;AACjC,CAAC;AAID,MAAa,kBAAkB,OAAO,OAAO;CAC3C,OAAO,QAAQ;CACf,gBAAgB,QAAQ;CACxB,YAAY,aAAa,OAAO;AAClC,CAAC;;;;;;;AAkBD,IAAa,OAAb,cAA0B,QAAQ,QAUhC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC"}

package/dist/Signature.d.mts

@@ -1,5 +1,5 @@
 import { OperationError } from "./Errors.mjs";
-import { Context, Effect, Redacted, Schema } from "effect";
+import { Context, Effect, Redacted, Schema, Scope } from "effect";
 //#region src/Signature.d.ts
 export declare const Algorithm: Schema.Literals<readonly ["ECDSA-P256-SHA256", "RSASSA-PKCS1-v1_5-SHA256", "RSA-PSS-SHA256", "Ed25519"]>;
 export type Algorithm = typeof Algorithm.Type;
@@ -41,6 +41,16 @@ export declare const PrivateKeyParameters: Schema.Union<readonly [Schema.Struct<
   readonly qi: Schema.Uint8Array;
 }>]>;
 export type PrivateKeyParameters = typeof PrivateKeyParameters.Type;
+export declare const PrivateKeyInput: Schema.Struct<{
+  readonly algorithm: Schema.Literals<readonly ["ECDSA-P256-SHA256", "RSASSA-PKCS1-v1_5-SHA256", "RSA-PSS-SHA256", "Ed25519"]>;
+  readonly privateKey: Schema.Redacted<Schema.Uint8Array>;
+}>;
+export type PrivateKeyInput = typeof PrivateKeyInput.Type;
+export declare const PublicKeyInput: Schema.Struct<{
+  readonly algorithm: Schema.Literals<readonly ["ECDSA-P256-SHA256", "RSASSA-PKCS1-v1_5-SHA256", "RSA-PSS-SHA256", "Ed25519"]>;
+  readonly publicKey: Schema.Uint8Array;
+}>;
+export type PublicKeyInput = typeof PublicKeyInput.Type;
 export declare const SignInput: Schema.Struct<{
   readonly algorithm: Schema.Literals<readonly ["ECDSA-P256-SHA256", "RSASSA-PKCS1-v1_5-SHA256", "RSA-PSS-SHA256", "Ed25519"]>;
   readonly privateKey: Schema.Redacted<Schema.Uint8Array>;
@@ -54,7 +64,19 @@ export declare const VerifyInput: Schema.Struct<{
   readonly signature: Schema.Uint8Array;
 }>;
 export type VerifyInput = typeof VerifyInput.Type;
+/** A nonextractable signing key with its algorithm fixed at import. */
+export interface PrivateKey {
+  readonly sign: (data: Uint8Array) => Effect.Effect<Uint8Array, OperationError>;
+}
+/** A verification key with its algorithm fixed at import. */
+export interface PublicKey {
+  readonly verify: (data: Uint8Array, signature: Uint8Array) => Effect.Effect<boolean, OperationError>;
+}
 declare const Signature_base: Context.ServiceClass<Signature, "@yielded/crypto/Signature", {
+  /** Snapshot PKCS8 once; the imported key is usable only inside its owning Scope. */
+  readonly importPrivateKey: (input: PrivateKeyInput) => Effect.Effect<PrivateKey, OperationError, Scope.Scope>;
+  /** Snapshot SPKI once; scope closure joins native work and rejects later use. */
+  readonly importPublicKey: (input: PublicKeyInput) => Effect.Effect<PublicKey, OperationError, Scope.Scope>;
   readonly encodePublicKey: (input: PublicKeyParameters) => Effect.Effect<Uint8Array, OperationError>;
   readonly encodePrivateKey: (input: Redacted.Redacted<PrivateKeyParameters>) => Effect.Effect<Redacted.Redacted<Uint8Array>, OperationError>;
   readonly sign: (input: SignInput) => Effect.Effect<Uint8Array, OperationError>;

package/dist/Signature.mjs

@@ -50,14 +50,20 @@ const PrivateKeyParameters = Schema.Union([
 		qi: integer
 	})
 ]);
-const SignInput = Schema.Struct({
+const PrivateKeyInput = Schema.Struct({
+	algorithm: Algorithm,
+	privateKey: Schema.Redacted(Schema.Uint8Array, { disallowJsonEncode: true })
+});
+const PublicKeyInput = Schema.Struct({
 	algorithm: Algorithm,
-	privateKey: Schema.Redacted(Schema.Uint8Array, { disallowJsonEncode: true }),
+	publicKey: Schema.Uint8Array
+});
+const SignInput = Schema.Struct({
+	...PrivateKeyInput.fields,
 	data: Schema.Uint8Array
 });
 const VerifyInput = Schema.Struct({
-	algorithm: Algorithm,
-	publicKey: Schema.Uint8Array,
+	...PublicKeyInput.fields,
 	data: Schema.Uint8Array,
 	signature: Schema.Uint8Array
 });
@@ -68,6 +74,6 @@ const VerifyInput = Schema.Struct({
 */
 var Signature = class extends Context.Service()("@yielded/crypto/Signature") {};
 //#endregion
-export { Algorithm, PrivateKeyParameters, PublicKeyParameters, SignInput, Signature, VerifyInput };
+export { Algorithm, PrivateKeyInput, PrivateKeyParameters, PublicKeyInput, PublicKeyParameters, SignInput, Signature, VerifyInput };
 
 //# sourceMappingURL=Signature.mjs.map

package/dist/Signature.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"Signature.mjs","names":[],"sources":["../src/Signature.ts"],"sourcesContent":["import { Context, type Effect, type Redacted, Schema } from \"effect\";\n\nimport type { OperationError } from \"./Errors\";\n\nexport const Algorithm = Schema.Literals([\n  \"ECDSA-P256-SHA256\",\n  \"RSASSA-PKCS1-v1_5-SHA256\",\n  \"RSA-PSS-SHA256\",\n  \"Ed25519\",\n]);\n\nexport type Algorithm = typeof Algorithm.Type;\n\nconst coordinate = Schema.Uint8Array.check(Schema.isMinLength(32), Schema.isMaxLength(32));\nconst integer = Schema.Uint8Array.check(Schema.isMinLength(1), Schema.isMaxLength(1024));\nconst ec = { algorithm: Schema.Literal(\"ECDSA-P256-SHA256\"), x: coordinate, y: coordinate };\nconst ed = { algorithm: Schema.Literal(\"Ed25519\"), x: coordinate };\n\nconst rsa = {\n  algorithm: Schema.Literals([\"RSASSA-PKCS1-v1_5-SHA256\", \"RSA-PSS-SHA256\"]),\n  n: integer,\n  e: integer,\n};\n\n/**\n * Unsigned big-endian components: 32-byte curve values and RSA components up to\n * 1024 bytes. Native import validates the actual key, including RSA's minimum.\n */\nexport const PublicKeyParameters = Schema.Union([\n  Schema.Struct(ec),\n  Schema.Struct(ed),\n  Schema.Struct(rsa),\n]);\n\nexport type PublicKeyParameters = typeof PublicKeyParameters.Type;\n\nexport const PrivateKeyParameters = Schema.Union([\n  Schema.Struct({ ...ec, d: coordinate }),\n  Schema.Struct({ ...ed, d: coordinate }),\n  Schema.Struct({\n    ...rsa,\n    d: integer,\n    p: integer,\n    q: integer,\n    dp: integer,\n    dq: integer,\n    qi: integer,\n  }),\n]);\n\nexport type PrivateKeyParameters = typeof PrivateKeyParameters.Type;\n\nexport const SignInput = Schema.Struct({\n  algorithm: Algorithm,\n  privateKey: Schema.Redacted(Schema.Uint8Array, { disallowJsonEncode: true }),\n  data: Schema.Uint8Array,\n});\n\nexport type SignInput = typeof SignInput.Type;\n\nexport const VerifyInput = Schema.Struct({\n  algorithm: Algorithm,\n  publicKey: Schema.Uint8Array,\n  data: Schema.Uint8Array,\n  signature: Schema.Uint8Array,\n});\n\nexport type VerifyInput = typeof VerifyInput.Type;\n\n/**\n * Private keys are PKCS8 DER; public keys are SPKI DER. ECDSA signatures are\n * 64-byte IEEE P1363 (r || s), not ASN.1 DER. RSA requires at least 2048 bits;\n * PSS uses a 32-byte salt. Key serialization/selection and JOSE policy stay outside.\n */\nexport class Signature extends Context.Service<\n  Signature,\n  {\n    readonly encodePublicKey: (\n      input: PublicKeyParameters,\n    ) => Effect.Effect<Uint8Array, OperationError>;\n    readonly encodePrivateKey: (\n      input: Redacted.Redacted<PrivateKeyParameters>,\n    ) => Effect.Effect<Redacted.Redacted<Uint8Array>, OperationError>;\n    readonly sign: (input: SignInput) => Effect.Effect<Uint8Array, OperationError>;\n    readonly verify: (input: VerifyInput) => Effect.Effect<boolean, OperationError>;\n  }\n>()(\"@yielded/crypto/Signature\") {}\n"],"mappings":";;AAIA,MAAa,YAAY,OAAO,SAAS;CACvC;CACA;CACA;CACA;AACF,CAAC;AAID,MAAM,aAAa,OAAO,WAAW,MAAM,OAAO,YAAY,EAAE,GAAG,OAAO,YAAY,EAAE,CAAC;AACzF,MAAM,UAAU,OAAO,WAAW,MAAM,OAAO,YAAY,CAAC,GAAG,OAAO,YAAY,IAAI,CAAC;AACvF,MAAM,KAAK;CAAE,WAAW,OAAO,QAAQ,mBAAmB;CAAG,GAAG;CAAY,GAAG;AAAW;AAC1F,MAAM,KAAK;CAAE,WAAW,OAAO,QAAQ,SAAS;CAAG,GAAG;AAAW;AAEjE,MAAM,MAAM;CACV,WAAW,OAAO,SAAS,CAAC,4BAA4B,gBAAgB,CAAC;CACzE,GAAG;CACH,GAAG;AACL;;;;;AAMA,MAAa,sBAAsB,OAAO,MAAM;CAC9C,OAAO,OAAO,EAAE;CAChB,OAAO,OAAO,EAAE;CAChB,OAAO,OAAO,GAAG;AACnB,CAAC;AAID,MAAa,uBAAuB,OAAO,MAAM;CAC/C,OAAO,OAAO;EAAE,GAAG;EAAI,GAAG;CAAW,CAAC;CACtC,OAAO,OAAO;EAAE,GAAG;EAAI,GAAG;CAAW,CAAC;CACtC,OAAO,OAAO;EACZ,GAAG;EACH,GAAG;EACH,GAAG;EACH,GAAG;EACH,IAAI;EACJ,IAAI;EACJ,IAAI;CACN,CAAC;AACH,CAAC;AAID,MAAa,YAAY,OAAO,OAAO;CACrC,WAAW;CACX,YAAY,OAAO,SAAS,OAAO,YAAY,EAAE,oBAAoB,KAAK,CAAC;CAC3E,MAAM,OAAO;AACf,CAAC;AAID,MAAa,cAAc,OAAO,OAAO;CACvC,WAAW;CACX,WAAW,OAAO;CAClB,MAAM,OAAO;CACb,WAAW,OAAO;AACpB,CAAC;;;;;;AASD,IAAa,YAAb,cAA+B,QAAQ,QAYrC,CAAC,CAAC,2BAA2B,CAAC,CAAC,CAAC"}
+{"version":3,"file":"Signature.mjs","names":[],"sources":["../src/Signature.ts"],"sourcesContent":["import { Context, type Effect, type Redacted, Schema, type Scope } from \"effect\";\n\nimport type { OperationError } from \"./Errors\";\n\nexport const Algorithm = Schema.Literals([\n  \"ECDSA-P256-SHA256\",\n  \"RSASSA-PKCS1-v1_5-SHA256\",\n  \"RSA-PSS-SHA256\",\n  \"Ed25519\",\n]);\n\nexport type Algorithm = typeof Algorithm.Type;\n\nconst coordinate = Schema.Uint8Array.check(Schema.isMinLength(32), Schema.isMaxLength(32));\nconst integer = Schema.Uint8Array.check(Schema.isMinLength(1), Schema.isMaxLength(1024));\nconst ec = { algorithm: Schema.Literal(\"ECDSA-P256-SHA256\"), x: coordinate, y: coordinate };\nconst ed = { algorithm: Schema.Literal(\"Ed25519\"), x: coordinate };\n\nconst rsa = {\n  algorithm: Schema.Literals([\"RSASSA-PKCS1-v1_5-SHA256\", \"RSA-PSS-SHA256\"]),\n  n: integer,\n  e: integer,\n};\n\n/**\n * Unsigned big-endian components: 32-byte curve values and RSA components up to\n * 1024 bytes. Native import validates the actual key, including RSA's minimum.\n */\nexport const PublicKeyParameters = Schema.Union([\n  Schema.Struct(ec),\n  Schema.Struct(ed),\n  Schema.Struct(rsa),\n]);\n\nexport type PublicKeyParameters = typeof PublicKeyParameters.Type;\n\nexport const PrivateKeyParameters = Schema.Union([\n  Schema.Struct({ ...ec, d: coordinate }),\n  Schema.Struct({ ...ed, d: coordinate }),\n  Schema.Struct({\n    ...rsa,\n    d: integer,\n    p: integer,\n    q: integer,\n    dp: integer,\n    dq: integer,\n    qi: integer,\n  }),\n]);\n\nexport type PrivateKeyParameters = typeof PrivateKeyParameters.Type;\n\nexport const PrivateKeyInput = Schema.Struct({\n  algorithm: Algorithm,\n  privateKey: Schema.Redacted(Schema.Uint8Array, { disallowJsonEncode: true }),\n});\n\nexport type PrivateKeyInput = typeof PrivateKeyInput.Type;\n\nexport const PublicKeyInput = Schema.Struct({\n  algorithm: Algorithm,\n  publicKey: Schema.Uint8Array,\n});\n\nexport type PublicKeyInput = typeof PublicKeyInput.Type;\n\nexport const SignInput = Schema.Struct({\n  ...PrivateKeyInput.fields,\n  data: Schema.Uint8Array,\n});\n\nexport type SignInput = typeof SignInput.Type;\n\nexport const VerifyInput = Schema.Struct({\n  ...PublicKeyInput.fields,\n  data: Schema.Uint8Array,\n  signature: Schema.Uint8Array,\n});\n\nexport type VerifyInput = typeof VerifyInput.Type;\n\n/** A nonextractable signing key with its algorithm fixed at import. */\nexport interface PrivateKey {\n  readonly sign: (data: Uint8Array) => Effect.Effect<Uint8Array, OperationError>;\n}\n\n/** A verification key with its algorithm fixed at import. */\nexport interface PublicKey {\n  readonly verify: (\n    data: Uint8Array,\n    signature: Uint8Array,\n  ) => Effect.Effect<boolean, OperationError>;\n}\n\n/**\n * Private keys are PKCS8 DER; public keys are SPKI DER. ECDSA signatures are\n * 64-byte IEEE P1363 (r || s), not ASN.1 DER. RSA requires at least 2048 bits;\n * PSS uses a 32-byte salt. Key serialization/selection and JOSE policy stay outside.\n */\nexport class Signature extends Context.Service<\n  Signature,\n  {\n    /** Snapshot PKCS8 once; the imported key is usable only inside its owning Scope. */\n    readonly importPrivateKey: (\n      input: PrivateKeyInput,\n    ) => Effect.Effect<PrivateKey, OperationError, Scope.Scope>;\n    /** Snapshot SPKI once; scope closure joins native work and rejects later use. */\n    readonly importPublicKey: (\n      input: PublicKeyInput,\n    ) => Effect.Effect<PublicKey, OperationError, Scope.Scope>;\n    readonly encodePublicKey: (\n      input: PublicKeyParameters,\n    ) => Effect.Effect<Uint8Array, OperationError>;\n    readonly encodePrivateKey: (\n      input: Redacted.Redacted<PrivateKeyParameters>,\n    ) => Effect.Effect<Redacted.Redacted<Uint8Array>, OperationError>;\n    readonly sign: (input: SignInput) => Effect.Effect<Uint8Array, OperationError>;\n    readonly verify: (input: VerifyInput) => Effect.Effect<boolean, OperationError>;\n  }\n>()(\"@yielded/crypto/Signature\") {}\n"],"mappings":";;AAIA,MAAa,YAAY,OAAO,SAAS;CACvC;CACA;CACA;CACA;AACF,CAAC;AAID,MAAM,aAAa,OAAO,WAAW,MAAM,OAAO,YAAY,EAAE,GAAG,OAAO,YAAY,EAAE,CAAC;AACzF,MAAM,UAAU,OAAO,WAAW,MAAM,OAAO,YAAY,CAAC,GAAG,OAAO,YAAY,IAAI,CAAC;AACvF,MAAM,KAAK;CAAE,WAAW,OAAO,QAAQ,mBAAmB;CAAG,GAAG;CAAY,GAAG;AAAW;AAC1F,MAAM,KAAK;CAAE,WAAW,OAAO,QAAQ,SAAS;CAAG,GAAG;AAAW;AAEjE,MAAM,MAAM;CACV,WAAW,OAAO,SAAS,CAAC,4BAA4B,gBAAgB,CAAC;CACzE,GAAG;CACH,GAAG;AACL;;;;;AAMA,MAAa,sBAAsB,OAAO,MAAM;CAC9C,OAAO,OAAO,EAAE;CAChB,OAAO,OAAO,EAAE;CAChB,OAAO,OAAO,GAAG;AACnB,CAAC;AAID,MAAa,uBAAuB,OAAO,MAAM;CAC/C,OAAO,OAAO;EAAE,GAAG;EAAI,GAAG;CAAW,CAAC;CACtC,OAAO,OAAO;EAAE,GAAG;EAAI,GAAG;CAAW,CAAC;CACtC,OAAO,OAAO;EACZ,GAAG;EACH,GAAG;EACH,GAAG;EACH,GAAG;EACH,IAAI;EACJ,IAAI;EACJ,IAAI;CACN,CAAC;AACH,CAAC;AAID,MAAa,kBAAkB,OAAO,OAAO;CAC3C,WAAW;CACX,YAAY,OAAO,SAAS,OAAO,YAAY,EAAE,oBAAoB,KAAK,CAAC;AAC7E,CAAC;AAID,MAAa,iBAAiB,OAAO,OAAO;CAC1C,WAAW;CACX,WAAW,OAAO;AACpB,CAAC;AAID,MAAa,YAAY,OAAO,OAAO;CACrC,GAAG,gBAAgB;CACnB,MAAM,OAAO;AACf,CAAC;AAID,MAAa,cAAc,OAAO,OAAO;CACvC,GAAG,eAAe;CAClB,MAAM,OAAO;CACb,WAAW,OAAO;AACpB,CAAC;;;;;;AAsBD,IAAa,YAAb,cAA+B,QAAQ,QAoBrC,CAAC,CAAC,2BAA2B,CAAC,CAAC,CAAC"}

package/dist/internal/aead.mjs

@@ -1,80 +1,124 @@
-import { Aead, DecryptInput, EncryptInput } from "../Aead.mjs";
+import { Aead, DecryptInput, EncryptInput, KeyDecryptInput, KeyEncryptInput, KeyInput } from "../Aead.mjs";
 import { AuthenticationFailed, UnsupportedAlgorithm } from "../Errors.mjs";
 import { copy, decode, importError, nativeError, nativeErrorName, withSecret } from "./common.mjs";
+import { makeScopedKey } from "./scoped-key.mjs";
 import { Effect, Redacted, Schema } from "effect";
 //#region src/internal/aead.ts
 const keyBytes = Schema.Uint8Array.check(Schema.isBetweenLength(32, 32));
-const makeAead = (subtle, xchacha) => Aead.of({
-	encrypt: Effect.fnUntraced(function* (input) {
-		const value = yield* decode(EncryptInput, input, "data");
-		const nonceLength = value.algorithm === "AES-256-GCM" ? 12 : 24;
-		yield* decode(keyBytes, Redacted.value(value.key), "key");
-		yield* decode(Schema.Uint8Array.check(Schema.isBetweenLength(nonceLength, nonceLength)), value.nonce, "nonce");
-		if (value.algorithm === "XChaCha20-Poly1305" && xchacha === void 0) return yield* UnsupportedAlgorithm.make({});
-		const nonce = yield* copy(value.nonce);
-		const additionalData = yield* copy(value.additionalData ?? /* @__PURE__ */ new Uint8Array());
-		return yield* withSecret(value.key, (key) => withSecret(value.plaintext, (data) => {
-			if (value.algorithm === "XChaCha20-Poly1305") return xchacha === void 0 ? Effect.fail(UnsupportedAlgorithm.make({})) : xchacha.encrypt({
-				key,
-				nonce,
-				additionalData,
-				data
-			});
-			return Effect.gen(function* () {
-				const imported = yield* Effect.tryPromise({
-					try: () => subtle.importKey("raw", key, "AES-GCM", false, ["encrypt"]),
-					catch: importError
-				});
-				const encrypted = yield* Effect.tryPromise({
-					try: () => subtle.encrypt({
-						name: "AES-GCM",
-						iv: nonce,
+const aesNonce = Schema.Uint8Array.check(Schema.isBetweenLength(12, 12));
+const makeAead = (subtle, xchacha) => {
+	const encryptAes = (key, input) => Effect.tryPromise({
+		try: () => subtle.encrypt({
+			name: "AES-GCM",
+			iv: input.nonce,
+			additionalData: input.additionalData,
+			tagLength: 128
+		}, key, input.data),
+		catch: nativeError
+	}).pipe(Effect.map((encrypted) => new Uint8Array(encrypted)));
+	const decryptAes = (key, input) => Effect.tryPromise({
+		try: () => subtle.decrypt({
+			name: "AES-GCM",
+			iv: input.nonce,
+			additionalData: input.additionalData,
+			tagLength: 128
+		}, key, input.data),
+		catch: (cause) => nativeErrorName(cause) === "OperationError" ? AuthenticationFailed.make({}) : nativeError(cause)
+	}).pipe(Effect.map((decrypted) => new Uint8Array(decrypted)));
+	return Aead.of({
+		importKey: Effect.fnUntraced(function* (input) {
+			const value = yield* decode(KeyInput, input, "key");
+			yield* decode(keyBytes, Redacted.value(value.key), "key");
+			const use = yield* makeScopedKey(withSecret(value.key, (material) => Effect.tryPromise({
+				try: () => subtle.importKey("raw", material, "AES-GCM", false, ["encrypt", "decrypt"]),
+				catch: importError
+			})));
+			return {
+				encrypt: Effect.fnUntraced(function* (input) {
+					const value = yield* decode(KeyEncryptInput, input, "data");
+					const nonce = yield* decode(aesNonce, value.nonce, "nonce").pipe(Effect.flatMap(copy));
+					const additionalData = yield* copy(value.additionalData ?? /* @__PURE__ */ new Uint8Array());
+					return yield* withSecret(value.plaintext, (data) => use((key) => encryptAes(key, {
+						nonce,
 						additionalData,
-						tagLength: 128
-					}, imported, data),
-					catch: nativeError
-				});
-				return new Uint8Array(encrypted);
-			}).pipe(Effect.uninterruptible);
-		}));
-	}),
-	decrypt: Effect.fnUntraced(function* (input) {
-		const value = yield* decode(DecryptInput, input, "data");
-		const nonceLength = value.algorithm === "AES-256-GCM" ? 12 : 24;
-		yield* decode(keyBytes, Redacted.value(value.key), "key");
-		yield* decode(Schema.Uint8Array.check(Schema.isBetweenLength(nonceLength, nonceLength)), value.nonce, "nonce");
-		if (value.algorithm === "XChaCha20-Poly1305" && xchacha === void 0) return yield* UnsupportedAlgorithm.make({});
-		if (value.ciphertext.length < 16) return yield* AuthenticationFailed.make({});
-		const nonce = yield* copy(value.nonce);
-		const additionalData = yield* copy(value.additionalData ?? /* @__PURE__ */ new Uint8Array());
-		const data = yield* copy(value.ciphertext);
-		const plaintext = yield* withSecret(value.key, (key) => {
-			if (value.algorithm === "XChaCha20-Poly1305") return xchacha === void 0 ? Effect.fail(UnsupportedAlgorithm.make({})) : xchacha.decrypt({
-				key,
-				nonce,
-				additionalData,
-				data
-			});
-			return Effect.gen(function* () {
-				const imported = yield* Effect.tryPromise({
-					try: () => subtle.importKey("raw", key, "AES-GCM", false, ["decrypt"]),
-					catch: importError
+						data
+					})));
+				}),
+				decrypt: Effect.fnUntraced(function* (input) {
+					const value = yield* decode(KeyDecryptInput, input, "data");
+					const nonce = yield* decode(aesNonce, value.nonce, "nonce").pipe(Effect.flatMap(copy));
+					const additionalData = yield* copy(value.additionalData ?? /* @__PURE__ */ new Uint8Array());
+					const data = yield* copy(value.ciphertext);
+					const plaintext = yield* use((key) => data.length < 16 ? Effect.fail(AuthenticationFailed.make({})) : decryptAes(key, {
+						nonce,
+						additionalData,
+						data
+					}));
+					return Redacted.make(plaintext);
+				})
+			};
+		}),
+		encrypt: Effect.fnUntraced(function* (input) {
+			const value = yield* decode(EncryptInput, input, "data");
+			const nonceLength = value.algorithm === "AES-256-GCM" ? 12 : 24;
+			yield* decode(keyBytes, Redacted.value(value.key), "key");
+			yield* decode(Schema.Uint8Array.check(Schema.isBetweenLength(nonceLength, nonceLength)), value.nonce, "nonce");
+			if (value.algorithm === "XChaCha20-Poly1305" && xchacha === void 0) return yield* UnsupportedAlgorithm.make({});
+			const nonce = yield* copy(value.nonce);
+			const additionalData = yield* copy(value.additionalData ?? /* @__PURE__ */ new Uint8Array());
+			return yield* withSecret(value.key, (key) => withSecret(value.plaintext, (data) => {
+				if (value.algorithm === "XChaCha20-Poly1305") return xchacha === void 0 ? Effect.fail(UnsupportedAlgorithm.make({})) : xchacha.encrypt({
+					key,
+					nonce,
+					additionalData,
+					data
 				});
-				const decrypted = yield* Effect.tryPromise({
-					try: () => subtle.decrypt({
-						name: "AES-GCM",
-						iv: nonce,
+				return Effect.gen(function* () {
+					const imported = yield* Effect.tryPromise({
+						try: () => subtle.importKey("raw", key, "AES-GCM", false, ["encrypt"]),
+						catch: importError
+					});
+					return yield* encryptAes(imported, {
+						nonce,
 						additionalData,
-						tagLength: 128
-					}, imported, data),
-					catch: (cause) => nativeErrorName(cause) === "OperationError" ? AuthenticationFailed.make({}) : nativeError(cause)
+						data
+					});
+				}).pipe(Effect.uninterruptible);
+			}));
+		}),
+		decrypt: Effect.fnUntraced(function* (input) {
+			const value = yield* decode(DecryptInput, input, "data");
+			const nonceLength = value.algorithm === "AES-256-GCM" ? 12 : 24;
+			yield* decode(keyBytes, Redacted.value(value.key), "key");
+			yield* decode(Schema.Uint8Array.check(Schema.isBetweenLength(nonceLength, nonceLength)), value.nonce, "nonce");
+			if (value.algorithm === "XChaCha20-Poly1305" && xchacha === void 0) return yield* UnsupportedAlgorithm.make({});
+			if (value.ciphertext.length < 16) return yield* AuthenticationFailed.make({});
+			const nonce = yield* copy(value.nonce);
+			const additionalData = yield* copy(value.additionalData ?? /* @__PURE__ */ new Uint8Array());
+			const data = yield* copy(value.ciphertext);
+			const plaintext = yield* withSecret(value.key, (key) => {
+				if (value.algorithm === "XChaCha20-Poly1305") return xchacha === void 0 ? Effect.fail(UnsupportedAlgorithm.make({})) : xchacha.decrypt({
+					key,
+					nonce,
+					additionalData,
+					data
 				});
-				return new Uint8Array(decrypted);
-			}).pipe(Effect.uninterruptible);
-		});
-		return Redacted.make(plaintext);
-	})
-});
+				return Effect.gen(function* () {
+					const imported = yield* Effect.tryPromise({
+						try: () => subtle.importKey("raw", key, "AES-GCM", false, ["decrypt"]),
+						catch: importError
+					});
+					return yield* decryptAes(imported, {
+						nonce,
+						additionalData,
+						data
+					});
+				}).pipe(Effect.uninterruptible);
+			});
+			return Redacted.make(plaintext);
+		})
+	});
+};
 //#endregion
 export { makeAead };
 

package/dist/internal/aead.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"aead.mjs","names":[],"sources":["../../src/internal/aead.ts"],"sourcesContent":["import { Effect, Redacted, Schema } from \"effect\";\n\nimport { Aead, DecryptInput, EncryptInput } from \"../Aead\";\nimport { AuthenticationFailed, type OperationError, UnsupportedAlgorithm } from \"../Errors\";\nimport { copy, decode, importError, nativeError, nativeErrorName, withSecret } from \"./common\";\n\ninterface CipherInput {\n  readonly key: Uint8Array<ArrayBuffer>;\n  readonly nonce: Uint8Array<ArrayBuffer>;\n  readonly additionalData: Uint8Array<ArrayBuffer>;\n  readonly data: Uint8Array<ArrayBuffer>;\n}\n\nexport interface XChaCha {\n  readonly encrypt: (input: CipherInput) => Effect.Effect<Uint8Array, OperationError>;\n  readonly decrypt: (\n    input: CipherInput,\n  ) => Effect.Effect<Uint8Array, OperationError | AuthenticationFailed>;\n}\n\nconst keyBytes = Schema.Uint8Array.check(Schema.isBetweenLength(32, 32));\n\nexport const makeAead = (subtle: SubtleCrypto, xchacha?: XChaCha): Aead[\"Service\"] =>\n  Aead.of({\n    encrypt: Effect.fnUntraced(function* (input) {\n      const value = yield* decode(EncryptInput, input, \"data\");\n      const nonceLength = value.algorithm === \"AES-256-GCM\" ? 12 : 24;\n\n      yield* decode(keyBytes, Redacted.value(value.key), \"key\");\n      yield* decode(\n        Schema.Uint8Array.check(Schema.isBetweenLength(nonceLength, nonceLength)),\n        value.nonce,\n        \"nonce\",\n      );\n      if (value.algorithm === \"XChaCha20-Poly1305\" && xchacha === undefined)\n        return yield* UnsupportedAlgorithm.make({});\n      const nonce = yield* copy(value.nonce);\n      const additionalData = yield* copy(value.additionalData ?? new Uint8Array());\n\n      return yield* withSecret(value.key, (key) =>\n        withSecret(value.plaintext, (data) => {\n          if (value.algorithm === \"XChaCha20-Poly1305\") {\n            return xchacha === undefined\n              ? Effect.fail(UnsupportedAlgorithm.make({}))\n              : xchacha.encrypt({ key, nonce, additionalData, data });\n          }\n\n          return Effect.gen(function* () {\n            const imported = yield* Effect.tryPromise({\n              try: () => subtle.importKey(\"raw\", key, \"AES-GCM\", false, [\"encrypt\"]),\n              catch: importError,\n            });\n\n            const encrypted = yield* Effect.tryPromise({\n              try: () =>\n                subtle.encrypt(\n                  { name: \"AES-GCM\", iv: nonce, additionalData, tagLength: 128 },\n                  imported,\n                  data,\n                ),\n              catch: nativeError,\n            });\n\n            return new Uint8Array(encrypted);\n          }).pipe(Effect.uninterruptible);\n        }),\n      );\n    }),\n    decrypt: Effect.fnUntraced(function* (input) {\n      const value = yield* decode(DecryptInput, input, \"data\");\n      const nonceLength = value.algorithm === \"AES-256-GCM\" ? 12 : 24;\n\n      yield* decode(keyBytes, Redacted.value(value.key), \"key\");\n      yield* decode(\n        Schema.Uint8Array.check(Schema.isBetweenLength(nonceLength, nonceLength)),\n        value.nonce,\n        \"nonce\",\n      );\n      if (value.algorithm === \"XChaCha20-Poly1305\" && xchacha === undefined)\n        return yield* UnsupportedAlgorithm.make({});\n      if (value.ciphertext.length < 16) return yield* AuthenticationFailed.make({});\n      const nonce = yield* copy(value.nonce);\n      const additionalData = yield* copy(value.additionalData ?? new Uint8Array());\n      const data = yield* copy(value.ciphertext);\n\n      const plaintext = yield* withSecret(value.key, (key) => {\n        if (value.algorithm === \"XChaCha20-Poly1305\") {\n          return xchacha === undefined\n            ? Effect.fail(UnsupportedAlgorithm.make({}))\n            : xchacha.decrypt({ key, nonce, additionalData, data });\n        }\n\n        return Effect.gen(function* () {\n          const imported = yield* Effect.tryPromise({\n            try: () => subtle.importKey(\"raw\", key, \"AES-GCM\", false, [\"decrypt\"]),\n            catch: importError,\n          });\n\n          const decrypted = yield* Effect.tryPromise({\n            try: () =>\n              subtle.decrypt(\n                { name: \"AES-GCM\", iv: nonce, additionalData, tagLength: 128 },\n                imported,\n                data,\n              ),\n            // WebCrypto specifies OperationError for a rejected GCM tag.\n            catch: (cause) =>\n              nativeErrorName(cause) === \"OperationError\"\n                ? AuthenticationFailed.make({})\n                : nativeError(cause),\n          });\n\n          return new Uint8Array(decrypted);\n        }).pipe(Effect.uninterruptible);\n      });\n\n      return Redacted.make(plaintext);\n    }),\n  });\n"],"mappings":"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"}
+{"version":3,"file":"aead.mjs","names":[],"sources":["../../src/internal/aead.ts"],"sourcesContent":["import { Effect, Redacted, Schema } from \"effect\";\n\nimport {\n  Aead,\n  DecryptInput,\n  EncryptInput,\n  type Key,\n  KeyDecryptInput,\n  KeyEncryptInput,\n  KeyInput,\n} from \"../Aead\";\nimport { AuthenticationFailed, type OperationError, UnsupportedAlgorithm } from \"../Errors\";\nimport { copy, decode, importError, nativeError, nativeErrorName, withSecret } from \"./common\";\nimport { makeScopedKey } from \"./scoped-key\";\n\ninterface CipherData {\n  readonly nonce: Uint8Array<ArrayBuffer>;\n  readonly additionalData: Uint8Array<ArrayBuffer>;\n  readonly data: Uint8Array<ArrayBuffer>;\n}\n\ninterface CipherInput extends CipherData {\n  readonly key: Uint8Array<ArrayBuffer>;\n}\n\nexport interface XChaCha {\n  readonly encrypt: (input: CipherInput) => Effect.Effect<Uint8Array, OperationError>;\n  readonly decrypt: (\n    input: CipherInput,\n  ) => Effect.Effect<Uint8Array, OperationError | AuthenticationFailed>;\n}\n\nconst keyBytes = Schema.Uint8Array.check(Schema.isBetweenLength(32, 32));\nconst aesNonce = Schema.Uint8Array.check(Schema.isBetweenLength(12, 12));\n\nexport const makeAead = (subtle: SubtleCrypto, xchacha?: XChaCha): Aead[\"Service\"] => {\n  const encryptAes = (key: CryptoKey, input: CipherData) =>\n    Effect.tryPromise({\n      try: () =>\n        subtle.encrypt(\n          {\n            name: \"AES-GCM\",\n            iv: input.nonce,\n            additionalData: input.additionalData,\n            tagLength: 128,\n          },\n          key,\n          input.data,\n        ),\n      catch: nativeError,\n    }).pipe(Effect.map((encrypted) => new Uint8Array(encrypted)));\n\n  const decryptAes = (key: CryptoKey, input: CipherData) =>\n    Effect.tryPromise({\n      try: () =>\n        subtle.decrypt(\n          {\n            name: \"AES-GCM\",\n            iv: input.nonce,\n            additionalData: input.additionalData,\n            tagLength: 128,\n          },\n          key,\n          input.data,\n        ),\n      // WebCrypto specifies OperationError for a rejected GCM tag.\n      catch: (cause) =>\n        nativeErrorName(cause) === \"OperationError\"\n          ? AuthenticationFailed.make({})\n          : nativeError(cause),\n    }).pipe(Effect.map((decrypted) => new Uint8Array(decrypted)));\n\n  return Aead.of({\n    importKey: Effect.fnUntraced(function* (input) {\n      const value = yield* decode(KeyInput, input, \"key\");\n\n      yield* decode(keyBytes, Redacted.value(value.key), \"key\");\n\n      const use = yield* makeScopedKey(\n        withSecret(value.key, (material) =>\n          Effect.tryPromise({\n            try: () => subtle.importKey(\"raw\", material, \"AES-GCM\", false, [\"encrypt\", \"decrypt\"]),\n            catch: importError,\n          }),\n        ),\n      );\n\n      return {\n        encrypt: Effect.fnUntraced(function* (input) {\n          const value = yield* decode(KeyEncryptInput, input, \"data\");\n          const nonce = yield* decode(aesNonce, value.nonce, \"nonce\").pipe(Effect.flatMap(copy));\n          const additionalData = yield* copy(value.additionalData ?? new Uint8Array());\n\n          return yield* withSecret(value.plaintext, (data) =>\n            use((key) => encryptAes(key, { nonce, additionalData, data })),\n          );\n        }),\n        decrypt: Effect.fnUntraced(function* (input) {\n          const value = yield* decode(KeyDecryptInput, input, \"data\");\n          const nonce = yield* decode(aesNonce, value.nonce, \"nonce\").pipe(Effect.flatMap(copy));\n          const additionalData = yield* copy(value.additionalData ?? new Uint8Array());\n          const data = yield* copy(value.ciphertext);\n\n          const plaintext = yield* use((key) =>\n            data.length < 16\n              ? Effect.fail(AuthenticationFailed.make({}))\n              : decryptAes(key, { nonce, additionalData, data }),\n          );\n\n          return Redacted.make(plaintext);\n        }),\n      } satisfies Key;\n    }),\n    encrypt: Effect.fnUntraced(function* (input) {\n      const value = yield* decode(EncryptInput, input, \"data\");\n      const nonceLength = value.algorithm === \"AES-256-GCM\" ? 12 : 24;\n\n      yield* decode(keyBytes, Redacted.value(value.key), \"key\");\n      yield* decode(\n        Schema.Uint8Array.check(Schema.isBetweenLength(nonceLength, nonceLength)),\n        value.nonce,\n        \"nonce\",\n      );\n      if (value.algorithm === \"XChaCha20-Poly1305\" && xchacha === undefined)\n        return yield* UnsupportedAlgorithm.make({});\n      const nonce = yield* copy(value.nonce);\n      const additionalData = yield* copy(value.additionalData ?? new Uint8Array());\n\n      return yield* withSecret(value.key, (key) =>\n        withSecret(value.plaintext, (data) => {\n          if (value.algorithm === \"XChaCha20-Poly1305\") {\n            return xchacha === undefined\n              ? Effect.fail(UnsupportedAlgorithm.make({}))\n              : xchacha.encrypt({ key, nonce, additionalData, data });\n          }\n\n          return Effect.gen(function* () {\n            const imported = yield* Effect.tryPromise({\n              try: () => subtle.importKey(\"raw\", key, \"AES-GCM\", false, [\"encrypt\"]),\n              catch: importError,\n            });\n\n            return yield* encryptAes(imported, { nonce, additionalData, data });\n          }).pipe(Effect.uninterruptible);\n        }),\n      );\n    }),\n    decrypt: Effect.fnUntraced(function* (input) {\n      const value = yield* decode(DecryptInput, input, \"data\");\n      const nonceLength = value.algorithm === \"AES-256-GCM\" ? 12 : 24;\n\n      yield* decode(keyBytes, Redacted.value(value.key), \"key\");\n      yield* decode(\n        Schema.Uint8Array.check(Schema.isBetweenLength(nonceLength, nonceLength)),\n        value.nonce,\n        \"nonce\",\n      );\n      if (value.algorithm === \"XChaCha20-Poly1305\" && xchacha === undefined)\n        return yield* UnsupportedAlgorithm.make({});\n      if (value.ciphertext.length < 16) return yield* AuthenticationFailed.make({});\n      const nonce = yield* copy(value.nonce);\n      const additionalData = yield* copy(value.additionalData ?? new Uint8Array());\n      const data = yield* copy(value.ciphertext);\n\n      const plaintext = yield* withSecret(value.key, (key) => {\n        if (value.algorithm === \"XChaCha20-Poly1305\") {\n          return xchacha === undefined\n            ? Effect.fail(UnsupportedAlgorithm.make({}))\n            : xchacha.decrypt({ key, nonce, additionalData, data });\n        }\n\n        return Effect.gen(function* () {\n          const imported = yield* Effect.tryPromise({\n            try: () => subtle.importKey(\"raw\", key, \"AES-GCM\", false, [\"decrypt\"]),\n            catch: importError,\n          });\n\n          return yield* decryptAes(imported, { nonce, additionalData, data });\n        }).pipe(Effect.uninterruptible);\n      });\n\n      return Redacted.make(plaintext);\n    }),\n  });\n};\n"],"mappings":"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"}

package/dist/internal/argon2.mjs

@@ -1,12 +1,17 @@
 import { allocate, destroy, fill, initialize, output } from "./argon2-core.mjs";
-import { Effect } from "effect";
+import { Clock, Effect } from "effect";
 //#region src/internal/argon2.ts
-/** Effect schedules bounded batches; admission remains held through buffer cleanup. */
+/** Effect schedules time slices; admission remains held through buffer cleanup. */
 const argon2 = (input) => Effect.acquireUseRelease(Effect.sync(() => allocate(input)), (state) => Effect.gen(function* () {
+	const clock = yield* Clock.Clock;
 	initialize(state, input);
 	const blocks = fill(state, input);
 	for (;;) {
-		for (let batch = 0; batch < 256; batch++) if (blocks.next().done) return output(state, input);
+		const started = clock.monotonicTimeNanosUnsafe();
+		for (let processed = 0; processed < 2048; processed += 256) {
+			for (let batch = 0; batch < 256; batch++) if (blocks.next().done) return output(state, input);
+			if (clock.monotonicTimeNanosUnsafe() - started >= 8000000n) break;
+		}
 		yield* Effect.yieldNow;
 	}
 }), (state) => Effect.sync(() => destroy(state)));

package/dist/internal/argon2.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"argon2.mjs","names":[],"sources":["../../src/internal/argon2.ts"],"sourcesContent":["import { Effect } from \"effect\";\n\nimport { allocate, destroy, fill, initialize, output } from \"./argon2-core\";\nimport type { Argon2 } from \"./kdf\";\n\n/** Effect schedules bounded batches; admission remains held through buffer cleanup. */\nexport const argon2: Argon2 = (input) =>\n  Effect.acquireUseRelease(\n    Effect.sync(() => allocate(input)),\n    (state) =>\n      Effect.gen(function* () {\n        initialize(state, input);\n        const blocks = fill(state, input);\n\n        for (;;) {\n          for (let batch = 0; batch < 256; batch++) {\n            if (blocks.next().done) return output(state, input);\n          }\n          yield* Effect.yieldNow;\n        }\n      }),\n    (state) => Effect.sync(() => destroy(state)),\n  );\n"],"mappings":";;;;AAMA,MAAa,UAAkB,UAC7B,OAAO,kBACL,OAAO,WAAW,SAAS,KAAK,CAAC,IAChC,UACC,OAAO,IAAI,aAAa;CACtB,WAAW,OAAO,KAAK;CACvB,MAAM,SAAS,KAAK,OAAO,KAAK;CAEhC,SAAS;EACP,KAAK,IAAI,QAAQ,GAAG,QAAQ,KAAK,SAC/B,IAAI,OAAO,KAAK,CAAC,CAAC,MAAM,OAAO,OAAO,OAAO,KAAK;EAEpD,OAAO,OAAO;CAChB;AACF,CAAC,IACF,UAAU,OAAO,WAAW,QAAQ,KAAK,CAAC,CAC7C"}
+{"version":3,"file":"argon2.mjs","names":[],"sources":["../../src/internal/argon2.ts"],"sourcesContent":["import { Clock, Effect } from \"effect\";\n\nimport { allocate, destroy, fill, initialize, output } from \"./argon2-core\";\nimport type { Argon2 } from \"./kdf\";\n\n/** Effect schedules time slices; admission remains held through buffer cleanup. */\nexport const argon2: Argon2 = (input) =>\n  Effect.acquireUseRelease(\n    Effect.sync(() => allocate(input)),\n    (state) =>\n      Effect.gen(function* () {\n        const clock = yield* Clock.Clock;\n\n        initialize(state, input);\n        const blocks = fill(state, input);\n\n        for (;;) {\n          const started = clock.monotonicTimeNanosUnsafe();\n\n          // Workers freeze clocks during CPU work. Cap each slice as well so\n          // interruption and other fibers still get a turn on those runtimes.\n          for (let processed = 0; processed < 2048; processed += 256) {\n            for (let batch = 0; batch < 256; batch++) {\n              if (blocks.next().done) return output(state, input);\n            }\n            if (clock.monotonicTimeNanosUnsafe() - started >= 8_000_000n) break;\n          }\n          yield* Effect.yieldNow;\n        }\n      }),\n    (state) => Effect.sync(() => destroy(state)),\n  );\n"],"mappings":";;;;AAMA,MAAa,UAAkB,UAC7B,OAAO,kBACL,OAAO,WAAW,SAAS,KAAK,CAAC,IAChC,UACC,OAAO,IAAI,aAAa;CACtB,MAAM,QAAQ,OAAO,MAAM;CAE3B,WAAW,OAAO,KAAK;CACvB,MAAM,SAAS,KAAK,OAAO,KAAK;CAEhC,SAAS;EACP,MAAM,UAAU,MAAM,yBAAyB;EAI/C,KAAK,IAAI,YAAY,GAAG,YAAY,MAAM,aAAa,KAAK;GAC1D,KAAK,IAAI,QAAQ,GAAG,QAAQ,KAAK,SAC/B,IAAI,OAAO,KAAK,CAAC,CAAC,MAAM,OAAO,OAAO,OAAO,KAAK;GAEpD,IAAI,MAAM,yBAAyB,IAAI,WAAW,UAAY;EAChE;EACA,OAAO,OAAO;CAChB;AACF,CAAC,IACF,UAAU,OAAO,WAAW,QAAQ,KAAK,CAAC,CAC7C"}

package/dist/internal/hmac.mjs

@@ -1,49 +1,35 @@
-import { CryptoUnavailable } from "../Errors.mjs";
 import { Hmac, Input, KeyInput, VerifyInput } from "../Hmac.mjs";
 import { copy, decode, importError, nativeError, withSecret } from "./common.mjs";
-import { Effect, Exit, Fiber, Redacted, Schema, Scope } from "effect";
+import { makeScopedKey } from "./scoped-key.mjs";
+import { Effect, Redacted, Schema } from "effect";
 //#region src/internal/hmac.ts
 const keyBytes = Schema.Uint8Array.check(Schema.isMinLength(1));
 const makeHmac = (subtle) => {
 	const importKey = Effect.fnUntraced(function* (input) {
 		const value = yield* decode(KeyInput, input, "key");
 		yield* decode(keyBytes, Redacted.value(value.key), "key");
-		const scope = yield* Scope.fork(yield* Effect.scope, "sequential");
-		let imported;
-		yield* Scope.addFinalizer(scope, Effect.sync(() => {
-			imported = void 0;
-		}));
-		const available = Effect.suspend(() => scope.state._tag === "Closed" ? Effect.fail(CryptoUnavailable.make({})) : Effect.void);
-		const run = (operation) => Effect.acquireUseRelease(available.pipe(Effect.andThen(Effect.forkIn(operation, scope, { uninterruptible: false }))), (fiber) => Effect.gen(function* () {
-			const exit = yield* Fiber.await(fiber);
-			yield* available;
-			return yield* exit;
-		}), Fiber.interrupt);
-		yield* run(withSecret(value.key, (material) => Effect.tryPromise({
+		const use = yield* makeScopedKey(withSecret(value.key, (material) => Effect.tryPromise({
 			try: () => subtle.importKey("raw", material, {
 				name: "HMAC",
 				hash: value.algorithm
 			}, false, ["sign", "verify"]),
 			catch: importError
-		}).pipe(Effect.tap((key) => Effect.sync(() => {
-			imported = key;
-		})), Effect.uninterruptible))).pipe(Effect.onExit((exit) => Exit.isFailure(exit) ? Scope.close(scope, exit) : Effect.void));
-		const use = (operation) => run(Effect.suspend(() => {
-			const key = imported;
-			return key === void 0 ? Effect.fail(CryptoUnavailable.make({})) : Effect.tryPromise({
-				try: () => operation(key),
-				catch: nativeError
-			});
-		}).pipe(Effect.uninterruptible));
+		})));
 		return {
 			sign: Effect.fnUntraced(function* (input) {
 				const data = yield* decode(Schema.Uint8Array, input, "data").pipe(Effect.flatMap(copy));
-				return new Uint8Array(yield* use((key) => subtle.sign("HMAC", key, data)));
+				return new Uint8Array(yield* use((key) => Effect.tryPromise({
+					try: () => subtle.sign("HMAC", key, data),
+					catch: nativeError
+				})));
 			}),
 			verify: Effect.fnUntraced(function* (input, signature) {
 				const data = yield* decode(Schema.Uint8Array, input, "data").pipe(Effect.flatMap(copy));
 				const tag = yield* decode(Schema.Uint8Array, signature, "data").pipe(Effect.flatMap(copy));
-				return yield* use((key) => subtle.verify("HMAC", key, tag, data));
+				return yield* use((key) => Effect.tryPromise({
+					try: () => subtle.verify("HMAC", key, tag, data),
+					catch: nativeError
+				}));
 			})
 		};
 	});

package/dist/internal/hmac.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"hmac.mjs","names":[],"sources":["../../src/internal/hmac.ts"],"sourcesContent":["import { Effect, Exit, Fiber, Redacted, Schema, Scope } from \"effect\";\n\nimport { CryptoUnavailable } from \"../Errors\";\nimport { Hmac, Input, type Key, KeyInput, VerifyInput } from \"../Hmac\";\nimport { copy, decode, importError, nativeError, withSecret } from \"./common\";\n\nconst keyBytes = Schema.Uint8Array.check(Schema.isMinLength(1));\n\nexport const makeHmac = (subtle: SubtleCrypto): Hmac[\"Service\"] => {\n  const importKey = Effect.fnUntraced(function* (input: KeyInput) {\n    const value = yield* decode(KeyInput, input, \"key\");\n\n    yield* decode(keyBytes, Redacted.value(value.key), \"key\");\n\n    // A sequential child joins every native call before dropping the key, even\n    // when the caller's Scope runs its other finalizers in parallel.\n    const scope = yield* Scope.fork(yield* Effect.scope, \"sequential\");\n    let imported: CryptoKey | undefined;\n\n    yield* Scope.addFinalizer(\n      scope,\n      Effect.sync(() => {\n        imported = undefined;\n      }),\n    );\n\n    const available = Effect.suspend(() =>\n      scope.state._tag === \"Closed\" ? Effect.fail(CryptoUnavailable.make({})) : Effect.void,\n    );\n\n    const run = <A, E>(operation: Effect.Effect<A, E>) =>\n      Effect.acquireUseRelease(\n        available.pipe(Effect.andThen(Effect.forkIn(operation, scope, { uninterruptible: false }))),\n        (fiber) =>\n          Effect.gen(function* () {\n            const exit = yield* Fiber.await(fiber);\n\n            yield* available;\n\n            return yield* exit;\n          }),\n        Fiber.interrupt,\n      );\n\n    yield* run(\n      withSecret(value.key, (material) =>\n        Effect.tryPromise({\n          try: () =>\n            subtle.importKey(\"raw\", material, { name: \"HMAC\", hash: value.algorithm }, false, [\n              \"sign\",\n              \"verify\",\n            ]),\n          catch: importError,\n        }).pipe(\n          Effect.tap((key) =>\n            Effect.sync(() => {\n              imported = key;\n            }),\n          ),\n          Effect.uninterruptible,\n        ),\n      ),\n    ).pipe(\n      Effect.onExit((exit) => (Exit.isFailure(exit) ? Scope.close(scope, exit) : Effect.void)),\n    );\n\n    const use = <A>(operation: (key: CryptoKey) => Promise<A>) =>\n      run(\n        Effect.suspend(() => {\n          const key = imported;\n\n          return key === undefined\n            ? Effect.fail(CryptoUnavailable.make({}))\n            : Effect.tryPromise({ try: () => operation(key), catch: nativeError });\n        }).pipe(Effect.uninterruptible),\n      );\n\n    return {\n      sign: Effect.fnUntraced(function* (input) {\n        const data = yield* decode(Schema.Uint8Array, input, \"data\").pipe(Effect.flatMap(copy));\n\n        return new Uint8Array(yield* use((key) => subtle.sign(\"HMAC\", key, data)));\n      }),\n      verify: Effect.fnUntraced(function* (input, signature) {\n        const data = yield* decode(Schema.Uint8Array, input, \"data\").pipe(Effect.flatMap(copy));\n        const tag = yield* decode(Schema.Uint8Array, signature, \"data\").pipe(Effect.flatMap(copy));\n\n        return yield* use((key) => subtle.verify(\"HMAC\", key, tag, data));\n      }),\n    } satisfies Key;\n  });\n\n  return Hmac.of({\n    importKey,\n    sign: Effect.fnUntraced(function* (input) {\n      const value = yield* decode(Input, input, \"data\");\n      const data = yield* copy(value.data);\n      const key = yield* importKey(value);\n\n      return yield* key.sign(data);\n    }, Effect.scoped),\n    verify: Effect.fnUntraced(function* (input) {\n      const value = yield* decode(VerifyInput, input, \"data\");\n      const data = yield* copy(value.data);\n      const tag = yield* copy(value.tag);\n      const key = yield* importKey(value);\n\n      return yield* key.verify(data, tag);\n    }, Effect.scoped),\n  });\n};\n"],"mappings":"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"}
+{"version":3,"file":"hmac.mjs","names":[],"sources":["../../src/internal/hmac.ts"],"sourcesContent":["import { Effect, Redacted, Schema } from \"effect\";\n\nimport { Hmac, Input, type Key, KeyInput, VerifyInput } from \"../Hmac\";\nimport { copy, decode, importError, nativeError, withSecret } from \"./common\";\nimport { makeScopedKey } from \"./scoped-key\";\n\nconst keyBytes = Schema.Uint8Array.check(Schema.isMinLength(1));\n\nexport const makeHmac = (subtle: SubtleCrypto): Hmac[\"Service\"] => {\n  const importKey = Effect.fnUntraced(function* (input: KeyInput) {\n    const value = yield* decode(KeyInput, input, \"key\");\n\n    yield* decode(keyBytes, Redacted.value(value.key), \"key\");\n\n    const use = yield* makeScopedKey(\n      withSecret(value.key, (material) =>\n        Effect.tryPromise({\n          try: () =>\n            subtle.importKey(\"raw\", material, { name: \"HMAC\", hash: value.algorithm }, false, [\n              \"sign\",\n              \"verify\",\n            ]),\n          catch: importError,\n        }),\n      ),\n    );\n\n    return {\n      sign: Effect.fnUntraced(function* (input) {\n        const data = yield* decode(Schema.Uint8Array, input, \"data\").pipe(Effect.flatMap(copy));\n\n        return new Uint8Array(\n          yield* use((key) =>\n            Effect.tryPromise({ try: () => subtle.sign(\"HMAC\", key, data), catch: nativeError }),\n          ),\n        );\n      }),\n      verify: Effect.fnUntraced(function* (input, signature) {\n        const data = yield* decode(Schema.Uint8Array, input, \"data\").pipe(Effect.flatMap(copy));\n        const tag = yield* decode(Schema.Uint8Array, signature, \"data\").pipe(Effect.flatMap(copy));\n\n        return yield* use((key) =>\n          Effect.tryPromise({\n            try: () => subtle.verify(\"HMAC\", key, tag, data),\n            catch: nativeError,\n          }),\n        );\n      }),\n    } satisfies Key;\n  });\n\n  return Hmac.of({\n    importKey,\n    sign: Effect.fnUntraced(function* (input) {\n      const value = yield* decode(Input, input, \"data\");\n      const data = yield* copy(value.data);\n      const key = yield* importKey(value);\n\n      return yield* key.sign(data);\n    }, Effect.scoped),\n    verify: Effect.fnUntraced(function* (input) {\n      const value = yield* decode(VerifyInput, input, \"data\");\n      const data = yield* copy(value.data);\n      const tag = yield* copy(value.tag);\n      const key = yield* importKey(value);\n\n      return yield* key.verify(data, tag);\n    }, Effect.scoped),\n  });\n};\n"],"mappings":";;;;;AAMA,MAAM,WAAW,OAAO,WAAW,MAAM,OAAO,YAAY,CAAC,CAAC;AAE9D,MAAa,YAAY,WAA0C;CACjE,MAAM,YAAY,OAAO,WAAW,WAAW,OAAiB;EAC9D,MAAM,QAAQ,OAAO,OAAO,UAAU,OAAO,KAAK;EAElD,OAAO,OAAO,UAAU,SAAS,MAAM,MAAM,GAAG,GAAG,KAAK;EAExD,MAAM,MAAM,OAAO,cACjB,WAAW,MAAM,MAAM,aACrB,OAAO,WAAW;GAChB,WACE,OAAO,UAAU,OAAO,UAAU;IAAE,MAAM;IAAQ,MAAM,MAAM;GAAU,GAAG,OAAO,CAChF,QACA,QACF,CAAC;GACH,OAAO;EACT,CAAC,CACH,CACF;EAEA,OAAO;GACL,MAAM,OAAO,WAAW,WAAW,OAAO;IACxC,MAAM,OAAO,OAAO,OAAO,OAAO,YAAY,OAAO,MAAM,CAAC,CAAC,KAAK,OAAO,QAAQ,IAAI,CAAC;IAEtF,OAAO,IAAI,WACT,OAAO,KAAK,QACV,OAAO,WAAW;KAAE,WAAW,OAAO,KAAK,QAAQ,KAAK,IAAI;KAAG,OAAO;IAAY,CAAC,CACrF,CACF;GACF,CAAC;GACD,QAAQ,OAAO,WAAW,WAAW,OAAO,WAAW;IACrD,MAAM,OAAO,OAAO,OAAO,OAAO,YAAY,OAAO,MAAM,CAAC,CAAC,KAAK,OAAO,QAAQ,IAAI,CAAC;IACtF,MAAM,MAAM,OAAO,OAAO,OAAO,YAAY,WAAW,MAAM,CAAC,CAAC,KAAK,OAAO,QAAQ,IAAI,CAAC;IAEzF,OAAO,OAAO,KAAK,QACjB,OAAO,WAAW;KAChB,WAAW,OAAO,OAAO,QAAQ,KAAK,KAAK,IAAI;KAC/C,OAAO;IACT,CAAC,CACH;GACF,CAAC;EACH;CACF,CAAC;CAED,OAAO,KAAK,GAAG;EACb;EACA,MAAM,OAAO,WAAW,WAAW,OAAO;GACxC,MAAM,QAAQ,OAAO,OAAO,OAAO,OAAO,MAAM;GAChD,MAAM,OAAO,OAAO,KAAK,MAAM,IAAI;GAGnC,OAAO,QAAO,OAFK,UAAU,KAAK,EAAA,CAEhB,KAAK,IAAI;EAC7B,GAAG,OAAO,MAAM;EAChB,QAAQ,OAAO,WAAW,WAAW,OAAO;GAC1C,MAAM,QAAQ,OAAO,OAAO,aAAa,OAAO,MAAM;GACtD,MAAM,OAAO,OAAO,KAAK,MAAM,IAAI;GACnC,MAAM,MAAM,OAAO,KAAK,MAAM,GAAG;GAGjC,OAAO,QAAO,OAFK,UAAU,KAAK,EAAA,CAEhB,OAAO,MAAM,GAAG;EACpC,GAAG,OAAO,MAAM;CAClB,CAAC;AACH"}

package/dist/internal/scoped-key.mjs

@@ -0,0 +1,31 @@
+import { CryptoUnavailable } from "../Errors.mjs";
+import { Effect, Exit, Fiber, Scope } from "effect";
+//#region src/internal/scoped-key.ts
+/** Join native calls before releasing a key, including parallel parent closure. */
+const makeScopedKey = Effect.fnUntraced(function* (acquire) {
+	const scope = yield* Scope.fork(yield* Effect.scope, "sequential");
+	let imported;
+	yield* Scope.addFinalizer(scope, Effect.sync(() => {
+		imported = void 0;
+	}));
+	const available = Effect.suspend(() => scope.state._tag === "Closed" ? Effect.fail(CryptoUnavailable.make({})) : Effect.void);
+	const run = (operation) => Effect.acquireUseRelease(available.pipe(Effect.andThen(Effect.forkIn(operation, scope, {
+		uninterruptible: false,
+		startImmediately: true
+	}))), (fiber) => Effect.gen(function* () {
+		const exit = yield* Fiber.await(fiber);
+		yield* available;
+		return yield* exit;
+	}), Fiber.interrupt);
+	yield* run(acquire.pipe(Effect.tap((key) => Effect.sync(() => {
+		imported = key;
+	})), Effect.uninterruptible)).pipe(Effect.onExit((exit) => Exit.isFailure(exit) ? Scope.close(scope, exit) : Effect.void));
+	return (operation) => run(Effect.suspend(() => {
+		const key = imported;
+		return key === void 0 ? Effect.fail(CryptoUnavailable.make({})) : operation(key);
+	}).pipe(Effect.uninterruptible));
+});
+//#endregion
+export { makeScopedKey };
+
+//# sourceMappingURL=scoped-key.mjs.map

package/dist/internal/scoped-key.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"scoped-key.mjs","names":[],"sources":["../../src/internal/scoped-key.ts"],"sourcesContent":["import { Effect, Exit, Fiber, Scope } from \"effect\";\n\nimport { CryptoUnavailable, type OperationError } from \"../Errors\";\n\n/** Join native calls before releasing a key, including parallel parent closure. */\nexport const makeScopedKey = Effect.fnUntraced(function* (\n  acquire: Effect.Effect<CryptoKey, OperationError>,\n) {\n  const scope = yield* Scope.fork(yield* Effect.scope, \"sequential\");\n  let imported: CryptoKey | undefined;\n\n  yield* Scope.addFinalizer(\n    scope,\n    Effect.sync(() => {\n      imported = undefined;\n    }),\n  );\n\n  const available = Effect.suspend(() =>\n    scope.state._tag === \"Closed\" ? Effect.fail(CryptoUnavailable.make({})) : Effect.void,\n  );\n\n  const run = <A, E>(operation: Effect.Effect<A, E>) =>\n    Effect.acquireUseRelease(\n      available.pipe(\n        Effect.andThen(\n          Effect.forkIn(operation, scope, { uninterruptible: false, startImmediately: true }),\n        ),\n      ),\n      (fiber) =>\n        Effect.gen(function* () {\n          const exit = yield* Fiber.await(fiber);\n\n          yield* available;\n\n          return yield* exit;\n        }),\n      Fiber.interrupt,\n    );\n\n  yield* run(\n    acquire.pipe(\n      Effect.tap((key) =>\n        Effect.sync(() => {\n          imported = key;\n        }),\n      ),\n      Effect.uninterruptible,\n    ),\n  ).pipe(Effect.onExit((exit) => (Exit.isFailure(exit) ? Scope.close(scope, exit) : Effect.void)));\n\n  return <A, E>(operation: (key: CryptoKey) => Effect.Effect<A, E>) =>\n    run(\n      Effect.suspend((): Effect.Effect<A, E | CryptoUnavailable> => {\n        const key = imported;\n\n        return key === undefined ? Effect.fail(CryptoUnavailable.make({})) : operation(key);\n      }).pipe(Effect.uninterruptible),\n    );\n});\n"],"mappings":";;;;AAKA,MAAa,gBAAgB,OAAO,WAAW,WAC7C,SACA;CACA,MAAM,QAAQ,OAAO,MAAM,KAAK,OAAO,OAAO,OAAO,YAAY;CACjE,IAAI;CAEJ,OAAO,MAAM,aACX,OACA,OAAO,WAAW;EAChB,WAAW,KAAA;CACb,CAAC,CACH;CAEA,MAAM,YAAY,OAAO,cACvB,MAAM,MAAM,SAAS,WAAW,OAAO,KAAK,kBAAkB,KAAK,CAAC,CAAC,CAAC,IAAI,OAAO,IACnF;CAEA,MAAM,OAAa,cACjB,OAAO,kBACL,UAAU,KACR,OAAO,QACL,OAAO,OAAO,WAAW,OAAO;EAAE,iBAAiB;EAAO,kBAAkB;CAAK,CAAC,CACpF,CACF,IACC,UACC,OAAO,IAAI,aAAa;EACtB,MAAM,OAAO,OAAO,MAAM,MAAM,KAAK;EAErC,OAAO;EAEP,OAAO,OAAO;CAChB,CAAC,GACH,MAAM,SACR;CAEF,OAAO,IACL,QAAQ,KACN,OAAO,KAAK,QACV,OAAO,WAAW;EAChB,WAAW;CACb,CAAC,CACH,GACA,OAAO,eACT,CACF,CAAC,CAAC,KAAK,OAAO,QAAQ,SAAU,KAAK,UAAU,IAAI,IAAI,MAAM,MAAM,OAAO,IAAI,IAAI,OAAO,IAAK,CAAC;CAE/F,QAAc,cACZ,IACE,OAAO,cAAuD;EAC5D,MAAM,MAAM;EAEZ,OAAO,QAAQ,KAAA,IAAY,OAAO,KAAK,kBAAkB,KAAK,CAAC,CAAC,CAAC,IAAI,UAAU,GAAG;CACpF,CAAC,CAAC,CAAC,KAAK,OAAO,eAAe,CAChC;AACJ,CAAC"}