@wemap/camera 3.2.3 → 3.2.4

package/package.json

@@ -11,7 +11,7 @@
         "directory": "packages/camera"
     },
     "name": "@wemap/camera",
-    "version": "3.2.3",
+    "version": "3.2.4",
     "bugs": {
         "url": "https://github.com/wemap/wemap-modules-js/issues"
     },
@@ -23,9 +23,9 @@
     ],
     "license": "ISC",
     "dependencies": {
-        "@wemap/navigation-logger": "^3.2.3",
+        "@wemap/navigation-logger": "^3.2.4",
         "events": "^3.1.0"
     },
     "type": "module",
-    "gitHead": "f7075f59fc3227c7f4cb7f1fa8cc69b98705364e"
+    "gitHead": "2b6080727464a2b671cd173a317ffd7bb196f789"
 }

package/src/Camera.js

@@ -209,6 +209,7 @@ class Camera extends EventEmitter {
             horizontal: fovH
         };
 
+        this._cameraLogger.fov = this.fov;
         this.emit('fov.changed', this.fov);
     }
 

package/src/CameraLogger.js

@@ -1,23 +1,22 @@
 import { NavigationLogger } from '@wemap/navigation-logger';
+import { TimeUtils } from '@wemap/utils';
 
 class CameraLogger {
 
+    static _videoPart = 0;
+
     _videoStream = null;
-    _loggerParams = null;
 
     constructor() {
 
-        this._loggerParams = NavigationLogger.params;
-
-        NavigationLogger.on('started', ({ params }) => {
-            this._loggerParams = params;
+        NavigationLogger.on('started', () => {
+            CameraLogger._videoPart = 0;
             if (this._videoStream !== null) {
                 this._start();
             }
         });
 
         NavigationLogger.on('stopped', () => {
-            this._loggerParams = null;
             this._stop();
         });
 
@@ -35,7 +34,12 @@ class CameraLogger {
         this._stop();
     }
 
+    set fov(fov) {
+        this._fov = fov;
+    }
+
     _start() {
+        CameraLogger._videoPart++;
 
         if (!('MediaRecorder' in window)) {
             return;
@@ -47,20 +51,31 @@ class CameraLogger {
 
         const options = {
             mimeType: 'video/webm;codecs=vp8',
-            bitsPerSecond: this._loggerParams.videoBitrate
+            bitsPerSecond: NavigationLogger.params.videoBitrate
         };
 
-        this.videoBlobs = [];
+        let isFirstChunck = true;
+
+        const startTime = TimeUtils.preciseTime;
 
         // https://stackoverflow.com/questions/56826079/how-to-concat-chunks-of-incoming-binary-into-video-webm-file-node-js
         this.mediaRecorder = new MediaRecorder(this._videoStream, options);
         this.mediaRecorder.ondataavailable = event => {
             if (event.data && event.data.size > 0) {
-                NavigationLogger.sendVideoChunck(event.data);
+                if (isFirstChunck) {
+                    this._sendEvent('video-start', {
+                        // startTime: TimeUtils.preciseTime - NavigationLogger.params.flushInterval,
+                        startTime,
+                        part: CameraLogger._videoPart,
+                        fov: this._fov
+                    });
+                    isFirstChunck = false;
+                }
+                this._sendChunck(CameraLogger._videoPart, event.data);
             }
         };
 
-        this.mediaRecorder.start(this._loggerParams.flushInterval);
+        this.mediaRecorder.start(NavigationLogger.params.flushInterval);
     }
 
 
@@ -70,9 +85,36 @@ class CameraLogger {
             return;
         }
 
+        this._sendEvent('video-end', {
+            time: TimeUtils.preciseTime,
+            part: CameraLogger._videoPart
+        });
+
         this.mediaRecorder.stop();
         this.mediaRecorder = null;
     }
+
+    _sendChunck(videoPart, chunck) {
+        fetch(NavigationLogger.getVideoChunckUrl(videoPart), {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/octet-stream' },
+            body: chunck
+        });
+    }
+
+    _sendEvent(eventName, data) {
+        fetch(NavigationLogger.getVideoConfigUrl(), {
+            method: 'POST',
+            headers: {
+                'Accept': 'application/json',
+                'Content-Type': 'application/json'
+            },
+            body: JSON.stringify({
+                eventName,
+                data
+            })
+        });
+    }
 }
 
 export default CameraLogger;