feat: Add build time browser mode configuration to package.json

refactor: Stripped out unused 'installed' flag

Author: colin969

gulpfile.mjs

@@ -20,7 +20,8 @@ const config = {
   buildVersion: Date.now().toString(),
   publish: !!process.env.PUBLISH,
   isRelease: process.env.NODE_ENV === 'production',
-  isStaticInstall: packageJson.config.installed,
+  browserBackendHost: packageJson.config.browserBackendHost || 'ws://localhost:12001/',
+  isBrowserBackendRemote: !!packageJson.config.isBrowserBackendRemote,
   static: {
     src: './static',
     dest: './build',
@@ -340,7 +341,7 @@ function configVersion(done) {
 
 /* ----- Version ---- */
 
-function createVersionFile(done) {
+function updateConstants(done) {
   // Get the current date
   const currentDate = new Date();
 
@@ -362,6 +363,22 @@ function createVersionFile(done) {
   const data = `export const VERSION = '${formattedDate} (${gitCommitHash})';
 export const VERSION_EPOCH = ${Date.now()};
 export const FPA_VERSION = '${fpaVersion}';
+export const IS_BROWSER_BACKEND_REMOTE = ${config.isBrowserBackendRemote};
+export const BROWSER_ISDEV = ${!config.isRelease};
+export const getBrowserBackendHost = () => {
+  const host = '${config.browserBackendHost}';
+  if (host.startsWith('ws:') || host.startsWith('wss:/')) {
+    return host;
+  } else {
+    // Convert relative path to absolute WebSocket URL
+    const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:';
+    const hostname = window.location.hostname;
+    const port = window.location.port;
+    const portSuffix = port ? ':' + port : '';
+    const basePath = host.startsWith('/') ? host : '/' + host;
+    return protocol + '//' + hostname + portSuffix + basePath;
+  }
+};
 `;
 
   // Write to src/shared/version.ts
@@ -483,7 +500,7 @@ async function extractTarball(inputFilePath, outputDirectory) {
 export const clean = series(cleanTask);
 export const build = series(
   cleanTask,
-  createVersionFile,
+  updateConstants,
   installCrossDeps,
   buildStatic,
   parallel(
@@ -497,7 +514,7 @@ export const build = series(
 );
 export const watch = series(
   cleanTask,
-  createVersionFile,
+  updateConstants,
   installCrossDeps,
   buildStatic,
   parallel(
@@ -511,7 +528,7 @@ export const watch = series(
 );
 export const watchStatic = series(
   cleanTask,
-  createVersionFile,
+  updateConstants,
   installCrossDeps,
   buildStatic,
   buildExtensions,

package.json

@@ -4,7 +4,8 @@
   "description": "A desktop application used to browse, manage and play games from Flashpoint Archive",
   "main": "build/main/electron.js",
   "config": {
-    "installed": false
+    "browserBackendHost": "ws://localhost:12001/",
+    "isBrowserBackendRemote": false
   },
   "scripts": {
     "start": "electron ./build/main/electron.js",

src/main/Main.ts

@@ -492,8 +492,8 @@ export function main(init: Init): void {
     const url = argv.find((arg) => arg.startsWith('flashpoint://'));
     const data: InitRendererData = {
       isBackRemote: !!init.args['connect-remote'],
-      installed: !!state._installed,
       host: state.backHost.href,
+      isDev: Util.isDev,
       url
     };
     event.returnValue = data;

src/renderer/components/AppLoader.tsx

@@ -37,6 +37,7 @@ const onInit = async (data: InitRendererData, dispatch: AppDispatch) => {
   window.Shared.isBackRemote = data.isBackRemote;
   window.Shared.backUrl = new URL(data.host);
   window.Shared.url = data.url;
+  window.Shared.isDev = data.isDev;
 
   // Register connection listener
   let startTime: number = 0;
@@ -152,7 +153,7 @@ window.Shared = {
     offset: 0,
   },
 
-  isDev: true, // TODO: fix
+  isDev: false,
 
   isBackRemote: createErrorProxy('isBackRemote'),
 

src/renderer/index.tsx

@@ -3,6 +3,7 @@ import { MergeComponents } from '@mdx-js/react/lib';
 import { init } from '@module-federation/enhanced/runtime';
 import store from '@renderer/store/store';
 import { InitRendererData } from '@shared/IPC';
+import { BROWSER_ISDEV, getBrowserBackendHost, IS_BROWSER_BACKEND_REMOTE } from '@shared/version';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { createRoot } from 'react-dom/client';
@@ -43,9 +44,9 @@ import { ProgressContext } from './context/ProgressContext';
   const data: InitRendererData = window.electronAPI ?
     window.electronAPI.getInitData() :
     {
-      isBackRemote: false,
-      installed: false,
-      host: 'ws://localhost:12001/'
+      isDev: BROWSER_ISDEV,
+      host: getBrowserBackendHost(),
+      isBackRemote: IS_BROWSER_BACKEND_REMOTE,
     };
 
   const container = document.getElementById('root')!;

src/shared/IPC.ts

@@ -4,7 +4,7 @@ export const InitRendererChannel = 'renderer-init';
 /** Message contents for the "initialize renderer" message. */
 export type InitRendererData = {
   isBackRemote: boolean;
-  installed: boolean;
+  isDev: boolean;
   host: string;
   url?: string;
 }