diff --git a/packages/insomnia/src/main/local-storage.ts b/packages/insomnia/src/main/electron-storage.ts similarity index 83% rename from packages/insomnia/src/main/local-storage.ts rename to packages/insomnia/src/main/electron-storage.ts index 00514a19229..efaba15ff48 100644 --- a/packages/insomnia/src/main/local-storage.ts +++ b/packages/insomnia/src/main/electron-storage.ts @@ -1,7 +1,7 @@ import fs from 'fs'; import path from 'path'; -class LocalStorage { +class ElectronStorage { _buffer: Record = {}; _timeouts: Record = {}; _basePath: string | null = null; @@ -11,7 +11,7 @@ class LocalStorage { // Debounce writes on a per key basis fs.mkdirSync(basePath, { recursive: true }); - console.log(`[localstorage] Initialized at ${basePath}`); + console.log(`[ElectronStorage] Initialized at ${basePath}`); } setItem(key: string, obj?: T) { @@ -39,7 +39,7 @@ class LocalStorage { try { return JSON.parse(contents); } catch (error) { - console.error(`[localstorage] Failed to parse item from LocalStorage: ${error}`); + console.error(`[ElectronStorage] Failed to parse item from electron storage: ${error}`); return defaultObj; } } @@ -61,7 +61,7 @@ class LocalStorage { try { fs.writeFileSync(path, contents); } catch (error) { - console.error(`[localstorage] Failed to save to LocalStorage: ${error}`); + console.error(`[ElectronStorage] Failed to save to electron storage: ${error}`); } } } @@ -72,4 +72,4 @@ class LocalStorage { } } -export default LocalStorage; +export default ElectronStorage; diff --git a/packages/insomnia/src/main/window-utils.ts b/packages/insomnia/src/main/window-utils.ts index 7c87f1bc921..6e9c8f02a81 100644 --- a/packages/insomnia/src/main/window-utils.ts +++ b/packages/insomnia/src/main/window-utils.ts @@ -30,8 +30,8 @@ import { docsBase } from '../common/documentation'; import * as log from '../common/log'; import { APP_START_TIME, SentryMetrics } from '../common/sentry'; import { invariant } from '../utils/invariant'; +import ElectronStorage from './electron-storage'; import { ipcMainOn } from './ipc/electron'; -import LocalStorage from './local-storage'; const DEFAULT_WIDTH = 1280; const DEFAULT_HEIGHT = 720; @@ -39,7 +39,7 @@ const MINIMUM_WIDTH = 500; const MINIMUM_HEIGHT = 400; const browserWindows = new Map<'Insomnia' | 'HiddenBrowserWindow', ElectronBrowserWindow>(); -let localStorage: LocalStorage | null = null; +let electronStorage: ElectronStorage | null = null; let hiddenWindowIsBusy = false; interface Bounds { @@ -50,7 +50,7 @@ interface Bounds { } export function init() { - initLocalStorage(); + initElectronStorage(); } const stopAndWaitForHiddenBrowserWindow = async (runningHiddenBrowserWindow: BrowserWindow) => { return await new Promise(resolve => { @@ -741,11 +741,11 @@ function saveBounds() { // Only save the size if we're not in fullscreen if (!fullscreen) { - localStorage?.setItem('bounds', browserWindow?.getBounds()); - localStorage?.setItem('maximize', browserWindow?.isMaximized()); - localStorage?.setItem('fullscreen', false); + electronStorage?.setItem('bounds', browserWindow?.getBounds()); + electronStorage?.setItem('maximize', browserWindow?.isMaximized()); + electronStorage?.setItem('fullscreen', false); } else { - localStorage?.setItem('fullscreen', true); + electronStorage?.setItem('fullscreen', true); } } @@ -755,9 +755,9 @@ function getBounds() { let maximize = false; try { - bounds = localStorage?.getItem('bounds', {}); - fullscreen = localStorage?.getItem('fullscreen', false); - maximize = localStorage?.getItem('maximize', false); + bounds = electronStorage?.getItem('bounds', {}); + fullscreen = electronStorage?.getItem('fullscreen', false); + maximize = electronStorage?.getItem('maximize', false); } catch (error) { // This should never happen, but if it does...! console.error('Failed to parse window bounds', error); @@ -776,7 +776,7 @@ const ZOOM_MIN = 0.05; const getZoomFactor = () => { try { - return localStorage?.getItem('zoomFactor', ZOOM_DEFAULT); + return electronStorage?.getItem('zoomFactor', ZOOM_DEFAULT); } catch (error) { // This should never happen, but if it does...! console.error('Failed to parse zoomFactor', error); @@ -797,12 +797,12 @@ export const setZoom = (transformer: (current: number) => number) => () => { const actual = Math.min(Math.max(ZOOM_MIN, desired), ZOOM_MAX); browserWindow.webContents.setZoomLevel(actual); - localStorage?.setItem('zoomFactor', actual); + electronStorage?.setItem('zoomFactor', actual); }; -function initLocalStorage() { - const localStoragePath = path.join(process.env['INSOMNIA_DATA_PATH'] || app.getPath('userData'), 'localStorage'); - localStorage = new LocalStorage(localStoragePath); +function initElectronStorage() { + const electronStoragePath = path.join(process.env['INSOMNIA_DATA_PATH'] || app.getPath('userData'), 'localStorage'); + electronStorage = new ElectronStorage(electronStoragePath); } export function createWindowsAndReturnMain({ firstLaunch }: { firstLaunch?: boolean } = {}) {