From 7277db35b45b76a2db20d37dc38471d42353e71a Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 25 Jul 2024 16:47:57 +1000 Subject: [PATCH 1/3] fix: failing tests making requests to real servers :bad: --- ts/test/test-utils/utils/pubkey.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ts/test/test-utils/utils/pubkey.ts b/ts/test/test-utils/utils/pubkey.ts index 52e522bc8..d90b0af9e 100644 --- a/ts/test/test-utils/utils/pubkey.ts +++ b/ts/test/test-utils/utils/pubkey.ts @@ -45,7 +45,8 @@ export function generateFakePubKeys(amount: number): Array { export function generateFakeSnode(): Snode { return { - ip: `${ipv4Section()}.${ipv4Section()}.${ipv4Section()}.${ipv4Section()}`, + // NOTE: make sure this is random, but not a valid ip (otherwise we will try to hit that ip during testing!) + ip: `${ipv4Section()}.${ipv4Section()}.${ipv4Section()}.${ipv4Section()}.${ipv4Section()}.${ipv4Section()}`, port: 22116, pubkey_x25519: generateFakePubKeyStr(), pubkey_ed25519: generateFakePubKeyStr(), @@ -59,7 +60,8 @@ function ipv4Section() { export function generateFakeSnodeWithEdKey(ed25519Pubkey: string): Snode { return { - ip: `${ipv4Section()}.${ipv4Section()}.${ipv4Section()}.${ipv4Section()}`, + // NOTE: make sure this is random, but not a valid ip (otherwise we will try to hit that ip during testing!) + ip: `${ipv4Section()}.${ipv4Section()}.${ipv4Section()}.${ipv4Section()}.${ipv4Section()}.${ipv4Section()}`, port: 22116, pubkey_x25519: generateFakePubKeyStr(), pubkey_ed25519: ed25519Pubkey, From 26e7a39a61e08e33175cba0658232d97592765e2 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 26 Jul 2024 11:03:28 +1000 Subject: [PATCH 2/3] feat: hit only once every 30mins the fs for release once we've already fetched the latest release --- ts/components/leftpane/ActionsPanel.tsx | 34 +----------- .../useFetchLatestReleaseFromFileServer.ts | 15 +++++ ts/session/fetch_latest_release/index.ts | 55 +++++++++++++++++++ 3 files changed, 73 insertions(+), 31 deletions(-) create mode 100644 ts/hooks/useFetchLatestReleaseFromFileServer.ts create mode 100644 ts/session/fetch_latest_release/index.ts diff --git a/ts/components/leftpane/ActionsPanel.tsx b/ts/components/leftpane/ActionsPanel.tsx index 319300713..8fbe069ad 100644 --- a/ts/components/leftpane/ActionsPanel.tsx +++ b/ts/components/leftpane/ActionsPanel.tsx @@ -1,7 +1,5 @@ -import { ipcRenderer } from 'electron'; import React, { useEffect, useState } from 'react'; - -import { debounce, isEmpty, isString } from 'lodash'; +import { debounce } from 'lodash'; import { useDispatch, useSelector } from 'react-redux'; import useInterval from 'react-use/lib/useInterval'; import useTimeoutFn from 'react-use/lib/useTimeoutFn'; @@ -37,7 +35,7 @@ import { SessionIconButton } from '../icon/SessionIconButton'; import { LeftPaneSectionContainer } from './LeftPaneSectionContainer'; import { SettingsKey } from '../../data/settings-key'; -import { getLatestReleaseFromFileServer } from '../../session/apis/file_server_api/FileServerApi'; +import { useFetchLatestReleaseFromFileServer } from '../../hooks/useFetchLatestReleaseFromFileServer'; import { forceRefreshRandomSnodePool, getFreshSwarmFor, @@ -144,11 +142,6 @@ const Section = (props: { type: SectionType }) => { const cleanUpMediasInterval = DURATION.MINUTES * 60; -// every 1 minute we fetch from the fileserver to check for a new release -// * if there is none, no request to github are made. -// * if there is a version on the fileserver more recent than our current, we fetch github to get the UpdateInfos and trigger an update as usual (asking user via dialog) -const fetchReleaseFromFileServerInterval = 1000 * 60; // try to fetch the latest release from the fileserver every minute - const setupTheme = async () => { const shouldFollowSystemTheme = window.getSettingValue(SettingsKey.hasFollowSystemThemeEnabled); const theme = window.Events.getThemeSetting(); @@ -232,22 +225,6 @@ const doAppStartUp = async () => { }, 20000); }; -async function fetchReleaseFromFSAndUpdateMain() { - try { - window.log.info('[updater] about to fetchReleaseFromFSAndUpdateMain'); - - const latest = await getLatestReleaseFromFileServer(); - window.log.info('[updater] fetched latest release from fileserver: ', latest); - - if (isString(latest) && !isEmpty(latest)) { - ipcRenderer.send('set-release-from-file-server', latest); - window.readyForUpdates(); - } - } catch (e) { - window.log.warn(e); - } -} - /** * ActionsPanel is the far left banner (not the left pane). * The panel with buttons to switch between the message/contact/settings/theme views @@ -272,12 +249,7 @@ export const ActionsPanel = () => { useInterval(cleanUpOldDecryptedMedias, startCleanUpMedia ? cleanUpMediasInterval : null); - useInterval(() => { - if (!ourPrimaryConversation) { - return; - } - void fetchReleaseFromFSAndUpdateMain(); - }, fetchReleaseFromFileServerInterval); + useFetchLatestReleaseFromFileServer(); useInterval(() => { if (!ourPrimaryConversation) { diff --git a/ts/hooks/useFetchLatestReleaseFromFileServer.ts b/ts/hooks/useFetchLatestReleaseFromFileServer.ts new file mode 100644 index 000000000..4766954e5 --- /dev/null +++ b/ts/hooks/useFetchLatestReleaseFromFileServer.ts @@ -0,0 +1,15 @@ +import { useSelector } from 'react-redux'; +import useInterval from 'react-use/lib/useInterval'; +import { getOurPrimaryConversation } from '../state/selectors/conversations'; +import { fetchLatestRelease } from '../session/fetch_latest_release'; + +export function useFetchLatestReleaseFromFileServer() { + const ourPrimaryConversation = useSelector(getOurPrimaryConversation); + + useInterval(() => { + if (!ourPrimaryConversation) { + return; + } + void fetchLatestRelease.fetchReleaseFromFSAndUpdateMain(); + }, fetchLatestRelease.fetchReleaseFromFileServerInterval); +} diff --git a/ts/session/fetch_latest_release/index.ts b/ts/session/fetch_latest_release/index.ts new file mode 100644 index 000000000..0ecbe7cb8 --- /dev/null +++ b/ts/session/fetch_latest_release/index.ts @@ -0,0 +1,55 @@ +// every 1 minute we fetch from the fileserver to check for a new release +// * if there is none, no request to github are made. +// * if there is a version on the fileserver more recent than our current, we fetch github to get the UpdateInfos and trigger an update as usual (asking user via dialog) + +import { isEmpty, isString } from 'lodash'; +import { ipcRenderer } from 'electron'; +import { DURATION } from '../constants'; +import { getLatestReleaseFromFileServer } from '../apis/file_server_api/FileServerApi'; + +/** + * Try to fetch the latest release from the fileserver every 1 minute. + * If we did fetch a release already in the last 30 minutes, we will skip the call. + */ +const fetchReleaseFromFileServerInterval = DURATION.MINUTES * 1; + +/** + * We don't want to hit the fileserver too often. Only often on start, and then every 30 minutes + */ +const skipIfLessThan = DURATION.MINUTES * 30; + +let lastFetchedTimestamp = Number.MIN_SAFE_INTEGER; + +function resetForTesting() { + lastFetchedTimestamp = Number.MIN_SAFE_INTEGER; +} + +async function fetchReleaseFromFSAndUpdateMain() { + try { + window.log.info('[updater] about to fetchReleaseFromFSAndUpdateMain'); + const diff = Date.now() - lastFetchedTimestamp; + if (diff < skipIfLessThan) { + window.log.info( + `[updater] fetched release from fs ${Math.floor(diff / DURATION.MINUTES)}minutes ago, skipping until that's at least ${Math.floor(skipIfLessThan / DURATION.MINUTES)}` + ); + return; + } + + const justFetched = await getLatestReleaseFromFileServer(); + window.log.info('[updater] fetched latest release from fileserver: ', justFetched); + + if (isString(justFetched) && !isEmpty(justFetched)) { + lastFetchedTimestamp = Date.now(); + ipcRenderer.send('set-release-from-file-server', justFetched); + window.readyForUpdates(); + } + } catch (e) { + window.log.warn(e); + } +} + +export const fetchLatestRelease = { + fetchReleaseFromFileServerInterval, + fetchReleaseFromFSAndUpdateMain, + resetForTesting, +}; From a72e9c9b2fcfd252898586187021f0b369b176cb Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 26 Jul 2024 15:47:18 +1000 Subject: [PATCH 3/3] chore: dedup yarn.lock --- yarn.lock | 59 ++++++++++++++++++------------------------------------- 1 file changed, 19 insertions(+), 40 deletions(-) diff --git a/yarn.lock b/yarn.lock index e5f576610..f965aa8ae 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2019,15 +2019,7 @@ "@types/prop-types" "*" "@types/react" "*" -"@types/react@*", "@types/react@17.0.2", "@types/react@^17": - version "17.0.2" - resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.2.tgz#3de24c4efef902dd9795a49c75f760cbe4f7a5a8" - integrity sha512-Xt40xQsrkdvjn1EyWe1Bc0dJLcil/9x2vAuW7ya+PuQip4UYUaXyhzWmAbwRsdMgwOFHpfp7/FFZebDU6Y8VHA== - dependencies: - "@types/prop-types" "*" - csstype "^3.0.2" - -"@types/react@^17.0.2": +"@types/react@*", "@types/react@^17", "@types/react@^17.0.2": version "17.0.65" resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.65.tgz#95f6a2ab61145ffb69129d07982d047f9e0870cd" integrity sha512-oxur785xZYHvnI7TRS61dXbkIhDPnGfsXKv0cNXR/0ml4SipRIFpSMzA7HMEfOywFwJ5AOnPrXYTEiTRUQeGlQ== @@ -2036,6 +2028,14 @@ "@types/scheduler" "*" csstype "^3.0.2" +"@types/react@17.0.2": + version "17.0.2" + resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.2.tgz#3de24c4efef902dd9795a49c75f760cbe4f7a5a8" + integrity sha512-Xt40xQsrkdvjn1EyWe1Bc0dJLcil/9x2vAuW7ya+PuQip4UYUaXyhzWmAbwRsdMgwOFHpfp7/FFZebDU6Y8VHA== + dependencies: + "@types/prop-types" "*" + csstype "^3.0.2" + "@types/redux-logger@3.0.7": version "3.0.7" resolved "https://registry.yarnpkg.com/@types/redux-logger/-/redux-logger-3.0.7.tgz#163f6f6865c69c21d56f9356dc8d741718ec0db0" @@ -3905,7 +3905,14 @@ debug@2.6.9, debug@^2.2.0, debug@^2.6.8, debug@^2.6.9: dependencies: ms "2.0.0" -debug@4, debug@4.3.4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4: +debug@4, debug@^4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4: + version "4.3.5" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.5.tgz#e83444eceb9fedd4a1da56d671ae2446a01a6e1e" + integrity sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg== + dependencies: + ms "2.1.2" + +debug@4.3.4: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== @@ -3919,13 +3926,6 @@ debug@^3.2.7: dependencies: ms "^2.1.1" -debug@^4: - version "4.3.5" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.5.tgz#e83444eceb9fedd4a1da56d671ae2446a01a6e1e" - integrity sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg== - dependencies: - ms "2.1.2" - decamelize-keys@^1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.1.tgz#04a2d523b2f18d80d0158a43b895d56dff8d19d8" @@ -5128,16 +5128,7 @@ fs-extra@^10.0.0, fs-extra@^10.1.0: jsonfile "^6.0.1" universalify "^2.0.0" -fs-extra@^11.0.0: - version "11.1.1" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.1.1.tgz#da69f7c39f3b002378b0954bb6ae7efdc0876e2d" - integrity sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ== - dependencies: - graceful-fs "^4.2.0" - jsonfile "^6.0.1" - universalify "^2.0.0" - -fs-extra@^11.2.0: +fs-extra@^11.0.0, fs-extra@^11.2.0: version "11.2.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.2.0.tgz#e70e17dfad64232287d01929399e0ea7c86b0e5b" integrity sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw== @@ -9588,19 +9579,7 @@ tapable@^2.1.1, tapable@^2.2.0: resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0" integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ== -tar@^6.1.0, tar@^6.1.11: - version "6.2.0" - resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.0.tgz#b14ce49a79cb1cd23bc9b016302dea5474493f73" - integrity sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ== - dependencies: - chownr "^2.0.0" - fs-minipass "^2.0.0" - minipass "^5.0.0" - minizlib "^2.1.1" - mkdirp "^1.0.3" - yallist "^4.0.0" - -tar@^6.2.0: +tar@^6.1.0, tar@^6.1.11, tar@^6.2.0: version "6.2.1" resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.1.tgz#717549c541bc3c2af15751bea94b1dd068d4b03a" integrity sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==