@evolu/common 8.11.0 → 8.13.0

package/src/local-first/Storage.ts

@@ -9,8 +9,7 @@ import type { NonEmptyReadonlyArray } from "../Array.ts";
 import { firstInArray, isNonEmptyArray } from "../Array.ts";
 import { assert, assertNonNullable } from "../Assert.ts";
 import type { Brand } from "../Brand.ts";
-import { concatBytes } from "../Bytes.ts";
-import type { DecryptWithXChaCha20Poly1305Error } from "../Crypto.ts";
+import { concatByteArrays } from "../Bytes.ts";
 import { decrement } from "../Number.ts";
 import type { RandomDep } from "../Random.ts";
 import { err, ok } from "../Result.ts";
@@ -39,11 +38,9 @@ import {
 import type { Awaitable } from "../Types.ts";
 import type { Owner, OwnerError, OwnerIdBytes } from "./Owner.ts";
 import { OwnerId, OwnerWriteKey } from "./Owner.ts";
-import type {
-  ProtocolInvalidDataError,
-  ProtocolTimestampMismatchError,
-} from "./Protocol.ts";
+import type { ProtocolQuotaError } from "./Protocol.ts";
 import { systemColumnsWithId } from "./Schema.ts";
+import type { syncStateToOwnerSyncStatus } from "./Shared.ts";
 import {
   createTimestamp,
   orderTimestampBytes,
@@ -72,9 +69,10 @@ export interface StorageConfig {
    * The callback returns a boolean rather than an error because error handling
    * and logging are the responsibility of the callback implementation.
    *
-   * Relay deployments configure this callback. Client applications can observe
-   * a denied relay write as a `ProtocolQuotaError` by subscribing once to the
-   * shared `EvoluErrorDep.evoluError` store returned by `createEvoluDeps`.
+   * Relay deployments configure this callback. Client applications observe a
+   * denied relay write as a {@link ProtocolQuotaError} in the `failure` of that
+   * relay's route, which {@link syncStateToOwnerSyncStatus} reports as the
+   * owner's `Error` status.
    *
    * ### Example
    *
@@ -109,7 +107,7 @@ export interface StorageConfig {
    */
   readonly isOwnerWithinQuota: (
     ownerId: OwnerId,
-    requiredBytes: PositiveInt,
+    requiredBytes: NonNegativeInt,
   ) => Awaitable<boolean>;
 }
 
@@ -194,7 +192,10 @@ export interface Storage {
    * Write encrypted {@link CrdtMessage}s to storage.
    *
    * Stores none of the messages and returns the cause when the batch cannot be
-   * accepted.
+   * accepted. A client storage that cannot decrypt, verify, or decode a message
+   * skips it and stores the rest, as the built-in client storage does, because
+   * the peer offers the message again in every round, and rejecting the batch
+   * would end each round.
    *
    * Must use a mutex per ownerId to ensure sequential processing and proper
    * protocol logic handling during sync operations.
@@ -234,19 +235,17 @@ export interface StorageQuotaError
 /**
  * Expected reasons why {@link Storage.writeMessages} stored none of a batch.
  *
- * Each implementation returns the members that apply to it. The built-in relay
- * storage currently stores opaque encrypted messages and rejects batches over
- * quota. The built-in client storage decrypts and validates incoming messages
- * before updating its clock and database tables. The contract permits quota
- * checks on either side.
+ * The built-in relay storage stores opaque encrypted messages and rejects
+ * batches over quota. The built-in client storage decrypts and validates
+ * incoming messages before updating its clock and database tables. It skips a
+ * message that fails instead of rejecting its batch, and sync state shows it as
+ * the route's `skippedError` without ending the sync round, so a message is
+ * never a reason to reject a batch. The contract permits quota checks on either
+ * side.
  *
  * @group Core
  */
-export type StorageWriteMessagesError =
-  | DecryptWithXChaCha20Poly1305Error
-  | ProtocolInvalidDataError
-  | ProtocolTimestampMismatchError
-  | StorageQuotaError;
+export type StorageWriteMessagesError = StorageQuotaError;
 
 /**
  * A cryptographic hash used for efficiently comparing collections of
@@ -581,7 +580,9 @@ export const createBaseSqliteStorage = (
   },
 
   getExistingTimestamps: (ownerIdBytes, timestampsBytes) => {
-    const concatenatedTimestamps = concatBytes(...timestampsBytes);
+    // A batch can hold hundreds of thousands of timestamps, too many to spread
+    // into concatBytes.
+    const concatenatedTimestamps = concatByteArrays(timestampsBytes);
 
     const result = deps.sqlite.exec<{
       timestampBytes: TimestampBytes;
@@ -1808,7 +1809,7 @@ export const updateOwnerUsage =
   (deps: SqliteDep) =>
   (
     ownerIdBytes: OwnerIdBytes,
-    storedBytes: PositiveInt,
+    storedBytes: NonNegativeInt,
     firstTimestamp: TimestampBytes,
     lastTimestamp: TimestampBytes,
   ): void => {