akanjs 3.1.0-rc.2 → 3.1.0-rc.21

package/ui/Model/ViewEditModal.tsx

@@ -36,6 +36,7 @@ interface ActionProps {
   label: ReactNode;
   onAct: () => void;
   closeView: () => void;
+  isBlocked?: boolean;
 }
 
 const EditAction = ({ modelName, label, onAct, closeView }: ActionProps) => {
@@ -45,21 +46,30 @@ const EditAction = ({ modelName, label, onAct, closeView }: ActionProps) => {
     .desc(`Turn the open ${modelName} from its detail view into the edit form.`)
     .exec(onAct);
   return (
-    <button className={buttonRecipe({ variant: "primary" }, "w-full")} onClick={editModel} {...agentAttrs(editModel)}>
+    <button
+      type="button"
+      className={buttonRecipe({ variant: "primary" }, "w-full")}
+      onClick={editModel}
+      {...agentAttrs(editModel)}
+    >
       <AiOutlineEdit /> {label}
     </button>
   );
 };
 
-const SaveAction = ({ modelName, label, onAct, closeView }: ActionProps) => {
+const SaveAction = ({ modelName, label, onAct, closeView, isBlocked = false }: ActionProps) => {
   useCloseViewTool(modelName, closeView);
   const submitModel = st
-    .tool(`submit${capitalize(modelName)}`)
+    .tool(`submit${capitalize(modelName)}`, {
+      guard: () => (isBlocked ? `The ${modelName} form is not ready to submit.` : true),
+    })
     .desc(`Save the ${modelName} the open form holds.`)
     .exec(onAct);
   return (
     <button
+      type="button"
       className={buttonRecipe({ variant: "primary" }, "w-full")}
+      disabled={isBlocked}
       onClick={submitModel}
       {...agentAttrs(submitModel)}
     >
@@ -94,7 +104,7 @@ export default function ViewEditModal({
   saveLabel,
 }: ViewEditModalProps) {
   const { l } = usePage();
-  const storeUse = st.use as unknown as { [key: string]: () => unknown };
+  const storeUse = st.use as unknown as { [key: string]: (option?: { agent?: boolean }) => unknown };
   const storeDo = st.do as unknown as { [key: string]: (...args: any[]) => void };
   const storeSel = st.sel as unknown as <Ret, Val>(selector: (state: { [key: string]: Val }) => Ret) => Ret;
   const { refName, sliceName } = slice;
@@ -116,11 +126,12 @@ export default function ViewEditModal({
   const modelLoading = storeUse[names.modelLoading]() as string | boolean;
   const modelFormLoading = storeUse[names.modelFormLoading]() as string | boolean;
   const modelFormId = storeSel<string, { id: string }>((state) => state[names.modelForm].id);
+  const isUploading = Object.keys(storeUse[`${modelName}FormUploading`]({ agent: false }) as object).length > 0;
   const canUpdate = !!servedEndpointOf(fetch, `update${ModelName}`);
   const canRemove = !!servedEndpointOf(fetch, `remove${ModelName}`);
   const isModalOpen = modelModal === "view" || (modelModal === "edit" && (!!modelFormLoading || !!modelFormId));
   const Title = () => {
-    if (!model || modelLoading || !renderTitle) return <></>;
+    if (!model || modelLoading || !renderTitle) return null;
     const render = renderTitle(model);
     if (typeof render === "string")
       return <h2 className="flex items-center text-sm md:text-base lg:text-lg xl:text-2xl">{render}</h2>;
@@ -182,6 +193,7 @@ export default function ViewEditModal({
             modelName={modelName}
             label={saveLabel ?? l("base.save")}
             closeView={closeView}
+            isBlocked={isUploading}
             onAct={() => {
               storeDo[names.submitModel]({ sliceName, modal: "view" });
             }}

package/ui/Model/ViewModal.tsx

@@ -59,13 +59,13 @@ export default function ViewModal({
   const modelLoading = storeUse[names.modelLoading]() as string | boolean;
   const isModalOpen = modelModal === (modal ?? "view") && (modelLoading === id || model?.id === id);
   const Title = () => {
-    if (!model || modelLoading || !renderTitle) return <></>;
+    if (!model || modelLoading || !renderTitle) return null;
     const render = renderTitle(model);
     if (typeof render === "string") return <h2 className="flex items-center text-2xl">{render}</h2>;
     else return render;
   };
   const Action = () => {
-    if (!model || modelLoading || !renderAction) return <></>;
+    if (!model || modelLoading || !renderAction) return null;
     const render = renderAction(model);
     return render;
   };

package/ui/ObjectId.tsx

@@ -26,7 +26,11 @@ export const ObjectId = ({ id }: ObjectIdProps) => {
       <Tooltip content={id} variant="primary">
         <div className="font-semibold text-xs">{shortenedId}</div>
       </Tooltip>
-      <button className={recipe({ variant: "ghost", size: "icon" }, "size-6 rounded-full")} onClick={handleCopyClick}>
+      <button
+        type="button"
+        className={recipe({ variant: "ghost", size: "icon" }, "size-6 rounded-full")}
+        onClick={handleCopyClick}
+      >
         {isCopied ? <AiOutlineCheck /> : <AiOutlineCopy />}
       </button>
     </div>

package/ui/Pagination.tsx

@@ -62,7 +62,7 @@ export const DefaultPagination = ({
   }
 
   const emptyNode = empty ?? renderEmpty;
-  if (total <= 0) return emptyNode ? <>{emptyNode}</> : null;
+  if (total <= 0) return emptyNode || null;
   return (
     <div className={cn("flex items-center justify-center gap-1", classNames?.className)}>
       <button

package/ui/Signal/Arg.tsx

@@ -37,9 +37,7 @@ export default function Arg({ argType, value, onChange }: ArgProps) {
     <Arg.Json value={value as string} onChange={onChange} />
   ) : argType === "Upload" ? (
     <Arg.Upload value={value as FileList} onChange={onChange} />
-  ) : (
-    <></>
-  );
+  ) : null;
 }
 
 interface ArgTableProps {

package/ui/Signal/Doc.tsx

@@ -74,7 +74,10 @@ export const DocSetting = ({ fetch = runtimeFetch, search, onSearch }: DocSettin
     <Toolbar>
       <ToolbarField label={l.trans(signalText.baseUrl)}>
         <Copy text={fetch.origin}>
-          <button className={buttonRecipe({ variant: "ghost", size: "sm" }, "font-mono text-foreground/80")}>
+          <button
+            type="button"
+            className={buttonRecipe({ variant: "ghost", size: "sm" }, "font-mono text-foreground/80")}
+          >
             {fetch.origin}
             <AiOutlineCopy className="text-foreground/40" />
           </button>
@@ -173,6 +176,7 @@ export const DocAuthModal = ({ children }: DocAuthModalProps) => {
         title={l.trans(signalText.setJwtTitle)}
         action={
           <button
+            type="button"
             className={buttonRecipe({ variant: "primary" }, "w-full")}
             onClick={() => {
               st.set(

package/ui/System/CSR.tsx

@@ -367,7 +367,7 @@ const CSRFrameSlotTargets = ({ slot }: { slot: FrameSlotTarget }) => {
 };
 
 const CSRInner = () => {
-  return <></>;
+  return null;
 };
 CSR.Inner = CSRInner;
 

package/ui/System/Client.tsx

@@ -53,7 +53,7 @@ import { Messages } from "./Messages";
 import { Reconnect } from "./Reconnect";
 
 export const Client = () => {
-  return <></>;
+  return null;
 };
 interface ClientWrapperProps {
   children: ReactNode;

package/ui/System/Reconnect.tsx

@@ -29,7 +29,7 @@ export const Reconnect = () => {
 
     try {
       await (fetch as unknown as { ping: () => Promise<string> }).ping();
-    } catch (e) {
+    } catch {
       setConnectStatus((prev) => (prev === "normal" || prev === "initial" ? "disconnected" : prev));
       setTimeout(() => {
         setConnectStatus((prev) => (prev === "disconnected" ? "connecting" : prev));

package/ui/System/SSR.tsx

@@ -7,20 +7,10 @@ import {
   type ReactFont,
   router,
   Translator,
-  transitionTypes,
   usePage,
-  viewTransitionClassOf,
 } from "akanjs/client";
 import { getRequestFrameState, setRequestTheme } from "akanjs/fetch";
-import {
-  Children,
-  type CSSProperties,
-  Fragment,
-  type ReactNode,
-  Suspense,
-  type ViewTransitionClassPerType,
-} from "react";
-import { ViewTransition } from "../../client/viewTransition";
+import { Children, type CSSProperties, Fragment, type ReactNode, Suspense } from "react";
 import { FontCss } from "../fontCss";
 import { frameSlotContainerClassNames, frameSlotContentClassNames, frameSlotStyles } from "../Layout/frameSlot";
 import { Load } from "../Load";
@@ -28,7 +18,7 @@ import { ClientBridge, ClientInner, ClientPathWrapper, ClientSsrBridge, ClientWr
 import { getFrameCssVars, isResponsiveFrame, type ProviderProps } from "./Common";
 
 export const SSR = () => {
-  return <></>;
+  return null;
 };
 
 export type SSRProviderProps = ProviderProps & {
@@ -124,18 +114,6 @@ const ServerFontFace = ({ fonts }: { fonts: ReactFont[] }) => {
   );
 };
 
-const pageViewTransition: ViewTransitionClassPerType = Object.fromEntries([
-  ["default", "none"],
-  ...transitionTypes.flatMap((transition) =>
-    transition === "none"
-      ? []
-      : (["push", "pop"] as const).map((direction) => {
-          const type = viewTransitionClassOf(transition, direction);
-          return [type, type];
-        }),
-  ),
-]);
-
 interface SSRWrapperProps {
   className?: string;
   appName: string;
@@ -220,18 +198,7 @@ const SSRWrapper = ({
                   layoutStyle === "mobile" && "left-1/2 h-screen w-full max-w-[600px] -translate-x-1/2",
                 )}
               >
-                {ViewTransition ? (
-                  <ViewTransition
-                    default="none"
-                    enter={pageViewTransition}
-                    exit={pageViewTransition}
-                    update={pageViewTransition}
-                  >
-                    {Children.toArray(children)}
-                  </ViewTransition>
-                ) : (
-                  Children.toArray(children)
-                )}
+                {Children.toArray(children)}
               </div>
             </div>
           </div>

package/ui/ToggleSelect.tsx

@@ -70,6 +70,7 @@ const DefaultToggleSelect = <I extends string | number | boolean | null>({
           <Fragment key={idx}>{renderItem(option, { selected: isSelected, disabled: isDisabled, onToggle })}</Fragment>
         ) : (
           <button
+            type="button"
             key={idx}
             disabled={isDisabled}
             className={cn(toggleBtn, isSelected && selectedCls, isDisabled && "cursor-not-allowed", btnClassName)}
@@ -128,6 +129,7 @@ const DefaultMulti = ({
         const isDisabled = (disabled ?? false) || (option.disabled ?? false);
         return (
           <button
+            type="button"
             key={idx}
             disabled={isDisabled}
             className={cn(toggleBtn, isSelected && selectedCls, isDisabled && "cursor-not-allowed", btnClassName)}

package/ui/styles.css

@@ -140,6 +140,16 @@ body {
   -webkit-user-select: none; */
 }
 
+/* An installed web app's document does not rubber-band; in a browser tab the page keeps the browser's own feel. */
+@layer base {
+  @media (display-mode: standalone) {
+    html,
+    body {
+      overscroll-behavior-y: none;
+    }
+  }
+}
+
 html.akan-mobile-document,
 body.akan-mobile-document {
   width: 100%;
@@ -323,109 +333,6 @@ body.akan-mobile-document {
   }
 }
 
-/* Route transitions on the web: an RSC navigation tags itself `akan-<transition>-<push|pop>` from the route's
-   `.config({ transition })`, and the page content's ViewTransition takes that class. The rest of the page holds. */
-:root:active-view-transition-type(akan-nav)::view-transition-old(root),
-:root:active-view-transition-type(akan-nav)::view-transition-new(root) {
-  animation: none;
-}
-::view-transition-old(.akan-stack-push) {
-  animation: 260ms cubic-bezier(0.32, 0.72, 0, 1) both akan-vt-out-left;
-}
-::view-transition-new(.akan-stack-push) {
-  animation: 260ms cubic-bezier(0.32, 0.72, 0, 1) both akan-vt-in-right;
-}
-::view-transition-old(.akan-stack-pop) {
-  animation: 260ms cubic-bezier(0.32, 0.72, 0, 1) both akan-vt-out-right;
-}
-::view-transition-new(.akan-stack-pop) {
-  animation: 260ms cubic-bezier(0.32, 0.72, 0, 1) both akan-vt-in-left;
-}
-::view-transition-old(.akan-bottomUp-push),
-::view-transition-new(.akan-bottomUp-pop) {
-  animation: none;
-}
-::view-transition-new(.akan-bottomUp-push) {
-  animation: 280ms cubic-bezier(0.32, 0.72, 0, 1) both akan-vt-in-up;
-}
-::view-transition-old(.akan-bottomUp-pop) {
-  animation: 240ms ease-in both akan-vt-out-down;
-}
-::view-transition-old(.akan-fade-push),
-::view-transition-old(.akan-fade-pop) {
-  animation: 180ms ease-in both akan-vt-fade-out;
-}
-::view-transition-new(.akan-fade-push),
-::view-transition-new(.akan-fade-pop) {
-  animation: 180ms ease-out both akan-vt-fade-in;
-}
-::view-transition-old(.akan-scaleOut-push) {
-  animation: 220ms ease-in both akan-vt-shrink-out;
-}
-::view-transition-new(.akan-scaleOut-push) {
-  animation: 220ms ease-out both akan-vt-fade-in;
-}
-::view-transition-old(.akan-scaleOut-pop) {
-  animation: 200ms ease-in both akan-vt-fade-out;
-}
-::view-transition-new(.akan-scaleOut-pop) {
-  animation: 220ms ease-out both akan-vt-grow-in;
-}
-@keyframes akan-vt-in-right {
-  from {
-    transform: translateX(100%);
-  }
-}
-@keyframes akan-vt-out-left {
-  to {
-    transform: translateX(-30%);
-    opacity: 0.6;
-  }
-}
-@keyframes akan-vt-in-left {
-  from {
-    transform: translateX(-30%);
-    opacity: 0.6;
-  }
-}
-@keyframes akan-vt-out-right {
-  to {
-    transform: translateX(100%);
-  }
-}
-@keyframes akan-vt-in-up {
-  from {
-    transform: translateY(100%);
-  }
-}
-@keyframes akan-vt-out-down {
-  to {
-    transform: translateY(100%);
-  }
-}
-@keyframes akan-vt-fade-in {
-  from {
-    opacity: 0;
-  }
-}
-@keyframes akan-vt-fade-out {
-  to {
-    opacity: 0;
-  }
-}
-@keyframes akan-vt-shrink-out {
-  to {
-    transform: scale(0.94);
-    opacity: 0;
-  }
-}
-@keyframes akan-vt-grow-in {
-  from {
-    transform: scale(0.94);
-    opacity: 0;
-  }
-}
-
 /* Always-included keyframes (non-theme animations) */
 @keyframes smaller {
   0% {

package/vendor/@akanjs/native/native/ios/Sources/AkanNativeBridge.swift

@@ -194,8 +194,9 @@ final class AkanNativeBridge: NSObject {
             return AkanNativeLog.info("emit \(plugin).\(event): data is not JSON, dropped")
         }
         // Arguments go in as values, so no JS string escaping is involved.
-        webView.callAsyncJavaScript("window.__AKAN_NATIVE__ && window.__AKAN_NATIVE__.receive(m)", arguments: ["m": text], in: nil, in: .page) { result in
-            if case .failure(let error) = result { AkanNativeLog.info("emit \(plugin).\(event) failed: \(error)") }
+        // The ObjC method: below an iOS 18.4 target Swift's Result overlay links libswiftWebKit.dylib, absent on iOS 18.5.
+        webView.__callAsyncJavaScript("window.__AKAN_NATIVE__ && window.__AKAN_NATIVE__.receive(m)", arguments: ["m": text], inFrame: nil, in: .page) { _, error in
+            if let error { AkanNativeLog.info("emit \(plugin).\(event) failed: \(error)") }
         }
     }
 

package/vendor/@akanjs/native/packages/cli/src/lib/addons.ts

@@ -61,7 +61,10 @@ export function addonReport(serverDir: string, os: AddonOs, arch: AddonArch): Ad
         `${name} was compiled on this computer at install (binding.gyp, no prebuilt binary): check that it runs on a computer with nothing else installed`,
       );
   }
-  return { problems: problems.sort(), warnings: warnings.sort() };
+  return {
+    problems: problems.sort((a, b) => (a < b ? -1 : a > b ? 1 : 0)),
+    warnings: warnings.sort((a, b) => (a < b ? -1 : a > b ? 1 : 0)),
+  };
 }
 
 /** A path inside the server as the report names it: relative, `/`-separated on every OS. */

package/vendor/@akanjs/native/packages/cli/src/lib/apk.ts

@@ -172,7 +172,7 @@ export function assembleApk({ base, dex, assetsDir, extra = [] }: ApkInput): Uin
   for (const [i, bytes] of dex.entries())
     entries.push(fileEntry(i === 0 ? "classes.dex" : `classes${i + 1}.dex`, bytes, true));
   for (const e of extra) entries.push(fileEntry(e.name, e.bytes, false));
-  for (const file of walk(assetsDir).sort()) {
+  for (const file of walk(assetsDir).sort((a, b) => (a < b ? -1 : a > b ? 1 : 0))) {
     const rel = relative(assetsDir, file).split("\\").join("/");
     const ext = rel.split(".").pop()!.toLowerCase();
     entries.push(fileEntry(`assets/${rel}`, new Uint8Array(readFileSync(file)), STORE_EXT.has(ext)));
@@ -194,7 +194,7 @@ export function assembleBundleModule({ base, dex, assetsDir, extra = [] }: ApkIn
     entries.push(fileEntry(`dex/${i === 0 ? "classes.dex" : `classes${i + 1}.dex`}`, bytes, false));
   
   for (const e of extra) entries.push(fileEntry(e.name.startsWith("lib/") ? e.name : `root/${e.name}`, e.bytes, false));
-  for (const file of walk(assetsDir).sort()) {
+  for (const file of walk(assetsDir).sort((a, b) => (a < b ? -1 : a > b ? 1 : 0))) {
     const rel = relative(assetsDir, file).split("\\").join("/");
     const ext = rel.split(".").pop()!.toLowerCase();
     entries.push(fileEntry(`assets/${rel}`, new Uint8Array(readFileSync(file)), STORE_EXT.has(ext)));

package/vendor/@akanjs/native/packages/cli/src/lib/codegen.ts

@@ -889,7 +889,7 @@ export function generateKotlin(model: GenModel, pkg: string): string {
     } else out.push(`            ${JSON.stringify(m.name)} -> ${kotlinName(m.name)}(${reply})`);
   }
   out.push(
-    '            else -> call.reject(AkanNativeErrorCode.NOT_FOUND, "unknown method ${call.method}")',
+    `            else -> call.reject(AkanNativeErrorCode.NOT_FOUND, "unknown method \${call.method}")`,
     "        }",
     "    }",
     "}",

package/vendor/@akanjs/native/packages/cli/src/lib/csp.ts

@@ -157,9 +157,10 @@ export function injectCspMeta(html: string, policy: string): string {
     );
   }
   const tag = `<meta http-equiv="Content-Security-Policy" content="${policy.replace(/&/g, "&amp;").replace(/"/g, "&quot;")}">`;
-  const head = /<head(\s[^>]*)?>/i.exec(html);
-  if (!head) throw new CliError("index.html has no <head> for the Content-Security-Policy <meta>");
-  const afterHead = head.index + head[0].length;
+  const head = /<head[\s>]/i.exec(html);
+  const headEnd = head ? html.indexOf(">", head.index) : -1;
+  if (headEnd < 0) throw new CliError("index.html has no <head> for the Content-Security-Policy <meta>");
+  const afterHead = headEnd + 1;
   const rest = html.slice(afterHead);
   const charset = /<meta\b[^>]*\bcharset\s*=[^>]*>/i.exec(rest);
   

package/vendor/@akanjs/native/packages/cli/src/lib/googleservices.ts

@@ -12,7 +12,13 @@ interface GoogleServices {
 }
 
 const escape = (s: string) =>
-  s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/'/g, "\\'").replace(/"/g, '\\"');
+  s
+    .replace(/\\/g, "\\\\")
+    .replace(/&/g, "&amp;")
+    .replace(/</g, "&lt;")
+    .replace(/>/g, "&gt;")
+    .replace(/'/g, "\\'")
+    .replace(/"/g, '\\"');
 
 /** res/values/google_services.xml for `packageName` (and `fallbackPackage` when it has no client). */
 export function googleServicesXml(json: string, packageName: string, fallbackPackage = packageName): string {

package/vendor/@akanjs/native/packages/cli/src/lib/hmr.ts

@@ -25,6 +25,9 @@ export function resolveDevEntry(project: Project): string {
   );
 }
 
+const scriptJson = (value: unknown) =>
+  JSON.stringify(value).replace(/[<>\u2028\u2029]/g, (c) => `\\u${c.charCodeAt(0).toString(16).padStart(4, "0")}`);
+
 /**
  * Inline classic script in the dev page. It runs while the document is parsed, so before Bun's
  * client (a module script, deferred).
@@ -47,17 +50,17 @@ export function devShim(socket?: { origin: string; path?: string; paths?: string
     socket === undefined
       ? ""
       : "var W=window.WebSocket,T=" +
-        JSON.stringify(socket.origin) +
+        scriptJson(socket.origin) +
         ",P=" +
-        JSON.stringify([socket.path ?? HMR_PATH, ...(socket.paths ?? [])]) +
+        scriptJson([socket.path ?? HMR_PATH, ...(socket.paths ?? [])]) +
         ";function S(u,p){try{var x=new URL(String(u),location.href);if(P.indexOf(x.pathname)>=0&&x.host===location.host)u=T+x.pathname+x.search}catch(e){}return p===undefined?new W(u):new W(u,p)}" +
         "S.prototype=W.prototype;S.CONNECTING=0;S.OPEN=1;S.CLOSING=2;S.CLOSED=3;window.WebSocket=S;";
   const gateway = socket?.origin.replace(/^ws/, "http");
-  const marker = gateway === undefined ? "" : `window.__AKAN_NATIVE_DEV__={gateway:${JSON.stringify(gateway)}};`;
+  const marker = gateway === undefined ? "" : `window.__AKAN_NATIVE_DEV__={gateway:${scriptJson(gateway)}};`;
   const bodies = !socket?.relayBodies
     ? ""
     : "var G=" +
-      JSON.stringify(gateway) +
+      scriptJson(gateway) +
       ';function R(u,m){try{var x=new URL(String(u),location.href);m=String(m||"GET").toUpperCase();' +
       'if(x.origin===location.origin&&m!=="GET"&&m!=="HEAD"&&x.pathname.indexOf("/__akan_native/")!==0)return G+x.pathname+x.search}catch(e){}return null}' +
       "var F=window.fetch;if(F)window.fetch=function(i,o){var q=window.Request&&i instanceof window.Request," +
@@ -387,7 +390,7 @@ export async function startHmrServer(opts: HmrOptions): Promise<HmrServer> {
       for (const warning of warnings) warnOnce(warning);
       return new Response(page, { headers: { ...noCache, "content-type": "text/html; charset=utf-8" } });
     } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
+      const message = `dev gateway: the page: ${error instanceof Error ? error.message : String(error)}`;
       warnOnce(message);
       return new Response(message, { status: 500, headers: { "content-type": "text/plain; charset=utf-8" } });
     }

package/vendor/@akanjs/native/packages/cli/src/lib/html.ts

@@ -42,9 +42,24 @@ export const EARLY_ERRORS_SCRIPT =
 
 /** Puts the early error collector right after the init.js tag (dev builds). */
 export function injectEarlyErrors(html: string): string {
-  const init = /<script\b[^>]*\bsrc\s*=\s*["']?[^"'\s>]*__akan_native\/init\.js[^>]*>\s*<\/script>/i.exec(html);
-  if (!init) return html;
-  return insertAt(html, init.index + init[0].length, `<script>${EARLY_ERRORS_SCRIPT}</script>`);
+  const opening = /<script\b/gi;
+  for (let m = opening.exec(html); m; m = opening.exec(html)) {
+    const tagEnd = html.indexOf(">", m.index);
+    if (tagEnd < 0) break;
+    let closeAt = tagEnd + 1;
+    while (closeAt < html.length && /\s/.test(html.charAt(closeAt))) closeAt += 1;
+    const closeEnd = closeAt + "</script>".length;
+    if (html.slice(closeAt, closeEnd).toLowerCase() === "</script>" && loadsInitScript(html.slice(m.index, tagEnd)))
+      return insertAt(html, closeEnd, `<script>${EARLY_ERRORS_SCRIPT}</script>`);
+    opening.lastIndex = tagEnd + 1;
+  }
+  return html;
+}
+
+function loadsInitScript(tag: string): boolean {
+  for (const src of tag.matchAll(/\bsrc\s*=\s*["']?([^"'\s>]*)/gi))
+    if (/__akan_native\/init\.js/i.test(src[1] ?? "")) return true;
+  return false;
 }
 
 function insertAt(text: string, index: number, insert: string): string {

package/vendor/@akanjs/native/packages/cli/src/lib/manifestmerge.ts

@@ -28,7 +28,7 @@ const KEPT_APPLICATION_ATTRS = ["android:appComponentFactory"];
 function clean(element: XmlElement, applicationId: string): XmlElement {
   element.attrs = element.attrs
     .filter(([n]) => !n.startsWith("tools:") && n !== "xmlns:tools")
-    .map(([n, v]) => [n, v.replaceAll("${applicationId}", applicationId)]);
+    .map(([n, v]) => [n, v.replaceAll(`\${applicationId}`, applicationId)]);
   for (const c of element.children) clean(c, applicationId);
   return element;
 }

package/vendor/@akanjs/native/packages/cli/src/lib/plist.ts

@@ -62,10 +62,8 @@ const unescape = (text: string) =>
  */
 export function parsePlist(xml: string): PlistValue {
   const tokens = [
-    ...xml
-      .replace(/<\?xml[^>]*\?>|<!DOCTYPE[^>]*>|<!--[\s\S]*?-->/g, "")
-      .matchAll(/<(\/?)([a-zA-Z]+)[^>]*?(\/)?>|([^<]+)/g),
-  ];
+    ...xml.matchAll(/<\?xml[^>]*\?>|<!DOCTYPE[^>]*>|<!--[\s\S]*?-->|<(\/?)([a-zA-Z]+)[^>]*?(\/)?>|([^<]+)/g),
+  ].filter((t) => t[2] !== undefined || t[4] !== undefined);
   let i = 0;
   const next = () => tokens[i++];
   const text = (tag: string): string => {

package/vendor/@akanjs/native/packages/cli/src/lib/toolchains.ts

@@ -256,7 +256,7 @@ async function withLock<T>(
       if ((error as NodeJS.ErrnoException).code !== "EEXIST") throw error;
     }
     if (opts.ready()) return null; 
-    let stale = true;
+    let stale: boolean;
     try {
       const [pid, at] = readFileSync(lock, "utf8").trim().split(" ").map(Number);
       const alive = (() => {

package/vendor/@akanjs/native/packages/cli/src/lib/updates.ts

@@ -175,7 +175,7 @@ export function validateUpdates(raw: unknown, problems: string[]): UpdatesConfig
   }
   const r = raw as Record<string, unknown>;
   
-  if (typeof r.url !== "string" || !/^https?:\/\/[^/?#]+[^?#]*$/.test(r.url))
+  if (typeof r.url !== "string" || !/^https?:\/\/[^/?#][^?#]*$/.test(r.url))
     problems.push("updates.url must be an http(s) URL without a query or fragment");
   const publicKeys = updatePublicKeys(r, problems);
   const revokedKeys = updateRevokedKeys(r.revokedKeys, problems);
@@ -187,13 +187,13 @@ export function validateUpdates(raw: unknown, problems: string[]): UpdatesConfig
   for (const key of Object.keys(r))
     if (!["url", "publicKey", "publicKeys", "revokedKeys", "channel", "readyTimeout", "report"].includes(key))
       problems.push(`updates.${key} is not supported`);
-  if (publicKeys && publicKeys.every((key) => revokedKeys.includes(keyIdOf(key))))
+  if (publicKeys?.every((key) => revokedKeys.includes(keyIdOf(key))))
     problems.push(
       "updates.revokedKeys revokes every key of updates.publicKeys: a phone built from it would trust none (add one with `akan-native update keygen`)",
     );
   if (typeof r.url !== "string" || !publicKeys) return null;
   return {
-    url: r.url.replace(/\/+$/, ""),
+    url: withoutTrailingSlashes(r.url),
     publicKeys,
     revokedKeys,
     channel: (r.channel as string | undefined) ?? "production",
@@ -202,11 +202,17 @@ export function validateUpdates(raw: unknown, problems: string[]): UpdatesConfig
   };
 }
 
+function withoutTrailingSlashes(url: string): string {
+  let end = url.length;
+  while (end > 0 && url[end - 1] === "/") end -= 1;
+  return url.slice(0, end);
+}
+
 /** `report: { url }`, posted to as it is: the address is the receiver's, a path of its own included. */
 function updateReportUrl(raw: unknown, problems: string[]): string | null {
   if (raw === undefined) return null;
   const url = raw && typeof raw === "object" && !Array.isArray(raw) ? (raw as Record<string, unknown>).url : undefined;
-  if (typeof url !== "string" || !/^https?:\/\/[^/?#]+[^#]*$/.test(url) || Object.keys(raw as object).length !== 1) {
+  if (typeof url !== "string" || !/^https?:\/\/[^/?#][^#]*$/.test(url) || Object.keys(raw as object).length !== 1) {
     problems.push("updates.report must be { url } with an http(s) URL");
     return null;
   }

package/vendor/@akanjs/native/packages/cli/src/lib/xml.ts

@@ -27,12 +27,13 @@ export const escapeXml = (text: string) =>
 
 /** Parses a document's root element. Text between elements is ignored (manifests have none that matters). */
 export function parseXml(source: string): XmlElement {
-  const text = source.replace(/<\?[\s\S]*?\?>|<!--[\s\S]*?-->|<!DOCTYPE[^>]*>/g, "");
-  const tag = /<(\/?)([\w:.-]+)((?:\s+[\w:.-]+\s*=\s*(?:"[^"]*"|'[^']*'))*)\s*(\/?)>/g;
+  const tag =
+    /<\?[\s\S]*?\?>|<!--[\s\S]*?-->|<!DOCTYPE[^>]*>|<(\/?)([\w:.-]+)((?:\s+[\w:.-]+\s*=\s*(?:"[^"]*"|'[^']*'))*)\s*(\/?)>/g;
   const stack: XmlElement[] = [];
   let root: XmlElement | null = null;
-  for (let m = tag.exec(text); m; m = tag.exec(text)) {
+  for (let m = tag.exec(source); m; m = tag.exec(source)) {
     const [, closing, name, attrText, selfClosing] = m;
+    if (name === undefined) continue;
     if (closing) {
       const open = stack.pop();
       if (!open || open.name !== name) throw new Error(`XML: </${name}> does not close <${open?.name ?? "nothing"}>`);