@sorisdk/matcher 0.1.3 → 0.1.5

package/README.md

@@ -38,6 +38,7 @@ await session.addEntry(
 const result = await session.match(new Uint8Array([1, 2, 3]));
 
 console.log(result.best);
+console.log(await session.getEntryMetadata("demo-track"));
 ```
 
 ## Advanced wasm loading
@@ -67,3 +68,13 @@ const session = new MatcherSession({
 - `URL`
 
 If you want campaign events and browser recognition flow on top of matching, use `@sorisdk/web-audio`.
+
+## Metadata lookup
+
+Audiopack footer metadata is available through explicit lookup rather than being
+embedded in `MatchResult`.
+
+```ts
+const best = await session.bestMatch(queryBytes);
+const metadata = best ? await session.getEntryMetadata(best.name) : null;
+```

package/dist/generated/core.d.ts

@@ -5,8 +5,9 @@ export class WasmMatcherDatabase {
     free(): void;
     [Symbol.dispose](): void;
     addEntry(name: string, afp_type: number, buffer: Uint8Array): void;
-    addOrReplace(name: string, afp_type: number, buffer: Uint8Array): void;
+    addOrReplace(name: string, afp_type: number, buffer: Uint8Array, metadata?: any | null): void;
     clear(): void;
+    getEntryMetadata(name: string): any;
     loadPackBytes(bytes: Uint8Array): void;
     loadPackBytesAppend(bytes: Uint8Array): void;
     constructor();

package/dist/generated/core_bg.js

@@ -28,13 +28,14 @@ export class WasmMatcherDatabase {
      * @param {string} name
      * @param {number} afp_type
      * @param {Uint8Array} buffer
+     * @param {any | null} [metadata]
      */
-    addOrReplace(name, afp_type, buffer) {
+    addOrReplace(name, afp_type, buffer, metadata) {
         const ptr0 = passStringToWasm0(name, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         const len0 = WASM_VECTOR_LEN;
         const ptr1 = passArray8ToWasm0(buffer, wasm.__wbindgen_malloc);
         const len1 = WASM_VECTOR_LEN;
-        const ret = wasm.wasmmatcherdatabase_addOrReplace(this.__wbg_ptr, ptr0, len0, afp_type, ptr1, len1);
+        const ret = wasm.wasmmatcherdatabase_addOrReplace(this.__wbg_ptr, ptr0, len0, afp_type, ptr1, len1, isLikeNone(metadata) ? 0 : addToExternrefTable0(metadata));
         if (ret[1]) {
             throw takeFromExternrefTable0(ret[0]);
         }
@@ -42,6 +43,19 @@ export class WasmMatcherDatabase {
     clear() {
         wasm.wasmmatcherdatabase_clear(this.__wbg_ptr);
     }
+    /**
+     * @param {string} name
+     * @returns {any}
+     */
+    getEntryMetadata(name) {
+        const ptr0 = passStringToWasm0(name, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        const len0 = WASM_VECTOR_LEN;
+        const ret = wasm.wasmmatcherdatabase_getEntryMetadata(this.__wbg_ptr, ptr0, len0);
+        if (ret[2]) {
+            throw takeFromExternrefTable0(ret[1]);
+        }
+        return takeFromExternrefTable0(ret[0]);
+    }
     /**
      * @returns {number}
      */
@@ -164,6 +178,12 @@ export function __wbg_String_8564e559799eccda(arg0, arg1) {
     getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true);
     getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
 }
+export function __wbg___wbindgen_bigint_get_as_i64_3d3aba5d616c6a51(arg0, arg1) {
+    const v = arg1;
+    const ret = typeof(v) === 'bigint' ? v : undefined;
+    getDataViewMemory0().setBigInt64(arg0 + 8 * 1, isLikeNone(ret) ? BigInt(0) : ret, true);
+    getDataViewMemory0().setInt32(arg0 + 4 * 0, !isLikeNone(ret), true);
+}
 export function __wbg___wbindgen_boolean_get_6ea149f0a8dcc5ff(arg0) {
     const v = arg0;
     const ret = typeof(v) === 'boolean' ? v : undefined;
@@ -180,6 +200,14 @@ export function __wbg___wbindgen_in_a5d8b22e52b24dd1(arg0, arg1) {
     const ret = arg0 in arg1;
     return ret;
 }
+export function __wbg___wbindgen_is_bigint_ec25c7f91b4d9e93(arg0) {
+    const ret = typeof(arg0) === 'bigint';
+    return ret;
+}
+export function __wbg___wbindgen_is_function_3baa9db1a987f47d(arg0) {
+    const ret = typeof(arg0) === 'function';
+    return ret;
+}
 export function __wbg___wbindgen_is_null_52ff4ec04186736f(arg0) {
     const ret = arg0 === null;
     return ret;
@@ -189,10 +217,18 @@ export function __wbg___wbindgen_is_object_63322ec0cd6ea4ef(arg0) {
     const ret = typeof(val) === 'object' && val !== null;
     return ret;
 }
+export function __wbg___wbindgen_is_string_6df3bf7ef1164ed3(arg0) {
+    const ret = typeof(arg0) === 'string';
+    return ret;
+}
 export function __wbg___wbindgen_is_undefined_29a43b4d42920abd(arg0) {
     const ret = arg0 === undefined;
     return ret;
 }
+export function __wbg___wbindgen_jsval_eq_d3465d8a07697228(arg0, arg1) {
+    const ret = arg0 === arg1;
+    return ret;
+}
 export function __wbg___wbindgen_jsval_loose_eq_cac3565e89b4134c(arg0, arg1) {
     const ret = arg0 == arg1;
     return ret;
@@ -214,6 +250,18 @@ export function __wbg___wbindgen_string_get_7ed5322991caaec5(arg0, arg1) {
 export function __wbg___wbindgen_throw_6b64449b9b9ed33c(arg0, arg1) {
     throw new Error(getStringFromWasm0(arg0, arg1));
 }
+export function __wbg_call_14b169f759b26747() { return handleError(function (arg0, arg1) {
+    const ret = arg0.call(arg1);
+    return ret;
+}, arguments); }
+export function __wbg_done_9158f7cc8751ba32(arg0) {
+    const ret = arg0.done;
+    return ret;
+}
+export function __wbg_entries_e0b73aa8571ddb56(arg0) {
+    const ret = Object.entries(arg0);
+    return ret;
+}
 export function __wbg_error_a6fa202b58aa1cd3(arg0, arg1) {
     let deferred0_0;
     let deferred0_1;
@@ -225,6 +273,18 @@ export function __wbg_error_a6fa202b58aa1cd3(arg0, arg1) {
         wasm.__wbindgen_free(deferred0_0, deferred0_1, 1);
     }
 }
+export function __wbg_get_1affdbdd5573b16a() { return handleError(function (arg0, arg1) {
+    const ret = Reflect.get(arg0, arg1);
+    return ret;
+}, arguments); }
+export function __wbg_get_8360291721e2339f(arg0, arg1) {
+    const ret = arg0[arg1 >>> 0];
+    return ret;
+}
+export function __wbg_get_unchecked_17f53dad852b9588(arg0, arg1) {
+    const ret = arg0[arg1 >>> 0];
+    return ret;
+}
 export function __wbg_get_with_ref_key_6412cf3094599694(arg0, arg1) {
     const ret = arg0[arg1];
     return ret;
@@ -239,6 +299,16 @@ export function __wbg_instanceof_ArrayBuffer_7c8433c6ed14ffe3(arg0) {
     const ret = result;
     return ret;
 }
+export function __wbg_instanceof_Map_1b76fd4635be43eb(arg0) {
+    let result;
+    try {
+        result = arg0 instanceof Map;
+    } catch (_) {
+        result = false;
+    }
+    const ret = result;
+    return ret;
+}
 export function __wbg_instanceof_Uint8Array_152ba1f289edcf3f(arg0) {
     let result;
     try {
@@ -249,10 +319,22 @@ export function __wbg_instanceof_Uint8Array_152ba1f289edcf3f(arg0) {
     const ret = result;
     return ret;
 }
+export function __wbg_isArray_c3109d14ffc06469(arg0) {
+    const ret = Array.isArray(arg0);
+    return ret;
+}
 export function __wbg_isSafeInteger_4fc213d1989d6d2a(arg0) {
     const ret = Number.isSafeInteger(arg0);
     return ret;
 }
+export function __wbg_iterator_013bc09ec998c2a7() {
+    const ret = Symbol.iterator;
+    return ret;
+}
+export function __wbg_length_3d4ecd04bd8d22f1(arg0) {
+    const ret = arg0.length;
+    return ret;
+}
 export function __wbg_length_9f1775224cf1d815(arg0) {
     const ret = arg0.length;
     return ret;
@@ -265,6 +347,10 @@ export function __wbg_new_227d7c05414eb861() {
     const ret = new Error();
     return ret;
 }
+export function __wbg_new_34d45cc8e36aaead() {
+    const ret = new Map();
+    return ret;
+}
 export function __wbg_new_682678e2f47e32bc() {
     const ret = new Array();
     return ret;
@@ -273,6 +359,14 @@ export function __wbg_new_aa8d0fa9762c29bd() {
     const ret = new Object();
     return ret;
 }
+export function __wbg_next_0340c4ae324393c3() { return handleError(function (arg0) {
+    const ret = arg0.next();
+    return ret;
+}, arguments); }
+export function __wbg_next_7646edaa39458ef7(arg0) {
+    const ret = arg0.next;
+    return ret;
+}
 export function __wbg_now_a9b7df1cbee90986() {
     const ret = Date.now();
     return ret;
@@ -286,6 +380,10 @@ export function __wbg_set_3bf1de9fab0cd644(arg0, arg1, arg2) {
 export function __wbg_set_6be42768c690e380(arg0, arg1, arg2) {
     arg0[arg1] = arg2;
 }
+export function __wbg_set_fde2cec06c23692b(arg0, arg1, arg2) {
+    const ret = arg0.set(arg1, arg2);
+    return ret;
+}
 export function __wbg_stack_3b0d974bbf31e44f(arg0, arg1) {
     const ret = arg1.stack;
     const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
@@ -293,17 +391,26 @@ export function __wbg_stack_3b0d974bbf31e44f(arg0, arg1) {
     getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true);
     getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
 }
+export function __wbg_value_ee3a06f4579184fa(arg0) {
+    const ret = arg0.value;
+    return ret;
+}
 export function __wbindgen_cast_0000000000000001(arg0) {
     // Cast intrinsic for `F64 -> Externref`.
     const ret = arg0;
     return ret;
 }
-export function __wbindgen_cast_0000000000000002(arg0, arg1) {
+export function __wbindgen_cast_0000000000000002(arg0) {
+    // Cast intrinsic for `I64 -> Externref`.
+    const ret = arg0;
+    return ret;
+}
+export function __wbindgen_cast_0000000000000003(arg0, arg1) {
     // Cast intrinsic for `Ref(String) -> Externref`.
     const ret = getStringFromWasm0(arg0, arg1);
     return ret;
 }
-export function __wbindgen_cast_0000000000000003(arg0) {
+export function __wbindgen_cast_0000000000000004(arg0) {
     // Cast intrinsic for `U64 -> Externref`.
     const ret = BigInt.asUintN(64, arg0);
     return ret;
@@ -427,6 +534,15 @@ function getUint8ArrayMemory0() {
     return cachedUint8ArrayMemory0;
 }
 
+function handleError(f, args) {
+    try {
+        return f.apply(this, args);
+    } catch (e) {
+        const idx = addToExternrefTable0(e);
+        wasm.__wbindgen_exn_store(idx);
+    }
+}
+
 function isLikeNone(x) {
     return x === undefined || x === null;
 }

package/dist/generated/core_bg.wasm.d.ts

@@ -4,8 +4,9 @@ export const memory: WebAssembly.Memory;
 export const __wbg_wasmmatcherdatabase_free: (a: number, b: number) => void;
 export const __wbg_wasmmatcherengine_free: (a: number, b: number) => void;
 export const wasmmatcherdatabase_addEntry: (a: number, b: number, c: number, d: number, e: number, f: number) => [number, number];
-export const wasmmatcherdatabase_addOrReplace: (a: number, b: number, c: number, d: number, e: number, f: number) => [number, number];
+export const wasmmatcherdatabase_addOrReplace: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => [number, number];
 export const wasmmatcherdatabase_clear: (a: number) => void;
+export const wasmmatcherdatabase_getEntryMetadata: (a: number, b: number, c: number) => [number, number, number];
 export const wasmmatcherdatabase_length: (a: number) => number;
 export const wasmmatcherdatabase_loadPackBytes: (a: number, b: number, c: number) => [number, number];
 export const wasmmatcherdatabase_loadPackBytesAppend: (a: number, b: number, c: number) => [number, number];
@@ -18,8 +19,9 @@ export const wasmmatcherengine_resetDistinctMatchState: (a: number) => void;
 export const init_matcher_wasm: () => void;
 export const __wbindgen_malloc: (a: number, b: number) => number;
 export const __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number;
-export const __wbindgen_free: (a: number, b: number, c: number) => void;
+export const __wbindgen_exn_store: (a: number) => void;
+export const __externref_table_alloc: () => number;
 export const __wbindgen_externrefs: WebAssembly.Table;
+export const __wbindgen_free: (a: number, b: number, c: number) => void;
 export const __externref_table_dealloc: (a: number) => void;
-export const __externref_table_alloc: () => number;
 export const __wbindgen_start: () => void;

package/dist/index.d.ts

@@ -8,6 +8,14 @@ interface MatchConfig {
     scoreThreshold?: number;
     gapThreshold?: number;
 }
+interface EntryMetadata {
+    id?: string | null;
+    name?: string | null;
+    title?: string | null;
+    image?: string | null;
+    type?: string | null;
+    [key: string]: unknown;
+}
 interface MatchResult {
     name: string;
     score: number;
@@ -125,9 +133,10 @@ declare class MatcherSession {
     ready(): Promise<void>;
     loadPack(source: PackSource): Promise<void>;
     addEntry(name: string, afpType: AudioFingerprintType, fingerprint: Uint8Array): Promise<void>;
-    addOrReplace(name: string, afpType: AudioFingerprintType, fingerprint: Uint8Array): Promise<void>;
+    addOrReplace(name: string, afpType: AudioFingerprintType, fingerprint: Uint8Array, metadata?: EntryMetadata | null): Promise<void>;
     removeEntry(name: string): Promise<void>;
     clear(): Promise<void>;
+    getEntryMetadata(name: string): Promise<EntryMetadata | null>;
     match(query: Uint8Array, config?: MatchConfig): Promise<MatchResult[]>;
     bestMatch(query: Uint8Array, config?: MatchConfig): Promise<MatchResult | null>;
     destroy(): void;
@@ -142,4 +151,4 @@ declare function __setMatcherWasmModuleForTests(moduleLike: unknown): void;
 declare function __setMatcherEmbeddedPackForTests(bytes: Uint8Array): void;
 declare function __resetMatcherWasmForTests(): void;
 
-export { AudioFingerprintType, type InitMatcherOptions, type InitMatcherResult, type MatchConfig, type MatchResult, type MatcherEphemeralAuthOptions, type MatcherEphemeralAuthResult, type MatcherEphemeralKeyExchangeMetadata, type MatcherEphemeralKeyExchangeOptions, MatcherSession, type MatcherSessionEventMap, type MatcherSessionEventName, type MatcherSessionListener, type MatcherSessionOptions, type PackSource, __resetMatcherWasmForTests, __setMatcherEmbeddedPackForTests, __setMatcherWasmModuleForTests, initMatcher };
+export { AudioFingerprintType, type EntryMetadata, type InitMatcherOptions, type InitMatcherResult, type MatchConfig, type MatchResult, type MatcherEphemeralAuthOptions, type MatcherEphemeralAuthResult, type MatcherEphemeralKeyExchangeMetadata, type MatcherEphemeralKeyExchangeOptions, MatcherSession, type MatcherSessionEventMap, type MatcherSessionEventName, type MatcherSessionListener, type MatcherSessionOptions, type PackSource, __resetMatcherWasmForTests, __setMatcherEmbeddedPackForTests, __setMatcherWasmModuleForTests, initMatcher };

package/dist/index.js

@@ -307,12 +307,12 @@ var WrappedDatabase = class {
     }
     fn.call(this.inner, name, afpType, fingerprint);
   }
-  addOrReplace(name, afpType, fingerprint) {
+  addOrReplace(name, afpType, fingerprint, metadata) {
     const fn = getCallable(this.inner, ["addOrReplace", "add_or_replace"]);
     if (!fn) {
       throw new Error("WASM database is missing addOrReplace");
     }
-    fn.call(this.inner, name, afpType, fingerprint);
+    fn.call(this.inner, name, afpType, fingerprint, metadata);
   }
   removeEntry(name) {
     const fn = getCallable(this.inner, ["removeEntry", "remove_entry"]);
@@ -347,6 +347,17 @@ var WrappedDatabase = class {
     }
     appendFn.call(this.inner, bytes);
   }
+  getEntryMetadata(name) {
+    const fn = getCallable(this.inner, ["getEntryMetadata", "get_entry_metadata"]);
+    if (!fn) {
+      throw new Error("WASM database is missing getEntryMetadata-compatible method");
+    }
+    const raw = fn.call(this.inner, name);
+    if (!raw || typeof raw !== "object") {
+      return null;
+    }
+    return normalizeEntryMetadata(raw);
+  }
   destroy() {
     const fn = getCallable(this.inner, ["destroy", "free"]);
     if (fn) {
@@ -412,6 +423,42 @@ function normalizeResult(raw) {
     afpType
   };
 }
+function isMapLike(raw) {
+  return raw instanceof Map || Object.prototype.toString.call(raw) === "[object Map]" && typeof raw.entries === "function";
+}
+function toEntryMetadataRecord(raw) {
+  if (isMapLike(raw)) {
+    const entries = [];
+    for (const [key, value] of raw.entries()) {
+      if (typeof key === "string") {
+        entries.push([key, value]);
+      }
+    }
+    return Object.fromEntries(entries);
+  }
+  return raw;
+}
+function normalizeEntryMetadata(raw) {
+  const metadata = toEntryMetadataRecord(raw);
+  const {
+    _id: legacyId,
+    id,
+    kind,
+    type,
+    title,
+    name,
+    image,
+    ...rest
+  } = metadata;
+  return {
+    ...rest,
+    ...id !== void 0 || legacyId !== void 0 ? { id: String(id ?? legacyId) } : {},
+    ...name !== void 0 ? { name: name == null ? null : String(name) } : {},
+    ...title !== void 0 ? { title: title == null ? null : String(title) } : {},
+    ...image !== void 0 ? { image: image == null ? null : String(image) } : {},
+    ...type !== void 0 || kind !== void 0 ? { type: type == null && kind == null ? null : String(type ?? kind) } : {}
+  };
+}
 function normalizeResults(rawResults) {
   return rawResults.filter((item) => typeof item === "object" && item !== null).map((item) => normalizeResult(item));
 }
@@ -557,10 +604,15 @@ var MatcherSession = class {
       handleError(this.events, "addEntry", error);
     }
   }
-  async addOrReplace(name, afpType, fingerprint) {
+  async addOrReplace(name, afpType, fingerprint, metadata) {
     try {
       await this.ensureLiveReady();
-      this.databaseOrThrow().addOrReplace(name, afpType, toUint8ArrayCopy(fingerprint));
+      this.databaseOrThrow().addOrReplace(
+        name,
+        afpType,
+        toUint8ArrayCopy(fingerprint),
+        metadata
+      );
       this.distinctMatchDeduper.reset();
       this.matcher?.resetDistinctMatchState?.();
     } catch (error) {
@@ -587,6 +639,14 @@ var MatcherSession = class {
       handleError(this.events, "clear", error);
     }
   }
+  async getEntryMetadata(name) {
+    try {
+      await this.ensureLiveReady();
+      return this.databaseOrThrow().getEntryMetadata(name);
+    } catch (error) {
+      handleError(this.events, "getEntryMetadata", error);
+    }
+  }
   async match(query, config) {
     try {
       await this.ensureLiveReady();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sorisdk/matcher",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "Browser WASM SDK for audio fingerprint matching",
   "type": "module",
   "main": "./dist/index.js",