windsor-bot 0.1.0 → 0.1.1

package/README.md

@@ -123,6 +123,6 @@ The control panel is a Preact app served by the diagnostics server and can:
 1. Show runtime bot status and recent events.
 2. Save basic setup into a local `windsor.config.json` file (Discord token, server id, etc).
 
-The browser app source lives in `src/web/app.tsx` and is bundled on-demand by the server using the esbuild API.
+The browser app source lives in `src/web/app.tsx`. It is bundled into the npm package during the build and served by the diagnostics server; development runs can still bundle the source on demand.
 
 `windsor.config.json` is gitignored because it can contain secrets.

package/dist/server.js

@@ -1,7 +1,8 @@
 import { createServer } from 'http';
 import { build } from 'esbuild';
-import { stat } from 'fs/promises';
-import { join } from 'path';
+import { readFile, stat } from 'fs/promises';
+import { dirname, join } from 'path';
+import { fileURLToPath } from 'url';
 import { getCurrentConfig, updateConfig, checkPassword, hashPassword, getConfigFilePath, } from './config.js';
 import { printTestPage, getImageFeed, clearImageFeed, renderFeedHtml } from './printing/index.js';
 const MAX_EVENTS = 200;
@@ -73,13 +74,29 @@ async function readJsonBody(req) {
 }
 let appBundleCache = null;
 async function loadAppScript() {
-    const entryPoint = join(process.cwd(), 'src', 'web', 'app.tsx');
-    const sourceStat = await stat(entryPoint);
-    if (appBundleCache && appBundleCache.mtimeMs === sourceStat.mtimeMs) {
+    const runtimeDir = dirname(fileURLToPath(import.meta.url));
+    const bundledApp = join(runtimeDir, 'web', 'app.bundle.js');
+    const sourceEntryPoint = join(runtimeDir, '..', 'src', 'web', 'app.tsx');
+    const appPath = await stat(bundledApp).then(() => bundledApp).catch((error) => {
+        if (error instanceof Error && 'code' in error && error.code === 'ENOENT') {
+            return sourceEntryPoint;
+        }
+        throw error;
+    });
+    const appStat = await stat(appPath);
+    if (appPath === bundledApp) {
+        if (appBundleCache && appBundleCache.mtimeMs === appStat.mtimeMs) {
+            return appBundleCache.script;
+        }
+        const script = await readFile(appPath, 'utf8');
+        appBundleCache = { script, mtimeMs: appStat.mtimeMs };
+        return script;
+    }
+    if (appBundleCache && appBundleCache.mtimeMs === appStat.mtimeMs) {
         return appBundleCache.script;
     }
     const result = await build({
-        entryPoints: [entryPoint],
+        entryPoints: [sourceEntryPoint],
         bundle: true,
         write: false,
         platform: 'browser',
@@ -92,7 +109,7 @@ async function loadAppScript() {
     const firstFile = result.outputFiles[0];
     if (!firstFile)
         throw new Error('Failed to generate app bundle');
-    appBundleCache = { script: firstFile.text, mtimeMs: sourceStat.mtimeMs };
+    appBundleCache = { script: firstFile.text, mtimeMs: appStat.mtimeMs };
     return firstFile.text;
 }
 function renderHtmlShell() {