@lossless.org/client 1.6.0 → 1.8.0

package/dist_ts/objectstorage/internal.exactupload.capability.js

@@ -11,10 +11,11 @@ const abortAndDisposeIndependentWork = (activeOperationArg, causeArg) => {
     }
     activeOperationArg.ownedIndependentAborts.clear();
 };
-const getLifecycleRecord = (smartbucketRefArg) => {
+const bucketDetachedMessage = 'The Bucket is not attached to a lifecycle-managed SmartBucket.';
+const getLifecycleRecord = (smartbucketRefArg, detachedMessageArg = bucketDetachedMessage) => {
     const lifecycleRecord = lifecycleRecords.get(smartbucketRefArg);
     if (!lifecycleRecord) {
-        throw new Error('The Bucket is not attached to a lifecycle-managed SmartBucket.');
+        throw new Error(detachedMessageArg);
     }
     return lifecycleRecord;
 };
@@ -68,9 +69,11 @@ export const beginOperationLifecycleClose = (smartbucketRefArg) => {
     }
     lifecycleRecord.state = 'closing';
     lifecycleRecord.generation++;
-    const lifecycleAbortCause = new Error('The SmartBucket lifecycle closed during an object operation.');
+    const lifecycleAbortCauses = new Map();
     const activeSettlements = [];
     for (const activeOperation of lifecycleRecord.activeOperations) {
+        const lifecycleAbortCause = new Error(activeOperation.closedDuringMessage);
+        lifecycleAbortCauses.set(activeOperation, lifecycleAbortCause);
         activeSettlements.push(activeOperation.settlement);
         activeOperation.abortController.abort(lifecycleAbortCause);
     }
@@ -81,7 +84,8 @@ export const beginOperationLifecycleClose = (smartbucketRefArg) => {
     return new Promise((resolveArg) => {
         const settlementDeadline = setTimeout(() => {
             for (const activeOperation of lifecycleRecord.activeOperations) {
-                activeOperation.forceFinish(lifecycleAbortCause);
+                activeOperation.forceFinish(lifecycleAbortCauses.get(activeOperation)
+                    ?? new Error(activeOperation.closedDuringMessage));
             }
             resolveArg();
         }, operationCloseSettlementTimeoutMs);
@@ -99,20 +103,32 @@ export const completeOperationLifecycleClose = (smartbucketRefArg) => {
     }
     lifecycleRecords.delete(smartbucketRefArg);
 };
-const assertBindingCurrent = (bindingArg) => {
-    const lifecycleRecord = getLifecycleRecord(bindingArg.smartbucketRef);
+const bucketIdentity = (bindingArg) => ({
+    isCurrent: () => bindingArg.bucketRef.smartbucketRef === bindingArg.smartbucketRef &&
+        bindingArg.bucketRef.name === bindingArg.bucketName,
+    staleMessage: 'The exact upload capability is invalid or stale.',
+    detachedMessage: bucketDetachedMessage,
+    closedDuringMessage: 'The SmartBucket lifecycle closed during an object operation.',
+});
+const accountIdentity = {
+    isCurrent: () => true,
+    staleMessage: 'The bucket request is stale.',
+    detachedMessage: 'The SmartBucket is closed; the bucket request was not sent.',
+    closedDuringMessage: 'The SmartBucket lifecycle closed during a bucket request.',
+};
+const assertBindingCurrent = (bindingArg, identityArg) => {
+    const lifecycleRecord = getLifecycleRecord(bindingArg.smartbucketRef, identityArg.detachedMessage);
     assertOpenLifecycle(lifecycleRecord);
-    if (bindingArg.bucketRef.smartbucketRef !== bindingArg.smartbucketRef ||
-        bindingArg.bucketRef.name !== bindingArg.bucketName ||
+    if (!identityArg.isCurrent() ||
         lifecycleRecord.generation !== bindingArg.lifecycleGeneration ||
         lifecycleRecord.storageClient !== bindingArg.storageClient ||
         bindingArg.smartbucketRef.storageClient !== bindingArg.storageClient) {
-        throw new Error('The exact upload capability is invalid or stale.');
+        throw new Error(identityArg.staleMessage);
     }
 };
-const beginOperation = (bindingArg, callerSignalArg) => {
-    assertBindingCurrent(bindingArg);
-    const lifecycleRecord = getLifecycleRecord(bindingArg.smartbucketRef);
+const beginLifecycleOperation = (bindingArg, identityArg, callerSignalArg) => {
+    assertBindingCurrent(bindingArg, identityArg);
+    const lifecycleRecord = getLifecycleRecord(bindingArg.smartbucketRef, identityArg.detachedMessage);
     const operationAbortController = new AbortController();
     let settleOperation;
     const operationSettlement = new Promise((resolveArg) => {
@@ -143,6 +159,7 @@ const beginOperation = (bindingArg, callerSignalArg) => {
     };
     const activeOperation = {
         abortController: operationAbortController,
+        closedDuringMessage: identityArg.closedDuringMessage,
         ownedIndependentAborts: new Set(),
         settlement: operationSettlement,
         settle: settleOperation,
@@ -163,7 +180,6 @@ const beginOperation = (bindingArg, callerSignalArg) => {
         abortForCaller();
     }
     return {
-        bucketName: bindingArg.bucketName,
         client: bindingArg.storageClient,
         signal: operationAbortController.signal,
         registerOwnedIndependentAbort(abortControllerArg, disposeArg) {
@@ -185,8 +201,7 @@ const beginOperation = (bindingArg, callerSignalArg) => {
         assertLifecycleCurrent() {
             if (lifecycleRecord.state === 'closed' ||
                 !lifecycleRecord.activeOperations.has(activeOperation) ||
-                bindingArg.bucketRef.smartbucketRef !== bindingArg.smartbucketRef ||
-                bindingArg.bucketRef.name !== bindingArg.bucketName ||
+                !identityArg.isCurrent() ||
                 lifecycleRecord.storageClient !== bindingArg.storageClient ||
                 bindingArg.smartbucketRef.storageClient !== bindingArg.storageClient) {
                 throw new Error('The object operation lifecycle or storage client is stale.');
@@ -196,7 +211,7 @@ const beginOperation = (bindingArg, callerSignalArg) => {
             if (operationAbortController.signal.aborted) {
                 throw operationAbortController.signal.reason;
             }
-            assertBindingCurrent(bindingArg);
+            assertBindingCurrent(bindingArg, identityArg);
         },
         runProvider(sendArg, optionsArg = {}) {
             this.assertCurrent();
@@ -289,6 +304,20 @@ const beginOperation = (bindingArg, callerSignalArg) => {
         },
     };
 };
+const beginOperation = (bindingArg, callerSignalArg) => Object.assign(beginLifecycleOperation(bindingArg, bucketIdentity(bindingArg), callerSignalArg), { bucketName: bindingArg.bucketName });
+/**
+ * Begins an account-scoped request under the SmartBucket lifecycle: the
+ * caller's signal and `SmartBucket.close()` both abort it, close waits for it,
+ * and the storage client cannot change while it is active.
+ */
+export const beginAccountOperation = (smartbucketRefArg, callerSignalArg) => {
+    const lifecycleRecord = getLifecycleRecord(smartbucketRefArg, accountIdentity.detachedMessage);
+    return beginLifecycleOperation({
+        smartbucketRef: smartbucketRefArg,
+        storageClient: lifecycleRecord.storageClient,
+        lifecycleGeneration: lifecycleRecord.generation,
+    }, accountIdentity, callerSignalArg);
+};
 export const beginBasicBucketOperation = (bucketRefArg, callerSignalArg) => {
     const smartbucketRef = bucketRefArg.smartbucketRef;
     const lifecycleRecord = getLifecycleRecord(smartbucketRef);
@@ -379,4 +408,4 @@ export const beginExactPathPurgeCapabilityOperation = (bucketRefArg, capabilityA
         versioningMode: binding.versioningMode,
     };
 };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"internal.exactupload.capability.js","sourceRoot":"","sources":["../../ts/objectstorage/internal.exactupload.capability.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"internal.exactupload.capability.js","sourceRoot":"","sources":["../../ts/objectstorage/internal.exactupload.capability.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lossless.org/client",
-  "version": "1.6.0",
+  "version": "1.8.0",
   "private": false,
   "description": "One typed client for NoSQLDB, MongoDB, SQLDB, MariaDB, ClickHouse and S3 object storage.",
   "exports": {
@@ -86,10 +86,10 @@
     "@git.zone/tstest": "6.3.0",
     "@lossless.org/nosqldb": "8.0.2",
     "@lossless.org/nosqldb-qualified": "npm:@lossless.org/nosqldb@10.6.0",
-    "@lossless.org/objectstorage": "10.1.0",
+    "@lossless.org/objectstorage": "10.3.1",
     "@lossless.org/sqldb": "0.2.3",
     "@push.rocks/qenv": "^6.1.3",
-    "@types/node": "26.6.1",
+    "@types/node": "26.6.2",
     "mariadb": "3.5.4",
     "mongodb-memory-server": "11.1.0"
   },

package/readme.md

@@ -102,9 +102,20 @@ Family imports preserve the established SmartData and SmartBucket names and cons
 | Migration-owned indexes | `toleratedIndexNames` on the model — named undeclared indexes are observed, never created, dropped or verified, and no longer make the topology divergent |
 | Partial index filters in inspection | `inspectNamespace()`, `inspectCollectionTopology()` and `getIndexInfo()` report a partial index's `partialFilterExpression` exactly as the backend lists it, as a frozen snapshot present only on a partial index |
 | Key-value store readiness | `EasyStore.ensureInitialized()` — installs the store's declared index at startup, outside any transaction window, so a first `readKey()`/`writeKey()` needs no index DDL |
+| Client deadlines | `timeoutMS` (1..120000) on every ordinary model read and write, instance `save()`/`saveIf()`/`delete()` included, on every exact call, and `session.withTransaction(callback, { timeoutMS })` for a whole transaction, retries and commit included; expiry rejects with `SmartdataPersistenceError` code `timeout`, and an exact write interrupted in flight with `ambiguous_write` |
+| Cancellation | `signal` on every exact call, `atomicDeleteMany()` and `session.withTransaction(callback, { signal })`, which interrupts the session's operation in flight, rolls the attempt back and never commits after an abort |
 
 `docs/source/smartdata/readme.md` documents each one with its refusals.
 
+| `@lossless.org/client/objectstorage` addition | API |
+| --- | --- |
+| Listing with size and ETag | `bucket.listObjectEntriesPage({ prefix?, limit, startAfter?, signal? })` — one keyset page of `{ key, size, etag, lastModified? }`; `bucket.listAllObjectEntries(prefix?, { pageSize?, signal? })` iterates every page |
+| Bucket lookup for bucket-scoped credentials | `smartBucket.getBucketByName(name, { signal? })` and `smartBucket.bucketExists(name, { signal? })` send one HeadBucket; `createBucket(name, { signal? })` and `removeBucket(name, { signal? })` take the same options |
+
+A bucket lookup sends one HeadBucket for the named bucket, never ListBuckets, so a credential scoped to its bucket can open it without the account-wide list permission, and a lookup does not depend on which buckets a listing returns. A missing bucket (404) keeps its answer: `getBucketByName()` rejects with `Bucket '<name>' not found.` and `bucketExists()` resolves `false`. A bucket the credentials may not access (403) rejects both with an error that names the denial and keeps the provider error as `cause`; S3 does not say whether such a bucket exists. Any other provider failure is rethrown unchanged. `signal` aborts the in-flight request and rejects with the signal's reason. Lookups, creations and removals run as lifecycle-managed operations: `SmartBucket.close()` aborts and awaits them, and the storage client cannot be replaced while one is active.
+
+`listObjectEntriesPage()` pages exactly like `listObjectKeysPage()`: `limit` is 1 to 1000, `startAfter` must be a non-empty key under the prefix, entries arrive in strict UTF-8 byte order after it, and `nextStartAfter` is present only while the provider reports more. Keyset pages stay valid when earlier keys are deleted between requests. Every field comes from the one ListObjectsV2 response, so no HEAD is sent per object. `size` is the listed `Size`, the byte length HEAD reports as `ContentLength`. `etag` is the listed `ETag` with its surrounding double quotes removed; HEAD returns the same entity tag, quoted. An entity tag identifies an object version and is not a content digest: AWS S3 derives it from the content MD5 only for single-part uploads without SSE-KMS or SSE-C, and a multipart tag ends in `-<parts>`. `lastModified` is present when the provider sends `LastModified`. Both values describe the object when the page was listed. A page with a missing or non-integer size, a missing or malformed ETag, or any key-page violation is refused rather than returned partially. `signal` aborts the in-flight request and rejects with the signal's reason; the iterator issues one request per page and none while the caller holds an entry, so breaking out ends the listing.
+
 ### Document APIs that need a MongoDB backend
 
 The document model runs on both NoSQLDB and MongoDB, but four APIs do not mean the same thing on both. The NoSQLDB engine is qualified at 8.0.2 and 10.6.0 (see [Verification](#verification)); the two releases part on the grouped-totals and guarded-`$expr` rows below — 10.6.0 groups composite keys exactly and evaluates the guard, 8.0.2 does neither — and on whether a migration can create a partial index at all.
@@ -165,7 +176,7 @@ New SQL methods accept `signal` and a total `timeoutMs` (30 seconds by default,
 
 `LosslessClientError` provides a safe outer message, a code, optional `backendCode`, `retryability`, `outcome` and acknowledged-row evidence. `cause` preserves the original error and can contain statement values; do not log it indiscriminately. The taxonomy includes invalid arguments, unsupported capability, a missing optional driver, authentication, conflict, timeout, cancellation, result limits, backend failure, partial writes and unknown write outcomes. There are no automatic write retries. A transient hint never establishes that retrying an ambiguous write is safe.
 
-Migrated document and object APIs retain their existing typed errors and exact-operation evidence. Their established per-operation timeout/ownership contracts continue to apply. `capabilities` distinguishes `available`, `unsupported` and `unknown`; MongoDB transaction/change-stream availability still depends on deployment topology. NoSQLDB change streams are explicitly unsupported. `capabilities.compositeGrouping` is the one member with its own vocabulary — `exact` or `unsupported` — and states whether two-field grouped totals are evaluated exactly; MongoDB and NoSQLDB 10.5.0 and newer are `exact`, every earlier or unidentified engine and every relational or object connection is `unsupported`. On a plain `SmartdataDb` the whole statement is `undefined` until `init()` identifies the engine, and an absent statement means "not available". S3 exact-operation capability tests remain explicit and require owned disposable resources.
+Migrated document and object APIs retain their existing typed errors and exact-operation evidence. Their established per-operation timeout/ownership contracts continue to apply. Ordinary document calls and every exact call take a client-side `timeoutMS` that the driver enforces from server selection to the last reply, and `session.withTransaction(callback, { timeoutMS })` bounds a whole transaction; an expired deadline rejects with `SmartdataPersistenceError` code `timeout`, and a write or commit that expired has an unknown outcome, which an exact write reports as `ambiguous_write`. The same exact calls, `atomicDeleteMany()` and `withTransaction()` take an `AbortSignal`; an aborted transaction is rolled back and never committed, while a commit already in flight runs to its own outcome. `docs/source/smartdata/readme.md` describes both, including the two driver cleanups that run on a fresh deadline of the same length after the deadline expired — the closing abort of a transaction whose callback stalled, and the `killCursors` after a stalled `getMore` of a read that needs more than one batch — so either settles within about twice `timeoutMS`. `capabilities` distinguishes `available`, `unsupported` and `unknown`; MongoDB transaction/change-stream availability still depends on deployment topology. NoSQLDB change streams are explicitly unsupported. `capabilities.compositeGrouping` is the one member with its own vocabulary — `exact` or `unsupported` — and states whether two-field grouped totals are evaluated exactly; MongoDB and NoSQLDB 10.5.0 and newer are `exact`, every earlier or unidentified engine and every relational or object connection is `unsupported`. On a plain `SmartdataDb` the whole statement is `undefined` until `init()` identifies the engine, and an absent statement means "not available". S3 exact-operation capability tests remain explicit and require owned disposable resources.
 
 ## Migrating existing applications
 
@@ -202,7 +213,7 @@ Qualified engines:
 | --- | --- |
 | NoSQLDB engine | **8.0.2 and 10.6.0** — the same `test/nosqldb/smartdb/` suite runs against both, through the single engine seam in `test/nosqldb/helpers/smartdb.ts`; `NOSQLDB_ENGINE=qualified` selects 10.6.0 |
 | MongoDB | 8.0.26 replica sets |
-| ObjectStorage | 10.1.0 |
+| ObjectStorage | 10.3.1 |
 | SQLDB | 0.2.3 |
 | MariaDB | 11.8 |
 | ClickHouse | 25.8 |

package/ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@lossless.org/client',
-  version: '1.6.0',
+  version: '1.8.0',
   description: 'One typed client for NoSQLDB, MongoDB, SQLDB, MariaDB, ClickHouse and S3 object storage.'
 }

package/ts/nosqldb/classes.atomicdelete.ts

@@ -27,14 +27,15 @@ export const executeAtomicDelete = async <T>(
       ordinaryWrite: true,
       prepared: collectionArg.isInitializedForCurrentDatabase(),
       collectionName: collectionArg.collectionName,
+      timeoutMS: optsArg?.timeoutMS,
     },
-    async (rawSessionArg) => {
-      await collectionArg.init();
+    async (rawSessionArg, deadlineArg) => {
+      await deadlineArg.join(collectionArg.init());
       return collectionArg.mongoDbCollection.deleteOne(
         filterArg,
         {
           session: rawSessionArg,
-          timeoutMS: optsArg?.timeoutMS,
+          ...deadlineArg.commandOptions(),
         },
       );
     },
@@ -55,6 +56,7 @@ export const executeAtomicDeleteMany = async <T>(
   optsArg?: {
     session?: TSmartdataOrdinarySession;
     timeoutMS?: number;
+    signal?: AbortSignal;
   },
 ): Promise<plugins.mongodb.DeleteResult> => {
   return runWithOrdinarySmartdataSession(
@@ -64,14 +66,16 @@ export const executeAtomicDeleteMany = async <T>(
       ordinaryWrite: true,
       prepared: collectionArg.isInitializedForCurrentDatabase(),
       collectionName: collectionArg.collectionName,
+      timeoutMS: optsArg?.timeoutMS,
+      signal: optsArg?.signal,
     },
-    async (rawSessionArg) => {
-      await collectionArg.init();
+    async (rawSessionArg, deadlineArg) => {
+      await deadlineArg.join(collectionArg.init());
       return collectionArg.mongoDbCollection.deleteMany(
         filterArg,
         {
           session: rawSessionArg,
-          timeoutMS: optsArg?.timeoutMS,
+          ...deadlineArg.commandOptions(),
         },
       );
     },

package/ts/nosqldb/classes.atomicfindoneandupdate.ts

@@ -95,6 +95,7 @@ export const executeAtomicFindOneAndUpdate = async <T>(
     upsert: boolean;
     sort?: Record<string, 1 | -1>;
     session?: TSmartdataOrdinarySession;
+    timeoutMS?: number;
   },
 ): Promise<TAtomicFindOneAndUpdateExecutionResult> => {
   const policy = collectionArg.getBoundModelSchema()?.ordinaryPersistence;
@@ -109,13 +110,14 @@ export const executeAtomicFindOneAndUpdate = async <T>(
       ordinaryWrite: true,
       prepared: collectionArg.isInitializedForCurrentDatabase(),
       collectionName: collectionArg.collectionName,
+      timeoutMS: optionsArg.timeoutMS,
     },
-    async (rawSessionArg) => {
+    async (rawSessionArg, deadlineArg) => {
       if (policy && !rawSessionArg?.inTransaction()) {
         throw new SmartdataPersistenceError('unsupported_operation',
           'Validated ordinary updates require an active owned transaction.');
       }
-      await collectionArg.init();
+      await deadlineArg.join(collectionArg.init());
       try {
         const result = await collectionArg.mongoDbCollection.findOneAndUpdate(
           filterArg,
@@ -126,6 +128,7 @@ export const executeAtomicFindOneAndUpdate = async <T>(
             upsert: optionsArg.upsert,
             ...(optionsArg.sort ? { sort: optionsArg.sort } : {}),
             session: rawSessionArg,
+            ...deadlineArg.commandOptions(),
           },
         );
         try {
@@ -170,6 +173,7 @@ export const executeAtomicFindOneAndReplace = async <T>(
   optionsArg: {
     returnDocument: 'before' | 'after';
     session?: TSmartdataOrdinarySession;
+    timeoutMS?: number;
   },
 ): Promise<TAtomicFindOneAndReplaceExecutionResult> => {
   if (collectionArg.getBoundModelSchema()?.ordinaryPersistence) {
@@ -185,9 +189,10 @@ export const executeAtomicFindOneAndReplace = async <T>(
       ordinaryWrite: true,
       prepared: collectionArg.isInitializedForCurrentDatabase(),
       collectionName: collectionArg.collectionName,
+      timeoutMS: optionsArg.timeoutMS,
     },
-    async (rawSessionArg) => {
-      await collectionArg.init();
+    async (rawSessionArg, deadlineArg) => {
+      await deadlineArg.join(collectionArg.init());
       try {
         const result = await collectionArg.mongoDbCollection.findOneAndReplace(
           filterArg,
@@ -197,6 +202,7 @@ export const executeAtomicFindOneAndReplace = async <T>(
             returnDocument: optionsArg.returnDocument,
             upsert: false,
             session: rawSessionArg,
+            ...deadlineArg.commandOptions(),
           },
         );
         const classified = classifyResult(result, {

package/ts/nosqldb/classes.atomicupdate.ts

@@ -20,6 +20,7 @@ export const executeAtomicUpdate = async <T>(
   optsArg?: {
     upsert?: boolean;
     session?: TSmartdataOrdinarySession;
+    timeoutMS?: number;
   },
 ): Promise<plugins.mongodb.UpdateResult> => {
   return runWithOrdinarySmartdataSession(
@@ -29,9 +30,10 @@ export const executeAtomicUpdate = async <T>(
       ordinaryWrite: true,
       prepared: collectionArg.isInitializedForCurrentDatabase(),
       collectionName: collectionArg.collectionName,
+      timeoutMS: optsArg?.timeoutMS,
     },
-    async (rawSessionArg) => {
-      await collectionArg.init();
+    async (rawSessionArg, deadlineArg) => {
+      await deadlineArg.join(collectionArg.init());
       try {
         return await collectionArg.mongoDbCollection.updateOne(
           filterArg,
@@ -39,6 +41,7 @@ export const executeAtomicUpdate = async <T>(
           {
             upsert: optsArg?.upsert === true,
             session: rawSessionArg,
+            ...deadlineArg.commandOptions(),
           },
         );
       } catch (errorArg) {
@@ -83,9 +86,10 @@ export const executeAtomicUpsertMany = async <T>(
       ordinaryWrite: true,
       prepared: collectionArg.isInitializedForCurrentDatabase(),
       collectionName: collectionArg.collectionName,
+      timeoutMS: optsArg?.timeoutMS,
     },
-    async (rawSessionArg) => {
-      await collectionArg.init();
+    async (rawSessionArg, deadlineArg) => {
+      await deadlineArg.join(collectionArg.init());
       try {
         const result = await collectionArg.mongoDbCollection.bulkWrite(
           operationsArg.map((operationArg) => ({
@@ -98,7 +102,7 @@ export const executeAtomicUpsertMany = async <T>(
           {
             ordered: false,
             session: rawSessionArg,
-            timeoutMS: optsArg?.timeoutMS,
+            ...deadlineArg.commandOptions(),
           },
         );
         return {
@@ -132,6 +136,7 @@ export const executeAtomicUpdateMany = async <T>(
   updateArg: plugins.mongodb.UpdateFilter<plugins.mongodb.Document>,
   optsArg?: {
     session?: TSmartdataOrdinarySession;
+    timeoutMS?: number;
   },
 ): Promise<plugins.mongodb.UpdateResult> => {
   return runWithOrdinarySmartdataSession(
@@ -141,15 +146,17 @@ export const executeAtomicUpdateMany = async <T>(
       ordinaryWrite: true,
       prepared: collectionArg.isInitializedForCurrentDatabase(),
       collectionName: collectionArg.collectionName,
+      timeoutMS: optsArg?.timeoutMS,
     },
-    async (rawSessionArg) => {
-      await collectionArg.init();
+    async (rawSessionArg, deadlineArg) => {
+      await deadlineArg.join(collectionArg.init());
       try {
         return await collectionArg.mongoDbCollection.updateMany(
           filterArg,
           updateArg,
           {
             session: rawSessionArg,
+            ...deadlineArg.commandOptions(),
           },
         );
       } catch (errorArg) {