@zappar/zappar-cv 3.0.0-alpha.3 → 3.0.0-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.0-alpha.3/zappar-cv.js"></script>
+<script src="https://libs.zappar.com/zappar-cv/3.0.0-alpha.5/zappar-cv.js"></script>
 ```
 
 Or you can download and host our standalone JavaScript bundle:
-[https://libs.zappar.com/zappar-cv/3.0.0-alpha.3/zappar-cv.zip](https://libs.zappar.com/zappar-cv/3.0.0-alpha.3/zappar-cv.zip)
+[https://libs.zappar.com/zappar-cv/3.0.0-alpha.5/zappar-cv.zip](https://libs.zappar.com/zappar-cv/3.0.0-alpha.5/zappar-cv.zip)

package/lib/mstp-camera-source.d.ts

@@ -19,6 +19,7 @@ export declare class MSTPCameraSource extends Source {
     private _getConstraints;
     getFrame(allowRead: boolean): void;
     private _getUserMedia;
+    streamEnded(): void;
     private _syncCamera;
     private _hasStartedOrientation;
     private _lastTimestamp;

package/lib/mstp-camera-source.js

@@ -164,6 +164,11 @@ export class MSTPCameraSource extends Source {
             });
         });
     }
+    streamEnded() {
+        console.log('MSTP stream ended');
+        this._stop();
+        this._syncCamera();
+    }
     _syncCamera() {
         return __awaiter(this, void 0, void 0, function* () {
             if (this._currentStream && this._isPaused) {
@@ -187,6 +192,11 @@ export class MSTPCameraSource extends Source {
                         let processor = new MediaStreamTrackProcessor({
                             track: videoTracks[0]
                         });
+                        const str = this._currentStream;
+                        yield delay(1000);
+                        if (str !== this._currentStream) {
+                            return;
+                        }
                         let p = Pipeline.get(this._pipeline);
                         if (p)
                             p.sendCameraStreamToWorker(this._impl, processor.readable, this._isUserFacing);
@@ -239,3 +249,9 @@ export class MSTPCameraSource extends Source {
 }
 MSTPCameraSource.USER_DEFAULT_DEVICE_ID = "Simulated User Default Device ID: a908df7f-5661-4d20-b227-a1c15d2fdb4b";
 MSTPCameraSource.DEFAULT_DEVICE_ID = "Simulated Default Device ID: a908df7f-5661-4d20-b227-a1c15d2fdb4b";
+function delay(ms) {
+    return new Promise(resolve => {
+        setTimeout(resolve, ms);
+    });
+}
+;

package/lib/native.js

@@ -25,6 +25,7 @@ import { SequenceSource } from "./sequencesource";
 import { createCameraSource, getCameraSource } from "./camera-source-map";
 import { gfx } from "./gfx";
 import { ImageTracker } from "./imagetracker";
+import { MSTPCameraSource } from "./mstp-camera-source";
 let client;
 export function initialize(opts) {
     if (client)
@@ -71,6 +72,13 @@ export function initialize(opts) {
                 (_g = (_f = Pipeline.get(msgt.p)) === null || _f === void 0 ? void 0 : _f.imageBitmapFromWorker) === null || _g === void 0 ? void 0 : _g.call(_f, msgt);
                 break;
             }
+            case "streamEndedS2C": {
+                let msgt = msg;
+                const src = getCameraSource(msgt.source);
+                if (src instanceof MSTPCameraSource)
+                    src.streamEnded();
+                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.0-alpha.3";
+export declare const VERSION = "3.0.0-alpha.5";

package/lib/version.js

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

package/lib/worker-server.js

@@ -68,7 +68,13 @@ export function launchWorkerServer(wasmUrl) {
                         }
                         case "streamC2S": {
                             let msgt = msg;
-                            consumeStream(mod, r, msgt.s, msgt.p, msgt.userFacing, server, msgt.source);
+                            consumeStream(mod, r, msgt.s, msgt.p, msgt.userFacing, server, msgt.source).then(() => {
+                                let m = { t: "streamEndedS2C", p: msgt.p, source: msgt.source };
+                                console.log('Stream ended, requesting new stream');
+                                messageManager.postOutgoingMessage(m, []);
+                            }).catch(err => {
+                                console.log('Stream ended with error', err);
+                            });
                             break;
                         }
                         case "cameraToScreenC2S": {
@@ -129,28 +135,52 @@ export function launchWorkerServer(wasmUrl) {
 function consumeStream(mod, r, stream, p, userFacing, server, source) {
     return __awaiter(this, void 0, void 0, function* () {
         while (true) {
+            let reader;
+            try {
+                reader = yield stream.getReader();
+            }
+            catch (err) {
+                console.log("Error getting reader", err);
+                yield delay(1000);
+                continue;
+            }
             try {
-                const reader = yield stream.getReader();
                 yield consumeReader(mod, r, reader, p, userFacing, server, source);
+                return;
             }
             catch (err) {
-                console.log("Consuming reader error", err);
+                console.log("Consuming reader error 2", err);
             }
             yield delay(1000);
+            return;
         }
     });
 }
 let streamDataBufferPointer = 0;
 let streamDataBufferLength = 0;
 let tokenId = 1;
+function getFrameOrTimeout(reader) {
+    return new Promise((resolve, reject) => {
+        const token = setTimeout(() => {
+            console.log('Frame timeout');
+            reject('Frame timeout');
+        }, 2000);
+        reader.read().then(result => {
+            clearTimeout(token);
+            resolve(result);
+        });
+    });
+}
 const cameraToDeviceTransform = mat4.create();
 const cameraModel = new Float32Array([300, 300, 160, 120, 0, 0]);
 function consumeReader(mod, r, reader, p, userFacing, server, source) {
+    var _a;
     return __awaiter(this, void 0, void 0, function* () {
         while (true) {
-            let result = yield reader.read();
+            let result = yield getFrameOrTimeout(reader);
             if (result.done) {
-                console.log("Stream done");
+                console.log("Stream done", userFacing);
+                (_a = result.value) === null || _a === void 0 ? void 0 : _a.close();
                 return;
             }
             let frame = result.value;

package/lib/workerinterface.d.ts

@@ -63,6 +63,11 @@ export interface ImageBitmapS2C {
     frame: ImageBitmap;
     tokenId: number;
 }
+export interface StreamEndedS2C {
+    t: "streamEndedS2C";
+    p: zappar_pipeline_t;
+    source: zappar_camera_source_t;
+}
 export interface SensorDataC2S {
     t: "sensorDataC2S";
     sensor: "accel" | "accel_wo_gravity_int" | "accel_w_gravity_int" | "rotation_rate_int" | "attitude_int" | "rotation_rate" | "attitude";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zappar/zappar-cv",
-  "version": "3.0.0-alpha.3",
+  "version": "3.0.0-alpha.5",
   "description": "Zappar's core computer vision library, supporting image, face and world tracking.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",