@zappar/zappar-cv 3.0.1-alpha.3 → 3.0.1-alpha.5

package/README.md

@@ -18,8 +18,8 @@ npm i @zappar/zappar-cv
 
 You can use our CDN from within your HTML:
 ```
-<script src="https://libs.zappar.com/zappar-cv/3.0.1-alpha.3/zappar-cv.js"></script>
+<script src="https://libs.zappar.com/zappar-cv/3.0.1-alpha.5/zappar-cv.js"></script>
 ```
 
 Or you can download and host our standalone JavaScript bundle:
-[https://libs.zappar.com/zappar-cv/3.0.1-alpha.3/zappar-cv.zip](https://libs.zappar.com/zappar-cv/3.0.1-alpha.3/zappar-cv.zip)
+[https://libs.zappar.com/zappar-cv/3.0.1-alpha.5/zappar-cv.zip](https://libs.zappar.com/zappar-cv/3.0.1-alpha.5/zappar-cv.zip)

package/lib/data-download.d.ts

@@ -0,0 +1,8 @@
+import type * as ZNM from "./zappar-cv";
+export interface DataDownloadAPI {
+    data_download_clear: () => void;
+    data_download_size: () => number;
+    data_download: () => number;
+    data_should_record_set: (v: number) => void;
+}
+export declare function getDataDownloadAPI(mod: ZNM.Module): DataDownloadAPI;

package/lib/data-download.js

@@ -0,0 +1,8 @@
+export function getDataDownloadAPI(mod) {
+    return {
+        data_download_clear: mod.cwrap("data_download_clear", null, []),
+        data_download_size: mod.cwrap("data_download_size", "number", []),
+        data_download: mod.cwrap("data_download", "number", []),
+        data_should_record_set: mod.cwrap("data_should_record_set", null, ["number"]),
+    };
+}

package/lib/direct.js

@@ -25,6 +25,6 @@ export function launchWorker(wasm) {
             for (let msg of msgs)
                 messageManager.postIncomingMessage(msg.msg);
         });
-        launchWorkerServer(wasm, module);
+        launchWorkerServer(wasm, module, false);
     });
 }

package/lib/gen/zappar-client.js

@@ -607,9 +607,9 @@ export class zappar_client {
                     enabled: true,
                     plane_count: 0,
                     plane_pose: [],
-                    world_anchor_valid: true,
+                    world_anchor_valid: false,
                     world_anchor_pose: new Float32Array([1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1]),
-                    ground_anchor_valid: true,
+                    ground_anchor_valid: false,
                     ground_anchor_pose: new Float32Array([1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1]),
                     debug_enabled: false,
                     debug_tracks_data: new Float32Array([]),

package/lib/native.js

@@ -89,6 +89,15 @@ export function initialize(opts) {
                 launchCeresWorker(msg.port);
                 break;
             }
+            case "_z_datadownload": {
+                let blob = new Blob([msg.data], { type: "application/octet-stream" });
+                let url = URL.createObjectURL(blob);
+                let a = document.createElement("a");
+                a.download = "sequencedata.bin";
+                a.href = url;
+                a.click();
+                break;
+            }
             case "licerr": {
                 let div = document.createElement("div");
                 div.innerHTML = "Visit <a href='https://docs.zap.works/universal-ar/licensing/' style='color: white;'>our licensing page</a> to find out about hosting on your own domain.";

package/lib/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "3.0.1-alpha.3";
+export declare const VERSION = "3.0.1-alpha.5";

package/lib/version.js

@@ -1 +1 @@
-export const VERSION = "3.0.1-alpha.3";
+export const VERSION = "3.0.1-alpha.5";

package/lib/worker-client.js

@@ -21,7 +21,8 @@ export function launchWorker(worker) {
         worker.postMessage({
             t: "wasm",
             url: new URL("./zappar-cv.wasm", import.meta.url).toString(),
-            module: yield wasmModule
+            module: yield wasmModule,
+            shouldRecordData: window.location.href.indexOf("_zrecorddata") >= 0
         });
         yield waitForLoad(worker);
         function sendOutgoing() {

package/lib/worker-server.d.ts

@@ -1,3 +1,3 @@
 import { MsgManager } from "./messages";
 export declare let messageManager: MsgManager;
-export declare function launchWorkerServer(wasmUrl: string, module: WebAssembly.Module): Promise<void>;
+export declare function launchWorkerServer(wasmUrl: string, module: WebAssembly.Module, shouldRecordData: boolean): Promise<void>;

package/lib/worker-server.js

@@ -16,12 +16,13 @@ import { frame_pixel_format_t } from "./gen/zappar-native";
 import { handleImageBitmap } from "./worker-imagebitmap";
 import { profile } from "./profile";
 import { getWorkerMessageAPI } from "./worker-messages";
+import { getDataDownloadAPI } from "./data-download";
 export let messageManager = new MsgManager();
 let workerMessageChannel;
 let latestCameraToScreenRotation = 0;
 let rawDataAccessEnabled = false;
 const rawCameraFrameBuffersByPipeline = new Map();
-export function launchWorkerServer(wasmUrl, module) {
+export function launchWorkerServer(wasmUrl, module, shouldRecordData) {
     return __awaiter(this, void 0, void 0, function* () {
         let mod = ZNM.default({
             locateFile: (path, prefix) => {
@@ -38,6 +39,8 @@ export function launchWorkerServer(wasmUrl, module) {
             onRuntimeInitialized: () => {
                 let r = getRuntimeObject(mod);
                 const workerMessageAPI = getWorkerMessageAPI(mod);
+                const dataDownloadAPI = shouldRecordData ? getDataDownloadAPI(mod) : undefined;
+                dataDownloadAPI === null || dataDownloadAPI === void 0 ? void 0 : dataDownloadAPI.data_should_record_set(1); // Only happens if dataDownloadAPI is defined
                 let server = new zappar_server(r, (pipelineId, ab) => {
                     messageManager.postOutgoingMessage({
                         p: pipelineId,
@@ -66,6 +69,8 @@ export function launchWorkerServer(wasmUrl, module) {
                                 att = r.pipeline_camera_frame_device_attitude(pipeline);
                                 server.exploreState();
                                 handleMessages(mod, workerMessageAPI);
+                                if (dataDownloadAPI)
+                                    handleDataDownload(mod, dataDownloadAPI);
                             }
                             let ret = {
                                 token: msgt.token,
@@ -96,7 +101,7 @@ export function launchWorkerServer(wasmUrl, module) {
                         }
                         case "streamC2S": {
                             let msgt = msg;
-                            consumeStream(mod, r, msgt.s, msgt.p, msgt.userFacing, server, msgt.source, workerMessageAPI).then(() => {
+                            consumeStream(mod, r, msgt.s, msgt.p, msgt.userFacing, server, msgt.source, workerMessageAPI, dataDownloadAPI).then(() => {
                                 let m = { t: "streamEndedS2C", p: msgt.p, source: msgt.source };
                                 // console.log('Stream ended, requesting new stream');
                                 messageManager.postOutgoingMessage(m, []);
@@ -160,7 +165,7 @@ export function launchWorkerServer(wasmUrl, module) {
     });
 }
 ;
-function consumeStream(mod, r, stream, p, userFacing, server, source, workerMessageAPI) {
+function consumeStream(mod, r, stream, p, userFacing, server, source, workerMessageAPI, dataDownloadAPI) {
     return __awaiter(this, void 0, void 0, function* () {
         while (true) {
             let reader;
@@ -173,7 +178,7 @@ function consumeStream(mod, r, stream, p, userFacing, server, source, workerMess
                 continue;
             }
             try {
-                yield consumeReader(mod, r, reader, p, userFacing, server, source, workerMessageAPI);
+                yield consumeReader(mod, r, reader, p, userFacing, server, source, workerMessageAPI, dataDownloadAPI);
                 return;
             }
             catch (err) {
@@ -201,7 +206,7 @@ function getFrameOrTimeout(reader) {
 }
 const cameraToDeviceTransform = mat4.create();
 const cameraModel = new Float32Array([300, 300, 160, 120, 0, 0]);
-function consumeReader(mod, r, reader, p, userFacing, server, source, workerMessageAPI) {
+function consumeReader(mod, r, reader, p, userFacing, server, source, workerMessageAPI, dataDownloadAPI) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
         while (true) {
@@ -274,6 +279,8 @@ function consumeReader(mod, r, reader, p, userFacing, server, source, workerMess
                 try {
                     r.pipeline_camera_frame_submit_raw_pointer(pipeline, streamDataBufferPointer, size, framePixelFormatFromFormat(frame.format), width, height, token, cameraToDeviceTransform, latestCameraToScreenRotation, cameraModel, userFacing, (_b = frame.timestamp) !== null && _b !== void 0 ? _b : -1);
                     handleMessages(mod, workerMessageAPI);
+                    if (dataDownloadAPI)
+                        handleDataDownload(mod, dataDownloadAPI);
                 }
                 catch (err) {
                     console.log('Exception during camera processing', err);
@@ -367,3 +374,12 @@ function handleMessages(mod, m) {
     }
     m.worker_message_send_clear();
 }
+function handleDataDownload(mod, d) {
+    const size = d.data_download_size();
+    if (size === 0)
+        return;
+    const dataPtr = d.data_download();
+    const data = mod.HEAPU8.slice(dataPtr, dataPtr + size);
+    messageManager.postOutgoingMessage({ t: '_z_datadownload', data }, [data.buffer]);
+    d.data_download_clear();
+}

package/lib/worker.js

@@ -7,9 +7,10 @@ messageManager.onOutgoingMessage.bind(() => {
     }
 });
 let launchHandler = (evt) => {
+    var _a;
     if (evt && evt.data && evt.data.t === "wasm") {
         let url = location.href.startsWith("blob") ? evt.data.url : new URL("./zappar-cv.wasm", import.meta.url).toString();
-        launchWorkerServer(url, evt.data.module);
+        launchWorkerServer(url, evt.data.module, (_a = evt.data.shouldRecordData) !== null && _a !== void 0 ? _a : false);
         ctx.removeEventListener("message", launchHandler);
     }
 };