Use environment variables instead of command-line arguments in Electr…

…on app

app/ide-desktop/lib/client/electron-builder-config.ts

@@ -260,8 +260,11 @@ export function createElectronBuilderConfig(passedArgs: Arguments): electronBuil
                     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                     appBundleId: macBuildOptions.appId!,
                     appPath: `${appOutDir}/${appName}.app`,
-                    appleId: process.env.APPLEID,
-                    appleIdPassword: process.env.APPLEIDPASS,
+                    // It is a mistake for either of these to be undefined.
+                    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                    appleId: process.env.APPLEID!,
+                    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                    appleIdPassword: process.env.APPLEIDPASS!,
                 })
             }
         },

app/ide-desktop/lib/client/src/bin/project-manager.ts

@@ -30,32 +30,37 @@ export function pathOrPanic(args: config.Args): string {
 }
 
 /** Execute the Project Manager with given arguments. */
-async function exec(args: config.Args, processArgs: string[]) {
+async function exec(args: config.Args, processArgs: string[], env?: NodeJS.ProcessEnv) {
     const binPath = pathOrPanic(args)
-    return await execFile(binPath, processArgs)
+    return await execFile(binPath, processArgs, { env })
 }
 
 /** Spawn the Project Manager process.
  *
  * The standard output and error handles will be redirected to the output and error handles of the
  * Electron app. Input is piped to this process, so it will not be closed until this process
  * finishes. */
-export function spawn(args: config.Args, processArgs: string[]): childProcess.ChildProcess {
+export function spawn(
+    args: config.Args,
+    processArgs: string[],
+    env?: NodeJS.ProcessEnv
+): childProcess.ChildProcess {
     return logger.groupMeasured(
         `Starting the backend process with the following options: ${processArgs.join(', ')}.`,
         () => {
             const binPath = pathOrPanic(args)
-            const process = childProcess.spawn(binPath, processArgs, {
+            const pmProcess = childProcess.spawn(binPath, processArgs, {
                 stdio: [/* stdin */ 'pipe', /* stdout */ 'inherit', /* stderr */ 'inherit'],
+                env,
                 // The Project Manager should never spawn any windows. On Windows OS this needs
                 // to be manually prevented, as the default is to spawn a console window.
                 windowsHide: true,
             })
-            logger.log(`Backend has been spawned (pid = ${String(process.pid)}).`)
-            process.on('exit', code => {
+            logger.log(`Backend has been spawned (pid = ${String(pmProcess.pid)}).`)
+            pmProcess.on('exit', code => {
                 logger.log(`Backend exited with code ${String(code)}.`)
             })
-            return process
+            return pmProcess
         }
     )
 }

app/ide-desktop/lib/client/src/index.ts

@@ -244,12 +244,15 @@ class App {
             })
             const projectManagerUrl = `ws://${this.projectManagerHost}:${this.projectManagerPort}`
             this.args.groups.engine.options.projectManagerUrl.value = projectManagerUrl
-            const backendOpts = [
-                ...(this.args.groups.debug.options.verbose.value ? ['-vv'] : []),
-                `--server-host=${this.projectManagerHost}`,
-                `--server-port=${this.projectManagerPort}`,
-            ]
-            projectManager.spawn(this.args, backendOpts)
+            const backendOpts = this.args.groups.debug.options.verbose.value ? ['-vv'] : []
+            const backendEnv = Object.assign({}, process.env, {
+                // These are environment variables, and MUST be in CONSTANT_CASE.
+                // eslint-disable-next-line @typescript-eslint/naming-convention
+                SERVER_HOST: this.projectManagerHost,
+                // eslint-disable-next-line @typescript-eslint/naming-convention
+                SERVER_PORT: `${this.projectManagerPort}`,
+            })
+            projectManager.spawn(this.args, backendOpts, backendEnv)
         })
     }
 

app/ide-desktop/lib/types/globals.d.ts

@@ -57,9 +57,10 @@ declare global {
     namespace NodeJS {
         /** */
         interface ProcessEnv {
+            // These are environment variables, and MUST be in CONSTANT_CASE.
             /* eslint-disable @typescript-eslint/naming-convention */
-            APPLEID: string
-            APPLEIDPASS: string
+            APPLEID?: string
+            APPLEIDPASS?: string
             /* eslint-enable @typescript-eslint/naming-convention */
         }
     }