flightdeck 0.0.14 → 0.1.0

package/dist/flightdeck.$configPath.schema.json

@@ -1,8 +1,8 @@
 {
 	"type": "object",
 	"properties": {
-		"secret": {
-			"type": "string"
+		"port": {
+			"type": "number"
 		},
 		"packageName": {
 			"type": "string"
@@ -47,7 +47,6 @@
 		}
 	},
 	"required": [
-		"secret",
 		"packageName",
 		"services",
 		"flightdeckRootDir",

package/dist/flightdeck.bin.js

@@ -2,8 +2,8 @@
 
 // src/flightdeck.bin.ts
 import * as path from "node:path";
-import { cli, optional } from "comline";
-import { z } from "zod";
+import { cli, optional, parseNumberOption } from "comline";
+import { z as z2 } from "zod";
 
 // src/flightdeck.lib.ts
 import { execSync, spawn } from "node:child_process";
@@ -14,9 +14,82 @@ import { resolve } from "node:path";
 import { Future } from "atom.io/internal";
 import { fromEntries, toEntries } from "atom.io/json";
 import { ChildSocket } from "atom.io/realtime-server";
-var PORT = process.env.PORT ?? 8080;
-var ORIGIN = `http://localhost:${PORT}`;
 
+// /home/runner/work/wayforge/wayforge/packages/flightdeck/node_modules/@t3-oss/env-core/dist/index.js
+import { object } from "zod";
+function createEnv(opts) {
+  const runtimeEnv = opts.runtimeEnvStrict ?? opts.runtimeEnv ?? process.env;
+  const emptyStringAsUndefined = opts.emptyStringAsUndefined ?? false;
+  if (emptyStringAsUndefined) {
+    for (const [key, value] of Object.entries(runtimeEnv)) {
+      if (value === "") {
+        delete runtimeEnv[key];
+      }
+    }
+  }
+  const skip = !!opts.skipValidation;
+  if (skip)
+    return runtimeEnv;
+  const _client = typeof opts.client === "object" ? opts.client : {};
+  const _server = typeof opts.server === "object" ? opts.server : {};
+  const _shared = typeof opts.shared === "object" ? opts.shared : {};
+  const client = object(_client);
+  const server = object(_server);
+  const shared = object(_shared);
+  const isServer = opts.isServer ?? (typeof window === "undefined" || ("Deno" in window));
+  const allClient = client.merge(shared);
+  const allServer = server.merge(shared).merge(client);
+  const parsed = isServer ? allServer.safeParse(runtimeEnv) : allClient.safeParse(runtimeEnv);
+  const onValidationError = opts.onValidationError ?? ((error) => {
+    console.error("\u274C Invalid environment variables:", error.flatten().fieldErrors);
+    throw new Error("Invalid environment variables");
+  });
+  const onInvalidAccess = opts.onInvalidAccess ?? ((_variable) => {
+    throw new Error("\u274C Attempted to access a server-side environment variable on the client");
+  });
+  if (parsed.success === false) {
+    return onValidationError(parsed.error);
+  }
+  const isServerAccess = (prop) => {
+    if (!opts.clientPrefix)
+      return true;
+    return !prop.startsWith(opts.clientPrefix) && !(prop in shared.shape);
+  };
+  const isValidServerAccess = (prop) => {
+    return isServer || !isServerAccess(prop);
+  };
+  const ignoreProp = (prop) => {
+    return prop === "__esModule" || prop === "$$typeof";
+  };
+  const extendedObj = (opts.extends ?? []).reduce((acc, curr) => {
+    return Object.assign(acc, curr);
+  }, {});
+  const fullObj = Object.assign(parsed.data, extendedObj);
+  const env = new Proxy(fullObj, {
+    get(target, prop) {
+      if (typeof prop !== "string")
+        return;
+      if (ignoreProp(prop))
+        return;
+      if (!isValidServerAccess(prop))
+        return onInvalidAccess(prop);
+      return Reflect.get(target, prop);
+    }
+  });
+  return env;
+}
+
+// src/flightdeck.env.ts
+import { z } from "zod";
+var env = createEnv({
+  server: { FLIGHTDECK_SECRET: z.string().optional() },
+  clientPrefix: `NEVER`,
+  client: {},
+  runtimeEnv: import.meta.env,
+  emptyStringAsUndefined: true
+});
+
+// src/flightdeck.lib.ts
 class FlightDeck {
   options;
   safety = 0;
@@ -38,7 +111,10 @@ class FlightDeck {
   persistentStateDir;
   constructor(options) {
     this.options = options;
-    const { secret, flightdeckRootDir = resolve(homedir(), `services`) } = options;
+    const { FLIGHTDECK_SECRET } = env;
+    const { flightdeckRootDir = resolve(homedir(), `services`) } = options;
+    const port = options.port ?? 8080;
+    const origin = `http://localhost:${port}`;
     const servicesEntries = toEntries(options.services);
     this.services = fromEntries(servicesEntries.map(([serviceName]) => [serviceName, null]));
     this.serviceIdx = fromEntries(servicesEntries.map(([serviceName], idx) => [serviceName, idx]));
@@ -83,79 +159,83 @@ class FlightDeck {
     if (!existsSync(this.persistentStateDir)) {
       mkdirSync(this.persistentStateDir, { recursive: true });
     }
-    createServer((req, res) => {
-      let data = [];
-      req.on(`data`, (chunk) => {
-        data.push(chunk instanceof Buffer ? chunk : Buffer.from(chunk));
-      }).on(`end`, () => {
-        const authHeader = req.headers.authorization;
-        try {
-          if (typeof req.url === `undefined`)
-            throw 400;
-          const expectedAuthHeader = `Bearer ${secret}`;
-          if (authHeader !== `Bearer ${secret}`) {
-            this.logger.info(`Unauthorized: needed \`${expectedAuthHeader}\`, got \`${authHeader}\``);
-            throw 401;
-          }
-          const url = new URL(req.url, ORIGIN);
-          this.logger.info(req.method, url.pathname);
-          switch (req.method) {
-            case `POST`:
-              {
-                switch (url.pathname) {
-                  case `/`:
-                    {
-                      res.writeHead(200);
-                      res.end();
-                      const installFile = resolve(this.persistentStateDir, `install`);
-                      const readyFile = resolve(this.persistentStateDir, `ready`);
-                      if (!existsSync(installFile)) {
-                        this.logger.info(`Install file does not exist yet. Creating...`);
-                        writeFileSync(installFile, ``);
-                      }
-                      if (existsSync(readyFile)) {
-                        this.logger.info(`Ready file exists. Removing...`);
-                        rmSync(readyFile);
-                      }
-                      this.getLatestRelease();
-                      if (toEntries(this.servicesReadyToUpdate).every(([, isReady]) => isReady)) {
-                        this.logger.info(`All services are ready to update!`);
-                        this.stopAllServices();
-                        return;
-                      }
-                      for (const entry of toEntries(this.services)) {
-                        const [serviceName, service] = entry;
-                        if (service) {
-                          if (this.options.services[serviceName].waitFor) {
-                            service.emit(`updatesReady`);
+    if (FLIGHTDECK_SECRET === undefined) {
+      this.logger.warn(`No FLIGHTDECK_SECRET environment variable found. FlightDeck will not run an update server.`);
+    } else {
+      createServer((req, res) => {
+        let data = [];
+        req.on(`data`, (chunk) => {
+          data.push(chunk instanceof Buffer ? chunk : Buffer.from(chunk));
+        }).on(`end`, () => {
+          const authHeader = req.headers.authorization;
+          try {
+            if (typeof req.url === `undefined`)
+              throw 400;
+            const expectedAuthHeader = `Bearer ${FLIGHTDECK_SECRET}`;
+            if (authHeader !== `Bearer ${FLIGHTDECK_SECRET}`) {
+              this.logger.info(`Unauthorized: needed \`${expectedAuthHeader}\`, got \`${authHeader}\``);
+              throw 401;
+            }
+            const url = new URL(req.url, origin);
+            this.logger.info(req.method, url.pathname);
+            switch (req.method) {
+              case `POST`:
+                {
+                  switch (url.pathname) {
+                    case `/`:
+                      {
+                        res.writeHead(200);
+                        res.end();
+                        const installFile = resolve(this.persistentStateDir, `install`);
+                        const readyFile = resolve(this.persistentStateDir, `ready`);
+                        if (!existsSync(installFile)) {
+                          this.logger.info(`Install file does not exist yet. Creating...`);
+                          writeFileSync(installFile, ``);
+                        }
+                        if (existsSync(readyFile)) {
+                          this.logger.info(`Ready file exists. Removing...`);
+                          rmSync(readyFile);
+                        }
+                        this.getLatestRelease();
+                        if (toEntries(this.servicesReadyToUpdate).every(([, isReady]) => isReady)) {
+                          this.logger.info(`All services are ready to update!`);
+                          this.stopAllServices();
+                          return;
+                        }
+                        for (const entry of toEntries(this.services)) {
+                          const [serviceName, service] = entry;
+                          if (service) {
+                            if (this.options.services[serviceName].waitFor) {
+                              service.emit(`updatesReady`);
+                            }
+                          } else {
+                            this.startService(serviceName);
                           }
-                        } else {
-                          this.startService(serviceName);
                         }
                       }
-                    }
-                    break;
-                  default:
-                    throw 404;
+                      break;
+                    default:
+                      throw 404;
+                  }
                 }
-              }
-              break;
-            default:
-              throw 405;
-          }
-        } catch (thrown) {
-          this.logger.error(thrown, req.url);
-          if (typeof thrown === `number`) {
-            res.writeHead(thrown);
-            res.end();
+                break;
+              default:
+                throw 405;
+            }
+          } catch (thrown) {
+            this.logger.error(thrown, req.url);
+            if (typeof thrown === `number`) {
+              res.writeHead(thrown);
+              res.end();
+            }
+          } finally {
+            data = [];
           }
-        } finally {
-          data = [];
-        }
+        });
+      }).listen(port, () => {
+        this.logger.info(`Server started on port ${port}`);
       });
-    }).listen(PORT, () => {
-      this.logger.info(`Server started on port ${PORT}`);
-    });
+    }
     this.startAllServices();
   }
   startAllServices() {
@@ -296,25 +376,26 @@ class FlightDeck {
 
 // src/flightdeck.bin.ts
 var FLIGHTDECK_MANUAL = {
-  optionsSchema: z.object({
-    secret: z.string(),
-    packageName: z.string(),
-    services: z.record(z.object({ run: z.string(), waitFor: z.boolean() })),
-    flightdeckRootDir: z.string(),
-    scripts: z.object({
-      download: z.string(),
-      install: z.string()
+  optionsSchema: z2.object({
+    port: z2.number().optional(),
+    packageName: z2.string(),
+    services: z2.record(z2.object({ run: z2.string(), waitFor: z2.boolean() })),
+    flightdeckRootDir: z2.string(),
+    scripts: z2.object({
+      download: z2.string(),
+      install: z2.string()
     })
   }),
   options: {
-    secret: {
-      flag: `x`,
-      required: true,
-      description: `Secret used to authenticate with the service.`,
-      example: `--secret=\"secret\"`
+    port: {
+      flag: `p`,
+      required: false,
+      description: `Port to run the flightdeck server on.`,
+      example: `--port=8080`,
+      parse: parseNumberOption
     },
     packageName: {
-      flag: `p`,
+      flag: `n`,
       required: true,
       description: `Name of the package.`,
       example: `--packageName=\"my-app\"`
@@ -342,8 +423,8 @@ var FLIGHTDECK_MANUAL = {
   }
 };
 var SCHEMA_MANUAL = {
-  optionsSchema: z.object({
-    outdir: z.string().optional()
+  optionsSchema: z2.object({
+    outdir: z2.string().optional()
   }),
   options: {
     outdir: {
@@ -362,6 +443,7 @@ var parse = cli({
     $configPath: FLIGHTDECK_MANUAL,
     schema: SCHEMA_MANUAL
   },
+  debugOutput: true,
   discoverConfigPath: (args) => {
     if (args[0] === `schema`) {
       return;

package/dist/flightdeck.main.schema.json

@@ -1,8 +1,8 @@
 {
 	"type": "object",
 	"properties": {
-		"secret": {
-			"type": "string"
+		"port": {
+			"type": "number"
 		},
 		"packageName": {
 			"type": "string"
@@ -47,7 +47,6 @@
 		}
 	},
 	"required": [
-		"secret",
 		"packageName",
 		"services",
 		"flightdeckRootDir",

package/dist/lib.d.ts

@@ -3,7 +3,6 @@ import { Future } from 'atom.io/internal';
 import { ChildSocket } from 'atom.io/realtime-server';
 
 type FlightDeckOptions<S extends string = string> = {
-    secret: string;
     packageName: string;
     services: {
         [service in S]: {
@@ -15,6 +14,7 @@ type FlightDeckOptions<S extends string = string> = {
         download: string;
         install: string;
     };
+    port?: number | undefined;
     flightdeckRootDir?: string | undefined;
 };
 declare class FlightDeck<S extends string = string> {

package/dist/lib.js

@@ -18,9 +18,82 @@ import { resolve } from "node:path";
 import { Future } from "atom.io/internal";
 import { fromEntries, toEntries } from "atom.io/json";
 import { ChildSocket } from "atom.io/realtime-server";
-var PORT = process.env.PORT ?? 8080;
-var ORIGIN = `http://localhost:${PORT}`;
 
+// /home/runner/work/wayforge/wayforge/packages/flightdeck/node_modules/@t3-oss/env-core/dist/index.js
+import { object } from "zod";
+function createEnv(opts) {
+  const runtimeEnv = opts.runtimeEnvStrict ?? opts.runtimeEnv ?? process.env;
+  const emptyStringAsUndefined = opts.emptyStringAsUndefined ?? false;
+  if (emptyStringAsUndefined) {
+    for (const [key, value] of Object.entries(runtimeEnv)) {
+      if (value === "") {
+        delete runtimeEnv[key];
+      }
+    }
+  }
+  const skip = !!opts.skipValidation;
+  if (skip)
+    return runtimeEnv;
+  const _client = typeof opts.client === "object" ? opts.client : {};
+  const _server = typeof opts.server === "object" ? opts.server : {};
+  const _shared = typeof opts.shared === "object" ? opts.shared : {};
+  const client = object(_client);
+  const server = object(_server);
+  const shared = object(_shared);
+  const isServer = opts.isServer ?? (typeof window === "undefined" || ("Deno" in window));
+  const allClient = client.merge(shared);
+  const allServer = server.merge(shared).merge(client);
+  const parsed = isServer ? allServer.safeParse(runtimeEnv) : allClient.safeParse(runtimeEnv);
+  const onValidationError = opts.onValidationError ?? ((error) => {
+    console.error("\u274C Invalid environment variables:", error.flatten().fieldErrors);
+    throw new Error("Invalid environment variables");
+  });
+  const onInvalidAccess = opts.onInvalidAccess ?? ((_variable) => {
+    throw new Error("\u274C Attempted to access a server-side environment variable on the client");
+  });
+  if (parsed.success === false) {
+    return onValidationError(parsed.error);
+  }
+  const isServerAccess = (prop) => {
+    if (!opts.clientPrefix)
+      return true;
+    return !prop.startsWith(opts.clientPrefix) && !(prop in shared.shape);
+  };
+  const isValidServerAccess = (prop) => {
+    return isServer || !isServerAccess(prop);
+  };
+  const ignoreProp = (prop) => {
+    return prop === "__esModule" || prop === "$$typeof";
+  };
+  const extendedObj = (opts.extends ?? []).reduce((acc, curr) => {
+    return Object.assign(acc, curr);
+  }, {});
+  const fullObj = Object.assign(parsed.data, extendedObj);
+  const env = new Proxy(fullObj, {
+    get(target, prop) {
+      if (typeof prop !== "string")
+        return;
+      if (ignoreProp(prop))
+        return;
+      if (!isValidServerAccess(prop))
+        return onInvalidAccess(prop);
+      return Reflect.get(target, prop);
+    }
+  });
+  return env;
+}
+
+// src/flightdeck.env.ts
+import { z } from "zod";
+var env = createEnv({
+  server: { FLIGHTDECK_SECRET: z.string().optional() },
+  clientPrefix: `NEVER`,
+  client: {},
+  runtimeEnv: import.meta.env,
+  emptyStringAsUndefined: true
+});
+
+// src/flightdeck.lib.ts
 class FlightDeck {
   options;
   safety = 0;
@@ -42,7 +115,10 @@ class FlightDeck {
   persistentStateDir;
   constructor(options) {
     this.options = options;
-    const { secret, flightdeckRootDir = resolve(homedir(), `services`) } = options;
+    const { FLIGHTDECK_SECRET } = env;
+    const { flightdeckRootDir = resolve(homedir(), `services`) } = options;
+    const port = options.port ?? 8080;
+    const origin = `http://localhost:${port}`;
     const servicesEntries = toEntries(options.services);
     this.services = fromEntries(servicesEntries.map(([serviceName]) => [serviceName, null]));
     this.serviceIdx = fromEntries(servicesEntries.map(([serviceName], idx) => [serviceName, idx]));
@@ -87,79 +163,83 @@ class FlightDeck {
     if (!existsSync(this.persistentStateDir)) {
       mkdirSync(this.persistentStateDir, { recursive: true });
     }
-    createServer((req, res) => {
-      let data = [];
-      req.on(`data`, (chunk) => {
-        data.push(chunk instanceof Buffer ? chunk : Buffer.from(chunk));
-      }).on(`end`, () => {
-        const authHeader = req.headers.authorization;
-        try {
-          if (typeof req.url === `undefined`)
-            throw 400;
-          const expectedAuthHeader = `Bearer ${secret}`;
-          if (authHeader !== `Bearer ${secret}`) {
-            this.logger.info(`Unauthorized: needed \`${expectedAuthHeader}\`, got \`${authHeader}\``);
-            throw 401;
-          }
-          const url = new URL(req.url, ORIGIN);
-          this.logger.info(req.method, url.pathname);
-          switch (req.method) {
-            case `POST`:
-              {
-                switch (url.pathname) {
-                  case `/`:
-                    {
-                      res.writeHead(200);
-                      res.end();
-                      const installFile = resolve(this.persistentStateDir, `install`);
-                      const readyFile = resolve(this.persistentStateDir, `ready`);
-                      if (!existsSync(installFile)) {
-                        this.logger.info(`Install file does not exist yet. Creating...`);
-                        writeFileSync(installFile, ``);
-                      }
-                      if (existsSync(readyFile)) {
-                        this.logger.info(`Ready file exists. Removing...`);
-                        rmSync(readyFile);
-                      }
-                      this.getLatestRelease();
-                      if (toEntries(this.servicesReadyToUpdate).every(([, isReady]) => isReady)) {
-                        this.logger.info(`All services are ready to update!`);
-                        this.stopAllServices();
-                        return;
-                      }
-                      for (const entry of toEntries(this.services)) {
-                        const [serviceName, service] = entry;
-                        if (service) {
-                          if (this.options.services[serviceName].waitFor) {
-                            service.emit(`updatesReady`);
+    if (FLIGHTDECK_SECRET === undefined) {
+      this.logger.warn(`No FLIGHTDECK_SECRET environment variable found. FlightDeck will not run an update server.`);
+    } else {
+      createServer((req, res) => {
+        let data = [];
+        req.on(`data`, (chunk) => {
+          data.push(chunk instanceof Buffer ? chunk : Buffer.from(chunk));
+        }).on(`end`, () => {
+          const authHeader = req.headers.authorization;
+          try {
+            if (typeof req.url === `undefined`)
+              throw 400;
+            const expectedAuthHeader = `Bearer ${FLIGHTDECK_SECRET}`;
+            if (authHeader !== `Bearer ${FLIGHTDECK_SECRET}`) {
+              this.logger.info(`Unauthorized: needed \`${expectedAuthHeader}\`, got \`${authHeader}\``);
+              throw 401;
+            }
+            const url = new URL(req.url, origin);
+            this.logger.info(req.method, url.pathname);
+            switch (req.method) {
+              case `POST`:
+                {
+                  switch (url.pathname) {
+                    case `/`:
+                      {
+                        res.writeHead(200);
+                        res.end();
+                        const installFile = resolve(this.persistentStateDir, `install`);
+                        const readyFile = resolve(this.persistentStateDir, `ready`);
+                        if (!existsSync(installFile)) {
+                          this.logger.info(`Install file does not exist yet. Creating...`);
+                          writeFileSync(installFile, ``);
+                        }
+                        if (existsSync(readyFile)) {
+                          this.logger.info(`Ready file exists. Removing...`);
+                          rmSync(readyFile);
+                        }
+                        this.getLatestRelease();
+                        if (toEntries(this.servicesReadyToUpdate).every(([, isReady]) => isReady)) {
+                          this.logger.info(`All services are ready to update!`);
+                          this.stopAllServices();
+                          return;
+                        }
+                        for (const entry of toEntries(this.services)) {
+                          const [serviceName, service] = entry;
+                          if (service) {
+                            if (this.options.services[serviceName].waitFor) {
+                              service.emit(`updatesReady`);
+                            }
+                          } else {
+                            this.startService(serviceName);
                           }
-                        } else {
-                          this.startService(serviceName);
                         }
                       }
-                    }
-                    break;
-                  default:
-                    throw 404;
+                      break;
+                    default:
+                      throw 404;
+                  }
                 }
-              }
-              break;
-            default:
-              throw 405;
+                break;
+              default:
+                throw 405;
+            }
+          } catch (thrown) {
+            this.logger.error(thrown, req.url);
+            if (typeof thrown === `number`) {
+              res.writeHead(thrown);
+              res.end();
+            }
+          } finally {
+            data = [];
           }
-        } catch (thrown) {
-          this.logger.error(thrown, req.url);
-          if (typeof thrown === `number`) {
-            res.writeHead(thrown);
-            res.end();
-          }
-        } finally {
-          data = [];
-        }
+        });
+      }).listen(port, () => {
+        this.logger.info(`Server started on port ${port}`);
       });
-    }).listen(PORT, () => {
-      this.logger.info(`Server started on port ${PORT}`);
-    });
+    }
     this.startAllServices();
   }
   startAllServices() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flightdeck",
-  "version": "0.0.14",
+  "version": "0.1.0",
   "license": "MIT",
   "author": {
     "name": "Jeremy Banka",
@@ -21,14 +21,15 @@
     "klaxon": "./dist/klaxon.bin.js"
   },
   "dependencies": {
+    "@t3-oss/env-core": "0.11.1",
     "zod": "3.23.8",
-    "atom.io": "0.30.0",
-    "comline": "0.1.3"
+    "comline": "0.1.4",
+    "atom.io": "0.30.0"
   },
   "devDependencies": {
     "@types/node": "22.7.6",
     "@types/tmp": "0.2.6",
-    "bun-types": "1.1.30",
+    "bun-types": "1.1.31",
     "concurrently": "9.0.1",
     "rimraf": "6.0.1",
     "tmp": "0.2.3",

package/src/flightdeck.bin.ts

@@ -3,7 +3,7 @@
 import * as path from "node:path"
 
 import type { OptionsGroup } from "comline"
-import { cli, optional, parseArrayOption } from "comline"
+import { cli, optional, parseNumberOption } from "comline"
 import { z } from "zod"
 
 import type { FlightDeckOptions } from "./flightdeck.lib"
@@ -11,7 +11,7 @@ import { FlightDeck } from "./flightdeck.lib"
 
 const FLIGHTDECK_MANUAL = {
 	optionsSchema: z.object({
-		secret: z.string(),
+		port: z.number().optional(),
 		packageName: z.string(),
 		services: z.record(z.object({ run: z.string(), waitFor: z.boolean() })),
 		flightdeckRootDir: z.string(),
@@ -21,14 +21,15 @@ const FLIGHTDECK_MANUAL = {
 		}),
 	}),
 	options: {
-		secret: {
-			flag: `x`,
-			required: true,
-			description: `Secret used to authenticate with the service.`,
-			example: `--secret=\"secret\"`,
+		port: {
+			flag: `p`,
+			required: false,
+			description: `Port to run the flightdeck server on.`,
+			example: `--port=8080`,
+			parse: parseNumberOption,
 		},
 		packageName: {
-			flag: `p`,
+			flag: `n`,
 			required: true,
 			description: `Name of the package.`,
 			example: `--packageName=\"my-app\"`,
@@ -79,6 +80,7 @@ const parse = cli(
 			$configPath: FLIGHTDECK_MANUAL,
 			schema: SCHEMA_MANUAL,
 		},
+		debugOutput: true,
 		discoverConfigPath: (args) => {
 			if (args[0] === `schema`) {
 				return

package/src/flightdeck.env.ts

@@ -0,0 +1,10 @@
+import { createEnv } from "@t3-oss/env-core"
+import { z } from "zod"
+
+export const env = createEnv({
+	server: { FLIGHTDECK_SECRET: z.string().optional() },
+	clientPrefix: `NEVER`,
+	client: {},
+	runtimeEnv: import.meta.env,
+	emptyStringAsUndefined: true,
+})

package/src/flightdeck.lib.ts

@@ -9,19 +9,19 @@ import { Future } from "atom.io/internal"
 import { fromEntries, toEntries } from "atom.io/json"
 import { ChildSocket } from "atom.io/realtime-server"
 
+import { env } from "./flightdeck.env"
+
 export type FlightDeckOptions<S extends string = string> = {
-	secret: string
 	packageName: string
 	services: { [service in S]: { run: string; waitFor: boolean } }
 	scripts: {
 		download: string
 		install: string
 	}
+	port?: number | undefined
 	flightdeckRootDir?: string | undefined
 }
 
-const PORT = process.env.PORT ?? 8080
-const ORIGIN = `http://localhost:${PORT}`
 export class FlightDeck<S extends string = string> {
 	protected safety = 0
 
@@ -52,8 +52,10 @@ export class FlightDeck<S extends string = string> {
 	protected persistentStateDir: string
 
 	public constructor(public readonly options: FlightDeckOptions<S>) {
-		const { secret, flightdeckRootDir = resolve(homedir(), `services`) } =
-			options
+		const { FLIGHTDECK_SECRET } = env
+		const { flightdeckRootDir = resolve(homedir(), `services`) } = options
+		const port = options.port ?? 8080
+		const origin = `http://localhost:${port}`
 
 		const servicesEntries = toEntries(options.services)
 		this.services = fromEntries(
@@ -116,96 +118,102 @@ export class FlightDeck<S extends string = string> {
 			mkdirSync(this.persistentStateDir, { recursive: true })
 		}
 
-		createServer((req, res) => {
-			let data: Uint8Array[] = []
-			req
-				.on(`data`, (chunk) => {
-					data.push(chunk instanceof Buffer ? chunk : Buffer.from(chunk))
-				})
-				.on(`end`, () => {
-					const authHeader = req.headers.authorization
-					try {
-						if (typeof req.url === `undefined`) throw 400
-						const expectedAuthHeader = `Bearer ${secret}`
-						if (authHeader !== `Bearer ${secret}`) {
-							this.logger.info(
-								`Unauthorized: needed \`${expectedAuthHeader}\`, got \`${authHeader}\``,
-							)
-							throw 401
-						}
-						const url = new URL(req.url, ORIGIN)
-						this.logger.info(req.method, url.pathname)
-						switch (req.method) {
-							case `POST`:
-								{
-									switch (url.pathname) {
-										case `/`:
-											{
-												res.writeHead(200)
-												res.end()
-												const installFile = resolve(
-													this.persistentStateDir,
-													`install`,
-												)
-												const readyFile = resolve(
-													this.persistentStateDir,
-													`ready`,
-												)
-												if (!existsSync(installFile)) {
-													this.logger.info(
-														`Install file does not exist yet. Creating...`,
+		if (FLIGHTDECK_SECRET === undefined) {
+			this.logger.warn(
+				`No FLIGHTDECK_SECRET environment variable found. FlightDeck will not run an update server.`,
+			)
+		} else {
+			createServer((req, res) => {
+				let data: Uint8Array[] = []
+				req
+					.on(`data`, (chunk) => {
+						data.push(chunk instanceof Buffer ? chunk : Buffer.from(chunk))
+					})
+					.on(`end`, () => {
+						const authHeader = req.headers.authorization
+						try {
+							if (typeof req.url === `undefined`) throw 400
+							const expectedAuthHeader = `Bearer ${FLIGHTDECK_SECRET}`
+							if (authHeader !== `Bearer ${FLIGHTDECK_SECRET}`) {
+								this.logger.info(
+									`Unauthorized: needed \`${expectedAuthHeader}\`, got \`${authHeader}\``,
+								)
+								throw 401
+							}
+							const url = new URL(req.url, origin)
+							this.logger.info(req.method, url.pathname)
+							switch (req.method) {
+								case `POST`:
+									{
+										switch (url.pathname) {
+											case `/`:
+												{
+													res.writeHead(200)
+													res.end()
+													const installFile = resolve(
+														this.persistentStateDir,
+														`install`,
 													)
-													writeFileSync(installFile, ``)
-												}
-												if (existsSync(readyFile)) {
-													this.logger.info(`Ready file exists. Removing...`)
-													rmSync(readyFile)
-												}
-												this.getLatestRelease()
-												if (
-													toEntries(this.servicesReadyToUpdate).every(
-														([, isReady]) => isReady,
+													const readyFile = resolve(
+														this.persistentStateDir,
+														`ready`,
 													)
-												) {
-													this.logger.info(`All services are ready to update!`)
-													this.stopAllServices()
-													return
-												}
-												for (const entry of toEntries(this.services)) {
-													const [serviceName, service] = entry
-													if (service) {
-														if (this.options.services[serviceName].waitFor) {
-															service.emit(`updatesReady`)
+													if (!existsSync(installFile)) {
+														this.logger.info(
+															`Install file does not exist yet. Creating...`,
+														)
+														writeFileSync(installFile, ``)
+													}
+													if (existsSync(readyFile)) {
+														this.logger.info(`Ready file exists. Removing...`)
+														rmSync(readyFile)
+													}
+													this.getLatestRelease()
+													if (
+														toEntries(this.servicesReadyToUpdate).every(
+															([, isReady]) => isReady,
+														)
+													) {
+														this.logger.info(`All services are ready to update!`)
+														this.stopAllServices()
+														return
+													}
+													for (const entry of toEntries(this.services)) {
+														const [serviceName, service] = entry
+														if (service) {
+															if (this.options.services[serviceName].waitFor) {
+																service.emit(`updatesReady`)
+															}
+														} else {
+															this.startService(serviceName)
 														}
-													} else {
-														this.startService(serviceName)
 													}
 												}
-											}
-											break
+												break
 
-										default:
-											throw 404
+											default:
+												throw 404
+										}
 									}
-								}
-								break
+									break
 
-							default:
-								throw 405
+								default:
+									throw 405
+							}
+						} catch (thrown) {
+							this.logger.error(thrown, req.url)
+							if (typeof thrown === `number`) {
+								res.writeHead(thrown)
+								res.end()
+							}
+						} finally {
+							data = []
 						}
-					} catch (thrown) {
-						this.logger.error(thrown, req.url)
-						if (typeof thrown === `number`) {
-							res.writeHead(thrown)
-							res.end()
-						}
-					} finally {
-						data = []
-					}
-				})
-		}).listen(PORT, () => {
-			this.logger.info(`Server started on port ${PORT}`)
-		})
+					})
+			}).listen(port, () => {
+				this.logger.info(`Server started on port ${port}`)
+			})
+		}
 
 		this.startAllServices()
 	}