@memberjunction/ng-conversations 6.2.0-edge.3 → 6.2.0-edge.5

package/dist/lib/services/recording/wasm-opus-encoder.js

@@ -0,0 +1,232 @@
+import { LIBOPUS_WORKER_SOURCE } from './libopus-worker-source';
+/**
+ * How long {@link WasmOpusEncoder.Flush} waits for the worker's `flushed` reply. The runtime bounds
+ * the whole recorder Stop at 2 s, so this stays below that and leaves room for closing up.
+ */
+export const WASM_OPUS_FLUSH_TIMEOUT_MS = 1500;
+/**
+ * How long {@link WasmOpusEncoder.Start} waits for the worker to instantiate libopus. Instantiating
+ * the ~330 KB module takes milliseconds; a worker that says nothing for this long is not running
+ * (a Content-Security-Policy without `worker-src blob:` or `'wasm-unsafe-eval'`, for instance).
+ */
+export const WASM_OPUS_READY_TIMEOUT_MS = 5000;
+/** Memoized load of the embedded wasm module, so a page only parses the 440 KB string once. */
+let wasmBase64Load = null;
+function loadLibopusWasmBase64() {
+    if (!wasmBase64Load) {
+        // Dynamic import, category 3 (genuine bundle-size deferral, .claude/rules/typescript-style.md):
+        // the embedded libopus build is ~440 KB of base64 and is needed only by browsers whose WebCodecs
+        // cannot encode Opus. A static import would put it in every Explorer bundle that loads this
+        // library. The module is local to this package, so no dependency is hidden from package.json.
+        wasmBase64Load = import('./libopus-wasm-binary').then((module) => module.LIBOPUS_WASM_BASE64);
+        wasmBase64Load.catch(() => {
+            // Let a later call retry (e.g. a chunk load that failed on a flaky network); the caller logs.
+            wasmBase64Load = null;
+        });
+    }
+    return wasmBase64Load;
+}
+/** Decodes base64 into a fresh ArrayBuffer (one the worker can take ownership of). */
+export function DecodeBase64ToArrayBuffer(base64) {
+    const binary = atob(base64);
+    const bytes = new Uint8Array(binary.length);
+    for (let i = 0; i < binary.length; i++) {
+        bytes[i] = binary.charCodeAt(i);
+    }
+    return bytes.buffer;
+}
+/**
+ * Opus encoding through libopus compiled to WebAssembly, running in a dedicated Worker so encoding
+ * never competes with the call's UI or audio on the main thread. The fallback for browsers whose
+ * WebCodecs cannot encode Opus.
+ *
+ * The worker does the 960-sample framing itself (see {@link LIBOPUS_WORKER_SOURCE}); this class only
+ * forwards audio, collects the packets the worker posts back, and turns `flush` into a promise.
+ */
+export class WasmOpusEncoder {
+    port;
+    onClose;
+    Kind = 'wasm';
+    packets = [];
+    flushWaiters = new Map();
+    nextFlushId = 1;
+    closed = false;
+    /** Whether the worker has reported `ready`, or the error it reported instead. */
+    startState = 'starting';
+    /** Notified once when {@link startState} leaves `starting` (null = ready, else the error). */
+    startWaiter = null;
+    /**
+     * @param port channel to a worker running {@link LIBOPUS_WORKER_SOURCE}
+     * @param wasmBytes the libopus module; ownership moves to the worker
+     * @param onClose extra cleanup after the worker stops (the Blob URL revoke)
+     */
+    constructor(port, wasmBytes, onClose = () => undefined) {
+        this.port = port;
+        this.onClose = onClose;
+        port.OnReply = (reply) => this.onReply(reply);
+        port.Post({ Type: 'init', Wasm: wasmBytes }, [wasmBytes]);
+    }
+    /**
+     * Loads the embedded wasm and starts the worker from a Blob URL. Rejects if either fails, or if the
+     * worker never gets libopus running (see {@link Start}).
+     */
+    static async Create() {
+        const wasmBytes = DecodeBase64ToArrayBuffer(await loadLibopusWasmBase64());
+        const url = URL.createObjectURL(new Blob([LIBOPUS_WORKER_SOURCE], { type: 'application/javascript' }));
+        let worker;
+        try {
+            worker = new Worker(url);
+        }
+        catch (error) {
+            URL.revokeObjectURL(url);
+            throw error;
+        }
+        return WasmOpusEncoder.Start(new BrowserWorkerPort(worker), wasmBytes, () => URL.revokeObjectURL(url));
+    }
+    /**
+     * Creates the encoder on `port` and resolves once the worker reports libopus ready. Rejects — after
+     * closing the encoder — when the worker reports an init error or says nothing for
+     * {@link WASM_OPUS_READY_TIMEOUT_MS}: an encoder that can never produce a packet must fail selection,
+     * so the recorder turns recording off visibly instead of "recording" while producing nothing.
+     */
+    static async Start(port, wasmBytes, onClose = () => undefined) {
+        const encoder = new WasmOpusEncoder(port, wasmBytes, onClose);
+        try {
+            await encoder.waitUntilStarted();
+            return encoder;
+        }
+        catch (error) {
+            encoder.Close();
+            throw error;
+        }
+    }
+    Encode(pcm48k) {
+        if (this.closed || pcm48k.length === 0) {
+            return;
+        }
+        const copy = pcm48k.slice();
+        this.port.Post({ Type: 'encode', Pcm: copy }, [copy.buffer]);
+    }
+    Flush() {
+        if (this.closed) {
+            return Promise.resolve();
+        }
+        const id = this.nextFlushId++;
+        return new Promise((resolve) => {
+            const timer = setTimeout(() => {
+                this.flushWaiters.delete(id);
+                console.warn(`[WasmOpusEncoder] Worker did not confirm flush within ${WASM_OPUS_FLUSH_TIMEOUT_MS} ms — the final packets may be missing.`);
+                resolve();
+            }, WASM_OPUS_FLUSH_TIMEOUT_MS);
+            this.flushWaiters.set(id, () => {
+                clearTimeout(timer);
+                resolve();
+            });
+            this.port.Post({ Type: 'flush', ID: id }, []);
+        });
+    }
+    TakePackets() {
+        const packets = this.packets;
+        this.packets = [];
+        return packets;
+    }
+    Close() {
+        if (this.closed) {
+            return;
+        }
+        this.closed = true;
+        this.port.OnReply = null;
+        this.port.Terminate();
+        this.onClose();
+        // A flush still waiting can never be answered now; release it instead of leaving it to the timeout.
+        for (const release of this.flushWaiters.values()) {
+            release();
+        }
+        this.flushWaiters.clear();
+    }
+    /** Records the worker's start outcome (only the first one counts) and wakes {@link waitUntilStarted}. */
+    settleStart(error) {
+        if (this.startState !== 'starting') {
+            return;
+        }
+        this.startState = error === null ? 'ready' : { Error: error };
+        const waiter = this.startWaiter;
+        this.startWaiter = null;
+        waiter?.(error);
+    }
+    /** Resolves once the worker is ready; rejects with its init error or after the start timeout. */
+    waitUntilStarted() {
+        return new Promise((resolve, reject) => {
+            const state = this.startState;
+            if (state === 'ready') {
+                resolve();
+                return;
+            }
+            if (state !== 'starting') {
+                reject(new Error(state.Error));
+                return;
+            }
+            const timer = setTimeout(() => {
+                this.startWaiter = null;
+                reject(new Error(`libopus worker did not start within ${WASM_OPUS_READY_TIMEOUT_MS} ms`));
+            }, WASM_OPUS_READY_TIMEOUT_MS);
+            this.startWaiter = (error) => {
+                clearTimeout(timer);
+                if (error === null) {
+                    resolve();
+                }
+                else {
+                    reject(new Error(error));
+                }
+            };
+        });
+    }
+    onReply(reply) {
+        switch (reply.Type) {
+            case 'packets':
+                for (const buffer of reply.Packets) {
+                    this.packets.push(new Uint8Array(buffer));
+                }
+                break;
+            case 'flushed': {
+                const release = this.flushWaiters.get(reply.ID);
+                this.flushWaiters.delete(reply.ID);
+                release?.();
+                break;
+            }
+            case 'error':
+                console.warn(`[WasmOpusEncoder] ${reply.Message} — the rest of this call is not recorded.`);
+                this.settleStart(reply.Message);
+                break;
+            case 'ready':
+                this.settleStart(null);
+                break;
+        }
+    }
+}
+/** Adapts a DOM `Worker` to {@link OpusWorkerPort}. */
+export class BrowserWorkerPort {
+    worker;
+    OnReply = null;
+    constructor(worker) {
+        this.worker = worker;
+        worker.onmessage = (event) => this.OnReply?.(event.data);
+        // A worker that fails to load or throws (a Content-Security-Policy without `worker-src blob:`, for
+        // instance) reports it here, not through a message. Surface it as an error reply, so a starting
+        // encoder fails at once instead of after its start timeout.
+        worker.onerror = (event) => {
+            const message = `Encoder worker error: ${event.message}`;
+            console.warn(`[WasmOpusEncoder] ${message}`);
+            this.OnReply?.({ Type: 'error', Message: message });
+        };
+    }
+    Post(message, transfer) {
+        this.worker.postMessage(message, transfer);
+    }
+    Terminate() {
+        this.worker.onmessage = null;
+        this.worker.onerror = null;
+        this.worker.terminate();
+    }
+}
+//# sourceMappingURL=wasm-opus-encoder.js.map

package/dist/lib/services/recording/wasm-opus-encoder.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"wasm-opus-encoder.js","sourceRoot":"","sources":["../../../../src/lib/services/recording/wasm-opus-encoder.ts"],"names":[],"mappings":"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","sourcesContent":["import { LIBOPUS_WORKER_SOURCE, OpusWorkerReply, OpusWorkerRequest } from './libopus-worker-source';\nimport type { IOpusPacketEncoder } from './opus-packet-encoder';\n\n/**\n * How long {@link WasmOpusEncoder.Flush} waits for the worker's `flushed` reply. The runtime bounds\n * the whole recorder Stop at 2 s, so this stays below that and leaves room for closing up.\n */\nexport const WASM_OPUS_FLUSH_TIMEOUT_MS = 1500;\n\n/**\n * How long {@link WasmOpusEncoder.Start} waits for the worker to instantiate libopus. Instantiating\n * the ~330 KB module takes milliseconds; a worker that says nothing for this long is not running\n * (a Content-Security-Policy without `worker-src blob:` or `'wasm-unsafe-eval'`, for instance).\n */\nexport const WASM_OPUS_READY_TIMEOUT_MS = 5000;\n\n/** The two-way channel to the encoder worker. A real `Worker` is adapted to it; tests run the worker source in-process. */\nexport interface OpusWorkerPort {\n    /** Posts a request, transferring the listed buffers. */\n    Post(message: OpusWorkerRequest, transfer: Transferable[]): void;\n    /** Receives every reply the worker posts. */\n    OnReply: ((reply: OpusWorkerReply) => void) | null;\n    /** Stops the worker. */\n    Terminate(): void;\n}\n\n/** Memoized load of the embedded wasm module, so a page only parses the 440 KB string once. */\nlet wasmBase64Load: Promise<string> | null = null;\n\nfunction loadLibopusWasmBase64(): Promise<string> {\n    if (!wasmBase64Load) {\n        // Dynamic import, category 3 (genuine bundle-size deferral, .claude/rules/typescript-style.md):\n        // the embedded libopus build is ~440 KB of base64 and is needed only by browsers whose WebCodecs\n        // cannot encode Opus. A static import would put it in every Explorer bundle that loads this\n        // library. The module is local to this package, so no dependency is hidden from package.json.\n        wasmBase64Load = import('./libopus-wasm-binary').then((module) => module.LIBOPUS_WASM_BASE64);\n        wasmBase64Load.catch(() => {\n            // Let a later call retry (e.g. a chunk load that failed on a flaky network); the caller logs.\n            wasmBase64Load = null;\n        });\n    }\n    return wasmBase64Load;\n}\n\n/** Decodes base64 into a fresh ArrayBuffer (one the worker can take ownership of). */\nexport function DecodeBase64ToArrayBuffer(base64: string): ArrayBuffer {\n    const binary = atob(base64);\n    const bytes = new Uint8Array(binary.length);\n    for (let i = 0; i < binary.length; i++) {\n        bytes[i] = binary.charCodeAt(i);\n    }\n    return bytes.buffer;\n}\n\n/**\n * Opus encoding through libopus compiled to WebAssembly, running in a dedicated Worker so encoding\n * never competes with the call's UI or audio on the main thread. The fallback for browsers whose\n * WebCodecs cannot encode Opus.\n *\n * The worker does the 960-sample framing itself (see {@link LIBOPUS_WORKER_SOURCE}); this class only\n * forwards audio, collects the packets the worker posts back, and turns `flush` into a promise.\n */\nexport class WasmOpusEncoder implements IOpusPacketEncoder {\n    public readonly Kind = 'wasm';\n    private packets: Uint8Array[] = [];\n    private readonly flushWaiters = new Map<number, () => void>();\n    private nextFlushId = 1;\n    private closed = false;\n    /** Whether the worker has reported `ready`, or the error it reported instead. */\n    private startState: 'starting' | 'ready' | { Error: string } = 'starting';\n    /** Notified once when {@link startState} leaves `starting` (null = ready, else the error). */\n    private startWaiter: ((error: string | null) => void) | null = null;\n\n    /**\n     * @param port channel to a worker running {@link LIBOPUS_WORKER_SOURCE}\n     * @param wasmBytes the libopus module; ownership moves to the worker\n     * @param onClose extra cleanup after the worker stops (the Blob URL revoke)\n     */\n    constructor(private readonly port: OpusWorkerPort, wasmBytes: ArrayBuffer, private readonly onClose: () => void = () => undefined) {\n        port.OnReply = (reply) => this.onReply(reply);\n        port.Post({ Type: 'init', Wasm: wasmBytes }, [wasmBytes]);\n    }\n\n    /**\n     * Loads the embedded wasm and starts the worker from a Blob URL. Rejects if either fails, or if the\n     * worker never gets libopus running (see {@link Start}).\n     */\n    public static async Create(): Promise<WasmOpusEncoder> {\n        const wasmBytes = DecodeBase64ToArrayBuffer(await loadLibopusWasmBase64());\n        const url = URL.createObjectURL(new Blob([LIBOPUS_WORKER_SOURCE], { type: 'application/javascript' }));\n        let worker: Worker;\n        try {\n            worker = new Worker(url);\n        } catch (error) {\n            URL.revokeObjectURL(url);\n            throw error;\n        }\n        return WasmOpusEncoder.Start(new BrowserWorkerPort(worker), wasmBytes, () => URL.revokeObjectURL(url));\n    }\n\n    /**\n     * Creates the encoder on `port` and resolves once the worker reports libopus ready. Rejects — after\n     * closing the encoder — when the worker reports an init error or says nothing for\n     * {@link WASM_OPUS_READY_TIMEOUT_MS}: an encoder that can never produce a packet must fail selection,\n     * so the recorder turns recording off visibly instead of \"recording\" while producing nothing.\n     */\n    public static async Start(port: OpusWorkerPort, wasmBytes: ArrayBuffer, onClose: () => void = () => undefined): Promise<WasmOpusEncoder> {\n        const encoder = new WasmOpusEncoder(port, wasmBytes, onClose);\n        try {\n            await encoder.waitUntilStarted();\n            return encoder;\n        } catch (error) {\n            encoder.Close();\n            throw error;\n        }\n    }\n\n    public Encode(pcm48k: Float32Array): void {\n        if (this.closed || pcm48k.length === 0) {\n            return;\n        }\n        const copy = pcm48k.slice();\n        this.port.Post({ Type: 'encode', Pcm: copy }, [copy.buffer]);\n    }\n\n    public Flush(): Promise<void> {\n        if (this.closed) {\n            return Promise.resolve();\n        }\n        const id = this.nextFlushId++;\n        return new Promise<void>((resolve) => {\n            const timer = setTimeout(() => {\n                this.flushWaiters.delete(id);\n                console.warn(`[WasmOpusEncoder] Worker did not confirm flush within ${WASM_OPUS_FLUSH_TIMEOUT_MS} ms — the final packets may be missing.`);\n                resolve();\n            }, WASM_OPUS_FLUSH_TIMEOUT_MS);\n            this.flushWaiters.set(id, () => {\n                clearTimeout(timer);\n                resolve();\n            });\n            this.port.Post({ Type: 'flush', ID: id }, []);\n        });\n    }\n\n    public TakePackets(): Uint8Array[] {\n        const packets = this.packets;\n        this.packets = [];\n        return packets;\n    }\n\n    public Close(): void {\n        if (this.closed) {\n            return;\n        }\n        this.closed = true;\n        this.port.OnReply = null;\n        this.port.Terminate();\n        this.onClose();\n        // A flush still waiting can never be answered now; release it instead of leaving it to the timeout.\n        for (const release of this.flushWaiters.values()) {\n            release();\n        }\n        this.flushWaiters.clear();\n    }\n\n    /** Records the worker's start outcome (only the first one counts) and wakes {@link waitUntilStarted}. */\n    private settleStart(error: string | null): void {\n        if (this.startState !== 'starting') {\n            return;\n        }\n        this.startState = error === null ? 'ready' : { Error: error };\n        const waiter = this.startWaiter;\n        this.startWaiter = null;\n        waiter?.(error);\n    }\n\n    /** Resolves once the worker is ready; rejects with its init error or after the start timeout. */\n    private waitUntilStarted(): Promise<void> {\n        return new Promise<void>((resolve, reject) => {\n            const state = this.startState;\n            if (state === 'ready') {\n                resolve();\n                return;\n            }\n            if (state !== 'starting') {\n                reject(new Error(state.Error));\n                return;\n            }\n            const timer = setTimeout(() => {\n                this.startWaiter = null;\n                reject(new Error(`libopus worker did not start within ${WASM_OPUS_READY_TIMEOUT_MS} ms`));\n            }, WASM_OPUS_READY_TIMEOUT_MS);\n            this.startWaiter = (error) => {\n                clearTimeout(timer);\n                if (error === null) {\n                    resolve();\n                } else {\n                    reject(new Error(error));\n                }\n            };\n        });\n    }\n\n    private onReply(reply: OpusWorkerReply): void {\n        switch (reply.Type) {\n            case 'packets':\n                for (const buffer of reply.Packets) {\n                    this.packets.push(new Uint8Array(buffer));\n                }\n                break;\n            case 'flushed': {\n                const release = this.flushWaiters.get(reply.ID);\n                this.flushWaiters.delete(reply.ID);\n                release?.();\n                break;\n            }\n            case 'error':\n                console.warn(`[WasmOpusEncoder] ${reply.Message} — the rest of this call is not recorded.`);\n                this.settleStart(reply.Message);\n                break;\n            case 'ready':\n                this.settleStart(null);\n                break;\n        }\n    }\n}\n\n/** The slice of a DOM `Worker` {@link BrowserWorkerPort} drives (the real `Worker` satisfies it). */\nexport type WorkerLike = Pick<Worker, 'postMessage' | 'terminate'> & {\n    // case-violation-ok-legacy-back-compat: mirrors the DOM Worker handler properties so a real Worker satisfies this type\n    onmessage: ((event: MessageEvent<OpusWorkerReply>) => void) | null;\n    // case-violation-ok-legacy-back-compat: mirrors the DOM Worker handler properties so a real Worker satisfies this type\n    onerror: ((event: ErrorEvent) => void) | null;\n};\n\n/** Adapts a DOM `Worker` to {@link OpusWorkerPort}. */\nexport class BrowserWorkerPort implements OpusWorkerPort {\n    public OnReply: ((reply: OpusWorkerReply) => void) | null = null;\n\n    constructor(private readonly worker: WorkerLike) {\n        worker.onmessage = (event: MessageEvent<OpusWorkerReply>) => this.OnReply?.(event.data);\n        // A worker that fails to load or throws (a Content-Security-Policy without `worker-src blob:`, for\n        // instance) reports it here, not through a message. Surface it as an error reply, so a starting\n        // encoder fails at once instead of after its start timeout.\n        worker.onerror = (event: ErrorEvent) => {\n            const message = `Encoder worker error: ${event.message}`;\n            console.warn(`[WasmOpusEncoder] ${message}`);\n            this.OnReply?.({ Type: 'error', Message: message });\n        };\n    }\n\n    public Post(message: OpusWorkerRequest, transfer: Transferable[]): void {\n        this.worker.postMessage(message, transfer);\n    }\n\n    public Terminate(): void {\n        this.worker.onmessage = null;\n        this.worker.onerror = null;\n        this.worker.terminate();\n    }\n}\n"]}

package/dist/lib/services/recording/webcodecs-opus-encoder.d.ts

@@ -0,0 +1,39 @@
+import type { IOpusPacketEncoder } from './opus-packet-encoder';
+/** The recording's Opus configuration for WebCodecs: mono 48 kHz, 32 kbps, 20 ms frames. */
+export declare const WEBCODECS_OPUS_CONFIG: AudioEncoderConfig;
+/** The slice of a WebCodecs `AudioEncoder` instance this wrapper drives. */
+export type AudioEncoderLike = Pick<AudioEncoder, 'configure' | 'encode' | 'flush' | 'close' | 'state'>;
+/** The WebCodecs `AudioEncoder` constructor shape (the real global satisfies it). */
+export interface AudioEncoderConstructor {
+    new (init: AudioEncoderInit): AudioEncoderLike;
+    isConfigSupported(config: AudioEncoderConfig): Promise<AudioEncoderSupport>;
+}
+/** The WebCodecs `AudioData` constructor shape (the real global satisfies it). */
+export interface AudioDataConstructor {
+    new (init: AudioDataInit): AudioData;
+}
+/**
+ * Opus encoding through the browser's native WebCodecs `AudioEncoder`.
+ *
+ * Each 48 kHz block becomes one `AudioData` whose timestamp comes from the running sample count
+ * (never the wall clock), so the encoder sees one gap-free stream. The encoder emits one
+ * `EncodedAudioChunk` per 20 ms packet; each is copied out immediately because a chunk's bytes are
+ * only guaranteed while the callback runs.
+ */
+export declare class WebCodecsOpusEncoder implements IOpusPacketEncoder {
+    private readonly audioData;
+    readonly Kind = "webcodecs";
+    private readonly encoder;
+    private packets;
+    private samplesFed;
+    /** Set by the encoder's error callback or a throwing encode: later input is dropped, packets kept. */
+    private failed;
+    private closed;
+    /** Creates and configures the encoder. Throws if `configure` does (the selector falls back to WASM). */
+    constructor(audioEncoder: AudioEncoderConstructor, audioData: AudioDataConstructor);
+    Encode(pcm48k: Float32Array): void;
+    Flush(): Promise<void>;
+    TakePackets(): Uint8Array[];
+    Close(): void;
+}
+//# sourceMappingURL=webcodecs-opus-encoder.d.ts.map

package/dist/lib/services/recording/webcodecs-opus-encoder.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"webcodecs-opus-encoder.d.ts","sourceRoot":"","sources":["../../../../src/lib/services/recording/webcodecs-opus-encoder.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAEhE,4FAA4F;AAC5F,eAAO,MAAM,qBAAqB,EAAE,kBAMnC,CAAC;AAEF,4EAA4E;AAC5E,MAAM,MAAM,gBAAgB,GAAG,IAAI,CAAC,YAAY,EAAE,WAAW,GAAG,QAAQ,GAAG,OAAO,GAAG,OAAO,GAAG,OAAO,CAAC,CAAC;AAExG,qFAAqF;AACrF,MAAM,WAAW,uBAAuB;IACpC,KAAK,IAAI,EAAE,gBAAgB,GAAG,gBAAgB,CAAC;IAE/C,iBAAiB,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;CAC/E;AAED,kFAAkF;AAClF,MAAM,WAAW,oBAAoB;IACjC,KAAK,IAAI,EAAE,aAAa,GAAG,SAAS,CAAC;CACxC;AAED;;;;;;;GAOG;AACH,qBAAa,oBAAqB,YAAW,kBAAkB;IAUR,OAAO,CAAC,QAAQ,CAAC,SAAS;IAT7E,SAAgB,IAAI,eAAe;IACnC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAmB;IAC3C,OAAO,CAAC,OAAO,CAAoB;IACnC,OAAO,CAAC,UAAU,CAAK;IACvB,sGAAsG;IACtG,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,MAAM,CAAS;IAEvB,wGAAwG;gBAC5F,YAAY,EAAE,uBAAuB,EAAmB,SAAS,EAAE,oBAAoB;IAgB5F,MAAM,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI;IAwB5B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAW5B,WAAW,IAAI,UAAU,EAAE;IAM3B,KAAK,IAAI,IAAI;CAcvB"}

package/dist/lib/services/recording/webcodecs-opus-encoder.js

@@ -0,0 +1,101 @@
+import { RECORDING_SAMPLE_RATE } from '@memberjunction/ai-core-plus';
+/** The recording's Opus configuration for WebCodecs: mono 48 kHz, 32 kbps, 20 ms frames. */
+export const WEBCODECS_OPUS_CONFIG = {
+    codec: 'opus',
+    sampleRate: RECORDING_SAMPLE_RATE,
+    numberOfChannels: 1,
+    bitrate: 32000,
+    opus: { frameDuration: 20000 },
+};
+/**
+ * Opus encoding through the browser's native WebCodecs `AudioEncoder`.
+ *
+ * Each 48 kHz block becomes one `AudioData` whose timestamp comes from the running sample count
+ * (never the wall clock), so the encoder sees one gap-free stream. The encoder emits one
+ * `EncodedAudioChunk` per 20 ms packet; each is copied out immediately because a chunk's bytes are
+ * only guaranteed while the callback runs.
+ */
+export class WebCodecsOpusEncoder {
+    audioData;
+    Kind = 'webcodecs';
+    encoder;
+    packets = [];
+    samplesFed = 0;
+    /** Set by the encoder's error callback or a throwing encode: later input is dropped, packets kept. */
+    failed = false;
+    closed = false;
+    /** Creates and configures the encoder. Throws if `configure` does (the selector falls back to WASM). */
+    constructor(audioEncoder, audioData) {
+        this.audioData = audioData;
+        this.encoder = new audioEncoder({
+            output: (chunk) => {
+                const bytes = new Uint8Array(chunk.byteLength);
+                chunk.copyTo(bytes);
+                this.packets.push(bytes);
+            },
+            error: (error) => {
+                // The recorder keeps the packets it already has; a broken encoder must never end the call.
+                console.warn(`[WebCodecsOpusEncoder] Encoder failed after ${this.samplesFed} samples — the rest of this call is not recorded:`, error);
+                this.failed = true;
+            },
+        });
+        this.encoder.configure(WEBCODECS_OPUS_CONFIG);
+    }
+    Encode(pcm48k) {
+        if (this.failed || this.closed || pcm48k.length === 0) {
+            return;
+        }
+        const data = new this.audioData({
+            format: 'f32',
+            sampleRate: RECORDING_SAMPLE_RATE,
+            numberOfFrames: pcm48k.length,
+            numberOfChannels: 1,
+            timestamp: Math.round((this.samplesFed * 1_000_000) / RECORDING_SAMPLE_RATE),
+            // AudioData needs an ArrayBuffer-backed view (not a SharedArrayBuffer one); it copies anyway.
+            data: pcm48k.buffer instanceof ArrayBuffer ? pcm48k : new Float32Array(pcm48k),
+        });
+        this.samplesFed += pcm48k.length;
+        try {
+            this.encoder.encode(data);
+        }
+        catch (error) {
+            console.warn(`[WebCodecsOpusEncoder] encode() threw at sample ${this.samplesFed} — the rest of this call is not recorded:`, error);
+            this.failed = true;
+        }
+        finally {
+            data.close();
+        }
+    }
+    async Flush() {
+        if (this.failed || this.closed) {
+            return;
+        }
+        try {
+            await this.encoder.flush();
+        }
+        catch (error) {
+            console.warn(`[WebCodecsOpusEncoder] flush() failed after ${this.samplesFed} samples — the final packets may be missing:`, error);
+        }
+    }
+    TakePackets() {
+        const packets = this.packets;
+        this.packets = [];
+        return packets;
+    }
+    Close() {
+        if (this.closed) {
+            return;
+        }
+        this.closed = true;
+        if (this.encoder.state === 'closed') {
+            return;
+        }
+        try {
+            this.encoder.close();
+        }
+        catch (error) {
+            console.warn('[WebCodecsOpusEncoder] close() failed:', error);
+        }
+    }
+}
+//# sourceMappingURL=webcodecs-opus-encoder.js.map

package/dist/lib/services/recording/webcodecs-opus-encoder.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"webcodecs-opus-encoder.js","sourceRoot":"","sources":["../../../../src/lib/services/recording/webcodecs-opus-encoder.ts"],"names":[],"mappings":"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","sourcesContent":["import { RECORDING_SAMPLE_RATE } from '@memberjunction/ai-core-plus';\nimport type { IOpusPacketEncoder } from './opus-packet-encoder';\n\n/** The recording's Opus configuration for WebCodecs: mono 48 kHz, 32 kbps, 20 ms frames. */\nexport const WEBCODECS_OPUS_CONFIG: AudioEncoderConfig = {\n    codec: 'opus',\n    sampleRate: RECORDING_SAMPLE_RATE,\n    numberOfChannels: 1,\n    bitrate: 32000,\n    opus: { frameDuration: 20000 },\n};\n\n/** The slice of a WebCodecs `AudioEncoder` instance this wrapper drives. */\nexport type AudioEncoderLike = Pick<AudioEncoder, 'configure' | 'encode' | 'flush' | 'close' | 'state'>;\n\n/** The WebCodecs `AudioEncoder` constructor shape (the real global satisfies it). */\nexport interface AudioEncoderConstructor {\n    new (init: AudioEncoderInit): AudioEncoderLike;\n    // case-violation-ok-legacy-back-compat: mirrors the WebCodecs static so the real `AudioEncoder` global satisfies this interface\n    isConfigSupported(config: AudioEncoderConfig): Promise<AudioEncoderSupport>;\n}\n\n/** The WebCodecs `AudioData` constructor shape (the real global satisfies it). */\nexport interface AudioDataConstructor {\n    new (init: AudioDataInit): AudioData;\n}\n\n/**\n * Opus encoding through the browser's native WebCodecs `AudioEncoder`.\n *\n * Each 48 kHz block becomes one `AudioData` whose timestamp comes from the running sample count\n * (never the wall clock), so the encoder sees one gap-free stream. The encoder emits one\n * `EncodedAudioChunk` per 20 ms packet; each is copied out immediately because a chunk's bytes are\n * only guaranteed while the callback runs.\n */\nexport class WebCodecsOpusEncoder implements IOpusPacketEncoder {\n    public readonly Kind = 'webcodecs';\n    private readonly encoder: AudioEncoderLike;\n    private packets: Uint8Array[] = [];\n    private samplesFed = 0;\n    /** Set by the encoder's error callback or a throwing encode: later input is dropped, packets kept. */\n    private failed = false;\n    private closed = false;\n\n    /** Creates and configures the encoder. Throws if `configure` does (the selector falls back to WASM). */\n    constructor(audioEncoder: AudioEncoderConstructor, private readonly audioData: AudioDataConstructor) {\n        this.encoder = new audioEncoder({\n            output: (chunk: EncodedAudioChunk) => {\n                const bytes = new Uint8Array(chunk.byteLength);\n                chunk.copyTo(bytes);\n                this.packets.push(bytes);\n            },\n            error: (error: DOMException) => {\n                // The recorder keeps the packets it already has; a broken encoder must never end the call.\n                console.warn(`[WebCodecsOpusEncoder] Encoder failed after ${this.samplesFed} samples — the rest of this call is not recorded:`, error);\n                this.failed = true;\n            },\n        });\n        this.encoder.configure(WEBCODECS_OPUS_CONFIG);\n    }\n\n    public Encode(pcm48k: Float32Array): void {\n        if (this.failed || this.closed || pcm48k.length === 0) {\n            return;\n        }\n        const data = new this.audioData({\n            format: 'f32',\n            sampleRate: RECORDING_SAMPLE_RATE,\n            numberOfFrames: pcm48k.length,\n            numberOfChannels: 1,\n            timestamp: Math.round((this.samplesFed * 1_000_000) / RECORDING_SAMPLE_RATE),\n            // AudioData needs an ArrayBuffer-backed view (not a SharedArrayBuffer one); it copies anyway.\n            data: pcm48k.buffer instanceof ArrayBuffer ? (pcm48k as Float32Array<ArrayBuffer>) : new Float32Array(pcm48k),\n        });\n        this.samplesFed += pcm48k.length;\n        try {\n            this.encoder.encode(data);\n        } catch (error) {\n            console.warn(`[WebCodecsOpusEncoder] encode() threw at sample ${this.samplesFed} — the rest of this call is not recorded:`, error);\n            this.failed = true;\n        } finally {\n            data.close();\n        }\n    }\n\n    public async Flush(): Promise<void> {\n        if (this.failed || this.closed) {\n            return;\n        }\n        try {\n            await this.encoder.flush();\n        } catch (error) {\n            console.warn(`[WebCodecsOpusEncoder] flush() failed after ${this.samplesFed} samples — the final packets may be missing:`, error);\n        }\n    }\n\n    public TakePackets(): Uint8Array[] {\n        const packets = this.packets;\n        this.packets = [];\n        return packets;\n    }\n\n    public Close(): void {\n        if (this.closed) {\n            return;\n        }\n        this.closed = true;\n        if (this.encoder.state === 'closed') {\n            return;\n        }\n        try {\n            this.encoder.close();\n        } catch (error) {\n            console.warn('[WebCodecsOpusEncoder] close() failed:', error);\n        }\n    }\n}\n"]}

package/dist/lib/services/search.service.d.ts

@@ -26,6 +26,10 @@ export interface SearchResult {
     collectionName?: string;
     createdAt: Date;
     relevanceScore: number;
+    /** A message hit's branch; null is the trunk. */
+    branchId?: string | null;
+    /** A message hit's position in its conversation. */
+    sequence?: number;
 }
 /**
  * Search results grouped by type
@@ -107,7 +111,8 @@ export declare class SearchService {
      */
     private searchConversations;
     /**
-     * Search message content inside the conversations the conversation list shows the user
+     * Search message content inside the conversations the conversation list shows the user,
+     * on every branch of each conversation
      */
     private searchMessages;
     /**
@@ -135,7 +140,7 @@ export declare class SearchService {
      */
     private mapConversationToSearchResult;
     /**
-     * Map message entity to search result
+     * Map a message row to a search result, with the branch and sequence that locate it
      */
     private mapMessageToSearchResult;
     /**

package/dist/lib/services/search.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"search.service.d.ts","sourceRoot":"","sources":["../../../src/lib/services/search.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"search.service.d.ts","sourceRoot":"","sources":["../../../src/lib/services/search.service.ts"],"names":[],"mappings":"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"}

package/dist/lib/services/search.service.js

@@ -4,8 +4,13 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
 import { ConversationEngine } from '@memberjunction/core-entities';
 import { RunView, Metadata } from '@memberjunction/core';
 import { EscapeSQLString } from '@memberjunction/global';
+import { BuildConversationTasksFilter } from './conversation-tasks-filter';
 import * as i0 from "@angular/core";
 import * as i1 from "./artifact-permission.service";
+/** Columns of {@link MessageSearchRow}, as the message query's `Fields`. */
+const MESSAGE_SEARCH_FIELDS = [
+    'ID', 'ConversationID', 'Conversation', 'Message', 'BranchID', 'Sequence', '__mj_CreatedAt'
+];
 /**
  * Service for searching across conversations, messages, and artifacts
  * Provides debounced search with result ranking and filtering
@@ -179,7 +184,8 @@ export class SearchService {
         return result.Results.map(conv => this.mapConversationToSearchResult(conv, query));
     }
     /**
-     * Search message content inside the conversations the conversation list shows the user
+     * Search message content inside the conversations the conversation list shows the user,
+     * on every branch of each conversation
      */
     async searchMessages(query, environmentId, currentUser, dateRange) {
         const conversationIds = await this.getVisibleConversationIds(environmentId, currentUser);
@@ -199,12 +205,14 @@ export class SearchService {
         if (dateRange.end) {
             filter += ` AND __mj_CreatedAt <= '${dateRange.end.toISOString()}'`;
         }
+        // conversation-scope: search spans every path on purpose; opening a hit switches to its branch
         const result = await rv.RunView({
             EntityName: 'MJ: Conversation Details',
             ExtraFilter: filter,
             OrderBy: '__mj_CreatedAt DESC',
             MaxRows: 100,
-            ResultType: 'entity_object'
+            Fields: [...MESSAGE_SEARCH_FIELDS],
+            ResultType: 'simple'
         }, currentUser);
         if (!result.Success || !result.Results) {
             console.error('Failed to search messages:', result.ErrorMessage);
@@ -322,22 +330,8 @@ export class SearchService {
     async searchTasks(query, environmentId, currentUser, dateRange) {
         const rv = RunView.FromMetadataProvider(this.Provider);
         const lowerQuery = query.toLowerCase();
-        // Build filter using same logic as TasksFullViewComponent
-        const md = this.Provider;
-        const cd = md.EntityByName('MJ: Conversation Details');
-        const c = md.EntityByName('MJ: Conversations');
-        if (!cd || !c) {
-            console.warn('⚠️ Missing metadata for Conversations or Conversation Details');
-            return [];
-        }
-        let filter = `ParentID IS NULL AND (UserID = '${currentUser.ID}' OR ConversationDetailID IN (
-      SELECT ID FROM [${cd.SchemaName}].[${cd.BaseView}]
-      WHERE
-      UserID ='${currentUser.ID}' OR
-      ConversationID IN (
-        SELECT ID FROM [${c.SchemaName}].[${c.BaseView}] WHERE UserID='${currentUser.ID}'
-      )
-    ))`;
+        // The same tasks the conversation workspace's tasks view shows.
+        let filter = await BuildConversationTasksFilter(this.Provider, currentUser);
         filter += ` AND (LOWER(Name) LIKE '%${EscapeSQLString(lowerQuery)}%' OR LOWER(Description) LIKE '%${EscapeSQLString(lowerQuery)}%')`;
         if (dateRange.start) {
             filter += ` AND __mj_CreatedAt >= '${dateRange.start.toISOString()}'`;
@@ -386,7 +380,7 @@ export class SearchService {
         };
     }
     /**
-     * Map message entity to search result
+     * Map a message row to a search result, with the branch and sequence that locate it
      */
     mapMessageToSearchResult(message, query) {
         const messageText = message.Message || '';
@@ -400,7 +394,9 @@ export class SearchService {
             conversationId: message.ConversationID,
             conversationName: message.Conversation || undefined,
             createdAt: message.__mj_CreatedAt,
-            relevanceScore: 5
+            relevanceScore: 5,
+            branchId: message.BranchID ?? null,
+            sequence: message.Sequence
         };
     }
     /**