@scalemule/sdk 0.0.18 → 0.0.19
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/index.d.mts +2 -0
- package/dist/index.d.ts +2 -0
- package/dist/index.js +44 -13
- package/dist/index.mjs +44 -13
- package/package.json +1 -1
package/dist/index.d.mts
CHANGED
|
@@ -1319,6 +1319,8 @@ interface S3MultipartOptions {
|
|
|
1319
1319
|
concurrency?: number;
|
|
1320
1320
|
/** Max retries per part (default: 3) */
|
|
1321
1321
|
maxRetries?: number;
|
|
1322
|
+
/** Stall timeout in ms — retry part if no progress for this long (default: none) */
|
|
1323
|
+
stallTimeoutMs?: number;
|
|
1322
1324
|
}
|
|
1323
1325
|
interface PartResult {
|
|
1324
1326
|
partNumber: number;
|
package/dist/index.d.ts
CHANGED
|
@@ -1319,6 +1319,8 @@ interface S3MultipartOptions {
|
|
|
1319
1319
|
concurrency?: number;
|
|
1320
1320
|
/** Max retries per part (default: 3) */
|
|
1321
1321
|
maxRetries?: number;
|
|
1322
|
+
/** Stall timeout in ms — retry part if no progress for this long (default: none) */
|
|
1323
|
+
stallTimeoutMs?: number;
|
|
1322
1324
|
}
|
|
1323
1325
|
interface PartResult {
|
|
1324
1326
|
partNumber: number;
|
package/dist/index.js
CHANGED
|
@@ -3019,6 +3019,7 @@ async function uploadMultipartToS3(file, config, options) {
|
|
|
3019
3019
|
const { partSizeBytes, totalParts, partUrls: initialPartUrls, fetchMoreUrls } = config;
|
|
3020
3020
|
const concurrency = options?.concurrency ?? DEFAULT_CONCURRENCY;
|
|
3021
3021
|
const maxRetries = options?.maxRetries ?? 3;
|
|
3022
|
+
const stallTimeoutMs = options?.stallTimeoutMs;
|
|
3022
3023
|
const completedParts = [];
|
|
3023
3024
|
const availableUrls = /* @__PURE__ */ new Map();
|
|
3024
3025
|
for (const pu of initialPartUrls) {
|
|
@@ -3047,12 +3048,19 @@ async function uploadMultipartToS3(file, config, options) {
|
|
|
3047
3048
|
const start = (partNum - 1) * partSizeBytes;
|
|
3048
3049
|
const end = Math.min(start + partSizeBytes, file.size);
|
|
3049
3050
|
const blob = file.slice(start, end);
|
|
3050
|
-
let result = await uploadPartWithRetry(url, blob, partNum, maxRetries, options?.signal);
|
|
3051
|
+
let result = await uploadPartWithRetry(url, blob, partNum, maxRetries, options?.signal, stallTimeoutMs);
|
|
3051
3052
|
if (!result && fetchMoreUrls) {
|
|
3052
3053
|
const freshUrls = await fetchMoreUrls([partNum]);
|
|
3053
3054
|
if (freshUrls?.[0]) {
|
|
3054
3055
|
availableUrls.set(partNum, freshUrls[0].url);
|
|
3055
|
-
result = await uploadPartWithRetry(
|
|
3056
|
+
result = await uploadPartWithRetry(
|
|
3057
|
+
freshUrls[0].url,
|
|
3058
|
+
blob,
|
|
3059
|
+
partNum,
|
|
3060
|
+
maxRetries,
|
|
3061
|
+
options?.signal,
|
|
3062
|
+
stallTimeoutMs
|
|
3063
|
+
);
|
|
3056
3064
|
}
|
|
3057
3065
|
}
|
|
3058
3066
|
if (result) {
|
|
@@ -3079,49 +3087,72 @@ async function uploadMultipartToS3(file, config, options) {
|
|
|
3079
3087
|
parts: completedParts.sort((a, b) => a.partNumber - b.partNumber)
|
|
3080
3088
|
};
|
|
3081
3089
|
}
|
|
3082
|
-
async function uploadPartWithRetry(url, blob, _partNumber, maxRetries, signal) {
|
|
3090
|
+
async function uploadPartWithRetry(url, blob, _partNumber, maxRetries, signal, stallTimeoutMs) {
|
|
3083
3091
|
const retryDelays = DEFAULT_RETRY_DELAYS.slice(0, maxRetries);
|
|
3084
3092
|
for (let attempt = 0; attempt < retryDelays.length; attempt++) {
|
|
3085
3093
|
if (attempt > 0) await sleep3(retryDelays[attempt] || 1e3);
|
|
3086
3094
|
if (signal?.aborted) return null;
|
|
3087
|
-
const result = await doPartPut(url, blob, signal);
|
|
3095
|
+
const result = await doPartPut(url, blob, signal, stallTimeoutMs);
|
|
3088
3096
|
if (result === "abort") return null;
|
|
3089
3097
|
if (typeof result === "object") return result;
|
|
3090
3098
|
}
|
|
3091
3099
|
return null;
|
|
3092
3100
|
}
|
|
3093
|
-
function doPartPut(url, blob, signal) {
|
|
3101
|
+
function doPartPut(url, blob, signal, stallTimeoutMs) {
|
|
3094
3102
|
return new Promise((resolve) => {
|
|
3095
3103
|
const xhr = new XMLHttpRequest();
|
|
3104
|
+
let stallTimer = null;
|
|
3105
|
+
let resolved = false;
|
|
3106
|
+
const settle = (result) => {
|
|
3107
|
+
if (resolved) return;
|
|
3108
|
+
resolved = true;
|
|
3109
|
+
if (stallTimer) clearTimeout(stallTimer);
|
|
3110
|
+
resolve(result);
|
|
3111
|
+
};
|
|
3112
|
+
const resetStallTimer = () => {
|
|
3113
|
+
if (stallTimer) clearTimeout(stallTimer);
|
|
3114
|
+
if (stallTimeoutMs) {
|
|
3115
|
+
stallTimer = setTimeout(() => {
|
|
3116
|
+
xhr.abort();
|
|
3117
|
+
settle("retry");
|
|
3118
|
+
}, stallTimeoutMs);
|
|
3119
|
+
}
|
|
3120
|
+
};
|
|
3121
|
+
xhr.upload.addEventListener("progress", () => {
|
|
3122
|
+
resetStallTimer();
|
|
3123
|
+
});
|
|
3096
3124
|
xhr.addEventListener("load", () => {
|
|
3097
3125
|
if (xhr.status >= 200 && xhr.status < 300) {
|
|
3098
3126
|
const etag = xhr.getResponseHeader("etag");
|
|
3099
3127
|
if (etag) {
|
|
3100
|
-
|
|
3128
|
+
settle({ etag });
|
|
3101
3129
|
} else {
|
|
3102
|
-
|
|
3130
|
+
settle("retry");
|
|
3103
3131
|
}
|
|
3104
3132
|
} else if (xhr.status === 403) {
|
|
3105
|
-
|
|
3133
|
+
settle("retry");
|
|
3106
3134
|
} else if (xhr.status >= 500) {
|
|
3107
|
-
|
|
3135
|
+
settle("retry");
|
|
3108
3136
|
} else {
|
|
3109
|
-
|
|
3137
|
+
settle("retry");
|
|
3110
3138
|
}
|
|
3111
3139
|
});
|
|
3112
|
-
xhr.addEventListener("error", () =>
|
|
3113
|
-
xhr.addEventListener("abort", () =>
|
|
3140
|
+
xhr.addEventListener("error", () => settle("retry"));
|
|
3141
|
+
xhr.addEventListener("abort", () => {
|
|
3142
|
+
if (!resolved) settle("abort");
|
|
3143
|
+
});
|
|
3114
3144
|
if (signal) {
|
|
3115
3145
|
signal.addEventListener(
|
|
3116
3146
|
"abort",
|
|
3117
3147
|
() => {
|
|
3118
3148
|
xhr.abort();
|
|
3119
|
-
|
|
3149
|
+
settle("abort");
|
|
3120
3150
|
},
|
|
3121
3151
|
{ once: true }
|
|
3122
3152
|
);
|
|
3123
3153
|
}
|
|
3124
3154
|
xhr.open("PUT", url);
|
|
3155
|
+
resetStallTimer();
|
|
3125
3156
|
xhr.send(blob);
|
|
3126
3157
|
});
|
|
3127
3158
|
}
|
package/dist/index.mjs
CHANGED
|
@@ -2663,6 +2663,7 @@ async function uploadMultipartToS3(file, config, options) {
|
|
|
2663
2663
|
const { partSizeBytes, totalParts, partUrls: initialPartUrls, fetchMoreUrls } = config;
|
|
2664
2664
|
const concurrency = options?.concurrency ?? DEFAULT_CONCURRENCY;
|
|
2665
2665
|
const maxRetries = options?.maxRetries ?? 3;
|
|
2666
|
+
const stallTimeoutMs = options?.stallTimeoutMs;
|
|
2666
2667
|
const completedParts = [];
|
|
2667
2668
|
const availableUrls = /* @__PURE__ */ new Map();
|
|
2668
2669
|
for (const pu of initialPartUrls) {
|
|
@@ -2691,12 +2692,19 @@ async function uploadMultipartToS3(file, config, options) {
|
|
|
2691
2692
|
const start = (partNum - 1) * partSizeBytes;
|
|
2692
2693
|
const end = Math.min(start + partSizeBytes, file.size);
|
|
2693
2694
|
const blob = file.slice(start, end);
|
|
2694
|
-
let result = await uploadPartWithRetry(url, blob, partNum, maxRetries, options?.signal);
|
|
2695
|
+
let result = await uploadPartWithRetry(url, blob, partNum, maxRetries, options?.signal, stallTimeoutMs);
|
|
2695
2696
|
if (!result && fetchMoreUrls) {
|
|
2696
2697
|
const freshUrls = await fetchMoreUrls([partNum]);
|
|
2697
2698
|
if (freshUrls?.[0]) {
|
|
2698
2699
|
availableUrls.set(partNum, freshUrls[0].url);
|
|
2699
|
-
result = await uploadPartWithRetry(
|
|
2700
|
+
result = await uploadPartWithRetry(
|
|
2701
|
+
freshUrls[0].url,
|
|
2702
|
+
blob,
|
|
2703
|
+
partNum,
|
|
2704
|
+
maxRetries,
|
|
2705
|
+
options?.signal,
|
|
2706
|
+
stallTimeoutMs
|
|
2707
|
+
);
|
|
2700
2708
|
}
|
|
2701
2709
|
}
|
|
2702
2710
|
if (result) {
|
|
@@ -2723,49 +2731,72 @@ async function uploadMultipartToS3(file, config, options) {
|
|
|
2723
2731
|
parts: completedParts.sort((a, b) => a.partNumber - b.partNumber)
|
|
2724
2732
|
};
|
|
2725
2733
|
}
|
|
2726
|
-
async function uploadPartWithRetry(url, blob, _partNumber, maxRetries, signal) {
|
|
2734
|
+
async function uploadPartWithRetry(url, blob, _partNumber, maxRetries, signal, stallTimeoutMs) {
|
|
2727
2735
|
const retryDelays = DEFAULT_RETRY_DELAYS.slice(0, maxRetries);
|
|
2728
2736
|
for (let attempt = 0; attempt < retryDelays.length; attempt++) {
|
|
2729
2737
|
if (attempt > 0) await sleep3(retryDelays[attempt] || 1e3);
|
|
2730
2738
|
if (signal?.aborted) return null;
|
|
2731
|
-
const result = await doPartPut(url, blob, signal);
|
|
2739
|
+
const result = await doPartPut(url, blob, signal, stallTimeoutMs);
|
|
2732
2740
|
if (result === "abort") return null;
|
|
2733
2741
|
if (typeof result === "object") return result;
|
|
2734
2742
|
}
|
|
2735
2743
|
return null;
|
|
2736
2744
|
}
|
|
2737
|
-
function doPartPut(url, blob, signal) {
|
|
2745
|
+
function doPartPut(url, blob, signal, stallTimeoutMs) {
|
|
2738
2746
|
return new Promise((resolve) => {
|
|
2739
2747
|
const xhr = new XMLHttpRequest();
|
|
2748
|
+
let stallTimer = null;
|
|
2749
|
+
let resolved = false;
|
|
2750
|
+
const settle = (result) => {
|
|
2751
|
+
if (resolved) return;
|
|
2752
|
+
resolved = true;
|
|
2753
|
+
if (stallTimer) clearTimeout(stallTimer);
|
|
2754
|
+
resolve(result);
|
|
2755
|
+
};
|
|
2756
|
+
const resetStallTimer = () => {
|
|
2757
|
+
if (stallTimer) clearTimeout(stallTimer);
|
|
2758
|
+
if (stallTimeoutMs) {
|
|
2759
|
+
stallTimer = setTimeout(() => {
|
|
2760
|
+
xhr.abort();
|
|
2761
|
+
settle("retry");
|
|
2762
|
+
}, stallTimeoutMs);
|
|
2763
|
+
}
|
|
2764
|
+
};
|
|
2765
|
+
xhr.upload.addEventListener("progress", () => {
|
|
2766
|
+
resetStallTimer();
|
|
2767
|
+
});
|
|
2740
2768
|
xhr.addEventListener("load", () => {
|
|
2741
2769
|
if (xhr.status >= 200 && xhr.status < 300) {
|
|
2742
2770
|
const etag = xhr.getResponseHeader("etag");
|
|
2743
2771
|
if (etag) {
|
|
2744
|
-
|
|
2772
|
+
settle({ etag });
|
|
2745
2773
|
} else {
|
|
2746
|
-
|
|
2774
|
+
settle("retry");
|
|
2747
2775
|
}
|
|
2748
2776
|
} else if (xhr.status === 403) {
|
|
2749
|
-
|
|
2777
|
+
settle("retry");
|
|
2750
2778
|
} else if (xhr.status >= 500) {
|
|
2751
|
-
|
|
2779
|
+
settle("retry");
|
|
2752
2780
|
} else {
|
|
2753
|
-
|
|
2781
|
+
settle("retry");
|
|
2754
2782
|
}
|
|
2755
2783
|
});
|
|
2756
|
-
xhr.addEventListener("error", () =>
|
|
2757
|
-
xhr.addEventListener("abort", () =>
|
|
2784
|
+
xhr.addEventListener("error", () => settle("retry"));
|
|
2785
|
+
xhr.addEventListener("abort", () => {
|
|
2786
|
+
if (!resolved) settle("abort");
|
|
2787
|
+
});
|
|
2758
2788
|
if (signal) {
|
|
2759
2789
|
signal.addEventListener(
|
|
2760
2790
|
"abort",
|
|
2761
2791
|
() => {
|
|
2762
2792
|
xhr.abort();
|
|
2763
|
-
|
|
2793
|
+
settle("abort");
|
|
2764
2794
|
},
|
|
2765
2795
|
{ once: true }
|
|
2766
2796
|
);
|
|
2767
2797
|
}
|
|
2768
2798
|
xhr.open("PUT", url);
|
|
2799
|
+
resetStallTimer();
|
|
2769
2800
|
xhr.send(blob);
|
|
2770
2801
|
});
|
|
2771
2802
|
}
|