windsor-bot 0.1.0 → 0.1.2

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "windsor-bot",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "Self-hosted Discord bot automation for household list and todo printing",
   "type": "module",
   "main": "dist/index.js",
   "scripts": {
-    "prepare": "tsc",
-    "build": "tsc",
+    "prepare": "npm run build",
+    "build": "tsc && node scripts/build-web.mjs",
     "dev": "node src/index.ts",
     "test": "node --test src/tests/*.test.ts"
   },

package/scripts/build-web.mjs

@@ -0,0 +1,13 @@
+import { build } from 'esbuild';
+
+await build({
+    entryPoints: ['src/web/app.tsx'],
+    bundle: true,
+    outfile: 'dist/web/app.bundle.js',
+    platform: 'browser',
+    format: 'esm',
+    target: ['es2022'],
+    jsx: 'automatic',
+    jsxImportSource: 'preact',
+    sourcemap: 'inline',
+});

package/src/index.ts

@@ -1,19 +1,19 @@
 #!/usr/bin/env node
-import { loadConfig, getCurrentConfig } from './config.ts';
+import { loadConfig } from './config.ts';
 import { logEvent, startDiagnosticsServer, setDiscordChannels, setRestartHandler, setRefreshChannelsHandler } from './server.ts';
 import { createWindsorBot, checkScheduledTasks } from './bot.ts';
 import { ChannelType } from 'discord.js';
+import type { WindsorConfig } from './types.ts';
 
-const config = getCurrentConfig();
+const { config } = await loadConfig();
 
 startDiagnosticsServer(config.diagnosticsPort);
 
 let bot: ReturnType<typeof createWindsorBot> | null = null;
 let startInFlight = false;
 
-async function startBot(): Promise<void> {
+async function startBot(cfg: WindsorConfig): Promise<void> {
     if (startInFlight) return;
-    const cfg = getCurrentConfig();
     if (!cfg.discordToken) {
         logEvent('info', 'No Discord token configured. Visit the control panel to set up.');
         return;
@@ -58,8 +58,8 @@ export async function restartBot(): Promise<void> {
         bot = null;
     }
     setDiscordChannels([]);
-    await loadConfig();
-    await startBot();
+    const { config } = await loadConfig();
+    await startBot(config);
 }
 
 // Recurring task checker
@@ -95,4 +95,4 @@ async function refreshChannels(): Promise<void> {
 }
 
 setRefreshChannelsHandler(refreshChannels);
-await startBot();
+await startBot(config);

package/src/server.ts

@@ -1,7 +1,8 @@
 import { createServer, type IncomingMessage, type ServerResponse } 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,
@@ -90,14 +91,30 @@ async function readJsonBody(req: IncomingMessage): Promise<Record<string, unknow
 let appBundleCache: { script: string; mtimeMs: number } | null = null;
 
 async function loadAppScript(): Promise<string> {
-    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: unknown) => {
+        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',
@@ -110,7 +127,7 @@ async function loadAppScript(): Promise<string> {
 
     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;
 }