@wemap/camera 5.1.8 → 5.4.2

package/index.js

@@ -1,4 +1,4 @@
-export { BarcodeFormat } from '@zxing/library/esm';
+export { BarcodeFormat } from '@zxing/library';
 export { default as Camera } from './src/Camera.js';
 export { default as QrCodeScanner } from './src/QrCodeScanner.js';
 export { default as SharedCameras } from './src/SharedCameras.js';

package/package.json

@@ -11,7 +11,7 @@
         "directory": "packages/camera"
     },
     "name": "@wemap/camera",
-    "version": "5.1.8",
+    "version": "5.4.2",
     "bugs": {
         "url": "https://github.com/wemap/wemap-modules-js/issues"
     },
@@ -27,5 +27,5 @@
         "events": "^3.3.0"
     },
     "type": "module",
-    "gitHead": "d84c25d1be23b5abd82c35ca7cca1ebe2663920b"
+    "gitHead": "1a3797d4b88939fb2f4615ff8f565e733295061d"
 }

package/src/Camera.js

@@ -3,23 +3,6 @@ import EventEmitter from 'events';
 import SharedCameras from './SharedCameras.js';
 import { calcDisplayedFov } from './CameraUtils.js';
 
-const GENERIC_HARDWARE_VERTICAL_FOV = 60;
-
-const parameters = {
-    sourceWidth: 640,
-    sourceHeight: 480
-};
-
-const userMediaConstraints = {
-    audio: false,
-    video: {
-        facingMode: 'environment',
-        width: { ideal: parameters.sourceWidth },
-        height: { ideal: parameters.sourceHeight }
-    }
-};
-
-
 // Helped from https://github.com/jeromeetienne/AR.js/blob/master/three.js/src/threex/threex-artoolkitsource.js
 
 // Camera preview will fill component bounds without transformations.
@@ -27,6 +10,14 @@ const userMediaConstraints = {
 //  camera preview is extended then cropped.
 class Camera extends EventEmitter {
 
+    static DEFAULT_OPTIONS = {
+        width: 1024,
+        height: 768,
+        resizeOnWindowChange: false
+    };
+
+    static GENERIC_HARDWARE_VERTICAL_FOV = 60;
+
     videoContainer;
     videoElement;
 
@@ -34,20 +25,31 @@ class Camera extends EventEmitter {
 
     _isStarted = false;
 
-    _hardwareVerticalFov = GENERIC_HARDWARE_VERTICAL_FOV;
+    _hardwareVerticalFov = Camera.GENERIC_HARDWARE_VERTICAL_FOV;
     _resizeOnWindowChange;
 
     /**
      * @param {Node} container
-     * @param {boolean} resizeOnWindowChange
+     * @param {{width: number, height: number, resizeOnWindowChange: boolean}} options
      */
-    constructor(container, resizeOnWindowChange = false) {
+    constructor(container, options = {}) {
         super();
 
+        options = Object.assign({}, Camera.DEFAULT_OPTIONS, options);
+
         SharedCameras._add(this, container);
 
         this.videoContainer = container;
-        this._resizeOnWindowChange = resizeOnWindowChange;
+
+        this._resizeOnWindowChange = options.resizeOnWindowChange;
+        this._userMediaConstraints = {
+            audio: false,
+            video: {
+                facingMode: 'environment',
+                width: { ideal: options.width },
+                height: { ideal: options.height }
+            }
+        };
 
         this.videoContainer.style.overflow = 'hidden';
 
@@ -69,7 +71,7 @@ class Camera extends EventEmitter {
 
         await Camera.checkAvailability();
 
-        const stream = await navigator.mediaDevices.getUserMedia(userMediaConstraints);
+        const stream = await navigator.mediaDevices.getUserMedia(this._userMediaConstraints);
 
         // Listeners have to be set before srcObject assigment or they can be never called
         this.videoElement.oncanplaythrough = () => this.videoElement.play();
@@ -139,7 +141,7 @@ class Camera extends EventEmitter {
         }
 
         if (testUserMedia) {
-            const stream = await navigator.mediaDevices.getUserMedia(userMediaConstraints);
+            const stream = await navigator.mediaDevices.getUserMedia(this._userMediaConstraints);
             if (stream.stop) {
                 stream.stop();
             } else {

package/src/QrCodeScanner.js

@@ -7,7 +7,7 @@ import {
     RGBLuminanceSource,
     BinaryBitmap,
     HybridBinarizer
-} from '@zxing/library/esm';
+} from '@zxing/library';
 
 import Camera from './Camera.js';