apps 0.0.1-beta.79 → 0.0.1-beta.80

package/js/ui/serving.js

@@ -3,6 +3,7 @@ import {
 } from "../chunk-KLYSEHUD.js";
 import "../chunk-JPEUKEV4.js";
 import {
+  UiFailed,
   UiForbidden
 } from "../chunk-CDXQDN7W.js";
 import {
@@ -17,7 +18,9 @@ import {
   HttpServerResponse_exports
 } from "../chunk-EOPQ727L.js";
 import {
-  Effect_exports
+  Effect_exports,
+  Option_exports,
+  Stream_exports
 } from "../chunk-IFJU5SYQ.js";
 import "../chunk-CZ7CSFO4.js";
 
@@ -8526,12 +8529,14 @@ var appDocument = (options) => Effect_exports.gen(function* () {
   const pathname = yield* Effect_exports.try(() => new URL(request.url, options.origin).pathname).pipe(
     Effect_exports.mapError(() => new UiForbidden())
   );
-  const file = pathname === "/" ? void 0 : yield* options.asset(pathname.slice(1));
-  if (file !== void 0 && file.contentType !== "text/html")
+  const path = Option_exports.getOrUndefined(assetPath(pathname.slice(1)));
+  const file = pathname === "/" || path === void 0 || path === "index.html" ? void 0 : yield* options.asset(path);
+  if (file !== void 0 && "body" in file)
     return HttpServerResponse_exports.uint8Array(file.body, {
       contentType: file.contentType,
       headers: appPrivateHeaders
     });
+  if (file !== void 0) return yield* storedFile(file, "private, no-cache");
   if (pathname.includes(".") && pathname !== "/index.html")
     return HttpServerResponse_exports.empty({ status: 404 });
   const notice = options.accounts;
@@ -8542,7 +8547,7 @@ var appDocument = (options) => Effect_exports.gen(function* () {
       headers: appPrivateHeaders
     });
   const document = yield* options.asset("index.html");
-  if (document === void 0)
+  if (document === void 0 || !("body" in document))
     return HttpServerResponse_exports.text("This app has no UI.", {
       status: 404,
       headers: appPrivateHeaders
@@ -8564,21 +8569,92 @@ var appDocument = (options) => Effect_exports.gen(function* () {
     { contentType: "text/html", headers: appPrivateHeaders }
   );
 });
+var storedAppFile = (stored, read) => {
+  const unavailable = () => new UiFailed({ reason: "unavailable" });
+  return {
+    contentType: stored.contentType,
+    size: stored.size,
+    etag: stored.etag,
+    read: (range) => read(range).pipe(
+      Effect_exports.mapError(unavailable),
+      Effect_exports.flatMap(
+        Option_exports.match({
+          onNone: () => Effect_exports.fail(unavailable()),
+          onSome: (found) => Effect_exports.succeed(found.body.pipe(Stream_exports.mapError(unavailable)))
+        })
+      )
+    )
+  };
+};
+var assetPath = (path) => Option_exports.liftThrowable(() => path.split("/").map(decodeURIComponent).join("/"))();
+var etagMatches = (header, etag) => header?.split(",").some(
+  (candidate) => candidate.trim() === "*" || candidate.trim().replace(/^W\//, "") === etag.replace(/^W\//, "")
+) === true;
+var requestedRange = (header, ifRange, etag, size) => {
+  if (header === void 0 || ifRange !== void 0 && ifRange.trim() !== etag) return void 0;
+  const match = /^bytes=(\d*)-(\d*)$/u.exec(header.trim());
+  if (match === null) return void 0;
+  const [, first = "", last = ""] = match;
+  if (first === "" && last === "") return void 0;
+  if (first === "") {
+    const suffix = Number(last);
+    if (suffix === 0) return "unsatisfiable";
+    return { start: Math.max(0, size - suffix), end: size - 1 };
+  }
+  const start = Number(first);
+  const end = last === "" ? size - 1 : Math.min(Number(last), size - 1);
+  if (start >= size) return "unsatisfiable";
+  if (end < start) return void 0;
+  return { start, end };
+};
+var storedFile = (file, cacheControl) => Effect_exports.gen(function* () {
+  const request = yield* HttpServerRequest_exports.HttpServerRequest;
+  const etag = `"${file.etag}"`;
+  const headers = {
+    ...appPrivateHeaders,
+    "cache-control": cacheControl,
+    vary: "Cookie",
+    etag,
+    "accept-ranges": "bytes"
+  };
+  if (etagMatches(request.headers["if-none-match"], etag))
+    return HttpServerResponse_exports.empty({ status: 304, headers });
+  const range = requestedRange(
+    request.headers.range,
+    request.headers["if-range"],
+    etag,
+    file.size
+  );
+  if (range === "unsatisfiable")
+    return HttpServerResponse_exports.empty({
+      status: 416,
+      headers: { ...headers, "content-range": `bytes */${file.size}` }
+    });
+  const length = range === void 0 ? file.size : range.end - range.start + 1;
+  const body = yield* file.read(
+    range === void 0 ? void 0 : { offset: range.start, length }
+  );
+  return HttpServerResponse_exports.stream(body, {
+    status: range === void 0 ? 200 : 206,
+    contentType: file.contentType,
+    contentLength: length,
+    headers: range === void 0 ? headers : { ...headers, "content-range": `bytes ${range.start}-${range.end}/${file.size}` }
+  });
+});
 var appAsset = (asset, build, path) => Effect_exports.gen(function* () {
-  if (asset === void 0 || asset.contentType === "text/html")
+  if (asset === void 0 || path === "index.html")
     return HttpServerResponse_exports.empty({ status: 404, headers: appPrivateHeaders });
+  const immutable = "private, max-age=31536000, immutable";
+  if (!("body" in asset)) return yield* storedFile(asset, immutable);
   const request = yield* HttpServerRequest_exports.HttpServerRequest;
   const etag = `W/"${encodeURIComponent(build)}/${encodeURIComponent(path)}"`;
   const headers = {
     ...appPrivateHeaders,
-    "cache-control": "private, max-age=31536000, immutable",
+    "cache-control": immutable,
     vary: "Cookie",
     etag
   };
-  const matches = request.headers["if-none-match"]?.split(",").some(
-    (candidate) => candidate.trim() === "*" || candidate.trim().replace(/^W\//, "") === etag.slice(2)
-  );
-  return matches ? HttpServerResponse_exports.empty({ status: 304, headers }) : HttpServerResponse_exports.uint8Array(asset.body, { contentType: asset.contentType, headers });
+  return etagMatches(request.headers["if-none-match"], etag) ? HttpServerResponse_exports.empty({ status: 304, headers }) : HttpServerResponse_exports.uint8Array(asset.body, { contentType: asset.contentType, headers });
 });
 
 // src/implementation/ui-watch.ts
@@ -8586,5 +8662,7 @@ var appWatchScript = appWatchSource;
 export {
   appAsset,
   appDocument,
-  appWatchScript
+  appWatchScript,
+  assetPath,
+  storedAppFile
 };

package/package.json

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