@vibes.diy/api-svc 12.1.0 → 12.1.2

package/intern/swr-html-cache-orchestrator.js

@@ -1,12 +1,18 @@
-import { CACHEABLE_MARKER_HEADER, CACHED_AT_HEADER, CACHE_STATE_HEADER, cachedAtOf, canonicalWorkspacePin, fromStoredResponse, isPlatformWorkspaceNpmUrl, swrDecision, toCacheableStoredResponse, } from "./swr-html-cache.js";
+import { CACHEABLE_MARKER_HEADER, CACHED_AT_HEADER, CACHE_STATE_HEADER, cachedAtOf, canonicalWorkspacePin, fromStoredResponse, isPlatformWorkspaceNpmUrl, swrDecision, toCacheableStoredResponse, UNVERSIONED_CLIENT_CACHE_CONTROL, VERSIONED_CLIENT_CACHE_CONTROL, } from "./swr-html-cache.js";
 import { ROOT_HTML_CACHE_CONTRACT } from "./root-html-cache-contract.js";
 import { isTrackingParam } from "@vibes.diy/api-types";
 import { etagMatches } from "../public/etag-utils.js";
-export function bareRootHtmlSwrKey(origin, workspaceNpmUrl) {
-    return `${origin}/?vibes-root-swr=ws-${encodeURIComponent(workspaceNpmUrl ?? "")}`;
+export function bareRootHtmlSwrKey(origin, workspaceNpmUrl, fsId) {
+    return `${origin}${versionedKeyPrefix(fsId)}/?vibes-root-swr=ws-${encodeURIComponent(workspaceNpmUrl ?? "")}`;
 }
-export function pinnedRootHtmlSwrKey(origin, npmUrl) {
-    return `${origin}/?npmUrl=${encodeURIComponent(canonicalWorkspacePin(npmUrl))}&contract=${ROOT_HTML_CACHE_CONTRACT}`;
+function versionedKeyPrefix(fsId) {
+    return fsId === undefined ? "" : `/~${fsId}~`;
+}
+function versionedRootFsId(pathname) {
+    return /^\/~(z[a-zA-Z0-9]{8,})~(?:\/(?:index\.html)?)?$/.exec(pathname)?.[1];
+}
+export function pinnedRootHtmlSwrKey(origin, npmUrl, fsId) {
+    return `${origin}${versionedKeyPrefix(fsId)}/?npmUrl=${encodeURIComponent(canonicalWorkspacePin(npmUrl))}&contract=${ROOT_HTML_CACHE_CONTRACT}`;
 }
 const VIBE_PROTOCOL_PARAM = "vibesProto";
 function eligibleKey(req, workspaceNpmUrl) {
@@ -17,13 +23,14 @@ function eligibleKey(req, workspaceNpmUrl) {
     if ((req.headers.get("Cookie") ?? "").includes("Vibes-Npm-Url"))
         return undefined;
     const url = new URL(req.url);
-    if (url.pathname !== "/" && url.pathname !== "/index.html")
+    const fsId = versionedRootFsId(url.pathname);
+    if (fsId === undefined && url.pathname !== "/" && url.pathname !== "/index.html")
         return undefined;
     const params = [...url.searchParams];
     if (params.some(([name]) => isTrackingParam(name)))
         return undefined;
     if (params.length === 0)
-        return bareRootHtmlSwrKey(url.origin, workspaceNpmUrl);
+        return bareRootHtmlSwrKey(url.origin, workspaceNpmUrl, fsId);
     let npmUrl;
     let seenProto = false;
     for (const [name, value] of params) {
@@ -45,7 +52,7 @@ function eligibleKey(req, workspaceNpmUrl) {
         return undefined;
     if (workspaceNpmUrl === undefined || !isPlatformWorkspaceNpmUrl(npmUrl, workspaceNpmUrl))
         return undefined;
-    return pinnedRootHtmlSwrKey(url.origin, npmUrl);
+    return pinnedRootHtmlSwrKey(url.origin, npmUrl, fsId);
 }
 function refreshRequest(req) {
     const headers = new Headers(req.headers);
@@ -74,6 +81,8 @@ export async function serveRootHtmlWithSwr(opts) {
     const key = eligibleKey(opts.request, opts.workspaceNpmUrl);
     if (key === undefined)
         return opts.inner(opts.request);
+    const isVersionedRoot = versionedRootFsId(new URL(opts.request.url).pathname) !== undefined;
+    const clientCacheControl = isVersionedRoot ? VERSIONED_CLIENT_CACHE_CONTROL : UNVERSIONED_CLIENT_CACHE_CONTROL;
     const cached = await opts.cache.match(key);
     if (cached !== undefined) {
         const state = swrDecision({ cachedAt: cachedAtOf(cached), now: opts.now() });
@@ -83,13 +92,17 @@ export async function serveRootHtmlWithSwr(opts) {
             }
             const serveState = state === "fresh" ? "hit-fresh" : "hit-stale-refreshing";
             if (wants304(opts.request, cached.headers.get("ETag"))) {
-                const h = new Headers({ "Cache-Control": "public, no-cache, must-revalidate", [CACHE_STATE_HEADER]: serveState });
+                const h = new Headers({
+                    "Cache-Control": clientCacheControl,
+                    [CACHE_STATE_HEADER]: serveState,
+                    "Access-Control-Allow-Origin": "*",
+                });
                 const etag = cached.headers.get("ETag");
                 if (etag !== null)
                     h.set("ETag", etag);
                 return new Response(null, { status: 304, headers: h });
             }
-            return fromStoredResponse(cached, serveState);
+            return fromStoredResponse(cached, serveState, clientCacheControl);
         }
     }
     const res = await renderAndStore(opts, key);

package/intern/swr-html-cache-orchestrator.js.map

@@ -1 +1 @@
-{"version":3,"file":"swr-html-cache-orchestrator.js","sourceRoot":"","sources":["../../jsr/intern/swr-html-cache-orchestrator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"swr-html-cache-orchestrator.js","sourceRoot":"","sources":["../../jsr/intern/swr-html-cache-orchestrator.ts"],"names":[],"mappings":"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"}

package/intern/swr-html-cache.d.ts

@@ -9,8 +9,10 @@ export declare function swrDecision(opts: {
     readonly cachedAt: number;
     readonly now: number;
 }): SwrState;
+export declare const UNVERSIONED_CLIENT_CACHE_CONTROL = "public, no-cache, must-revalidate";
+export declare const VERSIONED_CLIENT_CACHE_CONTROL = "public, max-age=86400";
 export declare function toCacheableStoredResponse(res: Response, now: number): Response | undefined;
-export declare function fromStoredResponse(stored: Response, state: CacheServeState): Response;
+export declare function fromStoredResponse(stored: Response, state: CacheServeState, clientCacheControl?: string): Response;
 export declare function cachedAtOf(stored: Response): number;
 export declare function isPlatformWorkspaceNpmUrl(candidate: string, workspace: string): boolean;
 export declare function canonicalWorkspacePin(npmUrl: string): string;

package/intern/swr-html-cache.js

@@ -12,7 +12,8 @@ export function swrDecision(opts) {
         return "fresh";
     return "stale";
 }
-const CLIENT_CACHE_CONTROL = "public, no-cache, must-revalidate";
+export const UNVERSIONED_CLIENT_CACHE_CONTROL = "public, no-cache, must-revalidate";
+export const VERSIONED_CLIENT_CACHE_CONTROL = "public, max-age=86400";
 const STORED_CACHE_CONTROL = "public, s-maxage=86400";
 export function toCacheableStoredResponse(res, now) {
     if (res.status !== 200)
@@ -28,10 +29,10 @@ export function toCacheableStoredResponse(res, now) {
     headers.set("Cache-Control", STORED_CACHE_CONTROL);
     return new Response(res.body, { status: res.status, headers });
 }
-export function fromStoredResponse(stored, state) {
+export function fromStoredResponse(stored, state, clientCacheControl = UNVERSIONED_CLIENT_CACHE_CONTROL) {
     const headers = new Headers(stored.headers);
     headers.delete(CACHED_AT_HEADER);
-    headers.set("Cache-Control", CLIENT_CACHE_CONTROL);
+    headers.set("Cache-Control", clientCacheControl);
     headers.set(CACHE_STATE_HEADER, state);
     return new Response(stored.body, { status: stored.status, headers });
 }

package/intern/swr-html-cache.js.map

@@ -1 +1 @@
-{"version":3,"file":"swr-html-cache.js","sourceRoot":"","sources":["../../jsr/intern/swr-html-cache.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"swr-html-cache.js","sourceRoot":"","sources":["../../jsr/intern/swr-html-cache.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vibes.diy/api-svc",
-  "version": "12.1.0",
+  "version": "12.1.2",
   "license": "Apache-2.0",
   "type": "module",
   "main": "./index.js",
@@ -22,18 +22,19 @@
     "@libsql/client": "~0.17.4",
     "@neondatabase/serverless": "~1.1.0",
     "@noble/hashes": "~2.2.0",
-    "@vibes.diy/api-pkg": "12.1.0",
-    "@vibes.diy/api-sql": "12.1.0",
-    "@vibes.diy/api-types": "12.1.0",
-    "@vibes.diy/call-ai-v2": "12.1.0",
-    "@vibes.diy/identity": "12.1.0",
-    "@vibes.diy/prompts": "12.1.0",
-    "@vibes.diy/vibe-db-explorer": "12.1.0",
-    "@vibes.diy/vibe-runtime": "12.1.0",
-    "@vibes.diy/vibe-types": "12.1.0",
+    "@vibes.diy/api-pkg": "12.1.2",
+    "@vibes.diy/api-sql": "12.1.2",
+    "@vibes.diy/api-types": "12.1.2",
+    "@vibes.diy/call-ai-v2": "12.1.2",
+    "@vibes.diy/identity": "12.1.2",
+    "@vibes.diy/prompts": "12.1.2",
+    "@vibes.diy/vibe-db-explorer": "12.1.2",
+    "@vibes.diy/vibe-runtime": "12.1.2",
+    "@vibes.diy/vibe-types": "12.1.2",
     "acorn": "~8.17.0",
     "arktype": "~2.2.3",
-    "call-ai": "12.1.0",
+    "call-ai": "12.1.2",
+    "charwise": "~3.0.1",
     "cookie": "~2.0.1",
     "csv-parse": "~7.0.1",
     "drizzle-orm": "~0.45.2",

package/public/app-documents-query-filter.d.ts

@@ -1,4 +1,5 @@
 import { type QueryFilter } from "@vibes.diy/api-types";
+export declare function encodeQueryKey(v: unknown): string;
 export declare function applyQueryFilter(docs: ({
     _id: string;
 } & Record<string, unknown>)[], filter: QueryFilter | undefined): ({

package/public/app-documents-query-filter.js

@@ -1,3 +1,5 @@
+import { exception2Result } from "@adviser/cement";
+import charwise from "charwise";
 function isInInclusiveRange(value, lo, hi) {
     if (typeof value === "string" && typeof lo === "string" && typeof hi === "string") {
         return value >= lo && value <= hi;
@@ -13,21 +15,47 @@ function isInInclusiveRange(value, lo, hi) {
     }
     return false;
 }
+function stableStringify(v) {
+    if (v === null || typeof v !== "object")
+        return JSON.stringify(v) ?? "null";
+    if (Array.isArray(v))
+        return "[" + v.map(stableStringify).join(",") + "]";
+    const obj = v;
+    return ("{" +
+        Object.keys(obj)
+            .sort()
+            .map((k) => JSON.stringify(k) + ":" + stableStringify(obj[k]))
+            .join(",") +
+        "}");
+}
+export function encodeQueryKey(v) {
+    const r = exception2Result(() => charwise.encode(v));
+    return r.isErr() ? "￿obj:" + stableStringify(v) : r.Ok();
+}
 export function applyQueryFilter(docs, filter) {
     if (!filter)
         return docs;
-    const { field, key, keys, range } = filter;
+    const { field, key, keys, range, prefix } = filter;
+    let out = docs.filter((doc) => doc[field] !== undefined);
     if (key !== undefined) {
-        return docs.filter((doc) => doc[field] === key);
+        const encodedKey = encodeQueryKey(key);
+        out = out.filter((doc) => encodeQueryKey(doc[field]) === encodedKey);
     }
     if (keys !== undefined) {
-        const keySet = new Set(keys);
-        return docs.filter((doc) => keySet.has(doc[field]));
+        const encodedKeys = new Set(keys.map((k) => encodeQueryKey(k)));
+        out = out.filter((doc) => encodedKeys.has(encodeQueryKey(doc[field])));
     }
     if (range !== undefined) {
         const [lo, hi] = range;
-        return docs.filter((doc) => isInInclusiveRange(doc[field], lo, hi));
+        out = out.filter((doc) => isInInclusiveRange(doc[field], lo, hi));
+    }
+    if (prefix !== undefined) {
+        let encodedPrefix = encodeQueryKey(prefix);
+        if (Array.isArray(prefix) && encodedPrefix.endsWith("!")) {
+            encodedPrefix = encodedPrefix.slice(0, -1);
+        }
+        out = out.filter((doc) => encodeQueryKey(doc[field]).startsWith(encodedPrefix));
     }
-    return docs;
+    return out;
 }
 //# sourceMappingURL=app-documents-query-filter.js.map

package/public/app-documents-query-filter.js.map

@@ -1 +1 @@
-{"version":3,"file":"app-documents-query-filter.js","sourceRoot":"","sources":["../../jsr/public/app-documents-query-filter.ts"],"names":[],"mappings":"AAEA,SAAS,kBAAkB,CAAC,KAAc,EAAE,EAAW,EAAE,EAAW;IAClE,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,EAAE,KAAK,QAAQ,IAAI,OAAO,EAAE,KAAK,QAAQ,EAAE,CAAC;QAClF,OAAO,KAAK,IAAI,EAAE,IAAI,KAAK,IAAI,EAAE,CAAC;IACpC,CAAC;IACD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,EAAE,KAAK,QAAQ,IAAI,OAAO,EAAE,KAAK,QAAQ,EAAE,CAAC;QAClF,OAAO,KAAK,IAAI,EAAE,IAAI,KAAK,IAAI,EAAE,CAAC;IACpC,CAAC;IACD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,EAAE,KAAK,QAAQ,IAAI,OAAO,EAAE,KAAK,QAAQ,EAAE,CAAC;QAClF,OAAO,KAAK,IAAI,EAAE,IAAI,KAAK,IAAI,EAAE,CAAC;IACpC,CAAC;IACD,IAAI,OAAO,KAAK,KAAK,SAAS,IAAI,OAAO,EAAE,KAAK,SAAS,IAAI,OAAO,EAAE,KAAK,SAAS,EAAE,CAAC;QACrF,OAAO,MAAM,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,EAAE,CAAC,CAAC;IACpE,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC9B,IAAmD,EACnD,MAA+B;IAE/B,IAAI,CAAC,MAAM;QAAE,OAAO,IAAI,CAAC;IACzB,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC;IAC3C,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;QACtB,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC;IAClD,CAAC;IACD,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACvB,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC;QAC7B,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACtD,CAAC;IACD,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACxB,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,KAAK,CAAC;QACvB,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,kBAAkB,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;IACtE,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}
+{"version":3,"file":"app-documents-query-filter.js","sourceRoot":"","sources":["../../jsr/public/app-documents-query-filter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAGnD,OAAO,QAAQ,MAAM,UAAU,CAAC;AAEhC,SAAS,kBAAkB,CAAC,KAAc,EAAE,EAAW,EAAE,EAAW;IAClE,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,EAAE,KAAK,QAAQ,IAAI,OAAO,EAAE,KAAK,QAAQ,EAAE,CAAC;QAClF,OAAO,KAAK,IAAI,EAAE,IAAI,KAAK,IAAI,EAAE,CAAC;IACpC,CAAC;IACD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,EAAE,KAAK,QAAQ,IAAI,OAAO,EAAE,KAAK,QAAQ,EAAE,CAAC;QAClF,OAAO,KAAK,IAAI,EAAE,IAAI,KAAK,IAAI,EAAE,CAAC;IACpC,CAAC;IACD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,EAAE,KAAK,QAAQ,IAAI,OAAO,EAAE,KAAK,QAAQ,EAAE,CAAC;QAClF,OAAO,KAAK,IAAI,EAAE,IAAI,KAAK,IAAI,EAAE,CAAC;IACpC,CAAC;IACD,IAAI,OAAO,KAAK,KAAK,SAAS,IAAI,OAAO,EAAE,KAAK,SAAS,IAAI,OAAO,EAAE,KAAK,SAAS,EAAE,CAAC;QACrF,OAAO,MAAM,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,EAAE,CAAC,CAAC;IACpE,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,eAAe,CAAC,CAAU;IACjC,IAAI,CAAC,KAAK,IAAI,IAAI,OAAO,CAAC,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC;IAC5E,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;QAAE,OAAO,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;IAC1E,MAAM,GAAG,GAAG,CAA4B,CAAC;IACzC,OAAO,CACL,GAAG;QACH,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;aACb,IAAI,EAAE;aACN,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;aAC7D,IAAI,CAAC,GAAG,CAAC;QACZ,GAAG,CACJ,CAAC;AACJ,CAAC;AAaD,MAAM,UAAU,cAAc,CAAC,CAAU;IACvC,MAAM,CAAC,GAAG,gBAAgB,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAW,CAAC,CAAC;IAC/D,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,OAAO,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;AAC3D,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC9B,IAAmD,EACnD,MAA+B;IAE/B,IAAI,CAAC,MAAM;QAAE,OAAO,IAAI,CAAC;IACzB,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;IAYnD,IAAI,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,SAAS,CAAC,CAAC;IAEzD,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;QAOtB,MAAM,UAAU,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC;QACvC,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,KAAK,UAAU,CAAC,CAAC;IACvE,CAAC;IACD,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACvB,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAChE,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IACzE,CAAC;IACD,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QAGxB,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,KAAK,CAAC;QACvB,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,kBAAkB,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;IACpE,CAAC;IACD,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QAGzB,IAAI,aAAa,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;QAC3C,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACzD,aAAa,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAC7C,CAAC;QACD,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC;IAClF,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC"}

package/public/app-documents.d.ts

@@ -1,4 +1,4 @@
 export { putDocEvento, deleteDocEvento, broadcastEphemeralEvento } from "./app-documents-write-eventos.js";
 export { getDocEvento, queryDocsEvento, subscribeDocsEvento, subscribeViewerGrantsEvento, listDbNamesEvento, } from "./app-documents-read-eventos.js";
 export { listDmThreadsEvento, markDmReadEvento } from "./app-documents-dm-eventos.js";
-export { applyQueryFilter } from "./app-documents-query-filter.js";
+export { applyQueryFilter, encodeQueryKey } from "./app-documents-query-filter.js";

package/public/app-documents.js

@@ -1,5 +1,5 @@
 export { putDocEvento, deleteDocEvento, broadcastEphemeralEvento } from "./app-documents-write-eventos.js";
 export { getDocEvento, queryDocsEvento, subscribeDocsEvento, subscribeViewerGrantsEvento, listDbNamesEvento, } from "./app-documents-read-eventos.js";
 export { listDmThreadsEvento, markDmReadEvento } from "./app-documents-dm-eventos.js";
-export { applyQueryFilter } from "./app-documents-query-filter.js";
+export { applyQueryFilter, encodeQueryKey } from "./app-documents-query-filter.js";
 //# sourceMappingURL=app-documents.js.map

package/public/app-documents.js.map

@@ -1 +1 @@
-{"version":3,"file":"app-documents.js","sourceRoot":"","sources":["../../jsr/public/app-documents.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AAC3G,OAAO,EACL,YAAY,EACZ,eAAe,EACf,mBAAmB,EACnB,2BAA2B,EAC3B,iBAAiB,GAClB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACtF,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC"}
+{"version":3,"file":"app-documents.js","sourceRoot":"","sources":["../../jsr/public/app-documents.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AAC3G,OAAO,EACL,YAAY,EACZ,eAAe,EACf,mBAAmB,EACnB,2BAA2B,EAC3B,iBAAiB,GAClB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACtF,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC"}

package/public/app-logs.d.ts

@@ -0,0 +1,4 @@
+import { EventoHandler } from "@adviser/cement";
+import { MsgBase, ReqAppLogs, ResAppLogs, VibesDiyError, W3CWebSocketEvent } from "@vibes.diy/api-types";
+export declare function clampLogLimit(limit: number): number;
+export declare const appLogsEvento: EventoHandler<W3CWebSocketEvent, MsgBase<ReqAppLogs>, ResAppLogs | VibesDiyError>;

package/public/app-logs.js

@@ -0,0 +1,109 @@
+import { Result, Option, EventoResult } from "@adviser/cement";
+import { reqAppLogs, APP_LOGS_LIMIT_DEFAULT, APP_LOGS_LIMIT_MAX, logEventIdFloor, } from "@vibes.diy/api-types";
+import { type } from "arktype";
+import { and, eq, gt, gte } from "drizzle-orm/sql/expressions";
+import { asc } from "drizzle-orm";
+import { unwrapMsgBase } from "../unwrap-msg-base.js";
+import { checkAuth } from "../check-auth.js";
+import { authorizeSlugOwner } from "./authorize-slug-owner.js";
+import { logAdminWriteOverride } from "./platform-admin.js";
+async function authorized(vctx, args) {
+    const auth = await authorizeSlugOwner(vctx, args);
+    if (auth === undefined)
+        return false;
+    if (auth.isOwner)
+        return true;
+    if (auth.isAdmin) {
+        logAdminWriteOverride(vctx, {
+            op: "app-logs",
+            actingUserId: args.userId,
+            ownerHandle: args.ownerHandle,
+            appSlug: args.appSlug,
+        });
+        return true;
+    }
+    return false;
+}
+function denialError(ownerHandle, appSlug) {
+    return {
+        type: "vibes.diy.res-error",
+        error: {
+            message: `not found or not authorized to read the logs of ${ownerHandle}/${appSlug}`,
+            code: "app-logs-not-found",
+        },
+    };
+}
+export function clampLogLimit(limit) {
+    if (!Number.isFinite(limit) || limit <= 0)
+        return APP_LOGS_LIMIT_DEFAULT;
+    return Math.min(Math.floor(limit), APP_LOGS_LIMIT_MAX);
+}
+export const appLogsEvento = {
+    hash: "app-logs",
+    validate: unwrapMsgBase(async (msg) => {
+        const ret = reqAppLogs(msg.payload);
+        if (ret instanceof type.errors) {
+            return Result.Ok(Option.None());
+        }
+        return Result.Ok(Option.Some({ ...msg, payload: ret }));
+    }),
+    handle: checkAuth(async (ctx) => {
+        const req = ctx.validated.payload;
+        const vctx = ctx.ctx.getOrThrow("vibesApiCtx");
+        const userId = req._auth.verifiedAuth.claims.userId;
+        if (!(await authorized(vctx, { ownerHandle: req.ownerHandle, appSlug: req.appSlug, userId }))) {
+            await ctx.send.send(ctx, denialError(req.ownerHandle, req.appSlug));
+            return Result.Ok(EventoResult.Continue);
+        }
+        const t = vctx.sql.tables.vibeLogEvents;
+        const limit = clampLogLimit(req.limit);
+        const conds = [eq(t.ownerHandle, req.ownerHandle), eq(t.appSlug, req.appSlug)];
+        if (req.sinceId !== undefined && req.sinceId !== "")
+            conds.push(gt(t.id, req.sinceId));
+        if (req.sinceTs !== undefined && req.sinceTs !== "") {
+            const sinceMs = Date.parse(req.sinceTs);
+            if (Number.isFinite(sinceMs))
+                conds.push(gte(t.id, logEventIdFloor(sinceMs)));
+        }
+        if (req.level !== undefined)
+            conds.push(eq(t.level, req.level));
+        const rows = await vctx.sql.db
+            .select({
+            id: t.id,
+            ts: t.ts,
+            lane: t.lane,
+            level: t.level,
+            trigger: t.trigger,
+            fsId: t.fsId,
+            body: t.body,
+            sessionId: t.sessionId,
+            viewerHandle: t.viewerHandle,
+        })
+            .from(t)
+            .where(and(...conds))
+            .orderBy(asc(t.id))
+            .limit(limit + 1);
+        const hasMore = rows.length > limit;
+        const page = hasMore ? rows.slice(0, limit) : rows;
+        const events = page.map((r) => ({
+            id: r.id,
+            ts: r.ts,
+            lane: r.lane,
+            level: r.level,
+            trigger: r.trigger,
+            fsId: r.fsId,
+            body: r.body,
+            sessionId: r.sessionId ?? null,
+            viewerHandle: r.viewerHandle ?? null,
+        }));
+        await ctx.send.send(ctx, {
+            type: "vibes.diy.res-app-logs",
+            ownerHandle: req.ownerHandle,
+            appSlug: req.appSlug,
+            events,
+            nextCursor: hasMore && page.length > 0 ? page[page.length - 1].id : null,
+        });
+        return Result.Ok(EventoResult.Continue);
+    }),
+};
+//# sourceMappingURL=app-logs.js.map

package/public/app-logs.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"app-logs.js","sourceRoot":"","sources":["../../jsr/public/app-logs.ts"],"names":[],"mappings":"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"}

package/public/app-tick.d.ts

@@ -0,0 +1,4 @@
+import { EventoHandler } from "@adviser/cement";
+import { MsgBase, ReqAppTickStatus, ReqAppTickRearm, ResAppTickStatus, ResAppTickRearm, VibesDiyError, W3CWebSocketEvent } from "@vibes.diy/api-types";
+export declare const appTickStatusEvento: EventoHandler<W3CWebSocketEvent, MsgBase<ReqAppTickStatus>, ResAppTickStatus | VibesDiyError>;
+export declare const appTickRearmEvento: EventoHandler<W3CWebSocketEvent, MsgBase<ReqAppTickRearm>, ResAppTickRearm | VibesDiyError>;

package/public/app-tick.js

@@ -0,0 +1,143 @@
+import { Result, Option, EventoResult } from "@adviser/cement";
+import { reqAppTickStatus, reqAppTickRearm, } from "@vibes.diy/api-types";
+import { type } from "arktype";
+import { unwrapMsgBase } from "../unwrap-msg-base.js";
+import { checkAuth } from "../check-auth.js";
+import { authorizeSlugOwner } from "./authorize-slug-owner.js";
+import { logAdminWriteOverride } from "./platform-admin.js";
+import { notifyTickSilent } from "../intern/notify-tick-silent.js";
+async function authorized(vctx, args) {
+    const auth = await authorizeSlugOwner(vctx, args);
+    if (auth === undefined)
+        return false;
+    if (auth.isOwner)
+        return true;
+    if (auth.isAdmin) {
+        logAdminWriteOverride(vctx, {
+            op: args.op,
+            actingUserId: args.userId,
+            ownerHandle: args.ownerHandle,
+            appSlug: args.appSlug,
+        });
+        return true;
+    }
+    return false;
+}
+function denialError(ownerHandle, appSlug) {
+    return {
+        type: "vibes.diy.res-error",
+        error: {
+            message: `not found or not authorized to manage the schedule of ${ownerHandle}/${appSlug}`,
+            code: "app-tick-not-found",
+        },
+    };
+}
+function unavailableError(message) {
+    return { type: "vibes.diy.res-error", error: { message, code: "app-tick-unavailable" } };
+}
+const isoOrNull = (ms) => (ms === null ? null : new Date(ms).toISOString());
+export const appTickStatusEvento = {
+    hash: "app-tick-status",
+    validate: unwrapMsgBase(async (msg) => {
+        const ret = reqAppTickStatus(msg.payload);
+        if (ret instanceof type.errors) {
+            return Result.Ok(Option.None());
+        }
+        return Result.Ok(Option.Some({ ...msg, payload: ret }));
+    }),
+    handle: checkAuth(async (ctx) => {
+        const req = ctx.validated.payload;
+        const vctx = ctx.ctx.getOrThrow("vibesApiCtx");
+        const userId = req._auth.verifiedAuth.claims.userId;
+        if (!(await authorized(vctx, { ownerHandle: req.ownerHandle, appSlug: req.appSlug, userId, op: "tick-status" }))) {
+            await ctx.send.send(ctx, denialError(req.ownerHandle, req.appSlug));
+            return Result.Ok(EventoResult.Continue);
+        }
+        const cp = vctx.backendControlPlane;
+        if (cp === undefined) {
+            await ctx.send.send(ctx, unavailableError("tick status is not available in this environment"));
+            return Result.Ok(EventoResult.Continue);
+        }
+        const rStatus = await cp.tickStatus(req.ownerHandle, req.appSlug);
+        if (rStatus.isErr()) {
+            await ctx.send.send(ctx, unavailableError(`tick status unavailable: ${rStatus.Err().message}`));
+            return Result.Ok(EventoResult.Continue);
+        }
+        const s = rStatus.Ok();
+        const notify = notifyTickSilent(vctx, {
+            ownerHandle: req.ownerHandle,
+            appSlug: req.appSlug,
+            state: s.state,
+            silenceMs: s.silenceMs,
+        }).catch((err) => {
+            vctx.logger.Error().Err(err).Msg("tick-silent notification failed");
+        });
+        if (vctx.waitUntil)
+            vctx.waitUntil(notify);
+        else
+            await notify;
+        await ctx.send.send(ctx, {
+            type: "vibes.diy.res-app-tick-status",
+            ownerHandle: req.ownerHandle,
+            appSlug: req.appSlug,
+            state: s.state,
+            intervalMs: s.intervalMs,
+            armedAt: s.armedAt,
+            lastAttemptAt: s.lastAttemptAt,
+            lastRunAt: s.lastRunAt,
+            lastErrorAt: s.lastErrorAt,
+            lastError: s.lastError,
+            attempt: s.attempt,
+            nextAlarmAt: isoOrNull(s.nextAlarmAt),
+            graceMs: s.graceMs,
+            overdueMs: s.overdueMs,
+            healed: s.healed,
+        });
+        return Result.Ok(EventoResult.Continue);
+    }),
+};
+export const appTickRearmEvento = {
+    hash: "app-tick-rearm",
+    validate: unwrapMsgBase(async (msg) => {
+        const ret = reqAppTickRearm(msg.payload);
+        if (ret instanceof type.errors) {
+            return Result.Ok(Option.None());
+        }
+        return Result.Ok(Option.Some({ ...msg, payload: ret }));
+    }),
+    handle: checkAuth(async (ctx) => {
+        const req = ctx.validated.payload;
+        const vctx = ctx.ctx.getOrThrow("vibesApiCtx");
+        const userId = req._auth.verifiedAuth.claims.userId;
+        if (!(await authorized(vctx, { ownerHandle: req.ownerHandle, appSlug: req.appSlug, userId, op: "tick-rearm" }))) {
+            await ctx.send.send(ctx, denialError(req.ownerHandle, req.appSlug));
+            return Result.Ok(EventoResult.Continue);
+        }
+        const cp = vctx.backendControlPlane;
+        if (cp === undefined) {
+            await ctx.send.send(ctx, unavailableError("tick rearm is not available in this environment"));
+            return Result.Ok(EventoResult.Continue);
+        }
+        const rArm = await cp.arm(req.ownerHandle, req.appSlug);
+        if (rArm.isErr()) {
+            await ctx.send.send(ctx, unavailableError(`tick rearm failed: ${rArm.Err().message}`));
+            return Result.Ok(EventoResult.Continue);
+        }
+        const rStatus = await cp.tickStatus(req.ownerHandle, req.appSlug);
+        if (rStatus.isErr()) {
+            await ctx.send.send(ctx, unavailableError(`tick rearm status read failed: ${rStatus.Err().message}`));
+            return Result.Ok(EventoResult.Continue);
+        }
+        const s = rStatus.Ok();
+        await ctx.send.send(ctx, {
+            type: "vibes.diy.res-app-tick-rearm",
+            ownerHandle: req.ownerHandle,
+            appSlug: req.appSlug,
+            state: s.state,
+            intervalMs: s.intervalMs,
+            nextAlarmAt: isoOrNull(s.nextAlarmAt),
+        });
+        return Result.Ok(EventoResult.Continue);
+    }),
+};
+//# sourceMappingURL=app-tick.js.map

package/public/app-tick.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"app-tick.js","sourceRoot":"","sources":["../../jsr/public/app-tick.ts"],"names":[],"mappings":"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"}

package/public/root-html-live-inputs.d.ts

@@ -3,6 +3,7 @@ import type { loadVibeLiveSettings } from "../intern/load-vibe-env.js";
 export type RootHtmlLiveSettings = Awaited<ReturnType<typeof loadVibeLiveSettings>>;
 export interface RootHtmlLiveInputsOpts {
     readonly isUnversionedPublishedRootHtml: boolean;
+    readonly isVersionedRootHtml?: boolean;
     readonly loadPublicReadable: () => Promise<boolean>;
     readonly loadSeedDocs: () => Promise<SeedDocs | undefined>;
     readonly loadLiveSettings: () => Promise<RootHtmlLiveSettings>;
@@ -12,7 +13,7 @@ export interface RootHtmlLiveInputs {
     readonly seedDocs: SeedDocs | undefined;
     readonly liveSettings: RootHtmlLiveSettings | undefined;
 }
-export declare function loadRootHtmlLiveInputs({ isUnversionedPublishedRootHtml, loadPublicReadable, loadSeedDocs, loadLiveSettings, }: RootHtmlLiveInputsOpts): Promise<RootHtmlLiveInputs>;
+export declare function loadRootHtmlLiveInputs({ isUnversionedPublishedRootHtml, isVersionedRootHtml, loadPublicReadable, loadSeedDocs, loadLiveSettings, }: RootHtmlLiveInputsOpts): Promise<RootHtmlLiveInputs>;
 export interface RootHtmlDbRegionOpts<Row> {
     readonly startAppsRow: () => Promise<Row | undefined>;
     readonly startLiveInputs: () => Promise<RootHtmlLiveInputs>;

package/public/root-html-live-inputs.js

@@ -1,6 +1,9 @@
-export async function loadRootHtmlLiveInputs({ isUnversionedPublishedRootHtml, loadPublicReadable, loadSeedDocs, loadLiveSettings, }) {
+export async function loadRootHtmlLiveInputs({ isUnversionedPublishedRootHtml, isVersionedRootHtml, loadPublicReadable, loadSeedDocs, loadLiveSettings, }) {
     if (!isUnversionedPublishedRootHtml) {
-        return { rootHtmlCacheable: false, seedDocs: undefined, liveSettings: undefined };
+        if (isVersionedRootHtml !== true) {
+            return { rootHtmlCacheable: false, seedDocs: undefined, liveSettings: undefined };
+        }
+        return { rootHtmlCacheable: await loadPublicReadable(), seedDocs: undefined, liveSettings: undefined };
     }
     const [publicReadable, liveSettings, seedDocs] = await Promise.all([loadPublicReadable(), loadLiveSettings(), loadSeedDocs()]);
     const rootHtmlCacheable = publicReadable;

package/public/root-html-live-inputs.js.map

@@ -1 +1 @@
-{"version":3,"file":"root-html-live-inputs.js","sourceRoot":"","sources":["../../jsr/public/root-html-live-inputs.ts"],"names":[],"mappings":"AA2DA,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,EAC3C,8BAA8B,EAC9B,kBAAkB,EAClB,YAAY,EACZ,gBAAgB,GACO;IACvB,IAAI,CAAC,8BAA8B,EAAE,CAAC;QAGpC,OAAO,EAAE,iBAAiB,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC;IACpF,CAAC;IAGD,MAAM,CAAC,cAAc,EAAE,YAAY,EAAE,QAAQ,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,kBAAkB,EAAE,EAAE,gBAAgB,EAAE,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC;IAI/H,MAAM,iBAAiB,GAAG,cAAc,CAAC;IACzC,OAAO;QACL,iBAAiB;QAKjB,QAAQ,EAAE,iBAAiB,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS;QAClD,YAAY;KACb,CAAC;AACJ,CAAC;AAuCD,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAM,EAC9C,YAAY,EACZ,eAAe,GACW;IAC1B,MAAM,OAAO,GAAG,YAAY,EAAE,CAAC;IAC/B,MAAM,UAAU,GAAG,eAAe,EAAE,CAAC;IACrC,KAAK,UAAU,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;IACvC,MAAM,EAAE,GAAG,MAAM,OAAO,CAAC;IACzB,IAAI,EAAE,KAAK,SAAS;QAAE,OAAO,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC;IAC/C,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,UAAU,EAAE,CAAC;AACxC,CAAC"}
+{"version":3,"file":"root-html-live-inputs.js","sourceRoot":"","sources":["../../jsr/public/root-html-live-inputs.ts"],"names":[],"mappings":"AAqEA,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,EAC3C,8BAA8B,EAC9B,mBAAmB,EACnB,kBAAkB,EAClB,YAAY,EACZ,gBAAgB,GACO;IACvB,IAAI,CAAC,8BAA8B,EAAE,CAAC;QAMpC,IAAI,mBAAmB,KAAK,IAAI,EAAE,CAAC;YACjC,OAAO,EAAE,iBAAiB,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC;QACpF,CAAC;QACD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC;IACzG,CAAC;IAGD,MAAM,CAAC,cAAc,EAAE,YAAY,EAAE,QAAQ,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,kBAAkB,EAAE,EAAE,gBAAgB,EAAE,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC;IAI/H,MAAM,iBAAiB,GAAG,cAAc,CAAC;IACzC,OAAO;QACL,iBAAiB;QAKjB,QAAQ,EAAE,iBAAiB,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS;QAClD,YAAY;KACb,CAAC;AACJ,CAAC;AAuCD,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAM,EAC9C,YAAY,EACZ,eAAe,GACW;IAC1B,MAAM,OAAO,GAAG,YAAY,EAAE,CAAC;IAC/B,MAAM,UAAU,GAAG,eAAe,EAAE,CAAC;IACrC,KAAK,UAAU,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;IACvC,MAAM,EAAE,GAAG,MAAM,OAAO,CAAC;IACzB,IAAI,EAAE,KAAK,SAAS;QAAE,OAAO,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC;IAC/C,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,UAAU,EAAE,CAAC;AACxC,CAAC"}