@powersync/service-module-mongodb-storage 0.20.0 → 0.22.0

package/dist/storage/implementation/v3/object-storage/ObjectStorageLifecycle.js.map

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

package/dist/storage/implementation/v3/object-storage/ObjectStorageUsage.d.ts

@@ -0,0 +1,38 @@
+import { mongo } from '@powersync/lib-service-mongodb';
+import { BucketDefinitionId } from '@powersync/service-sync-rules';
+import { MongoWriteBatch } from '../../MongoWriteBatch.js';
+import { BucketDataDocumentV3 } from '../models.js';
+import { VersionedPowerSyncMongoV3 } from '../VersionedPowerSyncMongoV3.js';
+export declare const OBJECT_STORAGE_USAGE_BASE_WRITER_ID = "__base__";
+export declare const DEFAULT_OBJECT_STORAGE_USAGE_STALE_WRITER_MS: number;
+export declare const DEFAULT_OBJECT_STORAGE_USAGE_FOLD_LIMIT = 100;
+export interface ReplicationStreamObjectStorageDefinitionUsageResult {
+    replication_stream_id: number;
+    definition_id: BucketDefinitionId;
+    active_bytes: bigint;
+}
+export declare function createObjectStorageUsageWriterId(): string;
+/**
+ * Tracks active S3 references. Values are signed writer-local deltas, so reference changes and
+ * accounting updates can be committed together without making replication and compaction share a
+ * hot counter document.
+ */
+export declare class ObjectStorageUsage {
+    private readonly db;
+    private readonly replicationStreamId;
+    readonly writerId?: string | undefined;
+    constructor(db: VersionedPowerSyncMongoV3, replicationStreamId: number, writerId?: string | undefined);
+    static bytes(document: Pick<BucketDataDocumentV3, 'storage_ref'>): bigint;
+    static readAllDefinitionUsage(db: VersionedPowerSyncMongoV3): Promise<ReplicationStreamObjectStorageDefinitionUsageResult[]>;
+    applyDelta(definitionId: BucketDefinitionId, delta: bigint, writes: MongoWriteBatch): void;
+    applyDeltas(deltas: ReadonlyMap<BucketDefinitionId, bigint>, writes: MongoWriteBatch): void;
+    removeDefinition(definitionId: BucketDefinitionId, session: mongo.ClientSession): Promise<void>;
+    removeStream(session: mongo.ClientSession): Promise<void>;
+    foldStaleWriterDeltas(options?: {
+        staleWriterMs?: number;
+        limit?: number;
+    }): Promise<void>;
+    private definitionPath;
+    private documentId;
+    private validateDefinitionId;
+}

package/dist/storage/implementation/v3/object-storage/ObjectStorageUsage.js

@@ -0,0 +1,164 @@
+import * as lib_mongo from '@powersync/lib-service-mongodb';
+import { ReplicationAssertionError } from '@powersync/lib-services-framework';
+import { randomUUID } from 'node:crypto';
+export const OBJECT_STORAGE_USAGE_BASE_WRITER_ID = '__base__';
+export const DEFAULT_OBJECT_STORAGE_USAGE_STALE_WRITER_MS = 30 * 60 * 1000;
+export const DEFAULT_OBJECT_STORAGE_USAGE_FOLD_LIMIT = 100;
+export function createObjectStorageUsageWriterId() {
+    return randomUUID();
+}
+/**
+ * Tracks active S3 references. Values are signed writer-local deltas, so reference changes and
+ * accounting updates can be committed together without making replication and compaction share a
+ * hot counter document.
+ */
+export class ObjectStorageUsage {
+    db;
+    replicationStreamId;
+    writerId;
+    constructor(db, replicationStreamId, writerId) {
+        this.db = db;
+        this.replicationStreamId = replicationStreamId;
+        this.writerId = writerId;
+        if (writerId === OBJECT_STORAGE_USAGE_BASE_WRITER_ID) {
+            throw new ReplicationAssertionError('The reserved object-storage usage writer id cannot be used by a writer');
+        }
+    }
+    static bytes(document) {
+        return BigInt(document.storage_ref?.file_size ?? 0);
+    }
+    static async readAllDefinitionUsage(db) {
+        return db.client.withSession({ snapshot: true }, async (session) => {
+            // Deliberately read the whole usage collection. The number of replication streams is
+            // expected to stay low, so a collection scan is cheaper than issuing one _id range query
+            // per stream (and the usage collection is bounded by streams and writers, not buckets).
+            const entries = await db.objectStorageUsage
+                .aggregate([
+                { $project: { replication_stream_id: '$_id.g', definitions: { $objectToArray: '$definitions' } } },
+                { $unwind: '$definitions' },
+                {
+                    $group: {
+                        _id: {
+                            replication_stream_id: '$replication_stream_id',
+                            definition_id: '$definitions.k'
+                        },
+                        active_bytes: { $sum: '$definitions.v' }
+                    }
+                }
+            ], { session, readConcern: 'snapshot' })
+                .toArray()
+                .catch((error) => {
+                if (lib_mongo.isMongoNamespaceNotFoundError(error)) {
+                    return [];
+                }
+                throw error;
+            });
+            return entries.map((entry) => {
+                const activeBytes = BigInt(entry.active_bytes ?? 0);
+                if (activeBytes < 0n) {
+                    return {
+                        replication_stream_id: entry._id.replication_stream_id,
+                        definition_id: entry._id.definition_id,
+                        active_bytes: 0n
+                    };
+                }
+                return {
+                    replication_stream_id: entry._id.replication_stream_id,
+                    definition_id: entry._id.definition_id,
+                    active_bytes: activeBytes
+                };
+            });
+        });
+    }
+    applyDelta(definitionId, delta, writes) {
+        this.applyDeltas(new Map([[definitionId, delta]]), writes);
+    }
+    applyDeltas(deltas, writes) {
+        if (this.writerId == null) {
+            throw new ReplicationAssertionError('A writer id is required to apply object-storage usage');
+        }
+        const increments = {};
+        for (const [definitionId, delta] of deltas) {
+            if (delta === 0n) {
+                continue;
+            }
+            increments[this.definitionPath(definitionId)] = delta;
+        }
+        if (Object.keys(increments).length === 0) {
+            return;
+        }
+        writes.updateOne(this.db.objectStorageUsage, { _id: this.documentId() }, { $inc: increments, $currentDate: { updated_at: true } }, { upsert: true });
+    }
+    async removeDefinition(definitionId, session) {
+        await this.db.objectStorageUsage.updateMany({ '_id.g': this.replicationStreamId }, { $unset: { [this.definitionPath(definitionId)]: 1 } }, { session });
+    }
+    async removeStream(session) {
+        await this.db.objectStorageUsage.deleteMany({ '_id.g': this.replicationStreamId }, { session });
+    }
+    async foldStaleWriterDeltas(options = {}) {
+        const staleWriterMs = options.staleWriterMs ?? DEFAULT_OBJECT_STORAGE_USAGE_STALE_WRITER_MS;
+        const limit = options.limit ?? DEFAULT_OBJECT_STORAGE_USAGE_FOLD_LIMIT;
+        if (limit <= 0) {
+            return;
+        }
+        await this.db.client.withSession((session) => session.withTransaction(async () => {
+            const staleDocuments = await this.db.objectStorageUsage
+                .find({
+                '_id.g': this.replicationStreamId,
+                '_id.w': { $ne: OBJECT_STORAGE_USAGE_BASE_WRITER_ID },
+                $expr: {
+                    $lt: [
+                        '$updated_at',
+                        { $dateSubtract: { startDate: '$$NOW', unit: 'millisecond', amount: staleWriterMs } }
+                    ]
+                }
+            }, { session, sort: { updated_at: 1 }, limit })
+                .toArray();
+            if (staleDocuments.length === 0) {
+                return;
+            }
+            const deltas = new Map();
+            for (const document of staleDocuments) {
+                for (const [definitionId, delta] of Object.entries(document.definitions ?? {})) {
+                    this.validateDefinitionId(definitionId);
+                    deltas.set(definitionId, (deltas.get(definitionId) ?? 0n) + BigInt(delta));
+                }
+            }
+            const increments = {};
+            for (const [definitionId, delta] of deltas) {
+                if (delta !== 0n) {
+                    increments[this.definitionPath(definitionId)] = delta;
+                }
+            }
+            if (Object.keys(increments).length > 0) {
+                await this.db.objectStorageUsage.updateOne({ _id: this.documentId(OBJECT_STORAGE_USAGE_BASE_WRITER_ID) }, {
+                    $inc: increments,
+                    $currentDate: { updated_at: true }
+                }, { upsert: true, session });
+            }
+            await this.db.objectStorageUsage.deleteMany({
+                '_id.g': this.replicationStreamId,
+                _id: { $in: staleDocuments.map((document) => document._id) }
+            }, { session });
+        }, { readConcern: { level: 'snapshot' }, writeConcern: { w: 'majority' } }));
+    }
+    definitionPath(definitionId) {
+        this.validateDefinitionId(definitionId);
+        return `definitions.${definitionId}`;
+    }
+    documentId(writerId = this.writerId) {
+        if (writerId == null) {
+            throw new ReplicationAssertionError('A writer id is required to identify object-storage usage');
+        }
+        return {
+            g: this.replicationStreamId,
+            w: writerId
+        };
+    }
+    validateDefinitionId(definitionId) {
+        if (definitionId.length === 0 || definitionId.includes('.') || definitionId.includes('$')) {
+            throw new ReplicationAssertionError(`Invalid bucket definition id for object-storage usage: ${definitionId}`);
+        }
+    }
+}
+//# sourceMappingURL=ObjectStorageUsage.js.map

package/dist/storage/implementation/v3/object-storage/ObjectStorageUsage.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ObjectStorageUsage.js","sourceRoot":"","sources":["../../../../../src/storage/implementation/v3/object-storage/ObjectStorageUsage.ts"],"names":[],"mappings":"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"}

package/dist/storage/implementation/v3/object-storage/S3ObjectStorage.d.ts

@@ -1,5 +1,29 @@
 import { S3Client } from '@aws-sdk/client-s3';
-import { type ObjectStorage, type ObjectStoragePutMetadata } from './ObjectStorage.js';
+import { type DefaultsMode, type ResolvedDefaultsMode } from '@smithy/core/client';
+import { type ObjectStorage, type ObjectStorageOperationOptions, type ObjectStoragePutMetadata } from './ObjectStorage.js';
+export interface S3TimeoutProfile {
+    /**
+     * Per attempt: establishing the connection, including waiting for a socket from the pool.
+     */
+    connectionTimeoutMs: number;
+    /**
+     * Per attempt: from starting the request until the response headers are received. For uploads
+     * this includes sending the body.
+     */
+    requestTimeoutMs: number;
+    /**
+     * The complete operation, including SDK retries and streaming the response body.
+     *
+     * The SDK timeouts above stop applying once the response headers are received, so this is what
+     * bounds how long a single operation can occupy a concurrency slot.
+     */
+    operationTimeoutMs: number;
+    /**
+     * Waiting for a concurrency slot, before the operation itself starts.
+     */
+    queueTimeoutMs: number;
+}
+export declare function resolveTimeoutProfile(mode: ResolvedDefaultsMode): S3TimeoutProfile;
 export interface S3ObjectStorageOptions {
     bucket: string;
     region?: string;
@@ -9,6 +33,12 @@ export interface S3ObjectStorageOptions {
     accessKeyId?: string;
     secretAccessKey?: string;
     concurrencyLimit?: number;
+    /**
+     * AWS defaults mode, used as the baseline for the request timeouts.
+     *
+     * Defaults to the AWS_DEFAULTS_MODE environment variable. `auto` is treated as `standard`.
+     */
+    defaultsMode?: DefaultsMode;
 }
 export declare class S3ObjectStorage implements ObjectStorage {
     /**
@@ -18,21 +48,16 @@ export declare class S3ObjectStorage implements ObjectStorage {
     private bucket;
     private prefix;
     private readonly operationSemaphore;
+    private readonly timeouts;
     constructor(options: S3ObjectStorageOptions);
-    put(path: string, data: Uint8Array, metadata: ObjectStoragePutMetadata): Promise<void>;
-    get(path: string, options?: {
-        signal?: AbortSignal;
-    }): Promise<{
+    put(path: string, data: Uint8Array, metadata: ObjectStoragePutMetadata, options?: ObjectStorageOperationOptions): Promise<void>;
+    get(path: string, options?: ObjectStorageOperationOptions): Promise<{
         data: Uint8Array;
         metadata: ObjectStoragePutMetadata;
     }>;
-    list(prefix: string, options?: {
-        signal?: AbortSignal;
-    }): AsyncIterable<string>;
-    delete(paths: string[]): Promise<void>;
-    deletePrefix(prefix: string, options?: {
-        signal?: AbortSignal;
-    }): Promise<{
+    list(prefix: string, options?: ObjectStorageOperationOptions): AsyncIterable<string>;
+    delete(paths: string[], options?: ObjectStorageOperationOptions): Promise<void>;
+    deletePrefix(prefix: string, options?: ObjectStorageOperationOptions): Promise<{
         objectCount: number;
     }>;
     private listPage;

package/dist/storage/implementation/v3/object-storage/S3ObjectStorage.js

@@ -1,16 +1,115 @@
 import { DeleteObjectsCommand, GetObjectCommand, ListObjectsV2Command, PutObjectCommand, S3Client } from '@aws-sdk/client-s3';
+import { logger } from '@powersync/lib-services-framework';
 import { acquireSemaphoreAbortable, isAbortError } from '@powersync/service-core';
+import { loadConfigsForDefaultMode } from '@smithy/core/client';
 import { isThrottlingError, isTransientError } from '@smithy/core/retry';
+import { NodeHttpHandler } from '@smithy/node-http-handler';
 import { Semaphore } from 'async-mutex';
 import { ObjectStorageError } from './ObjectStorage.js';
-const DEFAULT_S3_OPERATION_CONCURRENCY = 16;
+// Never statically import (or re-export) this module!
+// We want to avoid loading the AWS SDK unless the user has configured S3 object storage, since it's a large dependency.
+const DEFAULT_S3_OPERATION_CONCURRENCY = 64;
 const S3_DELETE_PREFIX_BATCH_SIZE = 1000;
 /**
- * Slightly smaller than DEFAULT_S3_OPERATION_CONCURRENCY.
+ * Keep prefix deletion below the default shared limit to leave capacity for other operations.
  */
 const S3_DELETE_PREFIX_CONCURRENCY = 12;
 const MAX_S3_PREFIX_BYTES = 256;
 const SAFE_S3_KEY_BYTES = 896;
+/**
+ * Timeouts are derived from the AWS defaults mode, rather than being individually configurable.
+ *
+ * The mode - AWS_DEFAULTS_MODE or the defaults_mode storage option - describes the expected latency
+ * between this service and the object storage endpoint. We use the connection timeout it defines
+ * as the baseline for the other timeouts:
+ *
+ * | mode                   | connection | request | operation | queue |
+ * | ---------------------- | ---------- | ------- | --------- | ----- |
+ * | in-region              |       1.1s |    5.5s |       11s |   44s |
+ * | standard, cross-region |       3.1s |   15.5s |       31s |  124s |
+ * | mobile                 |        30s |    150s |      300s | 1200s |
+ *
+ * The multipliers are sized for the objects we store: bucket data chunks target 1MB, and are
+ * bounded by the 16MB BSON document limit. Even at the upper bound, the request timeout only has to
+ * cover a transfer of a few MB/s, and the operation timeout leaves room for a second attempt.
+ *
+ * `legacy`, the mode used when nothing is configured, does not define any timeouts, and is treated
+ * as `standard` here. Running without timeouts is not an option: a stalled request holds one of the
+ * limited operation slots until the process restarts, and enough of those block all reads.
+ *
+ * `auto` is also treated as `standard` - see resolveConfiguredDefaultsMode() below.
+ */
+const BASELINE_CONNECTION_TIMEOUT_MS = 3_100;
+const REQUEST_TIMEOUT_FACTOR = 5;
+const OPERATION_TIMEOUT_FACTOR = 2;
+/**
+ * Don't keep idle http sockets around for longer than this timeout.
+ *
+ * This covers the case where we have large bursts of activity during replication, followed by
+ * long periods of inactivity.
+ */
+const SOCKET_IDLE_TIMEOUT_MS = 60_000;
+/**
+ * How long an operation may wait for a concurrency slot, as a multiple of the operation timeout.
+ *
+ * Every slot holder now releases within the operation timeout, so the queue always drains: this is
+ * a backpressure limit rather than a deadlock guard. Waiting this long means at least
+ * `factor * concurrencyLimit` operations ahead of us each took their full deadline - 256 at the
+ * default concurrency. Real operations complete in a fraction of the deadline, so the number of
+ * queued operations this actually tolerates is far higher, well above the ~2000 uploads that the
+ * largest possible replication flush (MAX_TRANSACTION_DOC_COUNT) can enqueue at once.
+ */
+const QUEUE_TIMEOUT_FACTOR = 4;
+export function resolveTimeoutProfile(mode) {
+    // Only connectionTimeout is currently vended by the SDK, but requestTimeout is part of the same
+    // contract - use it as the hint if a future version starts defining it.
+    const { connectionTimeout, requestTimeout } = loadConfigsForDefaultMode(mode);
+    const connectionTimeoutMs = connectionTimeout ?? BASELINE_CONNECTION_TIMEOUT_MS;
+    const requestTimeoutMs = requestTimeout ?? connectionTimeoutMs * REQUEST_TIMEOUT_FACTOR;
+    const operationTimeoutMs = requestTimeoutMs * OPERATION_TIMEOUT_FACTOR;
+    return {
+        connectionTimeoutMs,
+        requestTimeoutMs,
+        operationTimeoutMs,
+        queueTimeoutMs: operationTimeoutMs * QUEUE_TIMEOUT_FACTOR
+    };
+}
+const AWS_DEFAULTS_MODE_ENV = 'AWS_DEFAULTS_MODE';
+const RESOLVED_DEFAULTS_MODES = ['standard', 'in-region', 'cross-region', 'mobile', 'legacy'];
+/**
+ * Resolve the configured AWS defaults mode: the explicit option, then the AWS_DEFAULTS_MODE
+ * environment variable, then `legacy`, which is also the AWS default.
+ *
+ * Unlike the SDK's own lookup, this does not read defaults_mode from the AWS shared config file.
+ * That lookup is asynchronous, and the mode is only used to pick timeouts, which we want available
+ * synchronously so that operations never have to wait on configuration.
+ *
+ * `auto` is substituted with `standard`. It asks the SDK to detect whether it is running in the
+ * same region as the endpoint, which means querying the EC2 instance metadata service on startup:
+ *
+ * - The detection only succeeds on EC2-family compute with instance metadata reachable. Anywhere
+ *   else - including EC2 with IMDS disabled or behind a low hop limit - it silently falls back to
+ *   `standard`, so the timeouts differ by deployment with no indication of why.
+ * - It requires a resolvable region, and fails the client outright when there is none.
+ * - Timeouts that depend on where the process happens to run are hard to reason about when
+ *   diagnosing a stall.
+ *
+ * Deployments that want the tighter in-region timeouts should ask for them explicitly.
+ */
+function resolveConfiguredDefaultsMode(configured) {
+    // An empty environment variable is treated as unset, matching the SDK.
+    const mode = (configured || process.env[AWS_DEFAULTS_MODE_ENV] || 'legacy').toLowerCase();
+    if (mode === 'auto') {
+        logger.warn(`Ignoring AWS defaults mode "auto" for object storage, using "standard" instead. ` +
+            `Configure storage.object_storage.defaults_mode to select a mode explicitly.`);
+        return 'standard';
+    }
+    const resolved = RESOLVED_DEFAULTS_MODES.find((candidate) => candidate === mode);
+    if (resolved == null) {
+        throw new Error(`Invalid AWS defaults mode ${JSON.stringify(mode)}, expected one of ${RESOLVED_DEFAULTS_MODES.join(', ')}, auto`);
+    }
+    return resolved;
+}
 export class S3ObjectStorage {
     /**
      * Public for tests only.
@@ -19,6 +118,7 @@ export class S3ObjectStorage {
     bucket;
     prefix;
     operationSemaphore;
+    timeouts;
     constructor(options) {
         const concurrencyLimit = options.concurrencyLimit ?? DEFAULT_S3_OPERATION_CONCURRENCY;
         if (!Number.isInteger(concurrencyLimit) || concurrencyLimit <= 0) {
@@ -37,18 +137,37 @@ export class S3ObjectStorage {
         this.bucket = options.bucket;
         this.prefix = prefix;
         this.operationSemaphore = new Semaphore(concurrencyLimit);
+        // Resolve the mode once, and share it with the client so that its own defaults agree with ours.
+        const defaultsMode = resolveConfiguredDefaultsMode(options.defaultsMode);
+        this.timeouts = resolveTimeoutProfile(defaultsMode);
         this.client = new S3Client({
             region: options.region,
             endpoint: options.endpoint,
             forcePathStyle: options.forcePathStyle,
+            defaultsMode,
+            requestHandler: new NodeHttpHandler({
+                // Match the shared request limit instead of queuing again at the HTTP pool.
+                httpAgent: {
+                    keepAlive: true,
+                    maxSockets: concurrencyLimit,
+                    // The timeout here is a little more general than an "idle timeout", but it does cover the
+                    // case of closing idle sockets after a period of inactivity.
+                    timeout: SOCKET_IDLE_TIMEOUT_MS
+                },
+                httpsAgent: { keepAlive: true, maxSockets: concurrencyLimit, timeout: SOCKET_IDLE_TIMEOUT_MS },
+                connectionTimeout: this.timeouts.connectionTimeoutMs,
+                requestTimeout: this.timeouts.requestTimeoutMs,
+                // Without this, exceeding requestTimeout only logs a warning.
+                throwOnRequestTimeout: true
+            }),
             credentials: options.accessKeyId && options.secretAccessKey
                 ? { accessKeyId: options.accessKeyId, secretAccessKey: options.secretAccessKey }
                 : undefined
         });
     }
-    async put(path, data, metadata) {
+    async put(path, data, metadata, options) {
         const fullPath = this.fullPath(path);
-        await using _ = await this.withOperation();
+        await using operation = await this.withOperation('upload', fullPath, options?.signal);
         try {
             await this.client.send(new PutObjectCommand({
                 Bucket: this.bucket,
@@ -56,16 +175,17 @@ export class S3ObjectStorage {
                 Body: data,
                 ContentType: metadata.contentType,
                 ContentEncoding: metadata.contentEncoding ?? undefined
-            }));
+            }), { abortSignal: operation.signal });
         }
         catch (error) {
-            throw s3OperationError('upload', fullPath, error);
+            throw operation.error(error);
         }
     }
     async get(path, options) {
         const fullPath = this.fullPath(path);
-        const signal = options?.signal;
-        await using _ = await this.withOperation(signal);
+        await using operation = await this.withOperation('download', fullPath, options?.signal);
+        // Includes the operation deadline, which also covers streaming the response body below.
+        const signal = operation.signal;
         try {
             const response = await this.client.send(new GetObjectCommand({
                 Bucket: this.bucket,
@@ -82,7 +202,7 @@ export class S3ObjectStorage {
             let offset = 0;
             const stream = response.Body;
             for await (const chunk of stream) {
-                signal?.throwIfAborted();
+                signal.throwIfAborted();
                 const nextOffset = offset + chunk.byteLength;
                 if (nextOffset > contentLength) {
                     throw new Error(`S3 download ContentLength mismatch for ${fullPath}: expected ${contentLength} bytes, received at least ${nextOffset}`);
@@ -105,7 +225,7 @@ export class S3ObjectStorage {
             if (err.name === 'NoSuchKey' || err.Code === 'NoSuchKey') {
                 throw new ObjectStorageError(`S3 object not found: ${fullPath}`, { cause: err, retryable: false });
             }
-            throw s3OperationError('download', fullPath, err);
+            throw operation.error(err);
         }
     }
     async *list(prefix, options) {
@@ -127,9 +247,9 @@ export class S3ObjectStorage {
             }
         } while (continuationToken != null);
     }
-    async delete(paths) {
+    async delete(paths, options) {
         const fullPaths = paths.map((path) => ({ Key: this.fullPath(path) }));
-        await this.deleteFullPaths(fullPaths);
+        await this.deleteFullPaths(fullPaths, options?.signal);
     }
     async deletePrefix(prefix, options) {
         const fullPrefix = this.fullPath(prefix);
@@ -189,32 +309,34 @@ export class S3ObjectStorage {
         return { objectCount };
     }
     async listPage(fullPrefix, continuationToken, signal) {
+        // Acquired outside the try, matching the other operations: withOperation() already reports its
+        // own failures as ObjectStorageError.
+        await using operation = await this.withOperation('list', fullPrefix, signal);
         try {
-            await using _ = await this.withOperation(signal);
             return await this.client.send(new ListObjectsV2Command({
                 Bucket: this.bucket,
                 Prefix: fullPrefix,
                 ContinuationToken: continuationToken,
                 MaxKeys: S3_DELETE_PREFIX_BATCH_SIZE
-            }), { abortSignal: signal });
+            }), { abortSignal: operation.signal });
         }
         catch (error) {
-            throw s3OperationError('list', fullPrefix, error);
+            throw operation.error(error);
         }
     }
     async deleteFullPaths(fullPaths, signal) {
         if (fullPaths.length === 0)
             return;
-        await using _ = await this.withOperation(signal);
+        await using operation = await this.withOperation('delete', `${fullPaths.length} objects`, signal);
         let response;
         try {
             response = await this.client.send(new DeleteObjectsCommand({
                 Bucket: this.bucket,
                 Delete: { Objects: fullPaths, Quiet: true }
-            }), { abortSignal: signal });
+            }), { abortSignal: operation.signal });
         }
         catch (error) {
-            throw s3OperationError('delete', `${fullPaths.length} objects`, error);
+            throw operation.error(error);
         }
         if (response.Errors?.length) {
             const errors = response.Errors.map((error) => `${error.Key}: ${error.Code}`).join(', ');
@@ -232,25 +354,75 @@ export class S3ObjectStorage {
         }
         return fullPath;
     }
-    async withOperation(signal) {
+    async withOperation(operation, target, signal) {
         signal?.throwIfAborted();
-        const acquired = signal
-            ? await acquireSemaphoreAbortable(this.operationSemaphore, signal)
-            : await this.operationSemaphore.acquire();
+        const { operationTimeoutMs, queueTimeoutMs } = this.timeouts;
+        // Waiting for a slot is bounded even when the caller has no signal of its own, which is the
+        // case for uploads and deletes.
+        const queueDeadline = timeoutSignal(queueTimeoutMs, () => s3TimeoutError(operation, target, `timed out after ${queueTimeoutMs} ms waiting for a concurrency slot`));
+        let acquired;
+        try {
+            acquired = await acquireSemaphoreAbortable(this.operationSemaphore, signal ? AbortSignal.any([signal, queueDeadline.signal]) : queueDeadline.signal);
+        }
+        finally {
+            queueDeadline.cancel();
+        }
         if (acquired === 'aborted') {
-            signal.throwIfAborted();
-            throw new Error('S3 operation aborted while waiting for a concurrency slot');
+            // A caller abort takes precedence: it is a cancellation, not an S3 failure.
+            signal?.throwIfAborted();
+            throw queueDeadline.signal.reason;
         }
         const [, release] = acquired;
         if (signal?.aborted) {
             release();
             signal.throwIfAborted();
         }
+        // This deadline only starts once the operation holds a slot - queueing is covered above.
+        const deadline = timeoutSignal(operationTimeoutMs, () => s3TimeoutError(operation, target, `did not complete within ${operationTimeoutMs} ms`));
+        const operationSignal = signal ? AbortSignal.any([signal, deadline.signal]) : deadline.signal;
         return {
-            [Symbol.asyncDispose]: async () => release()
+            signal: operationSignal,
+            error: (cause) => {
+                // Aborting a request that is already streaming destroys the socket, and the failure
+                // surfaces as a generic "aborted" error that says nothing about the cause. The abort
+                // reason is always the better answer: the caller's reason when the caller stopped us -
+                // callers abort with the error that stopped them, and upstream handling matches on that
+                // type - and an already-classified timeout when the deadline did.
+                if (operationSignal.aborted) {
+                    return operationSignal.reason;
+                }
+                return s3OperationError(operation, target, cause);
+            },
+            [Symbol.asyncDispose]: async () => {
+                deadline.cancel();
+                release();
+            }
         };
     }
 }
+/**
+ * An abort signal that fires after the given timeout, using a timer that does not hold the process
+ * open.
+ *
+ * The reason is what callers see when the timeout fires, so it is the error to report - not a
+ * marker to translate later.
+ */
+function timeoutSignal(timeoutMs, createReason) {
+    const controller = new AbortController();
+    const timer = setTimeout(() => controller.abort(createReason()), timeoutMs);
+    timer.unref();
+    return { signal: controller.signal, cancel: () => clearTimeout(timer) };
+}
+/**
+ * A timeout that the compactor may retry, matching how the AWS SDK classifies its own request
+ * timeouts.
+ */
+function s3TimeoutError(operation, target, message) {
+    return new ObjectStorageError(`S3 ${operation} for ${target} ${message}`, {
+        cause: new DOMException(message, 'TimeoutError'),
+        retryable: true
+    });
+}
 function s3OperationError(operation, target, error) {
     if (error instanceof ObjectStorageError) {
         return error;