castle-web-cli 0.4.116 → 0.4.118

package/dist/importBrowse.d.ts

@@ -1,4 +1,4 @@
-import * as http from "http";
+import * as http from 'http';
 export declare const IMPORT_API_PREFIX = "/__castle/import/";
 export interface ImportCandidate {
     deckId: string;
@@ -14,8 +14,8 @@ export interface ImportList {
     decks: ImportCandidate[];
     truncated: boolean;
 }
-export type ImportTab = "mine" | "saved" | "kits";
+export type ImportTab = 'mine' | 'saved' | 'kits';
 export declare function listImportable(deckDir: string, tab: ImportTab): Promise<ImportList>;
 export declare function resolveDeckRef(deckDir: string, ref: string): Promise<ImportCandidate>;
 export declare function sourceFileCount(deckId: string): Promise<number | null>;
-export declare function handleImportApi(deckDir: string, req: http.IncomingMessage, res: http.ServerResponse, reqPath: string): boolean;
+export declare function handleImportApi(deckDir: string, req: http.IncomingMessage, res: http.ServerResponse, reqPath: string, onDeckChanged?: () => void): boolean;

package/dist/importBrowse.js

@@ -10,17 +10,17 @@
 // Nothing here goes through the deck iframe or the kit: the Files panel that
 // opens this picker is a builtin shell panel, and it has to keep working on a
 // `--kit none` deck that ships no editor app at all.
-import * as fs from "fs";
-import * as os from "os";
-import * as path from "path";
-import { nanoid } from "nanoid";
-import * as api from "./api.js";
-import * as config from "./config.js";
-import { runTar } from "./save-deck.js";
-import { readCastleJson } from "./castleJson.js";
-import { ImportError, addImportTo, importedDeckIds, parseDeckRef } from "./imports.js";
-import { errorMessage, readRequestBody, sendJson } from "./httpJson.js";
-export const IMPORT_API_PREFIX = "/__castle/import/";
+import * as fs from 'fs';
+import * as os from 'os';
+import * as path from 'path';
+import { nanoid } from 'nanoid';
+import * as api from './api.js';
+import * as config from './config.js';
+import { runTar } from './save-deck.js';
+import { readCastleJson } from './castleJson.js';
+import { ImportError, addImportTo, importedDeckIds, parseDeckRef } from './imports.js';
+import { errorMessage, readRequestBody, sendJson } from './httpJson.js';
+export const IMPORT_API_PREFIX = '/__castle/import/';
 // Rows per list, and how many decks we are willing to ask the source question
 // about to fill one. An account can hold hundreds of decks and only some are
 // web decks, so the scan has to look past the first fifty -- but not forever.
@@ -32,24 +32,24 @@ const SOURCE_CHUNK = 100;
 const PLAYLIST_CAP = 10;
 // The bookmarks feed already covers this playlist; listing both would just
 // duplicate it.
-const BOOKMARKS_PLAYLIST_PREFIX = "bookmarks-";
+const BOOKMARKS_PLAYLIST_PREFIX = 'bookmarks-';
 // The kits list, hardcoded. A playlist can't hold it: playlist feeds drop
 // unlisted decks, and a kit is published unlisted. Adding a kit means shipping
 // an update to this list.
 const KIT_DECK_IDS = [
-    "ckRZGFW4iPrx", // physics-2d
+    'ckRZGFW4iPrx', // physics-2d
 ];
 // Listing is several server round trips, and the picker is opened, closed and
 // reopened while someone decides. Cached briefly so that costs once.
 const LIST_TTL_MS = 60_000;
 const listCache = new Map();
 function asTab(value) {
-    return value === "saved" || value === "kits" ? value : "mine";
+    return value === 'saved' || value === 'kits' ? value : 'mine';
 }
 function toCandidate(row, hasSource) {
     return {
         deckId: row.deckId,
-        title: row.title?.trim() ? row.title.trim() : "Untitled",
+        title: row.title?.trim() ? row.title.trim() : 'Untitled',
         creator: row.creator?.username ?? null,
         imageUrl: row.initialCard?.backgroundImage?.smallUrl ?? null,
         parentCreator: row.parentDeck?.creator?.username ?? null,
@@ -101,7 +101,7 @@ async function filterImportable(rows) {
 // which of the two something landed in is not a distinction worth a tab.
 async function savedRows() {
     const userId = config.getUserId();
-    const bookmarks = await api.feedDecks("bookmarks", LIST_LIMIT);
+    const bookmarks = await api.feedDecks('bookmarks', LIST_LIMIT);
     if (!userId)
         return bookmarks;
     const playlists = (await api.myPlaylists(userId, PLAYLIST_CAP * 2))
@@ -111,9 +111,9 @@ async function savedRows() {
     return [bookmarks, ...lists].flat();
 }
 async function tabRows(tab) {
-    if (tab === "saved")
+    if (tab === 'saved')
         return savedRows();
-    if (tab === "kits")
+    if (tab === 'kits')
         return api.deckRows(KIT_DECK_IDS);
     return api.myDecks();
 }
@@ -137,10 +137,10 @@ export async function listImportable(deckDir, tab) {
 export async function resolveDeckRef(deckDir, ref) {
     const deckId = parseDeckRef(ref);
     if (!deckId) {
-        throw new ImportError("bad-deck-ref", `Not a deck id or a castle deck link: ${ref}`);
+        throw new ImportError('bad-deck-ref', `Not a deck id or a castle deck link: ${ref}`);
     }
     if (readCastleJson(deckDir)?.deckId === deckId) {
-        throw new ImportError("self-import", `That is this deck -- a deck can't import itself.`);
+        throw new ImportError('self-import', `That is this deck -- a deck can't import itself.`);
     }
     const [rows, source] = await Promise.all([
         api.deckRows([deckId]),
@@ -148,7 +148,7 @@ export async function resolveDeckRef(deckDir, ref) {
     ]);
     const row = rows[0];
     if (!row)
-        throw new ImportError("bad-deck-ref", `No deck ${deckId} on the server.`);
+        throw new ImportError('bad-deck-ref', `No deck ${deckId} on the server.`);
     return stampImported(deckDir, [toCandidate(row, source !== null)])[0];
 }
 // How many files a deck's source holds. Not on any list query, so it is counted
@@ -172,8 +172,8 @@ export async function sourceFileCount(deckId) {
         if (!res.ok)
             return null;
         fs.writeFileSync(tmpFile, Buffer.from(await res.arrayBuffer()));
-        const listing = await runTar(["-tzf", tmpFile], { capture: true });
-        const count = listing.split("\n").filter((line) => line && !line.endsWith("/")).length;
+        const listing = await runTar(['-tzf', tmpFile], { capture: true });
+        const count = listing.split('\n').filter((line) => line && !line.endsWith('/')).length;
         fileCountCache.set(key, count);
         return count;
     }
@@ -201,37 +201,45 @@ function sendResult(res, work) {
         sendJson(res, 500, { error: errorMessage(err) });
     });
 }
-export function handleImportApi(deckDir, req, res, reqPath) {
+export function handleImportApi(deckDir, req, res, reqPath, 
+// Called after an import that changed what the page has to load. Adding a kit
+// installs npm packages and can repoint the deck's entry, both under a serve
+// that already optimized deps for the OLD deck -- the running page then holds
+// a module graph in which react resolves to nothing, which surfaces as
+// "Cannot read properties of null (reading 'useState')" until a hand reload.
+onDeckChanged) {
     const action = reqPath.slice(IMPORT_API_PREFIX.length);
-    const url = new URL(req.url ?? "/", "http://localhost");
-    if (action === "list") {
-        sendResult(res, () => listImportable(deckDir, asTab(url.searchParams.get("tab"))));
+    const url = new URL(req.url ?? '/', 'http://localhost');
+    if (action === 'list') {
+        sendResult(res, () => listImportable(deckDir, asTab(url.searchParams.get('tab'))));
         return true;
     }
-    if (action === "resolve") {
-        const ref = url.searchParams.get("ref") ?? "";
+    if (action === 'resolve') {
+        const ref = url.searchParams.get('ref') ?? '';
         sendResult(res, async () => ({ deck: await resolveDeckRef(deckDir, ref) }));
         return true;
     }
-    if (action === "files") {
-        const deckId = url.searchParams.get("deckId") ?? "";
+    if (action === 'files') {
+        const deckId = url.searchParams.get('deckId') ?? '';
         sendResult(res, async () => ({ fileCount: await sourceFileCount(deckId) }));
         return true;
     }
-    if (action === "add") {
+    if (action === 'add') {
         sendResult(res, async () => {
             let body;
             try {
                 body = JSON.parse(await readRequestBody(req));
             }
             catch {
-                throw new ImportError("no-deck-ref", "Invalid JSON body.");
+                throw new ImportError('no-deck-ref', 'Invalid JSON body.');
             }
-            const deckRef = typeof body.deckRef === "string" ? body.deckRef : "";
+            const deckRef = typeof body.deckRef === 'string' ? body.deckRef : '';
             const result = await addImportTo(deckDir, { deckRef });
             // The lists said which decks were importable; one of them just stopped
             // being a candidate (or changed version), so the cached answers are stale.
             listCache.clear();
+            if (result.dependencies.length > 0 || result.adoptedMain)
+                onDeckChanged?.();
             return result;
         });
         return true;

package/dist/init.js

@@ -166,10 +166,14 @@ export function isPristineBareDeck(dir) {
     }
 }
 // Repoint a deck's entry at an imported deck's main module.
+//
+// Writes the SAME index.html `init --kit` writes, rather than swapping the bare
+// stub's script tag: a kit mounts React into `<div id="root">`, which the bare
+// page has no element for -- the result was a deck that loaded the kit and
+// rendered nothing -- and the bare page also lacks the dark color-scheme
+// declaration, so it painted white before the kit's CSS arrived.
 export function adoptImportEntry(deckDir, alias, mainFile) {
-    const file = path.join(deckDir, 'index.html');
-    const html = fs.readFileSync(file, 'utf8');
-    fs.writeFileSync(file, html.replace(/<script type="module" src="[^"]*"><\/script>/, `<script type="module" src="/${IMPORTS_DIR}/${alias}/${mainFile}"></script>`), 'utf8');
+    writeDeckIndexHtml(deckDir, alias, path.basename(deckDir), mainFile);
     fs.rmSync(path.join(deckDir, 'game.js'), { force: true });
 }
 function scaffoldBare(projectDir) {

package/dist/serve.js

@@ -16,12 +16,14 @@ function isPortFree(port) {
     return new Promise((resolve) => {
         const srv = net.createServer();
         srv.once('error', () => resolve(false));
-        srv.listen(port, () => { srv.close(() => resolve(true)); });
+        srv.listen(port, () => {
+            srv.close(() => resolve(true));
+        });
     });
 }
 async function findFreePorts(startPort) {
     for (let p = startPort; p < startPort + 100; p += 2) {
-        if (await isPortFree(p) && await isPortFree(p + 1)) {
+        if ((await isPortFree(p)) && (await isPortFree(p + 1))) {
             return { port: p, wsPort: p + 1 };
         }
     }
@@ -158,7 +160,9 @@ function readServeJson(projectDir) {
     try {
         const raw = fs.readFileSync(path.join(projectDir, '.castle', 'serve.json'), 'utf8');
         const info = JSON.parse(raw);
-        if (typeof info.port !== 'number' || typeof info.wsPort !== 'number' || typeof info.pid !== 'number')
+        if (typeof info.port !== 'number' ||
+            typeof info.wsPort !== 'number' ||
+            typeof info.pid !== 'number')
             return null;
         return { port: info.port, wsPort: info.wsPort, pid: info.pid };
     }
@@ -275,6 +279,12 @@ export async function serve(dir, options = {}) {
     const ideServer = createIdeServer({
         deckDir: projectDir,
         deckLabel: path.basename(projectDir),
+        // Same closure the agent server gets: invalidate then reload every tab.
+        // `viteHolder` is read lazily because Vite is created further down.
+        restart: () => {
+            invalidateModuleCaches(viteHolder.vite);
+            broadcast({ type: 'restart' });
+        },
     });
     process.on('exit', () => ideServer.shutdown());
     // The agent panel backend: router conversation + background task agents,
@@ -298,7 +308,11 @@ export async function serve(dir, options = {}) {
     process.on('exit', () => agentServer.shutdown());
     const vite = await createServer({
         root: projectDir,
-        plugins: [castlePlugin(wsPort, ideServer, agentServer), importsAliasPlugin(), sceneFilesPlugin()],
+        plugins: [
+            castlePlugin(wsPort, ideServer, agentServer),
+            importsAliasPlugin(),
+            sceneFilesPlugin(),
+        ],
         server: {
             port,
             strictPort: true,
@@ -482,7 +496,9 @@ function startWSServer(port, projectDir, logFile, screenshotsDir, viteHolder) {
                     }
                     // Nobody to ask -- say so now rather than leaving the CLI to sit out
                     // its whole timeout for an answer that can't come.
-                    if (delivered === 0 && msg.type === 'import_list_request' && typeof msg.requestId === 'string') {
+                    if (delivered === 0 &&
+                        msg.type === 'import_list_request' &&
+                        typeof msg.requestId === 'string') {
                         forgetRequest(msg.requestId);
                         ws.send(JSON.stringify({ type: 'import_list_response', requestId: msg.requestId }));
                     }