Merge pull request #369 from LasseRafn/patch-1

Update README.md

README.md

@@ -1,22 +1,26 @@
 quaggaJS
 ========
 
-- [Changelog](#changelog) (2016-08-15)
+[![Join the chat at https://gitter.im/quaggaJS/Lobby](https://badges.gitter.im/quaggaJS/Lobby.svg)](https://gitter.im/quaggaJS/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
+- [Changelog](#changelog) (2017-06-07)
 - [Browser Support](#browser-support)
 - [Installing](#installing)
 - [Getting Started](#gettingstarted)
 - [API](#api)
 - [Configuration](#configobject)
+- [Tips & Tricks](#tipsandtricks)
+- [Sponsors](#sponsors)
 
 ## What is QuaggaJS?
 
 QuaggaJS is a barcode-scanner entirely written in JavaScript supporting real-
 time localization and decoding of various types of barcodes such as __EAN__,
-__CODE 128__, __CODE 39__, __EAN 8__, __UPC-A__, __UPC-C__, __I2of5__ and
+__CODE 128__, __CODE 39__, __EAN 8__, __UPC-A__, __UPC-C__, __I2of5__,
-__CODABAR__. The library is also capable of using `getUserMedia` to get direct
+__2of5__, __CODE 93__ and __CODABAR__. The library is also capable of using
-access to the user's camera stream. Although the code relies on heavy image-
+`getUserMedia` to get direct access to the user's camera stream. Although the
-processing even recent smartphones are capable of locating and decoding
+code relies on heavy image-processing even recent smartphones are capable of
-barcodes in real-time.
+locating and decoding barcodes in real-time.
 
 Try some [examples](https://serratus.github.io/quaggaJS/examples) and check out
 the blog post ([How barcode-localization works in QuaggaJS][oberhofer_co_how])
@@ -60,6 +64,35 @@ The following APIs need to be implemented in your browser:
 In addition to the APIs mentioned above:
 - [MediaDevices](http://caniuse.com/#feat=stream)
 
+__Important:__ Accessing `getUserMedia` requires a secure origin in most
+browsers, meaning that `http://` can only be used on `localhost`. All other
+hostnames need to be served via `https://`. You can find more information in the
+[Chrome M47 WebRTC Release Notes](https://groups.google.com/forum/#!topic/discuss-webrtc/sq5CVmY69sc).
+
+### Feature-detection of getUserMedia
+
+Every browser seems to differently implement the `mediaDevices.getUserMedia`
+API. Therefore it's highly recommended to include
+[webrtc-adapter](https://github.com/webrtc/adapter) in your project.
+
+Here's how you can test your browser's capabilities:
+
+```javascript
+if (navigator.mediaDevices && typeof navigator.mediaDevices.getUserMedia === 'function') {
+  // safely access `navigator.mediaDevices.getUserMedia`
+}
+```
+
+The above condition evaluates to:
+
+| Browser       | result  |
+| ------------- |:-------:|
+| Edge          | `true`  |
+| Chrome        | `true`  |
+| Firefox       | `true`  |
+| IE 11         | `false` |
+| Safari iOS    | `true` |
+
 ## <a name="installing">Installing</a>
 
 QuaggaJS can be installed using __npm__, __bower__, or by including it with
@@ -414,6 +447,8 @@ barcodes which should be decoded during the session. Possible values are:
 - upc_reader
 - upc_e_reader
 - i2of5_reader
+- 2of5_reader
+- code_93_reader
 
 Why are not all types activated by default? Simply because one should
 explicitly define the set of barcodes for their use-case. More decoders means
@@ -538,7 +573,7 @@ that node does not support web-workers out of the box. Therefore the config
 property `numOfWorkers` must be explicitly set to `0`.
 
 ```javascript
-var Quagga = require('quagga');
+var Quagga = require('quagga').default;
 
 Quagga.decodeSingle({
     src: "image-abc-123.jpg",
@@ -558,6 +593,36 @@ Quagga.decodeSingle({
 });
 ```
 
+## <a name="tipsandtricks">Tips & Tricks</a>
+
+A growing collection of tips & tricks to improve the various aspects of Quagga.
+
+### Barcodes too small?
+
+Barcodes too far away from the camera, or a lens too close to the object
+result in poor recognition rates and Quagga might respond with a lot of
+false-positives.
+
+Starting in Chrome 59 you can now make use of `capabilities` and directly
+control the zoom of the camera. Head over to the
+[web-cam demo](https://serratus.github.io/quaggaJS/examples/live_w_locator.html)
+and check out the __Zoom__ feature.
+
+You can read more about those `capabilities` in
+[Let's light a torch and explore MediaStreamTrack's capabilities](https://www.oberhofer.co/mediastreamtrack-and-its-capabilities)
+
+### Video too dark?
+
+Dark environments usually result in noisy images and therefore mess with the
+recognition logic.
+
+Since Chrome 59 you can turn on/off the __Torch__ of our device and vastly
+improve the quality of the images. Head over to the
+[web-cam demo](https://serratus.github.io/quaggaJS/examples/live_w_locator.html)
+and check out the __Torch__ feature.
+
+To find out more about this feature [read on](https://www.oberhofer.co/mediastreamtrack-and-its-capabilities).
+
 ## Tests
 
 Unit Tests can be run with [Karma][karmaUrl] and written using
@@ -634,8 +699,43 @@ calling ``decodeSingle`` with the same configuration as used during recording
 . In order to reproduce the exact same result, you have to make sure to turn
 on the ``singleChannel`` flag in the configuration when using ``decodeSingle``.
 
+## <a name="sponsors">Sponsors</a>
+
+- [Maintenance Connection Canada (Asset Pro Solutions Inc.](http://maintenanceconnection.ca/)
+
 ## <a name="changelog">Changelog</a>
 
+### 2017-06-07
+- Improvements
+  - added `muted` and `playsinline` to `<video/>` to make it work for Safari 11
+  Beta (even iOS)
+- Fixes
+  - Fixed  [example/live_w_locator.js](https://github.com/serratus/quaggaJS/blob/master/example/live_w_locator.js)
+
+### 2017-06-06
+- Features
+  - Support for Standard 2of5 barcodes (See
+      [\#194](https://github.com/serratus/quaggaJS/issues/194))
+  - Support for Code 93 barcodes (See
+      [\#194](https://github.com/serratus/quaggaJS/issues/195))
+  - Exposing `Quagga.CameraAccess.getActiveTrack()` to get access to the
+      currently used `MediaStreamTrack`
+    - Example can be viewed here: [example/live_w_locator.js](https://github.com/serratus/quaggaJS/blob/master/example/live_w_locator.js) and a [demo](https://serratus.github.io/quaggaJS/examples/live_w_locator.html)
+
+Take a look at the release-notes (
+    [0.12.0](https://github.com/serratus/quaggaJS/releases/tag/v0.12.0))
+
+### 2017-01-08
+- Improvements
+  - Exposing `CameraAccess` module to get access to methods like
+    `enumerateVideoDevices` and `getActiveStreamLabel`
+    (see `example/live_w_locator`)
+  - Update to webpack 2.2 (API is still unstable)
+
+### 2016-10-03
+- Fixes
+  - Fixed `facingMode` issue with Chrome >= 53 (see [#128](https://github.com/serratus/quaggaJS/issues/128))
+
 ### 2016-08-15
 - Features
   - Proper handling of EXIF orientation when using `Quagga.decodeSingle`

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "quagga",
-  "version": "0.6.14",
+  "version": "0.12.1",
   "description": "An advanced barcode-scanner written in JavaScript",
   "main": "dist/quagga.js",
   "ignore": [

example/css/fonts.css

@@ -1 +1 @@
-@import url("http://fonts.googleapis.com/css?family=Ubuntu:400,700|Cabin+Condensed:400,600");
+@import url("https://fonts.googleapis.com/css?family=Ubuntu:400,700|Cabin+Condensed:400,600");

example/css/styles.css

@@ -1,79 +1,109 @@
 @charset "UTF-8";
-/* usual styles */
+@import url("https://fonts.googleapis.com/css?family=Ubuntu:400,700|Cabin+Condensed:400,600");
-/* LESS - http://lesscss.org style sheet */
+
-/* Palette color codes */
+body {
-/* Palette URL: http://paletton.com/#uid=31g0q0kHZAviRSkrHLOGomVNzac */
+  background-color: #FFF;
-/* Feel free to copy&paste color codes to your application */
+  margin: 0px;
-/* MIXINS */
+  font-family: Ubuntu, sans-serif;
-/* As hex codes */
+  color: #1e1e1e;
-/* Main Primary color */
+  font-weight: normal;
-/* Main Secondary color (1) */
+  padding-top: 0;
-/* Main Secondary color (2) */
+}
-/* As RGBa codes */
+
-/* Main Primary color */
+h1, h2, h3, h4 {
-/* Main Secondary color (1) */
+  font-family: "Cabin Condensed", sans-serif;
-/* Main Secondary color (2) */
+}
-/* Generated by Paletton.com ├é┬® 2002-2014 */
+
-/* http://paletton.com */
+header {
-@import url("http://fonts.googleapis.com/css?family=Ubuntu:400,700|Cabin+Condensed:400,600");
+  background: #FFC600;
-/* line 1, ../sass/_viewport.scss */
+  padding: 1em;
+}
+
+header .headline {
+  max-width: 640px;
+  margin: 0 auto;
+}
+
+header .headline h1 {
+  color: #FFDD69;
+  font-size: 3em;
+  margin-bottom: 0;
+}
+
+header .headline h2 {
+  margin-top: 0.2em;
+}
+
+footer {
+  background: #0A4DB7;
+  color: #6C9CE8;
+  padding: 1em 2em 2em;
+}
+
+#container {
+  width: 640px;
+  margin: 20px auto;
+  padding: 10px;
+}
+
 #interactive.viewport {
   width: 640px;
   height: 480px;
 }
 
-/* line 6, ../sass/_viewport.scss */
+
 #interactive.viewport canvas, video {
   float: left;
   width: 640px;
   height: 480px;
 }
-/* line 10, ../sass/_viewport.scss */
+
 #interactive.viewport canvas.drawingBuffer, video.drawingBuffer {
   margin-left: -640px;
 }
 
-/* line 16, ../sass/_viewport.scss */
 .controls fieldset {
   border: none;
+  margin: 0;
+  padding: 0;
 }
-/* line 19, ../sass/_viewport.scss */
+
 .controls .input-group {
   float: left;
 }
-/* line 21, ../sass/_viewport.scss */
+
 .controls .input-group input, .controls .input-group button {
   display: block;
 }
-/* line 25, ../sass/_viewport.scss */
+
 .controls .reader-config-group {
   float: right;
 }
-/* line 28, ../sass/_viewport.scss */
+
 .controls .reader-config-group label {
   display: block;
 }
-/* line 30, ../sass/_viewport.scss */
+
 .controls .reader-config-group label span {
-  width: 11rem;
+  width: 9rem;
   display: inline-block;
   text-align: right;
 }
-/* line 37, ../sass/_viewport.scss */
+
 .controls:after {
   content: '';
   display: block;
   clear: both;
 }
 
-/* line 44, ../sass/_viewport.scss */
+
 #result_strip {
   margin: 10px 0;
   border-top: 1px solid #EEE;
   border-bottom: 1px solid #EEE;
   padding: 10px 0;
 }
-/* line 50, ../sass/_viewport.scss */
+
 #result_strip > ul {
   padding: 0;
   margin: 0;
@@ -83,41 +113,41 @@
   overflow-y: hidden;
   white-space: nowrap;
 }
-/* line 59, ../sass/_viewport.scss */
+
 #result_strip > ul > li {
   display: inline-block;
   vertical-align: middle;
   width: 160px;
 }
-/* line 63, ../sass/_viewport.scss */
+
 #result_strip > ul > li .thumbnail {
   padding: 5px;
   margin: 4px;
   border: 1px dashed #CCC;
 }
-/* line 68, ../sass/_viewport.scss */
+
 #result_strip > ul > li .thumbnail img {
   max-width: 140px;
 }
-/* line 71, ../sass/_viewport.scss */
+
 #result_strip > ul > li .thumbnail .caption {
   white-space: normal;
 }
-/* line 73, ../sass/_viewport.scss */
+
 #result_strip > ul > li .thumbnail .caption h4 {
   text-align: center;
   word-wrap: break-word;
   height: 40px;
   margin: 0px;
 }
-/* line 83, ../sass/_viewport.scss */
+
 #result_strip > ul:after {
   content: "";
   display: table;
   clear: both;
 }
 
-/* line 7, ../sass/_overlay.scss */
+
 .scanner-overlay {
   display: none;
   width: 640px;
@@ -133,21 +163,21 @@
   -webkit-box-shadow: #333333 0px 4px 10px;
   box-shadow: #333333 0px 4px 10px;
 }
-/* line 20, ../sass/_overlay.scss */
+
 .scanner-overlay > .header {
   position: relative;
   margin-bottom: 14px;
 }
-/* line 23, ../sass/_overlay.scss */
+
 .scanner-overlay > .header h4, .scanner-overlay > .header .close {
   line-height: 16px;
 }
-/* line 26, ../sass/_overlay.scss */
+
 .scanner-overlay > .header h4 {
   margin: 0px;
   padding: 0px;
 }
-/* line 30, ../sass/_overlay.scss */
+
 .scanner-overlay > .header .close {
   position: absolute;
   right: 0px;
@@ -160,7 +190,7 @@
   cursor: pointer;
 }
 
-/* line 1, ../sass/_icons.scss */
+
 i.icon-24-scan {
   width: 24px;
   height: 24px;
@@ -172,11 +202,8 @@ i.icon-24-scan {
   vertical-align: text-top;
 }
 
-@media (min-width: 604px) and (max-width: 1024px) {
-  /* tablet styles */
-}
 @media (max-width: 603px) {
-  /* line 2, ../sass/phone/_core.scss */
+
   #container {
     width: 300px;
     margin: 10px auto;
@@ -184,46 +211,58 @@ i.icon-24-scan {
     -webkit-box-shadow: none;
     box-shadow: none;
   }
-  /* line 9, ../sass/phone/_core.scss */
+
   #container form.voucher-form input.voucher-code {
     width: 180px;
   }
 }
 @media (max-width: 603px) {
-  /* line 5, ../sass/phone/_viewport.scss */
+
+  .reader-config-group {
+    width: 100%;
+  }
+
+  .reader-config-group label > span {
+      width: 50%;
+  }
+
+  .reader-config-group label > select, .reader-config-group label > input {
+      max-width: calc(50% - 2px);
+  }
+
   #interactive.viewport {
     width: 300px;
     height: 300px;
     overflow: hidden;
   }
 
-  /* line 11, ../sass/phone/_viewport.scss */
+
   #interactive.viewport canvas, video {
     margin-top: -50px;
     width: 300px;
     height: 400px;
   }
-  /* line 15, ../sass/phone/_viewport.scss */
+
   #interactive.viewport canvas.drawingBuffer, video.drawingBuffer {
     margin-left: -300px;
   }
 
-  /* line 20, ../sass/phone/_viewport.scss */
+
   #result_strip {
     margin-top: 5px;
     padding-top: 5px;
   }
-  /* line 24, ../sass/phone/_viewport.scss */
+
   #result_strip ul.thumbnails > li {
     width: 150px;
   }
-  /* line 27, ../sass/phone/_viewport.scss */
+
   #result_strip ul.thumbnails > li .thumbnail .imgWrapper {
     width: 130px;
     height: 130px;
     overflow: hidden;
   }
-  /* line 31, ../sass/phone/_viewport.scss */
+
   #result_strip ul.thumbnails > li .thumbnail .imgWrapper img {
     margin-top: -25px;
     width: 130px;
@@ -231,7 +270,7 @@ i.icon-24-scan {
   }
 }
 @media (max-width: 603px) {
-  /* line 8, ../sass/phone/_overlay.scss */
+
   .overlay.scanner {
     width: 640px;
     height: 510px;
@@ -243,66 +282,17 @@ i.icon-24-scan {
     -webkit-box-shadow: none;
     box-shadow: none;
   }
-  /* line 17, ../sass/phone/_overlay.scss */
+
   .overlay.scanner > .header {
     margin-bottom: 14px;
   }
-  /* line 19, ../sass/phone/_overlay.scss */
+
   .overlay.scanner > .header h4, .overlay.scanner > .header .close {
     line-height: 16px;
   }
-  /* line 22, ../sass/phone/_overlay.scss */
+
   .overlay.scanner > .header .close {
     height: 16px;
     width: 16px;
   }
 }
-/* line 15, ../sass/styles.scss */
-body {
-  background-color: #FFF;
-  margin: 0px;
-  font-family: Ubuntu, sans-serif;
-  color: #1e1e1e;
-  font-weight: normal;
-  padding-top: 0;
-}
-
-/* line 24, ../sass/styles.scss */
-h1, h2, h3, h4 {
-  font-family: "Cabin Condensed", sans-serif;
-}
-
-/* line 28, ../sass/styles.scss */
-header {
-  background: #FFC600;
-  padding: 1em;
-}
-/* line 31, ../sass/styles.scss */
-header .headline {
-  width: 640px;
-  margin: 0 auto;
-}
-/* line 34, ../sass/styles.scss */
-header .headline h1 {
-  color: #FFDD69;
-  font-size: 3em;
-  margin-bottom: 0;
-}
-/* line 39, ../sass/styles.scss */
-header .headline h2 {
-  margin-top: 0.2em;
-}
-
-/* line 45, ../sass/styles.scss */
-footer {
-  background: #0A4DB7;
-  color: #6C9CE8;
-  padding: 1em 2em 2em;
-}
-
-/* line 51, ../sass/styles.scss */
-#container {
-  width: 640px;
-  margin: 20px auto;
-  padding: 10px;
-}

example/file_input.html

@@ -51,7 +51,9 @@
                     <option value="upc">UPC</option>
                     <option value="upc_e">UPC-E</option>
                     <option value="codabar">Codabar</option>
-                    <option value="i2of5">ITF</option>
+                    <option value="i2of5">Interleaved 2 of 5</option>
+                    <option value="2of5">Standard 2 of 5</option>
+                    <option value="code_93">Code 93</option>
                 </select>
             </label>
             <label>

example/live_w_locator.html

@@ -8,7 +8,7 @@
     <meta name="description" content="" />
     <meta name="author" content="Christoph Oberhofer" />
 
-    <meta name="viewport" content="width=device-width; initial-scale=1.0" />
+    <meta name="viewport" content="width=device-width; initial-scale=1.0; user-scalable=no" />
     <link rel="stylesheet" type="text/css" href="css/styles.css" />
   </head>
 
@@ -43,11 +43,13 @@
                         <option value="upc">UPC</option>
                         <option value="upc_e">UPC-E</option>
                         <option value="codabar">Codabar</option>
-                        <option value="i2of5">ITF</option>
+                        <option value="i2of5">Interleaved 2 of 5</option>
+                        <option value="2of5">Standard 2 of 5</option>
+                        <option value="code_93">Code 93</option>
                     </select>
                 </label>
                 <label>
-                    <span>Resolution (long side)</span>
+                    <span>Resolution (width)</span>
                     <select name="input-stream_constraints">
                         <option value="320x240">320px</option>
                         <option selected="selected" value="640x480">640px</option>
@@ -81,6 +83,19 @@
                         <option value="8">8</option>
                     </select>
                 </label>
+                <label>
+                    <span>Camera</span>
+                    <select name="input-stream_constraints" id="deviceSelection">
+                    </select>
+                </label>
+                <label style="display: none">
+                    <span>Zoom</span>
+                    <select name="settings_zoom"></select>
+                </label>
+                <label style="display: none">
+                    <span>Torch</span>
+                    <input type="checkbox" name="settings_torch" />
+                </label>
             </fieldset>
         </div>
       <div id="result_strip">
@@ -91,11 +106,12 @@
     </section>
           <footer>
         <p>
-          &copy; Copyright by Christoph Oberhofer
+          &copy; Made with ❤️ by Christoph Oberhofer
         </p>
       </footer>
 
     <script src="vendor/jquery-1.9.0.min.js" type="text/javascript"></script>
+    <script src="//webrtc.github.io/adapter/adapter-latest.js" type="text/javascript"></script>
     <script src="../dist/quagga.js" type="text/javascript"></script>
     <script src="live_w_locator.js" type="text/javascript"></script>
   </body>

example/live_w_locator.js

@@ -2,7 +2,19 @@ $(function() {
     var resultCollector = Quagga.ResultCollector.create({
         capture: true,
         capacity: 20,
-        blacklist: [{code: "2167361334", format: "i2of5"}],
+        blacklist: [{
+            code: "WIWV8ETQZ1", format: "code_93"
+        }, {
+            code: "EH3C-%GU23RK3", format: "code_93"
+        }, {
+            code: "O308SIHQOXN5SA/PJ", format: "code_93"
+        }, {
+            code: "DG7Q$TV8JQ/EN", format: "code_93"
+        }, {
+            code: "VOFD1DB5A.1F6QU", format: "code_93"
+        }, {
+            code: "4SO64P4X8 U4YUU1T-", format: "code_93"
+        }],
         filter: function(codeResult) {
             // only store results which match this constraint
             // e.g.: codeResult
@@ -10,24 +22,91 @@ $(function() {
         }
     });
     var App = {
-        init : function() {
+        init: function() {
             var self = this;
 
             Quagga.init(this.state, function(err) {
                 if (err) {
                     return self.handleError(err);
                 }
-                Quagga.registerResultCollector(resultCollector);
+                //Quagga.registerResultCollector(resultCollector);
                 App.attachListeners();
+                App.checkCapabilities();
                 Quagga.start();
             });
         },
         handleError: function(err) {
             console.log(err);
         },
+        checkCapabilities: function() {
+            var track = Quagga.CameraAccess.getActiveTrack();
+            var capabilities = {};
+            if (typeof track.getCapabilities === 'function') {
+                capabilities = track.getCapabilities();
+            }
+            this.applySettingsVisibility('zoom', capabilities.zoom);
+            this.applySettingsVisibility('torch', capabilities.torch);
+        },
+        updateOptionsForMediaRange: function(node, range) {
+            console.log('updateOptionsForMediaRange', node, range);
+            var NUM_STEPS = 6;
+            var stepSize = (range.max - range.min) / NUM_STEPS;
+            var option;
+            var value;
+            while (node.firstChild) {
+                node.removeChild(node.firstChild);
+            }
+            for (var i = 0; i <= NUM_STEPS; i++) {
+                value = range.min + (stepSize * i);
+                option = document.createElement('option');
+                option.value = value;
+                option.innerHTML = value;
+                node.appendChild(option);
+            }
+        },
+        applySettingsVisibility: function(setting, capability) {
+            // depending on type of capability
+            if (typeof capability === 'boolean') {
+                var node = document.querySelector('input[name="settings_' + setting + '"]');
+                if (node) {
+                    node.parentNode.style.display = capability ? 'block' : 'none';
+                }
+                return;
+            }
+            if (window.MediaSettingsRange && capability instanceof window.MediaSettingsRange) {
+                var node = document.querySelector('select[name="settings_' + setting + '"]');
+                if (node) {
+                    this.updateOptionsForMediaRange(node, capability);
+                    node.parentNode.style.display = 'block';
+                }
+                return;
+            }
+        },
+        initCameraSelection: function(){
+            var streamLabel = Quagga.CameraAccess.getActiveStreamLabel();
+
+            return Quagga.CameraAccess.enumerateVideoDevices()
+            .then(function(devices) {
+                function pruneText(text) {
+                    return text.length > 30 ? text.substr(0, 30) : text;
+                }
+                var $deviceSelection = document.getElementById("deviceSelection");
+                while ($deviceSelection.firstChild) {
+                    $deviceSelection.removeChild($deviceSelection.firstChild);
+                }
+                devices.forEach(function(device) {
+                    var $option = document.createElement("option");
+                    $option.value = device.deviceId || device.id;
+                    $option.appendChild(document.createTextNode(pruneText(device.label || device.deviceId || device.id)));
+                    $option.selected = streamLabel === device.label;
+                    $deviceSelection.appendChild($option);
+                });
+            });
+        },
         attachListeners: function() {
             var self = this;
 
+            self.initCameraSelection();
             $(".controls").on("click", "button.stop", function(e) {
                 e.preventDefault();
                 Quagga.stop();
@@ -64,7 +143,11 @@ $(function() {
 
             return parts.reduce(function(o, key, i) {
                 if (setter && (i + 1) === depth) {
-                    o[key] = val;
+                    if (typeof o[key] === "object" && typeof val === "object") {
+                        Object.assign(o[key], val);
+                    } else {
+                        o[key] = val;
+                    }
                 }
                 return key in o ? o[key] : {};
             }, obj);
@@ -78,6 +161,17 @@ $(function() {
             $(".controls").off("click", "button.stop");
             $(".controls .reader-config-group").off("change", "input, select");
         },
+        applySetting: function(setting, value) {
+            var track = Quagga.CameraAccess.getActiveTrack();
+            if (track && typeof track.getCapabilities === 'function') {
+                switch (setting) {
+                case 'zoom':
+                    return track.applyConstraints({advanced: [{zoom: parseFloat(value)}]});
+                case 'torch':
+                    return track.applyConstraints({advanced: [{torch: !!value}]});
+                }
+            }
+        },
         setState: function(path, value) {
             var self = this;
 
@@ -85,6 +179,10 @@ $(function() {
                 value = self._accessByPath(self.inputMapper, path)(value);
             }
 
+            if (path.startsWith('settings.')) {
+                var setting = path.substring(9);
+                return self.applySetting(setting, value);
+            }
             self._accessByPath(self.state, path, value);
 
             console.log(JSON.stringify(self.state));
@@ -95,11 +193,16 @@ $(function() {
         inputMapper: {
             inputStream: {
                 constraints: function(value){
-                    var values = value.split('x');
+                    if (/^(\d+)x(\d+)$/.test(value)) {
-                    return {
+                        var values = value.split('x');
-                        width: parseInt(values[0]),
+                        return {
-                        height: parseInt(values[1])
+                            width: {min: parseInt(values[0])},
+                            height: {min: parseInt(values[1])}
+                        };
                     }
+                    return {
+                        deviceId: value
+                    };
                 }
             },
             numOfWorkers: function(value) {
@@ -128,16 +231,18 @@ $(function() {
             inputStream: {
                 type : "LiveStream",
                 constraints: {
-                    width: 640,
+                    width: {min: 640},
-                    height: 480,
+                    height: {min: 480},
-                    facingMode: "environment"
+                    facingMode: "environment",
+                    aspectRatio: {min: 1, max: 2}
                 }
             },
             locator: {
                 patchSize: "medium",
                 halfSample: true
             },
-            numOfWorkers: 4,
+            numOfWorkers: 2,
+            frequency: 10,
             decoder: {
                 readers : [{
                     format: "code_128_reader",

example/node-test-with-buffer.js

@@ -0,0 +1,27 @@
+var Quagga = require('../lib/quagga').default;
+
+var buffer = require('fs').readFileSync('../test/fixtures/code_128/image-001.jpg');
+
+decode(buffer);
+function decode(buff){
+    Quagga.decodeSingle({
+        src: buff,
+        numOfWorkers: 0,
+        inputStream: {
+            mime: "image/jpeg",
+            size: 800,
+            area: {
+                top: "10%",
+                right: "5%",
+                left: "5%",
+                bottom: "10%"
+            }
+        }
+    }, function(result) {
+        if (result.codeResult) {
+            console.log("result", result.codeResult.code);
+        } else {
+            console.log("not detected");
+        }
+    });
+}

example/sass/_icons.scss

@@ -1,10 +0,0 @@
-i.icon-24-scan{
-  width: 24px;
-  height: 24px;
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6QzFFMjMzNTBFNjcwMTFFMkIzMERGOUMzMzEzM0E1QUMiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6QzFFMjMzNTFFNjcwMTFFMkIzMERGOUMzMzEzM0E1QUMiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpDMUUyMzM0RUU2NzAxMUUyQjMwREY5QzMzMTMzQTVBQyIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpDMUUyMzM0RkU2NzAxMUUyQjMwREY5QzMzMTMzQTVBQyIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PtQr90wAAAUuSURBVHjanFVLbFRVGP7ua97T9DGPthbamAYYBNSMVbBpjCliWWGIEBMWsnDJxkh8RDeEDW5MDGticMmGBWnSlRSCwgLFNkqmmrRIqzjTznTazkxn5s7c6/efzm0G0Jhwkj/nP+d/nv91tIWFBTQaDQWapkGW67p4ltUub5qmAi0UCqF/a/U2m81tpmddotwwDGSz2dzi4uKSaOucnJycGhsbe1XXdQiIIcdxEAgEtgXq9brySHCht79UXi/8QheawN27d385fPjwuEl6XyKR6LdtW7t06RLK5TKOHj2K/fv3Q87Dw8OYn5/HiRMnMDs7i5mZGQwODiqlPp8PuVwO6XRaOXb16lXl1OnTp5FMJvtosF8M+MWLarWqGJaWlpBKpRRcu3YN4+PjmJ6exsTEhDJw5coVjI6OKgPhcBiZTAbxeBx+vx+XL19Gd3c3Tp48Ka9zqDYgBlTQxYNgMIhIJKLCILkQb+TZsgvdsiyFi+feWRR7oRNZyanQtvW2V4DEUUBiK2eJpeDirSyhCe7F2QPh8fiEp72i9PbsC5G52DbiKZA771yr1dTuGfJ4PQNPFoAyQNR1aNEmsS5eyB3PgjeooMZd2AWvNmzYci/Gea7TeFOcI93jV/K67noGmi4vdRI9gPSDeMLSdKUBZZczlWm1rTtHjLZ24d+WER2tc8N1m+Y+ID74wx0zGYvhg9UNrJdtHJyZRdQfwPsrq9g99xsGlgsYmr6BNzO/IVwsYfjBQ6XYz6JI/72MV366B5/lw0elOkJWGUM3bmKtWjXSLuLaBWhnPnnp0FfoiFi4+TMfVAb2poBkDLjO845uYLEAjL4ALGWBP5YAOsP4AJYBFDaB1HOSVWD2PuV95H2RdV93Lv74/cf6p6Zxq/h6OofeOPJBC39JtONdwOAAViOs4p4OFGTf0Uc8iiyrr9YdQrUnDLsngrVOC0jQib44HlF2RafRZBz1Qy+vfhgK3NJZBlrm+LEm9qWwzFgLU7Ozg0JxZP06jQSRpQ7EerAWDSt6PuhHPmChEAog56fCLvJT5hHTm3OZkz3DyLx7XNWTGEA1GkV14gjWgwbW0ESVjYRwCOuai03L5E7OUBAV4kXSS4auoGIaKOma4m8EA5R1sMEGLh95C+XuLph0WJWpxepYYLtfT0RRgY1KgNODY6BoaChRuEhDCIZQYseuki5KN6hcQHiq7OZNv4/Zq2O6P4Lfkwn46vZjjaYZrIpvWbpzjLErrc4xUGE4avRedpYJalRcIl5hQius/SrPm9xrNOQYJhao6BvNUeWqtY8KaWuNjHOFAr7mM9f4NA4UbKysoUJ8PV9UzVOx6wxDDWUOxnK1pmCD07fOMAvtIsM3l89Dl3HRGhVma9AZMqjOnz2LQqWCxs6dqr3T7x1DTzKJaG8SekcHhg4cgI/56uKdlKnBV/WndqN3YAB/7tyBd3oT6GBIOzs7kc/nDfFdDFT5bS73cp06dQoaPa/Rw/rtO/resTHxxE2m9rCrbSR27UJCcMf1BpiA5rAAGgdfc868fUR1sMwj0cm9Iu9IctweisViB3hhKTHDcHc5jv/LspbyaZrR1OD82/fIlOkuB9LnEWRmDX2TsddUPg3D5gvuc0je0rZaD5EW6G3yjS+A3eeBEWq3XW/Abw1HhUspXADufQb86oW7tZytkYCN//3hHwBvDALPi8EnSOYK8DAOfCc2h4aGcO7cuafkzampqf9UripH12/DtOZbx8ciVGzYy5OO40o25ascGRl5Ssc/AgwAjW3JwqIUjSYAAAAASUVORK5CYII=");
-  display: inline-block;
-  background-repeat: no-repeat;
-  line-height: 24px;
-  margin-top: 1px;
-  vertical-align: text-top;
-}

example/sass/_overlay.scss

@@ -1,48 +0,0 @@
-$overlayWidth: $videoWidth;
-$overlayHeadline: 16px;
-$overlayHeadlineMargin: 14px;
-$overlayPadding: 20px;
-$overlayHeight: $videoHeight + $overlayHeadlineMargin + $overlayHeadline;
-
-.scanner-overlay {
-  display: none;
-  width: $overlayWidth;
-  height: $overlayHeight;
-  position: absolute;
-  padding: $overlayPadding;
-  top: 50%;
-  margin-top: -($overlayHeight)/2 - $overlayPadding;
-  left: 50%;
-  margin-left: -($overlayWidth + 2*$overlayPadding)/2;
-  background-color: $overlayBackground;
-  @include box-shadow(#333333 0px 4px 10px);
-  
-  & > .header{
-    position: relative;
-    margin-bottom: $overlayHeadlineMargin;
-    h4, .close{
-      line-height: $overlayHeadline;
-    }
-    h4{
-      margin: 0px;
-      padding: 0px;
-    }
-    .close{
-      position: absolute;
-      right: 0px;
-      top: 0px;
-      height: $overlayHeadline;
-      width: $overlayHeadline;
-      text-align: center;
-      font-weight: bold;
-      font-size: 14px;
-      cursor: pointer;
-    }
-  }
-  
-  & > .body{
-    
-    
-    
-  }
-}

example/sass/_phone.scss

@@ -1,3 +0,0 @@
-@import "phone/core";
-@import "phone/viewport";
-@import "phone/overlay";

example/sass/_tablet.scss

@@ -1,4 +0,0 @@
-@include tablet {
-    /* tablet styles */
-  
-}

example/sass/_utility.scss

@@ -1,17 +0,0 @@
-$tablet_upper: 1024px;
-$phone_upper: 603px;
- 
-@mixin phone {
-  @media (max-width: $phone_upper) {
-    @content;
-  }
- 
-} // @mixin phone
- 
-@mixin tablet {
- 
-  @media (min-width: $phone_upper+1) and (max-width: $tablet_upper) {
-    @content;
-  }
- 
-} // @mixin tablet

example/sass/_variables.scss

@@ -1,7 +0,0 @@
-$background_color: #FFF;
-$overlayBackground: #FFF;
-$videoWidth: 640px;
-$videoHeight: 480px;
-
-$text-font: Ubuntu, sans-serif;
-$header-font: 'Cabin Condensed', sans-serif;

example/sass/_viewport.scss

@@ -1,89 +0,0 @@
-#interactive.viewport{
-  width: $videoWidth;
-  height: $videoHeight;
-}
-
-#interactive.viewport canvas, video{
-  float: left;
-  width: $videoWidth;
-  height: $videoHeight;
-  &.drawingBuffer{
-    margin-left: -$videoWidth;
-  }
-}
-
-.controls {
-  fieldset {
-    border: none;
-  }
-  .input-group {
-    float: left;
-    input, button {
-      display: block;
-    }
-  }
-  .reader-config-group {
-    float: right;
-
-    label {
-      display: block;
-      span {
-        width: 11rem;
-        display: inline-block;
-        text-align: right;
-      }
-    }
-  }
-  &:after {
-    content:'';
-    display: block;
-    clear: both;
-  }
-}
-
-#result_strip{
-  margin: 10px 0;
-  border-top: 1px solid #EEE;
-  border-bottom: 1px solid #EEE;
-  padding: 10px 0;
-  
-  & > ul {
-    padding: 0;
-    margin: 0;
-    list-style-type: none;
-    width: auto;
-    overflow-x: auto;
-    overflow-y: hidden;
-    white-space: nowrap;
-    
-    & > li{
-      display: inline-block;
-      vertical-align: middle;
-      width: $videoWidth/4;
-      .thumbnail{
-        padding: 5px;
-        margin: 4px;
-        border: 1px dashed #CCC;
-        
-        img{
-          max-width: $videoWidth/4 - 20px;
-        }
-        .caption{
-          white-space: normal;
-          h4{
-            text-align: center;
-            word-wrap: break-word;
-            height: 40px;
-            margin: 0px;
-          }
-        }
-      }
-    }
-    
-    &:after{
-      content: "";
-      display: table;
-      clear: both;
-    }
-  }
-}

example/sass/colors.scss

@@ -1,55 +0,0 @@
-/* LESS - http://lesscss.org style sheet */
-/* Palette color codes */
-/* Palette URL: http://paletton.com/#uid=31g0q0kHZAviRSkrHLOGomVNzac */
-
-/* Feel free to copy&paste color codes to your application */
-
-
-/* MIXINS */
-
-/* As hex codes */
-
-$color-primary-0: #FFC600;  /* Main Primary color */
-$color-primary-1: #FFDD69;
-$color-primary-2: #FFCE22;
-$color-primary-3: #B78E00;
-$color-primary-4: #513F00;
-
-$color-secondary-1-0: #0A4DB7;  /* Main Secondary color (1) */
-$color-secondary-1-1: #6C9CE8;
-$color-secondary-1-2: #2E6FD6;
-$color-secondary-1-3: #073379;
-$color-secondary-1-4: #021636;
-
-$color-secondary-2-0: #5809BB;  /* Main Secondary color (2) */
-$color-secondary-2-1: #A36BE9;
-$color-secondary-2-2: #782DD8;
-$color-secondary-2-3: #3A077C;
-$color-secondary-2-4: #190237;
-
-
-
-/* As RGBa codes */
-
-$rgba-primary-0: rgba(255,198,  0,1); /* Main Primary color */
-$rgba-primary-1: rgba(255,221,105,1);
-$rgba-primary-2: rgba(255,206, 34,1);
-$rgba-primary-3: rgba(183,142,  0,1);
-$rgba-primary-4: rgba( 81, 63,  0,1);
-
-$rgba-secondary-1-0: rgba( 10, 77,183,1); /* Main Secondary color (1) */
-$rgba-secondary-1-1: rgba(108,156,232,1);
-$rgba-secondary-1-2: rgba( 46,111,214,1);
-$rgba-secondary-1-3: rgba(  7, 51,121,1);
-$rgba-secondary-1-4: rgba(  2, 22, 54,1);
-
-$rgba-secondary-2-0: rgba( 88,  9,187,1); /* Main Secondary color (2) */
-$rgba-secondary-2-1: rgba(163,107,233,1);
-$rgba-secondary-2-2: rgba(120, 45,216,1);
-$rgba-secondary-2-3: rgba( 58,  7,124,1);
-$rgba-secondary-2-4: rgba( 25,  2, 55,1);
-
-
-
-/* Generated by Paletton.com © 2002-2014 */
-/* http://paletton.com */

example/sass/fonts.scss

@@ -1 +0,0 @@
-@import url('http://fonts.googleapis.com/css?family=Ubuntu:400,700|Cabin+Condensed:400,600');

example/sass/phone/_core.scss

@@ -1,15 +0,0 @@
-@include phone {  
-  #container{
-    width: 300px;
-    margin: 10px auto;
-    @include box-shadow(none);
-    
-    form.voucher-form{
-      input{
-        &.voucher-code{
-          width: 180px;
-        }
-      }
-    }
-  }
-}

example/sass/phone/_overlay.scss

@@ -1,28 +0,0 @@
-@include phone {
-  $overlayWidth: $videoWidth;
-  $overlayHeadline: 16px;
-  $overlayHeadlineMargin: 14px;
-  $overlayPadding: 20px;
-  $overlayHeight: $videoHeight + $overlayHeadlineMargin + $overlayHeadline;
-  
-  .overlay.scanner {
-    width: $overlayWidth;
-    height: $overlayHeight;
-    padding: $overlayPadding;
-    margin-top: -($overlayHeight)/2 - $overlayPadding;
-    margin-left: -($overlayWidth + 2*$overlayPadding)/2;
-    background-color: $overlayBackground;
-    @include box-shadow(none);
-    
-    & > .header{
-      margin-bottom: $overlayHeadlineMargin;
-      h4, .close{
-        line-height: $overlayHeadline;
-      }
-      .close{
-        height: $overlayHeadline;
-        width: $overlayHeadline;
-      }
-    }
-  }
-}

example/sass/phone/_viewport.scss

@@ -1,42 +0,0 @@
-@include phone {
-  $videoWidth: 300px;
-  $videoHeight: 400px;
-  
-  #interactive.viewport{
-    width: $videoWidth;
-    height: $videoWidth;
-    overflow: hidden;
-  }
-  
-  #interactive.viewport canvas, video{
-    margin-top: ($videoWidth - $videoHeight)/2;
-    width: $videoWidth;
-    height: $videoHeight;
-    &.drawingBuffer{
-      margin-left: -$videoWidth;
-    }
-  }
-  
-  #result_strip{
-    margin-top: 5px;
-    padding-top: 5px;
-    ul.thumbnails{
-      & > li{
-        width: $videoWidth/2;
-        .thumbnail{
-          .imgWrapper{
-            width: $videoWidth/2 - 20px;
-            height: $videoWidth/2 - 20px;
-            overflow: hidden;
-            img{
-              margin-top: (($videoWidth/2 - 20px) - ($videoHeight/2 - 20px))/2;
-              width: $videoWidth/2 - 20px;
-              height: $videoHeight/2 - 20px;
-            }
-          }
-          
-        }
-      }
-    }
-  }
-}

example/sass/scanner.scss

@@ -1,14 +0,0 @@
-
-@import "compass/css3";
-@import "variables";
-@import "utility";
-
-/* usual styles */
-
-@import "fonts";
-@import "viewport";
-@import "overlay";
-@import "icons";
-
-@import "tablet";
-@import "phone";

example/sass/styles.scss

@@ -1,56 +0,0 @@
-@import "compass/css3";
-@import "variables";
-@import "utility";
-
-/* usual styles */
-@import "colors";
-@import "fonts";
-@import "viewport";
-@import "overlay";
-@import "icons";
-
-@import "tablet";
-@import "phone";
-
-body{
-  background-color: #FFF;
-  margin: 0px;
-  font-family: $text-font;
-  color: #1e1e1e;
-  font-weight: normal;
-  padding-top: 0;
-}
-
-h1,h2,h3,h4 {
-  font-family: $header-font;
-}
-
-header {
-  background: $color-primary-0;
-  padding: 1em;
-  .headline {
-    width: 640px;
-    margin: 0 auto;
-    h1 {
-      color: $color-primary-1;
-      font-size: 3em;
-      margin-bottom: 0;
-    }
-    h2 {
-      margin-top: 0.2em;
-    }
-  }
-}
-
-footer {
-  background: $color-secondary-1-0;
-  color: $color-secondary-1-1;
-  padding: 1em 2em 2em;
-}
-
-#container{
-  width: 640px;
-  margin: 20px auto;
-  padding: 10px;
-}
-

example/static_images.html

@@ -45,6 +45,9 @@
                   <option value="upc_e">UPC-E</option>
                   <option value="codabar">Codabar</option>
                   <option value="i2of5">I2of5</option>
+                  <option value="i2of5">Interleaved 2 of 5</option>
+                  <option value="2of5">Standard 2 of 5</option>
+                  <option value="code_93">Code 93</option>
               </select>
           </fieldset>
       </div>

karma-integration.conf.js

@@ -14,6 +14,9 @@ module.exports = function(config) {
             'test/test-main-integration.js': ['webpack']
         },
         webpack: {
+            entry: [
+                './src/quagga.js'
+            ],
             module: {
                 loaders: [{
                     test: /\.jsx?$/,
@@ -24,6 +27,7 @@ module.exports = function(config) {
             resolve: {
                 modules: [
                     path.resolve('./src/input/'),
+                    path.resolve('./src/common/'),
                     'node_modules'
                 ]
             },
@@ -36,7 +40,6 @@ module.exports = function(config) {
         plugins: [
             'karma-chrome-launcher',
             'karma-mocha',
-            'karma-requirejs',
             'karma-chai',
             'karma-sinon',
             'karma-sinon-chai',
@@ -45,7 +48,7 @@ module.exports = function(config) {
         reporters: ['progress'],
         port: 9876,
         colors: true,
-        logLevel: config.LOG_INFO,
+        logLevel: config.LOG_INFO, // LOG_DEBUG
         autoWatch: true,
         browsers: ['Chrome'],
         singleRun: false

karma.conf.js

@@ -13,6 +13,9 @@ module.exports = function(config) {
             'test/test-main.js': ['webpack']
         },
         webpack: {
+            entry: [
+                './src/quagga.js'
+            ],
             module: {
                 loaders: [{
                     test: /\.jsx?$/,
@@ -23,12 +26,13 @@ module.exports = function(config) {
                 }, {
                     test: /\.js$/,
                     include: path.resolve('src'),
-                    loader: 'babel-istanbul'
+                    loader: 'babel-istanbul-loader'
                 }]
             },
             resolve: {
                 modules: [
                     path.resolve('./src/input/'),
+                    path.resolve('./test/mocks/'),
                     'node_modules'
                 ]
             },

lib/input_stream.js

@@ -24,7 +24,7 @@ InputStream.createImageStream = function() {
 
     function loadImages() {
         loaded = false;
-        GetPixels(baseUrl, function(err, pixels) {
+        GetPixels(baseUrl, _config.mime, function(err, pixels) {
             if (err) {
                 console.log(err);
                 exit(1);

package.json

@@ -1,22 +1,25 @@
 {
   "name": "quagga",
-  "version": "0.11.3",
+  "version": "0.12.1",
   "description": "An advanced barcode-scanner written in JavaScript",
   "main": "lib/quagga.js",
+  "typings": "type-definitions/quagga.d.ts",
   "browser": "dist/quagga.min.js",
+  "typings": "type-definitions/quagga.d.ts",
   "devDependencies": {
     "async": "^1.4.2",
     "babel-cli": "^6.5.1",
-    "babel-core": "^6.7.4",
+    "babel-core": "^6.21.0",
-    "babel-eslint": "^6.0.0",
+    "babel-eslint": "^7.1.1",
+    "babel-istanbul": "^0.8.0",
     "babel-istanbul-loader": "^0.1.0",
-    "babel-loader": "^6.2.4",
+    "babel-loader": "^6.2.10",
-    "babel-plugin-add-module-exports": "^0.1.2",
+    "babel-plugin-add-module-exports": "^0.2.1",
     "babel-plugin-check-es2015-constants": "^6.3.13",
-    "babel-plugin-lodash": "^2.2.1",
+    "babel-plugin-lodash": "^3.2.11",
     "babel-plugin-transform-es2015-arrow-functions": "^6.3.13",
     "babel-plugin-transform-es2015-block-scoped-functions": "^6.3.13",
-    "babel-plugin-transform-es2015-block-scoping": "^6.3.13",
+    "babel-plugin-transform-es2015-block-scoping": "^6.21.0",
     "babel-plugin-transform-es2015-classes": "^6.3.13",
     "babel-plugin-transform-es2015-computed-properties": "^6.3.13",
     "babel-plugin-transform-es2015-destructuring": "^6.3.13",
@@ -25,7 +28,7 @@
     "babel-plugin-transform-es2015-literals": "^6.3.13",
     "babel-plugin-transform-es2015-modules-commonjs": "^6.3.13",
     "babel-plugin-transform-es2015-object-super": "^6.3.13",
-    "babel-plugin-transform-es2015-parameters": "^6.3.13",
+    "babel-plugin-transform-es2015-parameters": "^6.21.0",
     "babel-plugin-transform-es2015-shorthand-properties": "^6.3.13",
     "babel-plugin-transform-es2015-spread": "^6.3.13",
     "babel-plugin-transform-es2015-sticky-regex": "^6.3.13",
@@ -33,34 +36,34 @@
     "babel-plugin-transform-es2015-typeof-symbol": "^6.3.13",
     "babel-plugin-transform-es2015-unicode-regex": "^6.3.13",
     "babel-plugin-transform-object-rest-spread": "^6.5.0",
-    "babel-plugin-transform-regenerator": "^6.3.13",
+    "babel-plugin-transform-regenerator": "^6.21.0",
     "chai": "^3.4.1",
-    "core-js": "^1.2.1",
+    "core-js": "^2.4.1",
-    "cross-env": "^1.0.7",
+    "cross-env": "^3.1.4",
     "eslint": "^1.10.3",
     "grunt": "^0.4.5",
     "grunt-cli": "^0.1.13",
     "grunt-contrib-nodeunit": "^0.4.1",
-    "grunt-karma": "^0.12.1",
+    "grunt-karma": "^2.0.0",
     "isparta-loader": "^2.0.0",
-    "karma": "^0.13.9",
+    "karma": "^1.3.0",
     "karma-chai": "0.1.0",
-    "karma-chrome-launcher": "^0.2.0",
+    "karma-chrome-launcher": "^2.0.0",
-    "karma-coverage": "^0.5.2",
+    "karma-coverage": "^1.1.1",
     "karma-firefox-launcher": "^0.1.7",
     "karma-mocha": "~0.2.0",
     "karma-phantomjs-launcher": "^0.2.1",
     "karma-sinon": "^1.0.4",
     "karma-sinon-chai": "^1.1.0",
     "karma-source-map-support": "^1.1.0",
-    "karma-webpack": "^1.7.0",
+    "karma-webpack": "^1.8.1",
     "lolex": "^1.4.0",
     "mocha": "^2.3.2",
     "phantomjs": "^1.9.18",
-    "sinon": "^1.16.1",
+    "sinon": "^1.17.7",
     "sinon-chai": "^2.8.0",
-    "webpack": "^2.1.0-beta.4",
+    "webpack": "^2.2.1",
-    "webpack-sources": "^0.1.1"
+    "webpack-sources": "^0.1.4"
   },
   "directories": {
     "doc": "doc"
@@ -105,9 +108,8 @@
     "gl-mat2": "^1.0.0",
     "gl-vec2": "^1.0.0",
     "gl-vec3": "^1.0.3",
-    "lodash": "^4.6.1",
+    "lodash": "^4.17.4",
     "ndarray": "^1.0.18",
-    "ndarray-linear-interpolate": "^1.0.0",
+    "ndarray-linear-interpolate": "^1.0.0"
-    "webrtc-adapter": "^1.3.0"
   }
 }

server.pem

@@ -0,0 +1,33 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXAIBAAKBgQC9ORap3LvRegtrhRc8dLdH9Bp2QokcKEsWbtvyhtjisRRm2slK
+A6Q11McB/YTb7oImFfNaCX+7vdM1oVXVLJ0ekQaNljXG5Dy7DXEcT1V6gpN4xmZJ
+8f/KZ45VBINN0Ha74L7nS4kgImh5yvNolNr4IdlSjGf09kciFy8S3kPlGQIDAQAB
+AoGAYDlaxBCC1liY3Bl3IoA7//QrTL4zGUWIQaUoZmGag1UHifJycBf/9nv4o5N3
+b5wPRSzebofsE93JPTmI+3nPf62k5rS2xOo8swwOZc+f5/v0EnUNixD7P0jBiLVR
+B8kbMvNdNn33HuynW1/MSBFE0cfeDH2i8SVl+Z+fHYIUW10CQQD0yWB8xeM8AxYB
+/ZZWClem6gf1lQAYLzid3x51pkLqRFpX+rG251cSBUouE+kVO14j2xrBqCyyOwNu
+17eazy3DAkEAxeQdWP9b11ihKOf/kjXiczltLnBsotn6K9EEAe0QuH/6iXLm86mL
+ZiQe+TrY1GWbK3ns0sfXgNJ2aeaRkeZn8wJAWF5WedTKisCmckOEwTzslbJI+0w2
+A4UQkFWa3mgOIhpY7wfunhP35+aG+AlyDJspChKwHxdCQ3lwbNRtUPLYFwJBAK8G
+9QIbUbLlPB1/HOfH6xM4rp3NZ/idzQxmISJG+GwHHaPmUekfgyEDP7X2W4N4nsbU
+XyeLA8t32q4N9aDS5gsCQDHqhsXqnY6e4IEZrvf90l2V1PpnTKfEl/F5wye3g69G
+JN57scVUBHP/KKoyfge0fytWiQN/56KvWH+G5+N/JyA=
+-----END RSA PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIIC2zCCAkSgAwIBAgIJALUDN95Or7XlMA0GCSqGSIb3DQEBBQUAMFMxCzAJBgNV
+BAYTAkFUMQ8wDQYDVQQIEwZTdHlyaWExDTALBgNVBAcTBEdyYXoxETAPBgNVBAoT
+CFF1YWdnYUpTMREwDwYDVQQDEwhxdWFnZ2FqczAeFw0xNzAxMDgxNjI5MjhaFw0x
+ODAxMDgxNjI5MjhaMFMxCzAJBgNVBAYTAkFUMQ8wDQYDVQQIEwZTdHlyaWExDTAL
+BgNVBAcTBEdyYXoxETAPBgNVBAoTCFF1YWdnYUpTMREwDwYDVQQDEwhxdWFnZ2Fq
+czCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAvTkWqdy70XoLa4UXPHS3R/Qa
+dkKJHChLFm7b8obY4rEUZtrJSgOkNdTHAf2E2+6CJhXzWgl/u73TNaFV1SydHpEG
+jZY1xuQ8uw1xHE9VeoKTeMZmSfH/ymeOVQSDTdB2u+C+50uJICJoecrzaJTa+CHZ
+Uoxn9PZHIhcvEt5D5RkCAwEAAaOBtjCBszAdBgNVHQ4EFgQUYm5+uJVOOGiYa+Vx
+2o++VHyWkwIwgYMGA1UdIwR8MHqAFGJufriVTjhomGvlcdqPvlR8lpMCoVekVTBT
+MQswCQYDVQQGEwJBVDEPMA0GA1UECBMGU3R5cmlhMQ0wCwYDVQQHEwRHcmF6MREw
+DwYDVQQKEwhRdWFnZ2FKUzERMA8GA1UEAxMIcXVhZ2dhanOCCQC1AzfeTq+15TAM
+BgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBACyzC/CKL1mgTuNgFDuUf6u+
+YMnqlc9wcnEaFuvXnkSh6fT+qMZm188C/tlZwcWTrGmoCM0K6mX1TpHOjm8vbeXZ
+diezAVGIVN3VoHqm6yJldI2rgFI9r5BfwAWYC8XNjqnT3U6cm4k8iC7jmLC+dT9r
+Ysx2ucAF6lNHayekRmNq
+-----END CERTIFICATE-----

simple-https-server.py

@@ -0,0 +1,30 @@
+# taken from http://www.piware.de/2011/01/creating-an-https-server-in-python/
+# generate server.xml with the following command:
+#    openssl req -new -x509 -keyout server.pem -out server.pem -days 365 -nodes
+# run as follows:
+#    python simple-https-server.py
+# then in your browser, visit:
+#    https://localhost:4443
+
+import BaseHTTPServer, SimpleHTTPServer
+import ssl
+import sys, getopt
+
+host = 'localhost'
+port = 4443
+try:
+  opts, args = getopt.getopt(sys.argv[1:],"",["host=", "port="])
+except getopt.GetoptError:
+  print 'simple-https-server.py --host <host> --port <port>'
+  sys.exit(2)
+for opt, arg in opts:
+  if opt in ("--host"):
+     host = arg
+  elif opt in ("--port"):
+     port = int(arg)
+print 'host is ', host
+print 'port is ', port
+
+httpd = BaseHTTPServer.HTTPServer((host, port), SimpleHTTPServer.SimpleHTTPRequestHandler)
+httpd.socket = ssl.wrap_socket (httpd.socket, certfile='./server.pem', server_side=True)
+httpd.serve_forever()

src/common/cv_utils.js

@@ -488,7 +488,7 @@ export function grayAndHalfSampleFromCanvasData(canvasData, size, outArray) {
 
     while (bottomRowIdx < endIdx) {
         for ( i = 0; i < outWidth; i++) {
-            outArray[outImgIdx] = Math.floor((
+            outArray[outImgIdx] = (
                 (0.299 * canvasData[topRowIdx * 4 + 0] +
                  0.587 * canvasData[topRowIdx * 4 + 1] +
                  0.114 * canvasData[topRowIdx * 4 + 2]) +
@@ -500,7 +500,7 @@ export function grayAndHalfSampleFromCanvasData(canvasData, size, outArray) {
                  0.114 * canvasData[(bottomRowIdx) * 4 + 2]) +
                 (0.299 * canvasData[(bottomRowIdx + 1) * 4 + 0] +
                  0.587 * canvasData[(bottomRowIdx + 1) * 4 + 1] +
-                 0.114 * canvasData[(bottomRowIdx + 1) * 4 + 2])) / 4);
+                 0.114 * canvasData[(bottomRowIdx + 1) * 4 + 2])) / 4;
             outImgIdx++;
             topRowIdx = topRowIdx + 2;
             bottomRowIdx = bottomRowIdx + 2;
@@ -521,8 +521,8 @@ export function computeGray(imageData, outArray, config) {
         }
     } else {
         for (i = 0; i < l; i++) {
-            outArray[i] = Math.floor(
+            outArray[i] =
-                0.299 * imageData[i * 4 + 0] + 0.587 * imageData[i * 4 + 1] + 0.114 * imageData[i * 4 + 2]);
+                0.299 * imageData[i * 4 + 0] + 0.587 * imageData[i * 4 + 1] + 0.114 * imageData[i * 4 + 2];
         }
     }
 };

src/common/image_debug.js

@@ -2,7 +2,7 @@ export default {
     drawRect: function(pos, size, ctx, style){
         ctx.strokeStyle = style.color;
         ctx.fillStyle = style.color;
-        ctx.lineWidth = 1;
+        ctx.lineWidth = style.lineWidth || 1;
         ctx.beginPath();
         ctx.strokeRect(pos.x, pos.y, size.x, size.y);
     },

src/common/mediaDevices.js

@@ -0,0 +1,17 @@
+
+export function enumerateDevices() {
+    if (navigator.mediaDevices
+            && typeof navigator.mediaDevices.enumerateDevices === 'function') {
+        return navigator.mediaDevices.enumerateDevices();
+    }
+    return Promise.reject(new Error('enumerateDevices is not defined'));
+};
+
+export function getUserMedia(constraints) {
+    if (navigator.mediaDevices
+            && typeof navigator.mediaDevices.getUserMedia === 'function') {
+        return navigator.mediaDevices
+            .getUserMedia(constraints);
+    }
+    return Promise.reject(new Error('getUserMedia is not defined'));
+}

src/common/typedefs.js

@@ -24,3 +24,28 @@ Math.imul = Math.imul || function(a, b) {
     // the final |0 converts the unsigned value into a signed value
     return ((al * bl) + (((ah * bl + al * bh) << 16) >>> 0) | 0);
 };
+
+if (typeof Object.assign !== 'function') {
+    Object.assign = function(target) { // .length of function is 2
+        'use strict';
+        if (target === null) { // TypeError if undefined or null
+            throw new TypeError('Cannot convert undefined or null to object');
+        }
+
+        var to = Object(target);
+
+        for (var index = 1; index < arguments.length; index++) {
+            var nextSource = arguments[index];
+
+            if (nextSource !== null) { // Skip over if undefined or null
+                for (var nextKey in nextSource) {
+                    // Avoid bugs when hasOwnProperty is shadowed
+                    if (Object.prototype.hasOwnProperty.call(nextSource, nextKey)) {
+                        to[nextKey] = nextSource[nextKey];
+                    }
+                }
+            }
+        }
+        return to;
+    };
+}

src/decoder/barcode_decoder.js

@@ -11,6 +11,8 @@ import EAN2Reader from '../reader/ean_2_reader';
 import EAN5Reader from '../reader/ean_5_reader';
 import UPCEReader from '../reader/upc_e_reader';
 import I2of5Reader from '../reader/i2of5_reader';
+import TwoOfFiveReader from '../reader/2of5_reader';
+import Code93Reader from '../reader/code_93_reader';
 
 const READERS = {
     code_128_reader: Code128Reader,
@@ -23,7 +25,9 @@ const READERS = {
     codabar_reader: CodabarReader,
     upc_reader: UPCReader,
     upc_e_reader: UPCEReader,
-    i2of5_reader: I2of5Reader
+    i2of5_reader: I2of5Reader,
+    '2of5_reader': TwoOfFiveReader,
+    code_93_reader: Code93Reader
 };
 export default {
     create: function(config, inputImageWrapper) {

src/input/camera_access.js

@@ -1,4 +1,10 @@
-import {merge, pick} from 'lodash';
+import {omit, pick} from 'lodash';
+import {getUserMedia, enumerateDevices} from 'mediaDevices';
+
+const facingMatching = {
+    "user": /front/i,
+    "environment": /back/i
+};
 
 var streamRef;
 
@@ -8,7 +14,7 @@ function waitForVideo(video) {
 
         function checkVideo() {
             if (attempts > 0) {
-                if (video.videoWidth > 0 && video.videoHeight > 0) {
+                if (video.videoWidth > 10 && video.videoHeight > 10) {
                     if (ENV.development) {
                         console.log(video.videoWidth + "px x " + video.videoHeight + "px");
                     }
@@ -32,11 +38,13 @@ function waitForVideo(video) {
  * @param {Object} video
  */
 function initCamera(video, constraints) {
-    return navigator.mediaDevices.getUserMedia(constraints)
+    return getUserMedia(constraints)
     .then((stream) => {
         return new Promise((resolve) => {
             streamRef = stream;
-            video.setAttribute("autoplay", 'true');
+            video.setAttribute("autoplay", true);
+            video.setAttribute('muted', true);
+            video.setAttribute('playsinline', true);
             video.srcObject = stream;
             video.addEventListener('loadedmetadata', () => {
                 video.play();
@@ -63,34 +71,31 @@ function deprecatedConstraints(videoConstraints) {
     return normalized;
 }
 
-function applyCameraFacing(facing, constraints) {
+export function pickConstraints(videoConstraints) {
-    if (typeof constraints.video.deviceId !== 'undefined' || !facing){
+    const normalizedConstraints = {
-        return Promise.resolve(constraints);
-    }
-    if ( typeof MediaStreamTrack !== 'undefined' &&
-            typeof MediaStreamTrack.getSources !== 'undefined') {
-        return new Promise((resolve) => {
-            MediaStreamTrack.getSources((sourceInfos) => {
-                const videoSource = sourceInfos.filter((sourceInfo) => (
-                    sourceInfo.kind === "video" && sourceInfo.facing === facing
-                ))[0];
-                if (videoSource) {
-                    return resolve(merge({}, constraints,
-                        {video: {deviceId: videoSource.id}}));
-                }
-                return resolve(constraints);
-            });
-        });
-    }
-    return Promise.resolve(merge({}, constraints, {video: {facingMode: facing}}));
-}
-
-function pickConstraints(videoConstraints) {
-    const constraints = {
         audio: false,
         video: deprecatedConstraints(videoConstraints)
     };
-    return applyCameraFacing(constraints.video.facingMode, constraints);
+
+    if (normalizedConstraints.video.deviceId
+            && normalizedConstraints.video.facingMode) {
+        delete normalizedConstraints.video.facingMode;
+    }
+    return Promise.resolve(normalizedConstraints);
+}
+
+function enumerateVideoDevices() {
+    return enumerateDevices()
+    .then(devices => devices.filter(device => device.kind === 'videoinput'));
+}
+
+function getActiveTrack() {
+    if (streamRef) {
+        const tracks = streamRef.getVideoTracks();
+        if (tracks && tracks.length) {
+            return tracks[0];
+        }
+    }
 }
 
 export default {
@@ -104,5 +109,11 @@ export default {
             tracks[0].stop();
         }
         streamRef = null;
-    }
+    },
+    enumerateVideoDevices,
+    getActiveStreamLabel: function() {
+        const track = getActiveTrack();
+        return track ? track.label : '';
+    },
+    getActiveTrack
 };

src/quagga.js

@@ -1,5 +1,4 @@
 import TypeDefs from './common/typedefs'; // eslint-disable-line no-unused-vars
-import WebrtcAdapter from 'webrtc-adapter'; // eslint-disable-line no-unused-vars
 import ImageWrapper from './common/image_wrapper';
 import BarcodeLocator from './locator/barcode_locator';
 import BarcodeDecoder from './decoder/barcode_decoder';
@@ -539,5 +538,6 @@ export default {
     },
     ImageWrapper: ImageWrapper,
     ImageDebug: ImageDebug,
-    ResultCollector: ResultCollector
+    ResultCollector: ResultCollector,
+    CameraAccess: CameraAccess,
 };

src/reader/2of5_reader.js

@@ -0,0 +1,257 @@
+import BarcodeReader from './barcode_reader';
+
+function TwoOfFiveReader(opts) {
+    BarcodeReader.call(this, opts);
+    this.barSpaceRatio = [1, 1];
+}
+
+var N = 1,
+    W = 3,
+    properties = {
+        START_PATTERN: {value: [W, N, W, N, N, N]},
+        STOP_PATTERN: {value: [W, N, N, N, W]},
+        CODE_PATTERN: {value: [
+            [N, N, W, W, N],
+            [W, N, N, N, W],
+            [N, W, N, N, W],
+            [W, W, N, N, N],
+            [N, N, W, N, W],
+            [W, N, W, N, N],
+            [N, W, W, N, N],
+            [N, N, N, W, W],
+            [W, N, N, W, N],
+            [N, W, N, W, N]
+        ]},
+        SINGLE_CODE_ERROR: {value: 0.78, writable: true},
+        AVG_CODE_ERROR: {value: 0.30, writable: true},
+        FORMAT: {value: "2of5"}
+    };
+
+const startPatternLength = properties.START_PATTERN.value.reduce((sum, val) => sum + val, 0);
+
+TwoOfFiveReader.prototype = Object.create(BarcodeReader.prototype, properties);
+TwoOfFiveReader.prototype.constructor = TwoOfFiveReader;
+
+TwoOfFiveReader.prototype._findPattern = function(pattern, offset, isWhite, tryHarder) {
+    var counter = [],
+        self = this,
+        i,
+        counterPos = 0,
+        bestMatch = {
+            error: Number.MAX_VALUE,
+            code: -1,
+            start: 0,
+            end: 0
+        },
+        error,
+        j,
+        sum,
+        epsilon = self.AVG_CODE_ERROR;
+
+    isWhite = isWhite || false;
+    tryHarder = tryHarder || false;
+
+    if (!offset) {
+        offset = self._nextSet(self._row);
+    }
+
+    for ( i = 0; i < pattern.length; i++) {
+        counter[i] = 0;
+    }
+
+    for ( i = offset; i < self._row.length; i++) {
+        if (self._row[i] ^ isWhite) {
+            counter[counterPos]++;
+        } else {
+            if (counterPos === counter.length - 1) {
+                sum = 0;
+                for ( j = 0; j < counter.length; j++) {
+                    sum += counter[j];
+                }
+                error = self._matchPattern(counter, pattern);
+                if (error < epsilon) {
+                    bestMatch.error = error;
+                    bestMatch.start = i - sum;
+                    bestMatch.end = i;
+                    return bestMatch;
+                }
+                if (tryHarder) {
+                    for (j = 0; j < counter.length - 2; j++) {
+                        counter[j] = counter[j + 2];
+                    }
+                    counter[counter.length - 2] = 0;
+                    counter[counter.length - 1] = 0;
+                    counterPos--;
+                } else {
+                    return null;
+                }
+            } else {
+                counterPos++;
+            }
+            counter[counterPos] = 1;
+            isWhite = !isWhite;
+        }
+    }
+    return null;
+};
+
+TwoOfFiveReader.prototype._findStart = function() {
+    var self = this,
+        leadingWhitespaceStart,
+        offset = self._nextSet(self._row),
+        startInfo,
+        narrowBarWidth = 1;
+
+    while (!startInfo) {
+        startInfo = self._findPattern(self.START_PATTERN, offset, false, true);
+        if (!startInfo) {
+            return null;
+        }
+        narrowBarWidth = Math.floor((startInfo.end - startInfo.start) / startPatternLength);
+        leadingWhitespaceStart = startInfo.start - narrowBarWidth * 5;
+        if (leadingWhitespaceStart >= 0) {
+            if (self._matchRange(leadingWhitespaceStart, startInfo.start, 0)) {
+                return startInfo;
+            }
+        }
+        offset = startInfo.end;
+        startInfo = null;
+    }
+};
+
+TwoOfFiveReader.prototype._verifyTrailingWhitespace = function(endInfo) {
+    var self = this,
+        trailingWhitespaceEnd;
+
+    trailingWhitespaceEnd = endInfo.end + ((endInfo.end - endInfo.start) / 2);
+    if (trailingWhitespaceEnd < self._row.length) {
+        if (self._matchRange(endInfo.end, trailingWhitespaceEnd, 0)) {
+            return endInfo;
+        }
+    }
+    return null;
+};
+
+TwoOfFiveReader.prototype._findEnd = function() {
+    var self = this,
+        endInfo,
+        tmp,
+        offset;
+
+    self._row.reverse();
+    offset = self._nextSet(self._row);
+    endInfo = self._findPattern(self.STOP_PATTERN, offset, false, true);
+    self._row.reverse();
+
+    if (endInfo === null) {
+        return null;
+    }
+
+    // reverse numbers
+    tmp = endInfo.start;
+    endInfo.start = self._row.length - endInfo.end;
+    endInfo.end = self._row.length - tmp;
+
+    return endInfo !== null ? self._verifyTrailingWhitespace(endInfo) : null;
+};
+
+TwoOfFiveReader.prototype._decodeCode = function(counter) {
+    var j,
+        self = this,
+        sum = 0,
+        normalized,
+        error,
+        epsilon = self.AVG_CODE_ERROR,
+        code,
+        bestMatch = {
+            error: Number.MAX_VALUE,
+            code: -1,
+            start: 0,
+            end: 0
+        };
+
+    for ( j = 0; j < counter.length; j++) {
+        sum += counter[j];
+    }
+    for (code = 0; code < self.CODE_PATTERN.length; code++) {
+        error = self._matchPattern(counter, self.CODE_PATTERN[code]);
+        if (error < bestMatch.error) {
+            bestMatch.code = code;
+            bestMatch.error = error;
+        }
+    }
+    if (bestMatch.error < epsilon) {
+        return bestMatch;
+    }
+};
+
+TwoOfFiveReader.prototype._decodePayload = function(counters, result, decodedCodes) {
+    var i,
+        self = this,
+        pos = 0,
+        counterLength = counters.length,
+        counter = [0, 0, 0, 0, 0],
+        code;
+
+    while (pos < counterLength) {
+        for (i = 0; i < 5; i++) {
+            counter[i] = counters[pos] * this.barSpaceRatio[0];
+            pos += 2;
+        }
+        code = self._decodeCode(counter);
+        if (!code) {
+            return null;
+        }
+        result.push(code.code + "");
+        decodedCodes.push(code);
+    }
+    return code;
+};
+
+TwoOfFiveReader.prototype._verifyCounterLength = function(counters) {
+    return (counters.length % 10 === 0);
+};
+
+TwoOfFiveReader.prototype._decode = function() {
+    var startInfo,
+        endInfo,
+        self = this,
+        code,
+        result = [],
+        decodedCodes = [],
+        counters;
+
+    startInfo = self._findStart();
+    if (!startInfo) {
+        return null;
+    }
+    decodedCodes.push(startInfo);
+
+    endInfo = self._findEnd();
+    if (!endInfo) {
+        return null;
+    }
+
+    counters = self._fillCounters(startInfo.end, endInfo.start, false);
+    if (!self._verifyCounterLength(counters)) {
+        return null;
+    }
+    code = self._decodePayload(counters, result, decodedCodes);
+    if (!code) {
+        return null;
+    }
+    if (result.length < 5) {
+        return null;
+    }
+
+    decodedCodes.push(endInfo);
+    return {
+        code: result.join(""),
+        start: startInfo.start,
+        end: endInfo.end,
+        startInfo: startInfo,
+        decodedCodes: decodedCodes
+    };
+};
+
+export default TwoOfFiveReader;

src/reader/barcode_reader.js

@@ -1,3 +1,5 @@
+import ArrayHelper from '../common/array_helper';
+
 function BarcodeReader(config, supplements) {
     this._row = [];
     this.config = config || {};
@@ -195,6 +197,33 @@ BarcodeReader.prototype._fillCounters = function(offset, end, isWhite) {
     return counters;
 };
 
+BarcodeReader.prototype._toCounters = function(start, counter) {
+    var self = this,
+        numCounters = counter.length,
+        end = self._row.length,
+        isWhite = !self._row[start],
+        i,
+        counterPos = 0;
+
+    ArrayHelper.init(counter, 0);
+
+    for ( i = start; i < end; i++) {
+        if (self._row[i] ^ isWhite) {
+            counter[counterPos]++;
+        } else {
+            counterPos++;
+            if (counterPos === numCounters) {
+                break;
+            } else {
+                counter[counterPos] = 1;
+                isWhite = !isWhite;
+            }
+        }
+    }
+
+    return counter;
+};
+
 Object.defineProperty(BarcodeReader.prototype, "FORMAT", {
     value: 'unknown',
     writeable: false

src/reader/code_39_reader.js

@@ -20,33 +20,6 @@ var properties = {
 Code39Reader.prototype = Object.create(BarcodeReader.prototype, properties);
 Code39Reader.prototype.constructor = Code39Reader;
 
-Code39Reader.prototype._toCounters = function(start, counter) {
-    var self = this,
-        numCounters = counter.length,
-        end = self._row.length,
-        isWhite = !self._row[start],
-        i,
-        counterPos = 0;
-
-    ArrayHelper.init(counter, 0);
-
-    for ( i = start; i < end; i++) {
-        if (self._row[i] ^ isWhite) {
-            counter[counterPos]++;
-        } else {
-            counterPos++;
-            if (counterPos === numCounters) {
-                break;
-            } else {
-                counter[counterPos] = 1;
-                isWhite = !isWhite;
-            }
-        }
-    }
-
-    return counter;
-};
-
 Code39Reader.prototype._decode = function() {
     var self = this,
         counters = [0, 0, 0, 0, 0, 0, 0, 0, 0],

src/reader/code_93_reader.js

@@ -0,0 +1,251 @@
+import BarcodeReader from './barcode_reader';
+import ArrayHelper from '../common/array_helper';
+
+function Code93Reader() {
+    BarcodeReader.call(this);
+}
+
+const ALPHABETH_STRING = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ-. $/+%abcd*";
+
+var properties = {
+    ALPHABETH_STRING: {value: ALPHABETH_STRING},
+    ALPHABET: {value: ALPHABETH_STRING.split('').map(char => char.charCodeAt(0))},
+    CHARACTER_ENCODINGS: {value: [
+        0x114, 0x148, 0x144, 0x142, 0x128, 0x124, 0x122, 0x150, 0x112, 0x10A,
+        0x1A8, 0x1A4, 0x1A2, 0x194, 0x192, 0x18A, 0x168, 0x164, 0x162, 0x134,
+        0x11A, 0x158, 0x14C, 0x146, 0x12C, 0x116, 0x1B4, 0x1B2, 0x1AC, 0x1A6,
+        0x196, 0x19A, 0x16C, 0x166, 0x136, 0x13A, 0x12E, 0x1D4, 0x1D2, 0x1CA,
+        0x16E, 0x176, 0x1AE, 0x126, 0x1DA, 0x1D6, 0x132, 0x15E
+    ]},
+    ASTERISK: {value: 0x15E},
+    FORMAT: {value: "code_93", writeable: false}
+};
+
+Code93Reader.prototype = Object.create(BarcodeReader.prototype, properties);
+Code93Reader.prototype.constructor = Code93Reader;
+
+Code93Reader.prototype._decode = function() {
+    var self = this,
+        counters = [0, 0, 0, 0, 0, 0],
+        result = [],
+        start = self._findStart(),
+        decodedChar,
+        lastStart,
+        pattern,
+        nextStart;
+
+    if (!start) {
+        return null;
+    }
+    nextStart = self._nextSet(self._row, start.end);
+
+    do {
+        counters = self._toCounters(nextStart, counters);
+        pattern = self._toPattern(counters);
+        if (pattern < 0) {
+            return null;
+        }
+        decodedChar = self._patternToChar(pattern);
+        if (decodedChar < 0){
+            return null;
+        }
+        result.push(decodedChar);
+        lastStart = nextStart;
+        nextStart += ArrayHelper.sum(counters);
+        nextStart = self._nextSet(self._row, nextStart);
+    } while (decodedChar !== '*');
+    result.pop();
+
+    if (!result.length) {
+        return null;
+    }
+
+    if (!self._verifyEnd(lastStart, nextStart, counters)) {
+        return null;
+    }
+
+    if (!self._verifyChecksums(result)) {
+        return null;
+    }
+
+    result = result.slice(0, result.length - 2);
+    if ((result = self._decodeExtended(result)) === null) {
+        return null;
+    };
+
+    return {
+        code: result.join(""),
+        start: start.start,
+        end: nextStart,
+        startInfo: start,
+        decodedCodes: result
+    };
+};
+
+Code93Reader.prototype._verifyEnd = function(lastStart, nextStart) {
+    if (lastStart === nextStart || !this._row[nextStart]) {
+        return false;
+    }
+    return true;
+};
+
+Code93Reader.prototype._patternToChar = function(pattern) {
+    var i,
+        self = this;
+
+    for (i = 0; i < self.CHARACTER_ENCODINGS.length; i++) {
+        if (self.CHARACTER_ENCODINGS[i] === pattern) {
+            return String.fromCharCode(self.ALPHABET[i]);
+        }
+    }
+    return -1;
+};
+
+Code93Reader.prototype._toPattern = function(counters) {
+    const numCounters = counters.length;
+    let pattern = 0;
+    let sum = 0;
+    for (let i = 0; i < numCounters; i++) {
+        sum += counters[i];
+    }
+
+    for (let i = 0; i < numCounters; i++) {
+        let normalized = Math.round(counters[i] * 9 / sum);
+        if (normalized < 1 || normalized > 4) {
+            return -1;
+        }
+        if ((i & 1) === 0) {
+            for (let j = 0; j < normalized; j++) {
+                pattern = (pattern << 1) | 1;
+            }
+        } else {
+            pattern <<= normalized;
+        }
+    }
+
+    return pattern;
+};
+
+Code93Reader.prototype._findStart = function() {
+    var self = this,
+        offset = self._nextSet(self._row),
+        patternStart = offset,
+        counter = [0, 0, 0, 0, 0, 0],
+        counterPos = 0,
+        isWhite = false,
+        i,
+        j,
+        whiteSpaceMustStart;
+
+    for ( i = offset; i < self._row.length; i++) {
+        if (self._row[i] ^ isWhite) {
+            counter[counterPos]++;
+        } else {
+            if (counterPos === counter.length - 1) {
+                // find start pattern
+                if (self._toPattern(counter) === self.ASTERISK) {
+                    whiteSpaceMustStart = Math.floor(Math.max(0, patternStart - ((i - patternStart) / 4)));
+                    if (self._matchRange(whiteSpaceMustStart, patternStart, 0)) {
+                        return {
+                            start: patternStart,
+                            end: i
+                        };
+                    }
+                }
+
+                patternStart += counter[0] + counter[1];
+                for ( j = 0; j < 4; j++) {
+                    counter[j] = counter[j + 2];
+                }
+                counter[4] = 0;
+                counter[5] = 0;
+                counterPos--;
+            } else {
+                counterPos++;
+            }
+            counter[counterPos] = 1;
+            isWhite = !isWhite;
+        }
+    }
+    return null;
+};
+
+Code93Reader.prototype._decodeExtended = function(charArray) {
+    const length = charArray.length;
+    const result = [];
+    for (let i = 0; i < length; i++) {
+        const char = charArray[i];
+        if (char >= 'a' && char <= 'd') {
+            if (i > (length - 2)) {
+                return null;
+            }
+            const nextChar = charArray[++i];
+            const nextCharCode = nextChar.charCodeAt(0);
+            let decodedChar;
+            switch (char) {
+            case 'a':
+                if (nextChar >= 'A' && nextChar <= 'Z') {
+                    decodedChar = String.fromCharCode(nextCharCode - 64);
+                } else {
+                    return null;
+                }
+                break;
+            case 'b':
+                if (nextChar >= 'A' && nextChar <= 'E') {
+                    decodedChar = String.fromCharCode(nextCharCode - 38);
+                } else if (nextChar >= 'F' && nextChar <= 'J') {
+                    decodedChar = String.fromCharCode(nextCharCode - 11);
+                } else if (nextChar >= 'K' && nextChar <= 'O') {
+                    decodedChar = String.fromCharCode(nextCharCode + 16);
+                } else if (nextChar >= 'P' && nextChar <= 'S') {
+                    decodedChar = String.fromCharCode(nextCharCode + 43);
+                } else if (nextChar >= 'T' && nextChar <= 'Z') {
+                    decodedChar = String.fromCharCode(127);
+                } else {
+                    return null;
+                }
+                break;
+            case 'c':
+                if (nextChar >= 'A' && nextChar <= 'O') {
+                    decodedChar = String.fromCharCode(nextCharCode - 32);
+                } else if (nextChar === 'Z') {
+                    decodedChar = ':';
+                } else {
+                    return null;
+                }
+                break;
+            case 'd':
+                if (nextChar >= 'A' && nextChar <= 'Z') {
+                    decodedChar = String.fromCharCode(nextCharCode + 32);
+                } else {
+                    return null;
+                }
+                break;
+            }
+            result.push(decodedChar);
+        } else {
+            result.push(char);
+        }
+    }
+    return result;
+};
+
+Code93Reader.prototype._verifyChecksums = function(charArray) {
+    return this._matchCheckChar(charArray, charArray.length - 2, 20)
+        && this._matchCheckChar(charArray, charArray.length - 1, 15);
+};
+
+Code93Reader.prototype._matchCheckChar = function(charArray, index, maxWeight) {
+    const arrayToCheck = charArray.slice(0, index);
+    const length = arrayToCheck.length;
+    const weightedSums = arrayToCheck.reduce((sum, char, i) => {
+        const weight = (((i * -1) + (length - 1)) % maxWeight) + 1;
+        const value = this.ALPHABET.indexOf(char.charCodeAt(0));
+        return sum + (weight * value);
+    }, 0);
+
+    const checkChar = this.ALPHABET[(weightedSums % 47)];
+    return checkChar === charArray[index].charCodeAt(0);
+};
+
+export default Code93Reader;

tasks/uglyasm.js

@@ -10,9 +10,9 @@ module.exports = function(grunt) {
     grunt.registerTask('uglyasm', function() {
         var code = fs.readFileSync('dist/quagga.js', 'utf-8'),
             minifiedCode = fs.readFileSync('dist/quagga.min.js', 'utf-8'),
-            commentEnd = '/* @preserve ASM END */',
+            commentEnd = '@preserve ASM END',
-            moduleFunctionRegex = /function\s*\((\w+,\s*\w+,\s*\w+)\)\s*\{\s*\/\* \@preserve ASM BEGIN \*\//,
+            moduleFunctionRegex = /function\s*\((\w+,\s*\w+,\s*\w+)\)\s*\{(\n?\s*\"use strict\";?)*\n?\/\*\s*\@preserve ASM BEGIN/,
-            commentStartIdx = code.indexOf("/* @preserve ASM BEGIN */"),
+            commentStartIdx = code.indexOf("@preserve ASM BEGIN"),
             asmEndIdxTmp = code.indexOf(commentEnd),
             asmEndIdx = code.indexOf("}", asmEndIdxTmp),
             asmCodeTmp = code.substring(commentStartIdx - Math.min(500, commentStartIdx),
@@ -30,8 +30,6 @@ module.exports = function(grunt) {
             .replace(/ ([+=^|&]|>+|<+) /g, '$1') // remove spaces around operators
             .replace(/[\r\n/]/g, ''); // remove new lines
 
-        grunt.log.debug(asmCodeMinified);
-
         asmModule = moduleFunctionRegex.exec(asmCode);
         if (!asmModule) {
             grunt.log.error("No ASM module found");

test/integration/integration.spec.js

@@ -304,4 +304,78 @@ describe('decodeSingle', function () {
         });
         _runTestSet(testSet, config);
     });
+
+    describe("2of5", function() {
+        var config = config = {
+                inputStream: {
+                    size: 800,
+                    singleChannel: false
+                },
+                locator: {
+                    patchSize: "medium",
+                    halfSample: true
+                },
+                numOfWorkers: 0,
+                decoder: {
+                    readers: ["2of5_reader"]
+                },
+                locate: true,
+                src: null
+            },
+            testSet = [
+                {"name": "image-001.jpg", "result": "9577149002"},
+                {"name": "image-002.jpg", "result": "9577149002"},
+                {"name": "image-003.jpg", "result": "5776158811"},
+                {"name": "image-004.jpg", "result": "0463381455"},
+                {"name": "image-005.jpg", "result": "3261594101"},
+                {"name": "image-006.jpg", "result": "3261594101"},
+                {"name": "image-007.jpg", "result": "3261594101"},
+                {"name": "image-008.jpg", "result": "6730705801"},
+                {"name": "image-009.jpg", "result": "5776158811"},
+                {"name": "image-010.jpg", "result": "5776158811"}
+            ];
+
+        testSet.forEach(function(sample) {
+            sample.format = "2of5";
+        });
+
+        _runTestSet(testSet, config);
+    });
+
+    describe("code_93", function() {
+        var config = config = {
+                inputStream: {
+                    size: 800,
+                    singleChannel: false
+                },
+                locator: {
+                    patchSize: "large",
+                    halfSample: true
+                },
+                numOfWorkers: 0,
+                decoder: {
+                    readers: ["code_93_reader"]
+                },
+                locate: true,
+                src: null
+            },
+            testSet = [
+                {"name": "image-001.jpg", "result": "WIWV8ETQZ1"},
+                {"name": "image-002.jpg", "result": "EH3C-%GU23RK3"},
+                {"name": "image-003.jpg", "result": "O308SIHQOXN5SA/PJ"},
+                {"name": "image-004.jpg", "result": "DG7Q$TV8JQ/EN"},
+                {"name": "image-005.jpg", "result": "DG7Q$TV8JQ/EN"},
+                {"name": "image-006.jpg", "result": "O308SIHQOXN5SA/PJ"},
+                {"name": "image-007.jpg", "result": "VOFD1DB5A.1F6QU"},
+                {"name": "image-008.jpg", "result": "WIWV8ETQZ1"},
+                {"name": "image-009.jpg", "result": "4SO64P4X8 U4YUU1T-"},
+                {"name": "image-010.jpg", "result": "4SO64P4X8 U4YUU1T-"}
+            ];
+
+        testSet.forEach(function(sample) {
+            sample.format = "code_93";
+        });
+
+        _runTestSet(testSet, config);
+    });
 });

test/mocks/mediaDevices.js

@@ -0,0 +1,36 @@
+
+let devices = [],
+    stream,
+    _constraints,
+    _supported = true;
+
+export function enumerateDevices() {
+    console.log("enumerateDevices!!!!");
+    return Promise.resolve(devices);
+};
+
+export function getUserMedia(constraints) {
+    console.log("getUserMedia!!!!");
+    _constraints = constraints;
+    if (_supported) {
+        return Promise.resolve(stream);
+    }
+    return Promise.reject(new Error("das"));
+}
+
+export function setDevices(newDevices) {
+    devices = [...newDevices];
+}
+
+export function setStream(newStream) {
+    stream = newStream;
+}
+
+export function getConstraints() {
+    return _constraints;
+}
+
+export function setSupported(supported) {
+    console.log("Supported: " + supported);
+    _supported = supported;
+}

test/spec/camera_access.spec.js

@@ -1,177 +1,157 @@
-import CameraAccess from '../../src/input/camera_access';
+import CameraAccess, {pickConstraints} from '../../src/input/camera_access';
+import {setDevices, setStream, getConstraints, setSupported} from 'mediaDevices';
 
 var originalURL,
     originalMediaStreamTrack,
     video,
-    stream;
+    stream,
-
+    devices = [];
-beforeEach(function() {
-    var tracks = [{
-        stop: function() {}
-    }];
-
-    originalURL = window.URL;
-    originalMediaStreamTrack = window.MediaStreamTrack;
-    window.MediaStreamTrack = {};
-    window.URL = {
-        createObjectURL(stream) {
-            return stream;
-        }
-    };
-
-    stream = {
-        getVideoTracks: function() {
-            return tracks;
-        }
-    };
-    sinon.spy(tracks[0], "stop");
-
-    video = {
-        srcObject: null,
-        addEventListener: function() {},
-        removeEventListener: function() {},
-        setAttribute: sinon.spy(),
-        play: function() {},
-        videoWidth: 320,
-        videoHeight: 480
-    };
-    sinon.stub(video, "addEventListener", function(event, cb) {
-        cb();
-    });
-    sinon.stub(video, "play");
-});
-
-afterEach(function() {
-    window.URL = originalURL;
-    window.MediaStreamTrack = originalMediaStreamTrack;
-});
 
-describe('success', function() {
+describe("camera_access", () => {
     beforeEach(function() {
-        sinon.stub(navigator.mediaDevices, "getUserMedia", function(constraints) {
+        var tracks = [{
-            return Promise.resolve(stream);
+            stop: function() {}
+        }];
+
+        originalURL = window.URL;
+        originalMediaStreamTrack = window.MediaStreamTrack;
+        window.MediaStreamTrack = {};
+        window.URL = {
+            createObjectURL(stream) {
+                return stream;
+            }
+        };
+
+        stream = {
+            getVideoTracks: function() {
+                return tracks;
+            }
+        };
+        setStream(stream);
+        sinon.spy(tracks[0], "stop");
+
+        video = {
+            srcObject: null,
+            addEventListener: function() {},
+            removeEventListener: function() {},
+            setAttribute: sinon.spy(),
+            play: function() {},
+            videoWidth: 320,
+            videoHeight: 480
+        };
+        sinon.stub(video, "addEventListener", function(event, cb) {
+            cb();
         });
+        sinon.stub(video, "play");
     });
 
     afterEach(function() {
-        navigator.mediaDevices.getUserMedia.restore();
+        window.URL = originalURL;
+        window.MediaStreamTrack = originalMediaStreamTrack;
     });
-    describe('request', function () {
-        it('should request the camera', function (done) {
-            CameraAccess.request(video, {})
-            .then(function () {
-                expect(navigator.mediaDevices.getUserMedia.calledOnce).to.equal(true);
-                expect(video.srcObject).to.deep.equal(stream);
-                done();
-            })
-        });
 
-        it("should allow deprecated constraints to be used", (done) => {
+    describe('success', function() {
-            CameraAccess.request(video, {
+        describe('request', function () {
-                width: 320,
+            it('should request the camera', function (done) {
-                height: 240,
+                CameraAccess.request(video, {})
-                facing: "user",
+                .then(function () {
-                minAspectRatio: 2,
+                    expect(video.srcObject).to.deep.equal(stream);
-                maxAspectRatio: 100
+                    done();
-            })
+                })
-            .then(function () {
+            });
-                const call = navigator.mediaDevices.getUserMedia.getCall(0),
-                    args = call.args;
-                expect(call).to.be.defined;
-                expect(args[0].video.width).to.equal(320);
-                expect(args[0].video.height).to.equal(240);
-                expect(args[0].video.facingMode).to.equal("user");
-                expect(args[0].video.aspectRatio).to.equal(2);
-                expect(args[0].video.facing).not.to.be.defined;
-                expect(args[0].video.minAspectRatio).not.to.be.defined;
-                expect(args[0].video.maxAspectRatio).not.to.be.defined;
-                done();
-            })
-        });
-    });
-
-    describe('facingMode fallback in Chrome', () => {
-        beforeEach(() => {
-            window.MediaStreamTrack.getSources = (cb) => {
-                return cb([
-                    {kind: "video", facing: "environment", id: "environment"},
-                    {kind: "audio", id: "audio"},
-                    {kind: "video", facing: "user", id: "user"}
-                ]);
-            };
-        });
 
-        afterEach(() => {
+            it("should allow deprecated constraints to be used", (done) => {
-            window.MediaStreamTrack = {};
+                CameraAccess.request(video, {
-        })
+                    width: 320,
-
+                    height: 240,
-        it("should set deviceId in case facingMode is not supported", (done) => {
+                    facing: "user",
-            CameraAccess.request(video, {
+                    minAspectRatio: 2,
-                facing: "user"
+                    maxAspectRatio: 100
-            })
+                })
-            .then(function () {
+                .then(function () {
-                const call = navigator.mediaDevices.getUserMedia.getCall(0),
+                    const constraints = getConstraints();
-                    args = call.args;
+                    expect(constraints.video.width).to.equal(320);
-                expect(call).to.be.defined;
+                    expect(constraints.video.height).to.equal(240);
-                expect(args[0].video.facingMode).not.to.be.defined;
+                    expect(constraints.video.facingMode).to.equal("user");
-                expect(args[0].video.deviceId).to.equal("user");
+                    expect(constraints.video.aspectRatio).to.equal(2);
-                done();
+                    expect(constraints.video.facing).not.to.be.defined;
-            })
+                    expect(constraints.video.minAspectRatio).not.to.be.defined;
+                    expect(constraints.video.maxAspectRatio).not.to.be.defined;
+                    done();
+                })
+            });
         });
-    });
 
-    describe('release', function () {
+        describe('release', function () {
-        it('should release the camera', function (done) {
+            it('should release the camera', function (done) {
-            CameraAccess.request(video, {})
+                CameraAccess.request(video, {})
-            .then(function () {
+                .then(function () {
-                expect(video.srcObject).to.deep.equal(stream);
+                    expect(video.srcObject).to.deep.equal(stream);
-                CameraAccess.release();
+                    CameraAccess.release();
-                expect(video.srcObject.getVideoTracks()).to.have.length(1);
+                    expect(video.srcObject.getVideoTracks()).to.have.length(1);
-                expect(video.srcObject.getVideoTracks()[0].stop.calledOnce).to.equal(true);
+                    expect(video.srcObject.getVideoTracks()[0].stop.calledOnce).to.equal(true);
-                done();
+                    done();
+                });
             });
         });
     });
-});
 
-describe('failure', function() {
+    describe('failure', function() {
-    describe("permission denied", function(){
+        beforeEach(() => {
-        beforeEach(function() {
+            setSupported(false);
-            sinon.stub(navigator.mediaDevices, "getUserMedia", function(constraints, success, failure) {
-                return Promise.reject(new Error());
-            });
         });
 
-        afterEach(function() {
+        afterEach(() => {
-            navigator.mediaDevices.getUserMedia.restore();
+            setSupported(true);
         });
 
-        it('should throw if getUserMedia not available', function(done) {
+        describe("permission denied", function(){
-            CameraAccess.request(video, {})
+            it('should throw if getUserMedia not available', function(done) {
-            .catch(function (err) {
+                CameraAccess.request(video, {})
-                expect(err).to.be.defined;
+                .catch(function (err) {
-                done();
+                    expect(err).to.be.defined;
+                    done();
+                });
             });
         });
-    });
 
-    describe("not available", function(){
+        describe("not available", function(){
-        var originalGetUserMedia;
+            var originalGetUserMedia;
 
-        beforeEach(function() {
+            it('should throw if getUserMedia not available', function(done) {
-            originalGetUserMedia = navigator.mediaDevices.getUserMedia;
+                CameraAccess.request(video, {})
-            navigator.mediaDevices.getUserMedia = undefined;
+                .catch((err) => {
+                    expect(err).to.be.defined;
+                    done();
+                });
+            });
         });
 
-        afterEach(function() {
+        describe("pickConstraints", () => {
-            navigator.mediaDevices.getUserMedia = originalGetUserMedia;
+            it("should return the given constraints if no facingMode is defined", (done) => {
-        });
+                const givenConstraints = {width: 180};
+                return pickConstraints(givenConstraints).then((actualConstraints) => {
+                    expect(actualConstraints.video).to.deep.equal(givenConstraints);
+                    done();
+                })
+                .catch((err) => {
+                    expect(err).to.equal(null);
+                    console.log(err);
+                    done();
+                });
+            });
 
-        it('should throw if getUserMedia not available', function(done) {
+            it("should return the given constraints if deviceId is defined", (done) => {
-            CameraAccess.request(video, {})
+                const givenConstraints = {width: 180, deviceId: "4343"};
-            .catch((err) => {
+                return pickConstraints(givenConstraints).then((actualConstraints) => {
-                expect(err).to.be.defined;
+                    expect(actualConstraints.video).to.deep.equal(givenConstraints);
-                done();
+                    done();
+                })
+                .catch((err) => {
+                    expect(err).to.equal(null);
+                    console.log(err);
+                    done();
+                });
             });
         });
     });

test/spec/result_collector.spec.js

@@ -5,99 +5,102 @@ var canvasMock,
     imageSize,
     config;
 
-beforeEach(function() {
-    imageSize = {x: 320, y: 240};
-    config = {
-        capture: true,
-        capacity: 20,
-        blacklist: [{code: "3574660239843", format: "ean_13"}],
-        filter: function() {
-            return true;
-        }
-    };
-    canvasMock = {
-        getContext: function() {
-            return {};
-        },
-        toDataURL: sinon.spy(),
-        width: 0,
-        height: 0
-    };
-    sinon.stub(document, "createElement", function(type) {
-        if (type === "canvas") {
-            return canvasMock;
-        }
-    });
-});
-
-afterEach(function() {
-    document.createElement.restore();
-});
-
-
-describe('create', function () {
-    it("should return a new collector", function() {
-        ResultCollector.create(config);
-        expect(document.createElement.calledOnce).to.be.equal(true);
-        expect(document.createElement.getCall(0).args[0]).to.equal("canvas");
-    });
-});
 
-describe('addResult', function() {
+describe("resultCollector", () => {
     beforeEach(function() {
-        sinon.stub(ImageDebug, "drawImage", function() {});
+        imageSize = {x: 320, y: 240};
+        config = {
+            capture: true,
+            capacity: 20,
+            blacklist: [{code: "3574660239843", format: "ean_13"}],
+            filter: function() {
+                return true;
+            }
+        };
+        canvasMock = {
+            getContext: function() {
+                return {};
+            },
+            toDataURL: sinon.spy(),
+            width: 0,
+            height: 0
+        };
+        sinon.stub(document, "createElement", function(type) {
+            if (type === "canvas") {
+                return canvasMock;
+            }
+        });
     });
 
     afterEach(function() {
-        ImageDebug.drawImage.restore();
+        document.createElement.restore();
     });
 
-    it("should not add result if capacity is full", function(){
+
-        config.capacity = 1;
+    describe('create', function () {
-        var collector = ResultCollector.create(config);
+        it("should return a new collector", function() {
-        collector.addResult([], imageSize, {});
+            ResultCollector.create(config);
-        collector.addResult([], imageSize, {});
+            expect(document.createElement.calledOnce).to.be.equal(true);
-        collector.addResult([], imageSize, {});
+            expect(document.createElement.getCall(0).args[0]).to.equal("canvas");
-        expect(collector.getResults()).to.have.length(1);
+        });
     });
 
-    it("should only add results which match constraints", function(){
+    describe('addResult', function() {
-        var collector = ResultCollector.create(config),
+        beforeEach(function() {
-            results;
+            sinon.stub(ImageDebug, "drawImage", function() {});
+        });
+
+        afterEach(function() {
+            ImageDebug.drawImage.restore();
+        });
+
+        it("should not add result if capacity is full", function(){
+            config.capacity = 1;
+            var collector = ResultCollector.create(config);
+            collector.addResult([], imageSize, {});
+            collector.addResult([], imageSize, {});
+            collector.addResult([], imageSize, {});
+            expect(collector.getResults()).to.have.length(1);
+        });
 
-        collector.addResult([], imageSize, {code: "423423443", format: "ean_13"});
+        it("should only add results which match constraints", function(){
-        collector.addResult([], imageSize, {code: "3574660239843", format: "ean_13"});
+            var collector = ResultCollector.create(config),
-        collector.addResult([], imageSize, {code: "3574660239843", format: "code_128"});
+                results;
 
-        results = collector.getResults();
+            collector.addResult([], imageSize, {code: "423423443", format: "ean_13"});
-        expect(results).to.have.length(2);
+            collector.addResult([], imageSize, {code: "3574660239843", format: "ean_13"});
+            collector.addResult([], imageSize, {code: "3574660239843", format: "code_128"});
 
-        results.forEach(function(result) {
+            results = collector.getResults();
-            expect(result).not.to.deep.equal(config.blacklist[0]);
+            expect(results).to.have.length(2);
+
+            results.forEach(function(result) {
+                expect(result).not.to.deep.equal(config.blacklist[0]);
+            });
         });
-    });
 
-    it("should add result if no filter is set", function() {
+        it("should add result if no filter is set", function() {
-        delete config.filter;
+            delete config.filter;
-        var collector = ResultCollector.create(config);
+            var collector = ResultCollector.create(config);
 
-        collector.addResult([], imageSize, {code: "423423443", format: "ean_13"});
+            collector.addResult([], imageSize, {code: "423423443", format: "ean_13"});
-        expect(collector.getResults()).to.have.length(1);
+            expect(collector.getResults()).to.have.length(1);
-    });
+        });
 
-    it("should not add results if filter returns false", function() {
+        it("should not add results if filter returns false", function() {
-        config.filter = () => (false);
+            config.filter = () => (false);
-        var collector = ResultCollector.create(config);
+            var collector = ResultCollector.create(config);
 
-        collector.addResult([], imageSize, {code: "423423443", format: "ean_13"});
+            collector.addResult([], imageSize, {code: "423423443", format: "ean_13"});
-        expect(collector.getResults()).to.have.length(0);
+            expect(collector.getResults()).to.have.length(0);
-    });
+        });
 
-    it("should add result if no blacklist is set", function() {
+        it("should add result if no blacklist is set", function() {
-        delete config.blacklist;
+            delete config.blacklist;
-        var collector = ResultCollector.create(config);
+            var collector = ResultCollector.create(config);
 
-        collector.addResult([], imageSize, {code: "3574660239843", format: "ean_13"});
+            collector.addResult([], imageSize, {code: "3574660239843", format: "ean_13"});
-        expect(collector.getResults()).to.have.length(1);
+            expect(collector.getResults()).to.have.length(1);
+        });
     });
-});
+})

type-definitions/quagga.d.ts

@@ -1,9 +1,11 @@
-// Type definitions for QuaggaJS v2015.05.20 Project:
+// Type definitions for QuaggaJS v0.12.1 (2017-10-19)
-// http://serratus.github.io/quaggaJS/ Definitions by: Cam Birch, Peter
+// Project: http://serratus.github.io/quaggaJS/
-// Horwood aka Madman Pierre
+// Definitions by: Cam Birch, Peter Horwood aka Madman Pierre, Dan Manastireanu <https://github.com/danmana>
 
-declare var Quagga: QuaggaJSStatic;
+declare module "quagga" {
-export default Quagga;
+    var Quagga: QuaggaJSStatic;
+    export default Quagga;
+}
 
 interface QuaggaJSStatic {
     /**
@@ -72,7 +74,7 @@ interface QuaggaJSStatic {
 
     ResultCollector: QuaggaJSResultCollector;
     registerResultCollector(resultCollector: QuaggaJSResultCollector): void;
-    setReaders(readers: any): void;
+    setReaders(readers: (QuaggaJSReaderConfig | string)[]): void;
 
     /**
      * In contrast to the calls described
@@ -108,6 +110,24 @@ interface QuaggaJSStatic {
             overlay: HTMLCanvasElement
         }
     };
+
+    CameraAccess: QuaggaJSCameraAccess;
+}
+
+
+/**
+ * Used for accessing information about the active stream track and available video devices.
+ */
+interface QuaggaJSCameraAccess {
+    request(video: HTMLVideoElement, videoConstraints: QuaggaJSConstraints): Promise<void>;
+
+    release(): void;
+
+    enumerateVideoDevices(): Promise<MediaDeviceInfo[]>;
+
+    getActiveStreamLabel(): string;
+
+    getActiveTrack(): MediaStreamTrack;
 }
 
 /**
@@ -217,7 +237,7 @@ interface QuaggaJSResultCollector {
     /*
      * a static function that returns you a ResultCollector
      */
-    create?(QuaggaJSResultCollector): QuaggaJSResultCollector;
+    create?(param: QuaggaJSResultCollector): QuaggaJSResultCollector;
 
     getResults?(): QuaggaJSCodeResult[];
 }
@@ -291,7 +311,9 @@ interface QuaggaJSConfigObject {
      * Ex: '/test/fixtures/code_128/image-001.jpg'
      * or: 'data:image/jpg;base64,' + data
      */
-    src?: string; inputStream?: {
+    src?: string;
+
+    inputStream?: {
         /**
          * @default "Live"
          */
@@ -301,33 +323,10 @@ interface QuaggaJSConfigObject {
          * @default "LiveStream"
          */
         type?: string;
+		
+		target?: HTMLElement,
 
-        constraints?: {
+        constraints?: QuaggaJSConstraints;
-            /**
-             * @default 640
-             */
-            width?: number;
-
-            /**
-             * @default 480
-             */
-            height?: number;
-
-            /**
-             * In cases where height/width does not suffice
-             */
-            aspectRatio?: number
-
-            /**
-             * @default "environment"
-             */
-            facingMode?: string;
-
-            /**
-             * Explicitly set the camera to the user's choice
-             */
-            deviceId?: string
-        };
 
         /**
          * defines rectangle of the detection/localization area. Useful when you
@@ -380,11 +379,19 @@ interface QuaggaJSConfigObject {
      */
     numOfWorkers?: number;
 
+    /**
+     * This top-level property controls the scan-frequency of the video-stream.
+     * It’s optional and defines the maximum number of scans per second.
+     * This renders useful for cases where the scan-session is long-running and
+     * resources such as CPU power are of concern.
+     */
+    frequency?: number;
+
     decoder?: {
         /**
          * @default [ "code_128_reader" ]
          */
-        readers?: string[];
+        readers?: (QuaggaJSReaderConfig | string)[];
 
         debug?: {
             /**
@@ -406,7 +413,15 @@ interface QuaggaJSConfigObject {
              * @default false
              */
             showPattern?: boolean;
-        }
+        };
+
+        /**
+         * The multiple property tells the decoder if it should continue decoding after finding a valid barcode.
+         * If multiple is set to true, the results will be returned as an array of result objects.
+         * Each object in the array will have a box, and may have a codeResult
+         * depending on the success of decoding the individual box.
+         */
+        multiple?: boolean;
     };
 
     locator?: {
@@ -476,3 +491,40 @@ interface QuaggaJSConfigObject {
         }
     };
 }
+
+interface QuaggaJSConstraints {
+    /**
+     * @default 640
+     */
+    width?: number;
+
+    /**
+     * @default 480
+     */
+    height?: number;
+
+    /**
+     * In cases where height/width does not suffice
+     */
+    aspectRatio?: number
+
+    /**
+     * @default "environment"
+     */
+    facingMode?: string;
+
+    /**
+     * Explicitly set the camera to the user's choice
+     */
+    deviceId?: string
+}
+
+/**
+ * Used for extending a reader with supplements (ex: EAN-2, EAN-5)
+ */
+interface QuaggaJSReaderConfig {
+    format: string;
+    config: {
+        supplements: string[];
+    }
+}

webpack.config.js

@@ -17,6 +17,7 @@ module.exports = {
     resolve: {
         modules: [
             path.resolve('./src/input/'),
+            path.resolve('./src/common/'),
             'node_modules'
         ]
     },

webpack.config.min.js

@@ -10,14 +10,11 @@ module.exports.plugins = module.exports.plugins.concat([
       compress: {
         warnings: false
       },
-      output: {
-        comments: /@preserve/
-      },
       sourceMap: false
     }),
 ]);
 
 module.exports.output.filename = 'quagga.min.js';
 
-module.exports.output.sourceMapFilename = null;
+module.exports.output.sourceMapFilename = '';
-module.exports.devtool = null;
+module.exports.devtool = false;

webpack.node.config.js

@@ -6,6 +6,7 @@ module.exports = require('./webpack.config.js');
 module.exports.resolve = {
     modules: [
         path.resolve('./lib/'),
+        path.resolve('./src/common/'),
         'node_modules'
     ]
 };