thordata-js-sdk 0.4.0 → 1.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -21,7 +21,19 @@ async function main() {
21
21
  }
22
22
  let parameters;
23
23
  try {
24
- parameters = JSON.parse(parametersJson);
24
+ const raw = JSON.parse(parametersJson);
25
+ // Dashboard curl uses spider_parameters as an ARRAY string: [{...}]
26
+ // Accept both "{...}" and "[{...}]". SDK createScraperTask expects ONE parameter object.
27
+ if (Array.isArray(raw)) {
28
+ if (raw.length === 0) {
29
+ console.error("THORDATA_TASK_PARAMETERS_JSON must not be an empty array");
30
+ process.exit(1);
31
+ }
32
+ parameters = raw[0];
33
+ }
34
+ else {
35
+ parameters = raw;
36
+ }
25
37
  }
26
38
  catch {
27
39
  console.error("THORDATA_TASK_PARAMETERS_JSON must be valid JSON");
@@ -1 +1 @@
1
- {"version":3,"file":"basic_scraper_task.js","sourceRoot":"","sources":["../../examples/basic_scraper_task.ts"],"names":[],"mappings":"AAAA,iCAAiC;AAEjC,OAAO,eAAe,CAAC;AACvB,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjD,KAAK,UAAU,IAAI;IACjB,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC;IACxD,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC;IACtD,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC;IAElD,gHAAgH;IAChH,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC;IACzD,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC;IACrD,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,uBAAuB,IAAI,aAAa,CAAC;IACtE,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,6BAA6B,IAAI,IAAI,CAAC;IAEzE,IAAI,CAAC,YAAY,IAAI,CAAC,WAAW,IAAI,CAAC,SAAS,EAAE,CAAC;QAChD,OAAO,CAAC,KAAK,CACX,uFAAuF,CACxF,CAAC;QACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,yFAAyF;IACzF,IAAI,CAAC,UAAU,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC7B,OAAO,CAAC,GAAG,CACT,wJAAwJ,CACzJ,CAAC;QACF,OAAO;IACT,CAAC;IAED,IAAI,UAAe,CAAC;IACpB,IAAI,CAAC;QACH,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IAC1C,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,CAAC,KAAK,CAAC,kDAAkD,CAAC,CAAC;QAClE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,MAAM,MAAM,GAAG,IAAI,cAAc,CAAC;QAChC,YAAY;QACZ,WAAW;QACX,SAAS;KACV,CAAC,CAAC;IAEH,OAAO,CAAC,GAAG,CAAC,kDAAkD,CAAC,CAAC;IAChE,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,iBAAiB,CAAC;QAC5C,qEAAqE;QACrE,QAAQ;QACR,QAAQ;QACR,UAAU;QACV,UAAU;KACX,CAAC,CAAC;IAEH,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;IAErC,OAAO,CAAC,GAAG,CAAC,oCAAoC,CAAC,CAAC;IAClD,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE;QAC9C,cAAc,EAAE,IAAI;QACpB,SAAS,EAAE,OAAO;KACnB,CAAC,CAAC;IAEH,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;IAErC,IAAI,MAAM,CAAC,WAAW,EAAE,KAAK,OAAO,IAAI,MAAM,CAAC,WAAW,EAAE,KAAK,SAAS,EAAE,CAAC;QAC3E,MAAM,WAAW,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC/D,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC;IAC5C,CAAC;AACH,CAAC;AAED,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;IACnB,OAAO,CAAC,KAAK,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC;IACnC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"basic_scraper_task.js","sourceRoot":"","sources":["../../examples/basic_scraper_task.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,5 @@
1
+ export declare function loadEnv(): void;
2
+ export declare function env(name: string): string;
3
+ export declare function skipIfMissing(...required: string[]): boolean;
4
+ export declare function printJSON(v: unknown): void;
5
+ export declare function truncate(s: string, n: number): string;
@@ -0,0 +1,25 @@
1
+ // examples/internal/example.ts
2
+ import * as dotenv from "dotenv";
3
+ export function loadEnv() {
4
+ dotenv.config({ path: ".env" });
5
+ }
6
+ export function env(name) {
7
+ return (process.env[name] || "").trim();
8
+ }
9
+ export function skipIfMissing(...required) {
10
+ const missing = required.filter((k) => !env(k));
11
+ if (missing.length === 0)
12
+ return false;
13
+ console.log("Skipping example: missing env:", missing.join(", "));
14
+ console.log("Tip: copy .env.example to .env and fill values, then re-run.");
15
+ return true;
16
+ }
17
+ export function printJSON(v) {
18
+ console.log(JSON.stringify(v, null, 2));
19
+ }
20
+ export function truncate(s, n) {
21
+ if (n <= 0)
22
+ return "";
23
+ return s.length <= n ? s : s.slice(0, n) + "...";
24
+ }
25
+ //# sourceMappingURL=example.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"example.js","sourceRoot":"","sources":["../../../examples/internal/example.ts"],"names":[],"mappings":"AAAA,+BAA+B;AAC/B,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AAEjC,MAAM,UAAU,OAAO;IACrB,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;AAClC,CAAC;AAED,MAAM,UAAU,GAAG,CAAC,IAAY;IAC9B,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;AAC1C,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,GAAG,QAAkB;IACjD,MAAM,OAAO,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAChD,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IAEvC,OAAO,CAAC,GAAG,CAAC,gCAAgC,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAClE,OAAO,CAAC,GAAG,CAAC,8DAA8D,CAAC,CAAC;IAC5E,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,CAAU;IAClC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;AAC1C,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,CAAS,EAAE,CAAS;IAC3C,IAAI,CAAC,IAAI,CAAC;QAAE,OAAO,EAAE,CAAC;IACtB,OAAO,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,KAAK,CAAC;AACnD,CAAC"}
@@ -0,0 +1 @@
1
+ export {};
@@ -0,0 +1,21 @@
1
+ // examples/locations_basic.ts
2
+ import { loadEnv, skipIfMissing, printJSON } from "./internal/example.js";
3
+ import { ThordataClient } from "../src/index.js";
4
+ async function main() {
5
+ loadEnv();
6
+ if (skipIfMissing("THORDATA_SCRAPER_TOKEN"))
7
+ return;
8
+ const client = new ThordataClient({
9
+ scraperToken: process.env.THORDATA_SCRAPER_TOKEN,
10
+ publicToken: process.env.THORDATA_PUBLIC_TOKEN,
11
+ publicKey: process.env.THORDATA_PUBLIC_KEY,
12
+ });
13
+ // listCountries is proxy-location countries list (by proxy type)
14
+ const out = await client.listCountries("residential");
15
+ printJSON(out);
16
+ }
17
+ main().catch((e) => {
18
+ console.error(e);
19
+ process.exit(1);
20
+ });
21
+ //# sourceMappingURL=locations_basic.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"locations_basic.js","sourceRoot":"","sources":["../../examples/locations_basic.ts"],"names":[],"mappings":"AAAA,8BAA8B;AAC9B,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAC1E,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjD,KAAK,UAAU,IAAI;IACjB,OAAO,EAAE,CAAC;IACV,IAAI,aAAa,CAAC,wBAAwB,CAAC;QAAE,OAAO;IAEpD,MAAM,MAAM,GAAG,IAAI,cAAc,CAAC;QAChC,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,sBAAuB;QACjD,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB;QAC9C,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB;KAC3C,CAAC,CAAC;IAEH,iEAAiE;IACjE,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;IACtD,SAAS,CAAC,GAAG,CAAC,CAAC;AACjB,CAAC;AAED,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;IACjB,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACjB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC"}
@@ -0,0 +1 @@
1
+ export {};
@@ -0,0 +1,25 @@
1
+ // examples/serp_basic.ts
2
+ import { loadEnv, skipIfMissing, printJSON } from "./internal/example.js";
3
+ import { ThordataClient } from "../src/index.js";
4
+ async function main() {
5
+ loadEnv();
6
+ if (skipIfMissing("THORDATA_SCRAPER_TOKEN"))
7
+ return;
8
+ const client = new ThordataClient({
9
+ scraperToken: process.env.THORDATA_SCRAPER_TOKEN,
10
+ publicToken: process.env.THORDATA_PUBLIC_TOKEN,
11
+ publicKey: process.env.THORDATA_PUBLIC_KEY,
12
+ });
13
+ const out = await client.serpSearch({
14
+ query: "pizza",
15
+ engine: "google",
16
+ country: "us",
17
+ output_format: "json",
18
+ });
19
+ printJSON(out);
20
+ }
21
+ main().catch((e) => {
22
+ console.error(e);
23
+ process.exit(1);
24
+ });
25
+ //# sourceMappingURL=serp_basic.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"serp_basic.js","sourceRoot":"","sources":["../../examples/serp_basic.ts"],"names":[],"mappings":"AAAA,yBAAyB;AACzB,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAC1E,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjD,KAAK,UAAU,IAAI;IACjB,OAAO,EAAE,CAAC;IACV,IAAI,aAAa,CAAC,wBAAwB,CAAC;QAAE,OAAO;IAEpD,MAAM,MAAM,GAAG,IAAI,cAAc,CAAC;QAChC,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,sBAAuB;QACjD,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB;QAC9C,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB;KAC3C,CAAC,CAAC;IAEH,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC;QAClC,KAAK,EAAE,OAAO;QACd,MAAM,EAAE,QAAQ;QAChB,OAAO,EAAE,IAAI;QACb,aAAa,EAAE,MAAM;KACtB,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,CAAC,CAAC;AACjB,CAAC;AAED,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;IACjB,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACjB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC"}
@@ -0,0 +1 @@
1
+ export {};
@@ -0,0 +1,29 @@
1
+ // examples/universal_basic.ts
2
+ import { loadEnv, skipIfMissing, truncate } from "./internal/example.js";
3
+ import { ThordataClient } from "../src/index.js";
4
+ import fs from "node:fs";
5
+ async function main() {
6
+ loadEnv();
7
+ if (skipIfMissing("THORDATA_SCRAPER_TOKEN"))
8
+ return;
9
+ const client = new ThordataClient({
10
+ scraperToken: process.env.THORDATA_SCRAPER_TOKEN,
11
+ publicToken: process.env.THORDATA_PUBLIC_TOKEN,
12
+ publicKey: process.env.THORDATA_PUBLIC_KEY,
13
+ });
14
+ const out = await client.universalScrape({
15
+ url: "https://httpbin.org/html",
16
+ output_format: "html",
17
+ js_render: false,
18
+ });
19
+ const html = typeof out === "string" ? out : JSON.stringify(out, null, 2);
20
+ fs.writeFileSync("universal_output.html", html, "utf8");
21
+ console.log("saved: universal_output.html");
22
+ console.log("length:", html.length);
23
+ console.log("preview:", truncate(html, 300));
24
+ }
25
+ main().catch((e) => {
26
+ console.error(e);
27
+ process.exit(1);
28
+ });
29
+ //# sourceMappingURL=universal_basic.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"universal_basic.js","sourceRoot":"","sources":["../../examples/universal_basic.ts"],"names":[],"mappings":"AAAA,8BAA8B;AAE9B,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACzE,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,MAAM,SAAS,CAAC;AAEzB,KAAK,UAAU,IAAI;IACjB,OAAO,EAAE,CAAC;IACV,IAAI,aAAa,CAAC,wBAAwB,CAAC;QAAE,OAAO;IAEpD,MAAM,MAAM,GAAG,IAAI,cAAc,CAAC;QAChC,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,sBAAuB;QACjD,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB;QAC9C,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB;KAC3C,CAAC,CAAC;IAEH,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,eAAe,CAAC;QACvC,GAAG,EAAE,0BAA0B;QAC/B,aAAa,EAAE,MAAM;QACrB,SAAS,EAAE,KAAK;KACjB,CAAC,CAAC;IAEH,MAAM,IAAI,GAAG,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IAC1E,EAAE,CAAC,aAAa,CAAC,uBAAuB,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;IACxD,OAAO,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAC;IAC5C,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACpC,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC;AAC/C,CAAC;AAED,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;IACjB,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACjB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC"}
@@ -7,8 +7,6 @@ async function main() {
7
7
  const scraperToken = process.env.THORDATA_SCRAPER_TOKEN;
8
8
  const publicToken = process.env.THORDATA_PUBLIC_TOKEN;
9
9
  const publicKey = process.env.THORDATA_PUBLIC_KEY;
10
- const sign = process.env.THORDATA_SIGN || publicToken;
11
- const apiKey = process.env.THORDATA_API_KEY || publicKey;
12
10
  if (!scraperToken) {
13
11
  console.error("❌ THORDATA_SCRAPER_TOKEN required");
14
12
  process.exit(1);
@@ -17,8 +15,6 @@ async function main() {
17
15
  scraperToken,
18
16
  publicToken,
19
17
  publicKey,
20
- sign, // Public API NEW
21
- apiKey, // Public API NEW
22
18
  });
23
19
  console.log("========================================");
24
20
  console.log("Thordata SDK - New Features Verification");
@@ -88,34 +84,6 @@ async function main() {
88
84
  return false;
89
85
  }
90
86
  },
91
- api_new_balance: async () => {
92
- console.log("\n--- Testing: API NEW - Balance ---");
93
- try {
94
- const res = await client.getResidentialBalance();
95
- console.log(`✅ Balance: ${(res.balance / 1024 ** 3).toFixed(2)} GB`);
96
- return true;
97
- }
98
- catch (e) {
99
- console.log(`❌ Failed: ${e.message}`);
100
- return false;
101
- }
102
- },
103
- api_new_isp: async () => {
104
- console.log("\n--- Testing: API NEW - ISP Regions ---");
105
- try {
106
- const regions = await client.getIspRegions();
107
- console.log(`✅ Regions: ${regions.length}`);
108
- if (regions.length > 0) {
109
- const r = regions[0];
110
- console.log(` ${r.country}/${r.city}: ${r.num} IPs`);
111
- }
112
- return true;
113
- }
114
- catch (e) {
115
- console.log(`❌ Failed: ${e.message}`);
116
- return false;
117
- }
118
- },
119
87
  };
120
88
  let passed = 0;
121
89
  let total = 0;
@@ -1 +1 @@
1
- {"version":3,"file":"verify_new_features.js","sourceRoot":"","sources":["../../examples/verify_new_features.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"verify_new_features.js","sourceRoot":"","sources":["../../examples/verify_new_features.ts"],"names":[],"mappings":"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"}
@@ -12,10 +12,6 @@ export interface ThordataClientConfig {
12
12
  /** Public key for Web Scraper API and Location API */
13
13
  publicKey?: string;
14
14
  /** Request timeout in milliseconds (default: 30000) */
15
- sign?: string;
16
- /** Sign for Public API NEW (optional, falls back to publicToken) */
17
- apiKey?: string;
18
- /** API Key for Public API NEW (optional, falls back to publicKey) */
19
15
  timeoutMs?: number;
20
16
  /** Maximum number of retries on failure (default: 0) */
21
17
  maxRetries?: number;
@@ -23,10 +19,7 @@ export interface ThordataClientConfig {
23
19
  baseUrls?: Partial<ThordataBaseUrls>;
24
20
  /** Custom User-Agent string */
25
21
  userAgent?: string;
26
- /**
27
- * Whether to verify SSL certificates (default: true).
28
- * Set to false only for testing with self-signed certificates.
29
- */
22
+ /** Whether to verify SSL certificates (default: true). */
30
23
  verifySsl?: boolean;
31
24
  }
32
25
  /**
@@ -36,9 +29,6 @@ export declare class ThordataClient {
36
29
  private scraperToken;
37
30
  private publicToken?;
38
31
  private publicKey?;
39
- private sign?;
40
- private apiKey?;
41
- private gatewayBaseUrl;
42
32
  private timeoutMs;
43
33
  private maxRetries;
44
34
  private http;
@@ -152,13 +142,6 @@ export declare class ThordataClient {
152
142
  createProxyUser(username: string, pass: string, trafficLimit?: number, status?: boolean, proxyType?: ProxyTypeParam): Promise<any>;
153
143
  addWhitelistIp(ip: string, status?: boolean, proxyType?: ProxyTypeParam): Promise<any>;
154
144
  listProxyServers(proxyType: 1 | 2): Promise<ProxyServer[]>;
155
- private buildSignHeaders;
156
- getResidentialBalance(): Promise<{
157
- balance: number;
158
- expire_time: number;
159
- }>;
160
- getIspRegions(): Promise<any[]>;
161
- listIspProxies(): Promise<any[]>;
162
145
  /**
163
146
  * Internal method to call locations API.
164
147
  */
@@ -1,4 +1,6 @@
1
1
  // src/client.ts
2
+ import { HttpsProxyAgent } from "https-proxy-agent";
3
+ import { HttpProxyAgent } from "http-proxy-agent";
2
4
  import axios from "axios";
3
5
  import https from "node:https";
4
6
  import { Engine, TaskStatus } from "./enums.js";
@@ -22,9 +24,6 @@ export class ThordataClient {
22
24
  scraperToken;
23
25
  publicToken;
24
26
  publicKey;
25
- sign;
26
- apiKey;
27
- gatewayBaseUrl;
28
27
  timeoutMs;
29
28
  maxRetries;
30
29
  http;
@@ -77,10 +76,6 @@ export class ThordataClient {
77
76
  this.proxyListUrl = `${proxyApiBase}/proxy/proxy-list`;
78
77
  this.proxyExpirationUrl = `${apiBase}/proxy/expiration-time`;
79
78
  this.taskListUrl = `${this.baseUrls.webScraperApiBaseUrl}/tasks-list`;
80
- this.sign = config.sign || process.env.THORDATA_SIGN || this.publicToken;
81
- this.apiKey = config.apiKey || process.env.THORDATA_API_KEY || this.publicKey;
82
- this.gatewayBaseUrl =
83
- process.env.THORDATA_GATEWAY_BASE_URL || "https://api.thordata.com/api/gateway";
84
79
  }
85
80
  /**
86
81
  * Execute request with retry logic.
@@ -167,7 +162,7 @@ export class ThordataClient {
167
162
  if (noCache !== undefined)
168
163
  payload.no_cache = noCache ? "True" : "False";
169
164
  Object.assign(payload, extra);
170
- const headers = buildBuilderHeaders(this.scraperToken, this.publicToken, this.publicKey);
165
+ const headers = buildAuthHeaders(this.scraperToken);
171
166
  return this.execute(async () => {
172
167
  const res = await this.http.post(this.serpUrl, toFormBody(payload), {
173
168
  headers,
@@ -277,6 +272,7 @@ export class ThordataClient {
277
272
  * Create a new Web Scraper task.
278
273
  */
279
274
  async createScraperTask(options) {
275
+ this.requirePublicCreds();
280
276
  const { fileName, spiderId, spiderName, parameters, universalParams, includeErrors = true, } = options;
281
277
  const payload = {
282
278
  file_name: fileName,
@@ -288,7 +284,7 @@ export class ThordataClient {
288
284
  if (universalParams) {
289
285
  payload.spider_universal = JSON.stringify(universalParams);
290
286
  }
291
- const headers = buildAuthHeaders(this.scraperToken);
287
+ const headers = buildBuilderHeaders(this.scraperToken, this.publicToken, this.publicKey);
292
288
  return this.execute(async () => {
293
289
  const res = await this.http.post(this.scraperBuilderUrl, toFormBody(payload), { headers });
294
290
  const data = safeParseJson(res.data);
@@ -354,6 +350,7 @@ export class ThordataClient {
354
350
  * Create a YouTube video/audio download task.
355
351
  */
356
352
  async createVideoTask(options) {
353
+ this.requirePublicCreds();
357
354
  const { fileName, spiderId, spiderName, parameters, commonSettings, includeErrors = true, } = options;
358
355
  const payload = {
359
356
  file_name: fileName,
@@ -420,7 +417,15 @@ export class ThordataClient {
420
417
  timeout: timeout ?? this.timeoutMs,
421
418
  };
422
419
  if (proxy instanceof Proxy) {
423
- axiosConfig.proxy = proxy.toAxiosConfig();
420
+ const proxyUrl = proxy.toProxyUrl();
421
+ // Disable axios proxy logic & env proxy interference; use explicit agents
422
+ axiosConfig.proxy = false;
423
+ // IMPORTANT:
424
+ // - httpAgent is used for http:// targets
425
+ // - httpsAgent is used for https:// targets
426
+ // Both should point to a proxy agent that can CONNECT through the proxy.
427
+ axiosConfig.httpAgent = new HttpProxyAgent(proxyUrl);
428
+ axiosConfig.httpsAgent = new HttpsProxyAgent(proxyUrl);
424
429
  }
425
430
  return this.execute(async () => {
426
431
  const res = await this.http.get(url, axiosConfig);
@@ -528,48 +533,6 @@ export class ThordataClient {
528
533
  return (data.data ?? data.list ?? []);
529
534
  });
530
535
  }
531
- // Helper for API NEW headers
532
- buildSignHeaders() {
533
- if (!this.sign || !this.apiKey) {
534
- throw new ThordataConfigError("sign and apiKey are required for Public API NEW");
535
- }
536
- return {
537
- sign: this.sign,
538
- apiKey: this.apiKey,
539
- "Content-Type": "application/x-www-form-urlencoded",
540
- };
541
- }
542
- // --- Public API NEW Methods ---
543
- async getResidentialBalance() {
544
- const headers = this.buildSignHeaders();
545
- return this.execute(async () => {
546
- const res = await this.http.post(`${this.gatewayBaseUrl}/getFlowBalance`, {}, { headers });
547
- const data = safeParseJson(res.data);
548
- if (data?.code !== 200)
549
- raiseForCode("Get balance failed", data, res.status);
550
- return data.data ?? {};
551
- });
552
- }
553
- async getIspRegions() {
554
- const headers = this.buildSignHeaders();
555
- return this.execute(async () => {
556
- const res = await this.http.post(`${this.gatewayBaseUrl}/getRegionIsp`, {}, { headers });
557
- const data = safeParseJson(res.data);
558
- if (data?.code !== 200)
559
- raiseForCode("Get ISP regions failed", data, res.status);
560
- return data.data ?? [];
561
- });
562
- }
563
- async listIspProxies() {
564
- const headers = this.buildSignHeaders();
565
- return this.execute(async () => {
566
- const res = await this.http.post(`${this.gatewayBaseUrl}/queryListIsp`, {}, { headers });
567
- const data = safeParseJson(res.data);
568
- if (data?.code !== 200)
569
- raiseForCode("List ISP proxies failed", data, res.status);
570
- return data.data ?? [];
571
- });
572
- }
573
536
  // --------------------------
574
537
  // 5) Location API
575
538
  // --------------------------
@@ -1 +1 @@
1
- {"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/client.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/client.ts"],"names":[],"mappings":"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"}
@@ -1,15 +1,15 @@
1
1
  export function resolveBaseUrls(env, overrides) {
2
- const scraperapiBaseUrl = overrides?.scraperapiBaseUrl ??
3
- env.THORDATA_SCRAPERAPI_BASE_URL ??
2
+ const scraperapiBaseUrl = overrides?.scraperapiBaseUrl ||
3
+ env.THORDATA_SCRAPERAPI_BASE_URL ||
4
4
  "https://scraperapi.thordata.com";
5
- const universalapiBaseUrl = overrides?.universalapiBaseUrl ??
6
- env.THORDATA_UNIVERSALAPI_BASE_URL ??
5
+ const universalapiBaseUrl = overrides?.universalapiBaseUrl ||
6
+ env.THORDATA_UNIVERSALAPI_BASE_URL ||
7
7
  "https://universalapi.thordata.com";
8
- const webScraperApiBaseUrl = overrides?.webScraperApiBaseUrl ??
9
- env.THORDATA_WEB_SCRAPER_API_BASE_URL ??
8
+ const webScraperApiBaseUrl = overrides?.webScraperApiBaseUrl ||
9
+ env.THORDATA_WEB_SCRAPER_API_BASE_URL ||
10
10
  "https://openapi.thordata.com/api/web-scraper-api";
11
- const locationsBaseUrl = overrides?.locationsBaseUrl ??
12
- env.THORDATA_LOCATIONS_BASE_URL ??
11
+ const locationsBaseUrl = overrides?.locationsBaseUrl ||
12
+ env.THORDATA_LOCATIONS_BASE_URL ||
13
13
  "https://openapi.thordata.com/api/locations";
14
14
  return {
15
15
  scraperapiBaseUrl: scraperapiBaseUrl.replace(/\/+$/, ""),
@@ -89,6 +89,7 @@ export declare class Proxy {
89
89
  * Build the full username with geo/session parameters.
90
90
  */
91
91
  private buildUsername;
92
+ toProxyUrl(): string;
92
93
  /**
93
94
  * Generate axios proxy configuration.
94
95
  */
package/dist/src/proxy.js CHANGED
@@ -191,6 +191,28 @@ export class Proxy {
191
191
  }
192
192
  return parts.join("-");
193
193
  }
194
+ toProxyUrl() {
195
+ // Resolve endpoint (allow Dashboard shard host via env)
196
+ const productUpper = this.product.toUpperCase();
197
+ const protocol = process.env[`THORDATA_${productUpper}_PROXY_PROTOCOL`] ??
198
+ process.env.THORDATA_PROXY_PROTOCOL ??
199
+ "https";
200
+ const host = process.env[`THORDATA_${productUpper}_PROXY_HOST`] ??
201
+ process.env.THORDATA_PROXY_HOST ??
202
+ this.customHost ??
203
+ PROXY_HOSTS[this.product];
204
+ const portRaw = process.env[`THORDATA_${productUpper}_PROXY_PORT`] ??
205
+ process.env.THORDATA_PROXY_PORT ??
206
+ String(PROXY_PORTS[this.product]);
207
+ const port = Number(portRaw);
208
+ if (!host || !port) {
209
+ throw new Error("Proxy host/port is invalid. Set THORDATA_PROXY_HOST/PORT (or per-product overrides).");
210
+ }
211
+ // Username for Thordata proxy auth must include td-customer- prefix and geo/session segments
212
+ const username = encodeURIComponent(this.buildUsername());
213
+ const password = encodeURIComponent(this.credentials.password);
214
+ return `${protocol}://${username}:${password}@${host}:${port}`;
215
+ }
194
216
  /**
195
217
  * Generate axios proxy configuration.
196
218
  */
@@ -1 +1 @@
1
- {"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../src/proxy.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../src/proxy.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "type": "module",
3
3
  "name": "thordata-js-sdk",
4
- "version": "0.4.0",
4
+ "version": "1.0.0",
5
5
  "description": "Official JavaScript/TypeScript SDK for Thordata (SERP, Universal, Web Scraper).",
6
6
  "main": "./dist/index.js",
7
7
  "types": "./dist/index.d.ts",
@@ -25,7 +25,14 @@
25
25
  "format:check": "prettier -c .",
26
26
  "prepack": "npm run build",
27
27
  "prepublishOnly": "npm run format:check && npm run lint && npm test",
28
- "example:verify": "npm run build && node dist/examples/verify_new_features.js"
28
+ "example:verify": "npm run build && node dist/examples/verify_new_features.js",
29
+ "example:serp": "tsx examples/serp_basic.ts",
30
+ "example:universal": "tsx examples/universal_basic.ts",
31
+ "example:task": "tsx examples/basic_scraper_task.ts",
32
+ "example:proxy:residential": "tsx examples/proxy_residential.ts",
33
+ "example:proxy:mobile": "tsx examples/proxy_mobile.ts",
34
+ "example:proxy:datacenter": "tsx examples/proxy_datacenter.ts",
35
+ "example:proxy:isp": "tsx examples/proxy_isp.ts"
29
36
  },
30
37
  "keywords": [
31
38
  "thordata",
@@ -50,9 +57,12 @@
50
57
  "@vitest/coverage-v8": "^4.0.16",
51
58
  "dotenv": "^16.4.5",
52
59
  "eslint": "^9.39.2",
60
+ "http-proxy-agent": "^7.0.2",
61
+ "https-proxy-agent": "^7.0.6",
53
62
  "nock": "^14.0.10",
54
63
  "prettier": "^3.7.4",
55
64
  "ts-node": "^10.9.2",
65
+ "tsx": "^4.21.0",
56
66
  "typescript": "^5.9.3",
57
67
  "typescript-eslint": "^8.50.0",
58
68
  "vitest": "^4.0.16"
@@ -1 +0,0 @@
1
- import "dotenv/config";
@@ -1,29 +0,0 @@
1
- // examples/basic_serp.ts
2
- import "dotenv/config";
3
- import { ThordataClient, Engine } from "../src/index.js";
4
- async function main() {
5
- const token = process.env.THORDATA_SCRAPER_TOKEN;
6
- if (!token) {
7
- console.error("Please set THORDATA_SCRAPER_TOKEN in .env");
8
- process.exit(1);
9
- }
10
- const client = new ThordataClient({ scraperToken: token });
11
- console.log("🔍 Google Search: 'Thordata proxy network'");
12
- const results = await client.serpSearch({
13
- query: "Thordata proxy network",
14
- engine: Engine.GOOGLE,
15
- num: 5,
16
- });
17
- // Debug: show actual response structure
18
- console.dir(results, { depth: 4 });
19
- // Type-safe access with fallback
20
- const organic = (results?.organic ?? results?.organic_results ?? []);
21
- console.log(`Found ${organic.length} organic results`);
22
- for (const item of organic.slice(0, 3)) {
23
- console.log("-", item.title, "->", item.link);
24
- }
25
- }
26
- main().catch((err) => {
27
- console.error("Error:", err);
28
- });
29
- //# sourceMappingURL=basic_serp.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"basic_serp.js","sourceRoot":"","sources":["../../examples/basic_serp.ts"],"names":[],"mappings":"AAAA,yBAAyB;AAEzB,OAAO,eAAe,CAAC;AACvB,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEzD,KAAK,UAAU,IAAI;IACjB,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC;IACjD,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,CAAC,KAAK,CAAC,2CAA2C,CAAC,CAAC;QAC3D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,MAAM,MAAM,GAAG,IAAI,cAAc,CAAC,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC,CAAC;IAE3D,OAAO,CAAC,GAAG,CAAC,4CAA4C,CAAC,CAAC;IAC1D,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC;QACtC,KAAK,EAAE,wBAAwB;QAC/B,MAAM,EAAE,MAAM,CAAC,MAAM;QACrB,GAAG,EAAE,CAAC;KACP,CAAC,CAAC;IAEH,wCAAwC;IACxC,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;IAEnC,iCAAiC;IACjC,MAAM,OAAO,GAAG,CAAC,OAAO,EAAE,OAAO,IAAI,OAAO,EAAE,eAAe,IAAI,EAAE,CAGjE,CAAC;IACH,OAAO,CAAC,GAAG,CAAC,SAAS,OAAO,CAAC,MAAM,kBAAkB,CAAC,CAAC;IACvD,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;QACvC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IAChD,CAAC;AACH,CAAC;AAED,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;IACnB,OAAO,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;AAC/B,CAAC,CAAC,CAAC"}
@@ -1 +0,0 @@
1
- import "dotenv/config";
@@ -1,23 +0,0 @@
1
- // examples/basic_universal.ts
2
- import "dotenv/config";
3
- import { ThordataClient } from "../src/index.js";
4
- async function main() {
5
- const token = process.env.THORDATA_SCRAPER_TOKEN;
6
- if (!token) {
7
- console.error("Please set THORDATA_SCRAPER_TOKEN in .env");
8
- process.exit(1);
9
- }
10
- const client = new ThordataClient({ scraperToken: token });
11
- console.log("🌐 Universal Scrape: https://httpbin.org/html");
12
- const html = await client.universalScrape({
13
- url: "https://httpbin.org/html",
14
- jsRender: false,
15
- outputFormat: "html",
16
- });
17
- console.log("Preview:");
18
- console.log(String(html).slice(0, 300));
19
- }
20
- main().catch((err) => {
21
- console.error("Error:", err);
22
- });
23
- //# sourceMappingURL=basic_universal.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"basic_universal.js","sourceRoot":"","sources":["../../examples/basic_universal.ts"],"names":[],"mappings":"AAAA,8BAA8B;AAE9B,OAAO,eAAe,CAAC;AACvB,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjD,KAAK,UAAU,IAAI;IACjB,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC;IACjD,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,CAAC,KAAK,CAAC,2CAA2C,CAAC,CAAC;QAC3D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,MAAM,MAAM,GAAG,IAAI,cAAc,CAAC,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC,CAAC;IAE3D,OAAO,CAAC,GAAG,CAAC,+CAA+C,CAAC,CAAC;IAC7D,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,eAAe,CAAC;QACxC,GAAG,EAAE,0BAA0B;QAC/B,QAAQ,EAAE,KAAK;QACf,YAAY,EAAE,MAAM;KACrB,CAAC,CAAC;IAEH,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IACxB,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;AAC1C,CAAC;AAED,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;IACnB,OAAO,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;AAC/B,CAAC,CAAC,CAAC"}