alinea 2.0.0-preview.7 → 2.0.0-preview.9

package/dist/backend/Handler.js

@@ -4,7 +4,7 @@ import {
   object,
   optional,
   string
-} from "../chunks/chunk-I4GC3E65.js";
+} from "../chunks/chunk-UPY2RUZF.js";
 import {
   PLazy
 } from "../chunks/chunk-IKINPSS5.js";
@@ -19,8 +19,10 @@ import {
 } from "alinea/core/BlobTransport";
 import { Config } from "alinea/core/Config";
 import { developmentKeyHeader } from "alinea/core/Connection";
+import { Entry } from "alinea/core/Entry";
 import { ErrorCode, HttpError } from "alinea/core/HttpError";
 import { MediaLocation } from "alinea/core/media/MediaLocation";
+import { MediaFile } from "alinea/core/media/MediaTypes";
 import { assertUploadSize } from "alinea/core/media/UploadLimits";
 import { Permission, Policy } from "alinea/core/Role";
 import { getScope } from "alinea/core/Scope";
@@ -30,7 +32,7 @@ import { isRecord } from "alinea/core/util/Objects";
 import { isAbsolute, normalize } from "alinea/core/util/Paths";
 import { InvalidCredentialsError, MissingCredentialsError } from "./Auth.js";
 import { HandleAction } from "./HandleAction.js";
-import { isRedirectStatus, proxyMediaUrl } from "./api/ProxyMedia.js";
+import { proxyMediaUrl } from "./api/ProxyMedia.js";
 import { applyPreview, decodePreviewRequest } from "./resolver/ParsePreview.js";
 import { compressResponse } from "./router/Router.js";
 import { createThrottledSync } from "./util/Syncable.js";
@@ -51,9 +53,18 @@ function createHandler({
     const local = await db;
     const simulateLatency = process.env.ALINEA_LATENCY;
     if (simulateLatency) await new Promise((resolve) => setTimeout(resolve, 2e3));
+    async function syncForRead(cnx) {
+      try {
+        await local.syncWith(cnx);
+      } catch (error) {
+        console.warn(
+          `Alinea could not sync with the remote, serving current content: ${error instanceof Error ? error.message : String(error)}`
+        );
+      }
+    }
     async function periodicSync(cnx, syncInterval) {
       if (dev) return;
-      return throttle(() => local.syncWith(cnx), syncInterval);
+      return throttle(() => syncForRead(cnx), syncInterval);
     }
     try {
       const previews = new JWTPreviews(context.apiKey);
@@ -87,23 +98,33 @@ function createHandler({
           throw new HttpError(400, "Invalid file path");
         await periodicSync(cnx);
         const requestedUrl = Config.filePathname(cms.config, normalized);
-        const entry = local.index.findByUrl(
-          requestedUrl,
-          (entry2) => entry2.type === "MediaFile" && entry2.status === "published" && entry2.main
-        );
+        const select = {
+          url: Entry.url,
+          filePath: Entry.filePath,
+          workspace: Entry.workspace,
+          location: MediaFile.location,
+          previewUrl: MediaFile.previewUrl
+        };
+        const query = {
+          type: MediaFile,
+          status: "published",
+          main: true,
+          select
+        };
+        const entry = await local.first({ ...query, url: requestedUrl }) ?? await local.first({ ...query, alias: requestedUrl });
         if (!entry) return new Response("Not found", { status: 404 });
         if (entry.url !== requestedUrl && !proxy)
           return new Response(null, {
             status: 308,
             headers: { location: entry.url }
           });
-        const wasBuilt = local.index.initialSync?.has(entry.filePath) ?? false;
-        const previewUrl = entry.data.previewUrl;
-        const location = entry.data.location;
+        const wasBuilt = await local.includedAtBuild(entry.filePath);
+        const previewUrl = entry.previewUrl;
+        const location = entry.location;
         if (typeof location !== "string")
           return new Response("Not found", { status: 404 });
         const previewSource = typeof previewUrl === "string" && previewUrl ? new URL(previewUrl, request.url).href : void 0;
-        async function proxyMedia(source2, cacheControl, isAllowed) {
+        async function proxyMedia(source2, cacheControl) {
           const previewEntryId = uploadPreviewEntryId(
             source2,
             context.handlerUrl
@@ -114,13 +135,12 @@ function createHandler({
           } else {
             response = await proxyMediaUrl(
               request,
-              new URL(source2, request.url),
-              isAllowed
+              new URL(source2, request.url)
             );
           }
           return mediaResponse(request, response, cacheControl);
         }
-        if (!wasBuilt && previewSource) {
+        if (!context.isDev && !wasBuilt && previewSource) {
           if (proxy) return proxyMedia(previewSource, "private, no-store");
           return redirectFile(previewSource, "private, no-store");
         }
@@ -132,18 +152,10 @@ function createHandler({
         if (!source || source === requestedUrl)
           return new Response("Not found", { status: 404 });
         if (!proxy) return redirectFile(source, "public, max-age=60");
-        const configuredBase = Config.baseUrl(
-          cms.config,
-          context.isDev ? "development" : "production"
-        );
-        const deliveryBase = configuredBase ?? context.handlerUrl;
-        const sourceUrl = new URL(source, deliveryBase);
-        const deliveryOrigin = new URL(deliveryBase).origin;
-        const handlerPath = context.handlerUrl.pathname;
+        const deliveryBase = !context.isDev && Config.baseUrl(cms.config, "production") || context.handlerUrl;
         return proxyMedia(
-          sourceUrl.href,
-          "public, max-age=60",
-          (url2) => url2.origin === deliveryOrigin && url2.pathname !== handlerPath && !url2.pathname.startsWith(`${handlerPath}/`)
+          new URL(source, deliveryBase).href,
+          "public, max-age=60"
         );
       }
       const action = params.get("action");
@@ -245,8 +257,8 @@ function createHandler({
           );
         } else {
           const preview = await decodePreviewRequest(query.preview);
-          if ("contentHash" in preview && local.sha !== preview.contentHash)
-            await local.syncWith(cnx);
+          if ("contentHash" in preview && await local.sha !== preview.contentHash)
+            await syncForRead(cnx);
           query.preview = await applyPreview(local, preview);
         }
         return Response.json(await local.resolve(query) ?? null);
@@ -294,23 +306,6 @@ function createHandler({
         }
         return Response.json({ sha });
       }
-      if (action === HandleAction.Commit && request.method === "POST") {
-        if (!context.isDev)
-          throw new HttpError(400, "Commits are only accepted in development");
-        const developmentKey = request.headers.get(developmentKeyHeader);
-        if (!context.apiKey || developmentKey !== context.apiKey)
-          throw new HttpError(401, "Invalid development commit credentials");
-        const user = expectUser();
-        expectJson();
-        const commit = {
-          ...await body,
-          user: user.claims
-        };
-        let { sha } = await cnx.write(commit);
-        if (sha === commit.intoSha) await local.write(commit);
-        else sha = await local.syncWith(cnx);
-        return Response.json({ sha });
-      }
       if (action === HandleAction.History && request.method === "GET") {
         expectUser();
         expectJson();
@@ -322,10 +317,15 @@ function createHandler({
       if (action === HandleAction.Tree && request.method === "GET") {
         expectJson();
         const sha = string(url.searchParams.get("sha"));
-        await local.syncWith(cnx);
+        await syncForRead(cnx);
         const tree = await local.getTreeIfDifferent(sha);
         return compressResponse(request, Response.json(tree ?? null));
       }
+      if (action === HandleAction.Sha && request.method === "GET") {
+        expectJson();
+        await syncForRead(cnx);
+        return Response.json(await local.sha);
+      }
       if (action === HandleAction.Blob && request.method === "POST") {
         const { shas } = object({ shas: array(string) })(await body);
         await periodicSync(cnx);
@@ -431,8 +431,6 @@ function uploadPreviewEntryId(previewSource, handlerUrl) {
   return previewUrl.searchParams.get("entryId") ?? void 0;
 }
 function mediaResponse(request, upstream, cacheControl) {
-  if (isRedirectStatus(upstream.status))
-    return new Response("Media backend returned a redirect", { status: 502 });
   const responseHeaders = new Headers({
     "cache-control": upstream.ok || upstream.status === 304 ? cacheControl : "no-store"
   });

package/dist/backend/api/CreateBackend.js

@@ -1,8 +1,20 @@
 import {
   driver_exports
-} from "../../chunks/chunk-X47OVDF3.js";
-import "../../chunks/chunk-G6E35DMJ.js";
-import "../../chunks/chunk-NWQXN4SB.js";
+} from "../../chunks/chunk-QJGGYF6E.js";
+import "../../chunks/chunk-QSN6RH6X.js";
+import "../../chunks/chunk-ETWOY4AL.js";
+import "../../chunks/chunk-66YZ47TY.js";
+import "../../chunks/chunk-AIU6CMVT.js";
+import "../../chunks/chunk-N47Y62CI.js";
+import "../../chunks/chunk-QBPYWU6C.js";
+import "../../chunks/chunk-2BJ2IFQM.js";
+import "../../chunks/chunk-XCZXR3C2.js";
+import "../../chunks/chunk-MOWR65LM.js";
+import "../../chunks/chunk-76VMZTLN.js";
+import "../../chunks/chunk-2PIFHEYR.js";
+import "../../chunks/chunk-K62JP6HR.js";
+import "../../chunks/chunk-ATF42T2B.js";
+import "../../chunks/chunk-ETBQTP2S.js";
 import "../../chunks/chunk-CQ52GEHY.js";
 
 // src/backend/api/CreateBackend.ts

package/dist/backend/api/DatabaseApi.js

@@ -1,21 +1,29 @@
 import {
-  Builder,
-  Column,
-  ColumnType,
-  column,
-  eq,
-  jsonAggregateArray,
-  jsonArray,
-  querySelection,
-  selectQuery,
+  include
+} from "../../chunks/chunk-XTWYBWP2.js";
+import {
+  blob,
+  id,
+  integer,
+  text,
+  varchar
+} from "../../chunks/chunk-ASYKC6IE.js";
+import {
+  Builder
+} from "../../chunks/chunk-2BJ2IFQM.js";
+import {
+  eq
+} from "../../chunks/chunk-XCZXR3C2.js";
+import {
   table
-} from "../../chunks/chunk-G6E35DMJ.js";
+} from "../../chunks/chunk-MOWR65LM.js";
+import "../../chunks/chunk-76VMZTLN.js";
+import "../../chunks/chunk-2PIFHEYR.js";
+import "../../chunks/chunk-K62JP6HR.js";
+import "../../chunks/chunk-ATF42T2B.js";
 import {
-  getData,
-  internalData,
-  internalSql,
   sql
-} from "../../chunks/chunk-NWQXN4SB.js";
+} from "../../chunks/chunk-ETBQTP2S.js";
 import {
   PLazy
 } from "../../chunks/chunk-IKINPSS5.js";
@@ -26,127 +34,6 @@ import { createId } from "alinea/core/Id";
 import { assert } from "alinea/core/util/Assert";
 import { basename, extname } from "alinea/core/util/Paths";
 import { slugify } from "alinea/core/util/Slugs";
-
-// node_modules/rado/dist/universal/columns.js
-var idType = new ColumnType(
-  "id",
-  [],
-  sql.universal({
-    sqlite: sql`integer`,
-    postgres: sql`integer generated always as identity`,
-    mysql: sql`int not null auto_increment`
-  })
-);
-var blobType = new ColumnType(
-  "blob",
-  [],
-  sql.universal({
-    postgres: sql`bytea`,
-    default: sql`blob`
-  })
-);
-var numberType = new ColumnType(
-  "number",
-  [],
-  sql.universal({
-    mysql: sql`double`,
-    default: sql`numeric`
-  })
-);
-var jsonbType = new ColumnType(
-  "json",
-  [],
-  sql.universal({
-    mysql: sql`json`,
-    default: sql`jsonb`
-  })
-);
-function id(name) {
-  return new Column({
-    name,
-    type: idType,
-    primary: true,
-    notNull: true
-  });
-}
-function text(name) {
-  return new Column({ name, type: column.text() });
-}
-function varchar(name, options) {
-  return new Column({ name, type: column.varchar(options?.length) });
-}
-function integer(name) {
-  return new Column({ name, type: column.integer() });
-}
-function blob(name) {
-  return new Column({
-    name,
-    type: blobType,
-    mapFromDriverValue(value) {
-      return new Uint8Array(value);
-    }
-  });
-}
-
-// node_modules/rado/dist/core/expr/Include.js
-var Include = class {
-  [internalData];
-  constructor(data) {
-    this[internalData] = data;
-  }
-  #mapFromDriverValue = (value, specs) => {
-    const query = getData(this);
-    const parsed = specs.parsesJson ? value : JSON.parse(value);
-    const selected = querySelection(query);
-    if (query.first) {
-      const result = parsed ? selected.mapRow({ values: parsed, index: 0, specs }) : null;
-      return result;
-    }
-    if (!parsed) return [];
-    const rows = parsed;
-    const ctx = {
-      values: void 0,
-      index: 0,
-      specs
-    };
-    for (let i = 0; i < rows.length; i++) {
-      ctx.values = rows[i];
-      ctx.index = 0;
-      rows[i] = selected.mapRow(ctx);
-    }
-    return rows ?? [];
-  };
-  get [internalSql]() {
-    return includeQuery(getData(this)).mapWith({
-      mapFromDriverValue: this.#mapFromDriverValue
-    });
-  }
-};
-function include(select) {
-  return new Include({ ...getData(select), first: false });
-}
-((include2) => {
-  function one(select) {
-    return new Include({
-      ...getData(select),
-      first: true
-    });
-  }
-  include2.one = one;
-})(include || (include = {}));
-function includeQuery(query) {
-  const { first, limit, offset, orderBy } = query;
-  const wrapQuery = Boolean(limit || offset || orderBy);
-  const innerQuery = selectQuery(query);
-  const inner = wrapQuery ? sql`select * from (${innerQuery}) as __` : innerQuery;
-  const fields = querySelection(query).fieldNames();
-  const subject = jsonArray(
-    ...fields.map((name) => sql`_.${sql.identifier(name)}`)
-  );
-  return sql`(select ${first ? subject : jsonAggregateArray(subject)} from (${inner}) as _)`;
-}
-
-// src/backend/api/DatabaseApi.ts
 import { HandleAction } from "../HandleAction.js";
 var UploadTable = table("alinea_upload", {
   entryId: varchar(void 0, { length: 27 }).primaryKey(),

package/dist/backend/api/ProxyMedia.d.ts

@@ -1,3 +1,2 @@
-import { type Request, Response } from '@alinea/iso';
-export declare function proxyMediaUrl(request: Request, source: URL, isAllowed?: (url: URL) => boolean): Promise<Response>;
-export declare function isRedirectStatus(status: number): boolean;
+import { type Request } from '@alinea/iso';
+export declare function proxyMediaUrl(request: Request, source: URL): Promise<Response>;

package/dist/backend/api/ProxyMedia.js

@@ -1,8 +1,8 @@
 import "../../chunks/chunk-CQ52GEHY.js";
 
 // src/backend/api/ProxyMedia.ts
-import { Headers, Response } from "@alinea/iso";
-async function proxyMediaUrl(request, source, isAllowed = (url) => url.origin === source.origin) {
+import { Headers } from "@alinea/iso";
+function proxyMediaUrl(request, source) {
   const headers = new Headers();
   for (const name of [
     "range",
@@ -13,27 +13,12 @@ async function proxyMediaUrl(request, source, isAllowed = (url) => url.origin ==
     const value = request.headers.get(name);
     if (value) headers.set(name, value);
   }
-  let current = source;
-  for (let redirects = 0; ; redirects++) {
-    if (!isAllowed(current))
-      return new Response("Invalid media source", { status: 502 });
-    const response = await fetch(current, {
-      method: request.method,
-      headers,
-      redirect: "manual",
-      signal: request.signal
-    });
-    const location = response.headers.get("location");
-    if (!isRedirectStatus(response.status) || !location) return response;
-    if (redirects === 3)
-      return new Response("Too many media redirects", { status: 502 });
-    current = new URL(location, current);
-  }
-}
-function isRedirectStatus(status) {
-  return status === 301 || status === 302 || status === 303 || status === 307 || status === 308;
+  return fetch(source, {
+    method: request.method,
+    headers,
+    signal: request.signal
+  });
 }
 export {
-  isRedirectStatus,
   proxyMediaUrl
 };

package/dist/backend/api/database.js

@@ -1,8 +1,20 @@
 import {
   driver_exports
-} from "../../chunks/chunk-X47OVDF3.js";
-import "../../chunks/chunk-G6E35DMJ.js";
-import "../../chunks/chunk-NWQXN4SB.js";
+} from "../../chunks/chunk-QJGGYF6E.js";
+import "../../chunks/chunk-QSN6RH6X.js";
+import "../../chunks/chunk-ETWOY4AL.js";
+import "../../chunks/chunk-66YZ47TY.js";
+import "../../chunks/chunk-AIU6CMVT.js";
+import "../../chunks/chunk-N47Y62CI.js";
+import "../../chunks/chunk-QBPYWU6C.js";
+import "../../chunks/chunk-2BJ2IFQM.js";
+import "../../chunks/chunk-XCZXR3C2.js";
+import "../../chunks/chunk-MOWR65LM.js";
+import "../../chunks/chunk-76VMZTLN.js";
+import "../../chunks/chunk-2PIFHEYR.js";
+import "../../chunks/chunk-K62JP6HR.js";
+import "../../chunks/chunk-ATF42T2B.js";
+import "../../chunks/chunk-ETBQTP2S.js";
 import "../../chunks/chunk-CQ52GEHY.js";
 
 // src/backend/api/database.ts

package/dist/backend/resolver/ParsePreview.d.ts

@@ -1,9 +1,9 @@
-import type { LocalDB } from 'alinea/core/db/LocalDB';
 import { Entry } from 'alinea/core/Entry';
 import type { PreviewRequest, PreviewUpdate } from 'alinea/core/Preview';
+import type { Graph } from 'alinea/core/Graph';
 export interface DecodedEntryPreview {
     entry: Entry;
 }
 export type DecodedPreviewRequest = PreviewUpdate | DecodedEntryPreview;
 export declare function decodePreviewRequest(preview: PreviewRequest): Promise<DecodedPreviewRequest>;
-export declare function applyPreview(local: LocalDB, preview: DecodedPreviewRequest): Promise<PreviewRequest | undefined>;
+export declare function applyPreview(local: Graph, preview: DecodedPreviewRequest): Promise<PreviewRequest | undefined>;

package/dist/backend/router/NodeHandler.js

@@ -5,6 +5,8 @@ import { Headers, Request } from "@alinea/iso";
 import { TLSSocket } from "node:tls";
 async function writeReadableStreamToWritable(stream, writable) {
   const reader = stream.getReader();
+  writable.once("close", () => reader.cancel().catch(() => {
+  }));
   async function read() {
     const { done, value } = await reader.read();
     if (done) return writable.end();

package/dist/backend/store/GeneratedDatabase.d.ts

@@ -0,0 +1,8 @@
+import type { Config } from 'alinea/core/Config';
+import type { DatabaseHandle } from 'alinea/database/driver/DatabaseHandle';
+import { EntryStore } from 'alinea/database/EntryStore';
+/**
+ * Serve a generated database from a connection that keeps its writes in
+ * memory, so syncs and commits never reach the generated file.
+ */
+export declare function createGeneratedDatabase(config: Config, { database: db, fork, driver }: DatabaseHandle): Promise<EntryStore>;

package/dist/backend/store/GeneratedDatabase.js

@@ -0,0 +1,33 @@
+import "../../chunks/chunk-CQ52GEHY.js";
+
+// src/backend/store/GeneratedDatabase.ts
+import { DatabaseSource } from "alinea/database/DatabaseSource";
+import { assertReadableData } from "alinea/database/entry/EntryData";
+import { EntryDatabase } from "alinea/database/EntryDatabase";
+import { EntryStore } from "alinea/database/EntryStore";
+async function createGeneratedDatabase(config, { database: db, fork, driver }) {
+  let initialTree;
+  const database = new EntryDatabase(config, db, {
+    fork,
+    includedAtBuild(filePath) {
+      return initialTree?.has(filePath) ?? false;
+    },
+    // Nothing reopens the in-memory writes: skip storing the synced tree.
+    recordsTree: false
+  });
+  try {
+    await assertReadableData(db);
+    initialTree = await database.getTree();
+    return new EntryStore(config, database, new DatabaseSource(database), {
+      ownsDatabase: true,
+      sourceFollowsDatabase: true,
+      driver
+    });
+  } catch (error) {
+    await database.close();
+    throw error;
+  }
+}
+export {
+  createGeneratedDatabase
+};

package/dist/backend/store/GeneratedDatabaseNode.d.ts

@@ -0,0 +1,4 @@
+import type { Config } from 'alinea/core/Config';
+import type { DatabaseOptions } from 'rado';
+/** Open the traced generated file as an in-memory overlay. */
+export declare function generatedDatabase(config: Config, options?: DatabaseOptions): Promise<import("../../database/EntryStore.js").EntryStore>;

package/dist/backend/store/GeneratedDatabaseNode.js

@@ -0,0 +1,35 @@
+import "../../chunks/chunk-CQ52GEHY.js";
+
+// src/backend/store/GeneratedDatabaseNode.ts
+import { runtimeDatabase } from "alinea/database/driver/RuntimeDatabase";
+import { fileURLToPath } from "node:url";
+import { createGeneratedDatabase } from "./GeneratedDatabase.js";
+async function generatedDatabasePath() {
+  const { database } = await import("@alinea/generated/database.node.js");
+  if (!(database instanceof URL))
+    throw new Error("The generated database location is missing");
+  return fileURLToPath(database);
+}
+var stores = /* @__PURE__ */ new WeakMap();
+var loggers = /* @__PURE__ */ new WeakMap();
+function generatedDatabase(config, options = {}) {
+  if (options.logQuery) loggers.set(config, options.logQuery);
+  let store = stores.get(config);
+  if (!store) {
+    store = generatedDatabasePath().then(
+      (path) => runtimeDatabase({
+        path,
+        overlay: true,
+        logQuery: (query, durationMs) => loggers.get(config)?.(query, durationMs)
+      })
+    ).then((db) => createGeneratedDatabase(config, db));
+    stores.set(config, store);
+    store.catch(() => {
+      if (stores.get(config) === store) stores.delete(config);
+    });
+  }
+  return store;
+}
+export {
+  generatedDatabase
+};

package/dist/backend/util/ORM.js

@@ -1,7 +1,9 @@
 import {
-  input,
+  input
+} from "../../chunks/chunk-ATF42T2B.js";
+import {
   sql
-} from "../../chunks/chunk-NWQXN4SB.js";
+} from "../../chunks/chunk-ETBQTP2S.js";
 import "../../chunks/chunk-CQ52GEHY.js";
 
 // src/backend/util/ORM.ts