xtrawl 0.1.2 → 0.1.3
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/auth/bootstrap.d.ts +1 -1
- package/dist/auth/bootstrap.d.ts.map +1 -1
- package/dist/auth/bootstrap.js +27 -14
- package/dist/auth/bootstrap.js.map +1 -1
- package/dist/cli/main.d.ts.map +1 -1
- package/dist/cli/main.js +13 -12
- package/dist/cli/main.js.map +1 -1
- package/dist/cli/parser.d.ts +2 -14
- package/dist/cli/parser.d.ts.map +1 -1
- package/dist/cli/parser.js +26 -30
- package/dist/cli/parser.js.map +1 -1
- package/dist/cli/types.d.ts +17 -0
- package/dist/cli/types.d.ts.map +1 -0
- package/dist/cli/types.js +2 -0
- package/dist/cli/types.js.map +1 -0
- package/dist/client/accounts.d.ts.map +1 -1
- package/dist/client/accounts.js +13 -6
- package/dist/client/accounts.js.map +1 -1
- package/dist/client/client.d.ts +13 -1
- package/dist/client/client.d.ts.map +1 -1
- package/dist/client/client.js +93 -38
- package/dist/client/client.js.map +1 -1
- package/dist/client/collectors.d.ts +2 -10
- package/dist/client/collectors.d.ts.map +1 -1
- package/dist/client/collectors.js +122 -57
- package/dist/client/collectors.js.map +1 -1
- package/dist/client/database.d.ts +6 -18
- package/dist/client/database.d.ts.map +1 -1
- package/dist/client/database.js +4 -21
- package/dist/client/database.js.map +1 -1
- package/dist/client/page-commit.d.ts +15 -0
- package/dist/client/page-commit.d.ts.map +1 -0
- package/dist/client/page-commit.js +19 -0
- package/dist/client/page-commit.js.map +1 -0
- package/dist/client/profiles.d.ts +1 -1
- package/dist/client/profiles.d.ts.map +1 -1
- package/dist/client/profiles.js +10 -3
- package/dist/client/profiles.js.map +1 -1
- package/dist/client/search.d.ts +2 -15
- package/dist/client/search.d.ts.map +1 -1
- package/dist/client/search.js +64 -25
- package/dist/client/search.js.map +1 -1
- package/dist/client/types.d.ts +40 -2
- package/dist/client/types.d.ts.map +1 -1
- package/dist/config/defaults.d.ts.map +1 -1
- package/dist/config/defaults.js +5 -2
- package/dist/config/defaults.js.map +1 -1
- package/dist/config/types.d.ts +5 -2
- package/dist/config/types.d.ts.map +1 -1
- package/dist/config/validation.d.ts +1 -1
- package/dist/config/validation.d.ts.map +1 -1
- package/dist/config/validation.js +27 -11
- package/dist/config/validation.js.map +1 -1
- package/dist/constants/accounts.d.ts +16 -0
- package/dist/constants/accounts.d.ts.map +1 -0
- package/dist/constants/accounts.js +16 -0
- package/dist/constants/accounts.js.map +1 -0
- package/dist/constants/cli.d.ts +10 -0
- package/dist/constants/cli.d.ts.map +1 -0
- package/dist/constants/cli.js +10 -0
- package/dist/constants/cli.js.map +1 -0
- package/dist/constants/collection.d.ts +9 -0
- package/dist/constants/collection.d.ts.map +1 -0
- package/dist/constants/collection.js +9 -0
- package/dist/constants/collection.js.map +1 -0
- package/dist/constants/config.d.ts +6 -0
- package/dist/constants/config.d.ts.map +1 -0
- package/dist/constants/config.js +6 -0
- package/dist/constants/config.js.map +1 -0
- package/dist/constants/errors.d.ts +9 -0
- package/dist/constants/errors.d.ts.map +1 -0
- package/dist/constants/errors.js +9 -0
- package/dist/constants/errors.js.map +1 -0
- package/dist/constants/output.d.ts +7 -0
- package/dist/constants/output.d.ts.map +1 -0
- package/dist/constants/output.js +7 -0
- package/dist/constants/output.js.map +1 -0
- package/dist/constants/pages.d.ts +5 -0
- package/dist/constants/pages.d.ts.map +1 -0
- package/dist/constants/pages.js +5 -0
- package/dist/constants/pages.js.map +1 -0
- package/dist/constants/requests.d.ts +18 -0
- package/dist/constants/requests.d.ts.map +1 -0
- package/dist/constants/requests.js +18 -0
- package/dist/constants/requests.js.map +1 -0
- package/dist/constants/runner.d.ts +8 -0
- package/dist/constants/runner.d.ts.map +1 -0
- package/dist/constants/runner.js +8 -0
- package/dist/constants/runner.js.map +1 -0
- package/dist/constants/runs.d.ts +8 -0
- package/dist/constants/runs.d.ts.map +1 -0
- package/dist/constants/runs.js +8 -0
- package/dist/constants/runs.js.map +1 -0
- package/dist/domain/accounts.d.ts +4 -2
- package/dist/domain/accounts.d.ts.map +1 -1
- package/dist/domain/collection.d.ts +27 -0
- package/dist/domain/collection.d.ts.map +1 -0
- package/dist/domain/collection.js +2 -0
- package/dist/domain/collection.js.map +1 -0
- package/dist/domain/diagnostics.d.ts +11 -0
- package/dist/domain/diagnostics.d.ts.map +1 -0
- package/dist/domain/diagnostics.js +2 -0
- package/dist/domain/diagnostics.js.map +1 -0
- package/dist/domain/errors.d.ts +2 -1
- package/dist/domain/errors.d.ts.map +1 -1
- package/dist/domain/errors.js +10 -9
- package/dist/domain/errors.js.map +1 -1
- package/dist/domain/http.d.ts +7 -1
- package/dist/domain/http.d.ts.map +1 -1
- package/dist/domain/manifest.d.ts +8 -0
- package/dist/domain/manifest.d.ts.map +1 -1
- package/dist/domain/output.d.ts +3 -0
- package/dist/domain/output.d.ts.map +1 -0
- package/dist/domain/output.js +2 -0
- package/dist/domain/output.js.map +1 -0
- package/dist/domain/pages.d.ts +20 -0
- package/dist/domain/pages.d.ts.map +1 -0
- package/dist/domain/pages.js +2 -0
- package/dist/domain/pages.js.map +1 -0
- package/dist/domain/pool.d.ts +22 -0
- package/dist/domain/pool.d.ts.map +1 -0
- package/dist/domain/pool.js +2 -0
- package/dist/domain/pool.js.map +1 -0
- package/dist/domain/records.d.ts +2 -1
- package/dist/domain/records.d.ts.map +1 -1
- package/dist/domain/requests.d.ts +15 -10
- package/dist/domain/requests.d.ts.map +1 -1
- package/dist/domain/runner.d.ts +30 -0
- package/dist/domain/runner.d.ts.map +1 -0
- package/dist/domain/runner.js +2 -0
- package/dist/domain/runner.js.map +1 -0
- package/dist/domain/runs.d.ts +12 -0
- package/dist/domain/runs.d.ts.map +1 -0
- package/dist/domain/runs.js +2 -0
- package/dist/domain/runs.js.map +1 -0
- package/dist/engine/api-engine.d.ts +7 -7
- package/dist/engine/api-engine.d.ts.map +1 -1
- package/dist/engine/api-engine.js +42 -19
- package/dist/engine/api-engine.js.map +1 -1
- package/dist/engine/extractors.d.ts +2 -8
- package/dist/engine/extractors.d.ts.map +1 -1
- package/dist/engine/extractors.js +30 -11
- package/dist/engine/extractors.js.map +1 -1
- package/dist/index.d.ts +2 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/manifest/destinations.d.ts +4 -0
- package/dist/manifest/destinations.d.ts.map +1 -0
- package/dist/manifest/destinations.js +47 -0
- package/dist/manifest/destinations.js.map +1 -0
- package/dist/manifest/model.d.ts +3 -2
- package/dist/manifest/model.d.ts.map +1 -1
- package/dist/manifest/model.js +6 -1
- package/dist/manifest/model.js.map +1 -1
- package/dist/manifest/provider.d.ts +10 -3
- package/dist/manifest/provider.d.ts.map +1 -1
- package/dist/manifest/provider.js +86 -34
- package/dist/manifest/provider.js.map +1 -1
- package/dist/manifest/scraper.d.ts +2 -6
- package/dist/manifest/scraper.d.ts.map +1 -1
- package/dist/manifest/scraper.js +46 -15
- package/dist/manifest/scraper.js.map +1 -1
- package/dist/output/csv-writer.d.ts.map +1 -1
- package/dist/output/csv-writer.js +32 -10
- package/dist/output/csv-writer.js.map +1 -1
- package/dist/output/json-writer.d.ts +1 -0
- package/dist/output/json-writer.d.ts.map +1 -1
- package/dist/output/json-writer.js +36 -11
- package/dist/output/json-writer.js.map +1 -1
- package/dist/output/lock.d.ts +2 -0
- package/dist/output/lock.d.ts.map +1 -0
- package/dist/output/lock.js +18 -0
- package/dist/output/lock.js.map +1 -0
- package/dist/output/writer.d.ts +2 -1
- package/dist/output/writer.d.ts.map +1 -1
- package/dist/output/writer.js +6 -3
- package/dist/output/writer.js.map +1 -1
- package/dist/pool/account-pool.d.ts +3 -12
- package/dist/pool/account-pool.d.ts.map +1 -1
- package/dist/pool/account-pool.js +54 -16
- package/dist/pool/account-pool.js.map +1 -1
- package/dist/pool/cooldown.d.ts +3 -7
- package/dist/pool/cooldown.d.ts.map +1 -1
- package/dist/pool/cooldown.js +10 -7
- package/dist/pool/cooldown.js.map +1 -1
- package/dist/pool/limiter.d.ts +3 -3
- package/dist/pool/limiter.d.ts.map +1 -1
- package/dist/pool/limiter.js +5 -6
- package/dist/pool/limiter.js.map +1 -1
- package/dist/query/builder.d.ts +1 -1
- package/dist/query/builder.d.ts.map +1 -1
- package/dist/query/builder.js +10 -4
- package/dist/query/builder.js.map +1 -1
- package/dist/query/collection-id.d.ts +3 -0
- package/dist/query/collection-id.d.ts.map +1 -0
- package/dist/query/collection-id.js +21 -0
- package/dist/query/collection-id.js.map +1 -0
- package/dist/query/normalize.d.ts +3 -32
- package/dist/query/normalize.d.ts.map +1 -1
- package/dist/query/normalize.js +10 -16
- package/dist/query/normalize.js.map +1 -1
- package/dist/query/targets.d.ts +2 -7
- package/dist/query/targets.d.ts.map +1 -1
- package/dist/query/targets.js.map +1 -1
- package/dist/query/types.d.ts +40 -0
- package/dist/query/types.d.ts.map +1 -0
- package/dist/query/types.js +2 -0
- package/dist/query/types.js.map +1 -0
- package/dist/runner/index.d.ts +3 -0
- package/dist/runner/index.d.ts.map +1 -1
- package/dist/runner/index.js.map +1 -1
- package/dist/runner/retry.d.ts +3 -6
- package/dist/runner/retry.d.ts.map +1 -1
- package/dist/runner/retry.js +5 -3
- package/dist/runner/retry.js.map +1 -1
- package/dist/runner/runner.d.ts +2 -14
- package/dist/runner/runner.d.ts.map +1 -1
- package/dist/runner/runner.js +11 -7
- package/dist/runner/runner.js.map +1 -1
- package/dist/runner/task-queue.d.ts +9 -11
- package/dist/runner/task-queue.d.ts.map +1 -1
- package/dist/runner/task-queue.js +79 -32
- package/dist/runner/task-queue.js.map +1 -1
- package/dist/storage/account-repository.d.ts +2 -15
- package/dist/storage/account-repository.d.ts.map +1 -1
- package/dist/storage/account-repository.js +65 -35
- package/dist/storage/account-repository.js.map +1 -1
- package/dist/storage/database.d.ts +3 -1
- package/dist/storage/database.d.ts.map +1 -1
- package/dist/storage/database.js +10 -4
- package/dist/storage/database.js.map +1 -1
- package/dist/storage/index.d.ts +3 -1
- package/dist/storage/index.d.ts.map +1 -1
- package/dist/storage/index.js +2 -0
- package/dist/storage/index.js.map +1 -1
- package/dist/storage/progress-repository.d.ts +12 -0
- package/dist/storage/progress-repository.d.ts.map +1 -0
- package/dist/storage/progress-repository.js +76 -0
- package/dist/storage/progress-repository.js.map +1 -0
- package/dist/storage/run-repository.d.ts +4 -10
- package/dist/storage/run-repository.d.ts.map +1 -1
- package/dist/storage/run-repository.js +4 -2
- package/dist/storage/run-repository.js.map +1 -1
- package/dist/storage/schema.d.ts.map +1 -1
- package/dist/storage/schema.js +19 -0
- package/dist/storage/schema.js.map +1 -1
- package/dist/storage/types.d.ts +15 -0
- package/dist/storage/types.d.ts.map +1 -0
- package/dist/storage/types.js +2 -0
- package/dist/storage/types.js.map +1 -0
- package/dist/transport/body.d.ts +15 -0
- package/dist/transport/body.d.ts.map +1 -0
- package/dist/transport/body.js +61 -0
- package/dist/transport/body.js.map +1 -0
- package/dist/transport/dispatcher-pool.d.ts +13 -0
- package/dist/transport/dispatcher-pool.d.ts.map +1 -0
- package/dist/transport/dispatcher-pool.js +47 -0
- package/dist/transport/dispatcher-pool.js.map +1 -0
- package/dist/transport/graphql.d.ts +1 -1
- package/dist/transport/graphql.d.ts.map +1 -1
- package/dist/transport/graphql.js +36 -19
- package/dist/transport/graphql.js.map +1 -1
- package/dist/transport/session.d.ts +8 -11
- package/dist/transport/session.d.ts.map +1 -1
- package/dist/transport/session.js +71 -26
- package/dist/transport/session.js.map +1 -1
- package/dist/transport/transaction-id.d.ts +2 -7
- package/dist/transport/transaction-id.d.ts.map +1 -1
- package/dist/transport/transaction-id.js +20 -16
- package/dist/transport/transaction-id.js.map +1 -1
- package/dist/transport/types.d.ts +28 -0
- package/dist/transport/types.d.ts.map +1 -0
- package/dist/transport/types.js +2 -0
- package/dist/transport/types.js.map +1 -0
- package/dist/utils/abort.d.ts +6 -0
- package/dist/utils/abort.d.ts.map +1 -0
- package/dist/utils/abort.js +45 -0
- package/dist/utils/abort.js.map +1 -0
- package/dist/utils/redact.d.ts +5 -0
- package/dist/utils/redact.d.ts.map +1 -0
- package/dist/utils/redact.js +42 -0
- package/dist/utils/redact.js.map +1 -0
- package/docs/architecture/overview.md +6 -4
- package/docs/product/specification.md +10 -9
- package/docs/security/data-boundary.md +3 -0
- package/package.json +5 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cooldown.d.ts","sourceRoot":"","sources":["../../src/pool/cooldown.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cooldown.d.ts","sourceRoot":"","sources":["../../src/pool/cooldown.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAE1D,YAAY,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAE1D,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GAAG,MAAM,GAAG,SAAS,CAKjG;AAED,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GAAG,MAAM,GAAG,SAAS,CAKrG;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GAAG,OAAO,CAGnF;AAED,wBAAgB,eAAe,CAC7B,QAAQ,EAAE,aAAa,GAAG,SAAS,EACnC,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,EACX,OAAO,EAAE;IACP,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;CAC5B,GACA,gBAAgB,CAmBlB"}
|
package/dist/pool/cooldown.js
CHANGED
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { ACCOUNT_HEALTH } from "../constants/accounts.js";
|
|
2
|
+
import { ERROR_CATEGORY } from "../constants/errors.js";
|
|
1
3
|
export function parseRateLimitReset(headers) {
|
|
2
4
|
const raw = headers["x-rate-limit-reset"] ?? headers["X-Rate-Limit-Reset"];
|
|
3
5
|
const value = raw ? Number(raw) : NaN;
|
|
@@ -12,24 +14,25 @@ export function parseRateLimitRemaining(headers) {
|
|
|
12
14
|
const value = Number(raw);
|
|
13
15
|
return Number.isFinite(value) ? value : undefined;
|
|
14
16
|
}
|
|
15
|
-
export function
|
|
17
|
+
export function isQuotaExhausted(headers) {
|
|
16
18
|
const remaining = parseRateLimitRemaining(headers);
|
|
17
|
-
return
|
|
19
|
+
return remaining !== undefined && remaining <= 0;
|
|
18
20
|
}
|
|
19
21
|
export function computeCooldown(category, status, now, options) {
|
|
20
22
|
if (status === 200)
|
|
21
|
-
return { status:
|
|
22
|
-
if (category ===
|
|
23
|
+
return { status: ACCOUNT_HEALTH.HEALTHY, availableUntil: 0 };
|
|
24
|
+
if (category === ERROR_CATEGORY.AUTH || status === 401 || status === 403)
|
|
23
25
|
return {
|
|
24
|
-
status:
|
|
26
|
+
status: ACCOUNT_HEALTH.UNUSABLE,
|
|
25
27
|
availableUntil: now + options.authMs,
|
|
26
28
|
lastErrorCode: status,
|
|
27
29
|
reason: "authentication_failed",
|
|
28
30
|
};
|
|
29
|
-
const reset = options.resetAt ??
|
|
31
|
+
const reset = options.resetAt ??
|
|
32
|
+
now + (category === ERROR_CATEGORY.TRANSIENT ? options.transientMs : options.defaultMs);
|
|
30
33
|
const jitter = Math.round(Math.random() * Math.max(0, options.jitterMs ?? 0));
|
|
31
34
|
return {
|
|
32
|
-
status:
|
|
35
|
+
status: ACCOUNT_HEALTH.COOLING_DOWN,
|
|
33
36
|
availableUntil: reset + jitter,
|
|
34
37
|
lastErrorCode: status,
|
|
35
38
|
reason: category ?? "remote_error",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cooldown.js","sourceRoot":"","sources":["../../src/pool/cooldown.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cooldown.js","sourceRoot":"","sources":["../../src/pool/cooldown.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAMxD,MAAM,UAAU,mBAAmB,CAAC,OAAyC;IAC3E,MAAM,GAAG,GAAG,OAAO,CAAC,oBAAoB,CAAC,IAAI,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAC3E,MAAM,KAAK,GAAG,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;IACtC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IAC9C,OAAO,KAAK,GAAG,cAAc,CAAC,CAAC,CAAC,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;AACxD,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,OAAyC;IAC/E,MAAM,GAAG,GAAG,OAAO,CAAC,wBAAwB,CAAC,IAAI,OAAO,CAAC,wBAAwB,CAAC,CAAC;IACnF,IAAI,GAAG,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IACxC,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;IAC1B,OAAO,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;AACpD,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,OAAyC;IACxE,MAAM,SAAS,GAAG,uBAAuB,CAAC,OAAO,CAAC,CAAC;IACnD,OAAO,SAAS,KAAK,SAAS,IAAI,SAAS,IAAI,CAAC,CAAC;AACnD,CAAC;AAED,MAAM,UAAU,eAAe,CAC7B,QAAmC,EACnC,MAAc,EACd,GAAW,EACX,OAMC;IAED,IAAI,MAAM,KAAK,GAAG;QAAE,OAAO,EAAE,MAAM,EAAE,cAAc,CAAC,OAAO,EAAE,cAAc,EAAE,CAAC,EAAE,CAAC;IACjF,IAAI,QAAQ,KAAK,cAAc,CAAC,IAAI,IAAI,MAAM,KAAK,GAAG,IAAI,MAAM,KAAK,GAAG;QACtE,OAAO;YACL,MAAM,EAAE,cAAc,CAAC,QAAQ;YAC/B,cAAc,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM;YACpC,aAAa,EAAE,MAAM;YACrB,MAAM,EAAE,uBAAuB;SAChC,CAAC;IACJ,MAAM,KAAK,GACT,OAAO,CAAC,OAAO;QACf,GAAG,GAAG,CAAC,QAAQ,KAAK,cAAc,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAC1F,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAC,CAAC;IAC9E,OAAO;QACL,MAAM,EAAE,cAAc,CAAC,YAAY;QACnC,cAAc,EAAE,KAAK,GAAG,MAAM;QAC9B,aAAa,EAAE,MAAM;QACrB,MAAM,EAAE,QAAQ,IAAI,cAAc;KACnC,CAAC;AACJ,CAAC"}
|
package/dist/pool/limiter.d.ts
CHANGED
|
@@ -4,8 +4,8 @@ export declare class TokenBucketLimiter {
|
|
|
4
4
|
private readonly clock;
|
|
5
5
|
private readonly sleeper;
|
|
6
6
|
private nextAllowedAt;
|
|
7
|
-
constructor(requestsPerMinute: number, minDelayMs: number, clock?: () => number, sleeper?: (ms: number) => Promise<void>);
|
|
8
|
-
acquire(): Promise<void>;
|
|
7
|
+
constructor(requestsPerMinute: number, minDelayMs: number, clock?: () => number, sleeper?: (ms: number, signal?: AbortSignal) => Promise<void>);
|
|
8
|
+
acquire(signal?: AbortSignal): Promise<void>;
|
|
9
9
|
}
|
|
10
|
-
export declare function sleep(ms: number): Promise<void>;
|
|
10
|
+
export declare function sleep(ms: number, signal?: AbortSignal): Promise<void>;
|
|
11
11
|
//# sourceMappingURL=limiter.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"limiter.d.ts","sourceRoot":"","sources":["../../src/pool/limiter.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"limiter.d.ts","sourceRoot":"","sources":["../../src/pool/limiter.ts"],"names":[],"mappings":"AAEA,qBAAa,kBAAkB;IAI3B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAN1B,OAAO,CAAC,aAAa,CAAK;gBAGP,iBAAiB,EAAE,MAAM,EACzB,UAAU,EAAE,MAAM,EAClB,KAAK,GAAE,MAAM,MAAiB,EAC9B,OAAO,GAAE,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,IAAI,CAAS;IAG1E,OAAO,CAAC,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;CAO1D;AAED,wBAAsB,KAAK,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAE3E"}
|
package/dist/pool/limiter.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { delay } from "../utils/abort.js";
|
|
1
2
|
export class TokenBucketLimiter {
|
|
2
3
|
requestsPerMinute;
|
|
3
4
|
minDelayMs;
|
|
@@ -10,18 +11,16 @@ export class TokenBucketLimiter {
|
|
|
10
11
|
this.clock = clock;
|
|
11
12
|
this.sleeper = sleeper;
|
|
12
13
|
}
|
|
13
|
-
async acquire() {
|
|
14
|
+
async acquire(signal) {
|
|
14
15
|
const interval = Math.max(this.minDelayMs, 60_000 / Math.max(1, this.requestsPerMinute));
|
|
15
16
|
const now = this.clock();
|
|
16
17
|
const wait = Math.max(0, this.nextAllowedAt - now);
|
|
17
18
|
if (wait > 0)
|
|
18
|
-
await this.sleeper(wait);
|
|
19
|
+
await this.sleeper(wait, signal);
|
|
19
20
|
this.nextAllowedAt = Math.max(this.nextAllowedAt, this.clock()) + interval;
|
|
20
21
|
}
|
|
21
22
|
}
|
|
22
|
-
export async function sleep(ms) {
|
|
23
|
-
|
|
24
|
-
return;
|
|
25
|
-
await new Promise((resolve) => setTimeout(resolve, ms));
|
|
23
|
+
export async function sleep(ms, signal) {
|
|
24
|
+
await delay(ms, signal);
|
|
26
25
|
}
|
|
27
26
|
//# sourceMappingURL=limiter.js.map
|
package/dist/pool/limiter.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"limiter.js","sourceRoot":"","sources":["../../src/pool/limiter.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,kBAAkB;IAIV;IACA;IACA;IACA;IANX,aAAa,GAAG,CAAC,CAAC;IAE1B,YACmB,iBAAyB,EACzB,UAAkB,EAClB,QAAsB,IAAI,CAAC,GAAG,EAC9B,
|
|
1
|
+
{"version":3,"file":"limiter.js","sourceRoot":"","sources":["../../src/pool/limiter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAE1C,MAAM,OAAO,kBAAkB;IAIV;IACA;IACA;IACA;IANX,aAAa,GAAG,CAAC,CAAC;IAE1B,YACmB,iBAAyB,EACzB,UAAkB,EAClB,QAAsB,IAAI,CAAC,GAAG,EAC9B,UAA+D,KAAK;QAHpE,sBAAiB,GAAjB,iBAAiB,CAAQ;QACzB,eAAU,GAAV,UAAU,CAAQ;QAClB,UAAK,GAAL,KAAK,CAAyB;QAC9B,YAAO,GAAP,OAAO,CAA6D;IACpF,CAAC;IAEG,KAAK,CAAC,OAAO,CAAC,MAAoB;QACvC,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC;QACzF,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;QACzB,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,aAAa,GAAG,GAAG,CAAC,CAAC;QACnD,IAAI,IAAI,GAAG,CAAC;YAAE,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC/C,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,GAAG,QAAQ,CAAC;IAC7E,CAAC;CACF;AAED,MAAM,CAAC,KAAK,UAAU,KAAK,CAAC,EAAU,EAAE,MAAoB;IAC1D,MAAM,KAAK,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;AAC1B,CAAC"}
|
package/dist/query/builder.d.ts
CHANGED
|
@@ -9,7 +9,7 @@ export declare const OPERATION: {
|
|
|
9
9
|
readonly verifiedFollowers: "verified_followers";
|
|
10
10
|
readonly tweetResult: "tweet_result";
|
|
11
11
|
};
|
|
12
|
-
export declare function endpointFor(manifest: Manifest, operation: string): string;
|
|
12
|
+
export declare function endpointFor(manifest: Manifest, operation: string, extraOrigins?: readonly string[]): string;
|
|
13
13
|
export declare function buildSearchParams(request: SearchRequest, manifest: Manifest, cursor?: string, pageSize?: number): Record<string, string>;
|
|
14
14
|
export declare function buildUserLookupParams(username: string, manifest: Manifest): Record<string, string>;
|
|
15
15
|
export declare function buildProfileTimelineParams(userId: string, _request: ProfileTimelineRequest, manifest: Manifest, cursor?: string, pageSize?: number): Record<string, string>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../../src/query/builder.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../../src/query/builder.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEtD,OAAO,KAAK,EAAE,sBAAsB,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAIhG,eAAO,MAAM,SAAS;;;;;;;;CAQZ,CAAC;AAEX,wBAAgB,WAAW,CACzB,QAAQ,EAAE,QAAQ,EAClB,SAAS,EAAE,MAAM,EACjB,YAAY,GAAE,SAAS,MAAM,EAAO,GACnC,MAAM,CAMR;AAED,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,aAAa,EACtB,QAAQ,EAAE,QAAQ,EAClB,MAAM,CAAC,EAAE,MAAM,EACf,QAAQ,SAAK,GACZ,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAkBxB;AAED,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAQlG;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,sBAAsB,EAChC,QAAQ,EAAE,QAAQ,EAClB,MAAM,CAAC,EAAE,MAAM,EACf,QAAQ,SAAK,GACZ,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAexB;AAED,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,QAAQ,EAClB,MAAM,CAAC,EAAE,MAAM,EACf,QAAQ,SAAK,GACZ,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAqBxB;AAED,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAalG;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,WAAW,GAAG,MAAM,GAAG,SAAS,CActE"}
|
package/dist/query/builder.js
CHANGED
|
@@ -1,3 +1,6 @@
|
|
|
1
|
+
import { SEARCH_DISPLAY } from "../constants/requests.js";
|
|
2
|
+
import { ManifestError } from "../domain/errors.js";
|
|
3
|
+
import { assertCredentialDestination } from "../manifest/destinations.js";
|
|
1
4
|
import { buildEffectiveQuery, normalizeSearch } from "./normalize.js";
|
|
2
5
|
export const OPERATION = {
|
|
3
6
|
search: "search_timeline",
|
|
@@ -8,12 +11,13 @@ export const OPERATION = {
|
|
|
8
11
|
verifiedFollowers: "verified_followers",
|
|
9
12
|
tweetResult: "tweet_result",
|
|
10
13
|
};
|
|
11
|
-
export function endpointFor(manifest, operation) {
|
|
14
|
+
export function endpointFor(manifest, operation, extraOrigins = []) {
|
|
12
15
|
const id = manifest.queryIds[operation];
|
|
13
16
|
const endpoint = manifest.endpoints[operation];
|
|
14
17
|
if (!id || !endpoint)
|
|
15
|
-
throw new
|
|
16
|
-
|
|
18
|
+
throw new ManifestError(`Manifest does not define operation ${operation}`);
|
|
19
|
+
const url = endpoint.includes("{query_id}") ? endpoint.replace("{query_id}", id) : endpoint;
|
|
20
|
+
return assertCredentialDestination(url, extraOrigins);
|
|
17
21
|
}
|
|
18
22
|
export function buildSearchParams(request, manifest, cursor, pageSize = 20) {
|
|
19
23
|
const normalized = normalizeSearch(request).value;
|
|
@@ -22,7 +26,9 @@ export function buildSearchParams(request, manifest, cursor, pageSize = 20) {
|
|
|
22
26
|
rawQuery,
|
|
23
27
|
count: Math.max(1, Math.min(pageSize, 100)),
|
|
24
28
|
querySource: "typed_query",
|
|
25
|
-
product: (request.displayType ??
|
|
29
|
+
product: (request.displayType ?? SEARCH_DISPLAY.TOP).toLowerCase() === SEARCH_DISPLAY.LATEST.toLowerCase()
|
|
30
|
+
? SEARCH_DISPLAY.LATEST
|
|
31
|
+
: SEARCH_DISPLAY.TOP,
|
|
26
32
|
withGrokTranslatedBio: false,
|
|
27
33
|
...(cursor ? { cursor } : {}),
|
|
28
34
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../src/query/builder.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../src/query/builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"collection-id.d.ts","sourceRoot":"","sources":["../../src/query/collection-id.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,yBAAyB,IAAI,CAAC;AAY3C,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,KAAK,GAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAM,GAC5C,MAAM,CAQR"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import { queryHash } from "./hash.js";
|
|
2
|
+
export const COLLECTION_SCHEMA_VERSION = 1;
|
|
3
|
+
const NON_SEMANTIC_KEYS = new Set([
|
|
4
|
+
"save",
|
|
5
|
+
"saveDir",
|
|
6
|
+
"saveName",
|
|
7
|
+
"saveFormat",
|
|
8
|
+
"resume",
|
|
9
|
+
"signal",
|
|
10
|
+
"pretty",
|
|
11
|
+
]);
|
|
12
|
+
export function collectionIdentity(operation, request, extra = {}) {
|
|
13
|
+
const semantic = Object.fromEntries(Object.entries(request).filter(([key]) => !NON_SEMANTIC_KEYS.has(key)));
|
|
14
|
+
return queryHash({
|
|
15
|
+
schemaVersion: COLLECTION_SCHEMA_VERSION,
|
|
16
|
+
operation,
|
|
17
|
+
request: semantic,
|
|
18
|
+
...extra,
|
|
19
|
+
});
|
|
20
|
+
}
|
|
21
|
+
//# sourceMappingURL=collection-id.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"collection-id.js","sourceRoot":"","sources":["../../src/query/collection-id.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,CAAC;AAE3C,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAAC;IAChC,MAAM;IACN,SAAS;IACT,UAAU;IACV,YAAY;IACZ,QAAQ;IACR,QAAQ;IACR,QAAQ;CACT,CAAC,CAAC;AAEH,MAAM,UAAU,kBAAkB,CAChC,SAAiB,EACjB,OAAe,EACf,QAA2C,EAAE;IAE7C,MAAM,QAAQ,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAC5G,OAAO,SAAS,CAAC;QACf,aAAa,EAAE,yBAAyB;QACxC,SAAS;QACT,OAAO,EAAE,QAAQ;QACjB,GAAG,KAAK;KACT,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -1,35 +1,6 @@
|
|
|
1
|
-
import type { SearchRequest
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
readonly allWords: readonly string[];
|
|
5
|
-
readonly anyWords: readonly string[];
|
|
6
|
-
readonly exactPhrases: readonly string[];
|
|
7
|
-
readonly excludeWords: readonly string[];
|
|
8
|
-
readonly hashtagsAny: readonly string[];
|
|
9
|
-
readonly hashtagsExclude: readonly string[];
|
|
10
|
-
readonly fromUsers: readonly string[];
|
|
11
|
-
readonly toUsers: readonly string[];
|
|
12
|
-
readonly mentioningUsers: readonly string[];
|
|
13
|
-
readonly tweetType: TweetType;
|
|
14
|
-
readonly verifiedOnly: boolean;
|
|
15
|
-
readonly blueVerifiedOnly: boolean;
|
|
16
|
-
readonly hasImages: boolean;
|
|
17
|
-
readonly hasVideos: boolean;
|
|
18
|
-
readonly hasLinks: boolean;
|
|
19
|
-
readonly hasMentions: boolean;
|
|
20
|
-
readonly hasHashtags: boolean;
|
|
21
|
-
readonly minLikes: number;
|
|
22
|
-
readonly minReplies: number;
|
|
23
|
-
readonly minRetweets: number;
|
|
24
|
-
readonly place: string;
|
|
25
|
-
readonly geocode: string;
|
|
26
|
-
readonly near: string;
|
|
27
|
-
readonly within: string;
|
|
28
|
-
readonly lang: string;
|
|
29
|
-
readonly since: string;
|
|
30
|
-
readonly until: string;
|
|
31
|
-
readonly displayType: string;
|
|
32
|
-
}
|
|
1
|
+
import type { SearchRequest } from "../domain/requests.js";
|
|
2
|
+
import type { NormalizedSearch } from "./types.js";
|
|
3
|
+
export type { NormalizedSearch } from "./types.js";
|
|
33
4
|
export declare function normalizeSearch(input?: SearchRequest | Record<string, unknown>): {
|
|
34
5
|
readonly value: NormalizedSearch;
|
|
35
6
|
readonly warnings: readonly string[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize.d.ts","sourceRoot":"","sources":["../../src/query/normalize.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"normalize.d.ts","sourceRoot":"","sources":["../../src/query/normalize.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAa,MAAM,uBAAuB,CAAC;AAEtE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAEnD,YAAY,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAInD,wBAAgB,eAAe,CAAC,KAAK,GAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GAAG;IACpF,QAAQ,CAAC,KAAK,EAAE,gBAAgB,CAAC;IACjC,QAAQ,CAAC,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAC;IACrC,QAAQ,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAC;CACpC,CAgFA;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,gBAAgB,GAAG,MAAM,CA2DnE"}
|
package/dist/query/normalize.js
CHANGED
|
@@ -1,12 +1,6 @@
|
|
|
1
|
+
import { SEARCH_DISPLAY, TWEET_TYPE } from "../constants/requests.js";
|
|
1
2
|
import { asBoolean, asInteger, asString, asStringList } from "../utils/guards.js";
|
|
2
|
-
const VALID_TWEET_TYPES = new Set(
|
|
3
|
-
"all",
|
|
4
|
-
"originals_only",
|
|
5
|
-
"replies_only",
|
|
6
|
-
"retweets_only",
|
|
7
|
-
"exclude_replies",
|
|
8
|
-
"exclude_retweets",
|
|
9
|
-
]);
|
|
3
|
+
const VALID_TWEET_TYPES = new Set(Object.values(TWEET_TYPE));
|
|
10
4
|
export function normalizeSearch(input = {}) {
|
|
11
5
|
const raw = input;
|
|
12
6
|
const warnings = [];
|
|
@@ -39,8 +33,8 @@ export function normalizeSearch(input = {}) {
|
|
|
39
33
|
.map((item) => item.replace(/^@/u, ""))
|
|
40
34
|
.filter((item) => /^[A-Za-z0-9_]{1,15}$/u.test(item)));
|
|
41
35
|
const hashtags = (key) => unique(normalizedList(key).map((item) => (item.startsWith("#") || item.startsWith("$") ? item : `#${item}`)));
|
|
42
|
-
const tweetTypeValue = asString(coerced.tweetType) ??
|
|
43
|
-
const tweetType = VALID_TWEET_TYPES.has(tweetTypeValue) ? tweetTypeValue :
|
|
36
|
+
const tweetTypeValue = asString(coerced.tweetType) ?? TWEET_TYPE.ALL;
|
|
37
|
+
const tweetType = VALID_TWEET_TYPES.has(tweetTypeValue) ? tweetTypeValue : TWEET_TYPE.ALL;
|
|
44
38
|
const errors = VALID_TWEET_TYPES.has(tweetTypeValue) ? [] : [`Invalid tweetType: ${tweetTypeValue}`];
|
|
45
39
|
return {
|
|
46
40
|
value: {
|
|
@@ -72,7 +66,7 @@ export function normalizeSearch(input = {}) {
|
|
|
72
66
|
lang: asString(coerced.lang) ?? "",
|
|
73
67
|
since: asString(coerced.since) ?? "",
|
|
74
68
|
until: asString(coerced.until) ?? "",
|
|
75
|
-
displayType: asString(coerced.displayType)
|
|
69
|
+
displayType: asString(coerced.displayType) === SEARCH_DISPLAY.LATEST ? SEARCH_DISPLAY.LATEST : SEARCH_DISPLAY.TOP,
|
|
76
70
|
},
|
|
77
71
|
warnings,
|
|
78
72
|
errors,
|
|
@@ -106,11 +100,11 @@ export function buildEffectiveQuery(value) {
|
|
|
106
100
|
parts.push(`lang:${value.lang}`);
|
|
107
101
|
if (!hasFilterOperator(value.searchQuery)) {
|
|
108
102
|
const filters = {
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
103
|
+
[TWEET_TYPE.ORIGINALS_ONLY]: ["-filter:replies", "-filter:retweets"],
|
|
104
|
+
[TWEET_TYPE.REPLIES_ONLY]: ["filter:replies"],
|
|
105
|
+
[TWEET_TYPE.RETWEETS_ONLY]: ["filter:retweets"],
|
|
106
|
+
[TWEET_TYPE.EXCLUDE_REPLIES]: ["-filter:replies"],
|
|
107
|
+
[TWEET_TYPE.EXCLUDE_RETWEETS]: ["-filter:retweets"],
|
|
114
108
|
};
|
|
115
109
|
parts.push(...(filters[value.tweetType] ?? []));
|
|
116
110
|
for (const [field, filter] of [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize.js","sourceRoot":"","sources":["../../src/query/normalize.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"normalize.js","sourceRoot":"","sources":["../../src/query/normalize.ts"],"names":[],"mappings":"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"}
|
package/dist/query/targets.d.ts
CHANGED
|
@@ -1,11 +1,6 @@
|
|
|
1
1
|
import type { TargetInput } from "../domain/requests.js";
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
readonly skipped: readonly {
|
|
5
|
-
readonly raw: string;
|
|
6
|
-
readonly reason: string;
|
|
7
|
-
}[];
|
|
8
|
-
}
|
|
2
|
+
import type { NormalizedTargets } from "./types.js";
|
|
3
|
+
export type { NormalizedTargets } from "./types.js";
|
|
9
4
|
export declare function normalizeTargets(values: readonly (string | TargetInput)[]): NormalizedTargets;
|
|
10
5
|
export declare function targetFromString(value: string): TargetInput | undefined;
|
|
11
6
|
//# sourceMappingURL=targets.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"targets.d.ts","sourceRoot":"","sources":["../../src/query/targets.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AA2BzD,
|
|
1
|
+
{"version":3,"file":"targets.d.ts","sourceRoot":"","sources":["../../src/query/targets.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AA2BzD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAEpD,YAAY,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAEpD,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,SAAS,CAAC,MAAM,GAAG,WAAW,CAAC,EAAE,GAAG,iBAAiB,CAmB7F;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS,CAQvE"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"targets.js","sourceRoot":"","sources":["../../src/query/targets.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,GAAG,uBAAuB,CAAC;AACvC,MAAM,OAAO,GAAG,QAAQ,CAAC;AACzB,MAAM,aAAa,GAAG,IAAI,GAAG,CAAC;IAC5B,OAAO;IACP,WAAW;IACX,SAAS;IACT,cAAc;IACd,aAAa;IACb,iBAAiB;IACjB,eAAe;IACf,oBAAoB;CACrB,CAAC,CAAC;AACH,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC;IAC7B,MAAM;IACN,SAAS;IACT,QAAQ;IACR,eAAe;IACf,UAAU;IACV,SAAS;IACT,UAAU;IACV,GAAG;IACH,OAAO;IACP,QAAQ;CACT,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"targets.js","sourceRoot":"","sources":["../../src/query/targets.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
import type { SearchRequest, TargetInput, TweetType } from "../domain/requests.js";
|
|
2
|
+
export interface NormalizedSearch {
|
|
3
|
+
readonly searchQuery: string;
|
|
4
|
+
readonly allWords: readonly string[];
|
|
5
|
+
readonly anyWords: readonly string[];
|
|
6
|
+
readonly exactPhrases: readonly string[];
|
|
7
|
+
readonly excludeWords: readonly string[];
|
|
8
|
+
readonly hashtagsAny: readonly string[];
|
|
9
|
+
readonly hashtagsExclude: readonly string[];
|
|
10
|
+
readonly fromUsers: readonly string[];
|
|
11
|
+
readonly toUsers: readonly string[];
|
|
12
|
+
readonly mentioningUsers: readonly string[];
|
|
13
|
+
readonly tweetType: TweetType;
|
|
14
|
+
readonly verifiedOnly: boolean;
|
|
15
|
+
readonly blueVerifiedOnly: boolean;
|
|
16
|
+
readonly hasImages: boolean;
|
|
17
|
+
readonly hasVideos: boolean;
|
|
18
|
+
readonly hasLinks: boolean;
|
|
19
|
+
readonly hasMentions: boolean;
|
|
20
|
+
readonly hasHashtags: boolean;
|
|
21
|
+
readonly minLikes: number;
|
|
22
|
+
readonly minReplies: number;
|
|
23
|
+
readonly minRetweets: number;
|
|
24
|
+
readonly place: string;
|
|
25
|
+
readonly geocode: string;
|
|
26
|
+
readonly near: string;
|
|
27
|
+
readonly within: string;
|
|
28
|
+
readonly lang: string;
|
|
29
|
+
readonly since: string;
|
|
30
|
+
readonly until: string;
|
|
31
|
+
readonly displayType: NonNullable<SearchRequest["displayType"]>;
|
|
32
|
+
}
|
|
33
|
+
export interface NormalizedTargets {
|
|
34
|
+
readonly targets: readonly TargetInput[];
|
|
35
|
+
readonly skipped: readonly {
|
|
36
|
+
readonly raw: string;
|
|
37
|
+
readonly reason: string;
|
|
38
|
+
}[];
|
|
39
|
+
}
|
|
40
|
+
//# sourceMappingURL=types.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/query/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAEnF,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAC;IACrC,QAAQ,CAAC,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAC;IACrC,QAAQ,CAAC,YAAY,EAAE,SAAS,MAAM,EAAE,CAAC;IACzC,QAAQ,CAAC,YAAY,EAAE,SAAS,MAAM,EAAE,CAAC;IACzC,QAAQ,CAAC,WAAW,EAAE,SAAS,MAAM,EAAE,CAAC;IACxC,QAAQ,CAAC,eAAe,EAAE,SAAS,MAAM,EAAE,CAAC;IAC5C,QAAQ,CAAC,SAAS,EAAE,SAAS,MAAM,EAAE,CAAC;IACtC,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IACpC,QAAQ,CAAC,eAAe,EAAE,SAAS,MAAM,EAAE,CAAC;IAC5C,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IAC9B,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAC;IAC/B,QAAQ,CAAC,gBAAgB,EAAE,OAAO,CAAC;IACnC,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC;IAC9B,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC;IAC9B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC,CAAC;CACjE;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,OAAO,EAAE,SAAS,WAAW,EAAE,CAAC;IACzC,QAAQ,CAAC,OAAO,EAAE,SAAS;QAAE,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CAChF"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/query/types.ts"],"names":[],"mappings":""}
|
package/dist/runner/index.d.ts
CHANGED
|
@@ -1,4 +1,7 @@
|
|
|
1
1
|
export { ExecutionRunner } from "./runner.js";
|
|
2
|
+
export type { RunnerOptions, RunnerResult } from "./runner.js";
|
|
2
3
|
export { TaskQueue } from "./task-queue.js";
|
|
4
|
+
export type { QueueTask } from "./task-queue.js";
|
|
3
5
|
export { withRetry } from "./retry.js";
|
|
6
|
+
export type { RetryOptions } from "./retry.js";
|
|
4
7
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/runner/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/runner/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,YAAY,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC/D,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,YAAY,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,YAAY,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC"}
|
package/dist/runner/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/runner/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/runner/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC"}
|
package/dist/runner/retry.d.ts
CHANGED
|
@@ -1,7 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
readonly maxMs: number;
|
|
5
|
-
}
|
|
6
|
-
export declare function withRetry<T>(operation: (attempt: number) => Promise<T>, options: RetryOptions, shouldRetry?: (error: unknown) => boolean): Promise<T>;
|
|
1
|
+
import type { RetryOptions } from "../domain/runner.js";
|
|
2
|
+
export type { RetryOptions } from "../domain/runner.js";
|
|
3
|
+
export declare function withRetry<T>(operation: (attempt: number) => Promise<T>, options: RetryOptions, shouldRetry?: (error: unknown) => boolean, signal?: AbortSignal): Promise<T>;
|
|
7
4
|
//# sourceMappingURL=retry.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"retry.d.ts","sourceRoot":"","sources":["../../src/runner/retry.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"retry.d.ts","sourceRoot":"","sources":["../../src/runner/retry.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAIxD,YAAY,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAExD,wBAAsB,SAAS,CAAC,CAAC,EAC/B,SAAS,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,EAC1C,OAAO,EAAE,YAAY,EACrB,WAAW,GAAE,CAAC,KAAK,EAAE,OAAO,KAAK,OAAqB,EACtD,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,CAAC,CAAC,CAaZ"}
|
package/dist/runner/retry.js
CHANGED
|
@@ -1,15 +1,17 @@
|
|
|
1
1
|
import { sleep } from "../pool/limiter.js";
|
|
2
|
-
|
|
2
|
+
import { isAbortError, throwIfAborted } from "../utils/abort.js";
|
|
3
|
+
export async function withRetry(operation, options, shouldRetry = isRetryable, signal) {
|
|
3
4
|
let lastError;
|
|
4
5
|
for (let attempt = 1; attempt <= options.maxAttempts; attempt += 1) {
|
|
6
|
+
throwIfAborted(signal);
|
|
5
7
|
try {
|
|
6
8
|
return await operation(attempt);
|
|
7
9
|
}
|
|
8
10
|
catch (error) {
|
|
9
11
|
lastError = error;
|
|
10
|
-
if (attempt >= options.maxAttempts || !shouldRetry(error))
|
|
12
|
+
if (isAbortError(error) || attempt >= options.maxAttempts || !shouldRetry(error))
|
|
11
13
|
throw error;
|
|
12
|
-
await sleep(Math.min(options.maxMs, options.baseMs * 2 ** (attempt - 1)));
|
|
14
|
+
await sleep(Math.min(options.maxMs, options.baseMs * 2 ** (attempt - 1)), signal);
|
|
13
15
|
}
|
|
14
16
|
}
|
|
15
17
|
throw lastError instanceof Error ? lastError : new Error(String(lastError));
|
package/dist/runner/retry.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"retry.js","sourceRoot":"","sources":["../../src/runner/retry.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"retry.js","sourceRoot":"","sources":["../../src/runner/retry.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAIjE,MAAM,CAAC,KAAK,UAAU,SAAS,CAC7B,SAA0C,EAC1C,OAAqB,EACrB,cAA2C,WAAW,EACtD,MAAoB;IAEpB,IAAI,SAAkB,CAAC;IACvB,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,IAAI,OAAO,CAAC,WAAW,EAAE,OAAO,IAAI,CAAC,EAAE,CAAC;QACnE,cAAc,CAAC,MAAM,CAAC,CAAC;QACvB,IAAI,CAAC;YACH,OAAO,MAAM,SAAS,CAAC,OAAO,CAAC,CAAC;QAClC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,SAAS,GAAG,KAAK,CAAC;YAClB,IAAI,YAAY,CAAC,KAAK,CAAC,IAAI,OAAO,IAAI,OAAO,CAAC,WAAW,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC;gBAAE,MAAM,KAAK,CAAC;YAC9F,MAAM,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;QACpF,CAAC;IACH,CAAC;IACD,MAAM,SAAS,YAAY,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC;AAC9E,CAAC;AAED,SAAS,WAAW,CAAC,KAAc;IACjC,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAC;IACrD,MAAM,SAAS,GAAG,KAA6B,CAAC;IAChD,MAAM,MAAM,GACV,SAAS,CAAC,WAAW,IAAI,OAAO,SAAS,CAAC,WAAW,CAAC,UAAU,KAAK,QAAQ;QAC3E,CAAC,CAAC,SAAS,CAAC,WAAW,CAAC,UAAU;QAClC,CAAC,CAAC,SAAS,CAAC;IAChB,OAAO,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,GAAG,IAAI,MAAM,KAAK,GAAG,IAAI,MAAM,IAAI,GAAG,CAAC;AACnF,CAAC"}
|
package/dist/runner/runner.d.ts
CHANGED
|
@@ -1,17 +1,5 @@
|
|
|
1
|
-
import {
|
|
2
|
-
export
|
|
3
|
-
readonly concurrency: number;
|
|
4
|
-
readonly leaseTtlMs?: number;
|
|
5
|
-
readonly maxAttempts?: number;
|
|
6
|
-
}
|
|
7
|
-
export interface RunnerResult<T> {
|
|
8
|
-
readonly complete: readonly T[];
|
|
9
|
-
readonly failed: readonly {
|
|
10
|
-
readonly task: QueueTask<T>;
|
|
11
|
-
readonly error: unknown;
|
|
12
|
-
}[];
|
|
13
|
-
readonly retries: number;
|
|
14
|
-
}
|
|
1
|
+
import type { RunnerOptions, RunnerResult } from "../domain/runner.js";
|
|
2
|
+
export type { RunnerOptions, RunnerResult } from "../domain/runner.js";
|
|
15
3
|
export declare class ExecutionRunner<T> {
|
|
16
4
|
private readonly options;
|
|
17
5
|
constructor(options: RunnerOptions);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../src/runner/runner.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../src/runner/runner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAa,aAAa,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAGlF,YAAY,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEvE,qBAAa,eAAe,CAAC,CAAC;IACT,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAAP,OAAO,EAAE,aAAa;IAE7C,GAAG,CAAC,KAAK,EAAE,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;CA6BpG"}
|
package/dist/runner/runner.js
CHANGED
|
@@ -16,15 +16,19 @@ export class ExecutionRunner {
|
|
|
16
16
|
return;
|
|
17
17
|
try {
|
|
18
18
|
await worker(task.payload);
|
|
19
|
-
queue.ack(task.id)
|
|
20
|
-
|
|
19
|
+
if (queue.ack(task.id, task.generation))
|
|
20
|
+
complete.push(task.payload);
|
|
21
21
|
}
|
|
22
22
|
catch (error) {
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
23
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
24
|
+
if (task.attempts < (this.options.maxAttempts ?? 3)) {
|
|
25
|
+
queue.retry(task.id, message, task.generation);
|
|
26
|
+
}
|
|
27
|
+
else if (queue.fail(task.id, message, task.generation)) {
|
|
28
|
+
failures.push({
|
|
29
|
+
task: queue.snapshot().find((item) => item.id === task.id) ?? task,
|
|
30
|
+
error,
|
|
31
|
+
});
|
|
28
32
|
}
|
|
29
33
|
}
|
|
30
34
|
}
|