From dfb153a61333fa08b64e553ab8e71a8a63975f0b Mon Sep 17 00:00:00 2001 From: Tag Date: Sun, 2 Oct 2022 11:28:32 -0700 Subject: [PATCH] Replaced chromium timers with node versions --- package.nw/GridTracker.html | 2 +- package.nw/gt_bandactivity.html | 1 - package.nw/gt_conditions.html | 2 +- package.nw/lib/adif.js | 4 +- package.nw/lib/alerts.js | 8 +-- package.nw/lib/callsigns.js | 36 ++++++------ package.nw/lib/gt.js | 98 ++++++++++++++++----------------- package.nw/lib/gtws.js | 2 +- package.nw/lib/pota.js | 16 +++--- package.nw/lib/roster.js | 4 +- package.nw/lib/screens.js | 14 +++-- package.nw/package.json | 2 +- 12 files changed, 94 insertions(+), 95 deletions(-) diff --git a/package.nw/GridTracker.html b/package.nw/GridTracker.html index 84ea9f27..4d0d7aea 100644 --- a/package.nw/GridTracker.html +++ b/package.nw/GridTracker.html @@ -37,6 +37,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + @@ -50,7 +51,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -
diff --git a/package.nw/gt_bandactivity.html b/package.nw/gt_bandactivity.html index 8860a1ca..7a230613 100644 --- a/package.nw/gt_bandactivity.html +++ b/package.nw/gt_bandactivity.html @@ -36,7 +36,6 @@ } }); - 100) { @@ -218,7 +218,7 @@ function oqrsLoadCallsigns() { var oqrsWhenTimer = 86400 * 7 - (now - g_callsignLookups.oqrsLastUpdate); g_oqrsWhenDate = now + oqrsWhenTimer; - g_oqrsLoadTimer = setTimeout(oqrsDownload, oqrsWhenTimer * 1000); + g_oqrsLoadTimer = nodeTimers.setTimeout(oqrsDownload, oqrsWhenTimer * 1000); } if (!fs.existsSync(g_oqrsFile)) @@ -253,7 +253,7 @@ function oqrsSettingsDisplay() if (!g_callsignLookups.oqrsUseEnable) { - if (g_oqrsLoadTimer != null) clearTimeout(g_oqrsLoadTimer); + if (g_oqrsLoadTimer != null) nodeTimers.clearTimeout(g_oqrsLoadTimer); g_oqrsLoadTimer = null; g_oqrsCallsigns = Object(); } @@ -294,11 +294,11 @@ function processoqrsCallsigns(buffer, flag) g_callsignLookups.oqrsLastUpdate = timeNowSec(); var now = timeNowSec(); - if (g_oqrsLoadTimer != null) clearTimeout(g_oqrsLoadTimer); + if (g_oqrsLoadTimer != null) nodeTimers.clearTimeout(g_oqrsLoadTimer); var oqrsWhenTimer = 86400 * 7 - (now - g_callsignLookups.oqrsLastUpdate); g_oqrsWhenDate = now + oqrsWhenTimer; - g_oqrsLoadTimer = setTimeout(oqrsDownload, oqrsWhenTimer * 1000); + g_oqrsLoadTimer = nodeTimers.setTimeout(oqrsDownload, oqrsWhenTimer * 1000); fs.writeFileSync(g_oqrsFile, JSON.stringify(g_oqrsCallsigns)); oqrsSettingsDisplay(); @@ -313,7 +313,7 @@ function eqslLoadCallsigns() { var eqslWhenTimer = 86400 * 7 - (now - g_callsignLookups.eqslLastUpdate); g_eqslWhenDate = now + eqslWhenTimer; - g_eqslLoadTimer = setTimeout(eqslDownload, eqslWhenTimer * 1000); + g_eqslLoadTimer = nodeTimers.setTimeout(eqslDownload, eqslWhenTimer * 1000); } if (!fs.existsSync(g_eqslFile)) @@ -348,7 +348,7 @@ function eqslSettingsDisplay() if (!g_callsignLookups.eqslUseEnable) { - if (g_eqslLoadTimer != null) clearTimeout(g_eqslLoadTimer); + if (g_eqslLoadTimer != null) nodeTimers.clearTimeout(g_eqslLoadTimer); g_eqslLoadTimer = null; g_eqslCallsigns = Object(); } @@ -395,11 +395,11 @@ function processeqslCallsigns(buffer, flag) g_callsignLookups.eqslLastUpdate = timeNowSec(); var now = timeNowSec(); - if (g_eqslLoadTimer != null) clearTimeout(g_eqslLoadTimer); + if (g_eqslLoadTimer != null) nodeTimers.clearTimeout(g_eqslLoadTimer); var eqslWhenTimer = 86400 * 7 - (now - g_callsignLookups.eqslLastUpdate); g_eqslWhenDate = now + eqslWhenTimer; - g_eqslLoadTimer = setTimeout(eqslDownload, eqslWhenTimer * 1000); + g_eqslLoadTimer = nodeTimers.setTimeout(eqslDownload, eqslWhenTimer * 1000); if (Object.keys(g_eqslCallsigns).length > 10000) { fs.writeFileSync(g_eqslFile, JSON.stringify(g_eqslCallsigns)); } @@ -411,7 +411,7 @@ function ulsLoadCallsigns() { if (g_ulsLoadTimer != null) { - clearTimeout(g_ulsLoadTimer); + nodeTimers.clearTimeout(g_ulsLoadTimer); g_ulsLoadTimer = null; } @@ -421,7 +421,7 @@ function ulsLoadCallsigns() { var ulsWhenTimer = 86400 * 7 - (now - g_callsignLookups.ulsLastUpdate); g_ulsWhenDate = now + ulsWhenTimer; - g_ulsLoadTimer = setTimeout(ulsDownload, ulsWhenTimer * 1000); + g_ulsLoadTimer = nodeTimers.setTimeout(ulsDownload, ulsWhenTimer * 1000); updateCallsignCount(); } } @@ -507,7 +507,7 @@ function ulsSettingsDisplay() if (!g_callsignLookups.ulsUseEnable) { - if (g_ulsLoadTimer != null) clearTimeout(g_ulsLoadTimer); + if (g_ulsLoadTimer != null) nodeTimers.clearTimeout(g_ulsLoadTimer); g_ulsLoadTimer = null; g_ulsCallsignsCount = 0; ulsCountTd.innerHTML = g_ulsCallsignsCount; @@ -658,7 +658,7 @@ function processulsCallsigns(data, flag, cookies, starting, finished) { if (starting == true) { - if (g_ulsLoadTimer != null) clearTimeout(g_ulsLoadTimer); + if (g_ulsLoadTimer != null) nodeTimers.clearTimeout(g_ulsLoadTimer); g_ulsLoadTimer = null; g_ulsWhenDate = 0; g_ulsCallsignsCount = 0; @@ -708,11 +708,11 @@ function processulsCallsigns(data, flag, cookies, starting, finished) { var now = timeNowSec(); - if (g_ulsLoadTimer != null) clearTimeout(g_ulsLoadTimer); + if (g_ulsLoadTimer != null) nodeTimers.clearTimeout(g_ulsLoadTimer); var ulsWhenTimer = 86400 * 7; g_ulsWhenDate = ulsWhenTimer + now; - g_ulsLoadTimer = setTimeout(ulsDownload, ulsWhenTimer * 1000); + g_ulsLoadTimer = nodeTimers.setTimeout(ulsDownload, ulsWhenTimer * 1000); g_ulsDatabase.transaction(function (tx) { diff --git a/package.nw/lib/gt.js b/package.nw/lib/gt.js index 676a2069..071c680a 100644 --- a/package.nw/lib/gt.js +++ b/package.nw/lib/gt.js @@ -1664,9 +1664,9 @@ function timeoutSetUdpPort() function setUdpPort() { - if (g_setNewUdpPortTimeoutHandle != null) { window.clearTimeout(g_setNewUdpPortTimeoutHandle); } + if (g_setNewUdpPortTimeoutHandle != null) { nodeTimers.clearTimeout(g_setNewUdpPortTimeoutHandle); } lastMsgTimeDiv.innerHTML = "..setting.."; - g_setNewUdpPortTimeoutHandle = window.setTimeout(timeoutSetUdpPort, 1000); + g_setNewUdpPortTimeoutHandle = nodeTimers.setTimeout(timeoutSetUdpPort, 1000); } function changeGridDecay() @@ -2557,7 +2557,7 @@ function insertMessageInRoster( { if (g_rosterUpdateTimer != null) { - clearTimeout(g_rosterUpdateTimer); + nodeTimers.clearTimeout(g_rosterUpdateTimer); g_rosterUpdateTimer = null; } @@ -2585,7 +2585,7 @@ function insertMessageInRoster( g_callRoster[hash].DXcall = msgDXcallsign; g_callRoster[hash].DEcall = msgDEcallsign; - g_rosterUpdateTimer = setTimeout(delayedRosterUpdate, 100); + g_rosterUpdateTimer = nodeTimers.setTimeout(delayedRosterUpdate, 100); } function delayedRosterUpdate() @@ -4809,21 +4809,11 @@ function changeAnimateSpeedValue() } var g_animateFrame = 0; - var g_nextDimTime = 0; var g_last = 0; -function animatePaths() + +function removeFlightPathsAndDimSquares() { - requestAnimationFrame(animatePaths); - - g_last ^= g_last; - if (g_last == 1) return; - - g_animateFrame++; - g_animateFrame %= g_mapSettings.animateSpeed; - - if (g_animateFrame > 0) return; - for (var i = g_flightPaths.length - 1; i >= 0; i--) { if (g_flightPaths[i].age < g_timeNow) @@ -4841,6 +4831,19 @@ function animatePaths() { dimGridsquare(); } +} + +function animatePaths() +{ + requestAnimationFrame(animatePaths); + + g_last ^= g_last; + if (g_last == 1) return; + + g_animateFrame++; + g_animateFrame %= g_mapSettings.animateSpeed; + + if (g_animateFrame > 0) return; if (g_mapSettings.animate == false) return; @@ -5435,7 +5438,7 @@ function handleStrike(strike) let inRange = true; - if (Math.abs(strike.o - g_myLon) > g_strikeRange) inRange = false; + if (myRawGrid.length < 4 || Math.abs(strike.o - g_myLon) > g_strikeRange) inRange = false; if (Math.abs(strike.a - g_myLat) > g_strikeRange) inRange = false; @@ -5888,13 +5891,13 @@ function toggleNexrad() g_Nexrad = createNexRad(); g_map.addLayer(g_Nexrad); - if (g_nexradInterval == null) { g_nexradInterval = setInterval(nexradRefresh, 600000); } + if (g_nexradInterval == null) { g_nexradInterval = nodeTimers.setInterval(nexradRefresh, 600000); } } else { if (g_nexradInterval != null) { - clearInterval(g_nexradInterval); + nodeTimers.clearInterval(g_nexradInterval); g_nexradInterval = null; } if (g_Nexrad) @@ -6294,7 +6297,7 @@ function handleWsjtxADIF(newMessage) { if (g_oldQSOTimer) { - clearTimeout(g_oldQSOTimer); + nodeTimers.clearTimeout(g_oldQSOTimer); g_oldQSOTimer = null; } @@ -6305,13 +6308,13 @@ function handleWsjtxQSO(newMessage) { if (g_oldQSOTimer) { - clearTimeout(g_oldQSOTimer); + nodeTimers.clearTimeout(g_oldQSOTimer); g_oldQSOTimer = null; } g_oldStyleLogMessage = Object.assign({}, newMessage); - g_oldQSOTimer = setTimeout(oldSendToLogger, 3000); + g_oldQSOTimer = nodeTimers.setTimeout(oldSendToLogger, 3000); } function handleWsjtxNotSupported(newMessage) { } @@ -6458,7 +6461,7 @@ function handleWsjtxStatus(newMessage) bandChange = true; if (g_pskBandActivityTimerHandle != null) { - clearInterval(g_pskBandActivityTimerHandle); + nodeTimers.clearInterval(g_pskBandActivityTimerHandle); g_pskBandActivityTimerHandle = null; } removePaths(); @@ -6469,7 +6472,7 @@ function handleWsjtxStatus(newMessage) modeChange = true; if (g_pskBandActivityTimerHandle != null) { - clearInterval(g_pskBandActivityTimerHandle); + nodeTimers.clearInterval(g_pskBandActivityTimerHandle); g_pskBandActivityTimerHandle = null; } } @@ -9374,7 +9377,7 @@ function showStatBox(resize) return; } - if (g_statBoxTimer) clearTimeout(g_statBoxTimer); + if (g_statBoxTimer) nodeTimers.clearTimeout(g_statBoxTimer); if (count > 0) { @@ -9383,7 +9386,7 @@ function showStatBox(resize) " 
...Parsing Log Entries...
 " ); setStatsDivHeight("statViewDiv", "auto"); - g_statBoxTimer = setTimeout(renderStatsBox, 250); + g_statBoxTimer = nodeTimers.setTimeout(renderStatsBox, 250); } else { @@ -11032,7 +11035,7 @@ function newMessageSetting(whichSetting) } } -function checkForNewVersion(showUptoDate) +function checkForNewVersion(showUptoDate = false) { if (typeof nw != "undefined") { @@ -11058,7 +11061,7 @@ function downloadAcknowledgements() 80 ); - setTimeout(downloadAcknowledgements, 8640000); + nodeTimers.setTimeout(downloadAcknowledgements, 8640000); } } @@ -11238,13 +11241,10 @@ function pskGetBandActivity() if (g_pskBandActivityTimerHandle != null) { - clearInterval(g_pskBandActivityTimerHandle); + nodeTimers.clearInterval(g_pskBandActivityTimerHandle); } - g_pskBandActivityTimerHandle = setInterval(function () - { - pskGetBandActivity(); - }, 601000); // every 20 minutes, 1 second + g_pskBandActivityTimerHandle = nodeTimers.setInterval(pskGetBandActivity, 601000); // every 20 minutes, 1 second } function getIniFromApp(appName) @@ -13041,9 +13041,9 @@ function changeLegendColor(source) if (g_redrawFromLegendTimeoutHandle != null) { - clearTimeout(g_redrawFromLegendTimeoutHandle); + nodeTimers.clearTimeout(g_redrawFromLegendTimeoutHandle); } - g_redrawFromLegendTimeoutHandle = setTimeout(redrawGrids, 500); + g_redrawFromLegendTimeoutHandle = nodeTimers.setTimeout(redrawGrids, 500); } function toggleLegend() @@ -13179,7 +13179,7 @@ function initSpeech() { window.speechSynthesis.onvoiceschanged = function () { - setTimeout(timedGetVoices, 500); + nodeTimers.setTimeout(timedGetVoices, 500); }; var msg = new SpeechSynthesisUtterance("."); msg.lang = g_localeString; @@ -13504,11 +13504,8 @@ function startupVersionInit() stopAskingCheckbox.checked = g_appSettings.stopAskingVersion; if (stopAskingCheckbox.checked == false) { - checkForNewVersion(false); - setInterval(function () - { - checkForNewVersion(false); - }, 86400000); + checkForNewVersion(); + nodeTimers.setInterval(checkForNewVersion, 86400000); } } @@ -13564,7 +13561,7 @@ function startupEventsAndTimers() { document.addEventListener("keydown", onMyKeyDown, true); document.addEventListener("keyup", onMyKeyUp, false); - displayTimeInterval = setInterval(displayTime, 1000); + displayTimeInterval = nodeTimers.setInterval(displayTime, 1000); } var g_finishedLoading = false; @@ -13604,6 +13601,7 @@ function postInit() { devPanel.style.display = "inline-block"; } + nodeTimers.setInterval(removeFlightPathsAndDimSquares, 2000); } document.addEventListener("dragover", function (event) @@ -13662,7 +13660,7 @@ function init() documentsDiv.style.display = "none"; startupDiv.style.display = "block"; startupStatusDiv.innerHTML = "Starting..."; - setTimeout(startupEngine, 10); + nodeTimers.setTimeout(startupEngine, 32); } } @@ -13673,7 +13671,7 @@ function startupEngine() var funcInfo = g_startupTable.shift(); funcInfo[0](); startupStatusDiv.innerHTML = funcInfo[1]; - setTimeout(startupEngine, 10); + nodeTimers.setTimeout(startupEngine, 32); } else { @@ -14336,10 +14334,10 @@ function lookupCallsign(callsign, gridPass, useCache = true) } if (g_lookupTimeout != null) { - window.clearTimeout(g_lookupTimeout); + nodeTimers.clearTimeout(g_lookupTimeout); g_lookupTimeout = null; } - g_lookupTimeout = setTimeout(searchLogForCallsign, 500, callsign); + g_lookupTimeout = nodeTimers.setTimeout(searchLogForCallsign, 500, callsign); if (useCache) { @@ -16029,7 +16027,7 @@ function addNewOAMSSpot(cid, db) { if (g_oamsSpotTimeout !== null) { - clearTimeout(g_oamsSpotTimeout); + nodeTimers.clearTimeout(g_oamsSpotTimeout); g_oamsSpotTimeout = null; } var report; @@ -16062,7 +16060,7 @@ function addNewOAMSSpot(cid, db) if (SNR < 0) SNR = 0; report.color = SNR; - g_oamsSpotTimeout = setTimeout(redrawSpots, 500); + g_oamsSpotTimeout = nodeTimers.setTimeout(redrawSpots, 500); } } @@ -16565,5 +16563,5 @@ function refreshSpotsNoTx() redrawSpots(); } -setInterval(refreshSpotsNoTx, 300000); -setTimeout(refreshSpotsNoTx, 300000); +nodeTimers.setInterval(refreshSpotsNoTx, 300000); +nodeTimers.setTimeout(refreshSpotsNoTx, 300000); diff --git a/package.nw/lib/gtws.js b/package.nw/lib/gtws.js index 6a52c38c..58f661ca 100644 --- a/package.nw/lib/gtws.js +++ b/package.nw/lib/gtws.js @@ -617,7 +617,7 @@ function gtLightningStrike(jsmesg) function gtChatSystemInit() { - g_gtEngineInterval = setInterval(gtChatStateMachine, 1000); + g_gtEngineInterval = nodeTimers.setInterval(gtChatStateMachine, 1000); } function showGtFlags() diff --git a/package.nw/lib/pota.js b/package.nw/lib/pota.js index 98015715..d44a2e4f 100644 --- a/package.nw/lib/pota.js +++ b/package.nw/lib/pota.js @@ -268,13 +268,13 @@ function rbnReportResult(buffer, flag, cookies) // It worked! process latest spots! if (g_pota.spotsTimeout) { - clearTimeout(g_pota.spotsTimeout); + nodeTimers.clearTimeout(g_pota.spotsTimeout); g_pota.spotsTimeout = null; } processPotaSpots(String(buffer)); - g_pota.spotsTimeout = setTimeout(getPotaSpots, 300000); + g_pota.spotsTimeout = nodeTimers.setTimeout(getPotaSpots, 300000); } function spotFromCallObj(callObj, park, inCount, rbnTime) @@ -357,7 +357,7 @@ function getPotaParks() { if (g_pota.parksTimeout) { - clearTimeout(g_pota.parksTimeout); + nodeTimers.clearTimeout(g_pota.parksTimeout); g_pota.spotsTimeout = null; } @@ -372,7 +372,7 @@ function getPotaParks() ); } - g_pota.parksTimeout = setTimeout(getPotaParks, 86400000) + g_pota.parksTimeout = nodeTimers.setTimeout(getPotaParks, 86400000) } // This is a shallow copy, don't use with objects that contain other objects or arrays @@ -464,7 +464,7 @@ function getPotaSpots() { if (g_pota.spotsTimeout) { - clearTimeout(g_pota.spotsTimeout); + nodeTimers.clearTimeout(g_pota.spotsTimeout); g_pota.spotsTimeout = null; } @@ -479,7 +479,7 @@ function getPotaSpots() ); } - g_pota.spotsTimeout = setTimeout(getPotaSpots, 300000); + g_pota.spotsTimeout = nodeTimers.setTimeout(getPotaSpots, 300000); } function processPotaSchedule(buffer) @@ -538,7 +538,7 @@ function getPotaSchedule() { if (g_pota.scheduleTimeout) { - clearTimeout(g_pota.scheduleTimeout); + nodeTimers.clearTimeout(g_pota.scheduleTimeout); g_pota.scheduleTimeout = null; } @@ -552,7 +552,7 @@ function getPotaSchedule() 443 ); } - g_pota.scheduleTimeout = setTimeout(getPotaSchedule, 900000); + g_pota.scheduleTimeout = nodeTimers.setTimeout(getPotaSchedule, 900000); } var g_lastPark = null; diff --git a/package.nw/lib/roster.js b/package.nw/lib/roster.js index 236e16e5..fd8148d1 100644 --- a/package.nw/lib/roster.js +++ b/package.nw/lib/roster.js @@ -2,7 +2,7 @@ // All rights reserved. // See LICENSE for more information. -var fs = require("fs"); +const fs = require("fs"); var callRoster = {}; var g_blockedCalls = {}; @@ -2073,7 +2073,7 @@ function init() initDXCCSelector(); - g_timerInterval = setInterval(realtimeRoster, 1000); + g_timerInterval = nodeTimers.setInterval(realtimeRoster, 1000); updateInstances(); } diff --git a/package.nw/lib/screens.js b/package.nw/lib/screens.js index fca7d4dc..42a8b226 100644 --- a/package.nw/lib/screens.js +++ b/package.nw/lib/screens.js @@ -1,3 +1,5 @@ +const nodeTimers = require("timers"); + var s_title = null; var s_screenSettings = {}; var s_zoomLevel = 0; @@ -25,12 +27,12 @@ function clearAllScreenTimers() { if (g_windowMoveTimer != null) { - clearTimeout(g_windowMoveTimer); + nodeTimers.clearTimeout(g_windowMoveTimer); g_windowMoveTimer = null; } if (g_windowResizeTimer != null) { - clearTimeout(g_windowResizeTimer); + nodeTimers.clearTimeout(g_windowResizeTimer); g_windowResizeTimer = null; } } @@ -125,9 +127,9 @@ nw.Window.get().on("move", function (x, y) { if (g_windowMoveTimer != null) { - clearTimeout(g_windowMoveTimer); + nodeTimers.clearTimeout(g_windowMoveTimer); } - g_windowMoveTimer = setTimeout(setWindowInfo, 1000); + g_windowMoveTimer = nodeTimers.setTimeout(setWindowInfo, 1000); }); var g_windowResizeTimer = null; @@ -135,9 +137,9 @@ nw.Window.get().on("resize", function (w, h) { if (g_windowResizeTimer != null) { - clearTimeout(g_windowResizeTimer); + nodeTimers.clearTimeout(g_windowResizeTimer); } - g_windowResizeTimer = setTimeout(setWindowInfo, 1000); + g_windowResizeTimer = nodeTimers.setTimeout(setWindowInfo, 1000); }); var g_zoomKeys = { diff --git a/package.nw/package.json b/package.nw/package.json index 676a38b5..6ad3476a 100644 --- a/package.nw/package.json +++ b/package.nw/package.json @@ -1,7 +1,7 @@ { "name": "GridTracker", "product_string_do_not_use": "gridtracker", - "version": "1.22.1001", + "version": "1.22.1002", "betaVersion": "", "description": "GridTracker, an amateur radio companion", "author": "GridTracker.org",