@thsq/thsq-prod-tests - npm Package Compare versions

Comparing version 1.0.0 to 1.0.3

package.json

 {
   "name": "@thsq/thsq-prod-tests",
-  "version": "1.0.0",
+  "version": "1.0.3",
   "description": "Thingsquare production tester",
@@ -16,3 +16,2 @@ "main": "thsq-prod-tests.js",
     "getopts": "^2.3.0",
-    "live-server": "^1.2.1",
     "serialport": "^9.2.4",
@@ -19,0 +18,0 @@ "thsq": "^2.2.0"

thsq-prod-tests.js

@@ -11,3 +11,3 @@ #!/usr/bin/env node
 var fs = require('fs');
-var liveServer = require("live-server");
+//var liveServer = require("live-server");
 var serialport = require('serialport');
@@ -25,5 +25,3 @@
 
-function run() {
-    var getopts = require('getopts');
-
+function run(cmdlineoptions) {
     function usage() {
@@ -40,3 +38,3 @@ var npm_pkg_version = require('./package.json').version;
         console.info();
-        console.info('optional: --webserver [port]: report test progress via local web interface');
+        // console.info('optional: --webserver [port]: report test progress via local web interface');
         console.info('optional: --tests <comma-separated list of test codes>: default init,rssi,flash,done');
@@ -46,19 +44,2 @@ console.info('optional: --onerror <test code, or false>: test code to send to devices that report errors. default shhh');
 
-    var cmdlineoptions = getopts(process.argv.slice(2), {
-        alias: {
-            frontend: 'f',
-            backend: 'b',
-            usertoken: 'u',
-            help: 'h',
-            verbose: 'v'
-        },
-        default: {
-            usertoken: undefined,
-            tests: 'init,rssi,flash,done',
-            onerror: 'shhh',
-            logdevices: true,
-            verbose: false
-        }
-    });
-
     var euiToUniqueMap;
@@ -225,2 +206,5 @@ if (cmdlineoptions.usertoken) {
         html += '</table>';
+        if (!fs.existsSync('web')){
+            fs.mkdirSync('web');
+        }
         fs.writeFileSync('web/index.html', html);
@@ -234,2 +218,6 @@
          * "test 0012740000010002 rssi -13 len 36 rssi parent -13 dBm (noise -100 dBm)" */
+
+        if (cmdlineoptions.verbose) {
+            console.log(msg);
+        }
         var arr = msg.split(' ');
@@ -257,2 +245,9 @@ if (arr[0] !== 'test' || arr[2] !== 'rssi' || arr[4] !== 'len') {
             }
+        } else if (cmdlineoptions.testProgressCallback && !cmdlineoptions.testProgressCallback(eui, rssi, len, code, msg)) {
+            console.log(eui, '?/' + cmdlineoptions.tests.length, code, 'errored', '"' + msg + '"');
+            action = 'errored';
+            if (cmdlineoptions.onerror && typeof cmdlineoptions.onerror === 'string') {
+                sendTestcode(eui, cmdlineoptions.onerror);
+            }
+            code = 'err';
         } else {
@@ -337,19 +332,21 @@ next = cmdlineoptions.tests[idx + 1];
         usage();
+        console.log();
+        console.log('error: need --serialport or --tcp')
         process.exit(1);
     }
 
-    if (cmdlineoptions.webserver) {
-        if (cmdlineoptions.webserver == true || Number.isNaN(Number(cmdlineoptions.webserver))) {
-            cmdlineoptions.webserver = 8080;
-        }
+    // if (cmdlineoptions.webserver) {
+    //     if (cmdlineoptions.webserver == true || Number.isNaN(Number(cmdlineoptions.webserver))) {
+    //         cmdlineoptions.webserver = 8080;
+    //     }
 
-        pushState();
-        var params = {
-            root: 'web',
-            port: cmdlineoptions.webserver, // Set the server port. Defaults to 8080.
-            file: "web/index.html", // When set, serve this file (server root relative) for every 404 (useful for single-page applications)
-            logLevel: 0,
-        };
-        liveServer.start(params);
-    }
+    //     pushState();
+    //     var params = {
+    //         root: 'web',
+    //         port: cmdlineoptions.webserver, // Set the server port. Defaults to 8080.
+    //         file: "web/index.html", // When set, serve this file (server root relative) for every 404 (useful for single-page applications)
+    //         logLevel: 0,
+    //     };
+    //     liveServer.start(params);
+    // }
 }
@@ -360,3 +357,5 @@
     if (typeof exports !== 'undefined') {
-        /* TODO module.exports. */
+        module.exports = {
+            run: run
+        };
     }
@@ -366,3 +365,23 @@ } else {
     require('console-stamp')(console, { pattern : 'HH:MM:ss.l' });
-    run();
+
+    var getopts = require('getopts');
+
+    var cmdlineoptions = getopts(process.argv.slice(2), {
+        alias: {
+            frontend: 'f',
+            backend: 'b',
+            usertoken: 'u',
+            help: 'h',
+            verbose: 'v'
+        },
+        default: {
+            usertoken: undefined,
+            tests: 'init,rssi,flash,done',
+            onerror: 'shhh',
+            logdevices: true,
+            verbose: false
+        }
+    });
+
+    run(cmdlineoptions);
 }

No alert changes

Improved metrics

Total package byte prevSize

15190

increased by2.62%

Dependency count

5

decreased by-16.67%

Lines of code

386

increased by4.61%

Worsened metrics

Number of package files

4

decreased by-20%

Dependency changes

• + Addedsafe-buffer@5.2.1(transitive)

• + Addedstring_decoder@1.3.0(transitive)

• - Removedlive-server@^1.2.1

• - Removedaccepts@1.3.8(transitive)

• - Removedanymatch@2.0.0(transitive)

• - Removedapache-crypt@1.2.6(transitive)

• - Removedapache-md5@1.1.8(transitive)

• - Removedarr-diff@4.0.0(transitive)

• - Removedarr-flatten@1.1.0(transitive)

• - Removedarr-union@3.1.0(transitive)

• - Removedarray-unique@0.3.2(transitive)

• - Removedassign-symbols@1.0.0(transitive)

• - Removedasync-each@1.0.6(transitive)

• - Removedatob@2.1.2(transitive)

• - Removedbase@0.11.2(transitive)

• - Removedbasic-auth@2.0.1(transitive)

• - Removedbatch@0.6.1(transitive)

• - Removedbcryptjs@2.4.3(transitive)

• - Removedbinary-extensions@1.13.1(transitive)

• - Removedbraces@2.3.2(transitive)

• - Removedcache-base@1.0.1(transitive)

• - Removedchokidar@2.1.8(transitive)

• - Removedclass-utils@0.3.6(transitive)

• - Removedcollection-visit@1.0.0(transitive)

• - Removedcolors@1.4.0(transitive)

• - Removedcomponent-emitter@1.3.1(transitive)

• - Removedconnect@3.7.0(transitive)

• - Removedcopy-descriptor@0.1.1(transitive)

• - Removedcore-util-is@1.0.3(transitive)

• - Removedcors@2.8.5(transitive)

• - Removeddecode-uri-component@0.2.2(transitive)

• - Removeddefine-property@0.2.51.0.02.0.2(transitive)

• - Removeddepd@1.1.22.0.0(transitive)

• - Removeddestroy@1.2.0(transitive)

• - Removedee-first@1.1.1(transitive)

• - Removedencodeurl@1.0.2(transitive)

• - Removedescape-html@1.0.3(transitive)

• - Removedetag@1.8.1(transitive)

• - Removedevent-stream@3.3.4(transitive)

• - Removedexpand-brackets@2.1.4(transitive)

• - Removedextend-shallow@2.0.13.0.2(transitive)

• - Removedextglob@2.0.4(transitive)

• - Removedfaye-websocket@0.11.4(transitive)

• - Removedfill-range@4.0.0(transitive)

• - Removedfinalhandler@1.1.2(transitive)

• - Removedfor-in@1.0.2(transitive)

• - Removedfragment-cache@0.2.1(transitive)

• - Removedfresh@0.5.2(transitive)

• - Removedfsevents@1.2.13(transitive)

• - Removedfunction-bind@1.1.2(transitive)

• - Removedget-value@2.0.6(transitive)

• - Removedglob-parent@3.1.0(transitive)

• - Removedgraceful-fs@4.2.11(transitive)

• - Removedhas-value@0.3.11.0.0(transitive)

• - Removedhas-values@0.1.41.0.0(transitive)

• - Removedhasown@2.0.2(transitive)

• - Removedhttp-auth@3.1.3(transitive)

• - Removedhttp-errors@1.6.32.0.0(transitive)

• - Removedhttp-parser-js@0.5.8(transitive)

• - Removedinherits@2.0.3(transitive)

• - Removedis-accessor-descriptor@1.0.1(transitive)

• - Removedis-binary-path@1.0.1(transitive)

• - Removedis-buffer@1.1.6(transitive)

• - Removedis-data-descriptor@1.0.1(transitive)

• - Removedis-descriptor@0.1.71.0.3(transitive)

• - Removedis-extendable@0.1.11.0.1(transitive)

• - Removedis-extglob@2.1.1(transitive)

• - Removedis-glob@3.1.04.0.3(transitive)

• - Removedis-number@3.0.0(transitive)

• - Removedis-plain-object@2.0.4(transitive)

• - Removedis-windows@1.0.2(transitive)

• - Removedis-wsl@1.1.0(transitive)

• - Removedisarray@1.0.0(transitive)

• - Removedisobject@2.1.03.0.1(transitive)

• - Removedkind-of@3.2.24.0.06.0.3(transitive)

• - Removedlive-server@1.2.2(transitive)

• - Removedmap-cache@0.2.2(transitive)

• - Removedmap-stream@0.1.0(transitive)

• - Removedmap-visit@1.0.0(transitive)

• - Removedmicromatch@3.1.10(transitive)

• - Removedmime@1.6.0(transitive)

• - Removedmixin-deep@1.3.2(transitive)

• - Removedmorgan@1.10.0(transitive)

• - Removedms@2.1.3(transitive)

• - Removednanomatch@1.2.13(transitive)

• - Removednegotiator@0.6.3(transitive)

• - Removednormalize-path@2.1.13.0.0(transitive)

• - Removedobject-assign@4.1.1(transitive)

• - Removedobject-copy@0.1.0(transitive)

• - Removedobject-visit@1.0.1(transitive)

• - Removedobject.pick@1.3.0(transitive)

• - Removedon-finished@2.3.02.4.1(transitive)

• - Removedon-headers@1.0.2(transitive)

• - Removedopn@6.0.0(transitive)

• - Removedparseurl@1.3.3(transitive)

• - Removedpascalcase@0.1.1(transitive)

• - Removedpath-dirname@1.0.2(transitive)

• - Removedpath-is-absolute@1.0.1(transitive)

• - Removedposix-character-classes@0.1.1(transitive)

• - Removedprocess-nextick-args@2.0.1(transitive)

• - Removedproxy-middleware@0.15.0(transitive)

• - Removedrange-parser@1.2.1(transitive)

• - Removedreadable-stream@2.3.8(transitive)

• - Removedreaddirp@2.2.1(transitive)

• - Removedregex-not@1.0.2(transitive)

• - Removedremove-trailing-separator@1.1.0(transitive)

• - Removedrepeat-element@1.1.4(transitive)

• - Removedrepeat-string@1.6.1(transitive)

• - Removedresolve-url@0.2.1(transitive)

• - Removedret@0.1.15(transitive)

• - Removedsafe-buffer@5.1.2(transitive)

• - Removedsafe-regex@1.1.0(transitive)

• - Removedsend@0.18.0(transitive)

• - Removedserve-index@1.9.1(transitive)

• - Removedset-value@2.0.1(transitive)

• - Removedsetprototypeof@1.1.01.2.0(transitive)

• - Removedsnapdragon@0.8.2(transitive)

• - Removedsnapdragon-node@2.1.1(transitive)

• - Removedsnapdragon-util@3.0.1(transitive)

• - Removedsource-map@0.5.7(transitive)

• - Removedsource-map-resolve@0.5.3(transitive)

• - Removedsource-map-url@0.4.1(transitive)

• - Removedsplit@0.3.3(transitive)

• - Removedsplit-string@3.1.0(transitive)

• - Removedstatic-extend@0.1.2(transitive)

• - Removedstatuses@1.5.02.0.1(transitive)

• - Removedstream-combiner@0.0.4(transitive)

• - Removedstring_decoder@1.1.1(transitive)

• - Removedto-object-path@0.3.0(transitive)

• - Removedto-regex@3.0.2(transitive)

• - Removedto-regex-range@2.1.1(transitive)

• - Removedtoidentifier@1.0.1(transitive)

• - Removedunion-value@1.0.1(transitive)

• - Removedunix-crypt-td-js@1.1.4(transitive)

• - Removedunpipe@1.0.0(transitive)

• - Removedunset-value@1.0.0(transitive)

• - Removedupath@1.2.0(transitive)

• - Removedurix@0.1.0(transitive)

• - Removeduse@3.1.1(transitive)

• - Removedutils-merge@1.0.1(transitive)

• - Removedvary@1.1.2(transitive)

• - Removedwebsocket-driver@0.7.4(transitive)

• - Removedwebsocket-extensions@0.1.4(transitive)