@evolu/common 7.4.1 → 8.0.0-next.0

package/dist/src/local-first/Query.d.ts

@@ -1,29 +1,38 @@
-import { Brand } from "../Brand.js";
-import { Result } from "../Result.js";
-import { SqliteDep, SqliteError, SqliteQuery, SqliteRow, SqliteValue } from "../Sqlite.js";
-import { Store, StoreSubscribe } from "../Store.js";
-import { Id } from "../Type.js";
-import { Simplify } from "../Types.js";
+/**
+ * Query helpers, execution, and caching.
+ *
+ * @module
+ */
+import type { AliasableExpression, Expression, Simplify as KyselySimplify, RawBuilder, SelectQueryNode } from "kysely";
+import type { Brand } from "../Brand.js";
+import type { SqliteQueryString } from "../Sqlite.js";
+import { SqliteValue } from "../Sqlite.js";
+import type { Simplify } from "../Types.js";
+import type { EvoluSchema } from "./Schema.js";
+export { sql as kyselySql } from "kysely";
+export type { NotNull as KyselyNotNull } from "kysely";
 /**
  * A type-safe SQL query.
  *
  * ### Example
  *
  * ```ts
- * const allTodos = evolu.createQuery((db) =>
- *   db.selectFrom("todo").selectAll(),
- * );
+ * const createQuery = createQueryBuilder(Schema);
+ * const allTodos = createQuery((db) => db.selectFrom("todo").selectAll());
  * type AllTodosRow = typeof allTodos.Row;
  * ```
  */
-export type Query<R extends Row = Row> = string & Brand<"Query"> & {
+export type Query<S extends EvoluSchema = EvoluSchema, R extends Row = Row> = SqliteQueryString & Brand<"Query"> & {
+    /** A shorthand for the query schema. */
+    Schema: S;
     /**
      * A shorthand for {@link InferRow}.
      *
      * ### Example
      *
      * ```ts
-     * const allTodos = evolu.createQuery((db) =>
+     * const createQuery = createQueryBuilder(Schema);
+     * const allTodos = createQuery((db) =>
      *   db.selectFrom("todo").selectAll(),
      * );
      * type AllTodosRow = typeof allTodos.Row;
@@ -31,47 +40,124 @@ export type Query<R extends Row = Row> = string & Brand<"Query"> & {
      */
     Row: R;
 };
-/**
- * Evolu serializes {@link SqliteQuery} into a string to be easily used as a key
- * and for comparison.
- */
-export declare const serializeQuery: <R extends Row>(query: SqliteQuery) => Query<R>;
-export declare const deserializeQuery: <R extends Row>(query: Query<R>) => SqliteQuery;
-export type InferRow<T extends Query> = T extends Query<infer R> ? R : never;
+export type InferRow<T extends Query> = T extends Query<any, infer R> ? R : never;
 export interface Row {
     readonly [key: string]: SqliteValue | Row | ReadonlyArray<Row>;
 }
-export declare const emptyRows: ReadonlyArray<Row>;
+/**
+ * An improved Evolu version of Kysely's SQLite `jsonArrayFrom` helper.
+ *
+ * Kysely's `ParseJSONResultsPlugin` heuristically parses any result string that
+ * looks like JSON. Evolu instead prefixes JSON produced by these helpers with a
+ * per-runtime identifier and only parses values carrying that prefix, avoiding
+ * accidental parsing of ordinary string columns that merely happen to start
+ * with `{` or `[`.
+ *
+ * ### Example
+ *
+ * ```ts
+ * import { evoluJsonArrayFrom } from "@evolu/common";
+ *
+ * const result = await db
+ *   .selectFrom("person")
+ *   .select((eb) => [
+ *     "id",
+ *     evoluJsonArrayFrom(
+ *       eb
+ *         .selectFrom("pet")
+ *         .select(["pet.id as pet_id", "pet.name"])
+ *         .whereRef("pet.owner_id", "=", "person.id")
+ *         .orderBy("pet.name"),
+ *     ).as("pets"),
+ *   ])
+ *   .execute();
+ *
+ * result[0]?.id;
+ * result[0]?.pets[0].pet_id;
+ * result[0]?.pets[0].name;
+ * ```
+ */
+export declare const evoluJsonArrayFrom: <O>(expr: SelectQueryBuilderExpression<O>) => RawBuilder<Array<KyselySimplify<O>>>;
+/**
+ * An improved Evolu version of Kysely's SQLite `jsonObjectFrom` helper.
+ *
+ * Kysely's `ParseJSONResultsPlugin` heuristically parses any result string that
+ * looks like JSON. Evolu instead prefixes JSON produced by these helpers with a
+ * per-runtime identifier and only parses values carrying that prefix, avoiding
+ * accidental parsing of ordinary string columns that merely happen to start
+ * with `{` or `[`.
+ *
+ * The subquery must only return one row.
+ *
+ * ### Example
+ *
+ * ```ts
+ * import { evoluJsonObjectFrom } from "@evolu/common";
+ *
+ * const result = await db
+ *   .selectFrom("person")
+ *   .select((eb) => [
+ *     "id",
+ *     evoluJsonObjectFrom(
+ *       eb
+ *         .selectFrom("pet")
+ *         .select(["pet.id as pet_id", "pet.name"])
+ *         .whereRef("pet.owner_id", "=", "person.id")
+ *         .where("pet.is_favorite", "=", true),
+ *     ).as("favorite_pet"),
+ *   ])
+ *   .execute();
+ *
+ * result[0]?.id;
+ * result[0]?.favorite_pet?.pet_id;
+ * result[0]?.favorite_pet?.name;
+ * ```
+ */
+export declare const evoluJsonObjectFrom: <O>(expr: SelectQueryBuilderExpression<O>) => RawBuilder<KyselySimplify<O> | null>;
+/**
+ * An improved Evolu version of Kysely's SQLite `jsonBuildObject` helper.
+ *
+ * Kysely's `ParseJSONResultsPlugin` heuristically parses any result string that
+ * looks like JSON. Evolu instead prefixes JSON produced by these helpers with a
+ * per-runtime identifier and only parses values carrying that prefix, avoiding
+ * accidental parsing of ordinary string columns that merely happen to start
+ * with `{` or `[`.
+ *
+ * ### Example
+ *
+ * ```ts
+ * import { evoluJsonBuildObject, kyselySql } from "@evolu/common";
+ *
+ * const result = await db
+ *   .selectFrom("person")
+ *   .select((eb) => [
+ *     "id",
+ *     evoluJsonBuildObject({
+ *       first: eb.ref("first_name"),
+ *       last: eb.ref("last_name"),
+ *       full: kyselySql<string>`first_name || ' ' || last_name`,
+ *     }).as("name"),
+ *   ])
+ *   .execute();
+ *
+ * result[0]?.id;
+ * result[0]?.name.first;
+ * result[0]?.name.last;
+ * result[0]?.name.full;
+ * ```
+ */
+export declare const evoluJsonBuildObject: <O extends Record<string, Expression<unknown>>>(obj: O) => RawBuilder<KyselySimplify<{ [K in keyof O]: O[K] extends Expression<infer V> ? V : never; }>>;
+export declare const getJsonObjectArgs: (node: SelectQueryNode, table: string) => Array<Expression<unknown> | string>;
 /** Rows returned by a query. */
 export type QueryRows<R extends Row = Row> = ReadonlyArray<Readonly<Simplify<R>>>;
-export type Queries<R extends Row = Row> = ReadonlyArray<Query<R>>;
+export type Queries<S extends EvoluSchema = EvoluSchema, R extends Row = Row> = ReadonlyArray<Query<S, R>>;
 export type QueriesToQueryRows<Q extends Queries> = {
-    [P in keyof Q]: Q[P] extends Query<infer R> ? QueryRows<R> : never;
+    [P in keyof Q]: Q[P] extends Query<any, infer R> ? QueryRows<R> : never;
 };
 export type QueriesToQueryRowsPromises<Q extends Queries> = {
-    [P in keyof Q]: Q[P] extends Query<infer R> ? Promise<QueryRows<R>> : never;
+    [P in keyof Q]: Q[P] extends Query<any, infer R> ? Promise<QueryRows<R>> : never;
 };
-export type QueryRowsMap = ReadonlyMap<Query, ReadonlyArray<Row>>;
-export interface SubscribedQueries {
-    subscribe: (query: Query) => StoreSubscribe;
-    has: (query: Query) => boolean;
-    get: () => ReadonlyArray<Query>;
-}
-export declare const createSubscribedQueries: (rowsStore: Store<QueryRowsMap>) => SubscribedQueries;
-export interface GetQueryRowsCacheDep {
-    readonly getQueryRowsCache: GetQueryRowsCache;
-}
-export type GetQueryRowsCache = (tabId: Id) => QueryRowsCache;
-export interface QueryRowsCache {
-    readonly set: (queriesRows: ReadonlyArray<readonly [Query, ReadonlyArray<SqliteRow>]>) => void;
-    readonly get: () => QueryRowsMap;
-}
-export declare const createGetQueryRowsCache: () => GetQueryRowsCache;
-export declare const loadQueries: (deps: GetQueryRowsCacheDep & SqliteDep) => (tabId: Id, queries: ReadonlyArray<Query>) => Result<ReadonlyArray<QueryPatches>, SqliteError>;
-export interface QueryPatches {
-    readonly query: Query;
-    readonly patches: ReadonlyArray<Patch>;
-}
+export type RowsByQueryMap<S extends EvoluSchema = EvoluSchema> = ReadonlyMap<Query<S>, ReadonlyArray<Row>>;
 export type Patch = ReplaceAllPatch | ReplaceAtPatch;
 export interface ReplaceAllPatch {
     readonly op: "replaceAll";
@@ -108,5 +194,9 @@ export declare const applyPatches: (patches: ReadonlyArray<Patch>, current: Read
  * See: https://github.com/kysely-org/kysely/issues/1372#issuecomment-2702773948
  */
 export declare const kyselyJsonIdentifier: string & Brand<"Id">;
+interface SelectQueryBuilderExpression<O> extends AliasableExpression<O> {
+    get isSelectQueryBuilder(): true;
+    toOperationNode(): SelectQueryNode;
+}
 export declare const parseSqliteJsonArray: <T>(arr: ReadonlyArray<T>) => ReadonlyArray<T>;
 //# sourceMappingURL=Query.d.ts.map

package/dist/src/local-first/Query.d.ts.map

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

package/dist/src/local-first/Query.js

@@ -1,96 +1,134 @@
-import { bytesToHex, hexToBytes } from "../Buffer.js";
+/**
+ * Query helpers, execution, and caching.
+ *
+ * @module
+ */
+import { AliasNode, ColumnNode, ExpressionWrapper, IdentifierNode, sql as kyselySqlBuilder, ReferenceNode, TableNode, ValueNode, } from "kysely";
 import { createRandomBytes } from "../Crypto.js";
-import { createRecord, isPlainObject, objectToEntries, } from "../Object.js";
-import { ok } from "../Result.js";
-import { eqSqliteValue, explainSqliteQueryPlan, } from "../Sqlite.js";
+import { createRecord, isPlainObject } from "../Object.js";
+import { eqSqliteValue, SqliteValue } from "../Sqlite.js";
 import { createId, String } from "../Type.js";
+export { sql as kyselySql } from "kysely";
 /**
- * Evolu serializes {@link SqliteQuery} into a string to be easily used as a key
- * and for comparison.
+ * An improved Evolu version of Kysely's SQLite `jsonArrayFrom` helper.
+ *
+ * Kysely's `ParseJSONResultsPlugin` heuristically parses any result string that
+ * looks like JSON. Evolu instead prefixes JSON produced by these helpers with a
+ * per-runtime identifier and only parses values carrying that prefix, avoiding
+ * accidental parsing of ordinary string columns that merely happen to start
+ * with `{` or `[`.
+ *
+ * ### Example
+ *
+ * ```ts
+ * import { evoluJsonArrayFrom } from "@evolu/common";
+ *
+ * const result = await db
+ *   .selectFrom("person")
+ *   .select((eb) => [
+ *     "id",
+ *     evoluJsonArrayFrom(
+ *       eb
+ *         .selectFrom("pet")
+ *         .select(["pet.id as pet_id", "pet.name"])
+ *         .whereRef("pet.owner_id", "=", "person.id")
+ *         .orderBy("pet.name"),
+ *     ).as("pets"),
+ *   ])
+ *   .execute();
+ *
+ * result[0]?.id;
+ * result[0]?.pets[0].pet_id;
+ * result[0]?.pets[0].name;
+ * ```
  */
-export const serializeQuery = (query) => {
-    const params = query.parameters.map((v) => v instanceof Uint8Array
-        ? ["b", bytesToHex(v)]
-        : ["j", v]);
-    const options = query.options
-        ? objectToEntries(query.options).toSorted(([a], [b]) => a.localeCompare(b))
-        : [];
-    return JSON.stringify([query.sql, params, options]);
-};
-export const deserializeQuery = (query) => {
-    const [sql, paramsArr, optionsArr] = JSON.parse(query);
-    const parameters = paramsArr.map(([type, value]) => type === "b" ? hexToBytes(value) : value);
-    const options = optionsArr.length
-        ? Object.fromEntries(optionsArr)
-        : undefined;
-    return {
-        sql,
-        parameters,
-        ...(options !== undefined && { options }),
-    };
-};
-// To preserve identity.
-export const emptyRows = [];
-export const createSubscribedQueries = (rowsStore) => {
-    const subscribedQueryMap = new Map();
-    const subscribedQueries = {
-        subscribe: (query) => (listener) => {
-            subscribedQueryMap.set(query, (subscribedQueryMap.get(query) ?? 0) + 1);
-            const unsubscribe = rowsStore.subscribe(listener);
-            return () => {
-                const count = subscribedQueryMap.get(query);
-                if (count != null && count > 1) {
-                    subscribedQueryMap.set(query, count - 1);
-                }
-                else {
-                    subscribedQueryMap.delete(query);
-                }
-                unsubscribe();
-            };
-        },
-        get: () => [...subscribedQueryMap.keys()],
-        has: (query) => subscribedQueryMap.has(query),
-    };
-    return subscribedQueries;
-};
-export const createGetQueryRowsCache = () => {
-    const tabQueryRowsCacheMap = new Map();
-    return (tabId) => {
-        let cache = tabQueryRowsCacheMap.get(tabId);
-        if (!cache) {
-            let queryRowsCache = new Map();
-            cache = {
-                set: (queriesRows) => {
-                    queryRowsCache = new Map([...queryRowsCache, ...queriesRows]);
-                },
-                get: () => queryRowsCache,
-            };
-            tabQueryRowsCacheMap.set(tabId, cache);
+export const evoluJsonArrayFrom = (expr) => kyselySqlBuilder `(select ${kyselySqlBuilder.lit(kyselyJsonIdentifier)} || coalesce(json_group_array(json_object(${kyselySqlBuilder.join(getSqliteJsonObjectArgs(expr.toOperationNode(), "agg"))})), '[]') from ${expr} as agg)`;
+/**
+ * An improved Evolu version of Kysely's SQLite `jsonObjectFrom` helper.
+ *
+ * Kysely's `ParseJSONResultsPlugin` heuristically parses any result string that
+ * looks like JSON. Evolu instead prefixes JSON produced by these helpers with a
+ * per-runtime identifier and only parses values carrying that prefix, avoiding
+ * accidental parsing of ordinary string columns that merely happen to start
+ * with `{` or `[`.
+ *
+ * The subquery must only return one row.
+ *
+ * ### Example
+ *
+ * ```ts
+ * import { evoluJsonObjectFrom } from "@evolu/common";
+ *
+ * const result = await db
+ *   .selectFrom("person")
+ *   .select((eb) => [
+ *     "id",
+ *     evoluJsonObjectFrom(
+ *       eb
+ *         .selectFrom("pet")
+ *         .select(["pet.id as pet_id", "pet.name"])
+ *         .whereRef("pet.owner_id", "=", "person.id")
+ *         .where("pet.is_favorite", "=", true),
+ *     ).as("favorite_pet"),
+ *   ])
+ *   .execute();
+ *
+ * result[0]?.id;
+ * result[0]?.favorite_pet?.pet_id;
+ * result[0]?.favorite_pet?.name;
+ * ```
+ */
+export const evoluJsonObjectFrom = (expr) => kyselySqlBuilder `(select ${kyselySqlBuilder.lit(kyselyJsonIdentifier)} || json_object(${kyselySqlBuilder.join(getSqliteJsonObjectArgs(expr.toOperationNode(), "obj"))}) from ${expr} as obj)`;
+/**
+ * An improved Evolu version of Kysely's SQLite `jsonBuildObject` helper.
+ *
+ * Kysely's `ParseJSONResultsPlugin` heuristically parses any result string that
+ * looks like JSON. Evolu instead prefixes JSON produced by these helpers with a
+ * per-runtime identifier and only parses values carrying that prefix, avoiding
+ * accidental parsing of ordinary string columns that merely happen to start
+ * with `{` or `[`.
+ *
+ * ### Example
+ *
+ * ```ts
+ * import { evoluJsonBuildObject, kyselySql } from "@evolu/common";
+ *
+ * const result = await db
+ *   .selectFrom("person")
+ *   .select((eb) => [
+ *     "id",
+ *     evoluJsonBuildObject({
+ *       first: eb.ref("first_name"),
+ *       last: eb.ref("last_name"),
+ *       full: kyselySql<string>`first_name || ' ' || last_name`,
+ *     }).as("name"),
+ *   ])
+ *   .execute();
+ *
+ * result[0]?.id;
+ * result[0]?.name.first;
+ * result[0]?.name.last;
+ * result[0]?.name.full;
+ * ```
+ */
+export const evoluJsonBuildObject = (obj) => kyselySqlBuilder `${kyselySqlBuilder.lit(kyselyJsonIdentifier)} || json_object(${kyselySqlBuilder.join(Object.keys(obj).flatMap((k) => [kyselySqlBuilder.lit(k), obj[k]]))})`;
+export const getJsonObjectArgs = (node, table) => {
+    const args = [];
+    for (const { selection: s } of node.selections ?? []) {
+        if (ReferenceNode.is(s) && ColumnNode.is(s.column)) {
+            args.push(colName(s.column.column.name), colRef(table, s.column.column.name));
         }
-        return cache;
-    };
-};
-export const loadQueries = (deps) => (tabId, queries) => {
-    const queriesRows = [];
-    for (const query of queries) {
-        const sqlQuery = deserializeQuery(query);
-        const result = deps.sqlite.exec(sqlQuery);
-        if (!result.ok)
-            return result;
-        queriesRows.push([query, result.value.rows]);
-        if (sqlQuery.options?.logExplainQueryPlan) {
-            explainSqliteQueryPlan(deps)(sqlQuery);
+        else if (ColumnNode.is(s)) {
+            args.push(colName(s.column.name), colRef(table, s.column.name));
+        }
+        else if (AliasNode.is(s) && IdentifierNode.is(s.alias)) {
+            args.push(colName(s.alias.name), colRef(table, s.alias.name));
+        }
+        else {
+            throw new Error(`can't extract column names from the select query node`);
         }
     }
-    const queryRowsCache = deps.getQueryRowsCache(tabId);
-    const previousState = queryRowsCache.get();
-    queryRowsCache.set(queriesRows);
-    const currentState = queryRowsCache.get();
-    const queryPatchesArray = queries.map((query) => ({
-        query,
-        patches: makePatches(previousState.get(query), currentState.get(query) ?? emptyRows),
-    }));
-    return ok(queryPatchesArray);
+    return args;
 };
 /**
  * We detect only changes in the whole result and in-place edits. In the future,
@@ -100,8 +138,9 @@ export const loadQueries = (deps) => (tabId, queries) => {
  * if necessary.
  */
 export const makePatches = (previousRows, nextRows) => {
-    if (previousRows === undefined)
+    if (previousRows === undefined) {
         return [{ op: "replaceAll", value: nextRows }];
+    }
     // TODO: Detect prepend and append, it's cheap.
     if (previousRows.length !== nextRows.length) {
         return [{ op: "replaceAll", value: nextRows }];
@@ -149,9 +188,17 @@ export const applyPatches = (patches, current) => patches.reduce((next, patch) =
  *
  * See: https://github.com/kysely-org/kysely/issues/1372#issuecomment-2702773948
  */
-export const kyselyJsonIdentifier = createId({
-    randomBytes: createRandomBytes(),
+export const kyselyJsonIdentifier = /*#__PURE__*/ createId({
+    randomBytes: /*#__PURE__*/ createRandomBytes(),
 });
+const getSqliteJsonObjectArgs = (node, table) => {
+    try {
+        return getJsonObjectArgs(node, table);
+    }
+    catch {
+        throw new Error("SQLite evoluJsonArrayFrom and evoluJsonObjectFrom can only handle explicit selections due to limitations of the json_object function. selectAll() is not allowed in the subquery.");
+    }
+};
 export const parseSqliteJsonArray = (arr) => {
     const result = new Array(arr.length);
     for (let i = 0; i < arr.length; ++i) {
@@ -161,7 +208,7 @@ export const parseSqliteJsonArray = (arr) => {
 };
 const parse = (obj) => {
     if (String.is(obj) && obj.startsWith(kyselyJsonIdentifier)) {
-        return JSON.parse(obj.slice(kyselyJsonIdentifier.length));
+        return parse(JSON.parse(obj.slice(kyselyJsonIdentifier.length)));
     }
     if (Array.isArray(obj)) {
         return parseSqliteJsonArray(obj);
@@ -178,3 +225,5 @@ const parseObject = (obj) => {
     }
     return result;
 };
+const colName = (col) => new ExpressionWrapper(ValueNode.createImmediate(col));
+const colRef = (table, col) => new ExpressionWrapper(ReferenceNode.create(ColumnNode.create(col), TableNode.create(table)));

package/dist/src/local-first/Relay.d.ts

@@ -1,26 +1,27 @@
-import { ConsoleConfig, ConsoleDep } from "../Console.js";
-import { TimingSafeEqualDep } from "../Crypto.js";
-import { LazyValue } from "../Function.js";
-import { Result } from "../Result.js";
-import { SqliteDep, SqliteError } from "../Sqlite.js";
-import { MaybeAsync } from "../Task.js";
-import { SimpleName } from "../Type.js";
+/**
+ * Relay server for data synchronization.
+ *
+ * @module
+ */
+import type { TimingSafeEqualDep } from "../Crypto.js";
+import type { SqliteDep } from "../Sqlite.js";
+import { Name } from "../Type.js";
+import { type Awaitable } from "../Types.js";
 import { OwnerId } from "./Owner.js";
-import { ProtocolInvalidDataError } from "./Protocol.js";
-import { CreateBaseSqliteStorageConfig, SqliteStorageDeps, Storage, StorageConfig } from "./Storage.js";
-export interface RelayConfig extends ConsoleConfig, StorageConfig {
+import type { SqliteStorageDeps, Storage, StorageConfig } from "./Storage.js";
+export interface RelayConfig extends StorageConfig {
     /**
      * The relay name.
      *
      * Implementations can use this for identification purposes (e.g., database
      * file name, logging).
      */
-    readonly name?: SimpleName;
+    readonly name?: Name;
     /**
      * Optional callback to check if an {@link OwnerId} is allowed to access the
      * relay. If this callback is not provided, all owners are allowed.
      *
-     * The callback receives the {@link OwnerId} and returns a {@link MaybeAsync}
+     * The callback receives the {@link OwnerId} and returns a {@link Awaitable}
      * boolean: `true` to allow access, or `false` to deny.
      *
      * The callback can be synchronous (for SQLite or in-memory checks) or
@@ -34,7 +35,7 @@ export interface RelayConfig extends ConsoleConfig, StorageConfig {
      * relay access, not write permissions. Since all data is encrypted on the
      * relay, OwnerId exposure is safe.
      *
-     * Owners specify which relays to connect to via {@link OwnerTransport}. In
+     * Owners specify which relays to connect to via `OwnerTransport`. In
      * WebSocket-based implementations, this check occurs before accepting the
      * connection, with the OwnerId typically extracted from the URL Path (e.g.,
      * `ws://localhost:4000/<ownerId>`). The relay requires the URL to be in the
@@ -59,7 +60,7 @@ export interface RelayConfig extends ConsoleConfig, StorageConfig {
      *   Promise.resolve(ownerId === "6jy_2F4RT5qqeLgJ14_dnQ"),
      * ```
      */
-    readonly isOwnerAllowed?: (ownerId: OwnerId) => MaybeAsync<boolean>;
+    readonly isOwnerAllowed?: (ownerId: OwnerId) => Awaitable<boolean>;
 }
 /**
  * A completely interchangeable server for syncing and backing up encrypted data
@@ -70,29 +71,8 @@ export interface RelayConfig extends ConsoleConfig, StorageConfig {
  * decentralization and infinite horizontal scalability with minimal
  * infrastructure.
  */
-export interface Relay extends Disposable {
-}
-export declare const createRelaySqliteStorage: (deps: SqliteStorageDeps & TimingSafeEqualDep) => (config: CreateBaseSqliteStorageConfig) => Storage;
-export declare const createRelayStorageTables: (deps: SqliteDep) => Result<void, SqliteError>;
-export interface RelayLogger {
-    readonly started: (enableLogging: boolean, port: number) => void;
-    readonly storageError: (error: unknown) => void;
-    readonly upgradeSocketError: (error: Error) => void;
-    readonly invalidOrMissingOwnerIdInUrl: (url: string | undefined) => void;
-    readonly unauthorizedOwner: (ownerId: OwnerId) => void;
-    readonly connectionEstablished: (totalConnectionCount: number) => void;
-    readonly connectionWebSocketError: (error: Error) => void;
-    readonly relayOptionSubscribe: (ownerId: OwnerId, getSubscriberCount: LazyValue<number>) => void;
-    readonly relayOptionUnsubscribe: (ownerId: OwnerId, getSubscriberCount: LazyValue<number>) => void;
-    readonly relayOptionBroadcast: (ownerId: OwnerId, broadcastCount: number, subscriberCount: number) => void;
-    readonly messageLength: (messageLength: number) => void;
-    readonly applyProtocolMessageAsRelayError: (error: ProtocolInvalidDataError) => void;
-    readonly responseLength: (responseLength: number) => void;
-    readonly applyProtocolMessageAsRelayUnknownError: (error: unknown) => void;
-    readonly connectionClosed: (totalConnectionCount: number) => void;
-    readonly shuttingDown: () => void;
-    readonly webSocketServerDisposed: () => void;
-    readonly httpServerDisposed: () => void;
+export interface Relay extends AsyncDisposable {
 }
-export declare const createRelayLogger: (deps: ConsoleDep) => RelayLogger;
+export declare const createRelaySqliteStorage: (deps: SqliteStorageDeps & TimingSafeEqualDep) => (config: StorageConfig) => Storage;
+export declare const createRelayStorageTables: (deps: SqliteDep) => void;
 //# sourceMappingURL=Relay.d.ts.map

package/dist/src/local-first/Relay.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Relay.d.ts","sourceRoot":"","sources":["../../../src/local-first/Relay.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Relay.d.ts","sourceRoot":"","sources":["../../../src/local-first/Relay.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AASH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAEvD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAG9C,OAAO,EAAE,IAAI,EAAe,MAAM,YAAY,CAAC;AAC/C,OAAO,EAAiB,KAAK,SAAS,EAAE,MAAM,aAAa,CAAC;AAC5D,OAAO,EACL,OAAO,EAIR,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAEV,iBAAiB,EACjB,OAAO,EACP,aAAa,EAEd,MAAM,cAAc,CAAC;AAStB,MAAM,WAAW,WAAY,SAAQ,aAAa;IAChD;;;;;OAKG;IACH,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC;IAErB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA0CG;IACH,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,SAAS,CAAC,OAAO,CAAC,CAAC;CACpE;AAED;;;;;;;;GAQG;AACH,MAAM,WAAW,KAAM,SAAQ,eAAe;CAAG;AAEjD,eAAO,MAAM,wBAAwB,GAClC,MAAM,iBAAiB,GAAG,kBAAkB,MAC5C,QAAQ,aAAa,KAAG,OA0LxB,CAAC;AAEJ,eAAO,MAAM,wBAAwB,GAAI,MAAM,SAAS,KAAG,IAuB1D,CAAC"}