@remotion/whisper-web 4.0.306 → 4.0.308

package/.turbo/turbo-make.log

@@ -1,6 +1,6 @@
 
 
-> @remotion/whisper-web@4.0.306 make /Users/jonathanburger/remotion/packages/whisper-web
+> @remotion/whisper-web@4.0.308 make /Users/jonathanburger/remotion/packages/whisper-web
 > tsc -d && bun --env-file=../.env.bundle bundle.ts
 
-[44.75ms] Generated.
+[8.44ms] Generated.

package/.turbo/turbo-test.log

@@ -0,0 +1,13 @@
+
+
+> @remotion/whisper-web@4.0.306 test /Users/jonathanburger/remotion/packages/whisper-web
+> bun test src
+
+bun test v1.2.5 (013fdddc)
+The following filters did not match any test files:
+  src
+86 files were searched [4.00ms]
+
+note: Tests need ".test", "_test_", ".spec" or "_spec_" in the filename (ex: "MyApp.test.ts")
+
+Learn more about the test runner: https://bun.sh/docs/cli/test

package/build-wasm.ts

@@ -1,3 +1,5 @@
+// TODO: there's no indication of error in case worker.js is fails to dynamically import
+
 import {$} from 'bun';
 import fs from 'fs';
 import os from 'os';
@@ -16,7 +18,7 @@ fs.mkdirSync(wasmDir, {recursive: true});
 const cwd = path.join(wasmDir, 'build-em');
 
 await $`git clone https://github.com/ggerganov/whisper.cpp ${wasmDir}`;
-await $`git checkout v1.7.4`.cwd(wasmDir);
+await $`git checkout v1.7.5`.cwd(wasmDir);
 
 fs.mkdirSync(cwd);
 
@@ -32,7 +34,12 @@ const file = fs.readFileSync(cmakeListsFile, 'utf8');
 // Disable Node.JS target, compile with assertions to get stack trace
 const lines = file.split('\n').map((line) => {
 	if (line.includes('-s FORCE_FILESYSTEM=1 \\')) {
-		return `-s FORCE_FILESYSTEM=1 -s ENVIRONMENT='web,worker' -s ASSERTIONS=1 \\`;
+		// output ES6 module so we can import it dynamically without injeting the script tag
+		return `-s FORCE_FILESYSTEM=1 -s ENVIRONMENT='web,worker' -s EXPORT_ES6=1 -s MODULARIZE=1 -s EXPORT_NAME=\\"createModule\\" \\`;
+	}
+
+	if (line.includes('-s EXPORTED_RUNTIME_METHODS')) {
+		return `-s EXPORTED_RUNTIME_METHODS=\\"['print', 'printErr', 'ccall', 'cwrap', 'HEAPU8']\\" \\`;
 	}
 
 	return line;
@@ -63,46 +70,12 @@ await $`make -j`.cwd(cwd);
 
 const mainJsFile = path.join(cwd, 'bin', 'whisper.wasm', 'main.js');
 
-let content = fs.readFileSync(mainJsFile, 'utf8');
-
-// pass our handlers
-content = content.replace(
-	'var moduleOverrides=Object.assign({},Module);',
-	'var moduleOverrides=Object.assign({},Module);if (typeof window !== "undefined") {Object.assign(Module, window.remotion_wasm_moduleOverrides);};',
-);
-
-// assert changes have been made
-if (!content.includes('window.remotion_wasm_moduleOverrides')) {
-	throw new Error('Changes have not been made');
-}
-
-// Modify the Worker path
-const mainContent =
-	content.replace(
-		'new Worker(pthreadMainJs',
-		`new Worker(new URL('./worker.js', import.meta.url)`,
-	) +
-	'\n' +
-	'export default Module;' +
-	'\n';
-
-// assert changes have been made
-if (!mainContent.includes('new Worker(new URL(')) {
-	throw new Error('Changes have not been made');
-}
-
-const workerContent =
-	content.replace(
-		'worker=new Worker(pthreadMainJs)',
-		`throw new Error('Already is in worker')`,
-	) +
-	'\n' +
-	'export default Module;' +
-	'\n';
+let content = fs
+	.readFileSync(mainJsFile, 'utf8')
+	.replace('libmain.js', './main.js');
 
 // Write the modified content directly to the destination
-fs.writeFileSync(path.join(__dirname, 'main.js'), mainContent, 'utf8');
-fs.writeFileSync(path.join(__dirname, 'worker.js'), workerContent, 'utf8');
+fs.writeFileSync(path.join(__dirname, 'main.js'), content, 'utf8');
 
 const dTsFile = path.join(
 	wasmDir,

package/dist/esm/index.mjs

@@ -455,9 +455,15 @@ var toCaptions = (input) => {
   return { captions };
 };
 // src/load-mod/load-mod.ts
-var loadMod = async () => {
-  const Mod = await import("../../main.js");
-  return Mod.default;
+var loadMod = async ({
+  handler
+}) => {
+  const createModule = await import("../../main.js").then((mod) => mod.default);
+  const Module = await createModule({
+    print: handler,
+    printErr: handler
+  });
+  return Module;
 };
 
 // src/print-handler.ts
@@ -642,12 +648,7 @@ var transcribe = async ({
       onTranscriptionChunk?.(json.transcription);
     }
   });
-  window.remotion_wasm_moduleOverrides = {
-    print: handler,
-    printErr: handler
-  };
-  const Mod = await loadMod();
-  delete window.remotion_wasm_moduleOverrides;
+  const Mod = await loadMod({ handler });
   const url = getModelUrl(model);
   const result = await getObject({ key: url });
   if (!result) {

package/dist/load-mod/load-mod.d.ts

@@ -1,2 +1,4 @@
-import type { MainModule } from '../../main.js';
-export declare const loadMod: () => Promise<MainModule>;
+import type { printHandler } from '../print-handler.js';
+export declare const loadMod: ({ handler, }: {
+    handler: ReturnType<typeof printHandler>;
+}) => Promise<import("../../main.js").MainModule>;

package/dist/load-mod/load-mod.js

@@ -1,4 +1,6 @@
 "use strict";
+// ⚠️⚠️⚠️⚠️⚠️!! Intentionally putting this in a subdirectory, so it is 2 directories deep
+// That way it can be imported when the output is dist/esm/index.js
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -34,10 +36,12 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadMod = void 0;
-const loadMod = async () => {
-    // According to MDN, this is allowed:
-    // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/import#module_namespace_object
-    const Mod = await Promise.resolve().then(() => __importStar(require('../../main.js')));
-    return Mod.default;
+const loadMod = async ({ handler, }) => {
+    const createModule = await Promise.resolve().then(() => __importStar(require('../../main.js'))).then((mod) => mod.default);
+    const Module = await createModule({
+        print: handler,
+        printErr: handler,
+    });
+    return Module;
 };
 exports.loadMod = loadMod;

package/dist/transcribe.js

@@ -77,15 +77,7 @@ const transcribe = async ({ channelWaveform, model, language = 'auto', onProgres
             onTranscriptionChunk === null || onTranscriptionChunk === void 0 ? void 0 : onTranscriptionChunk(json.transcription);
         },
     });
-    // Emscripten creates moduleOverrides from global Module object
-    // var Module = typeof Module != 'undefined' ? Module : {};
-    // var moduleOverrides = Object.assign({}, Module);
-    window.remotion_wasm_moduleOverrides = {
-        print: handler,
-        printErr: handler,
-    };
-    const Mod = await (0, load_mod_1.loadMod)();
-    delete window.remotion_wasm_moduleOverrides;
+    const Mod = await (0, load_mod_1.loadMod)({ handler });
     const url = (0, get_model_url_1.getModelUrl)(model);
     const result = await (0, get_object_from_db_1.getObject)({ key: url });
     if (!result) {

package/main.d.ts

@@ -14,24 +14,14 @@ declare namespace RuntimeExports {
      * @param {Array=} argTypes
      * @param {Object=} opts
      */
-    function cwrap(ident: any, returnType?: string | undefined, argTypes?: any[] | undefined, opts?: any | undefined): (...args: any[]) => any;
-    let HEAPF32: any;
-    let HEAPF64: any;
-    let HEAP_DATA_VIEW: any;
-    let HEAP8: any;
+    function cwrap(ident: any, returnType?: string | undefined, argTypes?: any[] | undefined, opts?: any | undefined): any;
     let HEAPU8: any;
-    let HEAP16: any;
-    let HEAPU16: any;
-    let HEAP32: any;
-    let HEAPU32: any;
-    let HEAP64: any;
-    let HEAPU64: any;
-    let FS_createPath: any;
-    function FS_createDataFile(parent: any, name: any, fileData: any, canRead: any, canWrite: any, canOwn: any): void;
+    function FS_createPath(...args: any[]): any;
+    function FS_createDataFile(...args: any[]): any;
     function FS_createPreloadedFile(parent: any, name: any, url: any, canRead: any, canWrite: any, onload: any, onerror: any, dontCreateFile: any, canOwn: any, preFinish: any): void;
-    function FS_unlink(path: any): any;
-    let FS_createLazyFile: any;
-    let FS_createDevice: any;
+    function FS_unlink(...args: any[]): any;
+    function FS_createLazyFile(...args: any[]): any;
+    function FS_createDevice(...args: any[]): any;
     let addRunDependency: any;
     let removeRunDependency: any;
 }
@@ -44,3 +34,4 @@ interface EmbindModule {
 }
 
 export type MainModule = WasmModule & typeof RuntimeExports & EmbindModule;
+export default function MainModuleFactory (options?: unknown): Promise<MainModule>;