@wemap/camera 9.0.0 → 9.0.8

package/index.d.ts

@@ -1,5 +1,6 @@
-declare module '@wemap/camera' {
+import type EventEmitter from 'events';
 
+declare module '@wemap/camera' {
 
     export type IntrinsicParams = [number, number, number, number, number, number, number, number, number];
     export type DistortionsParams = [number, number, number, number, number];
@@ -10,8 +11,54 @@ declare module '@wemap/camera' {
     }
 
     export class CameraUtils {
+        static convertFov(angle: number, aspectRatio: number): number;
+        static calcDisplayedFov(
+            videoContainer: HTMLDivElement,
+            videoElement: HTMLVideoElement,
+            hardwareVerticalFov: number
+        ): { vertical: number, horizontal: number };
         static createCameraCalibrationFromWidthHeightFov(width: number, height: number, fovOfWidth: number): Calibration;
+        static canvasToBase64(canvas: HTMLCanvasElement, type?: string, quality?: any): string;
+        static convertToGrayscale(imageCanvas: HTMLCanvasElement): void;
+        static reduceImageSize(
+            imageCanvas: HTMLCanvasElement,
+            maxWidth: number,
+            maxHeight?: number
+        ): HTMLCanvasElement;
+    }
+
+    export type CameraOptions = {
+        width?: number,
+        height?: number,
+        resizeOnWindowChange?: boolean
     }
 
+    export type CameraState = 'stopped' | 'starting' | 'started' | 'stopping';
+
+    export class Camera extends EventEmitter {
+
+        constructor(container: Node, options?: CameraOptions);
 
+        start(videoMediaConstraints?: MediaTrackConstraints)
+            : Promise<{
+                videoElement: HTMLVideoElement,
+                stream: MediaStream
+            }>;
+        stop(): Promise<void>;
+        release(): void;
+
+        checkAvailability(testUserMedia?: boolean): Promise<void>;
+        notifyContainerSizeChanged(): void;
+        get currentImage(): Promise<HTMLCanvasElement>;
+
+        get state(): CameraState;
+        get hardwareVerticalFov(): number;
+        set hardwareVerticalFov(fov: number);
+
+    }
+
+    export class SharedCameras extends EventEmitter {
+        list: { container: Node, camera: Camera }[];
+        getCameraByContainer(container: Node): Camera | null;
+    }
 }

package/package.json

@@ -12,7 +12,7 @@
         "directory": "packages/camera"
     },
     "name": "@wemap/camera",
-    "version": "9.0.0",
+    "version": "9.0.8",
     "bugs": {
         "url": "https://github.com/wemap/wemap-modules-js/issues"
     },
@@ -28,6 +28,9 @@
         "@zxing/library": "^0.18.4",
         "events": "^3.3.0"
     },
+    "devDependencies": {
+        "@types/events": "^3.0.0"
+    },
     "type": "module",
-    "gitHead": "9f16c3cebf6f0e6d03a83835607528f5c37707cf"
+    "gitHead": "68d42075fd79592fb762747c41a86d930a800625"
 }

package/src/Camera.js

@@ -70,7 +70,7 @@ class Camera extends EventEmitter {
         this.videoContainer.appendChild(this.videoElement);
     }
 
-    async start(videoMediaConstraints = null) {
+    async start(videoMediaConstraints) {
 
         if (this._state !== Camera.State.STOPPED) {
             throw new Error('Camera is already started');
@@ -81,11 +81,11 @@ class Camera extends EventEmitter {
         }
 
         this._state = Camera.State.STARTING;
-        this.emit('starting');
+        this.emit(Camera.State.STARTING);
 
         await Camera.checkAvailability();
 
-        if (videoMediaConstraints) {
+        if (typeof videoMediaConstraints === 'object') {
             Object.assign(this._userMediaConstraints.video,
                 this._userMediaConstraints.video, videoMediaConstraints);
         }
@@ -107,10 +107,13 @@ class Camera extends EventEmitter {
         }
 
         this._state = Camera.State.STARTED;
-        this.emit('started', {
+        const output = {
             videoElement: this.videoElement,
             stream
-        });
+        };
+
+        this.emit(Camera.State.STARTED, output);
+        return output;
     }
 
     async stop() {
@@ -124,7 +127,7 @@ class Camera extends EventEmitter {
         }
 
         this._state = Camera.State.STOPPING;
-        this.emit('stopping', this);
+        this.emit(Camera.State.STOPPING, this);
 
         if (this.videoStream && this.videoStream.stop) {
             // compatibility with old JS API
@@ -141,7 +144,7 @@ class Camera extends EventEmitter {
         }
 
         this._state = Camera.State.STOPPED;
-        this.emit('stopped', this);
+        this.emit(Camera.State.STOPPED, this);
     }
 
     release() {

package/src/SharedCameras.js

@@ -4,17 +4,6 @@ import Camera from './Camera.js';
 
 class SharedCameras extends EventEmitter {
 
-    /**
-     * Singleton pattern.
-     * @returns {SharedCameras}
-     */
-    static get instance() {
-        if (!this._instance) {
-            this._instance = new SharedCameras();
-        }
-        return this._instance;
-    }
-
     /** @type {{container: Node, camera: Camera}[]} */
     _list = [];
 
@@ -51,15 +40,13 @@ class SharedCameras extends EventEmitter {
      * @returns {?Camera}
      */
     getCameraByContainer(container) {
-        for (const {
-            camera, container: _container
-        } of this._list) {
-            if (container === _container) {
-                return camera;
+        for (const obj of this._list) {
+            if (container === obj.container) {
+                return obj.camera;
             }
         }
         return null;
     }
 }
 
-export default SharedCameras.instance;
+export default new SharedCameras();