1 files changed, 25 insertions, 45 deletions

diff --git a/packages/main/src/index.ts b/packages/main/src/index.ts
index a886a16..128ae35 100644
--- a/packages/main/src/index.ts
+++ b/packages/main/src/index.ts
@@ -22,7 +22,6 @@
 import { readFileSync } from 'node:fs';
 import { readFile } from 'node:fs/promises';
 import { arch } from 'node:os';
-import path from 'node:path';
 import { URL } from 'node:url';
 
 import {
@@ -46,7 +45,8 @@ import {
   enableStacktraceSourceMaps,
   installDevToolsExtensions,
   openDevToolsWhenReady,
-} from './devTools';
+} from './infrastructure/electron/impl/devTools';
+import getDistResources from './infrastructure/resources/impl/getDistResources';
 import initReactions from './initReactions';
 import { createMainStore } from './stores/MainStore';
 import { getLogger } from './utils/log';
@@ -107,23 +107,12 @@ app.setAboutPanelOptions({
   version: '',
 });
 
-// eslint-disable-next-line unicorn/prefer-module -- Electron apps run in a commonjs environment.
-const thisDir = __dirname;
+const resources = getDistResources(isDevelopment);
 
-function getResourcePath(relativePath: string): string {
-  return path.join(thisDir, relativePath);
-}
-
-const baseUrl = `file://${thisDir}`;
-function getResourceUrl(relativePath: string): string {
-  return new URL(relativePath, baseUrl).toString();
-}
-
-const serviceInjectRelativePath = '../../service-inject/dist/index.js';
-const serviceInjectPath = getResourcePath(serviceInjectRelativePath);
+const serviceInjectPath = resources.getPath('service-inject', 'index.js');
 const serviceInject: WebSource = {
   code: readFileSync(serviceInjectPath, 'utf8'),
-  url: getResourceUrl(serviceInjectRelativePath),
+  url: resources.getFileURL('service-inject', 'index.js'),
 };
 
 let mainWindow: BrowserWindow | undefined;
@@ -139,36 +128,30 @@ initReactions(store)
     log.log('Failed to initialize application', error);
   });
 
-const rendererBaseUrl = getResourceUrl('../renderer/');
+const rendererBaseURL = resources.getRendererURL('/');
 function shouldCancelMainWindowRequest(url: string, method: string): boolean {
   if (method !== 'GET') {
     return true;
   }
-  let normalizedUrl: string;
+  let normalizedURL: string;
   try {
-    normalizedUrl = new URL(url).toString();
+    normalizedURL = new URL(url).toString();
   } catch {
     return true;
   }
-  if (isDevelopment) {
-    if (
-      DEVMODE_ALLOWED_URL_PREFIXES.some((prefix) =>
-        normalizedUrl.startsWith(prefix),
-      )
-    ) {
-      return false;
-    }
-    if (import.meta.env.VITE_DEV_SERVER_URL !== undefined) {
-      const isHttp = normalizedUrl.startsWith(
-        import.meta.env.VITE_DEV_SERVER_URL,
-      );
-      const isWs = normalizedUrl.startsWith(
-        import.meta.env.VITE_DEV_SERVER_URL.replace(/^http:/, 'ws:'),
-      );
-      return !isHttp && !isWs;
-    }
+  if (
+    isDevelopment &&
+    DEVMODE_ALLOWED_URL_PREFIXES.some((prefix) =>
+      normalizedURL.startsWith(prefix),
+    )
+  ) {
+    return false;
   }
-  return !normalizedUrl.startsWith(getResourceUrl(rendererBaseUrl));
+  const isHttp = normalizedURL.startsWith(rendererBaseURL);
+  const isWs = normalizedURL.startsWith(
+    rendererBaseURL.replace(/^http:/, 'ws:'),
+  );
+  return !isHttp && !isWs;
 }
 
 async function createWindow(): Promise<unknown> {
@@ -178,7 +161,7 @@ async function createWindow(): Promise<unknown> {
     webPreferences: {
       sandbox: true,
       devTools: isDevelopment,
-      preload: getResourcePath('../../preload/dist/index.cjs'),
+      preload: resources.getPath('preload', 'index.cjs'),
     },
   });
 
@@ -200,13 +183,10 @@ async function createWindow(): Promise<unknown> {
     },
   );
 
-  const pageUrl =
-    isDevelopment && import.meta.env.VITE_DEV_SERVER_URL !== undefined
-      ? import.meta.env.VITE_DEV_SERVER_URL
-      : getResourceUrl('../renderer/dist/index.html');
+  const pageURL = resources.getRendererURL('index.html');
 
   webContents.on('will-navigate', (event, url) => {
-    if (url !== pageUrl) {
+    if (url !== pageURL) {
       event.preventDefault();
     }
   });
@@ -225,7 +205,7 @@ async function createWindow(): Promise<unknown> {
     webPreferences: {
       sandbox: true,
       nodeIntegrationInSubFrames: true,
-      preload: getResourcePath('../../service-preload/dist/index.cjs'),
+      preload: resources.getPath('service-preload', 'index.cjs'),
       partition: 'persist:service',
     },
   });
@@ -370,7 +350,7 @@ async function createWindow(): Promise<unknown> {
       log.error('Failed to load browser', error);
     });
 
-  return mainWindow.loadURL(pageUrl);
+  return mainWindow.loadURL(pageURL);
 }
 
 app.on('second-instance', () => {