@zappar/mediarecorder 0.3.0 → 0.4.1

package/lib/converter-worker.js

@@ -8,10 +8,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import * as enc from "./encoder";
-enc.initialize(new URL("./webmtransmux.wasm", import.meta.url).toString()).then(() => {
-    postMessage({ 'type': 'converter-worker-loaded' });
-});
 addEventListener('message', (evt) => __awaiter(void 0, void 0, void 0, function* () {
+    if (evt && evt.data && evt.data.t === 'wasm') {
+        enc.initialize((location.href.startsWith("blob") || location.href.startsWith('data:')) ? evt.data.url : new URL("./webmtransmux.wasm", import.meta.url).toString()).then(() => {
+            postMessage({ 'type': 'converter-wasm-loaded' });
+        });
+        return;
+    }
     if (evt && evt.data && typeof evt.data['indx'] === 'number') {
         const webtrans = yield enc.createWebMTrans();
         webtrans.initialize();
@@ -19,5 +22,7 @@ addEventListener('message', (evt) => __awaiter(void 0, void 0, void 0, function*
         const ret = webtrans.FS.readFile('/output.mp4');
         webtrans.delete();
         postMessage({ indx: evt.data.indx, data: ret.buffer }, { transfer: [ret.buffer] });
+        return;
     }
 }));
+postMessage({ 'type': 'converter-worker-loaded' });

package/lib/converter.d.ts

@@ -1,3 +1,3 @@
 export declare function getWorker(): Promise<Worker>;
 export declare function convert(data: ArrayBuffer): Promise<ArrayBuffer>;
-export declare function load(): Promise<void>;
+export declare function load(provideWorker?: () => Worker): Promise<void>;

package/lib/converter.js

@@ -8,15 +8,22 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 let workerPromise;
+let providedWorker;
 export function getWorker() {
     if (!workerPromise) {
         workerPromise = new Promise(resolve => {
-            const worker = new Worker(new URL('./converter-worker', import.meta.url), { type: 'module' });
+            const worker = providedWorker !== null && providedWorker !== void 0 ? providedWorker : new Worker(new URL('./converter-worker', import.meta.url), { type: 'module' });
             function handle(evt) {
-                if (evt.data && evt.data.type === 'converter-worker-loaded') {
+                if (evt.data && evt.data.type === 'converter-wasm-loaded') {
                     worker.removeEventListener('message', handle);
                     resolve(worker);
                 }
+                else if (evt.data && evt.data.type === 'converter-worker-loaded') {
+                    worker.postMessage({
+                        t: "wasm",
+                        url: new URL("./webmtransmux.wasm", import.meta.url).toString()
+                    });
+                }
             }
             worker.addEventListener('message', handle);
         });
@@ -39,10 +46,11 @@ export function convert(data) {
         });
     });
 }
-export function load() {
+export function load(provideWorker) {
     return __awaiter(this, void 0, void 0, function* () {
         // Preload worker if it's likely to be necessary
         if (!MediaRecorder.isTypeSupported('video/mp4') && MediaRecorder.isTypeSupported('video/webm;codecs="avc1,opus"')) {
+            providedWorker = provideWorker === null || provideWorker === void 0 ? void 0 : provideWorker();
             yield getWorker();
         }
     });

package/lib/mediarecorder.js

@@ -11,13 +11,9 @@ import { convert } from "./converter";
 export class ConvertingMediaRecorder extends MediaRecorder {
     static isTypeSupported(type) {
         if (type === 'video/mp4') {
-            if (MediaRecorder.isTypeSupported('video/mp4'))
+            if (MediaRecorder.isTypeSupported('video/webm;codecs="avc1,opus"'))
                 return true;
-            if (!MediaRecorder.isTypeSupported('video/webm;codecs="avc1,opus"')) {
-                console.log("Warning: device doesn't support codec required for @zappar/mediarecorder remuxing ('video/webm;codecs=\"avc1,opus\"')");
-                return false;
-            }
-            else
+            if (MediaRecorder.isTypeSupported('video/mp4'))
                 return true;
         }
         return MediaRecorder.isTypeSupported(type);
@@ -26,14 +22,9 @@ export class ConvertingMediaRecorder extends MediaRecorder {
         let needsConversion = false;
         let mimeType = options === null || options === void 0 ? void 0 : options.mimeType;
         if (mimeType === 'video/mp4') {
-            if (!MediaRecorder.isTypeSupported('video/mp4')) {
-                if (!MediaRecorder.isTypeSupported('video/webm;codecs="avc1,opus"')) {
-                    console.log("Warning: device doesn't support codec required for @zappar/mediarecorder remuxing ('video/webm;codecs=\"avc1,opus\"')");
-                }
-                else {
-                    needsConversion = true;
-                    mimeType = 'video/webm;codecs="avc1,opus"';
-                }
+            if (MediaRecorder.isTypeSupported('video/webm;codecs="avc1,opus"')) {
+                needsConversion = true;
+                mimeType = 'video/webm;codecs="avc1,opus"';
             }
         }
         super(stream, Object.assign(Object.assign({}, options), { mimeType }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zappar/mediarecorder",
-  "version": "0.3.0",
+  "version": "0.4.1",
   "description": "A MediaRecorder polyfill that supports video/mp4 output on both iOS and Android",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",