apps 0.0.1-beta.17 → 0.0.1-beta.19

package/js/ui/serving.js

@@ -19,186 +19,58 @@ import {
 } from "../chunk-CDL5PM2Q.js";
 import "../chunk-CZ7CSFO4.js";
 
-// src/implementation/ui-errors.ts
-var installAppFailureUI = () => {
-  let activeDialog;
-  let windowStart = Date.now(), reports = 0, dropped = 0;
-  const recent = /* @__PURE__ */ new Map();
-  const extension = /^(?:chrome|moz|safari-web)-extension:/;
-  const errorTypes = /* @__PURE__ */ new Set([
-    "Error",
-    "TypeError",
-    "ReferenceError",
-    "SyntaxError",
-    "RangeError",
-    "URIError",
-    "EvalError",
-    "AggregateError"
-  ]);
-  const sourceAttributes = (filename, line = 0, column = 0) => {
-    const attributes = [];
-    if (!URL.canParse(filename)) return attributes;
-    const url = new URL(filename);
-    if (url.origin !== location.origin || !url.pathname.startsWith("/_executor/assets/") || !url.pathname.endsWith(".js"))
-      return attributes;
-    attributes.push({ key: "code.file.path", value: { stringValue: url.pathname } });
-    if (Number.isSafeInteger(line) && line > 0)
-      attributes.push({ key: "code.line.number", value: { intValue: String(line) } });
-    if (Number.isSafeInteger(column) && column > 0)
-      attributes.push({ key: "code.column.number", value: { intValue: String(column) } });
-    return attributes;
-  };
-  const fail = (kind, details, attributes = []) => {
-    const now = Date.now();
-    if (now - windowStart >= 6e4) {
-      windowStart = now;
-      reports = 0;
-      recent.clear();
-    }
-    const signature = `${kind}:${details.slice(0, 2e3)}`;
-    const previous = recent.get(signature);
-    if (previous !== void 0 && now - previous < 1e3 || reports >= 20) {
-      dropped++;
-      return;
-    }
-    recent.set(signature, now);
-    reports++;
-    attributes.push({
-      key: "executor.ui.failure.suppressed",
-      value: { intValue: String(dropped) }
-    });
-    dropped = 0;
-    const traceId = Array.from(
-      crypto.getRandomValues(new Uint8Array(16)),
-      (byte) => byte.toString(16).padStart(2, "0")
-    ).join("");
-    const time = `${Date.now()}000000`;
-    let status;
-    let deliveryMessage = "Sending error report\u2026";
-    const show = () => {
-      if (activeDialog?.open) return;
-      const host = document.createElement("div");
-      const root = host.attachShadow({ mode: "open" });
-      const dialog = document.createElement("dialog");
-      activeDialog = dialog;
-      dialog.setAttribute("aria-labelledby", "executor-failure-title");
-      const title = document.createElement("h2");
-      title.id = "executor-failure-title";
-      title.textContent = kind === "script" ? "This app could not load" : "This app stopped working";
-      const message = document.createElement("p");
-      message.textContent = kind === "script" ? "A file needed by this page did not load. Reload the page to try again." : "The app encountered an unexpected error. Reload the page to try again.";
-      const warning = document.createElement("p");
-      warning.textContent = "Copy any unsaved work before reloading.";
-      const disclosure = document.createElement("details");
-      const summary = document.createElement("summary");
-      summary.textContent = "Error details";
-      const report = document.createElement("textarea");
-      report.readOnly = true;
-      report.rows = 10;
-      report.cols = 36;
-      report.setAttribute("aria-label", "Error details");
-      report.value = `${details.slice(0, 12e3)}
+// src/implementation/browser-scripts.gen.ts
+var appWatchSource = '"use strict";(()=>{var s=()=>{let i=document.getElementById("executor-context")?.textContent;if(!i)return;let n=JSON.parse(i);if(typeof n!="object"||n===null||!("deployment"in n))return;let r=n.deployment;if(typeof r!="string"||r.length===0)return;let t=new EventSource("/_executor/version"),l=!1,o=()=>{l||(l=!0,t.close(),location.reload())};t.addEventListener("version",d=>{let e=JSON.parse(d.data);typeof e=="object"&&e!==null&&"deployment"in e&&(e.deployment===null||typeof e.deployment=="string")&&e.deployment!==r&&o()}),t.addEventListener("revoked",o),window.addEventListener("executor:deployment-changed",o),window.addEventListener("pagehide",()=>t.close(),{once:!0}),window.addEventListener("pageshow",d=>{d.persisted&&o()})};s();})();';
+var appFailureSource = '"use strict";(()=>{var D=()=>{let d,w=Date.now(),m=0,g=0,f=new Map,A=/^(?:chrome|moz|safari-web)-extension:/,R=new Set(["Error","TypeError","ReferenceError","SyntaxError","RangeError","URIError","EvalError","AggregateError"]),x=(e,t=0,i=0)=>{let r=[];if(!URL.canParse(e))return r;let a=new URL(e);return a.origin!==location.origin||!a.pathname.startsWith("/_executor/assets/")||!a.pathname.endsWith(".js")||(r.push({key:"code.file.path",value:{stringValue:a.pathname}}),Number.isSafeInteger(t)&&t>0&&r.push({key:"code.line.number",value:{intValue:String(t)}}),Number.isSafeInteger(i)&&i>0&&r.push({key:"code.column.number",value:{intValue:String(i)}})),r},E=(e,t,i=[])=>{let r=Date.now();r-w>=6e4&&(w=r,m=0,f.clear());let a=`${e}:${t.slice(0,2e3)}`,b=f.get(a);if(b!==void 0&&r-b<1e3||m>=20){g++;return}f.set(a,r),m++,i.push({key:"executor.ui.failure.suppressed",value:{intValue:String(g)}}),g=0;let h=Array.from(crypto.getRandomValues(new Uint8Array(16)),s=>s.toString(16).padStart(2,"0")).join(""),S=`${Date.now()}000000`,n,u="Sending error report\\u2026",k=()=>{if(d?.open)return;let s=document.createElement("div"),V=s.attachShadow({mode:"open"}),o=document.createElement("dialog");d=o,o.setAttribute("aria-labelledby","executor-failure-title");let y=document.createElement("h2");y.id="executor-failure-title",y.textContent=e==="script"?"This app could not load":"This app stopped working";let C=document.createElement("p");C.textContent=e==="script"?"A file needed by this page did not load. Reload the page to try again.":"The app encountered an unexpected error. Reload the page to try again.";let L=document.createElement("p");L.textContent="Copy any unsaved work before reloading.";let T=document.createElement("details"),v=document.createElement("summary");v.textContent="Error details";let c=document.createElement("textarea");c.readOnly=!0,c.rows=10,c.cols=36,c.setAttribute("aria-label","Error details"),c.value=`${t.slice(0,12e3)}\n\nDiagnostic ID: ${h}`,T.append(v,c),n=document.createElement("p"),n.setAttribute("role","status"),n.textContent=u;let l=document.createElement("button");l.type="button",l.textContent="Reload page",l.addEventListener("click",()=>location.reload());let p=document.createElement("button");p.type="button",p.textContent="Close",p.addEventListener("click",()=>o.close()),o.addEventListener("close",()=>{d===o&&(d=void 0),s.remove()}),o.append(y,C,L,T,n,l,p),V.append(o),document.documentElement.append(s),o.showModal()};document.readyState==="loading"?document.addEventListener("DOMContentLoaded",k,{once:!0}):k(),fetch("/_executor/api/telemetry/traces",{method:"POST",headers:{"content-type":"application/json"},credentials:"same-origin",keepalive:!0,body:JSON.stringify({resourceSpans:[{scopeSpans:[{spans:[{traceId:h,spanId:h.slice(0,16),name:"ui.app.failure",kind:1,startTimeUnixNano:S,endTimeUnixNano:S,status:{code:2},attributes:[{key:"executor.ui.failure.kind",value:{stringValue:e}},...i]}]}]}]})}).then(s=>{u=s.ok?"Error report sent.":"Could not send the error report. You can copy the error details.",n&&(n.textContent=u)},()=>{u="Could not send the error report. You can copy the error details.",n&&(n.textContent=u)})};window.addEventListener("error",e=>{if(e instanceof ErrorEvent){if(A.test(e.filename))return;let t=x(e.filename,e.lineno,e.colno);e.error instanceof Error&&R.has(e.error.name)&&t.push({key:"exception.type",value:{stringValue:e.error.name}}),E("runtime",e.error instanceof Error?e.error.stack??e.message:e.message,t)}else e.target instanceof HTMLScriptElement&&E("script",`Could not load script: ${e.target.src}`,x(e.target.src))},!0),window.addEventListener("unhandledrejection",e=>{let t=e.reason;E("rejection",t instanceof Error?t.stack??t.message:"An app operation failed without handling its error.")})};D();})();';
+var accountNoticeSource = '"use strict";(()=>{var g=()=>{let r=document.getElementById("executor-account-notice")?.textContent;if(!r)return;let t=JSON.parse(r);if(typeof t!="object"||t===null||!("items"in t)||!("fix"in t))return;let c=t.items,s=t.fix;if(!Array.isArray(c)||typeof s!="string")return;let a=()=>{let i=document.createElement("div"),x=i.attachShadow({mode:"open"}),d=document.createElement("style");d.textContent="aside{position:fixed;right:16px;bottom:16px;z-index:2147483647;max-width:360px;box-sizing:border-box;padding:14px 16px;border-radius:10px;border:1px solid #fcd34d;background:#fffbeb;color:#451a03;font:14px/1.45 ui-sans-serif,system-ui,sans-serif;box-shadow:0 8px 24px rgb(0 0 0/.12)}strong{display:block;margin-bottom:4px}ul{margin:0 0 10px;padding-left:18px}div{display:flex;gap:12px;align-items:center}a{color:inherit;font-weight:600}button{margin-left:auto;font:inherit;background:none;border:0;padding:0;color:inherit;text-decoration:underline;cursor:pointer}";let e=document.createElement("aside");e.setAttribute("role","status"),e.setAttribute("aria-label","Account warning");let l=document.createElement("strong");l.textContent="Some things might not work";let m=document.createElement("ul");for(let f of c){let p=document.createElement("li");p.textContent=String(f),m.append(p)}let u=document.createElement("div"),n=document.createElement("a");n.href=s,n.target="_top",n.textContent="Review accounts";let o=document.createElement("button");o.type="button",o.textContent="Dismiss",o.addEventListener("click",()=>i.remove()),u.append(n,o),e.append(l,m,u),x.append(d,e),document.documentElement.append(i)};document.readyState==="loading"?document.addEventListener("DOMContentLoaded",a,{once:!0}):a()};g();})();';
 
-Diagnostic ID: ${traceId}`;
-      disclosure.append(summary, report);
-      status = document.createElement("p");
-      status.setAttribute("role", "status");
-      status.textContent = deliveryMessage;
-      const reload = document.createElement("button");
-      reload.type = "button";
-      reload.textContent = "Reload page";
-      reload.addEventListener("click", () => location.reload());
-      const close = document.createElement("button");
-      close.type = "button";
-      close.textContent = "Close";
-      close.addEventListener("click", () => dialog.close());
-      dialog.addEventListener("close", () => {
-        if (activeDialog === dialog) activeDialog = void 0;
-        host.remove();
-      });
-      dialog.append(title, message, warning, disclosure, status, reload, close);
-      root.append(dialog);
-      document.documentElement.append(host);
-      dialog.showModal();
-    };
-    if (document.readyState === "loading") {
-      document.addEventListener("DOMContentLoaded", show, { once: true });
-    } else {
-      show();
-    }
-    void fetch("/_executor/api/telemetry/traces", {
-      method: "POST",
-      headers: { "content-type": "application/json" },
-      credentials: "same-origin",
-      keepalive: true,
-      body: JSON.stringify({
-        resourceSpans: [
-          {
-            scopeSpans: [
-              {
-                spans: [
-                  {
-                    traceId,
-                    spanId: traceId.slice(0, 16),
-                    name: "ui.app.failure",
-                    kind: 1,
-                    startTimeUnixNano: time,
-                    endTimeUnixNano: time,
-                    status: { code: 2 },
-                    attributes: [
-                      { key: "executor.ui.failure.kind", value: { stringValue: kind } },
-                      ...attributes
-                    ]
-                  }
-                ]
-              }
-            ]
-          }
-        ]
-      })
-    }).then(
-      (response) => {
-        deliveryMessage = response.ok ? "Error report sent." : "Could not send the error report. You can copy the error details.";
-        if (status) status.textContent = deliveryMessage;
-      },
-      () => {
-        deliveryMessage = "Could not send the error report. You can copy the error details.";
-        if (status) status.textContent = deliveryMessage;
-      }
-    );
-  };
-  window.addEventListener(
-    "error",
-    (event) => {
-      if (event instanceof ErrorEvent) {
-        if (extension.test(event.filename)) return;
-        const attributes = sourceAttributes(event.filename, event.lineno, event.colno);
-        if (event.error instanceof Error && errorTypes.has(event.error.name))
-          attributes.push({ key: "exception.type", value: { stringValue: event.error.name } });
-        fail(
-          "runtime",
-          event.error instanceof Error ? event.error.stack ?? event.message : event.message,
-          attributes
-        );
-      } else if (event.target instanceof HTMLScriptElement) {
-        fail(
-          "script",
-          `Could not load script: ${event.target.src}`,
-          sourceAttributes(event.target.src)
-        );
-      }
-    },
-    true
-  );
-  window.addEventListener("unhandledrejection", (event) => {
-    const reason = event.reason;
-    fail(
-      "rejection",
-      reason instanceof Error ? reason.stack ?? reason.message : "An app operation failed without handling its error."
-    );
-  });
+// src/implementation/ui-account-notice.ts
+var escape = (text) => text.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll('"', "&quot;");
+var accountProblemBlocks = (problem) => problem.reason === "missing" || problem.reason === "removed" || problem.reason === "incompatible" || problem.reason === "credentials_rejected";
+var accountProblemText = (problem) => {
+  switch (problem.reason) {
+    case "missing":
+      return `No ${problem.provider} account chosen`;
+    case "removed":
+      return `${problem.provider} account was removed or is no longer shared`;
+    case "incompatible":
+      return `Chosen account can't be used as the ${problem.provider} account`;
+    case "credentials_rejected":
+      return `${problem.account} (${problem.provider}): sign-in rejected at last check`;
+    case "forbidden":
+      return `${problem.account} (${problem.provider}): missing permission at last check`;
+    case "upstream_unavailable":
+      return `${problem.account} (${problem.provider}): service unavailable at last check`;
+    case "check_failed":
+      return `${problem.account} (${problem.provider}): last check failed`;
+  }
+};
+var accountBlockedPage = (notice) => {
+  const title = `${escape(notice.app)} can't open`;
+  const items = notice.problems.map(
+    (problem) => `<li class="${accountProblemBlocks(problem) ? "bad" : "warn"}">${escape(accountProblemText(problem))}</li>`
+  ).join("");
+  return `<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>${title}</title><style>
+:root{color-scheme:light dark;font-family:ui-sans-serif,system-ui,sans-serif;color:#18181b;background:#fafafa}
+@media (prefers-color-scheme:dark){:root{color:#f4f4f5;background:#18181b}main{background:#27272a!important;border-color:#3f3f46!important}a{color:inherit!important;border-color:#52525b!important}a.primary{background:#f4f4f5!important;color:#18181b!important}p{color:#a1a1aa!important}}
+body{margin:0;min-height:100vh;display:grid;place-items:center;padding:24px;box-sizing:border-box}
+main{max-width:480px;width:100%;background:#fff;border:1px solid #e4e4e7;border-radius:12px;padding:28px}
+h1{margin:0 0 8px;font-size:20px}p{margin:0 0 16px;color:#52525b;line-height:1.5}
+ul{margin:0 0 24px;padding:0;list-style:none;display:grid;gap:8px}
+li{display:flex;gap:10px;align-items:baseline;line-height:1.4}li::before{content:"";flex:none;width:8px;height:8px;border-radius:50%;transform:translateY(-1px)}
+li.bad::before{background:#dc2626}li.warn::before{background:#f59e0b}
+.actions{display:flex;flex-wrap:wrap;gap:8px}
+a{padding:8px 14px;border-radius:8px;border:1px solid #d4d4d8;color:#18181b;text-decoration:none;font-weight:500}
+a.primary{background:#18181b;border-color:#18181b;color:#fff}
+</style></head><body><main><h1>${title}</h1><p>This profile's accounts need attention before the app can work.</p><ul>${items}</ul><div class="actions"><a class="primary" href="${escape(notice.fix)}">Fix accounts</a><a href="${escape(notice.choose)}">Open with another profile</a></div></main></body></html>`;
 };
-var appFailureBootstrap = `<script>(${installAppFailureUI.toString()})()</script>`;
+var accountNoticeBootstrap = (notice) => `<script type="application/json" id="executor-account-notice">${JSON.stringify({
+  items: notice.problems.map(accountProblemText),
+  fix: notice.fix
+}).replaceAll("<", "\\u003c")}</script><script>${accountNoticeSource}</script>`;
+
+// src/implementation/ui-errors.ts
+var appFailureBootstrap = `<script>${appFailureSource}</script>`;
 
 // src/implementation/ui-serving.ts
 var appDocument = (options) => Effect_exports.gen(function* () {
@@ -214,8 +86,15 @@ var appDocument = (options) => Effect_exports.gen(function* () {
     });
   if (pathname.includes(".") && pathname !== "/index.html")
     return HttpServerResponse_exports.empty({ status: 404 });
-  const document2 = yield* options.asset("index.html");
-  if (document2 === void 0)
+  const notice = options.accounts;
+  if (notice?.problems.some(accountProblemBlocks))
+    return HttpServerResponse_exports.text(accountBlockedPage(notice), {
+      status: 409,
+      contentType: "text/html",
+      headers: appPrivateHeaders
+    });
+  const document = yield* options.asset("index.html");
+  if (document === void 0)
     return HttpServerResponse_exports.text("This app has no UI.", {
       status: 404,
       headers: appPrivateHeaders
@@ -228,9 +107,9 @@ var appDocument = (options) => Effect_exports.gen(function* () {
   const telemetry = yield* CurrentTelemetryConfig;
   const attribute = (text) => text.replaceAll("&", "&amp;").replaceAll('"', "&quot;").replaceAll("<", "&lt;");
   const metadata = telemetry === void 0 ? "" : `<meta name="executor-build" content="${attribute(telemetry.version)}"><meta name="executor-environment" content="${attribute(telemetry.environment)}">`;
-  const boot = `${metadata}<base href="/_executor/assets/${attribute(options.deployment)}/"><script type="application/json" id="executor-context">${context}</script>${appFailureBootstrap}<script src="/_executor/watch.js" defer></script>`;
+  const boot = `${metadata}<base href="/_executor/assets/${attribute(options.deployment)}/"><script type="application/json" id="executor-context">${context}</script>${appFailureBootstrap}${notice === void 0 || notice.problems.length === 0 ? "" : accountNoticeBootstrap(notice)}<script src="/_executor/watch.js" defer></script>`;
   return HttpServerResponse_exports.text(
-    new TextDecoder().decode(document2.body).replace("<!--executor-ui-->", boot),
+    new TextDecoder().decode(document.body).replace("<!--executor-ui-->", boot),
     { contentType: "text/html", headers: appPrivateHeaders }
   );
 });
@@ -252,34 +131,7 @@ var appAsset = (asset, build, path) => Effect_exports.gen(function* () {
 });
 
 // src/implementation/ui-watch.ts
-var installAppWatch = () => {
-  const context = document.getElementById("executor-context")?.textContent;
-  if (!context) return;
-  const pinned = JSON.parse(context);
-  if (typeof pinned !== "object" || pinned === null || !("deployment" in pinned)) return;
-  const deployment = pinned.deployment;
-  if (typeof deployment !== "string" || deployment.length === 0) return;
-  const stream = new EventSource("/_executor/version");
-  let reloading = false;
-  const reload = () => {
-    if (reloading) return;
-    reloading = true;
-    stream.close();
-    location.reload();
-  };
-  stream.addEventListener("version", (event) => {
-    const current = JSON.parse(event.data);
-    if (typeof current === "object" && current !== null && "deployment" in current && (current.deployment === null || typeof current.deployment === "string") && current.deployment !== deployment)
-      reload();
-  });
-  stream.addEventListener("revoked", reload);
-  window.addEventListener("executor:deployment-changed", reload);
-  window.addEventListener("pagehide", () => stream.close(), { once: true });
-  window.addEventListener("pageshow", (event) => {
-    if (event.persisted) reload();
-  });
-};
-var appWatchScript = `(${installAppWatch.toString()})()`;
+var appWatchScript = appWatchSource;
 export {
   appAsset,
   appDocument,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apps",
-  "version": "0.0.1-beta.17",
+  "version": "0.0.1-beta.19",
   "description": "TypeScript apps with typed tools, accounts, storage, and UI.",
   "type": "module",
   "sideEffects": false,