Add support for displaying ΔUT1 and ΔTAI. Improve efficacy of AWC_DEBUG_TIME.

Author: kshetline

.eslintignore

@@ -2,3 +2,4 @@ dist
 e2e
 node_modules
 raspberry_pi_setup
+tsc-out

README.md

@@ -11,7 +11,7 @@ To test and build the web client project, you can use the following commands:
 > Note: As of the time of this writing, the build will not work with Node 11 or later on Linux (including Raspbian)
 because of a dependency on `node-sass`. Even when using Node 10.x or earlier you might get some errors with `npm install`
 due to `node-sass`. I found that using `LIBSASS_EXT="no" npm install` helped. If you have a problem, and this doesn't
-fix it, search for solutions based on `node-sass` and any specific error messages you recieve.
+fix it, search for solutions based on `node-sass` and any specific error messages you receive.
 
 
 To run the weather server, use "`npm start`" from within the server directory.

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "aw-clock",
-  "version": "1.2.6",
+  "version": "1.2.7",
   "license": "MIT",
   "author": "Kerry Shetline <kerry@shetline.com>",
   "scripts": {
@@ -9,8 +9,7 @@
     "build-for-dht": "webpack && cd server && npm run build-for-dht && cd .. && cp -Rp dist/ server/dist/public/",
     "test": "karma start ./karma.conf.js",
     "lint": "eslint \"**/*.ts\" \"**/*.js\"",
-    "e2e": "protractor ./protractor.conf.js",
-    "pree2e": "webdriver-manager update --standalone false --gecko false --quiet"
+    "e2e": "protractor ./protractor.conf.js"
   },
   "private": true,
   "dependencies": {
@@ -26,13 +25,13 @@
   },
   "devDependencies": {
     "@types/follow-redirects": "^1.8.0",
-    "@types/jasmine": "^3.5.0",
+    "@types/jasmine": "^3.5.1",
     "@types/jasminewd2": "^2.0.8",
     "@types/jquery": "^3.3.31",
     "@types/js-cookie": "^2.2.4",
-    "@types/node": "^13.1.7",
-    "@typescript-eslint/eslint-plugin": "^2.16.0",
-    "@typescript-eslint/parser": "^2.16.0",
+    "@types/node": "^13.1.8",
+    "@typescript-eslint/eslint-plugin": "^2.17.0",
+    "@typescript-eslint/parser": "^2.17.0",
     "autoprefixer": "^9.7.4",
     "circular-dependency-plugin": "^5.2.0",
     "copy-webpack-plugin": "~5.1.1",
@@ -65,7 +64,7 @@
     "raw-loader": "^4.0.0",
     "sass-loader": "^8.0.2",
     "source-map-loader": "^0.2.4",
-    "style-loader": "^1.1.2",
+    "style-loader": "^1.1.3",
     "stylus-loader": "^3.0.2",
     "terser-webpack-plugin": "^2.3.2",
     "ts-loader": "^6.2.1",

package.json

@@ -26,6 +26,7 @@ function flushStderr() {
   }
 }
 
+// noinspection JSUnusedGlobalSymbols
 exports.config = {
   allScriptsTimeout: 11000,
   specs: [

protractor.conf.js

@@ -1,6 +1,6 @@
 {
   "name": "aw-clock-server",
-  "version": "1.2.6",
+  "version": "1.2.7",
   "license": "MIT",
   "author": "Kerry Shetline <kerry@shetline.com>",
   "private": true,
@@ -33,7 +33,7 @@
     "@types/mocha": "^5.2.7",
     "@types/morgan": "^1.7.37",
     "@types/nock": "^11.1.0",
-    "@types/node": "^13.1.7",
+    "@types/node": "^13.1.8",
     "@types/promise-ftp": "^1.3.4",
     "@types/request": "^2.48.4",
     "chai": "^4.2.0",

server/package-lock.json

@@ -66,11 +66,13 @@ const ntpPoller = new NtpPoller(ntpServer);
 const daytimeServer = process.env.AWC_DAYTIME_SERVER || DEFAULT_DAYTIME_SERVER;
 const daytime = new Daytime(daytimeServer);
 const leapSecondsUrl = process.env.AWC_LEAP_SECONDS_URL || DEFAULT_LEAP_SECOND_URLS;
-const taiUtc = new TaiUtc(leapSecondsUrl);
+let taiUtc = new TaiUtc(leapSecondsUrl);
 
 if (process.env.AWC_DEBUG_TIME) {
   const parts = process.env.AWC_DEBUG_TIME.split(';'); // UTC-time [;optional-leap-second]
   ntpPoller.setDebugTime(new Date(parts[0]), Number(parts[1] || 0));
+  const debugDelta = Date.now() - new Date(parts[0]).getTime();
+  taiUtc = new TaiUtc(leapSecondsUrl, () => Date.now() - debugDelta);
 }
 
 function readSensor() {

server/package.json

@@ -17,25 +17,34 @@ describe('tai-utc', () => {
   });
 
   it('should get TAI-UTC and pending leap second', async function () {
+    this.slow(5000);
+    this.timeout(20000);
     let data: any;
 
     data = await (new TaiUtc('http://example.com/1', () => new Date(2016, 6, 1).getTime()).getCurrentDelta());
+    delete data.dut1;
     expect(data).to.eql({ delta: 36, pendingLeap: 1, pendingLeapDate: '2016-12-31' });
 
     data = await (new TaiUtc('http://example.com/2', () => new Date(2020, 0, 1).getTime()).getCurrentDelta());
+    delete data.dut1;
     expect(data).to.eql({ delta: 37, pendingLeap: 1, pendingLeapDate: '2021-12-31' });
 
     data = await (new TaiUtc('http://example.com/2', () => new Date(2022, 0, 1).getTime()).getCurrentDelta());
+    delete data.dut1;
     expect(data).to.eql({ delta: 38, pendingLeap: 0, pendingLeapDate: null });
 
     data = await (new TaiUtc('http://example.com/3', () => new Date(2020, 0, 1).getTime()).getCurrentDelta());
+    delete data.dut1;
     expect(data).to.eql({ delta: 37, pendingLeap: -1, pendingLeapDate: '2021-12-31' });
 
     data = await (new TaiUtc('http://example.com/3', () => new Date(2022, 0, 1).getTime()).getCurrentDelta());
+    delete data.dut1;
     expect(data).to.eql({ delta: 36, pendingLeap: 0, pendingLeapDate: null });
   });
 
   it('should get leap second history', async function () {
+    this.slow(5000);
+    this.timeout(20000);
     let data: any;
 
     data = await (new TaiUtc('http://example.com/1', () => new Date(2016, 6, 1).getTime()).getLeapSecondHistory());