1688-cli 0.1.38 → 0.1.39
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/CHANGELOG.md +29 -0
- package/README.md +1 -1
- package/dist/commands/cart-add.js +40 -55
- package/dist/commands/cart-add.js.map +1 -1
- package/dist/commands/cart-list.js +32 -39
- package/dist/commands/cart-list.js.map +1 -1
- package/dist/commands/image-search.js +17 -48
- package/dist/commands/image-search.js.map +1 -1
- package/dist/commands/offer.js +38 -45
- package/dist/commands/offer.js.map +1 -1
- package/dist/commands/order-list.js +44 -46
- package/dist/commands/order-list.js.map +1 -1
- package/dist/commands/order-logistics.js +1 -5
- package/dist/commands/order-logistics.js.map +1 -1
- package/dist/commands/search.js +123 -208
- package/dist/commands/search.js.map +1 -1
- package/dist/commands/similar.js +23 -47
- package/dist/commands/similar.js.map +1 -1
- package/dist/session/artifacts.js +5 -1
- package/dist/session/artifacts.js.map +1 -1
- package/dist/session/mtop.js +7 -0
- package/dist/session/mtop.js.map +1 -0
- package/dist/session/response-capture.js +145 -0
- package/dist/session/response-capture.js.map +1 -0
- package/dist/session/search-capture.js +115 -0
- package/dist/session/search-capture.js.map +1 -0
- package/dist/session/search-mtop.js +67 -0
- package/dist/session/search-mtop.js.map +1 -0
- package/dist/session/wait.js +24 -14
- package/dist/session/wait.js.map +1 -1
- package/package.json +1 -1
|
@@ -5,7 +5,7 @@ import { detectPageState, recoverHintForPageState, } from './page-state.js';
|
|
|
5
5
|
import { runsDir } from './paths.js';
|
|
6
6
|
function errorShape(e) {
|
|
7
7
|
if (e instanceof CliError) {
|
|
8
|
-
return { code: e.code, message: e.message, stack: e.stack };
|
|
8
|
+
return { code: e.code, message: e.message, stack: e.stack, details: e.details };
|
|
9
9
|
}
|
|
10
10
|
if (e instanceof Error) {
|
|
11
11
|
return { message: e.message, stack: e.stack };
|
|
@@ -125,6 +125,10 @@ export async function captureFailureArtifact(ctx, meta, error, options = {}) {
|
|
|
125
125
|
await fs.writeFile(path.join(dir, 'page.html'), html);
|
|
126
126
|
}
|
|
127
127
|
const shaped = errorShape(error);
|
|
128
|
+
const responseCapture = shaped.details?.responseCapture;
|
|
129
|
+
if (responseCapture) {
|
|
130
|
+
await writeJson(path.join(dir, 'response-capture.json'), responseCapture).catch(() => { });
|
|
131
|
+
}
|
|
128
132
|
await fs.writeFile(path.join(dir, 'error.txt'), errorText(shaped)).catch(() => { });
|
|
129
133
|
await writeJson(path.join(dir, 'meta.json'), {
|
|
130
134
|
requestId: id,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"artifacts.js","sourceRoot":"","sources":["../../src/session/artifacts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,QAAQ,EAAwB,MAAM,iBAAiB,CAAC;AACjE,OAAO,EACL,eAAe,EACf,uBAAuB,GAExB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"artifacts.js","sourceRoot":"","sources":["../../src/session/artifacts.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mtop.js","sourceRoot":"","sources":["../../src/session/mtop.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,cAAc,CAAc,IAAY;IACtD,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;IAC5B,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;IAC3D,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAE,CAAC,CAAC,CAAC,OAAO,CAAM,CAAC;AACtD,CAAC;AAED,MAAM,CAAC,MAAM,SAAS,GAAG,cAAc,CAAC"}
|
|
@@ -0,0 +1,145 @@
|
|
|
1
|
+
import { withTimeout } from './wait.js';
|
|
2
|
+
export function startResponseCapture(opts) {
|
|
3
|
+
const maxDiagnosticsEntries = opts.maxDiagnosticsEntries ?? 5;
|
|
4
|
+
const startedAt = new Date().toISOString();
|
|
5
|
+
let endedAt;
|
|
6
|
+
let disposed = false;
|
|
7
|
+
let settled = false;
|
|
8
|
+
let timedOut = false;
|
|
9
|
+
let seenCount = 0;
|
|
10
|
+
let matchedCount = 0;
|
|
11
|
+
let parsedCount = 0;
|
|
12
|
+
let emptyResultCount = 0;
|
|
13
|
+
let lastSeenUrl;
|
|
14
|
+
let lastMatchedUrl;
|
|
15
|
+
let lastParsedUrl;
|
|
16
|
+
const failures = [];
|
|
17
|
+
const emptyResults = [];
|
|
18
|
+
let waitPromise = null;
|
|
19
|
+
let resolveCaptured;
|
|
20
|
+
const captured = new Promise((resolve) => {
|
|
21
|
+
resolveCaptured = resolve;
|
|
22
|
+
});
|
|
23
|
+
const remember = (entries, entry) => {
|
|
24
|
+
entries.push(entry);
|
|
25
|
+
if (entries.length > maxDiagnosticsEntries)
|
|
26
|
+
entries.shift();
|
|
27
|
+
};
|
|
28
|
+
const errorInfo = (error) => {
|
|
29
|
+
if (error instanceof Error) {
|
|
30
|
+
return { name: error.name, message: error.message };
|
|
31
|
+
}
|
|
32
|
+
return { message: String(error) };
|
|
33
|
+
};
|
|
34
|
+
const recordFailure = (phase, url, error) => {
|
|
35
|
+
const info = errorInfo(error);
|
|
36
|
+
remember(failures, {
|
|
37
|
+
at: new Date().toISOString(),
|
|
38
|
+
phase,
|
|
39
|
+
url,
|
|
40
|
+
...info,
|
|
41
|
+
});
|
|
42
|
+
};
|
|
43
|
+
const dispose = () => {
|
|
44
|
+
if (disposed)
|
|
45
|
+
return;
|
|
46
|
+
disposed = true;
|
|
47
|
+
endedAt ??= new Date().toISOString();
|
|
48
|
+
opts.page.off('response', onResponse);
|
|
49
|
+
};
|
|
50
|
+
const matches = (response) => {
|
|
51
|
+
if (opts.matcher instanceof RegExp)
|
|
52
|
+
return opts.matcher.test(response.url());
|
|
53
|
+
return opts.matcher(response);
|
|
54
|
+
};
|
|
55
|
+
const onResponse = async (response) => {
|
|
56
|
+
if (disposed || settled)
|
|
57
|
+
return;
|
|
58
|
+
const url = response.url();
|
|
59
|
+
seenCount++;
|
|
60
|
+
lastSeenUrl = url;
|
|
61
|
+
let matched = false;
|
|
62
|
+
try {
|
|
63
|
+
matched = matches(response);
|
|
64
|
+
}
|
|
65
|
+
catch (e) {
|
|
66
|
+
recordFailure('match', url, e);
|
|
67
|
+
return;
|
|
68
|
+
}
|
|
69
|
+
if (!matched)
|
|
70
|
+
return;
|
|
71
|
+
matchedCount++;
|
|
72
|
+
lastMatchedUrl = url;
|
|
73
|
+
try {
|
|
74
|
+
const value = await opts.parse(response);
|
|
75
|
+
if (!value) {
|
|
76
|
+
emptyResultCount++;
|
|
77
|
+
remember(emptyResults, { at: new Date().toISOString(), url });
|
|
78
|
+
return;
|
|
79
|
+
}
|
|
80
|
+
if (settled || disposed)
|
|
81
|
+
return;
|
|
82
|
+
parsedCount++;
|
|
83
|
+
lastParsedUrl = url;
|
|
84
|
+
settled = true;
|
|
85
|
+
endedAt = new Date().toISOString();
|
|
86
|
+
resolveCaptured(value);
|
|
87
|
+
}
|
|
88
|
+
catch (e) {
|
|
89
|
+
recordFailure('parse', url, e);
|
|
90
|
+
}
|
|
91
|
+
};
|
|
92
|
+
const diagnostics = () => ({
|
|
93
|
+
timeoutMs: opts.timeoutMs,
|
|
94
|
+
startedAt,
|
|
95
|
+
endedAt,
|
|
96
|
+
disposed,
|
|
97
|
+
settled,
|
|
98
|
+
timedOut,
|
|
99
|
+
seenCount,
|
|
100
|
+
matchedCount,
|
|
101
|
+
parsedCount,
|
|
102
|
+
emptyResultCount,
|
|
103
|
+
failureCount: failures.length,
|
|
104
|
+
lastSeenUrl,
|
|
105
|
+
lastMatchedUrl,
|
|
106
|
+
lastParsedUrl,
|
|
107
|
+
failures: [...failures],
|
|
108
|
+
emptyResults: [...emptyResults],
|
|
109
|
+
});
|
|
110
|
+
opts.page.on('response', onResponse);
|
|
111
|
+
return {
|
|
112
|
+
wait() {
|
|
113
|
+
waitPromise ??= withTimeout(captured, {
|
|
114
|
+
timeoutMs: opts.timeoutMs,
|
|
115
|
+
fallback: null,
|
|
116
|
+
})
|
|
117
|
+
.then((value) => {
|
|
118
|
+
if (value === null && !settled) {
|
|
119
|
+
timedOut = true;
|
|
120
|
+
endedAt = new Date().toISOString();
|
|
121
|
+
}
|
|
122
|
+
return value;
|
|
123
|
+
})
|
|
124
|
+
.finally(dispose);
|
|
125
|
+
return waitPromise;
|
|
126
|
+
},
|
|
127
|
+
async waitForAction(action) {
|
|
128
|
+
try {
|
|
129
|
+
const actionResult = await action();
|
|
130
|
+
const response = await this.wait();
|
|
131
|
+
return {
|
|
132
|
+
actionResult,
|
|
133
|
+
response,
|
|
134
|
+
diagnostics: diagnostics(),
|
|
135
|
+
};
|
|
136
|
+
}
|
|
137
|
+
finally {
|
|
138
|
+
dispose();
|
|
139
|
+
}
|
|
140
|
+
},
|
|
141
|
+
dispose,
|
|
142
|
+
diagnostics,
|
|
143
|
+
};
|
|
144
|
+
}
|
|
145
|
+
//# sourceMappingURL=response-capture.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"response-capture.js","sourceRoot":"","sources":["../../src/session/response-capture.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AA8DxC,MAAM,UAAU,oBAAoB,CAClC,IAAoC;IAEpC,MAAM,qBAAqB,GAAG,IAAI,CAAC,qBAAqB,IAAI,CAAC,CAAC;IAC9D,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IAC3C,IAAI,OAA2B,CAAC;IAChC,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,IAAI,SAAS,GAAG,CAAC,CAAC;IAClB,IAAI,YAAY,GAAG,CAAC,CAAC;IACrB,IAAI,WAAW,GAAG,CAAC,CAAC;IACpB,IAAI,gBAAgB,GAAG,CAAC,CAAC;IACzB,IAAI,WAA+B,CAAC;IACpC,IAAI,cAAkC,CAAC;IACvC,IAAI,aAAiC,CAAC;IACtC,MAAM,QAAQ,GAA6B,EAAE,CAAC;IAC9C,MAAM,YAAY,GAAiC,EAAE,CAAC;IACtD,IAAI,WAAW,GAA6B,IAAI,CAAC;IACjD,IAAI,eAAoC,CAAC;IACzC,MAAM,QAAQ,GAAG,IAAI,OAAO,CAAI,CAAC,OAAO,EAAE,EAAE;QAC1C,eAAe,GAAG,OAAO,CAAC;IAC5B,CAAC,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,CAAS,OAAiB,EAAE,KAAa,EAAE,EAAE;QAC5D,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACpB,IAAI,OAAO,CAAC,MAAM,GAAG,qBAAqB;YAAE,OAAO,CAAC,KAAK,EAAE,CAAC;IAC9D,CAAC,CAAC;IAEF,MAAM,SAAS,GAAG,CAAC,KAAc,EAAsC,EAAE;QACvE,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;YAC3B,OAAO,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC;QACtD,CAAC;QACD,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;IACpC,CAAC,CAAC;IAEF,MAAM,aAAa,GAAG,CACpB,KAAsC,EACtC,GAAW,EACX,KAAc,EACd,EAAE;QACF,MAAM,IAAI,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;QAC9B,QAAQ,CAAC,QAAQ,EAAE;YACjB,EAAE,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;YAC5B,KAAK;YACL,GAAG;YACH,GAAG,IAAI;SACR,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,MAAM,OAAO,GAAG,GAAG,EAAE;QACnB,IAAI,QAAQ;YAAE,OAAO;QACrB,QAAQ,GAAG,IAAI,CAAC;QAChB,OAAO,KAAK,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QACrC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IACxC,CAAC,CAAC;IAEF,MAAM,OAAO,GAAG,CAAC,QAAoB,EAAW,EAAE;QAChD,IAAI,IAAI,CAAC,OAAO,YAAY,MAAM;YAAE,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC;QAC7E,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAChC,CAAC,CAAC;IAEF,MAAM,UAAU,GAAG,KAAK,EAAE,QAAoB,EAAE,EAAE;QAChD,IAAI,QAAQ,IAAI,OAAO;YAAE,OAAO;QAChC,MAAM,GAAG,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC;QAC3B,SAAS,EAAE,CAAC;QACZ,WAAW,GAAG,GAAG,CAAC;QAClB,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC;YACH,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC9B,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,aAAa,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;YAC/B,OAAO;QACT,CAAC;QACD,IAAI,CAAC,OAAO;YAAE,OAAO;QACrB,YAAY,EAAE,CAAC;QACf,cAAc,GAAG,GAAG,CAAC;QACrB,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YACzC,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,gBAAgB,EAAE,CAAC;gBACnB,QAAQ,CAAC,YAAY,EAAE,EAAE,EAAE,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;gBAC9D,OAAO;YACT,CAAC;YACD,IAAI,OAAO,IAAI,QAAQ;gBAAE,OAAO;YAChC,WAAW,EAAE,CAAC;YACd,aAAa,GAAG,GAAG,CAAC;YACpB,OAAO,GAAG,IAAI,CAAC;YACf,OAAO,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;YACnC,eAAe,CAAC,KAAK,CAAC,CAAC;QACzB,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,aAAa,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;QACjC,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,WAAW,GAAG,GAA+B,EAAE,CAAC,CAAC;QACrD,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,SAAS;QACT,OAAO;QACP,QAAQ;QACR,OAAO;QACP,QAAQ;QACR,SAAS;QACT,YAAY;QACZ,WAAW;QACX,gBAAgB;QAChB,YAAY,EAAE,QAAQ,CAAC,MAAM;QAC7B,WAAW;QACX,cAAc;QACd,aAAa;QACb,QAAQ,EAAE,CAAC,GAAG,QAAQ,CAAC;QACvB,YAAY,EAAE,CAAC,GAAG,YAAY,CAAC;KAChC,CAAC,CAAC;IAEH,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IAErC,OAAO;QACL,IAAI;YACF,WAAW,KAAK,WAAW,CAAC,QAAQ,EAAE;gBACpC,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,QAAQ,EAAE,IAAI;aACf,CAAC;iBACC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE;gBACd,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;oBAC/B,QAAQ,GAAG,IAAI,CAAC;oBAChB,OAAO,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;gBACrC,CAAC;gBACD,OAAO,KAAK,CAAC;YACf,CAAC,CAAC;iBACD,OAAO,CAAC,OAAO,CAAC,CAAC;YACpB,OAAO,WAAW,CAAC;QACrB,CAAC;QACD,KAAK,CAAC,aAAa,CAAU,MAA8B;YACzD,IAAI,CAAC;gBACH,MAAM,YAAY,GAAG,MAAM,MAAM,EAAE,CAAC;gBACpC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;gBACnC,OAAO;oBACL,YAAY;oBACZ,QAAQ;oBACR,WAAW,EAAE,WAAW,EAAE;iBAC3B,CAAC;YACJ,CAAC;oBAAS,CAAC;gBACT,OAAO,EAAE,CAAC;YACZ,CAAC;QACH,CAAC;QACD,OAAO;QACP,WAAW;KACZ,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,115 @@
|
|
|
1
|
+
import { waitWithDeadline } from './wait.js';
|
|
2
|
+
import { SEARCH_APP_ID, parseOfferItemsFromMtopText, readSearchMtopRequestMeta, } from './search-mtop.js';
|
|
3
|
+
export function startSearchOfferCapture(opts) {
|
|
4
|
+
let disposed = false;
|
|
5
|
+
let offers = [];
|
|
6
|
+
let seenCount = 0;
|
|
7
|
+
let matchedCount = 0;
|
|
8
|
+
let parsedCount = 0;
|
|
9
|
+
let failureCount = 0;
|
|
10
|
+
let lastSeenUrl;
|
|
11
|
+
let lastMatchedUrl;
|
|
12
|
+
let lastParsedUrl;
|
|
13
|
+
const diagnostics = () => ({
|
|
14
|
+
seenCount,
|
|
15
|
+
matchedCount,
|
|
16
|
+
parsedCount,
|
|
17
|
+
failureCount,
|
|
18
|
+
lastSeenUrl,
|
|
19
|
+
lastMatchedUrl,
|
|
20
|
+
lastParsedUrl,
|
|
21
|
+
});
|
|
22
|
+
const reset = () => {
|
|
23
|
+
offers = [];
|
|
24
|
+
seenCount = 0;
|
|
25
|
+
matchedCount = 0;
|
|
26
|
+
parsedCount = 0;
|
|
27
|
+
failureCount = 0;
|
|
28
|
+
lastSeenUrl = undefined;
|
|
29
|
+
lastMatchedUrl = undefined;
|
|
30
|
+
lastParsedUrl = undefined;
|
|
31
|
+
};
|
|
32
|
+
const onResponse = async (resp) => {
|
|
33
|
+
if (disposed)
|
|
34
|
+
return;
|
|
35
|
+
const url = resp.url();
|
|
36
|
+
seenCount++;
|
|
37
|
+
lastSeenUrl = url;
|
|
38
|
+
try {
|
|
39
|
+
const meta = readSearchMtopRequestMeta(url);
|
|
40
|
+
if (!meta || meta.appId !== SEARCH_APP_ID)
|
|
41
|
+
return;
|
|
42
|
+
if (opts.requireMethod && meta.method !== opts.requireMethod)
|
|
43
|
+
return;
|
|
44
|
+
const targetPage = opts.targetPage?.();
|
|
45
|
+
if (targetPage !== undefined && (meta.beginPage ?? 1) !== targetPage)
|
|
46
|
+
return;
|
|
47
|
+
matchedCount++;
|
|
48
|
+
lastMatchedUrl = url;
|
|
49
|
+
const parsed = parseOfferItemsFromMtopText(await resp.text());
|
|
50
|
+
if (parsed.length === 0)
|
|
51
|
+
return;
|
|
52
|
+
if (opts.keep === 'largest') {
|
|
53
|
+
if (parsed.length > offers.length)
|
|
54
|
+
offers = parsed;
|
|
55
|
+
}
|
|
56
|
+
else {
|
|
57
|
+
offers = parsed;
|
|
58
|
+
}
|
|
59
|
+
parsedCount++;
|
|
60
|
+
lastParsedUrl = url;
|
|
61
|
+
}
|
|
62
|
+
catch {
|
|
63
|
+
failureCount++;
|
|
64
|
+
}
|
|
65
|
+
};
|
|
66
|
+
const dispose = () => {
|
|
67
|
+
if (disposed)
|
|
68
|
+
return;
|
|
69
|
+
disposed = true;
|
|
70
|
+
opts.page.off('response', onResponse);
|
|
71
|
+
};
|
|
72
|
+
const wait = async (optsWait) => {
|
|
73
|
+
const result = await waitWithDeadline(async () => {
|
|
74
|
+
if (optsWait.isClosed?.())
|
|
75
|
+
return 'browser_closed';
|
|
76
|
+
if (offers.length > 0)
|
|
77
|
+
return 'captured';
|
|
78
|
+
if (await optsWait.isBlocked?.())
|
|
79
|
+
return 'blocked';
|
|
80
|
+
if (disposed)
|
|
81
|
+
return 'stream_closed';
|
|
82
|
+
return null;
|
|
83
|
+
}, {
|
|
84
|
+
timeoutMs: optsWait.timeoutMs,
|
|
85
|
+
intervalMs: optsWait.intervalMs ?? 300,
|
|
86
|
+
onTimeout: () => (offers.length > 0 ? 'captured' : 'timeout'),
|
|
87
|
+
});
|
|
88
|
+
return { status: result, offers, diagnostics: diagnostics() };
|
|
89
|
+
};
|
|
90
|
+
const waitForAction = async (action, optsWait) => {
|
|
91
|
+
try {
|
|
92
|
+
const actionResult = await action();
|
|
93
|
+
const result = await wait(optsWait);
|
|
94
|
+
return {
|
|
95
|
+
actionResult,
|
|
96
|
+
status: result.status,
|
|
97
|
+
offers: result.offers,
|
|
98
|
+
diagnostics: result.diagnostics,
|
|
99
|
+
};
|
|
100
|
+
}
|
|
101
|
+
finally {
|
|
102
|
+
dispose();
|
|
103
|
+
}
|
|
104
|
+
};
|
|
105
|
+
opts.page.on('response', onResponse);
|
|
106
|
+
return {
|
|
107
|
+
reset,
|
|
108
|
+
wait,
|
|
109
|
+
waitForAction,
|
|
110
|
+
dispose,
|
|
111
|
+
diagnostics,
|
|
112
|
+
offers: () => offers,
|
|
113
|
+
};
|
|
114
|
+
}
|
|
115
|
+
//# sourceMappingURL=search-capture.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"search-capture.js","sourceRoot":"","sources":["../../src/session/search-capture.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
import { parseMtopJsonp } from './mtop.js';
|
|
2
|
+
export const SEARCH_MTOP_API = 'mtop.relationrecommend.wirelessrecommend.recommend';
|
|
3
|
+
export const SEARCH_APP_ID = '32517';
|
|
4
|
+
function bool(s) {
|
|
5
|
+
return s === 'true';
|
|
6
|
+
}
|
|
7
|
+
export function mapOffer(item) {
|
|
8
|
+
const d = item.data;
|
|
9
|
+
if (!d?.offerId)
|
|
10
|
+
return null;
|
|
11
|
+
const title = (d.title ?? '').replace(/<\/?font[^>]*>/g, '').trim();
|
|
12
|
+
const priceRaw = d.priceInfo?.price;
|
|
13
|
+
const price = priceRaw ? parseFloat(priceRaw) : null;
|
|
14
|
+
const yearsRaw = d.shop?.tpYear;
|
|
15
|
+
const years = yearsRaw ? parseInt(yearsRaw, 10) : null;
|
|
16
|
+
const tags = (d.tags ?? [])
|
|
17
|
+
.map((t) => t?.text?.trim() ?? '')
|
|
18
|
+
.filter((s) => !!s);
|
|
19
|
+
return {
|
|
20
|
+
offerId: d.offerId,
|
|
21
|
+
title,
|
|
22
|
+
price: {
|
|
23
|
+
text: priceRaw ? `¥${priceRaw}` : '',
|
|
24
|
+
min: price,
|
|
25
|
+
max: price,
|
|
26
|
+
},
|
|
27
|
+
supplier: {
|
|
28
|
+
name: d.shop?.text ?? null,
|
|
29
|
+
shopUrl: d.shopAddition?.shopLinkUrl ?? d.winPortUrl ?? null,
|
|
30
|
+
years,
|
|
31
|
+
},
|
|
32
|
+
location: {
|
|
33
|
+
province: d.province ?? null,
|
|
34
|
+
city: d.city ?? null,
|
|
35
|
+
},
|
|
36
|
+
bizType: d.bizType ?? null,
|
|
37
|
+
verified: {
|
|
38
|
+
factory: bool(d.factoryInspection),
|
|
39
|
+
business: bool(d.businessInspection),
|
|
40
|
+
superFactory: bool(d.superFactory),
|
|
41
|
+
},
|
|
42
|
+
tags,
|
|
43
|
+
isP4P: bool(d.isP4P),
|
|
44
|
+
turnover: d.bookedCount ?? null,
|
|
45
|
+
url: `https://detail.1688.com/offer/${d.offerId}.html`,
|
|
46
|
+
image: d.offerPicUrl ?? null,
|
|
47
|
+
};
|
|
48
|
+
}
|
|
49
|
+
export function readSearchMtopRequestMeta(url) {
|
|
50
|
+
if (!url.includes(SEARCH_MTOP_API))
|
|
51
|
+
return null;
|
|
52
|
+
const dataParam = new URLSearchParams(new URL(url).search).get('data') ?? '';
|
|
53
|
+
const dataObj = JSON.parse(dataParam);
|
|
54
|
+
const params = JSON.parse(dataObj.params ?? '{}');
|
|
55
|
+
const beginPage = params.beginPage === undefined ? undefined : Number(params.beginPage);
|
|
56
|
+
return {
|
|
57
|
+
appId: String(dataObj.appId),
|
|
58
|
+
method: params.method,
|
|
59
|
+
beginPage,
|
|
60
|
+
};
|
|
61
|
+
}
|
|
62
|
+
export function parseOfferItemsFromMtopText(text) {
|
|
63
|
+
const json = parseMtopJsonp(text);
|
|
64
|
+
const items = json?.data?.data?.OFFER?.items ?? [];
|
|
65
|
+
return items.map(mapOffer).filter((o) => o !== null);
|
|
66
|
+
}
|
|
67
|
+
//# sourceMappingURL=search-mtop.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"search-mtop.js","sourceRoot":"","sources":["../../src/session/search-mtop.ts"],"names":[],"mappings":"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"}
|
package/dist/session/wait.js
CHANGED
|
@@ -18,25 +18,35 @@ export async function withTimeout(promise, opts) {
|
|
|
18
18
|
clearTimeout(timer);
|
|
19
19
|
}
|
|
20
20
|
}
|
|
21
|
-
export async function
|
|
21
|
+
export async function waitWithDeadline(poll, opts) {
|
|
22
22
|
const deadline = Date.now() + opts.timeoutMs;
|
|
23
23
|
const intervalMs = opts.intervalMs ?? 250;
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
24
|
+
let attempt = 0;
|
|
25
|
+
while (true) {
|
|
26
|
+
const now = Date.now();
|
|
27
|
+
const remainingMs = Math.max(0, deadline - now);
|
|
28
|
+
if (remainingMs <= 0)
|
|
29
|
+
return opts.onTimeout();
|
|
30
|
+
const result = await poll({ attempt, deadline, now, remainingMs });
|
|
31
|
+
if (result !== null && result !== undefined)
|
|
32
|
+
return result;
|
|
33
|
+
attempt++;
|
|
34
|
+
await sleep(Math.min(intervalMs, remainingMs));
|
|
28
35
|
}
|
|
29
|
-
|
|
36
|
+
}
|
|
37
|
+
export async function waitUntil(predicate, opts) {
|
|
38
|
+
return waitWithDeadline(async () => ((await predicate()) ? true : null), {
|
|
39
|
+
...opts,
|
|
40
|
+
onTimeout: () => false,
|
|
41
|
+
});
|
|
30
42
|
}
|
|
31
43
|
export async function waitForTruthy(probe, opts) {
|
|
32
|
-
|
|
33
|
-
const intervalMs = opts.intervalMs ?? 250;
|
|
34
|
-
while (Date.now() < deadline) {
|
|
44
|
+
return waitWithDeadline(async () => {
|
|
35
45
|
const value = await probe();
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
46
|
+
return value || null;
|
|
47
|
+
}, {
|
|
48
|
+
...opts,
|
|
49
|
+
onTimeout: () => null,
|
|
50
|
+
});
|
|
41
51
|
}
|
|
42
52
|
//# sourceMappingURL=wait.js.map
|
package/dist/session/wait.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wait.js","sourceRoot":"","sources":["../../src/session/wait.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,KAAK,UAAU,KAAK,CAAC,EAAU;IACpC,IAAI,EAAE,IAAI,CAAC;QAAE,OAAO;IACpB,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;AAC1D,CAAC;
|
|
1
|
+
{"version":3,"file":"wait.js","sourceRoot":"","sources":["../../src/session/wait.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,KAAK,UAAU,KAAK,CAAC,EAAU;IACpC,IAAI,EAAE,IAAI,CAAC;QAAE,OAAO;IACpB,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;AAC1D,CAAC;AAuBD,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,OAAmB,EACnB,IAAmC;IAEnC,IAAI,KAAK,GAAyC,IAAI,CAAC;IACvD,IAAI,CAAC;QACH,OAAO,MAAM,OAAO,CAAC,IAAI,CAAgB;YACvC,OAAO;YACP,IAAI,OAAO,CAAY,CAAC,OAAO,EAAE,EAAE;gBACjC,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;YACnE,CAAC,CAAC;SACH,CAAC,CAAC;IACL,CAAC;YAAS,CAAC;QACT,IAAI,KAAK;YAAE,YAAY,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,IAAwF,EACxF,IAAgC;IAEhC,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC;IAC7C,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,IAAI,GAAG,CAAC;IAC1C,IAAI,OAAO,GAAG,CAAC,CAAC;IAChB,OAAO,IAAI,EAAE,CAAC;QACZ,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,GAAG,GAAG,CAAC,CAAC;QAChD,IAAI,WAAW,IAAI,CAAC;YAAE,OAAO,IAAI,CAAC,SAAS,EAAE,CAAC;QAC9C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,WAAW,EAAE,CAAC,CAAC;QACnE,IAAI,MAAM,KAAK,IAAI,IAAI,MAAM,KAAK,SAAS;YAAE,OAAO,MAAM,CAAC;QAC3D,OAAO,EAAE,CAAC;QACV,MAAM,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC,CAAC;IACjD,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,SAAS,CAC7B,SAA2C,EAC3C,IAAsB;IAEtB,OAAO,gBAAgB,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,CAAC,MAAM,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE;QACvE,GAAG,IAAI;QACP,SAAS,EAAE,GAAG,EAAE,CAAC,KAAK;KACvB,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,KAAiF,EACjF,IAAsB;IAEtB,OAAO,gBAAgB,CAAC,KAAK,IAAI,EAAE;QACjC,MAAM,KAAK,GAAG,MAAM,KAAK,EAAE,CAAC;QAC5B,OAAO,KAAK,IAAI,IAAI,CAAC;IACvB,CAAC,EAAE;QACD,GAAG,IAAI;QACP,SAAS,EAAE,GAAG,EAAE,CAAC,IAAI;KACtB,CAAC,CAAC;AACL,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "1688-cli",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.39",
|
|
4
4
|
"description": "1688.com CLI for humans, Codex, and Claude Code. Sourcing (search / image-search / offer / inquire) and orders (list / detail / logistics / seller chat).",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"author": "nobodyjack",
|