mirror of
https://github.com/fluxerapp/fluxer
synced 2026-10-18 13:35:42 +09:00
fix(desktop): honour the system proxy in main-process requests (#3270)
This commit is contained in:
1 parent
6de6be2358
commit
3071bc7525
16 files changed
+542
-19
No files matched your search
@@ -13,6 +13,7 @@ import {
|
||||
sweepAbandonedAppImageUpdates,
|
||||
} from '@electron/main/AppImageUpdate';
|
||||
import {destroyDesktopTray} from '@electron/main/DesktopTray';
|
||||
import {moduleNetworkFetch} from '@electron/main/ModuleNetworkFetch';
|
||||
import {MANUAL_DESKTOP_FORMATS, type ManualDesktopFormat} from '@electron/main/ShellDownloadFormats';
|
||||
import {resolveShellUpdatePlan, ShellUpdateCapability} from '@electron/main/ShellUpdateCapability';
|
||||
import {relaunchAndExit} from '@electron/main/Troubleshooting';
|
||||
@@ -33,7 +34,7 @@ import {
|
||||
type UpdaterDownloadOption,
|
||||
} from '@electron/main/UpdaterDownloads';
|
||||
import {setQuitting} from '@electron/main/Window';
|
||||
import {app, autoUpdater, type BrowserWindow, ipcMain} from 'electron';
|
||||
import {app, autoUpdater, type BrowserWindow, ipcMain, net} from 'electron';
|
||||
import log from 'electron-log';
|
||||
import type {UpdateInfo, VelopackAsset} from 'velopack';
|
||||
|
||||
@@ -552,7 +553,7 @@ async function fetchManualLatest(options: {forceRefresh?: boolean} = {}): Promis
|
||||
if (!options.forceRefresh && manualLatestCache && now - manualLatestCache.at < MANUAL_CACHE_TTL_MS) {
|
||||
return manualLatestCache.info;
|
||||
}
|
||||
const response = await fetch(`${UPDATE_BASE_URL}/latest`, {
|
||||
const response = await net.fetch(`${UPDATE_BASE_URL}/latest`, {
|
||||
cache: 'no-store',
|
||||
headers: {
|
||||
Accept: 'application/json',
|
||||
@@ -628,6 +629,7 @@ async function downloadAppImageUpdate(
|
||||
target,
|
||||
url,
|
||||
expectedSha256,
|
||||
fetchImpl: moduleNetworkFetch,
|
||||
onProgress: ({transferred, total}) => {
|
||||
const now = Date.now();
|
||||
const dtMs = now - lastSampleAt;
|
||||
|
||||
Reference in new issue
Block a user