@akanjs/devkit 3.2.0-rc.3 → 3.2.0-rc.5

package/preview/PreviewView.ts

@@ -77,20 +77,12 @@ export class PreviewView {
     }: PreviewProbeOptions = {},
   ): Promise<PreviewProbeResult> {
     const logs: string[] = [];
-    const view = PreviewView.#open({ width, height, engine, onConsole: (line) => logs.push(line) });
+    const view = await PreviewView.#start(
+      () => PreviewView.#open({ width, height, engine, onConsole: (line) => logs.push(line) }),
+      engine,
+      { startTimeoutMs, timeoutMs },
+    );
     try {
-      //? A browser that missed its start bound may still come up, so a later page retries it within only its own bound.
-      //? One that died or was closed instead is spawned afresh by the next view, which gets the full bound.
-      const startMs = PreviewView.#stalled.has(engine) ? Math.min(startTimeoutMs, timeoutMs) : startTimeoutMs;
-      const stalled = new Error(`Timed out starting the ${engine} browser after ${startMs / 1_000} s.`);
-      await PreviewView.#within(view.navigate("about:blank"), Date.now() + startMs, stalled).then(
-        () => PreviewView.#stalled.delete(engine),
-        (error: unknown) => {
-          if (error === stalled) PreviewView.#stalled.add(engine);
-          else PreviewView.#stalled.delete(engine);
-          throw error;
-        },
-      );
       const deadline = Date.now() + timeoutMs;
       const within = <T>(work: Promise<T>, what: string) =>
         PreviewView.#within(
@@ -122,6 +114,33 @@ export class PreviewView {
     }
   }
 
+  static async #start(
+    open: () => WebViewLike,
+    engine: PreviewEngine,
+    { startTimeoutMs, timeoutMs }: { startTimeoutMs: number; timeoutMs: number },
+  ) {
+    for (let attempt = 1; ; attempt++) {
+      //? A browser that missed its start bound may still come up, so a later page retries it within only its own bound.
+      //? One that died or was closed instead is spawned afresh by the next view, which gets the full bound.
+      const startMs = PreviewView.#stalled.has(engine) ? Math.min(startTimeoutMs, timeoutMs) : startTimeoutMs;
+      const stalled = new Error(`Timed out starting the ${engine} browser after ${startMs / 1_000} s.`);
+      let view: WebViewLike | undefined;
+      try {
+        view = open();
+        await PreviewView.#within(view.navigate("about:blank"), Date.now() + startMs, stalled);
+        PreviewView.#stalled.delete(engine);
+        return view;
+      } catch (error) {
+        await view?.close();
+        if (error === stalled) PreviewView.#stalled.add(engine);
+        else PreviewView.#stalled.delete(engine);
+        if (error === stalled || attempt > 1) throw error;
+        //? Bun reaps a browser that died only on a later timer turn; until then `new Bun.WebView()` throws "Failed to spawn Chrome".
+        await Bun.sleep(100);
+      }
+    }
+  }
+
   static async #load(
     view: WebViewLike,
     url: string,

package/preview/previewView.test.ts

@@ -178,9 +178,7 @@ Bun.WebView.closeAll();`,
 console.log(await open());
 const killed = open();
 Bun.WebView.closeAll();
-console.error(await killed);
-await Bun.sleep(500);
-console.log(await open());
+console.log(await killed);
 Bun.WebView.closeAll();`,
         6,
       );
@@ -194,4 +192,36 @@ Bun.WebView.closeAll();`,
     },
     browserTestMs,
   );
+
+  test.skipIf(!slowChromeRuns)(
+    "starts a new browser for the page right after one that the browser died on",
+    async () => {
+      const { code, out, log } = await withSlowChrome(
+        `const { promise: loading, resolve } = Promise.withResolvers();
+const server = Bun.serve({
+  port: 0,
+  fetch: (req) =>
+    new URL(req.url).pathname === "/hang"
+      ? (resolve(), new Promise(() => undefined))
+      : new Response("<!doctype html><body>up</body>", { headers: { "content-type": "text/html" } }),
+});
+const open = (path) =>
+  PreviewView.probe(\`http://localhost:\${server.port}\${path}\`, { engine: "chrome" }).then(
+    (probe) => probe.text,
+    (error) => error.message,
+  );
+const killed = open("/hang");
+await loading;
+Bun.WebView.closeAll();
+console.error(await killed);
+console.log(await open("/"));
+server.stop(true);
+Bun.WebView.closeAll();`,
+        0,
+      );
+      expect(out, log).toBe("up");
+      expect(code, log).toBe(0);
+    },
+    browserTestMs,
+  );
 });

package/workflow/plainName.ts

@@ -1,15 +1,28 @@
 export const sysNamePattern = /^[a-z0-9][a-zA-Z0-9_-]*$/;
 export const identifierPattern = /^_{0,2}[a-zA-Z][a-zA-Z0-9_-]*$/;
+const packageNamePattern = /^(@[a-z0-9][a-z0-9._-]*\/)?[a-z0-9][a-z0-9._-]*$/;
+
+export type PlainNameKind = "app" | "lib" | "module" | "service" | "scalar";
 
 export const isWorkflowSysName = (value: unknown): value is string =>
   typeof value === "string" && sysNamePattern.test(value);
 export const isWorkflowModuleName = (value: unknown): value is string =>
   typeof value === "string" && identifierPattern.test(value);
 
-export const assertPlainName = (kind: "app" | "lib" | "module" | "service" | "scalar", name: string) => {
+export const plainNameProblem = (kind: PlainNameKind, name: string) => {
   const isSys = kind === "app" || kind === "lib";
-  if (isSys ? isWorkflowSysName(name) : isWorkflowModuleName(name)) return;
+  if (isSys ? isWorkflowSysName(name) : isWorkflowModuleName(name)) return null;
+  return `${JSON.stringify(name)} is no ${kind} name; use letters, digits, - and _, starting with ${isSys ? "a lowercase letter or digit" : "a letter"}`;
+};
+
+export const assertPlainName = (kind: PlainNameKind, name: string) => {
+  const problem = plainNameProblem(kind, name);
+  if (problem) throw new Error(problem);
+};
+
+export const assertPackageName = (name: string) => {
+  if (packageNamePattern.test(name)) return;
   throw new Error(
-    `${JSON.stringify(name)} is no ${kind} name; use letters, digits, - and _, starting with ${isSys ? "a lowercase letter or digit" : "a letter"}`,
+    `${JSON.stringify(name)} is no package name; use name or @scope/name, each of lowercase letters, digits, -, . and _, starting with a letter or digit`,
   );
 };

package/constantFieldNames.ts

@@ -1,18 +0,0 @@
-import ts from "typescript";
-
-const isFieldCall = (node: ts.Expression): boolean =>
-  ts.isCallExpression(node) &&
-  (ts.isIdentifier(node.expression)
-    ? node.expression.text === "field"
-    : ts.isPropertyAccessExpression(node.expression) && isFieldCall(node.expression.expression));
-
-export const constantFieldNames = (content: string) => {
-  const names: string[] = [];
-  const visit = (node: ts.Node) => {
-    if (ts.isPropertyAssignment(node) && ts.isIdentifier(node.name) && isFieldCall(node.initializer))
-      names.push(node.name.text);
-    ts.forEachChild(node, visit);
-  };
-  visit(ts.createSourceFile("constant.ts", content, ts.ScriptTarget.Latest));
-  return names;
-};