@moontaiworks/fanbox-dl 1.2.2 → 1.3.1
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/bundle/index.cjs +1 -1
- package/dist/bundle/index.cjs.map +1 -1
- package/dist/bundle/index.js +1 -1
- package/dist/bundle/index.js.map +1 -1
- package/dist/cjs/downloader/asset/download.d.ts.map +1 -1
- package/dist/cjs/downloader/asset/download.js +11 -5
- package/dist/cjs/downloader/asset/download.js.map +1 -1
- package/dist/cjs/downloader/cli/resolver.js +1 -1
- package/dist/cjs/downloader/cli/resolver.js.map +1 -1
- package/dist/cjs/downloader/creator/sync.d.ts.map +1 -1
- package/dist/cjs/downloader/creator/sync.js +19 -12
- package/dist/cjs/downloader/creator/sync.js.map +1 -1
- package/dist/cjs/downloader/fs/filesystem.d.ts +4 -0
- package/dist/cjs/downloader/fs/filesystem.d.ts.map +1 -1
- package/dist/cjs/downloader/fs/filesystem.js +11 -0
- package/dist/cjs/downloader/fs/filesystem.js.map +1 -1
- package/dist/cjs/downloader/index.js +2 -2
- package/dist/cjs/downloader/manifest/store.d.ts.map +1 -1
- package/dist/cjs/downloader/manifest/store.js +2 -1
- package/dist/cjs/downloader/manifest/store.js.map +1 -1
- package/dist/cjs/downloader/post/sync.d.ts +7 -5
- package/dist/cjs/downloader/post/sync.d.ts.map +1 -1
- package/dist/cjs/downloader/post/sync.js +13 -4
- package/dist/cjs/downloader/post/sync.js.map +1 -1
- package/dist/cjs/transport/http2.d.ts +0 -4
- package/dist/cjs/transport/http2.d.ts.map +1 -1
- package/dist/cjs/transport/http2.js +3 -12
- package/dist/cjs/transport/http2.js.map +1 -1
- package/dist/cjs/transport/worker.d.ts.map +1 -1
- package/dist/cjs/transport/worker.js +6 -6
- package/dist/cjs/transport/worker.js.map +1 -1
- package/dist/esm/downloader/asset/download.d.ts.map +1 -1
- package/dist/esm/downloader/asset/download.js +11 -5
- package/dist/esm/downloader/asset/download.js.map +1 -1
- package/dist/esm/downloader/cli/resolver.js +1 -1
- package/dist/esm/downloader/cli/resolver.js.map +1 -1
- package/dist/esm/downloader/creator/sync.d.ts.map +1 -1
- package/dist/esm/downloader/creator/sync.js +20 -13
- package/dist/esm/downloader/creator/sync.js.map +1 -1
- package/dist/esm/downloader/fs/filesystem.d.ts +4 -0
- package/dist/esm/downloader/fs/filesystem.d.ts.map +1 -1
- package/dist/esm/downloader/fs/filesystem.js +9 -0
- package/dist/esm/downloader/fs/filesystem.js.map +1 -1
- package/dist/esm/downloader/index.js +2 -2
- package/dist/esm/downloader/manifest/store.d.ts.map +1 -1
- package/dist/esm/downloader/manifest/store.js +2 -1
- package/dist/esm/downloader/manifest/store.js.map +1 -1
- package/dist/esm/downloader/post/sync.d.ts +7 -5
- package/dist/esm/downloader/post/sync.d.ts.map +1 -1
- package/dist/esm/downloader/post/sync.js +12 -4
- package/dist/esm/downloader/post/sync.js.map +1 -1
- package/dist/esm/transport/http2.d.ts +0 -4
- package/dist/esm/transport/http2.d.ts.map +1 -1
- package/dist/esm/transport/http2.js +3 -12
- package/dist/esm/transport/http2.js.map +1 -1
- package/dist/esm/transport/worker.d.ts.map +1 -1
- package/dist/esm/transport/worker.js +6 -6
- package/dist/esm/transport/worker.js.map +1 -1
- package/package.json +1 -1
|
@@ -50,23 +50,23 @@ class TimeLimiter {
|
|
|
50
50
|
__classPrivateFieldGet(this, _TimeLimiter_logger, "f").trace(`Initialized TimeLimiter with interval ${intervalMs}ms`);
|
|
51
51
|
}
|
|
52
52
|
setNextAvailableAt(availableAt) {
|
|
53
|
-
__classPrivateFieldGet(this, _TimeLimiter_logger, "f").trace(`Setting next available time to ${availableAt}.`);
|
|
53
|
+
__classPrivateFieldGet(this, _TimeLimiter_logger, "f").trace(`Setting next available time to ${new Date(availableAt).toISOString()}.`);
|
|
54
54
|
__classPrivateFieldSet(this, _TimeLimiter_availableAt, availableAt, "f");
|
|
55
55
|
}
|
|
56
56
|
async wait() {
|
|
57
57
|
const now = Date.now();
|
|
58
58
|
if (__classPrivateFieldGet(this, _TimeLimiter_availableAt, "f") > now) {
|
|
59
59
|
const waitMs = __classPrivateFieldGet(this, _TimeLimiter_availableAt, "f") - now;
|
|
60
|
-
__classPrivateFieldGet(this, _TimeLimiter_logger, "f").trace(`Waiting for time limiter for ${waitMs}ms, until ${__classPrivateFieldGet(this, _TimeLimiter_availableAt, "f")}.`);
|
|
60
|
+
__classPrivateFieldGet(this, _TimeLimiter_logger, "f").trace(`Waiting for time limiter for ${waitMs}ms, until ${new Date(__classPrivateFieldGet(this, _TimeLimiter_availableAt, "f")).toISOString()}.`);
|
|
61
61
|
await sleep(waitMs);
|
|
62
|
-
__classPrivateFieldGet(this, _TimeLimiter_logger, "f").trace(`Time limiter continued at ${__classPrivateFieldGet(this, _TimeLimiter_availableAt, "f")}.`);
|
|
62
|
+
__classPrivateFieldGet(this, _TimeLimiter_logger, "f").trace(`Time limiter continued at ${new Date(__classPrivateFieldGet(this, _TimeLimiter_availableAt, "f")).toISOString()}.`);
|
|
63
63
|
}
|
|
64
64
|
this.setNextAvailableAt(Date.now() + this.intervalMs);
|
|
65
65
|
}
|
|
66
66
|
}
|
|
67
67
|
_TimeLimiter_availableAt = new WeakMap(), _TimeLimiter_logger = new WeakMap();
|
|
68
68
|
export class RequestWorker {
|
|
69
|
-
constructor({ logger }, { concurrency = 5, intervalMs = 500, maxRetries = 3, rateLimitPauseMs, transport = new Http2Transport(
|
|
69
|
+
constructor({ logger }, { concurrency = 5, intervalMs = 500, maxRetries = 3, rateLimitPauseMs, transport = new Http2Transport(), } = {}) {
|
|
70
70
|
_RequestWorker_instances.add(this);
|
|
71
71
|
_RequestWorker_concurrencyLimiter.set(this, void 0);
|
|
72
72
|
_RequestWorker_logger.set(this, void 0);
|
|
@@ -96,7 +96,7 @@ export class RequestWorker {
|
|
|
96
96
|
}
|
|
97
97
|
}
|
|
98
98
|
_RequestWorker_concurrencyLimiter = new WeakMap(), _RequestWorker_logger = new WeakMap(), _RequestWorker_maxRetries = new WeakMap(), _RequestWorker_rateLimitPauseMs = new WeakMap(), _RequestWorker_timeLimiter = new WeakMap(), _RequestWorker_transport = new WeakMap(), _RequestWorker_instances = new WeakSet(), _RequestWorker_fetch = async function _RequestWorker_fetch(request, retryRemains = __classPrivateFieldGet(this, _RequestWorker_maxRetries, "f")) {
|
|
99
|
-
__classPrivateFieldGet(this, _RequestWorker_logger, "f").
|
|
99
|
+
__classPrivateFieldGet(this, _RequestWorker_logger, "f").info(`Fetching request with max ${retryRemains} retries to ${request instanceof Request ? request.url : request.toString()}`);
|
|
100
100
|
await __classPrivateFieldGet(this, _RequestWorker_timeLimiter, "f").wait();
|
|
101
101
|
const requestObj = request instanceof Request ? request.clone() : new Request(request);
|
|
102
102
|
const response = await __classPrivateFieldGet(this, _RequestWorker_transport, "f").fetch(requestObj);
|
|
@@ -105,7 +105,7 @@ _RequestWorker_concurrencyLimiter = new WeakMap(), _RequestWorker_logger = new W
|
|
|
105
105
|
if (response.status === 429) {
|
|
106
106
|
const retryAfter = __classPrivateFieldGet(this, _RequestWorker_rateLimitPauseMs, "f") ?? parseRetryAfter(response) ?? 60000;
|
|
107
107
|
const availableAt = Date.now() + retryAfter;
|
|
108
|
-
__classPrivateFieldGet(this, _RequestWorker_logger, "f").warn(
|
|
108
|
+
__classPrivateFieldGet(this, _RequestWorker_logger, "f").warn(`Received 429 Too Many Requests. Pausing requests until ${new Date(availableAt).toISOString()}.`);
|
|
109
109
|
await sleep(retryAfter);
|
|
110
110
|
__classPrivateFieldGet(this, _RequestWorker_timeLimiter, "f").setNextAvailableAt(availableAt);
|
|
111
111
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker.js","sourceRoot":"","sources":["../../../src/transport/worker.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,OAAO,EAAE,cAAc,EAAsB,MAAM,YAAY,CAAC;AAUhE,MAAM,kBAAkB;IAKtB,YACE,EAAE,MAAM,EAAsB,EACtB,WAAmB;QAAnB,gBAAW,GAAX,WAAW,CAAQ;QAN7B,qCAAU,CAAC,EAAC;QACZ,6CAAgB;QAChB,oCAAyB,EAAE,EAAC;QAM1B,uBAAA,IAAI,8BAAW,MAAM,MAAA,CAAC;QACtB,uBAAA,IAAI,kCAAQ,CAAC,KAAK,CAAC,EAAE,WAAW,EAAE,EAAE,gCAAgC,CAAC,CAAC;IACxE,CAAC;IAED,KAAK,CAAC,OAAO;;QACX,IAAI,uBAAA,IAAI,kCAAQ,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACrC,uBAAA,IAAI,kCAAQ,CAAC,KAAK,CAChB,8BAA8B,uBAAA,IAAI,kCAAQ,IAAI,IAAI,CAAC,WAAW,yBAAyB,CACxF,CAAC;YACF,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE,CAAC,uBAAA,IAAI,iCAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;QAClE,CAAC;QAED,yDAAA,CAAE,kEAAY,EAAd,IAAc,CAAA,MAAA,CAAC;IACjB,CAAC;IAED,OAAO;;QACL,yDAAA,CAAE,kEAAY,EAAd,IAAc,CAAA,MAAA,CAAC;QACf,IAAI,uBAAA,IAAI,iCAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC3B,MAAM,IAAI,GAAG,uBAAA,IAAI,iCAAO,CAAC,KAAK,EAAE,CAAC;YACjC,IAAI,IAAI,EAAE,CAAC;gBACT,uBAAA,IAAI,kCAAQ,CAAC,KAAK,CAChB,+BAA+B,uBAAA,IAAI,kCAAQ,IAAI,IAAI,CAAC,WAAW,6BAA6B,CAC7F,CAAC;gBACF,IAAI,EAAE,CAAC;YACT,CAAC;QACH,CAAC;IACH,CAAC;CACF;;AAED,MAAM,WAAW;IAIf,YACE,EAAE,MAAM,EAAsB,EACtB,UAAkB;QAAlB,eAAU,GAAV,UAAU,CAAQ;QAL5B,mCAAe,CAAC,EAAC;QACjB,sCAAgB;QAMd,uBAAA,IAAI,uBAAW,MAAM,MAAA,CAAC;QACtB,uBAAA,IAAI,2BAAQ,CAAC,KAAK,CAAC,yCAAyC,UAAU,IAAI,CAAC,CAAC;IAC9E,CAAC;IAED,kBAAkB,CAAC,WAAmB;QACpC,uBAAA,IAAI,2BAAQ,CAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"worker.js","sourceRoot":"","sources":["../../../src/transport/worker.ts"],"names":[],"mappings":"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"}
|