@lossless.org/client 2.0.0 → 2.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/nosqldb/classes.persistence.d.ts +21 -1
- package/dist_ts/nosqldb/classes.persistence.js +23 -1
- package/dist_ts/nosqldb/classes.session.d.ts +8 -0
- package/dist_ts/nosqldb/classes.session.js +27 -2
- package/dist_ts/nosqldb/index.d.ts +1 -1
- package/dist_ts/nosqldb/index.js +2 -2
- package/dist_ts/objectstorage/interfaces.d.ts +16 -2
- package/dist_ts/objectstorage/internal.exactupload.operations.js +148 -77
- package/dist_ts/objectstorage/internal.multipart.planner.d.ts +8 -2
- package/dist_ts/objectstorage/internal.multipart.planner.js +30 -1
- package/dist_ts/objectstorage/internal.multipart.stream.js +68 -19
- package/dist_ts/objectstorage/internal.multipart.types.d.ts +32 -3
- package/package.json +1 -1
- package/readme.md +2 -1
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/nosqldb/classes.persistence.ts +30 -1
- package/ts/nosqldb/classes.session.ts +26 -0
- package/ts/nosqldb/index.ts +1 -1
- package/ts/objectstorage/interfaces.ts +16 -2
- package/ts/objectstorage/internal.exactupload.operations.ts +190 -97
- package/ts/objectstorage/internal.multipart.planner.ts +46 -2
- package/ts/objectstorage/internal.multipart.stream.ts +79 -21
- package/ts/objectstorage/internal.multipart.types.ts +35 -2
|
@@ -60,4 +60,33 @@ export const planMultipartUpload = (optionsArg) => {
|
|
|
60
60
|
maximumBufferedBytes: Math.min(optionsArg.objectSize, partSize * concurrency) + Math.min(optionsArg.objectSize, partSize),
|
|
61
61
|
};
|
|
62
62
|
};
|
|
63
|
-
|
|
63
|
+
/**
|
|
64
|
+
* Plans an upload of undeclared length that must not exceed
|
|
65
|
+
* `maxObjectSize`. The part size grows with the maximum so that the largest
|
|
66
|
+
* allowed source still fits into the multipart part limit.
|
|
67
|
+
*/
|
|
68
|
+
export const planBoundedMultipartUpload = (optionsArg) => {
|
|
69
|
+
if (!Number.isSafeInteger(optionsArg.maxObjectSize) || optionsArg.maxObjectSize < 1) {
|
|
70
|
+
throw new TypeError('maxObjectSize must be a positive safe integer.');
|
|
71
|
+
}
|
|
72
|
+
if (optionsArg.maxObjectSize > MULTIPART_MAX_OBJECT_SIZE) {
|
|
73
|
+
throw new RangeError(`maxObjectSize exceeds the ${MULTIPART_MAX_OBJECT_SIZE} byte multipart limit.`);
|
|
74
|
+
}
|
|
75
|
+
const requestedConcurrency = normalizeRequestedConcurrency(optionsArg.requestedConcurrency);
|
|
76
|
+
const preferredPartSize = normalizeRequestedPartSize(optionsArg.requestedPartSize);
|
|
77
|
+
const partSize = Math.max(preferredPartSize, Math.ceil(optionsArg.maxObjectSize / MULTIPART_MAX_PART_COUNT));
|
|
78
|
+
if (partSize > MULTIPART_MAX_PART_SIZE) {
|
|
79
|
+
throw new RangeError('The maximum cannot be represented by legal multipart parts.');
|
|
80
|
+
}
|
|
81
|
+
const maxPartCount = Math.ceil(optionsArg.maxObjectSize / partSize);
|
|
82
|
+
const concurrency = Math.min(requestedConcurrency, maxPartCount);
|
|
83
|
+
return {
|
|
84
|
+
classification: 'bounded',
|
|
85
|
+
maxObjectSize: optionsArg.maxObjectSize,
|
|
86
|
+
partSize,
|
|
87
|
+
maxPartCount,
|
|
88
|
+
concurrency,
|
|
89
|
+
maximumBufferedBytes: Math.min(optionsArg.maxObjectSize, partSize * concurrency) + Math.min(optionsArg.maxObjectSize, partSize),
|
|
90
|
+
};
|
|
91
|
+
};
|
|
92
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50ZXJuYWwubXVsdGlwYXJ0LnBsYW5uZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9vYmplY3RzdG9yYWdlL2ludGVybmFsLm11bHRpcGFydC5wbGFubmVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQU9BLE1BQU0sQ0FBQyxNQUFNLHVCQUF1QixHQUFHLENBQUMsR0FBRyxJQUFJLEdBQUcsSUFBSSxDQUFDO0FBQ3ZELE1BQU0sQ0FBQyxNQUFNLHVCQUF1QixHQUFHLENBQUMsR0FBRyxJQUFJLEdBQUcsSUFBSSxHQUFHLElBQUksQ0FBQztBQUM5RCxNQUFNLENBQUMsTUFBTSx3QkFBd0IsR0FBRyxNQUFNLENBQUM7QUFDL0MsTUFBTSxDQUFDLE1BQU0seUJBQXlCLEdBQUcsQ0FBQyxHQUFHLElBQUksR0FBRyxJQUFJLEdBQUcsSUFBSSxHQUFHLElBQUksQ0FBQztBQUN2RSxNQUFNLENBQUMsTUFBTSw2QkFBNkIsR0FBRyxDQUFDLENBQUM7QUFDL0MsTUFBTSxDQUFDLE1BQU0seUJBQXlCLEdBQUcsRUFBRSxDQUFDO0FBRTVDLE1BQU0sNkJBQTZCLEdBQUcsQ0FBQyxRQUFnQixFQUFFLE9BQWUsRUFBUSxFQUFFO0lBQ2hGLElBQUksQ0FBQyxNQUFNLENBQUMsYUFBYSxDQUFDLFFBQVEsQ0FBQyxJQUFJLFFBQVEsR0FBRyxDQUFDLEVBQUUsQ0FBQztRQUNwRCxNQUFNLElBQUksU0FBUyxDQUFDLEdBQUcsT0FBTyx1Q0FBdUMsQ0FBQyxDQUFDO0lBQ3pFLENBQUM7QUFDSCxDQUFDLENBQUM7QUFFRixNQUFNLDBCQUEwQixHQUFHLENBQUMsb0JBQXdDLEVBQVUsRUFBRTtJQUN0RixJQUFJLG9CQUFvQixLQUFLLFNBQVMsRUFBRSxDQUFDO1FBQ3ZDLE9BQU8sdUJBQXVCLENBQUM7SUFDakMsQ0FBQztJQUNELElBQUksQ0FBQyxNQUFNLENBQUMsYUFBYSxDQUFDLG9CQUFvQixDQUFDLElBQUksb0JBQW9CLElBQUksQ0FBQyxF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
|
|
@@ -6,6 +6,7 @@ const failureMessages = {
|
|
|
6
6
|
'source-empty-chunk-limit': 'The multipart source emitted too many consecutive empty chunks.',
|
|
7
7
|
'source-short': 'The multipart source ended before the declared content length.',
|
|
8
8
|
'source-extra': 'The multipart source exceeded the declared content length.',
|
|
9
|
+
'source-over-maximum': 'The multipart source exceeded the maximum content length.',
|
|
9
10
|
'part-callback': 'A multipart part callback failed.',
|
|
10
11
|
};
|
|
11
12
|
const failureSettlementMaximumTimeoutMs = 30_000;
|
|
@@ -33,16 +34,33 @@ export class MultipartStreamConsumptionError extends Error {
|
|
|
33
34
|
}
|
|
34
35
|
}
|
|
35
36
|
const validatePlan = (planArg) => {
|
|
36
|
-
if (!Number.isSafeInteger(planArg.objectSize) ||
|
|
37
|
-
planArg.objectSize < 0 ||
|
|
38
|
-
planArg.objectSize > MULTIPART_MAX_OBJECT_SIZE) {
|
|
39
|
-
throw new TypeError('plan.objectSize is invalid.');
|
|
40
|
-
}
|
|
41
37
|
if (!Number.isSafeInteger(planArg.concurrency) ||
|
|
42
38
|
planArg.concurrency < 1 ||
|
|
43
39
|
planArg.concurrency > MULTIPART_MAX_CONCURRENCY) {
|
|
44
40
|
throw new TypeError('plan.concurrency is invalid.');
|
|
45
41
|
}
|
|
42
|
+
if (planArg.classification === 'bounded') {
|
|
43
|
+
if (!Number.isSafeInteger(planArg.maxObjectSize) ||
|
|
44
|
+
planArg.maxObjectSize < 1 ||
|
|
45
|
+
planArg.maxObjectSize > MULTIPART_MAX_OBJECT_SIZE ||
|
|
46
|
+
!Number.isSafeInteger(planArg.partSize) ||
|
|
47
|
+
planArg.partSize < MULTIPART_MIN_PART_SIZE ||
|
|
48
|
+
planArg.partSize > MULTIPART_MAX_PART_SIZE ||
|
|
49
|
+
planArg.maxPartCount !== Math.ceil(planArg.maxObjectSize / planArg.partSize) ||
|
|
50
|
+
planArg.maxPartCount > MULTIPART_MAX_PART_COUNT ||
|
|
51
|
+
planArg.concurrency > planArg.maxPartCount ||
|
|
52
|
+
planArg.maximumBufferedBytes !==
|
|
53
|
+
Math.min(planArg.maxObjectSize, planArg.partSize * planArg.concurrency) +
|
|
54
|
+
Math.min(planArg.maxObjectSize, planArg.partSize)) {
|
|
55
|
+
throw new TypeError('The bounded multipart plan is inconsistent.');
|
|
56
|
+
}
|
|
57
|
+
return;
|
|
58
|
+
}
|
|
59
|
+
if (!Number.isSafeInteger(planArg.objectSize) ||
|
|
60
|
+
planArg.objectSize < 0 ||
|
|
61
|
+
planArg.objectSize > MULTIPART_MAX_OBJECT_SIZE) {
|
|
62
|
+
throw new TypeError('plan.objectSize is invalid.');
|
|
63
|
+
}
|
|
46
64
|
if (planArg.classification === 'zero') {
|
|
47
65
|
if (planArg.objectSize !== 0 ||
|
|
48
66
|
planArg.partSize !== 0 ||
|
|
@@ -82,6 +100,14 @@ export const consumeExactMultipartStream = async (optionsArg) => {
|
|
|
82
100
|
failureSettlementTimeoutMs > failureSettlementMaximumTimeoutMs) {
|
|
83
101
|
throw new TypeError(`failureSettlementTimeoutMs must be a positive safe integer no greater than ${failureSettlementMaximumTimeoutMs}.`);
|
|
84
102
|
}
|
|
103
|
+
const plan = optionsArg.plan;
|
|
104
|
+
// A bounded plan reads parts until the source ends and refuses more than
|
|
105
|
+
// its maximum; an exact plan reads exactly the declared length.
|
|
106
|
+
const bounded = plan.classification === 'bounded';
|
|
107
|
+
const sizeLimit = bounded ? plan.maxObjectSize : plan.objectSize;
|
|
108
|
+
const overLimitKind = bounded
|
|
109
|
+
? 'source-over-maximum'
|
|
110
|
+
: 'source-extra';
|
|
85
111
|
const reader = optionsArg.readableStream.getReader();
|
|
86
112
|
const callbackAbortController = new AbortController();
|
|
87
113
|
const inFlightParts = new Map();
|
|
@@ -187,7 +213,7 @@ export const consumeExactMultipartStream = async (optionsArg) => {
|
|
|
187
213
|
return outcome.result;
|
|
188
214
|
}
|
|
189
215
|
};
|
|
190
|
-
const dispatchPart = (dataArg, partNumberArg) => {
|
|
216
|
+
const dispatchPart = (dataArg, partNumberArg, isLastPartArg) => {
|
|
191
217
|
const token = Symbol(`multipart-part-${partNumberArg}`);
|
|
192
218
|
partCallbacksStarted++;
|
|
193
219
|
currentPartBytes = 0;
|
|
@@ -196,8 +222,8 @@ export const consumeExactMultipartStream = async (optionsArg) => {
|
|
|
196
222
|
const outcome = Promise.resolve()
|
|
197
223
|
.then(() => optionsArg.onPart({
|
|
198
224
|
partNumber: partNumberArg,
|
|
199
|
-
byteOffset: (partNumberArg - 1) *
|
|
200
|
-
isLastPart:
|
|
225
|
+
byteOffset: (partNumberArg - 1) * plan.partSize,
|
|
226
|
+
isLastPart: isLastPartArg,
|
|
201
227
|
data: dataArg,
|
|
202
228
|
signal: callbackAbortController.signal,
|
|
203
229
|
}))
|
|
@@ -233,10 +259,14 @@ export const consumeExactMultipartStream = async (optionsArg) => {
|
|
|
233
259
|
try {
|
|
234
260
|
let pendingChunk;
|
|
235
261
|
let pendingChunkOffset = 0;
|
|
236
|
-
for (let partNumber = 1; partNumber <=
|
|
262
|
+
for (let partNumber = 1; bounded ? !sourceClosed : partNumber <= plan.partCount; partNumber++) {
|
|
237
263
|
await waitForCapacity();
|
|
238
|
-
const partByteLength = Math.min(
|
|
239
|
-
|
|
264
|
+
const partByteLength = Math.min(plan.partSize, sizeLimit - (partNumber - 1) * plan.partSize);
|
|
265
|
+
if (partByteLength <= 0) {
|
|
266
|
+
// A bounded source filled its maximum, which ends at or inside the
|
|
267
|
+
// previous part; the trailing read below refuses any further byte.
|
|
268
|
+
break;
|
|
269
|
+
}
|
|
240
270
|
if (inFlightBytes + partByteLength >
|
|
241
271
|
optionsArg.plan.maximumBufferedBytes) {
|
|
242
272
|
throw new Error('The multipart plan cannot honor its buffering bound.');
|
|
@@ -262,6 +292,9 @@ export const consumeExactMultipartStream = async (optionsArg) => {
|
|
|
262
292
|
const readResult = await readWhileObservingCallbacks();
|
|
263
293
|
if (readResult.done) {
|
|
264
294
|
sourceClosed = true;
|
|
295
|
+
if (bounded) {
|
|
296
|
+
break;
|
|
297
|
+
}
|
|
265
298
|
throw {
|
|
266
299
|
kind: 'source-short',
|
|
267
300
|
};
|
|
@@ -276,22 +309,36 @@ export const consumeExactMultipartStream = async (optionsArg) => {
|
|
|
276
309
|
continue;
|
|
277
310
|
}
|
|
278
311
|
observedBytes += readResult.value.byteLength;
|
|
279
|
-
if (observedBytes >
|
|
312
|
+
if (observedBytes > sizeLimit) {
|
|
280
313
|
throw {
|
|
281
|
-
kind:
|
|
314
|
+
kind: overLimitKind,
|
|
282
315
|
};
|
|
283
316
|
}
|
|
284
|
-
if (readResult.value.byteLength >
|
|
317
|
+
if (readResult.value.byteLength > plan.partSize) {
|
|
285
318
|
throw {
|
|
286
319
|
kind: 'source-buffer-limit',
|
|
287
|
-
cause: new RangeError(`Source chunks must not exceed ${
|
|
320
|
+
cause: new RangeError(`Source chunks must not exceed ${plan.partSize} bytes.`),
|
|
288
321
|
};
|
|
289
322
|
}
|
|
290
323
|
pendingChunk = readResult.value;
|
|
291
324
|
pendingChunkBytes = readResult.value.byteLength;
|
|
292
325
|
observeBufferedBytes();
|
|
293
326
|
}
|
|
294
|
-
|
|
327
|
+
if (partOffset === 0) {
|
|
328
|
+
// A bounded source ended at a part boundary.
|
|
329
|
+
currentPartBytes = 0;
|
|
330
|
+
break;
|
|
331
|
+
}
|
|
332
|
+
if (partOffset < partByteLength) {
|
|
333
|
+
// Only a bounded source ends inside a part; its last part keeps the
|
|
334
|
+
// bytes read, as an exact copy.
|
|
335
|
+
dispatchPart(partData.slice(0, partOffset), partNumber, true);
|
|
336
|
+
}
|
|
337
|
+
else {
|
|
338
|
+
dispatchPart(partData, partNumber, bounded
|
|
339
|
+
? sourceClosed || observedBytes === sizeLimit
|
|
340
|
+
: partNumber === plan.partCount);
|
|
341
|
+
}
|
|
295
342
|
}
|
|
296
343
|
while (!sourceClosed) {
|
|
297
344
|
const readResult = await readWhileObservingCallbacks();
|
|
@@ -310,7 +357,7 @@ export const consumeExactMultipartStream = async (optionsArg) => {
|
|
|
310
357
|
}
|
|
311
358
|
observedBytes += readResult.value.byteLength;
|
|
312
359
|
throw {
|
|
313
|
-
kind:
|
|
360
|
+
kind: overLimitKind,
|
|
314
361
|
};
|
|
315
362
|
}
|
|
316
363
|
while (inFlightParts.size > 0) {
|
|
@@ -407,7 +454,9 @@ export const consumeExactMultipartStream = async (optionsArg) => {
|
|
|
407
454
|
completionAuthorized: false,
|
|
408
455
|
kind: failure.kind,
|
|
409
456
|
cause: failure.cause,
|
|
410
|
-
|
|
457
|
+
...(bounded
|
|
458
|
+
? { maxBytes: plan.maxObjectSize }
|
|
459
|
+
: { expectedBytes: plan.objectSize }),
|
|
411
460
|
observedBytes,
|
|
412
461
|
partCallbacksStarted,
|
|
413
462
|
completedPartNumbers: [...completedPartNumbers].sort((leftArg, rightArg) => {
|
|
@@ -437,4 +486,4 @@ export const consumeExactMultipartStream = async (optionsArg) => {
|
|
|
437
486
|
}
|
|
438
487
|
}
|
|
439
488
|
};
|
|
440
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"internal.multipart.stream.js","sourceRoot":"","sources":["../../ts/objectstorage/internal.multipart.stream.ts"],"names":[],"mappings":"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"}
|
|
489
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"internal.multipart.stream.js","sourceRoot":"","sources":["../../ts/objectstorage/internal.multipart.stream.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,11 @@ export interface IMultipartPlanningOptions {
|
|
|
3
3
|
requestedPartSize?: number;
|
|
4
4
|
requestedConcurrency?: number;
|
|
5
5
|
}
|
|
6
|
+
export interface IMultipartBoundedPlanningOptions {
|
|
7
|
+
maxObjectSize: number;
|
|
8
|
+
requestedPartSize?: number;
|
|
9
|
+
requestedConcurrency?: number;
|
|
10
|
+
}
|
|
6
11
|
interface IMultipartUploadPlanBase {
|
|
7
12
|
objectSize: number;
|
|
8
13
|
concurrency: number;
|
|
@@ -20,10 +25,31 @@ export interface IMultipartDataUploadPlan extends IMultipartUploadPlanBase {
|
|
|
20
25
|
partSize: number;
|
|
21
26
|
partCount: number;
|
|
22
27
|
}
|
|
23
|
-
|
|
28
|
+
/**
|
|
29
|
+
* A plan for a source of undeclared length: full parts are read until the
|
|
30
|
+
* source ends, and a source longer than `maxObjectSize` fails. The part size
|
|
31
|
+
* is chosen so that `maxObjectSize` fits into the multipart part limit.
|
|
32
|
+
*/
|
|
33
|
+
export interface IMultipartBoundedUploadPlan {
|
|
34
|
+
classification: 'bounded';
|
|
35
|
+
maxObjectSize: number;
|
|
36
|
+
partSize: number;
|
|
37
|
+
/** Parts that `maxObjectSize` needs; the source may need fewer. */
|
|
38
|
+
maxPartCount: number;
|
|
39
|
+
concurrency: number;
|
|
40
|
+
maximumBufferedBytes: number;
|
|
41
|
+
}
|
|
42
|
+
/** A plan for a source of declared length. */
|
|
43
|
+
export type TMultipartDeclaredUploadPlan = IMultipartZeroUploadPlan | IMultipartDataUploadPlan;
|
|
44
|
+
export type TMultipartUploadPlan = TMultipartDeclaredUploadPlan | IMultipartBoundedUploadPlan;
|
|
24
45
|
export interface IMultipartStreamPart {
|
|
25
46
|
partNumber: number;
|
|
26
47
|
byteOffset: number;
|
|
48
|
+
/**
|
|
49
|
+
* Under a bounded plan a part is only known to be the last when the source
|
|
50
|
+
* ended inside it or it reached the maximum; a source that ends exactly at
|
|
51
|
+
* a part boundary leaves its last part marked false.
|
|
52
|
+
*/
|
|
27
53
|
isLastPart: boolean;
|
|
28
54
|
/**
|
|
29
55
|
* An exact, exclusively owned copy. The consumer never mutates or reuses it.
|
|
@@ -46,7 +72,7 @@ export interface IMultipartStreamConsumptionResult {
|
|
|
46
72
|
peakBufferedBytes: number;
|
|
47
73
|
maximumBufferedBytes: number;
|
|
48
74
|
}
|
|
49
|
-
export type TMultipartStreamFailureKind = 'aborted' | 'source-read' | 'source-buffer-limit' | 'source-empty-chunk-limit' | 'source-short' | 'source-extra' | 'part-callback';
|
|
75
|
+
export type TMultipartStreamFailureKind = 'aborted' | 'source-read' | 'source-buffer-limit' | 'source-empty-chunk-limit' | 'source-short' | 'source-extra' | 'source-over-maximum' | 'part-callback';
|
|
50
76
|
export type TMultipartOwnedReaderCleanup = {
|
|
51
77
|
status: 'closed';
|
|
52
78
|
} | {
|
|
@@ -72,7 +98,10 @@ export interface IMultipartStreamFailureState {
|
|
|
72
98
|
completionAuthorized: false;
|
|
73
99
|
kind: TMultipartStreamFailureKind;
|
|
74
100
|
cause?: unknown;
|
|
75
|
-
|
|
101
|
+
/** The declared length; absent under a bounded plan. */
|
|
102
|
+
expectedBytes?: number;
|
|
103
|
+
/** The maximum length of a bounded plan. */
|
|
104
|
+
maxBytes?: number;
|
|
76
105
|
observedBytes: number;
|
|
77
106
|
partCallbacksStarted: number;
|
|
78
107
|
completedPartNumbers: number[];
|
package/package.json
CHANGED
package/readme.md
CHANGED
|
@@ -113,6 +113,7 @@ Family imports preserve the established SmartData and SmartBucket names and cons
|
|
|
113
113
|
| 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` |
|
|
114
114
|
| Bounded database close | `db.close({ timeoutMs })` bounds the whole close — session cleanup, the optional database removal and the driver client's close — and rejects at its deadline with `SmartdataPersistenceError` code `timeout`, leaving the database `close_failed`; the driver's close keeps running until it settles on its own, and the next `close()` joins it |
|
|
115
115
|
| Transactions ended by close | a `session.withTransaction()` whose session `db.close()` ends while it runs rejects with `SmartdataPersistenceError` code `unsupported_operation` — "nothing was committed" before the commit, "the commit outcome is unknown" during it — instead of resolving with the callback's result |
|
|
116
|
+
| Transaction conflicts | a `session.withTransaction()` whose every attempt the database aborted as transient (a write conflict or another error labelled `TransientTransactionError`) until the driver's 120-second retry window closed rejects with `SmartdataTransactionConflictError` (a `SmartdataPersistenceError` of code `transaction_conflict`) carrying `attempts`, `elapsedMS` and the last attempt's error as `cause`: nothing was committed and the transaction is safe to re-run. With `timeoutMS` it rejects with `timeout` instead. Ordinary model writes that run in their own transaction reject the same way |
|
|
116
117
|
| Transaction commit outcome | `SmartdataSession.getCommitOutcome(error)` states for every value a `session.withTransaction()` rejected with whether the transaction could have committed: `not_committed` (nothing was committed) or `unknown` (a commit was sent and never confirmed); the rejection itself keeps its identity |
|
|
117
118
|
| 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 |
|
|
118
119
|
| Nested array paths | `@svDb({ arrayPaths: [...] })` declares nested arrays below a persisted root; `$push`, `$addToSet` and `$pull` in `atomicUpdate()`, `atomicUpdateMany()`, `atomicFindOneAndUpdate()` and `atomicUpsertMany()` accept them, while undeclared and non-array nested paths stay refused with `invalid_argument` |
|
|
@@ -148,7 +149,7 @@ A bucket lookup sends one HeadBucket for the named bucket, never ListBuckets, so
|
|
|
148
149
|
|
|
149
150
|
`fastGetIfPresent()` answers "read it, or tell me it is gone" with one GetObject, so an object removed between an existence check and a read can no longer turn into a failed read: a provider answer that the key does not exist — `NoSuchKey`, `NotFound` or any other HTTP 404 — resolves `null`. Every other failure rejects as `fastGet()` does, the provider error unchanged: a missing bucket (`NoSuchBucket`), a denied request, a failure while the body streams, and an abort through `signal` or `SmartBucket.close()`, which rejects with the abort reason even when the provider answers not-found after it. `fastExists()` and the create-only check of `fastPutStream()` classify a missing object the same way.
|
|
150
151
|
|
|
151
|
-
Every request of the S3 client a `SmartBucket` builds is bounded. An attempt whose socket does not connect within `connectionTimeoutMs` (default 10 s, at most 60 s), or whose response headers do not arrive within `requestTimeoutMs` of its start (default 60 s, at most 1 h; the upload of the request body counts), fails with the SDK's `TimeoutError`; the SDK retries it up to `maxAttempts` attempts in all (default 3, at most 10, standard retry mode, `AWS_MAX_ATTEMPTS` and shared config files ignored). Each value must be a positive safe integer; anything else is refused with a `TypeError` before a client is built. `smartBucket.requestBounds` (and `connection.requestBounds`) reads the frozen bounds, including `requestDeadlineMs = maxAttempts × requestTimeoutMs + (maxAttempts − 1) × 20 000 ms + 1 000 ms` — the attempts, the longest wait the retry strategy takes before a retry (a provider's retry-after hint included), and a second for the client's own work. 221 000 ms with the defaults. A request still unsettled at that deadline, a stalled error body included, rejects with `ObjectStorageRequestDeadlineError`, its attempt in flight is destroyed and no further attempt of it starts, so a consumer can hold the client to an upper bound of its own (`requestDeadlineMs < bound`). The bound does not undo a request: a PutObject the provider received completely before the deadline or an abort may still take effect. It covers requests, not the time a caller takes to read a download it received: a response body streams at the caller's pace until it is consumed, the caller's signal aborts or the SmartBucket closes. While a client assigned through `storageClient` or `replaceStorageClient()` is in use, `requestBounds` is `undefined` and that client's own configuration applies. A single-request upload (`fastPut`, `fastPutStream`) must finish sending its body within `requestTimeoutMs`;
|
|
152
|
+
Every request of the S3 client a `SmartBucket` builds is bounded. An attempt whose socket does not connect within `connectionTimeoutMs` (default 10 s, at most 60 s), or whose response headers do not arrive within `requestTimeoutMs` of its start (default 60 s, at most 1 h; the upload of the request body counts), fails with the SDK's `TimeoutError`; the SDK retries it up to `maxAttempts` attempts in all (default 3, at most 10, standard retry mode, `AWS_MAX_ATTEMPTS` and shared config files ignored). Each value must be a positive safe integer; anything else is refused with a `TypeError` before a client is built. `smartBucket.requestBounds` (and `connection.requestBounds`) reads the frozen bounds, including `requestDeadlineMs = maxAttempts × requestTimeoutMs + (maxAttempts − 1) × 20 000 ms + 1 000 ms` — the attempts, the longest wait the retry strategy takes before a retry (a provider's retry-after hint included), and a second for the client's own work. 221 000 ms with the defaults. A request still unsettled at that deadline, a stalled error body included, rejects with `ObjectStorageRequestDeadlineError`, its attempt in flight is destroyed and no further attempt of it starts, so a consumer can hold the client to an upper bound of its own (`requestDeadlineMs < bound`). The bound does not undo a request: a PutObject the provider received completely before the deadline or an abort may still take effect. It covers requests, not the time a caller takes to read a download it received: a response body streams at the caller's pace until it is consumed, the caller's signal aborts or the SmartBucket closes. While a client assigned through `storageClient` or `replaceStorageClient()` is in use, `requestBounds` is `undefined` and that client's own configuration applies. A single-request upload (`fastPut`, `fastPutStream`) must finish sending its body within `requestTimeoutMs`; large or slow bodies use `fastPutStreamExact()`, whose parts are separate requests, each bounded on its own (5 MiB unless `requestedPartSize` asks for more or the length needs more than 10,000 parts).
|
|
152
153
|
|
|
153
154
|
A `signal` aborts the request in flight, stops its retries and rejects with the signal's reason; an already aborted signal sends nothing. A signal of a bucket read, write, copy, move, removal, existence check or listing that is not an `AbortSignal`, a `Proxy` of one included, is refused with a `TypeError` before any request. A per-call time limit is a signal as well, `AbortSignal.timeout(ms)` or an own `AbortController`.
|
|
154
155
|
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -7,7 +7,8 @@ export type TSmartdataPersistenceErrorCode =
|
|
|
7
7
|
| 'unique_conflict'
|
|
8
8
|
| 'ambiguous_write'
|
|
9
9
|
| 'unsupported_operation'
|
|
10
|
-
| 'timeout'
|
|
10
|
+
| 'timeout'
|
|
11
|
+
| 'transaction_conflict';
|
|
11
12
|
|
|
12
13
|
/**
|
|
13
14
|
* Stable errors for ordinary SmartData model configuration and persistence.
|
|
@@ -28,6 +29,34 @@ export class SmartdataPersistenceError extends Error {
|
|
|
28
29
|
}
|
|
29
30
|
}
|
|
30
31
|
|
|
32
|
+
/**
|
|
33
|
+
* `session.withTransaction()` gave up because every attempt of the transaction
|
|
34
|
+
* was aborted as transient: a write conflict or another error the database
|
|
35
|
+
* labelled `TransientTransactionError`, through the driver's whole retry
|
|
36
|
+
* window. Nothing was committed, so the transaction is safe to re-run. The
|
|
37
|
+
* last attempt's error is the `cause` and tells which error it was; like every
|
|
38
|
+
* driver error it can contain statement data. A transaction with `timeoutMS`
|
|
39
|
+
* rejects with code `timeout` instead once its deadline expires.
|
|
40
|
+
*/
|
|
41
|
+
export class SmartdataTransactionConflictError extends SmartdataPersistenceError {
|
|
42
|
+
/** How many times the callback ran. */
|
|
43
|
+
public readonly attempts: number;
|
|
44
|
+
/** Milliseconds from the start of `withTransaction()` until it gave up. */
|
|
45
|
+
public readonly elapsedMS: number;
|
|
46
|
+
|
|
47
|
+
constructor(optionsArg: { attempts: number; elapsedMS: number; cause: unknown }) {
|
|
48
|
+
super(
|
|
49
|
+
'transaction_conflict',
|
|
50
|
+
`SmartData transaction gave up after ${optionsArg.attempts} attempts in ${optionsArg.elapsedMS} ms: `
|
|
51
|
+
+ 'every attempt was aborted as transient; nothing was committed.',
|
|
52
|
+
{ cause: optionsArg.cause },
|
|
53
|
+
);
|
|
54
|
+
this.name = 'SmartdataTransactionConflictError';
|
|
55
|
+
this.attempts = optionsArg.attempts;
|
|
56
|
+
this.elapsedMS = optionsArg.elapsedMS;
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
|
|
31
60
|
/**
|
|
32
61
|
* The client-side deadline of a model call or transaction expired. The
|
|
33
62
|
* driver's own `MongoOperationTimeoutError` stays available as `cause` when
|
|
@@ -11,6 +11,7 @@ import {
|
|
|
11
11
|
import { assertDataOptions } from './classes.operationbudget.js';
|
|
12
12
|
import {
|
|
13
13
|
SmartdataPersistenceError,
|
|
14
|
+
SmartdataTransactionConflictError,
|
|
14
15
|
createSmartdataTimeoutError,
|
|
15
16
|
isMongoDeadlineError,
|
|
16
17
|
isMongoTransientTransactionError,
|
|
@@ -355,6 +356,14 @@ export class SmartdataSession {
|
|
|
355
356
|
* committed, afterwards the commit outcome is unknown. The callback's
|
|
356
357
|
* error, if it threw, is the `cause`.
|
|
357
358
|
*
|
|
359
|
+
* The driver re-runs an attempt the database aborted as transient — a
|
|
360
|
+
* write conflict or another error labelled `TransientTransactionError` —
|
|
361
|
+
* until its retry window of 120 seconds closes. When every attempt was
|
|
362
|
+
* aborted that way, the call rejects with `SmartdataTransactionConflictError`
|
|
363
|
+
* (code `transaction_conflict`): nothing was committed and the transaction
|
|
364
|
+
* is safe to re-run. With `timeoutMS` the deadline is the window, and the
|
|
365
|
+
* call rejects with `timeout` instead.
|
|
366
|
+
*
|
|
358
367
|
* Every rejection states whether the transaction could have committed:
|
|
359
368
|
* `SmartdataSession.getCommitOutcome(error)` returns `not_committed` or
|
|
360
369
|
* `unknown` for the value the call rejected with.
|
|
@@ -370,6 +379,9 @@ export class SmartdataSession {
|
|
|
370
379
|
throw rejectTransaction(errorArg, 'not_committed');
|
|
371
380
|
}
|
|
372
381
|
const { binding, timeoutMS, signal } = admitted;
|
|
382
|
+
const startedAt = performance.now();
|
|
383
|
+
/** How many times the driver started the callback. */
|
|
384
|
+
let attempts = 0;
|
|
373
385
|
binding.transactionActive = true;
|
|
374
386
|
binding.transactionTimeoutMS = timeoutMS;
|
|
375
387
|
binding.transactionSignal = signal;
|
|
@@ -385,6 +397,7 @@ export class SmartdataSession {
|
|
|
385
397
|
const runAttempt = async () => {
|
|
386
398
|
// The last attempt's slots end after this one starts, so it bumps others.
|
|
387
399
|
const attemptStartedAt = performance.now();
|
|
400
|
+
attempts++;
|
|
388
401
|
revisionAttempt?.finish(false);
|
|
389
402
|
revisionAttempt = beginSmartdataWriteRevisionAttempt(binding.owner, attemptStartedAt);
|
|
390
403
|
// The driver starts another attempt only once the last one was aborted.
|
|
@@ -511,6 +524,19 @@ export class SmartdataSession {
|
|
|
511
524
|
outcome: commitOutcomeOfTransactionEnd(binding.transactionEnded),
|
|
512
525
|
};
|
|
513
526
|
}
|
|
527
|
+
// The driver re-runs every attempt aborted as transient until its retry
|
|
528
|
+
// window closes, so such an error that still reaches here exhausted it.
|
|
529
|
+
// With `timeoutMS` the driver raises a deadline error in its place.
|
|
530
|
+
if (isMongoTransientTransactionError(errorArg) && !isMongoDeadlineError(errorArg)) {
|
|
531
|
+
return {
|
|
532
|
+
error: new SmartdataTransactionConflictError({
|
|
533
|
+
attempts,
|
|
534
|
+
elapsedMS: Math.round(performance.now() - startedAt),
|
|
535
|
+
cause: errorArg,
|
|
536
|
+
}),
|
|
537
|
+
outcome: 'not_committed',
|
|
538
|
+
};
|
|
539
|
+
}
|
|
514
540
|
if (errorArg === callbackError) {
|
|
515
541
|
return { error: normalizeDeadlineError(errorArg), outcome: 'not_committed' };
|
|
516
542
|
}
|
package/ts/nosqldb/index.ts
CHANGED
|
@@ -48,7 +48,7 @@ export type {
|
|
|
48
48
|
export type {
|
|
49
49
|
ISmartdataQueryPlanOptions, ISmartdataQueryPlan, ISmartdataQueryPlanStage,
|
|
50
50
|
} from './classes.queryplaninspection.js';
|
|
51
|
-
export { SmartdataPersistenceError } from './classes.persistence.js';
|
|
51
|
+
export { SmartdataPersistenceError, SmartdataTransactionConflictError } from './classes.persistence.js';
|
|
52
52
|
export type { TSmartdataPersistenceErrorCode } from './classes.persistence.js';
|
|
53
53
|
export * from './classes.exactpersistence.js';
|
|
54
54
|
export * from './classes.easystore.js';
|
|
@@ -264,7 +264,18 @@ export interface IFastPutStreamExactOptions {
|
|
|
264
264
|
* size (5 MiB by default).
|
|
265
265
|
*/
|
|
266
266
|
readableStream: Readable | ReadableStream<Uint8Array>;
|
|
267
|
-
|
|
267
|
+
/**
|
|
268
|
+
* The exact source length. Exactly one of `contentLength` and
|
|
269
|
+
* `maxContentLength` must be given.
|
|
270
|
+
*/
|
|
271
|
+
contentLength?: number;
|
|
272
|
+
/**
|
|
273
|
+
* The upper bound for a source of undeclared length. The part size grows so
|
|
274
|
+
* that the maximum fits in 10,000 parts, and buffering stays bounded to the
|
|
275
|
+
* planned parts in flight. A source that exceeds the maximum fails the
|
|
276
|
+
* upload, and the multipart upload is aborted instead of completed.
|
|
277
|
+
*/
|
|
278
|
+
maxContentLength?: number;
|
|
268
279
|
nativeMetadata?: Record<string, string>;
|
|
269
280
|
/**
|
|
270
281
|
* Native S3 object properties that must retain their semantic header
|
|
@@ -316,7 +327,10 @@ export type TExactUploadMultipartCleanup =
|
|
|
316
327
|
export interface IExactUploadFailureState {
|
|
317
328
|
phase: TExactUploadFailurePhase;
|
|
318
329
|
destinationPath: string;
|
|
319
|
-
|
|
330
|
+
/** The declared source length, when the upload declared one. */
|
|
331
|
+
expectedContentLength?: number;
|
|
332
|
+
/** The source maximum, when the upload had an undeclared length. */
|
|
333
|
+
maxContentLength?: number;
|
|
320
334
|
/**
|
|
321
335
|
* Whether this operation can prove that it did not publish the destination.
|
|
322
336
|
* A conditional PutObject or CompleteMultipartUpload response can be lost
|