xtrawl 0.1.0 → 0.1.2
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/DOCUMENTATION.md +127 -4
- package/LICENSE +21 -0
- package/README.md +170 -19
- package/dist/auth/account-state.d.ts +3 -0
- package/dist/auth/account-state.d.ts.map +1 -0
- package/dist/auth/account-state.js +85 -0
- package/dist/auth/account-state.js.map +1 -0
- package/dist/client/accounts.d.ts +31 -0
- package/dist/client/accounts.d.ts.map +1 -0
- package/dist/client/accounts.js +163 -0
- package/dist/client/accounts.js.map +1 -0
- package/dist/client/client.d.ts +16 -5
- package/dist/client/client.d.ts.map +1 -1
- package/dist/client/client.js +58 -19
- package/dist/client/client.js.map +1 -1
- package/dist/client/database.d.ts +2 -1
- package/dist/client/database.d.ts.map +1 -1
- package/dist/client/database.js +1 -1
- package/dist/client/database.js.map +1 -1
- package/dist/client/search.d.ts +3 -2
- package/dist/client/search.d.ts.map +1 -1
- package/dist/client/search.js +23 -7
- package/dist/client/search.js.map +1 -1
- package/dist/client/types.d.ts +2 -0
- package/dist/client/types.d.ts.map +1 -1
- package/dist/domain/account-state.d.ts +68 -0
- package/dist/domain/account-state.d.ts.map +1 -0
- package/dist/domain/account-state.js +2 -0
- package/dist/domain/account-state.js.map +1 -0
- package/dist/domain/errors.d.ts +3 -0
- package/dist/domain/errors.d.ts.map +1 -1
- package/dist/domain/errors.js +5 -0
- package/dist/domain/errors.js.map +1 -1
- package/dist/domain/records.d.ts +4 -0
- package/dist/domain/records.d.ts.map +1 -1
- package/dist/domain/requests.d.ts +4 -0
- package/dist/domain/requests.d.ts.map +1 -1
- package/dist/index.d.ts +7 -4
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +3 -1
- package/dist/index.js.map +1 -1
- package/dist/pool/account-pool.d.ts +12 -5
- package/dist/pool/account-pool.d.ts.map +1 -1
- package/dist/pool/account-pool.js +102 -13
- package/dist/pool/account-pool.js.map +1 -1
- package/dist/storage/account-repository.d.ts +8 -1
- package/dist/storage/account-repository.d.ts.map +1 -1
- package/dist/storage/account-repository.js +63 -26
- package/dist/storage/account-repository.js.map +1 -1
- package/docs/architecture/overview.md +16 -11
- package/docs/decisions/0003-caller-owned-account-state.md +33 -0
- package/docs/product/specification.md +19 -2
- package/docs/security/data-boundary.md +9 -2
- package/package.json +4 -3
|
@@ -0,0 +1,163 @@
|
|
|
1
|
+
import { bootstrapCookiesFromAuthToken } from "../auth/bootstrap.js";
|
|
2
|
+
import { parseAccountStateSnapshot } from "../auth/account-state.js";
|
|
3
|
+
import { loadAccountsFileSync, loadInlineAccounts } from "../auth/loaders.js";
|
|
4
|
+
import { accountInputToRecord } from "../auth/records.js";
|
|
5
|
+
import { loadAccountFromEnvironmentSync } from "../config/environment.js";
|
|
6
|
+
import { AccountStateError } from "../domain/errors.js";
|
|
7
|
+
import { summarizeAccounts } from "../pool/account-pool.js";
|
|
8
|
+
import { redactAccount } from "./database.js";
|
|
9
|
+
export class XTrawlAccounts {
|
|
10
|
+
store;
|
|
11
|
+
config;
|
|
12
|
+
location;
|
|
13
|
+
onAccountsChanged;
|
|
14
|
+
cachedAccounts = [];
|
|
15
|
+
constructor(store, config, location, onAccountsChanged) {
|
|
16
|
+
this.store = store;
|
|
17
|
+
this.config = config;
|
|
18
|
+
this.location = location;
|
|
19
|
+
this.onAccountsChanged = onAccountsChanged;
|
|
20
|
+
}
|
|
21
|
+
async refresh() {
|
|
22
|
+
this.cachedAccounts = await this.store.list();
|
|
23
|
+
this.onAccountsChanged?.(this.cachedAccounts);
|
|
24
|
+
}
|
|
25
|
+
initialize(accounts) {
|
|
26
|
+
this.cachedAccounts = accounts;
|
|
27
|
+
}
|
|
28
|
+
inspectCached() {
|
|
29
|
+
return this.cachedAccounts.map((account) => redactAccount(account, {}));
|
|
30
|
+
}
|
|
31
|
+
async summary() {
|
|
32
|
+
await this.refresh();
|
|
33
|
+
return summarizeAccounts(this.cachedAccounts, this.config, this.location);
|
|
34
|
+
}
|
|
35
|
+
async list(options = {}) {
|
|
36
|
+
await this.refresh();
|
|
37
|
+
const now = Date.now();
|
|
38
|
+
return this.cachedAccounts
|
|
39
|
+
.filter((account) => !options.eligibleOnly || isEligible(account, this.config, now))
|
|
40
|
+
.filter((account) => !options.unusableOnly || account.status === 0)
|
|
41
|
+
.map((account) => redactAccount(account, options));
|
|
42
|
+
}
|
|
43
|
+
async get(username, options = {}) {
|
|
44
|
+
const account = await this.store.findByUsername(username);
|
|
45
|
+
return account ? redactAccount(account, options) : undefined;
|
|
46
|
+
}
|
|
47
|
+
async import(options) {
|
|
48
|
+
const accounts = loadImportAccounts(options);
|
|
49
|
+
for (const account of accounts)
|
|
50
|
+
await this.store.upsert({ ...account, proxy: account.proxy ?? options.proxy });
|
|
51
|
+
return { processed: accounts.length, eligible: (await this.summary()).eligible };
|
|
52
|
+
}
|
|
53
|
+
async delete(username) {
|
|
54
|
+
const deleted = await this.store.delete(username);
|
|
55
|
+
await this.refresh();
|
|
56
|
+
return deleted;
|
|
57
|
+
}
|
|
58
|
+
async setProxy(username, proxy) {
|
|
59
|
+
const account = await this.store.findByUsername(username);
|
|
60
|
+
if (!account)
|
|
61
|
+
return false;
|
|
62
|
+
await this.store.upsert({ ...account, proxy });
|
|
63
|
+
await this.refresh();
|
|
64
|
+
return true;
|
|
65
|
+
}
|
|
66
|
+
async repair(username, forceRefresh = false) {
|
|
67
|
+
const account = await this.store.findByUsername(username);
|
|
68
|
+
if (!account?.authToken)
|
|
69
|
+
return false;
|
|
70
|
+
if (!forceRefresh && account.csrfToken) {
|
|
71
|
+
await this.store.upsert({ ...account, status: 1, availableUntil: 0 });
|
|
72
|
+
await this.refresh();
|
|
73
|
+
return true;
|
|
74
|
+
}
|
|
75
|
+
const cookies = await bootstrapCookiesFromAuthToken(account.authToken, undefined, account.proxy);
|
|
76
|
+
if (!cookies?.ct0)
|
|
77
|
+
return false;
|
|
78
|
+
await this.store.upsert({
|
|
79
|
+
...account,
|
|
80
|
+
status: 1,
|
|
81
|
+
availableUntil: 0,
|
|
82
|
+
csrfToken: cookies.ct0,
|
|
83
|
+
cookies: { ...account.cookies, ...cookies },
|
|
84
|
+
});
|
|
85
|
+
await this.refresh();
|
|
86
|
+
return true;
|
|
87
|
+
}
|
|
88
|
+
async exportState(options) {
|
|
89
|
+
if (!options || options.includeSecrets !== true)
|
|
90
|
+
throw new AccountStateError("exportState requires includeSecrets: true.");
|
|
91
|
+
const accounts = await this.store.list();
|
|
92
|
+
return {
|
|
93
|
+
schemaVersion: 1,
|
|
94
|
+
exportedAt: new Date().toISOString(),
|
|
95
|
+
accounts: accounts.map(toSnapshotRecord),
|
|
96
|
+
};
|
|
97
|
+
}
|
|
98
|
+
async restoreState(state, options = {}) {
|
|
99
|
+
const snapshot = parseAccountStateSnapshot(state);
|
|
100
|
+
const accounts = snapshot.accounts.map(fromSnapshotRecord);
|
|
101
|
+
const mode = options.mode ?? "merge";
|
|
102
|
+
if (mode !== "merge" && mode !== "replace")
|
|
103
|
+
throw new AccountStateError("restoreState mode must be merge or replace.");
|
|
104
|
+
if (mode === "replace")
|
|
105
|
+
await this.store.replaceAll(accounts);
|
|
106
|
+
else
|
|
107
|
+
for (const account of accounts)
|
|
108
|
+
await this.store.upsert(account);
|
|
109
|
+
await this.refresh();
|
|
110
|
+
return { restored: accounts.length, mode };
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
function loadImportAccounts(options) {
|
|
114
|
+
const accounts = [];
|
|
115
|
+
if (options.accounts)
|
|
116
|
+
accounts.push(...options.accounts.map(accountInputToRecord));
|
|
117
|
+
if (options.cookies !== undefined)
|
|
118
|
+
accounts.push(...loadInlineAccounts(options.cookies));
|
|
119
|
+
if (options.accountsFile)
|
|
120
|
+
accounts.push(...loadAccountsFileSync(options.accountsFile));
|
|
121
|
+
if (options.cookiesFile)
|
|
122
|
+
accounts.push(...loadAccountsFileSync(options.cookiesFile));
|
|
123
|
+
if (options.envFile)
|
|
124
|
+
accounts.push(...loadAccountFromEnvironmentSync(options.envFile).map(accountInputToRecord));
|
|
125
|
+
return accounts;
|
|
126
|
+
}
|
|
127
|
+
function toSnapshotRecord(account) {
|
|
128
|
+
return {
|
|
129
|
+
username: account.username,
|
|
130
|
+
...(account.authToken ? { authToken: account.authToken } : {}),
|
|
131
|
+
...(account.csrfToken ? { csrfToken: account.csrfToken } : {}),
|
|
132
|
+
cookies: account.cookies,
|
|
133
|
+
...(account.bearerToken ? { bearerToken: account.bearerToken } : {}),
|
|
134
|
+
...(account.proxy ? { proxy: account.proxy } : {}),
|
|
135
|
+
...(account.status === 0 || account.status === 1 || account.status === 2
|
|
136
|
+
? { status: account.status }
|
|
137
|
+
: {}),
|
|
138
|
+
...copyOperationalState(account),
|
|
139
|
+
};
|
|
140
|
+
}
|
|
141
|
+
function fromSnapshotRecord(account) {
|
|
142
|
+
return { ...account, cookies: account.cookies };
|
|
143
|
+
}
|
|
144
|
+
function copyOperationalState(account) {
|
|
145
|
+
return {
|
|
146
|
+
...(account.availableUntil === undefined ? {} : { availableUntil: account.availableUntil }),
|
|
147
|
+
...(account.dailyRequests === undefined ? {} : { dailyRequests: account.dailyRequests }),
|
|
148
|
+
...(account.dailyTweets === undefined ? {} : { dailyTweets: account.dailyTweets }),
|
|
149
|
+
...(account.totalTweets === undefined ? {} : { totalTweets: account.totalTweets }),
|
|
150
|
+
...(account.lastResetDate === undefined ? {} : { lastResetDate: account.lastResetDate }),
|
|
151
|
+
...(account.lastUsed === undefined ? {} : { lastUsed: account.lastUsed }),
|
|
152
|
+
...(account.lastErrorCode === undefined ? {} : { lastErrorCode: account.lastErrorCode }),
|
|
153
|
+
...(account.cooldownReason === undefined ? {} : { cooldownReason: account.cooldownReason }),
|
|
154
|
+
};
|
|
155
|
+
}
|
|
156
|
+
function isEligible(account, config, now) {
|
|
157
|
+
return (account.status !== 0 &&
|
|
158
|
+
!(account.status === 2 && (account.availableUntil ?? 0) > now) &&
|
|
159
|
+
Boolean(account.authToken && account.csrfToken) &&
|
|
160
|
+
(account.dailyRequests ?? 0) < config.dailyRequestsLimit &&
|
|
161
|
+
(account.dailyTweets ?? 0) < config.dailyTweetsLimit);
|
|
162
|
+
}
|
|
163
|
+
//# sourceMappingURL=accounts.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"accounts.js","sourceRoot":"","sources":["../../src/client/accounts.ts"],"names":[],"mappings":"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"}
|
package/dist/client/client.d.ts
CHANGED
|
@@ -1,18 +1,26 @@
|
|
|
1
1
|
import type { ClientConfig } from "../config/types.js";
|
|
2
|
-
import type { FollowRecord, ProfileRecord, SearchResult, TweetRecord } from "../domain/records.js";
|
|
3
|
-
import type { FollowsRequest, ProfileTimelineRequest, SearchRequest, TargetInput, UserInfoRequest } from "../domain/requests.js";
|
|
2
|
+
import type { FollowRecord, ProfileRecord, SearchPageResult, SearchResult, TweetRecord } from "../domain/records.js";
|
|
3
|
+
import type { FollowsRequest, ProfileTimelineRequest, SearchPageRequest, SearchRequest, TargetInput, UserInfoRequest } from "../domain/requests.js";
|
|
4
4
|
import { type StorageBundle } from "../storage/index.js";
|
|
5
5
|
import type { ClientInspection, ClientOptions } from "./types.js";
|
|
6
6
|
import { XTrawlDatabase } from "./database.js";
|
|
7
|
+
import { XTrawlAccounts } from "./accounts.js";
|
|
8
|
+
declare const ASYNC_ACCOUNT_STORE_INITIALIZATION: unique symbol;
|
|
7
9
|
export declare class XTrawl {
|
|
8
10
|
readonly config: ClientConfig;
|
|
9
11
|
readonly storage: StorageBundle;
|
|
10
12
|
readonly db: XTrawlDatabase;
|
|
11
|
-
|
|
12
|
-
private readonly
|
|
13
|
+
readonly accounts: XTrawlAccounts;
|
|
14
|
+
private readonly accountStore;
|
|
15
|
+
private readonly usesExternalAccountStore;
|
|
16
|
+
private pool;
|
|
17
|
+
private engine;
|
|
13
18
|
constructor(options?: ClientOptions);
|
|
19
|
+
constructor(options: ClientOptions, initialization: typeof ASYNC_ACCOUNT_STORE_INITIALIZATION);
|
|
14
20
|
static create(options?: ClientOptions): Promise<XTrawl>;
|
|
21
|
+
private initializeRuntime;
|
|
15
22
|
search(query?: string, options?: SearchRequest): Promise<SearchResult>;
|
|
23
|
+
searchPage(query?: string, options?: SearchPageRequest): Promise<SearchPageResult>;
|
|
16
24
|
getUserInfo(targets: readonly (string | TargetInput)[], options?: UserInfoRequest): Promise<readonly ProfileRecord[]>;
|
|
17
25
|
getTweet(target: string): Promise<TweetRecord | undefined>;
|
|
18
26
|
getProfileTweets(targets: readonly (string | TargetInput)[], options?: Omit<ProfileTimelineRequest, "targets">): Promise<SearchResult>;
|
|
@@ -23,7 +31,10 @@ export declare class XTrawl {
|
|
|
23
31
|
get poolSummary(): import("../domain/accounts.js").AccountSummary;
|
|
24
32
|
close(): void;
|
|
25
33
|
private collectionContext;
|
|
26
|
-
private
|
|
34
|
+
private provisionSqlite;
|
|
35
|
+
private provisionExternal;
|
|
36
|
+
private provisionRecords;
|
|
27
37
|
private bootstrapMissingAccounts;
|
|
28
38
|
}
|
|
39
|
+
export {};
|
|
29
40
|
//# sourceMappingURL=client.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/client/client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/client/client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAKvD,OAAO,KAAK,EACV,YAAY,EACZ,aAAa,EACb,gBAAgB,EAChB,YAAY,EACZ,WAAW,EACZ,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EACV,cAAc,EACd,sBAAsB,EACtB,iBAAiB,EACjB,aAAa,EACb,WAAW,EACX,eAAe,EAChB,MAAM,uBAAuB,CAAC;AAQ/B,OAAO,EAAe,KAAK,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAQtE,OAAO,KAAK,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAClE,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAE/C,QAAA,MAAM,kCAAkC,eAA+C,CAAC;AAExF,qBAAa,MAAM;IACjB,SAAgB,MAAM,EAAE,YAAY,CAAC;IACrC,SAAgB,OAAO,EAAE,aAAa,CAAC;IACvC,SAAgB,EAAE,EAAE,cAAc,CAAC;IACnC,SAAgB,QAAQ,EAAE,cAAc,CAAC;IACzC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAoB;IACjD,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAAU;IACnD,OAAO,CAAC,IAAI,CAAe;IAC3B,OAAO,CAAC,MAAM,CAAa;gBAER,OAAO,CAAC,EAAE,aAAa;gBACvB,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,OAAO,kCAAkC;WA8BhF,MAAM,CAAC,OAAO,GAAE,aAAkB,GAAG,OAAO,CAAC,MAAM,CAAC;IAexE,OAAO,CAAC,iBAAiB;IA6CZ,MAAM,CAAC,KAAK,SAAK,EAAE,OAAO,GAAE,aAAkB,GAAG,OAAO,CAAC,YAAY,CAAC;IAItE,UAAU,CAAC,KAAK,SAAK,EAAE,OAAO,GAAE,iBAAsB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAIlF,WAAW,CACtB,OAAO,EAAE,SAAS,CAAC,MAAM,GAAG,WAAW,CAAC,EAAE,EAC1C,OAAO,GAAE,eAAoB,GAC5B,OAAO,CAAC,SAAS,aAAa,EAAE,CAAC;IAKvB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC;IAM1D,gBAAgB,CAC3B,OAAO,EAAE,SAAS,CAAC,MAAM,GAAG,WAAW,CAAC,EAAE,EAC1C,OAAO,GAAE,IAAI,CAAC,sBAAsB,EAAE,SAAS,CAAM,GACpD,OAAO,CAAC,YAAY,CAAC;IAIX,YAAY,CACvB,OAAO,EAAE,SAAS,CAAC,MAAM,GAAG,WAAW,CAAC,EAAE,EAC1C,OAAO,GAAE,IAAI,CAAC,cAAc,EAAE,SAAS,GAAG,YAAY,CAAM,GAC3D,OAAO,CAAC,SAAS,YAAY,EAAE,CAAC;IAStB,YAAY,CACvB,OAAO,EAAE,SAAS,CAAC,MAAM,GAAG,WAAW,CAAC,EAAE,EAC1C,OAAO,GAAE,IAAI,CAAC,cAAc,EAAE,SAAS,GAAG,YAAY,CAAM,GAC3D,OAAO,CAAC,SAAS,YAAY,EAAE,CAAC;IAStB,oBAAoB,CAC/B,OAAO,EAAE,SAAS,CAAC,MAAM,GAAG,WAAW,CAAC,EAAE,EAC1C,OAAO,GAAE,IAAI,CAAC,cAAc,EAAE,SAAS,GAAG,YAAY,CAAM,GAC3D,OAAO,CAAC,SAAS,YAAY,EAAE,CAAC;IAS5B,OAAO,IAAI,gBAAgB;IAWlC,IAAW,WAAW,mDAErB;IAEM,KAAK,IAAI,IAAI;IAIpB,OAAO,CAAC,iBAAiB;IAIzB,OAAO,CAAC,eAAe;YAIT,iBAAiB;IAI/B,OAAO,CAAC,gBAAgB;YAqBV,wBAAwB;CAYvC"}
|
package/dist/client/client.js
CHANGED
|
@@ -13,16 +13,23 @@ import { SessionBuilder } from "../transport/session.js";
|
|
|
13
13
|
import { TransactionIdProvider } from "../transport/transaction-id.js";
|
|
14
14
|
import { normalizeTargets } from "../query/targets.js";
|
|
15
15
|
import { collectFollows, collectProfileTweets } from "./collectors.js";
|
|
16
|
-
import { collectSearch } from "./search.js";
|
|
16
|
+
import { collectSearch, collectSearchPage } from "./search.js";
|
|
17
17
|
import { collectProfiles } from "./profiles.js";
|
|
18
18
|
import { XTrawlDatabase } from "./database.js";
|
|
19
|
+
import { XTrawlAccounts } from "./accounts.js";
|
|
20
|
+
const ASYNC_ACCOUNT_STORE_INITIALIZATION = Symbol("async-account-store-initialization");
|
|
19
21
|
export class XTrawl {
|
|
20
22
|
config;
|
|
21
23
|
storage;
|
|
22
24
|
db;
|
|
25
|
+
accounts;
|
|
26
|
+
accountStore;
|
|
27
|
+
usesExternalAccountStore;
|
|
23
28
|
pool;
|
|
24
29
|
engine;
|
|
25
|
-
constructor(options = {}) {
|
|
30
|
+
constructor(options = {}, initialization) {
|
|
31
|
+
if (options.accountStore && initialization !== ASYNC_ACCOUNT_STORE_INITIALIZATION)
|
|
32
|
+
throw new ConfigError("Custom accountStore instances require await XTrawl.create(options).");
|
|
26
33
|
this.config = validateConfig(options);
|
|
27
34
|
this.storage = openStorage(this.config.dbPath, {
|
|
28
35
|
dailyRequestsLimit: this.config.dailyRequestsLimit,
|
|
@@ -30,8 +37,35 @@ export class XTrawl {
|
|
|
30
37
|
leaseTtlMs: this.config.leaseTtlMs,
|
|
31
38
|
});
|
|
32
39
|
this.db = new XTrawlDatabase(this.storage);
|
|
33
|
-
this.
|
|
34
|
-
|
|
40
|
+
this.usesExternalAccountStore = Boolean(options.accountStore);
|
|
41
|
+
this.accountStore = options.accountStore ?? this.storage.accounts;
|
|
42
|
+
this.accounts = new XTrawlAccounts(this.accountStore, this.config, options.accountStore ? `external:${options.accountStore.kind ?? "custom"}` : this.config.dbPath, (current) => this.pool.updateAccounts(current));
|
|
43
|
+
if (!options.accountStore) {
|
|
44
|
+
this.provisionSqlite(options);
|
|
45
|
+
const initialAccounts = this.storage.accounts.list();
|
|
46
|
+
this.accounts.initialize(initialAccounts);
|
|
47
|
+
this.initializeRuntime(options, initialAccounts);
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
static async create(options = {}) {
|
|
51
|
+
const client = new XTrawl(options, ASYNC_ACCOUNT_STORE_INITIALIZATION);
|
|
52
|
+
try {
|
|
53
|
+
if (options.accountStore)
|
|
54
|
+
await client.provisionExternal(options);
|
|
55
|
+
await client.bootstrapMissingAccounts();
|
|
56
|
+
const accounts = await client.accountStore.list();
|
|
57
|
+
client.accounts.initialize(accounts);
|
|
58
|
+
if (options.accountStore)
|
|
59
|
+
client.initializeRuntime(options, accounts);
|
|
60
|
+
return client;
|
|
61
|
+
}
|
|
62
|
+
catch (error) {
|
|
63
|
+
client.close();
|
|
64
|
+
throw error;
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
initializeRuntime(options, accounts) {
|
|
68
|
+
const manifestAccount = accounts.find((account) => Boolean(account.authToken));
|
|
35
69
|
const manifests = new ManifestProvider(this.config, this.storage.manifests, undefined, manifestAccount?.authToken);
|
|
36
70
|
const transactions = new TransactionIdProvider(options.transactionIdSource, {
|
|
37
71
|
enabled: this.config.transactionIdEnabled && (!options.sessionFactory || Boolean(options.transactionIdSource)),
|
|
@@ -45,13 +79,13 @@ export class XTrawl {
|
|
|
45
79
|
...(this.config.apiHttpImpersonate ? { impersonate: this.config.apiHttpImpersonate } : {}),
|
|
46
80
|
...(options.sessionFactory ? { factory: options.sessionFactory } : {}),
|
|
47
81
|
});
|
|
48
|
-
this.pool = new AccountPool(this.
|
|
82
|
+
this.pool = new AccountPool(this.accountStore, sessions, this.config, async (account) => {
|
|
49
83
|
if (!account.authToken)
|
|
50
84
|
return false;
|
|
51
85
|
const cookies = await bootstrapCookiesFromAuthToken(account.authToken, undefined, account.proxy);
|
|
52
86
|
if (!cookies?.ct0)
|
|
53
87
|
return false;
|
|
54
|
-
this.
|
|
88
|
+
await this.accountStore.upsert({
|
|
55
89
|
...account,
|
|
56
90
|
status: 1,
|
|
57
91
|
availableUntil: 0,
|
|
@@ -59,17 +93,15 @@ export class XTrawl {
|
|
|
59
93
|
cookies: { ...account.cookies, ...cookies },
|
|
60
94
|
});
|
|
61
95
|
return true;
|
|
62
|
-
});
|
|
96
|
+
}, accounts, options.accountStore ? `external:${options.accountStore.kind ?? "custom"}` : this.config.dbPath, (current) => this.accounts.initialize(current));
|
|
63
97
|
this.engine = new ApiEngine(this.config, manifests, new GraphqlTransport(transactions));
|
|
64
98
|
}
|
|
65
|
-
static async create(options = {}) {
|
|
66
|
-
const client = new XTrawl(options);
|
|
67
|
-
await client.bootstrapMissingAccounts();
|
|
68
|
-
return client;
|
|
69
|
-
}
|
|
70
99
|
async search(query = "", options = {}) {
|
|
71
100
|
return collectSearch(this.collectionContext(), query, options);
|
|
72
101
|
}
|
|
102
|
+
async searchPage(query = "", options = {}) {
|
|
103
|
+
return collectSearchPage(this.collectionContext(), query, options);
|
|
104
|
+
}
|
|
73
105
|
async getUserInfo(targets, options = {}) {
|
|
74
106
|
const normalized = normalizeTargets(targets).targets;
|
|
75
107
|
return collectProfiles(this.collectionContext(), normalized, options);
|
|
@@ -114,7 +146,7 @@ export class XTrawl {
|
|
|
114
146
|
bearerToken: "[redacted]",
|
|
115
147
|
...(this.config.proxy ? { proxy: redactProxy(this.config.proxy) } : {}),
|
|
116
148
|
},
|
|
117
|
-
accounts: this.db.listAccounts(),
|
|
149
|
+
accounts: this.usesExternalAccountStore ? this.accounts.inspectCached() : this.db.listAccounts(),
|
|
118
150
|
};
|
|
119
151
|
}
|
|
120
152
|
get poolSummary() {
|
|
@@ -126,9 +158,17 @@ export class XTrawl {
|
|
|
126
158
|
collectionContext() {
|
|
127
159
|
return { config: this.config, pool: this.pool, engine: this.engine, storage: this.storage };
|
|
128
160
|
}
|
|
129
|
-
|
|
161
|
+
provisionSqlite(options) {
|
|
162
|
+
for (const record of this.provisionRecords(options))
|
|
163
|
+
this.storage.accounts.upsert(record);
|
|
164
|
+
}
|
|
165
|
+
async provisionExternal(options) {
|
|
166
|
+
for (const record of this.provisionRecords(options))
|
|
167
|
+
await this.accountStore.upsert(record);
|
|
168
|
+
}
|
|
169
|
+
provisionRecords(options) {
|
|
130
170
|
if (options.provision === false)
|
|
131
|
-
return;
|
|
171
|
+
return [];
|
|
132
172
|
const records = [];
|
|
133
173
|
if (options.accounts)
|
|
134
174
|
records.push(...options.accounts.map(accountInputToRecord));
|
|
@@ -147,16 +187,15 @@ export class XTrawl {
|
|
|
147
187
|
records.push(...loadAccountsFileSync(options.accountsFile));
|
|
148
188
|
if (options.envFile)
|
|
149
189
|
records.push(...loadAccountFromEnvironmentSync(options.envFile).map(accountInputToRecord));
|
|
150
|
-
|
|
151
|
-
this.storage.accounts.upsert(record);
|
|
190
|
+
return records;
|
|
152
191
|
}
|
|
153
192
|
async bootstrapMissingAccounts() {
|
|
154
|
-
for (const account of this.
|
|
193
|
+
for (const account of await this.accountStore.list()) {
|
|
155
194
|
if (!account.authToken || account.csrfToken)
|
|
156
195
|
continue;
|
|
157
196
|
const cookies = await bootstrapCookiesFromAuthToken(account.authToken, undefined, account.proxy);
|
|
158
197
|
if (cookies?.ct0)
|
|
159
|
-
this.
|
|
198
|
+
await this.accountStore.upsert({
|
|
160
199
|
...account,
|
|
161
200
|
csrfToken: cookies.ct0,
|
|
162
201
|
cookies: { ...account.cookies, ...cookies },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/client/client.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,8BAA8B,EAAE,MAAM,0BAA0B,CAAC;AAC1E,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/client/client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { AccountInput, ProxySettings } from "../domain/accounts.js";
|
|
1
|
+
import type { AccountInput, AccountRecord, ProxySettings } from "../domain/accounts.js";
|
|
2
2
|
import type { StorageBundle } from "../storage/index.js";
|
|
3
3
|
export interface AccountListOptions {
|
|
4
4
|
readonly eligibleOnly?: boolean;
|
|
@@ -53,4 +53,5 @@ export declare class XTrawlDatabase {
|
|
|
53
53
|
readonly lastRun?: import("../storage/run-repository.js").RunRecord;
|
|
54
54
|
};
|
|
55
55
|
}
|
|
56
|
+
export declare function redactAccount(account: AccountRecord, options: Pick<AccountListOptions, "includeCookies" | "revealSecrets">): Record<string, unknown>;
|
|
56
57
|
//# sourceMappingURL=database.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"database.d.ts","sourceRoot":"","sources":["../../src/client/database.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,
|
|
1
|
+
{"version":3,"file":"database.d.ts","sourceRoot":"","sources":["../../src/client/database.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACxF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAGzD,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC;IAChC,QAAQ,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC;IAChC,QAAQ,CAAC,cAAc,CAAC,EAAE,OAAO,CAAC;IAClC,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAC;CAClC;AAED,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,QAAQ,CAAC,EAAE,SAAS,YAAY,EAAE,CAAC;IAC5C,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,aAAa,CAAC;CACzC;AAED,qBAAa,cAAc;IACN,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAAP,OAAO,EAAE,aAAa;IAEnD,eAAe;IAIf,YAAY,CAAC,OAAO,GAAE,kBAAuB,GAAG,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE;IAQlF,UAAU,CACf,QAAQ,EAAE,MAAM,EAChB,OAAO,GAAE,IAAI,CAAC,kBAAkB,EAAE,gBAAgB,GAAG,eAAe,CAAM,GACzE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS;IAK/B,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;IAIxC,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,aAAa,GAAG,OAAO;IAI1E,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,SAAW,GAAG,OAAO;IAI3D,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,UAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;IAmB7E,qBAAqB,CAAC,SAAS,CAAC,EAAE,SAAS,MAAM,EAAE,EAAE,eAAe,UAAQ,GAAG,MAAM;IAIrF,WAAW,CAAC,WAAW,UAAO,GAAG,MAAM;IAIvC,kBAAkB,CAAC,SAAS,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM;IAIzD,cAAc,CAAC,OAAO,EAAE,oBAAoB,GAAG;QACpD,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;QAC3B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;KAC3B;IAaM,yBAAyB,CAAC,MAAM,UAAO;;;;;;;;;;;IASvC,aAAa,CAAC,SAAS,EAAE,MAAM;IAI/B,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAI3C,mBAAmB,IAAI,MAAM;IAI7B,QAAQ,CAAC,KAAK,SAAK;IAInB,OAAO;IAIP,WAAW,CAAC,KAAK,SAAM;;;;;CAG/B;AAED,wBAAgB,aAAa,CAC3B,OAAO,EAAE,aAAa,EACtB,OAAO,EAAE,IAAI,CAAC,kBAAkB,EAAE,gBAAgB,GAAG,eAAe,CAAC,GACpE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAgBzB"}
|
package/dist/client/database.js
CHANGED
|
@@ -104,7 +104,7 @@ export class XTrawlDatabase {
|
|
|
104
104
|
return this.storage.runs.summary(limit);
|
|
105
105
|
}
|
|
106
106
|
}
|
|
107
|
-
function redactAccount(account, options) {
|
|
107
|
+
export function redactAccount(account, options) {
|
|
108
108
|
const safe = {
|
|
109
109
|
...account,
|
|
110
110
|
authToken: account.authToken ? tokenFingerprint(account.authToken) : undefined,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"database.js","sourceRoot":"","sources":["../../src/client/database.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"database.js","sourceRoot":"","sources":["../../src/client/database.ts"],"names":[],"mappings":"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"}
|
package/dist/client/search.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { ClientConfig } from "../config/types.js";
|
|
2
|
-
import type { SearchResult } from "../domain/records.js";
|
|
3
|
-
import type { SearchRequest } from "../domain/requests.js";
|
|
2
|
+
import type { SearchPageResult, SearchResult } from "../domain/records.js";
|
|
3
|
+
import type { SearchPageRequest, SearchRequest } from "../domain/requests.js";
|
|
4
4
|
import type { ApiEngine } from "../engine/api-engine.js";
|
|
5
5
|
import type { AccountPool } from "../pool/account-pool.js";
|
|
6
6
|
import type { StorageBundle } from "../storage/index.js";
|
|
@@ -14,6 +14,7 @@ interface SearchTask {
|
|
|
14
14
|
readonly id: string;
|
|
15
15
|
readonly request: SearchRequest;
|
|
16
16
|
}
|
|
17
|
+
export declare function collectSearchPage(context: SearchContext, query: string, options: SearchPageRequest): Promise<SearchPageResult>;
|
|
17
18
|
export declare function collectSearch(context: SearchContext, query: string, options: SearchRequest): Promise<SearchResult>;
|
|
18
19
|
export declare function withDefaultBounds(request: SearchRequest, now?: Date): SearchRequest;
|
|
19
20
|
export declare function splitSearchTasks(request: SearchRequest, requestedSplits: number, minIntervalMs: number): readonly SearchTask[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search.d.ts","sourceRoot":"","sources":["../../src/client/search.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEvD,OAAO,KAAK,EAAE,YAAY,EAAe,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"search.d.ts","sourceRoot":"","sources":["../../src/client/search.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEvD,OAAO,KAAK,EAAE,gBAAgB,EAAE,YAAY,EAAe,MAAM,sBAAsB,CAAC;AACxF,OAAO,KAAK,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAC9E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAG3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAIzD,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAC3B,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC;IAC3B,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAC;CACjC;AAED,UAAU,UAAU;IAClB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAC;CACjC;AAQD,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,aAAa,EACtB,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,gBAAgB,CAAC,CAO3B;AAED,wBAAsB,aAAa,CACjC,OAAO,EAAE,aAAa,EACtB,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,YAAY,CAAC,CA6FvB;AAmBD,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,aAAa,EAAE,GAAG,OAAa,GAAG,aAAa,CAIzF;AAED,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,aAAa,EACtB,eAAe,EAAE,MAAM,EACvB,aAAa,EAAE,MAAM,GACpB,SAAS,UAAU,EAAE,CAavB"}
|
package/dist/client/search.js
CHANGED
|
@@ -3,6 +3,14 @@ import { queryHash } from "../query/hash.js";
|
|
|
3
3
|
import { ExecutionRunner } from "../runner/runner.js";
|
|
4
4
|
import { saveRows } from "../output/writer.js";
|
|
5
5
|
import { searchOutputName } from "../output/names.js";
|
|
6
|
+
export async function collectSearchPage(context, query, options) {
|
|
7
|
+
const { cursor, maxAccountSwitches, ...searchOptions } = options;
|
|
8
|
+
const request = withDefaultBounds({
|
|
9
|
+
...searchOptions,
|
|
10
|
+
...(query ? { searchQuery: query } : {}),
|
|
11
|
+
});
|
|
12
|
+
return requestSearchPage(context, request, { cursor, maxAccountSwitches });
|
|
13
|
+
}
|
|
6
14
|
export async function collectSearch(context, query, options) {
|
|
7
15
|
const request = withDefaultBounds({ ...options, ...(query ? { searchQuery: query } : {}) });
|
|
8
16
|
const hash = queryHash({ operation: "search", request });
|
|
@@ -31,8 +39,8 @@ export async function collectSearch(context, query, options) {
|
|
|
31
39
|
let cursor = cursors.get(task.id);
|
|
32
40
|
let emptyPages = 0;
|
|
33
41
|
while (!limitReached) {
|
|
34
|
-
const page = await
|
|
35
|
-
|
|
42
|
+
const page = await requestSearchPage(context, task.request, {
|
|
43
|
+
cursor,
|
|
36
44
|
onRetry: () => {
|
|
37
45
|
poolRetries += 1;
|
|
38
46
|
},
|
|
@@ -50,14 +58,14 @@ export async function collectSearch(context, query, options) {
|
|
|
50
58
|
}
|
|
51
59
|
}
|
|
52
60
|
emptyPages = added === 0 ? emptyPages + 1 : 0;
|
|
53
|
-
if (page.
|
|
54
|
-
cursors.set(task.id, page.
|
|
61
|
+
if (page.nextCursor) {
|
|
62
|
+
cursors.set(task.id, page.nextCursor);
|
|
55
63
|
if (request.resume)
|
|
56
|
-
context.storage.checkpoints.save(task.id, { root: page.
|
|
64
|
+
context.storage.checkpoints.save(task.id, { root: page.nextCursor });
|
|
57
65
|
}
|
|
58
|
-
if (!page.
|
|
66
|
+
if (!page.nextCursor || emptyPages >= (request.maxEmptyPages ?? context.config.maxEmptyPages))
|
|
59
67
|
break;
|
|
60
|
-
cursor = page.
|
|
68
|
+
cursor = page.nextCursor;
|
|
61
69
|
}
|
|
62
70
|
if (!limitReached)
|
|
63
71
|
context.storage.checkpoints.clear(task.id);
|
|
@@ -92,6 +100,14 @@ export async function collectSearch(context, query, options) {
|
|
|
92
100
|
: new RunFailed(error instanceof Error ? error.message : String(error));
|
|
93
101
|
}
|
|
94
102
|
}
|
|
103
|
+
async function requestSearchPage(context, request, options = {}) {
|
|
104
|
+
const page = await context.pool.execute("search", ({ session }) => context.engine.search(session, request, options.cursor), {
|
|
105
|
+
countTweets: (value) => value.tweets.length,
|
|
106
|
+
...(options.onRetry ? { onRetry: options.onRetry } : {}),
|
|
107
|
+
...(options.maxAccountSwitches === undefined ? {} : { maxAccountSwitches: options.maxAccountSwitches }),
|
|
108
|
+
});
|
|
109
|
+
return { tweets: page.tweets, nextCursor: page.cursor };
|
|
110
|
+
}
|
|
95
111
|
export function withDefaultBounds(request, now = new Date()) {
|
|
96
112
|
const until = request.until ?? dateOnly(now);
|
|
97
113
|
const since = request.since ?? dateOnly(new Date(now.getTime() - 30 * 24 * 60 * 60 * 1_000));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search.js","sourceRoot":"","sources":["../../src/client/search.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAK7D,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"search.js","sourceRoot":"","sources":["../../src/client/search.ts"],"names":[],"mappings":"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"}
|