@samebase/convex-hosting 0.3.2 → 0.4.1

package/dist/client/index.js

@@ -1,260 +1,83 @@
-import { httpActionGeneric, queryGeneric, } from "convex/server";
-import { v } from "convex/values";
-import { cacheControlFor, decodeRequestPath, errorResponse, etagMatches, getMimeType, getSetupHtml, isHtmlContentType, } from "../component/serving.js";
-const deploymentInfoValidator = v.object({
-    _id: v.string(),
-    _creationTime: v.number(),
-    currentDeploymentId: v.string(),
-    deployedAt: v.number(),
-    spaFallback: v.optional(v.boolean()),
-});
 /**
- * Register app-owned HTTP routes for the hosted site.
+ * Answers `request` with the asset of version `versionId` that Cloudflare's asset handler picks.
  *
- * Prefer mounting the component's own HTTP routes when it can own the URL
- * prefix. Use this compatibility mode when existing app HTTP routes must stay
- * at the same root. Exact app routes take precedence over this catch-all.
- * Assets and deployment state still live in the component.
- *
- * @example
- * ```typescript
- * // convex/convex.config.ts
- * const app = defineApp();
- * app.use(hosting); // no httpPrefix: the app owns HTTP routing
- *
- * // convex/http.ts
- * const http = httpRouter();
- * auth.addHttpRoutes(http);
- * registerStaticRoutes(http, components.hosting);
- * export default http;
- * ```
+ * Returns `null` when no asset matches, so the app continues (a static site answers 404, a
+ * server-rendered site renders the page). A version that does not exist, is still uploading, or
+ * is being deleted answers 404, so a half-installed site does not render pages without their
+ * files. The first request for a `ready` version marks it live, which deletes the versions that
+ * were live before it.
  */
-export function registerStaticRoutes(http, component, { pathPrefix = "/", spaFallback, cdnBaseUrl, } = {}) {
-    if (!pathPrefix.startsWith("/")) {
-        throw new Error("pathPrefix must start with /");
-    }
-    const normalizedPrefix = pathPrefix === "/" ? "" : pathPrefix.replace(/\/$/, "");
-    const serveStaticFile = httpActionGeneric(async (ctx, request) => {
-        const decodedPath = decodeRequestPath(new URL(request.url).pathname);
-        if (decodedPath === null) {
-            return errorResponse(400, "Bad Request");
-        }
-        let path = decodedPath;
-        if (normalizedPrefix && path.startsWith(normalizedPrefix)) {
-            path = path.slice(normalizedPrefix.length) || "/";
-        }
-        if (path === "" || path === "/") {
-            path = "/index.html";
-        }
-        const response = await serveAsset(ctx, component, request, path, {
-            spaFallback,
-            cdnBaseUrl,
-        });
-        if (response)
-            return response;
-        if (path === "/index.html") {
-            return new Response(getSetupHtml(), {
-                status: 503,
-                headers: {
-                    "Content-Type": "text/html; charset=utf-8",
-                    "Cache-Control": "no-store",
-                    "Retry-After": "5",
-                },
-            });
-        }
-        return errorResponse(404, "Not Found");
-    });
-    http.route({
-        pathPrefix: pathPrefix === "/" ? "/" : `${normalizedPrefix}/`,
-        method: "GET",
-        handler: serveStaticFile,
+export async function serveAsset(ctx, component, request, versionId) {
+    const { state, newestLiveAt, asset } = await ctx.runQuery(component.lib.route, {
+        versionId,
+        method: request.method,
+        url: request.url,
+        headers: handlerHeaders(request.headers),
     });
-    if (normalizedPrefix) {
-        http.route({
-            path: normalizedPrefix,
-            method: "GET",
-            handler: serveStaticFile,
+    if (state === null || state === "uploading" || state === "deleting") {
+        const problem = state === null
+            ? "does not exist"
+            : state === "uploading"
+                ? "is still uploading"
+                : "is being deleted";
+        return new Response(`Version ${versionId} of the site ${problem}.`, {
+            status: 404,
+            headers: NO_STORE,
         });
     }
-}
-/**
- * Serve an uploaded static file from your own HTTP action, or return null when
- * no file matches so the action can continue with its own routing: server
- * rendering, prerendered pages, redirects.
- *
- * Found files get the same response as `registerStaticRoutes`: content type,
- * cache headers, ETag revalidation, and legacy CDN redirects. A found file
- * whose storage can't be read gets a 500 response. A request path with
- * malformed percent-encoding matches no file, so it returns null.
- *
- * The lookup is exact by default. `/` is not mapped to `/index.html`, and there
- * is no SPA fallback, so the SPA shell never answers for a route your action
- * handles. To serve the shell, pass `{ path: "/index.html" }`. When your route
- * has a prefix, pass `path` with the prefix removed.
- *
- * @example
- * ```typescript
- * // convex/http.ts
- * const http = httpRouter();
- * http.route({
- *   pathPrefix: "/",
- *   method: "GET",
- *   handler: httpAction(async (ctx, request) => {
- *     const file = await serveStaticAsset(ctx, components.hosting, request);
- *     if (file) return file;
- *     return await renderPage(request);
- *   }),
- * });
- * export default http;
- * ```
- */
-export async function serveStaticAsset(ctx, component, request, { path, spaFallback = false, cdnBaseUrl, } = {}) {
-    if (path !== undefined && !path.startsWith("/")) {
-        throw new Error("path must start with /");
-    }
-    const filePath = path ?? decodeRequestPath(new URL(request.url).pathname);
-    if (filePath === null)
-        return null;
-    return await serveAsset(ctx, component, request, filePath, {
-        spaFallback,
-        cdnBaseUrl,
-    });
-}
-export { decodeRequestPath };
-/**
- * Serve the uploaded file at `path` (decoded, relative to the mount prefix),
- * or return null when no file matches. An undefined `spaFallback` uses the
- * deployment's stored setting.
- */
-async function serveAsset(ctx, component, request, path, { spaFallback, cdnBaseUrl, }) {
-    const asset = await ctx.runQuery(component.lib.resolveAssetForHttp, {
-        path,
-        ...(spaFallback === undefined ? {} : { spaFallback }),
-    });
-    if (!asset)
-        return null;
-    const contentType = asset.contentType || getMimeType(path);
-    const cacheControl = cacheControlFor(path);
-    if (asset.blobId && !isHtmlContentType(contentType)) {
-        const configuredBase = typeof cdnBaseUrl === "function" ? cdnBaseUrl(request) : cdnBaseUrl;
-        const baseUrl = configuredBase ?? `${new URL(request.url).origin}/fs/blobs`;
-        return new Response(null, {
-            status: 302,
-            headers: {
-                Location: `${baseUrl.replace(/\/$/, "")}/${asset.blobId}`,
-                "Cache-Control": cacheControl,
-            },
-        });
-    }
-    // TODO(remove in a future major): v1→v2 transitional path. The file still
-    // lives in the app's own storage (a same-name migration inherited the v1
-    // row; see the component's resolveAssetForHttp). Serve it directly from app
-    // storage so the site stays up during migration with no re-upload. Once v1
-    // app-storage assets are no longer supported, delete this branch.
-    if (asset.appStorageId) {
-        if (asset.etag && etagMatches(request.headers.get("If-None-Match"), asset.etag)) {
-            return new Response(null, {
-                status: 304,
-                headers: { ETag: asset.etag, "Cache-Control": cacheControl },
-            });
-        }
-        const blob = await ctx.storage.get(asset.appStorageId);
-        if (!blob) {
-            // The component surfaces appStorageId whenever it can't resolve a
-            // storage URL, which also covers a genuinely deleted file (the two are
-            // indistinguishable from the component). If it isn't in app storage
-            // either, treat it as missing, like an empty deployment, rather than
-            // erroring.
-            return null;
-        }
-        return new Response(blob, {
-            status: 200,
-            headers: {
-                "Content-Type": contentType,
-                "Cache-Control": cacheControl,
-                ...(asset.etag ? { ETag: asset.etag } : {}),
-                "X-Content-Type-Options": "nosniff",
-            },
+    // Only the pushed code knows which version the deployment runs, so its first request reports it.
+    if (state === "ready") {
+        await ctx.runMutation(component.lib.markLive, {
+            versionId,
+            expectedNewestLiveAt: newestLiveAt,
         });
     }
-    if (!asset.storageUrl) {
-        return errorResponse(500, "Asset not available");
-    }
-    if (asset.etag && etagMatches(request.headers.get("If-None-Match"), asset.etag)) {
-        return new Response(null, {
-            status: 304,
-            headers: { ETag: asset.etag, "Cache-Control": cacheControl },
-        });
+    if (asset === null)
+        return null;
+    const headers = new Headers();
+    for (const { name, value } of asset.headers)
+        headers.append(name, value);
+    if (asset.bodyUrl === null)
+        return new Response(null, { status: asset.status, headers });
+    // An app cannot read a component's storage, so the body comes from the storage URL.
+    let stored;
+    try {
+        stored = await fetch(asset.bodyUrl);
     }
-    const storageResponse = await fetch(asset.storageUrl);
-    if (!storageResponse.ok || !storageResponse.body) {
-        return errorResponse(500, "Storage error");
+    catch {
+        return badGateway();
     }
-    return new Response(storageResponse.body, {
-        status: 200,
-        headers: {
-            "Content-Type": contentType,
-            "Cache-Control": cacheControl,
-            ...(asset.etag ? { ETag: asset.etag } : {}),
-            "X-Content-Type-Options": "nosniff",
-        },
-    });
+    // A deploy deleted the file between the query and the fetch.
+    if (stored.status === 404)
+        return new Response(null, { status: 404, headers: NO_STORE });
+    if (!stored.ok)
+        return badGateway();
+    return new Response(stored.body, { status: asset.status, headers });
 }
 /**
- * Expose a query that clients can subscribe to for live reload on deploy.
- * This is only needed if you use `UpdateBanner` / `useDeploymentUpdates` from
- * `@samebase/convex-hosting/react`. If you don't surface deployment updates
- * in your app, you don't need to call this.
- *
- * @example
- * ```typescript
- * // convex/hosting.ts
- * import { exposeDeploymentQuery } from "@samebase/convex-hosting";
- * import { components } from "./_generated/api";
- *
- * export const { getCurrentDeployment } = exposeDeploymentQuery(
- *   components.hosting,
- * );
- * ```
+ * The request headers that Cloudflare's handler reads. It reads only the presence of
+ * `Authorization` and `Range`, so their values (a credential, for one) stay out of the query.
  */
-export function exposeDeploymentQuery(component) {
-    return {
-        getCurrentDeployment: queryGeneric({
-            args: {},
-            returns: v.union(deploymentInfoValidator, v.null()),
-            handler: async (ctx) => {
-                const deployment = await ctx.runQuery(component.lib.getCurrentDeployment, {});
-                if (!deployment)
-                    return null;
-                // Cleanup accounting is private component state. Returning it through
-                // this public wrapper would fail the narrower response validator.
-                const deploymentWithCleanup = deployment;
-                const { pendingBlobCleanupCount: _pending, ...publicDeployment } = deploymentWithCleanup;
-                return publicDeployment;
-            },
-        }),
-    };
+function handlerHeaders(headers) {
+    const picked = {};
+    for (const name of ["if-none-match", "sec-fetch-mode"]) {
+        const value = headers.get(name);
+        if (value !== null)
+            picked[name] = value;
+    }
+    for (const name of ["authorization", "range"]) {
+        if (headers.has(name))
+            picked[name] = "";
+    }
+    return picked;
 }
 /**
- * Derive the Convex cloud URL from a `.convex.site` hostname.
- * Useful when your frontend is served by this component and needs
- * to connect to its own Convex backend without an explicit env var.
- *
- * @example
- * ```typescript
- * import { getConvexUrl } from "@samebase/convex-hosting";
- *
- * const convexUrl = import.meta.env.VITE_CONVEX_URL ?? getConvexUrl();
- * const convex = new ConvexReactClient(convexUrl);
- * ```
+ * For the answers that no uploaded file gives. The deployment's Cloudflare front caches 404 answers
+ * on static paths, so without it a script requested seconds before its upload ended would stay
+ * missing for hours (the 0.3.2 incident).
  */
-export function getConvexUrl() {
-    if (typeof window === "undefined") {
-        throw new Error("getConvexUrl() can only be called in a browser context");
-    }
-    if (window.location.hostname.endsWith(".convex.site")) {
-        return `https://${window.location.hostname.replace(".convex.site", ".convex.cloud")}`;
-    }
-    throw new Error("Unable to derive Convex URL. Please set VITE_CONVEX_URL environment variable.");
+const NO_STORE = { "Cache-Control": "no-store" };
+function badGateway() {
+    return new Response(null, { status: 502, headers: NO_STORE });
 }
 //# sourceMappingURL=index.js.map

package/dist/client/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/client/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/client/index.ts"],"names":[],"mappings":"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"}

package/dist/client/types.d.ts

@@ -0,0 +1,5 @@
+// An import cannot include a script declaration file, and the wildcard module in it needs an
+// ambient context, so this is the one reference directive in the package.
+// oxlint-disable-next-line typescript/triple-slash-reference
+/// <reference path="./version-module.d.ts" />
+export * from "./index.js";

package/dist/client/version-module.d.ts

@@ -0,0 +1,6 @@
+// Ambient declaration of the module that `convex-hosting deploy` writes, so an app typechecks on a
+// fresh clone, before its first deploy. Script file on purpose: a wildcard module name is only allowed
+// in an ambient context.
+declare module "*/.convex-hosting/version.js" {
+  export const versionId: string;
+}

package/dist/component/_generated/api.d.ts

@@ -6,14 +6,10 @@
  * To regenerate, run `npx convex dev`.
  * @module
  */
-import type * as http from "../http.js";
 import type * as lib from "../lib.js";
-import type * as serving from "../serving.js";
 import type { ApiFromModules, FilterApi, FunctionReference } from "convex/server";
 declare const fullApi: ApiFromModules<{
-    http: typeof http;
     lib: typeof lib;
-    serving: typeof serving;
 }>;
 /**
  * A utility for referencing Convex functions in your app's public API.
@@ -35,4 +31,3 @@ export declare const api: FilterApi<typeof fullApi, FunctionReference<any, "publ
 export declare const internal: FilterApi<typeof fullApi, FunctionReference<any, "internal">>;
 export declare const components: {};
 export {};
-//# sourceMappingURL=api.d.ts.map

package/dist/component/_generated/api.js.map

@@ -1 +1 @@
-{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/component/_generated/api.ts"],"names":[],"mappings":"AAAA,oBAAoB;AACpB;;;;;;;GAOG;AAWH,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAE1D,MAAM,OAAO,GAIR,MAAa,CAAC;AAEnB;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,GAAG,GAGZ,MAAa,CAAC;AAElB;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,QAAQ,GAGjB,MAAa,CAAC;AAElB,MAAM,CAAC,MAAM,UAAU,GAAG,iBAAiB,EAAmB,CAAC"}
+{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/component/_generated/api.ts"],"names":[],"mappings":"AAAA,oBAAoB;AACpB;;;;;;;GAOG;AASH,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAE1D,MAAM,OAAO,GAER,MAAa,CAAC;AAEnB;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,GAAG,GAGZ,MAAa,CAAC;AAElB;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,QAAQ,GAGjB,MAAa,CAAC;AAElB,MAAM,CAAC,MAAM,UAAU,GAAG,iBAAiB,EAAmB,CAAC"}

package/dist/component/_generated/component.d.ts

@@ -20,24 +20,26 @@ import type { FunctionReference } from "convex/server";
  */
 export type ComponentApi<Name extends string | undefined = string | undefined> = {
     lib: {
-        getCurrentDeployment: FunctionReference<"query", "internal", {}, {
-            _creationTime: number;
-            _id: string;
-            currentDeploymentId: string;
-            deployedAt: number;
-            pendingBlobCleanupCount?: number;
-            spaFallback?: boolean;
-        } | null, Name>;
-        resolveAssetForHttp: FunctionReference<"query", "internal", {
-            path: string;
-            spaFallback?: boolean;
+        markLive: FunctionReference<"mutation", "internal", {
+            expectedNewestLiveAt: number | null;
+            versionId: string;
+        }, null, Name>;
+        route: FunctionReference<"query", "internal", {
+            headers: Record<string, string>;
+            method: string;
+            url: string;
+            versionId: string;
         }, {
-            appStorageId?: string;
-            blobId?: string;
-            contentType: string;
-            etag?: string;
-            storageUrl?: string;
-        } | null, Name>;
+            asset: null | {
+                bodyUrl: string | null;
+                headers: Array<{
+                    name: string;
+                    value: string;
+                }>;
+                status: number;
+            };
+            newestLiveAt: number | null;
+            state: "uploading" | "ready" | "live" | "deleting" | null;
+        }, Name>;
     };
 };
-//# sourceMappingURL=component.d.ts.map

package/dist/component/_generated/dataModel.d.ts

@@ -43,4 +43,3 @@ export type Id<TableName extends TableNames | SystemTableNames> = GenericId<Tabl
  * `mutationGeneric` to make them type-safe.
  */
 export type DataModel = DataModelFromSchemaDefinition<typeof schema>;
-//# sourceMappingURL=dataModel.d.ts.map

package/dist/component/_generated/server.d.ts

@@ -8,6 +8,16 @@
  */
 import type { ActionBuilder, HttpActionBuilder, MutationBuilder, QueryBuilder, GenericActionCtx, GenericMutationCtx, GenericQueryCtx, GenericDatabaseReader, GenericDatabaseWriter } from "convex/server";
 import type { DataModel } from "./dataModel.js";
+/**
+ * Typesafe environment variables.
+ *
+ * This includes platform-provided env vars and any variables declared in
+ * `convex.config.ts`.
+ */
+type Env = {
+    readonly CONVEX_CLOUD_URL: string;
+    readonly CONVEX_SITE_URL: string;
+};
 /**
  * Define a query in this Convex app's public API.
  *
@@ -75,6 +85,7 @@ export declare const internalAction: ActionBuilder<DataModel, "internal">;
  * @returns The wrapped function. Import this function from `convex/http.js` and route it to hook it up.
  */
 export declare const httpAction: HttpActionBuilder;
+export declare const env: Env;
 /**
  * A set of services for use within Convex query functions.
  *
@@ -118,4 +129,4 @@ export type DatabaseReader = GenericDatabaseReader<DataModel>;
  * for the guarantees Convex provides your functions.
  */
 export type DatabaseWriter = GenericDatabaseWriter<DataModel>;
-//# sourceMappingURL=server.d.ts.map
+export {};

package/dist/component/_generated/server.js

@@ -75,4 +75,6 @@ export const internalAction = internalActionGeneric;
  * @returns The wrapped function. Import this function from `convex/http.js` and route it to hook it up.
  */
 export const httpAction = httpActionGeneric;
+export const env = globalThis
+    .process.env;
 //# sourceMappingURL=server.js.map

package/dist/component/_generated/server.js.map

@@ -1 +1 @@
-{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../src/component/_generated/server.ts"],"names":[],"mappings":"AAAA,oBAAoB;AACpB;;;;;;;GAOG;AAaH,OAAO,EACL,aAAa,EACb,iBAAiB,EACjB,YAAY,EACZ,eAAe,EACf,qBAAqB,EACrB,uBAAuB,EACvB,oBAAoB,GACrB,MAAM,eAAe,CAAC;AAGvB;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,KAAK,GAAsC,YAAY,CAAC;AAErE;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,aAAa,GACxB,oBAAoB,CAAC;AAEvB;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAyC,eAAe,CAAC;AAE9E;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAC3B,uBAAuB,CAAC;AAE1B;;;;;;;;;;GAUG;AACH,MAAM,CAAC,MAAM,MAAM,GAAuC,aAAa,CAAC;AAExE;;;;;GAKG;AACH,MAAM,CAAC,MAAM,cAAc,GACzB,qBAAqB,CAAC;AAExB;;;;;;;;;;GAUG;AACH,MAAM,CAAC,MAAM,UAAU,GAAsB,iBAAiB,CAAC"}
+{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../src/component/_generated/server.ts"],"names":[],"mappings":"AAAA,oBAAoB;AACpB;;;;;;;GAOG;AAaH,OAAO,EACL,aAAa,EACb,iBAAiB,EACjB,YAAY,EACZ,eAAe,EACf,qBAAqB,EACrB,uBAAuB,EACvB,oBAAoB,GACrB,MAAM,eAAe,CAAC;AAcvB;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,KAAK,GAAsC,YAAY,CAAC;AAErE;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,aAAa,GACxB,oBAAoB,CAAC;AAEvB;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAyC,eAAe,CAAC;AAE9E;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAC3B,uBAAuB,CAAC;AAE1B;;;;;;;;;;GAUG;AACH,MAAM,CAAC,MAAM,MAAM,GAAuC,aAAa,CAAC;AAExE;;;;;GAKG;AACH,MAAM,CAAC,MAAM,cAAc,GACzB,qBAAqB,CAAC;AAExB;;;;;;;;;;GAUG;AACH,MAAM,CAAC,MAAM,UAAU,GAAsB,iBAAiB,CAAC;AAC/D,MAAM,CAAC,MAAM,GAAG,GAAS,UAAmD;KACzE,OAAO,CAAC,GAAG,CAAC"}

package/dist/component/convex.config.d.ts

@@ -1,3 +1,2 @@
 declare const _default: import("convex/server").ComponentDefinition<any, {}>;
 export default _default;
-//# sourceMappingURL=convex.config.d.ts.map