@wemap/camera 3.2.6 → 3.2.9

package/package.json

@@ -11,7 +11,7 @@
         "directory": "packages/camera"
     },
     "name": "@wemap/camera",
-    "version": "3.2.6",
+    "version": "3.2.9",
     "bugs": {
         "url": "https://github.com/wemap/wemap-modules-js/issues"
     },
@@ -23,10 +23,9 @@
     ],
     "license": "ISC",
     "dependencies": {
-        "@wemap/navigation-logger": "^3.2.6",
         "@zxing/library": "^0.17.1",
         "events": "^3.1.0"
     },
     "type": "module",
-    "gitHead": "0b4bcb307a86aa10d123603698961463baf931fd"
+    "gitHead": "6cfc15b7c401c74c4cf5297f367c8420a03bc2cf"
 }

package/src/Camera.js

@@ -1,6 +1,5 @@
 import EventEmitter from 'events';
 
-import CameraLogger from './CameraLogger.js';
 import SharedCameras from './SharedCameras.js';
 
 const GENERIC_HARDWARE_VERTICAL_FOV = 60;
@@ -37,8 +36,6 @@ class Camera extends EventEmitter {
     _hardwareVerticalFov = GENERIC_HARDWARE_VERTICAL_FOV;
     _resizeOnWindowChange;
 
-    _cameraLogger;
-
     /**
      * @param {Node} container
      * @param {boolean} resizeOnWindowChange
@@ -59,8 +56,6 @@ class Camera extends EventEmitter {
         this.videoElement.setAttribute('muted', '');
         this.videoElement.setAttribute('playsinline', '');
         this.videoContainer.appendChild(this.videoElement);
-
-        this._cameraLogger = new CameraLogger();
     }
 
     async start() {
@@ -89,9 +84,10 @@ class Camera extends EventEmitter {
             window.addEventListener('resize', this.notifyContainerSizeChanged);
         }
 
-        this._cameraLogger.attachStream(this.videoStream);
-
-        this.emit('start');
+        this.emit('start', {
+            videoElement: this.videoElement,
+            stream
+        });
     }
 
     async stop() {
@@ -102,8 +98,6 @@ class Camera extends EventEmitter {
 
         this.emit('stop');
 
-        this._cameraLogger.detachStream();
-
         if (this.videoStream && this.videoStream.stop) {
             // compatibility with old JS API
             this.videoStream.stop();
@@ -120,6 +114,10 @@ class Camera extends EventEmitter {
         this._isStarted = false;
     }
 
+    release() {
+        SharedCameras._remove(this);
+    }
+
     static async checkAvailability(testUserMedia = false) {
 
         if (!navigator.mediaDevices) {
@@ -224,7 +222,6 @@ class Camera extends EventEmitter {
             horizontal: fovH
         };
 
-        this._cameraLogger.fov = this.fov;
         this.emit('fov.changed', this.fov);
     }
 

package/src/SharedCameras.js

@@ -1,25 +1,48 @@
+import { EventEmitter } from 'events';
+
 import Camera from './Camera.js';
 
-class SharedCameras {
+class SharedCameras extends EventEmitter {
+
+    /**
+     * Singleton pattern.
+     * @returns {SharedCameras}
+     */
+    static get instance() {
+        if (!this._instance) {
+            this._instance = new SharedCameras();
+        }
+        return this._instance;
+    }
 
-    static _list = [];
+    _list = [];
 
     /**
      * @param {Camera} camera
      * @param {Node}
      */
-    static _add(camera, container) {
-        this._list.push({
+    _add(camera, container) {
+        const obj = {
             camera,
             container
-        });
+        };
+        this._list.push(obj);
+        this.emit('added', obj);
+    }
+
+    /**
+     * @param {Camera} camera
+     */
+    _remove(camera) {
+        this._list = this._list.filter(({ camera: _camera }) => _camera !== camera);
+        this.emit('removed', { camera });
     }
 
-    static get list() {
+    get list() {
         return this._list;
     }
 
-    static getCameraByContainer(container) {
+    getCameraByContainer(container) {
         for (const {
             camera, container: _container
         } of this._list) {
@@ -31,4 +54,4 @@ class SharedCameras {
     }
 }
 
-export default SharedCameras;
+export default SharedCameras.instance;

package/src/CameraLogger.js

@@ -1,120 +0,0 @@
-import { NavigationLogger } from '@wemap/navigation-logger';
-import { TimeUtils } from '@wemap/utils';
-
-class CameraLogger {
-
-    static _videoPart = 0;
-
-    _videoStream = null;
-
-    constructor() {
-
-        NavigationLogger.on('started', () => {
-            CameraLogger._videoPart = 0;
-            if (this._videoStream !== null) {
-                this._start();
-            }
-        });
-
-        NavigationLogger.on('stopped', () => {
-            this._stop();
-        });
-
-    }
-
-    attachStream(videoStream) {
-        this._videoStream = videoStream;
-        if (NavigationLogger.isRecording) {
-            this._start();
-        }
-    }
-
-    detachStream() {
-        this._videoStream = null;
-        this._stop();
-    }
-
-    set fov(fov) {
-        this._fov = fov;
-    }
-
-    _start() {
-        CameraLogger._videoPart++;
-
-        if (!('MediaRecorder' in window)) {
-            return;
-        }
-
-        if (this.mediaRecorder) {
-            throw new Error('CameraLogger is already recording');
-        }
-
-        const options = {
-            mimeType: 'video/webm;codecs=vp8',
-            bitsPerSecond: NavigationLogger.params.videoBitrate
-        };
-
-        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) {
-                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(NavigationLogger.params.flushInterval);
-    }
-
-
-    _stop() {
-
-        if (!this.mediaRecorder) {
-            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;