@gnufoo/canaad 0.1.3 → 0.3.0

package/init.d.ts

@@ -0,0 +1,11 @@
+/**
+ * Initialize WASM. Call once before using any WASM functions.
+ *
+ * @param wasmModule - Pass the WebAssembly.Module in Workers, omit in browser
+ */
+export function initWasm(wasmModule?: WebAssembly.Module): Promise<void>;
+
+/**
+ * Check if WASM has been initialized.
+ */
+export function isInitialized(): boolean;

package/init.js

@@ -0,0 +1,24 @@
+import init from './canaad_wasm.js';
+
+let initialized = false;
+let initPromise = null;
+
+/**
+ * Initialize WASM. Call once before using any WASM functions.
+ *
+ * @param {WebAssembly.Module | undefined} wasmModule - Pass the Module in Workers, omit in browser
+ */
+export async function initWasm(wasmModule) {
+  if (initialized) return;
+  if (initPromise) return initPromise;
+
+  initPromise = init(wasmModule).then(() => {
+    initialized = true;
+  });
+
+  return initPromise;
+}
+
+export function isInitialized() {
+  return initialized;
+}

package/meta.js

@@ -44,7 +44,7 @@ export const meta = {
   slug: 'canaad',
   description: 'canonicalize JSON for AAD (Additional Authenticated Data) per RFC 8785',
   category: 'crypto',
-  executionType: 'client',
+  executionType: 'hybrid',
   positionalArgs: { order: ['action', 'input'], required: 1 },
   inputSchema,
   outputSchema,

package/package.json

@@ -1,14 +1,26 @@
 {
   "name": "@gnufoo/canaad",
-  "version": "0.1.3",
+  "version": "0.3.0",
   "type": "module",
   "main": "canaad_wasm.js",
   "types": "canaad_wasm.d.ts",
   "exports": {
-    ".": "./canaad_wasm.js",
-    "./meta": "./meta.js",
-    "./tool": "./tool.js",
-    "./wasm": "./canaad_wasm_bg.wasm"
+    ".": {
+      "types": "./canaad_wasm.d.ts",
+      "import": "./canaad_wasm.js"
+    },
+    "./meta": {
+      "types": "./meta.d.ts",
+      "import": "./meta.js"
+    },
+    "./tool": {
+      "types": "./tool.d.ts",
+      "import": "./tool.js"
+    },
+    "./init": {
+      "types": "./init.d.ts",
+      "import": "./init.js"
+    }
   },
   "dependencies": {
     "zod": "^3.24.0"
@@ -18,6 +30,7 @@
     "*.d.ts",
     "*.wasm"
   ],
+  "sideEffects": false,
   "keywords": [
     "aead",
     "aad",

package/tool.d.ts

@@ -1,19 +1,8 @@
 import type { meta, CanaadInput, CanaadOutput } from './meta.js';
+import type { initWasm, isInitialized } from './init.js';
 
-/**
- * Initialize the WASM module.
- *
- * @param wasmSource - Optional WASM source:
- *   - Browser: omit (fetches automatically)
- *   - Cloudflare Workers: pass WebAssembly.Module from import
- */
-export function ensureReady(wasmSource?:
-  | WebAssembly.Module
-  | ArrayBuffer
-  | URL
-  | string
-): Promise<void>;
-
-export const toolDefinition: typeof meta & {
+export declare const toolDefinition: typeof meta & {
+  initWasm: typeof initWasm;
+  isInitialized: typeof isInitialized;
   execute(input: CanaadInput): Promise<CanaadOutput>;
 };

package/tool.js

@@ -1,48 +1,24 @@
 import { meta, inputSchema } from './meta.js';
-import init, { canonicalize, canonicalizeString, hash, validate, AadBuilder } from './canaad_wasm.js';
+import { initWasm, isInitialized } from './init.js';
+import { canonicalize, canonicalizeString, hash, validate, AadBuilder } from './canaad_wasm.js';
 
-// --- Initialization state ---
-let initialized = false;
-let initPromise = null;
-
-/**
- * Initialize the WASM module.
- *
- * @param {WebAssembly.Module | ArrayBuffer | URL | string} [wasmSource]
- *   - Browser: omit or pass URL/string path (uses fetch)
- *   - Cloudflare Workers: pass the imported WebAssembly.Module
- *
- * @example
- * // Browser (fetch automatically)
- * await ensureReady();
- *
- * @example
- * // Cloudflare Workers (pre-compiled module)
- * import wasmModule from '@gnufoo/canaad/wasm';
- * await ensureReady(wasmModule);
- */
-export async function ensureReady(wasmSource) {
-  if (initialized) return;
-  if (initPromise) return initPromise;
-
-  initPromise = init(wasmSource).then(() => {
-    initialized = true;
-  });
-
-  return initPromise;
-}
-
-// --- Helpers ---
 const bytesToHex = (bytes) => Array.from(bytes).map(b => b.toString(16).padStart(2, '0')).join('');
-const bytesToBase64 = (bytes) => btoa(String.fromCharCode(...bytes));
+const bytesToBase64 = (bytes) => globalThis.btoa(String.fromCharCode(...bytes));
 
-// --- Tool Definition ---
 export const toolDefinition = {
   ...meta,
 
+  /**
+   * Initialize WASM. Must be called before execute() in Workers.
+   * In browsers with vite-plugin-wasm, this is optional.
+   */
+  initWasm,
+  isInitialized,
+
   async execute(rawInput) {
-    // Default initialization (browser) - no wasmSource needed
-    await ensureReady();
+    if (!isInitialized()) {
+      throw new Error('WASM not initialized. Call initWasm() first.');
+    }
 
     const input = inputSchema.parse(rawInput);