@zappar/zappar-cv 0.4.0-beta.8 → 2.0.0-beta.2

package/lib/worker-client.js

@@ -1,4 +1,3 @@
-"use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -8,41 +7,30 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.launchWorker = exports.messageManager = void 0;
-const messages_1 = require("./messages");
-exports.messageManager = new messages_1.MsgManager();
-let Worker;
-if (typeof Z_STANDALONE !== 'undefined' && Z_STANDALONE) {
-    Worker = require('worker-loader?inline=fallback!./worker');
-}
-else {
-    Worker = require('worker-loader!./worker');
-}
-if (Worker.default)
-    Worker = Worker.default;
-function launchWorker() {
+import { MsgManager } from "./messages";
+export let messageManager = new MsgManager();
+export function launchWorker(worker) {
     return __awaiter(this, void 0, void 0, function* () {
-        let worker = new Worker();
+        if (!worker)
+            worker = new Worker(new URL("./worker", import.meta.url), { type: 'module' });
         worker.postMessage({
             t: "wasm",
-            url: require("./zcv.wasm").default
+            url: new URL("./zcv.wasm", import.meta.url).toString()
         });
         yield waitForLoad(worker);
         function sendOutgoing() {
-            let msgs = exports.messageManager.getOutgoingMessages();
+            let msgs = messageManager.getOutgoingMessages();
             for (let msg of msgs) {
                 worker.postMessage(msg.msg, msg.transferables);
             }
         }
-        exports.messageManager.onOutgoingMessage.bind(sendOutgoing);
+        messageManager.onOutgoingMessage.bind(sendOutgoing);
         sendOutgoing();
         worker.addEventListener("message", evt => {
-            exports.messageManager.postIncomingMessage(evt.data);
+            messageManager.postIncomingMessage(evt.data);
         });
     });
 }
-exports.launchWorker = launchWorker;
 function waitForLoad(w) {
     return new Promise(resolve => {
         let listener = (msg) => {

package/lib/worker-imagebitmap.js

@@ -1,9 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleImageBitmap = void 0;
-const image_process_gl_1 = require("./image-process-gl");
-const profile_1 = require("./profile");
-const gl_matrix_1 = require("gl-matrix");
+import { ImageProcessGL } from "./image-process-gl";
+import { profile } from "./profile";
+import { mat4 } from "gl-matrix";
 let pixels;
 let texture;
 let _imageProcessor;
@@ -14,11 +11,11 @@ function getImageProcessor() {
         _gl = canvas.getContext("webgl");
         if (!_gl)
             throw new Error("Unable to get offscreen GL context");
-        _imageProcessor = new image_process_gl_1.ImageProcessGL(_gl);
+        _imageProcessor = new ImageProcessGL(_gl);
     }
     return [_imageProcessor, _gl];
 }
-function handleImageBitmap(m, r, server, mgr) {
+export function handleImageBitmap(m, r, server, mgr) {
     // img: ImageBitmap,
     //                                 rot: number,
     //                                 tokenId: number,
@@ -37,9 +34,9 @@ function handleImageBitmap(m, r, server, mgr) {
     }
     if (!texture)
         return;
-    if (!pixels || pixels.byteLength < profile_1.profile.dataWidth * profile_1.profile.dataHeight) {
-        console.log("Generating pixel buffer", profile_1.profile.dataWidth * profile_1.profile.dataHeight);
-        pixels = new ArrayBuffer(profile_1.profile.dataWidth * profile_1.profile.dataHeight);
+    if (!pixels || pixels.byteLength < profile.dataWidth * profile.dataHeight) {
+        console.log("Generating pixel buffer", profile.dataWidth * profile.dataHeight);
+        pixels = new ArrayBuffer(profile.dataWidth * profile.dataHeight);
     }
     imageProcessor.uploadFrame(texture, m.i, m.r, m.userFacing);
     let info = imageProcessor.readFrame(texture, pixels);
@@ -49,7 +46,7 @@ function handleImageBitmap(m, r, server, mgr) {
         dataHeight: info.dataHeight,
         frame: m.i,
         userFacing: info.userFacing,
-        uvTransform: info.uvTransform || gl_matrix_1.mat4.create(),
+        uvTransform: info.uvTransform || mat4.create(),
         tokenId: m.tokenId, p: m.p
     };
     mgr.postOutgoingMessage(msg, [m.i]);
@@ -60,4 +57,3 @@ function handleImageBitmap(m, r, server, mgr) {
         server.exploreState();
     }
 }
-exports.handleImageBitmap = handleImageBitmap;

package/lib/worker-server.js

@@ -1,4 +1,3 @@
-"use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -8,19 +7,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.launchWorkerServer = exports.messageManager = void 0;
-const ZNM = require("./zcv");
-const zappar_cwrap_1 = require("./gen/zappar-cwrap");
-const zappar_server_1 = require("./gen/zappar-server");
-const messages_1 = require("./messages");
-const gl_matrix_1 = require("gl-matrix");
-const zappar_native_1 = require("./gen/zappar-native");
-const worker_imagebitmap_1 = require("./worker-imagebitmap");
-const profile_1 = require("./profile");
-exports.messageManager = new messages_1.MsgManager();
+import * as ZNM from "./zcv";
+import { getRuntimeObject } from "./gen/zappar-cwrap";
+import { zappar_server } from "./gen/zappar-server";
+import { MsgManager } from "./messages";
+import { mat4 } from "gl-matrix";
+import { frame_pixel_format_t } from "./gen/zappar-native";
+import { handleImageBitmap } from "./worker-imagebitmap";
+import { profile } from "./profile";
+export let messageManager = new MsgManager();
 let latestCameraToScreenRotation = 0;
-function launchWorkerServer(wasmUrl) {
+export function launchWorkerServer(wasmUrl) {
     return __awaiter(this, void 0, void 0, function* () {
         let mod = ZNM.default({
             locateFile: (path, prefix) => {
@@ -30,21 +27,21 @@ function launchWorkerServer(wasmUrl) {
                 return prefix + path;
             },
             onRuntimeInitialized: () => {
-                let r = zappar_cwrap_1.getRuntimeObject(mod);
-                let server = new zappar_server_1.zappar_server(r, (pipelineId, ab) => {
-                    exports.messageManager.postOutgoingMessage({
+                let r = getRuntimeObject(mod);
+                let server = new zappar_server(r, (pipelineId, ab) => {
+                    messageManager.postOutgoingMessage({
                         p: pipelineId,
                         t: "zappar",
                         d: ab
                     }, [ab]);
                 });
-                exports.messageManager.postOutgoingMessage("loaded", []);
-                exports.messageManager.onIncomingMessage.bind((msg) => {
+                messageManager.postOutgoingMessage("loaded", []);
+                messageManager.onIncomingMessage.bind((msg) => {
                     var _a;
                     switch (msg.t) {
                         case "zappar":
                             server.processBuffer(msg.d);
-                            exports.messageManager.postOutgoingMessage({ t: "buf", d: msg.d }, [msg.d]);
+                            messageManager.postOutgoingMessage({ t: "buf", d: msg.d }, [msg.d]);
                             break;
                         case "buf":
                             (_a = server.serializersByPipelineId.get(msg.p)) === null || _a === void 0 ? void 0 : _a.bufferReturn(msg.d);
@@ -66,7 +63,7 @@ function launchWorkerServer(wasmUrl) {
                                 t: "cameraFrameRecycleS2C",
                                 att
                             };
-                            exports.messageManager.postOutgoingMessage(ret, [msgt.d]);
+                            messageManager.postOutgoingMessage(ret, [msgt.d]);
                             break;
                         }
                         case "streamC2S": {
@@ -81,7 +78,7 @@ function launchWorkerServer(wasmUrl) {
                         }
                         case "imageBitmapC2S": {
                             let msgt = msg;
-                            worker_imagebitmap_1.handleImageBitmap(msgt, r, server, exports.messageManager);
+                            handleImageBitmap(msgt, r, server, messageManager);
                             break;
                         }
                     }
@@ -90,12 +87,11 @@ function launchWorkerServer(wasmUrl) {
         });
     });
 }
-exports.launchWorkerServer = launchWorkerServer;
 ;
 let streamDataBufferPointer = 0;
 let streamDataBufferLength = 0;
 let tokenId = 1;
-const cameraToDeviceTransform = gl_matrix_1.mat4.create();
+const cameraToDeviceTransform = mat4.create();
 const cameraModel = new Float32Array([300, 300, 160, 120, 0, 0]);
 function consumeStream(mod, r, stream, p, userFacing, server, source) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -142,14 +138,14 @@ function consumeStream(mod, r, stream, p, userFacing, server, source) {
             }
             let clone = frame.clone();
             if (userFacing)
-                gl_matrix_1.mat4.fromScaling(cameraToDeviceTransform, [-1, 1, -1]);
+                mat4.fromScaling(cameraToDeviceTransform, [-1, 1, -1]);
             else
-                gl_matrix_1.mat4.identity(cameraToDeviceTransform);
-            let focalLength = 300.0 * profile_1.profile.dataWidth / 320.0;
+                mat4.identity(cameraToDeviceTransform);
+            let focalLength = 300.0 * profile.dataWidth / 320.0;
             cameraModel[0] = focalLength;
             cameraModel[1] = focalLength;
-            cameraModel[2] = profile_1.profile.dataWidth * 0.5;
-            cameraModel[3] = profile_1.profile.dataHeight * 0.5;
+            cameraModel[2] = profile.dataWidth * 0.5;
+            cameraModel[3] = profile.dataHeight * 0.5;
             const ret = {
                 token: token,
                 d: clone,
@@ -163,7 +159,7 @@ function consumeStream(mod, r, stream, p, userFacing, server, source) {
                 cameraModel,
                 source
             };
-            exports.messageManager.postOutgoingMessage(ret, [ret.d, ret.uvTransform.buffer]);
+            messageManager.postOutgoingMessage(ret, [ret.d, ret.uvTransform.buffer]);
             const pipeline = server._pipeline_by_instance.get(p);
             if (pipeline) {
                 r.pipeline_camera_frame_submit_raw_pointer(pipeline, streamDataBufferPointer, size, framePixelFormatFromFormat(frame.format), width, height, token, cameraToDeviceTransform, latestCameraToScreenRotation, cameraModel, userFacing);
@@ -176,17 +172,17 @@ function consumeStream(mod, r, stream, p, userFacing, server, source) {
 }
 function framePixelFormatFromFormat(f) {
     switch (f) {
-        case "I420": return zappar_native_1.frame_pixel_format_t.FRAME_PIXEL_FORMAT_I420;
-        case "I420A": return zappar_native_1.frame_pixel_format_t.FRAME_PIXEL_FORMAT_I420A;
-        case "I422": return zappar_native_1.frame_pixel_format_t.FRAME_PIXEL_FORMAT_I422;
-        case "I444": return zappar_native_1.frame_pixel_format_t.FRAME_PIXEL_FORMAT_I444;
-        case "NV12": return zappar_native_1.frame_pixel_format_t.FRAME_PIXEL_FORMAT_NV12;
+        case "I420": return frame_pixel_format_t.FRAME_PIXEL_FORMAT_I420;
+        case "I420A": return frame_pixel_format_t.FRAME_PIXEL_FORMAT_I420A;
+        case "I422": return frame_pixel_format_t.FRAME_PIXEL_FORMAT_I422;
+        case "I444": return frame_pixel_format_t.FRAME_PIXEL_FORMAT_I444;
+        case "NV12": return frame_pixel_format_t.FRAME_PIXEL_FORMAT_NV12;
         case "RGBA":
         case "RGBX":
-            return zappar_native_1.frame_pixel_format_t.FRAME_PIXEL_FORMAT_RGBA;
+            return frame_pixel_format_t.FRAME_PIXEL_FORMAT_RGBA;
         case "BGRA":
         case "BGRX":
-            return zappar_native_1.frame_pixel_format_t.FRAME_PIXEL_FORMAT_BGRA;
+            return frame_pixel_format_t.FRAME_PIXEL_FORMAT_BGRA;
     }
-    return zappar_native_1.frame_pixel_format_t.FRAME_PIXEL_FORMAT_Y;
+    return frame_pixel_format_t.FRAME_PIXEL_FORMAT_Y;
 }

package/lib/worker.js

@@ -1,23 +1,19 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const worker_server_1 = require("./worker-server");
+import { launchWorkerServer, messageManager } from "./worker-server";
 const ctx = self;
-worker_server_1.messageManager.onOutgoingMessage.bind(() => {
-    let msgs = worker_server_1.messageManager.getOutgoingMessages();
+messageManager.onOutgoingMessage.bind(() => {
+    let msgs = messageManager.getOutgoingMessages();
     for (let msg of msgs) {
         ctx.postMessage(msg.msg, msg.transferables);
     }
 });
 let launchHandler = (evt) => {
     if (evt && evt.data && evt.data.t === "wasm") {
-        let url = location.href.startsWith("blob") ? evt.data.url : require("./zcv.wasm");
-        if (url.default)
-            url = url.default;
-        worker_server_1.launchWorkerServer(url);
+        let url = location.href.startsWith("blob") ? evt.data.url : new URL("./zcv.wasm", import.meta.url).toString();
+        launchWorkerServer(url);
         ctx.removeEventListener("message", launchHandler);
     }
 };
 ctx.addEventListener("message", launchHandler);
 ctx.addEventListener("message", evt => {
-    worker_server_1.messageManager.postIncomingMessage(evt.data);
+    messageManager.postIncomingMessage(evt.data);
 });

package/lib/workerinterface.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};