From eb05c983addbc97f39bfff4f4f16fbf1baaaab7d Mon Sep 17 00:00:00 2001
From: Pablo Acosta-Serafini <pablo.acosta@prescientdevices.com>
Date: Thu, 18 Feb 2021 17:03:42 -0500
Subject: [PATCH] Replaced momentum dependency with spacetime

---
 time/timeswitch/package.json    |   2 +-
 time/timeswitch/timeswitch.html | 277 +++++++++++++++++---------------
 time/timeswitch/timeswitch.js   |   6 +-
 3 files changed, 148 insertions(+), 137 deletions(-)

diff --git a/time/timeswitch/package.json b/time/timeswitch/package.json
index 9b699382..6d0fca3b 100644
--- a/time/timeswitch/package.json
+++ b/time/timeswitch/package.json
@@ -3,7 +3,7 @@
     "version"       : "0.0.8",
     "description"   : "A Node-RED node to provide a simple timeswitch to schedule daily on/off events.",
     "dependencies"  : {
-        "moment-timezone": "^0.5.33",
+        "spacetime": "^6.12.5",
         "suncalc": "^1.8.0"
     },
     "repository" : {
diff --git a/time/timeswitch/timeswitch.html b/time/timeswitch/timeswitch.html
index 7689f5bf..52506229 100644
--- a/time/timeswitch/timeswitch.html
+++ b/time/timeswitch/timeswitch.html
@@ -235,7 +235,7 @@
         <option>Africa/Ceuta</option>
         <option>Africa/Conakry</option>
         <option>Africa/Dakar</option>
-        <option>Africa/Dar_es_Salaam</option>
+        <option>Africa/Dar_Es_Salaam</option>
         <option>Africa/Djibouti</option>
         <option>Africa/Douala</option>
         <option>Africa/El_Aaiun</option>
@@ -265,7 +265,7 @@
         <option>Africa/Niamey</option>
         <option>Africa/Nouakchott</option>
         <option>Africa/Ouagadougou</option>
-        <option>Africa/Porto-Novo</option>
+        <option>Africa/Porto-novo</option>
         <option>Africa/Sao_Tome</option>
         <option>Africa/Timbuktu</option>
         <option>Africa/Tripoli</option>
@@ -276,19 +276,7 @@
         <option>America/Anguilla</option>
         <option>America/Antigua</option>
         <option>America/Araguaina</option>
-        <option>America/Argentina/Buenos_Aires</option>
-        <option>America/Argentina/Catamarca</option>
-        <option>America/Argentina/ComodRivadavia</option>
-        <option>America/Argentina/Cordoba</option>
-        <option>America/Argentina/Jujuy</option>
-        <option>America/Argentina/La_Rioja</option>
-        <option>America/Argentina/Mendoza</option>
-        <option>America/Argentina/Rio_Gallegos</option>
-        <option>America/Argentina/Salta</option>
-        <option>America/Argentina/San_Juan</option>
-        <option>America/Argentina/San_Luis</option>
-        <option>America/Argentina/Tucuman</option>
-        <option>America/Argentina/Ushuaia</option>
+        <option>America/Argentina</option>
         <option>America/Aruba</option>
         <option>America/Asuncion</option>
         <option>America/Atikokan</option>
@@ -298,7 +286,7 @@
         <option>America/Barbados</option>
         <option>America/Belem</option>
         <option>America/Belize</option>
-        <option>America/Blanc-Sablon</option>
+        <option>America/Blanc-sablon</option>
         <option>America/Boa_Vista</option>
         <option>America/Bogota</option>
         <option>America/Boise</option>
@@ -343,23 +331,15 @@
         <option>America/Halifax</option>
         <option>America/Havana</option>
         <option>America/Hermosillo</option>
-        <option>America/Indiana/Indianapolis</option>
-        <option>America/Indiana/Knox</option>
-        <option>America/Indiana/Marengo</option>
-        <option>America/Indiana/Petersburg</option>
-        <option>America/Indiana/Tell_City</option>
-        <option>America/Indiana/Vevay</option>
-        <option>America/Indiana/Vincennes</option>
-        <option>America/Indiana/Winamac</option>
+        <option>America/Indiana</option>
         <option>America/Indianapolis</option>
         <option>America/Inuvik</option>
         <option>America/Iqaluit</option>
         <option>America/Jamaica</option>
         <option>America/Jujuy</option>
         <option>America/Juneau</option>
-        <option>America/Kentucky/Louisville</option>
-        <option>America/Kentucky/Monticello</option>
-        <option>America/Knox_IN</option>
+        <option>America/Kentucky</option>
+        <option>America/Knox_In</option>
         <option>America/Kralendijk</option>
         <option>America/La_Paz</option>
         <option>America/Lima</option>
@@ -389,17 +369,15 @@
         <option>America/Nipigon</option>
         <option>America/Nome</option>
         <option>America/Noronha</option>
-        <option>America/North_Dakota/Beulah</option>
-        <option>America/North_Dakota/Center</option>
-        <option>America/North_Dakota/New_Salem</option>
+        <option>America/North_Dakota</option>
         <option>America/Nuuk</option>
         <option>America/Ojinaga</option>
         <option>America/Panama</option>
         <option>America/Pangnirtung</option>
         <option>America/Paramaribo</option>
         <option>America/Phoenix</option>
-        <option>America/Port-au-Prince</option>
-        <option>America/Port_of_Spain</option>
+        <option>America/Port-au-prince</option>
+        <option>America/Port_Of_Spain</option>
         <option>America/Porto_Acre</option>
         <option>America/Porto_Velho</option>
         <option>America/Puerto_Rico</option>
@@ -440,10 +418,10 @@
         <option>America/Yellowknife</option>
         <option>Antarctica/Casey</option>
         <option>Antarctica/Davis</option>
-        <option>Antarctica/DumontDUrville</option>
+        <option>Antarctica/Dumontdurville</option>
         <option>Antarctica/Macquarie</option>
         <option>Antarctica/Mawson</option>
-        <option>Antarctica/McMurdo</option>
+        <option>Antarctica/Mcmurdo</option>
         <option>Antarctica/Palmer</option>
         <option>Antarctica/Rothera</option>
         <option>Antarctica/South_Pole</option>
@@ -543,9 +521,10 @@
         <option>Asia/Ulaanbaatar</option>
         <option>Asia/Ulan_Bator</option>
         <option>Asia/Urumqi</option>
-        <option>Asia/Ust-Nera</option>
+        <option>Asia/Ust-nera</option>
         <option>Asia/Vientiane</option>
         <option>Asia/Vladivostok</option>
+        <option>Asia/Volgograd</option>
         <option>Asia/Yakutsk</option>
         <option>Asia/Yangon</option>
         <option>Asia/Yekaterinburg</option>
@@ -562,7 +541,7 @@
         <option>Atlantic/South_Georgia</option>
         <option>Atlantic/St_Helena</option>
         <option>Atlantic/Stanley</option>
-        <option>Australia/ACT</option>
+        <option>Australia/Act</option>
         <option>Australia/Adelaide</option>
         <option>Australia/Brisbane</option>
         <option>Australia/Broken_Hill</option>
@@ -571,12 +550,12 @@
         <option>Australia/Darwin</option>
         <option>Australia/Eucla</option>
         <option>Australia/Hobart</option>
-        <option>Australia/LHI</option>
+        <option>Australia/Lhi</option>
         <option>Australia/Lindeman</option>
         <option>Australia/Lord_Howe</option>
         <option>Australia/Melbourne</option>
-        <option>Australia/NSW</option>
         <option>Australia/North</option>
+        <option>Australia/Nsw</option>
         <option>Australia/Perth</option>
         <option>Australia/Queensland</option>
         <option>Australia/South</option>
@@ -586,13 +565,12 @@
         <option>Australia/West</option>
         <option>Australia/Yancowinna</option>
         <option>Brazil/Acre</option>
-        <option>Brazil/DeNoronha</option>
+        <option>Brazil/Denoronha</option>
         <option>Brazil/East</option>
         <option>Brazil/West</option>
-        <option>CET</option>
-        <option>CST6CDT</option>
         <option>Canada/Atlantic</option>
         <option>Canada/Central</option>
+        <option>Canada/East-saskatchewan</option>
         <option>Canada/Eastern</option>
         <option>Canada/Mountain</option>
         <option>Canada/Newfoundland</option>
@@ -600,48 +578,71 @@
         <option>Canada/Saskatchewan</option>
         <option>Canada/Yukon</option>
         <option>Chile/Continental</option>
-        <option>Chile/EasterIsland</option>
-        <option>Cuba</option>
-        <option>EET</option>
-        <option>EST</option>
-        <option>EST5EDT</option>
-        <option>Egypt</option>
-        <option>Eire</option>
-        <option>Etc/GMT</option>
-        <option>Etc/GMT+0</option>
-        <option>Etc/GMT+1</option>
-        <option>Etc/GMT+10</option>
-        <option>Etc/GMT+11</option>
-        <option>Etc/GMT+12</option>
-        <option>Etc/GMT+2</option>
-        <option>Etc/GMT+3</option>
-        <option>Etc/GMT+4</option>
-        <option>Etc/GMT+5</option>
-        <option>Etc/GMT+6</option>
-        <option>Etc/GMT+7</option>
-        <option>Etc/GMT+8</option>
-        <option>Etc/GMT+9</option>
-        <option>Etc/GMT-0</option>
-        <option>Etc/GMT-1</option>
-        <option>Etc/GMT-10</option>
-        <option>Etc/GMT-11</option>
-        <option>Etc/GMT-12</option>
-        <option>Etc/GMT-13</option>
-        <option>Etc/GMT-14</option>
-        <option>Etc/GMT-2</option>
-        <option>Etc/GMT-3</option>
-        <option>Etc/GMT-4</option>
-        <option>Etc/GMT-5</option>
-        <option>Etc/GMT-6</option>
-        <option>Etc/GMT-7</option>
-        <option>Etc/GMT-8</option>
-        <option>Etc/GMT-9</option>
-        <option>Etc/GMT0</option>
-        <option>Etc/Greenwich</option>
-        <option>Etc/UCT</option>
-        <option>Etc/UTC</option>
-        <option>Etc/Universal</option>
-        <option>Etc/Zulu</option>
+        <option>Chile/Easterisland</option>
+        <option>ETC/GMT+0.5</option>
+        <option>ETC/GMT+0</option>
+        <option>ETC/GMT+1.5</option>
+        <option>ETC/GMT+10.5</option>
+        <option>ETC/GMT+10</option>
+        <option>ETC/GMT+11.5</option>
+        <option>ETC/GMT+11</option>
+        <option>ETC/GMT+12.5</option>
+        <option>ETC/GMT+12</option>
+        <option>ETC/GMT+13.5</option>
+        <option>ETC/GMT+13</option>
+        <option>ETC/GMT+14</option>
+        <option>ETC/GMT+1</option>
+        <option>ETC/GMT+2.5</option>
+        <option>ETC/GMT+2</option>
+        <option>ETC/GMT+3.5</option>
+        <option>ETC/GMT+3</option>
+        <option>ETC/GMT+4.5</option>
+        <option>ETC/GMT+4</option>
+        <option>ETC/GMT+5.5</option>
+        <option>ETC/GMT+5</option>
+        <option>ETC/GMT+6.5</option>
+        <option>ETC/GMT+6</option>
+        <option>ETC/GMT+7.5</option>
+        <option>ETC/GMT+7</option>
+        <option>ETC/GMT+8.5</option>
+        <option>ETC/GMT+8</option>
+        <option>ETC/GMT+9.5</option>
+        <option>ETC/GMT+9</option>
+        <option>ETC/GMT-0.5</option>
+        <option>ETC/GMT-0</option>
+        <option>ETC/GMT-1.5</option>
+        <option>ETC/GMT-10.5</option>
+        <option>ETC/GMT-10</option>
+        <option>ETC/GMT-11.5</option>
+        <option>ETC/GMT-11</option>
+        <option>ETC/GMT-12.5</option>
+        <option>ETC/GMT-12</option>
+        <option>ETC/GMT-13.5</option>
+        <option>ETC/GMT-13</option>
+        <option>ETC/GMT-14</option>
+        <option>ETC/GMT-1</option>
+        <option>ETC/GMT-2.5</option>
+        <option>ETC/GMT-2</option>
+        <option>ETC/GMT-3.5</option>
+        <option>ETC/GMT-3</option>
+        <option>ETC/GMT-4.5</option>
+        <option>ETC/GMT-4</option>
+        <option>ETC/GMT-5.5</option>
+        <option>ETC/GMT-5</option>
+        <option>ETC/GMT-6.5</option>
+        <option>ETC/GMT-6</option>
+        <option>ETC/GMT-7.5</option>
+        <option>ETC/GMT-7</option>
+        <option>ETC/GMT-8.5</option>
+        <option>ETC/GMT-8</option>
+        <option>ETC/GMT-9.5</option>
+        <option>ETC/GMT-9</option>
+        <option>ETC/GMT0</option>
+        <option>ETC/GMT</option>
+        <option>ETC/Greenwich</option>
+        <option>ETC/Universal</option>
+        <option>ETC/Utc</option>
+        <option>ETC/Zulu</option>
         <option>Europe/Amsterdam</option>
         <option>Europe/Andorra</option>
         <option>Europe/Astrakhan</option>
@@ -660,7 +661,7 @@
         <option>Europe/Gibraltar</option>
         <option>Europe/Guernsey</option>
         <option>Europe/Helsinki</option>
-        <option>Europe/Isle_of_Man</option>
+        <option>Europe/Isle_Of_Man</option>
         <option>Europe/Istanbul</option>
         <option>Europe/Jersey</option>
         <option>Europe/Kaliningrad</option>
@@ -705,16 +706,6 @@
         <option>Europe/Zagreb</option>
         <option>Europe/Zaporozhye</option>
         <option>Europe/Zurich</option>
-        <option>GB</option>
-        <option>GB-Eire</option>
-        <option>GMT</option>
-        <option>GMT+0</option>
-        <option>GMT-0</option>
-        <option>GMT0</option>
-        <option>Greenwich</option>
-        <option>HST</option>
-        <option>Hongkong</option>
-        <option>Iceland</option>
         <option>Indian/Antananarivo</option>
         <option>Indian/Chagos</option>
         <option>Indian/Christmas</option>
@@ -726,23 +717,9 @@
         <option>Indian/Mauritius</option>
         <option>Indian/Mayotte</option>
         <option>Indian/Reunion</option>
-        <option>Iran</option>
-        <option>Israel</option>
-        <option>Jamaica</option>
-        <option>Japan</option>
-        <option>Kwajalein</option>
-        <option>Libya</option>
-        <option>MET</option>
-        <option>MST</option>
-        <option>MST7MDT</option>
-        <option>Mexico/BajaNorte</option>
-        <option>Mexico/BajaSur</option>
+        <option>Mexico/Bajanorte</option>
+        <option>Mexico/Bajasur</option>
         <option>Mexico/General</option>
-        <option>NZ</option>
-        <option>NZ-CHAT</option>
-        <option>Navajo</option>
-        <option>PRC</option>
-        <option>PST8PDT</option>
         <option>Pacific/Apia</option>
         <option>Pacific/Auckland</option>
         <option>Pacific/Bougainville</option>
@@ -786,30 +763,64 @@
         <option>Pacific/Wake</option>
         <option>Pacific/Wallis</option>
         <option>Pacific/Yap</option>
-        <option>Poland</option>
-        <option>Portugal</option>
-        <option>ROC</option>
-        <option>ROK</option>
-        <option>Singapore</option>
-        <option>Turkey</option>
-        <option>UCT</option>
-        <option>US/Alaska</option>
-        <option>US/Aleutian</option>
-        <option>US/Arizona</option>
-        <option>US/Central</option>
-        <option>US/East-Indiana</option>
-        <option>US/Eastern</option>
-        <option>US/Hawaii</option>
-        <option>US/Indiana-Starke</option>
-        <option>US/Michigan</option>
-        <option>US/Mountain</option>
-        <option>US/Pacific</option>
-        <option>US/Samoa</option>
+        <option>UTC/GMT+0.5</option>
+        <option>UTC/GMT+1.5</option>
+        <option>UTC/GMT+10.5</option>
+        <option>UTC/GMT+10</option>
+        <option>UTC/GMT+11.5</option>
+        <option>UTC/GMT+11</option>
+        <option>UTC/GMT+12.5</option>
+        <option>UTC/GMT+12</option>
+        <option>UTC/GMT+13.5</option>
+        <option>UTC/GMT+13</option>
+        <option>UTC/GMT+14</option>
+        <option>UTC/GMT+1</option>
+        <option>UTC/GMT+2.5</option>
+        <option>UTC/GMT+2</option>
+        <option>UTC/GMT+3.5</option>
+        <option>UTC/GMT+3</option>
+        <option>UTC/GMT+4.5</option>
+        <option>UTC/GMT+4</option>
+        <option>UTC/GMT+5.5</option>
+        <option>UTC/GMT+5</option>
+        <option>UTC/GMT+6.5</option>
+        <option>UTC/GMT+6</option>
+        <option>UTC/GMT+7.5</option>
+        <option>UTC/GMT+7</option>
+        <option>UTC/GMT+8.5</option>
+        <option>UTC/GMT+8</option>
+        <option>UTC/GMT+9.5</option>
+        <option>UTC/GMT+9</option>
+        <option>UTC/GMT-0.5</option>
+        <option>UTC/GMT-1.5</option>
+        <option>UTC/GMT-10.5</option>
+        <option>UTC/GMT-10</option>
+        <option>UTC/GMT-11.5</option>
+        <option>UTC/GMT-11</option>
+        <option>UTC/GMT-12.5</option>
+        <option>UTC/GMT-12</option>
+        <option>UTC/GMT-13.5</option>
+        <option>UTC/GMT-13</option>
+        <option>UTC/GMT-14</option>
+        <option>UTC/GMT-1</option>
+        <option>UTC/GMT-2.5</option>
+        <option>UTC/GMT-2</option>
+        <option>UTC/GMT-3.5</option>
+        <option>UTC/GMT-3</option>
+        <option>UTC/GMT-4.5</option>
+        <option>UTC/GMT-4</option>
+        <option>UTC/GMT-5.5</option>
+        <option>UTC/GMT-5</option>
+        <option>UTC/GMT-6.5</option>
+        <option>UTC/GMT-6</option>
+        <option>UTC/GMT-7.5</option>
+        <option>UTC/GMT-7</option>
+        <option>UTC/GMT-8.5</option>
+        <option>UTC/GMT-8</option>
+        <option>UTC/GMT-9.5</option>
+        <option>UTC/GMT-9</option>
+        <option>UTC/GMT0</option>
         <option>UTC</option>
-        <option>Universal</option>
-        <option>W-SU</option>
-        <option>WET</option>
-        <option>Zulu</option>
     </select>
   </div>
 
diff --git a/time/timeswitch/timeswitch.js b/time/timeswitch/timeswitch.js
index 0e1c7506..1e0e8f40 100644
--- a/time/timeswitch/timeswitch.js
+++ b/time/timeswitch/timeswitch.js
@@ -2,7 +2,7 @@
 module.exports = function(RED) {
     "use strict";
     var SunCalc = require('suncalc');
-    var moment = require('moment-timezone');
+    const spacetime = require("spacetime")
 
     function TimeswitchNode(n) {
         RED.nodes.createNode(this, n);
@@ -44,8 +44,8 @@ module.exports = function(RED) {
         this.on("input", function(msg2) {
             if (msg2.payload === "reset") { ison = 0; }
 
-            var timeOffset = moment.tz.zone(this.timezone).utcOffset(Date.now()) * 60 * 1000;
-            var now = new Date(Date.now() - timeOffset);
+            var timeOffset = spacetime(Date.now()).goto(this.timezone.toLowerCase()).timezone().current.offset * 60 * 60 * 1000;
+            var now = new Date(Date.now() + timeOffset);
             var nowMillis = Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate(), now.getUTCHours(), now.getUTCMinutes(), 0);
             var midnightMillis = Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate(), 0, 0);
             var today = Math.round((nowMillis - midnightMillis) / 60000) % 1440;