1688-cli 0.1.35 → 0.1.38
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 +37 -0
- package/dist/commands/cart-add.js +21 -43
- package/dist/commands/cart-add.js.map +1 -1
- package/dist/commands/cart-list.js +5 -4
- package/dist/commands/cart-list.js.map +1 -1
- package/dist/commands/cart-remove.js +10 -65
- package/dist/commands/cart-remove.js.map +1 -1
- package/dist/commands/checkout-confirm.js +16 -90
- package/dist/commands/checkout-confirm.js.map +1 -1
- package/dist/commands/checkout-prepare.js +12 -68
- package/dist/commands/checkout-prepare.js.map +1 -1
- package/dist/commands/image-search.js +5 -27
- package/dist/commands/image-search.js.map +1 -1
- package/dist/commands/login.js +2 -1
- package/dist/commands/login.js.map +1 -1
- package/dist/commands/offer.js +7 -6
- package/dist/commands/offer.js.map +1 -1
- package/dist/commands/order-list.js +5 -4
- package/dist/commands/order-list.js.map +1 -1
- package/dist/commands/order-logistics.js +3 -2
- package/dist/commands/order-logistics.js.map +1 -1
- package/dist/commands/search.js +10 -19
- package/dist/commands/search.js.map +1 -1
- package/dist/commands/seller-chat.js +11 -64
- package/dist/commands/seller-chat.js.map +1 -1
- package/dist/commands/seller-inquire.js +3 -2
- package/dist/commands/seller-inquire.js.map +1 -1
- package/dist/commands/seller-messages.js +11 -36
- package/dist/commands/seller-messages.js.map +1 -1
- package/dist/commands/similar.js +3 -2
- package/dist/commands/similar.js.map +1 -1
- package/dist/daemon/manager.js +12 -15
- package/dist/daemon/manager.js.map +1 -1
- package/dist/daemon/throttle.js +2 -1
- package/dist/daemon/throttle.js.map +1 -1
- package/dist/session/cart-locators.js +123 -0
- package/dist/session/cart-locators.js.map +1 -0
- package/dist/session/checkout-locators.js +13 -0
- package/dist/session/checkout-locators.js.map +1 -0
- package/dist/session/im-locators.js +103 -0
- package/dist/session/im-locators.js.map +1 -0
- package/dist/session/image-search-locators.js +30 -0
- package/dist/session/image-search-locators.js.map +1 -0
- package/dist/session/locator.js +90 -0
- package/dist/session/locator.js.map +1 -0
- package/dist/session/offer-locators.js +42 -0
- package/dist/session/offer-locators.js.map +1 -0
- package/dist/session/page-state.js +9 -17
- package/dist/session/page-state.js.map +1 -1
- package/dist/session/recovery.js +4 -8
- package/dist/session/recovery.js.map +1 -1
- package/dist/session/search-locators.js +16 -0
- package/dist/session/search-locators.js.map +1 -0
- package/dist/session/wait.js +42 -0
- package/dist/session/wait.js.map +1 -0
- package/package.json +1 -1
package/dist/commands/search.js
CHANGED
|
@@ -3,6 +3,8 @@ import { dispatch } from '../session/dispatch.js';
|
|
|
3
3
|
import { emit, info } from '../io/output.js';
|
|
4
4
|
import { CliError } from '../io/errors.js';
|
|
5
5
|
import { withRecovery } from '../session/recovery.js';
|
|
6
|
+
import { clickSearchNextPage } from '../session/search-locators.js';
|
|
7
|
+
import { sleep } from '../session/wait.js';
|
|
6
8
|
export async function execute(ctx, args) {
|
|
7
9
|
return withRecovery(ctx, { cmd: 'search', args }, async () => {
|
|
8
10
|
const offers = await fetchSearch(ctx, args.keyword, args.headed === true, args.max);
|
|
@@ -154,7 +156,7 @@ async function fetchSearch(ctx, keyword, headed, maxResults) {
|
|
|
154
156
|
waitUntil: 'domcontentloaded',
|
|
155
157
|
timeout: 20000,
|
|
156
158
|
});
|
|
157
|
-
await
|
|
159
|
+
await sleep(delayMs);
|
|
158
160
|
}
|
|
159
161
|
catch {
|
|
160
162
|
/* best-effort */
|
|
@@ -307,7 +309,7 @@ async function fetchSearch(ctx, keyword, headed, maxResults) {
|
|
|
307
309
|
// Cheap WAF check: if we're stuck on the punish URL, fail fast headless.
|
|
308
310
|
if (!headed && /\/punish|x5secdata=/.test(page.url()))
|
|
309
311
|
return false;
|
|
310
|
-
await
|
|
312
|
+
await sleep(300);
|
|
311
313
|
}
|
|
312
314
|
return false;
|
|
313
315
|
}
|
|
@@ -321,9 +323,6 @@ async function fetchSearch(ctx, keyword, headed, maxResults) {
|
|
|
321
323
|
page.on('response', onResp);
|
|
322
324
|
const allOffers = [];
|
|
323
325
|
const seenIds = new Set();
|
|
324
|
-
// Pagination control is in-page `<div>` elements (not anchors). The "next"
|
|
325
|
-
// arrow loses the `fui-next` clickable state on the last page.
|
|
326
|
-
const NEXT_BTN = '.fui-arrow.fui-next:not(.fui-next-disabled)';
|
|
327
326
|
for (let pageNum = 1; pageNum <= pagesWanted; pageNum++) {
|
|
328
327
|
capturedOffers = [];
|
|
329
328
|
currentTargetPage = pageNum; // onResp only captures responses for this page
|
|
@@ -341,17 +340,9 @@ async function fetchSearch(ctx, keyword, headed, maxResults) {
|
|
|
341
340
|
// Clicking the in-page "next" arrow advances `beginPage` within the
|
|
342
341
|
// SAME pageId, which is the only way to get a clean next 60.
|
|
343
342
|
info(`Fetching page ${pageNum}/${pagesWanted}...`);
|
|
344
|
-
const
|
|
345
|
-
if (
|
|
346
|
-
info(`
|
|
347
|
-
break;
|
|
348
|
-
}
|
|
349
|
-
try {
|
|
350
|
-
await nextBtn.click({ timeout: 5000 });
|
|
351
|
-
}
|
|
352
|
-
catch {
|
|
353
|
-
info(`Could not advance to page ${pageNum} — stopping at ` +
|
|
354
|
-
`${allOffers.length} results.`);
|
|
343
|
+
const advanced = await clickSearchNextPage(page).catch(() => false);
|
|
344
|
+
if (!advanced) {
|
|
345
|
+
info(`Could not advance to page ${pageNum} — stopping at ${allOffers.length} results.`);
|
|
355
346
|
break;
|
|
356
347
|
}
|
|
357
348
|
}
|
|
@@ -403,7 +394,7 @@ async function fetchSearch(ctx, keyword, headed, maxResults) {
|
|
|
403
394
|
break;
|
|
404
395
|
// Human-like jitter between page clicks to keep the WAF score low.
|
|
405
396
|
if (pageNum < pagesWanted) {
|
|
406
|
-
await
|
|
397
|
+
await sleep(1500 + Math.random() * 2000);
|
|
407
398
|
}
|
|
408
399
|
}
|
|
409
400
|
page.off('response', onResp);
|
|
@@ -428,7 +419,7 @@ async function isBlocked(page, retries = 3) {
|
|
|
428
419
|
return false;
|
|
429
420
|
}
|
|
430
421
|
if (i < retries - 1)
|
|
431
|
-
await
|
|
422
|
+
await sleep(800);
|
|
432
423
|
}
|
|
433
424
|
return false;
|
|
434
425
|
}
|
|
@@ -485,7 +476,7 @@ async function waitPastBlocking(page, headed) {
|
|
|
485
476
|
info(`Still waiting for results page (${Math.round((deadline - Date.now()) / 1000)}s left)...`);
|
|
486
477
|
lastProgressAt = Date.now();
|
|
487
478
|
}
|
|
488
|
-
await
|
|
479
|
+
await sleep(500);
|
|
489
480
|
}
|
|
490
481
|
return false;
|
|
491
482
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search.js","sourceRoot":"","sources":["../../src/commands/search.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"search.js","sourceRoot":"","sources":["../../src/commands/search.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,YAAY,CAAC;AAC/B,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAuC3C,MAAM,CAAC,KAAK,UAAU,OAAO,CAC3B,GAAmB,EACnB,IAAgB;IAEhB,OAAO,YAAY,CACjB,GAAG,EACH,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,EACvB,KAAK,IAAI,EAAE;QACT,MAAM,MAAM,GAAG,MAAM,WAAW,CAC9B,GAAG,EACH,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,MAAM,KAAK,IAAI,EACpB,IAAI,CAAC,GAAG,CACT,CAAC;QACF,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;QACxC,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;IACvE,CAAC,EACD,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,KAAK,IAAI,EAAE,UAAU,EAAE,CAAC,EAAE,CAChD,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,GAAG,CAAC,OAAe,EAAE,IAAgB;IACzD,MAAM,EAAE,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAClC,IAAI,CAAC,EAAE,EAAE,CAAC;QACR,MAAM,IAAI,QAAQ,CAAC,CAAC,EAAE,WAAW,EAAE,6BAA6B,CAAC,CAAC;IACpE,CAAC;IACD,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,CAAC,IAAI,CAAC,GAAG,IAAI,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;IAExD,MAAM,IAAI,GAAG,MAAM,QAAQ,CACzB,QAAQ,EACR,EAAE,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,EACzC,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAC/C,CAAC;IAEF,IAAI,CAAC;QACH,KAAK,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC;QACnD,IAAI;KACL,CAAC,CAAC;AACL,CAAC;AAED,IAAI,QAAQ,GAAG,CAAC,CAAC;AACjB,IAAI,QAAQ,GAAG,CAAC,CAAC;AAEjB,0EAA0E;AAC1E,sEAAsE;AACtE,gEAAgE;AAChE,MAAM,CAAC,MAAM,eAAe,GAC1B,oDAAoD,CAAC;AACvD,MAAM,CAAC,MAAM,aAAa,GAAG,OAAO,CAAC;AAErC,oEAAoE;AACpE,oEAAoE;AACpE,0EAA0E;AAC1E,2EAA2E;AAC3E,wEAAwE;AACxE,iBAAiB;AACjB,MAAM,SAAS,GAAG,EAAE,CAAC;AACrB,MAAM,SAAS,GAAG,EAAE,CAAC;AAErB,MAAM,UAAU,cAAc,CAAC,GAAW;IACxC,MAAM,CAAC,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;IACrB,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAC;IACvD,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACnC,CAAC;AA0BD,SAAS,IAAI,CAAC,CAAU;IACtB,OAAO,CAAC,KAAK,MAAM,CAAC;AACtB,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,IAAkB;IACzC,MAAM,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC;IACpB,IAAI,CAAC,CAAC,EAAE,OAAO;QAAE,OAAO,IAAI,CAAC;IAC7B,MAAM,KAAK,GAAG,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,iBAAiB,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACpE,MAAM,QAAQ,GAAG,CAAC,CAAC,SAAS,EAAE,KAAK,CAAC;IACpC,MAAM,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACrD,MAAM,QAAQ,GAAG,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC;IAChC,MAAM,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACvD,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC;SACxB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;SACjC,MAAM,CAAC,CAAC,CAAC,EAAe,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACnC,OAAO;QACL,OAAO,EAAE,CAAC,CAAC,OAAO;QAClB,KAAK;QACL,KAAK,EAAE;YACL,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE;YACpC,GAAG,EAAE,KAAK;YACV,GAAG,EAAE,KAAK;SACX;QACD,QAAQ,EAAE;YACR,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,IAAI,IAAI;YAC1B,OAAO,EAAE,CAAC,CAAC,YAAY,EAAE,WAAW,IAAI,CAAC,CAAC,UAAU,IAAI,IAAI;YAC5D,KAAK;SACN;QACD,QAAQ,EAAE;YACR,QAAQ,EAAE,CAAC,CAAC,QAAQ,IAAI,IAAI;YAC5B,IAAI,EAAE,CAAC,CAAC,IAAI,IAAI,IAAI;SACrB;QACD,OAAO,EAAE,CAAC,CAAC,OAAO,IAAI,IAAI;QAC1B,QAAQ,EAAE;YACR,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAC;YAClC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC,kBAAkB,CAAC;YACpC,YAAY,EAAE,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC;SACnC;QACD,IAAI;QACJ,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;QACpB,QAAQ,EAAE,CAAC,CAAC,WAAW,IAAI,IAAI;QAC/B,GAAG,EAAE,iCAAiC,CAAC,CAAC,OAAO,OAAO;QACtD,KAAK,EAAE,CAAC,CAAC,WAAW,IAAI,IAAI;KAC7B,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,WAAW,CACxB,GAAmB,EACnB,OAAe,EACf,MAAe,EACf,UAAkB;IAElB,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,OAAO,EAAE,CAAC;IAEjC,sEAAsE;IACtE,8DAA8D;IAC9D,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAC9C,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC;SAC/B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;SAC/D,IAAI,CAAC,EAAE,CAAC,CAAC;IACZ,MAAM,OAAO,GAAG,0DAA0D,KAAK,EAAE,CAAC;IAClF,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAC1B,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC,CAAC,EAC9C,SAAS,CACV,CAAC;IAEF,oEAAoE;IACpE,gBAAgB;IAChB,EAAE;IACF,uEAAuE;IACvE,+DAA+D;IAC/D,uEAAuE;IACvE,wEAAwE;IACxE,oEAAoE;IACpE,0EAA0E;IAC1E,cAAc;IACd,IAAI,cAAc,GAAY,EAAE,CAAC;IACjC,IAAI,iBAAiB,GAAG,CAAC,CAAC;IAC1B,MAAM,MAAM,GAAG,KAAK,EAAE,IAAmC,EAAE,EAAE;QAC3D,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC3B,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC;YAAE,OAAO;QAC/C,IAAI,CAAC;YACH,MAAM,SAAS,GACb,IAAI,eAAe,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YACjE,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAGnC,CAAC;YACF,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,aAAa;gBAAE,OAAO;YACpD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,IAAI,IAAI,CAG/C,CAAC;YACF,IAAI,MAAM,CAAC,MAAM,KAAK,cAAc;gBAAE,OAAO;YAC7C,sEAAsE;YACtE,wEAAwE;YACxE,IAAI,MAAM,CAAC,MAAM,CAAC,SAAS,IAAI,CAAC,CAAC,KAAK,iBAAiB;gBAAE,OAAO;QAClE,CAAC;QAAC,MAAM,CAAC;YACP,OAAO;QACT,CAAC;QACD,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;YAC/B,MAAM,IAAI,GAAG,cAAc,CAAC,IAAI,CAE/B,CAAC;YACF,MAAM,KAAK,GAAG,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,IAAI,EAAE,CAAC;YACnD,MAAM,MAAM,GAAG,KAAK;iBACjB,GAAG,CAAC,QAAQ,CAAC;iBACb,MAAM,CAAC,CAAC,CAAC,EAAc,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC;YACzC,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC;gBAAE,cAAc,GAAG,MAAM,CAAC;QACjD,CAAC;QAAC,MAAM,CAAC;YACP,+BAA+B;QACjC,CAAC;IACH,CAAC,CAAC;IACF,yEAAyE;IACzE,0EAA0E;IAC1E,qEAAqE;IACrE,2EAA2E;IAC3E,wCAAwC;IAExC,KAAK,UAAU,MAAM,CAAC,OAAe;QACnC,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,IAAI,CAAC,qBAAqB,EAAE;gBACrC,SAAS,EAAE,kBAAkB;gBAC7B,OAAO,EAAE,KAAK;aACf,CAAC,CAAC;YACH,MAAM,KAAK,CAAC,OAAO,CAAC,CAAC;QACvB,CAAC;QAAC,MAAM,CAAC;YACP,iBAAiB;QACnB,CAAC;IACH,CAAC;IAED,KAAK,UAAU,UAAU,CAAC,SAAiB;QACzC,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;gBACzB,SAAS,EAAE,kBAAkB;gBAC7B,OAAO,EAAE,KAAK;aACf,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,IAAI,QAAQ,CAChB,CAAC,EACD,eAAe,EACf,+BAAgC,CAAW,CAAC,OAAO,EAAE,CACtD,CAAC;QACJ,CAAC;IACH,CAAC;IAED,yEAAyE;IACzE,qEAAqE;IACrE,uEAAuE;IACvE,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY,KAAK,GAAG,EAAE,CAAC;QACrC,MAAM,GAAG,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC;QAChE,GAAG,CAAC,gBAAgB,CAAC,CAAC;QACtB,QAAQ,GAAG,CAAC,CAAC;QACb,QAAQ,GAAG,CAAC,CAAC;QACb,IAAI,CAAC,EAAE,CAAC,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;YACjC,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YACrB,MAAM,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;YAChD,IACE,wEAAwE,CAAC,IAAI,CAC3E,CAAC,CACF;gBAED,OAAO;YACT,mCAAmC;YACnC,IAAI,yDAAyD,CAAC,IAAI,CAAC,CAAC,CAAC;gBACnE,OAAO;YACT,IAAI,CAAC;gBACH,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;gBACjC,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;gBACzC,IAAI,CAAC,EAAE,CAAC;oBACN,sEAAsE;oBACtE,2DAA2D;oBAC3D,qDAAqD;oBACrD,MAAM,EAAE,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;oBAC7B,MAAM,SAAS,GACb,IAAI,eAAe,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;oBAC5C,IAAI,KAAK,GAAG,EAAE,CAAC;oBACf,IAAI,CAAC;wBACH,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;wBACtC,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;oBACtC,CAAC;oBAAC,MAAM,CAAC;wBACP,YAAY;oBACd,CAAC;oBACD,IAAI,IAAI,GAAG,EAAE,CAAC;oBACd,IAAI,CAAC;wBACH,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;oBAC3B,CAAC;oBAAC,MAAM,CAAC;wBACP,YAAY;oBACd,CAAC;oBACD,MAAM,aAAa,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC;oBAC7D,GAAG,CACD,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,KAAK,YAAY,IAAI,CAAC,MAAM,YAAY,aAAa,EAAE,CAChF,CAAC;oBACF,IAAI,aAAa,GAAG,CAAC,EAAE,CAAC;wBACtB,IAAI,CAAC;4BACH,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAC;4BAC5C,MAAM,GAAG,GAAG,CAAC,EAAE,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;4BACrD,MAAM,IAAI,GAAG,kBAAkB,GAAG,IAAI,KAAK,IAAI,SAAS,OAAO,CAAC;4BAChE,MAAM,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;4BAC/B,GAAG,CAAC,kBAAkB,IAAI,EAAE,CAAC,CAAC;wBAChC,CAAC;wBAAC,MAAM,CAAC;4BACP,YAAY;wBACd,CAAC;oBACH,CAAC;oBACD,OAAO;gBACT,CAAC;gBACD,iEAAiE;gBACjE,sDAAsD;gBACtD,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC,gBAAgB,CAAC,IAAI,GAAG,CAAC;gBACpD,GAAG,CACD,WAAW,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,GAAG,EAAE,CAClF,CAAC;gBACF,IAAI,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,6BAA6B,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;oBACjE,kDAAkD;oBAClD,OAAO;gBACT,CAAC;gBACD,IACE,oCAAoC,CAAC,IAAI,CAAC,CAAC,CAAC;oBAC5C,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,EACtB,CAAC;oBACD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;oBAC/B,8DAA8D;oBAC9D,gEAAgE;oBAChE,IAAI,CAAC;wBACH,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAC;wBAC5C,MAAM,GAAG,GAAG,CAAC,EAAE,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;wBACrD,MAAM,GAAG,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;4BAC1B,CAAC,CAAC,QAAQ;4BACV,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;gCACpB,CAAC,CAAC,MAAM;gCACR,CAAC,CAAC,KAAK,CAAC;wBACV,MAAM,OAAO,GAAG,yBAAyB,GAAG,IAAI,GAAG,OAAO,CAAC;wBAC3D,MAAM,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;wBAClC,MAAM,cAAc,GAAG,CACrB,IAAI,CAAC,KAAK,CAAC,kCAAkC,CAAC,IAAI,EAAE,CACrD,CAAC,MAAM,CAAC;wBACT,GAAG,CACD,kBAAkB,OAAO,KAAK,IAAI,CAAC,MAAM,qBAAqB,cAAc,GAAG,CAChF,CAAC;oBACJ,CAAC;oBAAC,MAAM,CAAC;wBACP,YAAY;oBACd,CAAC;oBACD,0DAA0D;oBAC1D,MAAM,MAAM,GAAG;wBACb,WAAW;wBACX,WAAW;wBACX,eAAe;wBACf,cAAc;wBACd,mBAAmB;wBACnB,cAAc;wBACd,kBAAkB;wBAClB,mBAAmB;wBACnB,iBAAiB;wBACjB,gBAAgB;wBAChB,UAAU;wBACV,aAAa;wBACb,WAAW;wBACX,UAAU;wBACV,eAAe;wBACf,YAAY;qBACb,CAAC;oBACF,KAAK,MAAM,CAAC,IAAI,MAAM,EAAE,CAAC;wBACvB,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;wBAC5B,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC;4BACb,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,GAAG,EAAE,CAAC,EAAE,GAAG,GAAG,EAAE,CAAC,CAAC;4BACxD,GAAG,CACD,WAAW,CAAC,MAAM,GAAG,QAAQ,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,CAC3D,CAAC;wBACJ,CAAC;oBACH,CAAC;oBACD,4BAA4B;oBAC5B,MAAM,YAAY,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC;oBAC3D,MAAM,WAAW,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC;oBAC1D,MAAM,WAAW,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC;oBAC9D,GAAG,CACD,kBAAkB,YAAY,WAAW,WAAW,eAAe,WAAW,EAAE,CACjF,CAAC;gBACJ,CAAC;YACH,CAAC;YAAC,MAAM,CAAC;gBACP,aAAa;YACf,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,mEAAmE;IACnE,6DAA6D;IAC7D,KAAK,UAAU,aAAa,CAAC,SAAiB;QAC5C,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;QACxC,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,QAAQ,EAAE,CAAC;YAC7B,IAAI,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC;gBACpB,MAAM,IAAI,QAAQ,CAAC,GAAG,EAAE,UAAU,EAAE,iBAAiB,CAAC,CAAC;YACzD,CAAC;YACD,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC;gBAAE,OAAO,IAAI,CAAC;YAC3C,yEAAyE;YACzE,IAAI,CAAC,MAAM,IAAI,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;gBAAE,OAAO,KAAK,CAAC;YACpE,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC;QACnB,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,wEAAwE;IACxE,sEAAsE;IACtE,+DAA+D;IAC/D,IAAI,CAAC,0BAA0B,CAAC,CAAC;IACjC,MAAM,MAAM,CAAC,IAAI,CAAC,CAAC;IAEnB,0EAA0E;IAC1E,0EAA0E;IAC1E,IAAI,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IAE5B,MAAM,SAAS,GAAY,EAAE,CAAC;IAC9B,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;IAElC,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,IAAI,WAAW,EAAE,OAAO,EAAE,EAAE,CAAC;QACxD,cAAc,GAAG,EAAE,CAAC;QACpB,iBAAiB,GAAG,OAAO,CAAC,CAAC,+CAA+C;QAE5E,IAAI,OAAO,KAAK,CAAC,EAAE,CAAC;YAClB,IAAI,CAAC,uBAAuB,OAAO,MAAM,CAAC,CAAC;YAC3C,IAAI,MAAM,EAAE,CAAC;gBACX,IAAI,CAAC,sDAAsD,CAAC,CAAC;YAC/D,CAAC;YACD,MAAM,UAAU,CAAC,OAAO,CAAC,CAAC;QAC5B,CAAC;aAAM,CAAC;YACN,sEAAsE;YACtE,mEAAmE;YACnE,kEAAkE;YAClE,oEAAoE;YACpE,6DAA6D;YAC7D,IAAI,CAAC,iBAAiB,OAAO,IAAI,WAAW,KAAK,CAAC,CAAC;YACnD,MAAM,QAAQ,GAAG,MAAM,mBAAmB,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC;YACpE,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,IAAI,CAAC,6BAA6B,OAAO,kBAAkB,SAAS,CAAC,MAAM,WAAW,CAAC,CAAC;gBACxF,MAAM;YACR,CAAC;QACH,CAAC;QAED,IAAI,GAAG,GAAG,MAAM,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QACvD,qEAAqE;QACrE,+DAA+D;QAC/D,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,IAAI,OAAO,KAAK,CAAC,EAAE,CAAC;YACrC,IAAI,CAAC,4DAA4D,CAAC,CAAC;YACnE,uEAAuE;YACvE,yDAAyD;YACzD,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;YAC7B,cAAc,GAAG,EAAE,CAAC;YACpB,MAAM,MAAM,CAAC,IAAI,CAAC,CAAC;YACnB,IAAI,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;YAC5B,MAAM,UAAU,CAAC,OAAO,CAAC,CAAC;YAC1B,GAAG,GAAG,MAAM,aAAa,CAAC,KAAK,CAAC,CAAC;QACnC,CAAC;QACD,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,IAAI,OAAO,KAAK,CAAC,EAAE,CAAC;gBAClB,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;gBAC7B,MAAM,gBAAgB,CAAC,MAAM,CAAC,CAAC;YACjC,CAAC;YACD,IAAI,CACF,QAAQ,OAAO,iCAAiC,SAAS,CAAC,MAAM,GAAG;gBACjE,gBAAgB,OAAO,GAAG,CAAC,WAAW,CACzC,CAAC;YACF,MAAM;QACR,CAAC;QACD,IAAI,OAAO,KAAK,CAAC;YAAE,MAAM,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAEnD,qEAAqE;QACrE,wDAAwD;QACxD,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,KAAK,MAAM,CAAC,IAAI,cAAc,EAAE,CAAC;YAC/B,IAAI,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC;gBAAE,SAAS;YACrC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YACvB,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,KAAK,EAAE,CAAC;QACV,CAAC;QAED,mBAAmB;QACnB,6CAA6C;QAC7C,6DAA6D;QAC7D,uEAAuE;QACvE,mCAAmC;QACnC,IAAI,SAAS,CAAC,MAAM,IAAI,UAAU;YAAE,MAAM;QAC1C,IAAI,cAAc,CAAC,MAAM,GAAG,SAAS;YAAE,MAAM;QAC7C,IAAI,KAAK,KAAK,CAAC;YAAE,MAAM;QAEvB,mEAAmE;QACnE,IAAI,OAAO,GAAG,WAAW,EAAE,CAAC;YAC1B,MAAM,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC;QAC3C,CAAC;IACH,CAAC;IAED,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IAC7B,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,KAAK,UAAU,SAAS,CAAC,IAAU,EAAE,OAAO,GAAG,CAAC;IAC9C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,EAAE,CAAC,EAAE,EAAE,CAAC;QACjC,IAAI,CAAC;YACH,qEAAqE;YACrE,qEAAqE;YACrE,wCAAwC;YACxC,IAAI,uCAAuC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC;gBAC7D,OAAO,IAAI,CAAC;YACd,CAAC;YACD,kEAAkE;YAClE,yCAAyC;YACzC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;YAC9D,IAAI,oBAAoB,CAAC,IAAI,CAAC,KAAK,CAAC;gBAAE,OAAO,IAAI,CAAC;QACpD,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,KAAK,CAAC;QACf,CAAC;QACD,IAAI,CAAC,GAAG,OAAO,GAAG,CAAC;YAAE,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC;IACxC,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;;;;;;;;GAWG;AACH,KAAK,UAAU,gBAAgB,CAC7B,IAAU,EACV,MAAe;IAEf,IAAI,MAAM,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC;QAC7B,IAAI,CAAC,MAAM;YAAE,OAAO,KAAK,CAAC;QAC1B,IAAI,CAAC,6DAA6D,CAAC,CAAC;IACtE,CAAC;IAED,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IACvD,IAAI,cAAc,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAChC,IAAI,WAAW,GAAG,CAAC,CAAC;IACpB,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,KAAK,GAAG,CAAC;IAC/C,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,QAAQ,EAAE,CAAC;QAC7B,IAAI,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC;YACpB,MAAM,IAAI,QAAQ,CAAC,GAAG,EAAE,UAAU,EAAE,iBAAiB,CAAC,CAAC;QACzD,CAAC;QAED,MAAM,KAAK,GAAG,MAAM,IAAI;aACrB,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC;YACf,GAAG,EAAE,QAAQ,CAAC,IAAI;YAClB,KAAK,EAAE,QAAQ,CAAC,KAAK,IAAI,EAAE;YAC3B,WAAW,EAAE,QAAQ,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,MAAM;YAClD,OAAO,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,SAAS,IAAI,EAAE,CAAC,CAAC,MAAM;SACjD,CAAC,CAAC;aACF,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;QAErB,IAAI,KAAK,IAAI,KAAK,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,WAAW,GAAG,IAAI,EAAE,CAAC;YACtD,IAAI,CACF,cAAc,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,WAAW,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,aAAa,KAAK,CAAC,WAAW,YAAY,KAAK,CAAC,OAAO,EAAE,CACjI,CAAC;YACF,WAAW,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC3B,CAAC;QAED,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,QAAQ,GAAG,uCAAuC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACzE,oEAAoE;YACpE,sEAAsE;YACtE,qDAAqD;YACrD,IACE,CAAC,QAAQ;gBACT,KAAK,CAAC,WAAW,IAAI,EAAE;gBACvB,KAAK,CAAC,OAAO,IAAI,GAAG,EACpB,CAAC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;QAED,IAAI,MAAM,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,cAAc,GAAG,KAAK,EAAE,CAAC;YAClD,IAAI,CACF,mCAAmC,IAAI,CAAC,KAAK,CAC3C,CAAC,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,GAAG,IAAI,CAC/B,YAAY,CACd,CAAC;YACF,cAAc,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC9B,CAAC;QAED,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC;IACnB,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,gBAAgB,CAAC,WAAoB;IAC5C,MAAM,GAAG,GAAG,WAAW;QACrB,CAAC,CAAC,sDAAsD;YACtD,oCAAoC;QACtC,CAAC,CAAC,uDAAuD;YACvD,0FAA0F;YAC1F,oCAAoC,CAAC;IACzC,OAAO,IAAI,QAAQ,CAAC,CAAC,EAAE,cAAc,EAAE,GAAG,CAAC,CAAC;AAC9C,CAAC;AAED,KAAK,UAAU,mBAAmB,CAAC,IAAU;IAC3C,IAAI,qCAAqC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC;QAC3D,MAAM,IAAI,QAAQ,CAChB,CAAC,EACD,eAAe,EACf,oCAAoC,CACrC,CAAC;IACJ,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,IAAU;IAC5C,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE;QACxB,oEAAoE;QACpE,+BAA+B;QAC/B,MAAM,UAAU,GACd,8FAA8F,CAAC;QAEjG,SAAS,UAAU,CAAC,IAAY;YAC9B,MAAM,CAAC,GACL,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;YACxE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;QACjC,CAAC;QAED,SAAS,iBAAiB,CAAC,CAAoB;YAC7C,qEAAqE;YACrE,gEAAgE;YAChE,mDAAmD;YACnD,IAAI,IAAI,GAAgB,CAAC,CAAC;YAC1B,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC;gBACxC,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC;gBAClC,IAAI,CAAC,MAAM,IAAI,MAAM,KAAK,QAAQ,CAAC,IAAI;oBAAE,MAAM;gBAC/C,MAAM,YAAY,GAAG,MAAM,CAAC,gBAAgB,CAC1C,UAAU,CACX,CAAC;gBACF,MAAM,GAAG,GAAG,IAAI,GAAG,EAAU,CAAC;gBAC9B,KAAK,MAAM,EAAE,IAAI,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC;oBAC1C,MAAM,EAAE,GAAG,UAAU,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;oBAC/B,IAAI,EAAE;wBAAE,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBACtB,CAAC;gBACD,IAAI,GAAG,CAAC,IAAI,GAAG,CAAC;oBAAE,OAAO,IAAI,CAAC,CAAC,oCAAoC;gBACnE,IAAI,GAAG,MAAM,CAAC;YAChB,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;QAED,SAAS,YAAY,CACnB,IAAiB,EACjB,MAAyB;YAEzB,MAAM,MAAM,GAAG,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;YAC5C,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,IAAI,CAAC,IAAI,MAAM,CAAC,MAAM,IAAI,GAAG,EAAE,CAAC;gBACzD,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC;YACvB,CAAC;YACD,MAAM,MAAM,GAAG,MAAM,CAAC,aAAa,CAAmB,KAAK,CAAC,CAAC;YAC7D,MAAM,IAAI,GAAG,MAAM,EAAE,YAAY,CAAC,KAAK,CAAC,CAAC;YACzC,IAAI,IAAI,IAAI,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,IAAI,GAAG;gBAAE,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC;YAEvE,wDAAwD;YACxD,MAAM,UAAU,GAAG,IAAI,CAAC,gBAAgB,CACtC,yEAAyE,CAC1E,CAAC;YACF,KAAK,MAAM,EAAE,IAAI,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;gBACxC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;gBAC7D,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC3D,OAAO,CAAC,CAAC;gBACX,CAAC;YACH,CAAC;YACD,mDAAmD;YACnD,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,YAAY,CAAC,KAAK,CAAC,CAAC;YAC9D,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,IAAI,CAAC;gBAAE,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;YACrE,8DAA8D;YAC9D,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,SAAS,YAAY,CAAC,IAAiB;YAKrC,mEAAmE;YACnE,wEAAwE;YACxE,mCAAmC;YACnC,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAc,GAAG,CAAC,CAAC,CAAC,MAAM,CACvE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,CACjC,CAAC;YACF,KAAK,MAAM,EAAE,IAAI,MAAM,EAAE,CAAC;gBACxB,MAAM,GAAG,GAAG,CAAC,EAAE,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;gBACvD,MAAM,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAAC;gBAC1D,IAAI,CAAC,CAAC;oBAAE,SAAS;gBACjB,MAAM,GAAG,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,CAAE,CAAC,CAAC;gBAC9B,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,GAAG,GAAG,GAAG;oBAAE,SAAS;gBAC7D,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;gBAC1C,IAAI,GAAG,KAAK,IAAI,IAAI,CAAC,GAAG,GAAG,GAAG,IAAI,GAAG,GAAG,GAAG,CAAC;oBAAE,SAAS;gBACvD,OAAO;oBACL,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE;oBACzC,GAAG;oBACH,GAAG;iBACJ,CAAC;YACJ,CAAC;YACD,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC;QAC5C,CAAC;QAED,SAAS,eAAe,CAAC,IAAiB;YAKxC,sEAAsE;YACtE,mDAAmD;YACnD,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CACtB,IAAI,CAAC,gBAAgB,CAAoB,qBAAqB,CAAC,CAChE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;gBACb,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC;gBACvB,IAAI,4DAA4D,CAAC,IAAI,CAAC,CAAC,CAAC;oBACtE,OAAO,KAAK,CAAC;gBACf,OAAO,+CAA+C,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACjE,CAAC,CAAC,CAAC;YACH,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC;YAC9B,MAAM,IAAI,GAAG,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC;YAC5D,MAAM,OAAO,GAAG,IAAI,EAAE,IAAI,IAAI,IAAI,CAAC;YACnC,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,IAAI,EAAE,CAAC;YACpC,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;YACvC,MAAM,KAAK,GAAG,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAE,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YAC/C,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;QAClC,CAAC;QAED,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CACxB,QAAQ,CAAC,gBAAgB,CAAoB,UAAU,CAAC,CACzD,CAAC;QACF,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;QAC/B,MAAM,GAAG,GAAY,EAAE,CAAC;QAExB,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;YACxB,MAAM,OAAO,GAAG,UAAU,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;YACzC,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC;gBAAE,SAAS;YAC5C,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAElB,MAAM,IAAI,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAC;YAClC,MAAM,KAAK,GAAG,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;YACpC,MAAM,KAAK,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;YACjC,MAAM,QAAQ,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC;YACvC,MAAM,GAAG,GACP,CAAC,CAAC,aAAa,CAAmB,KAAK,CAAC;gBACxC,IAAI,CAAC,aAAa,CAAmB,KAAK,CAAC,CAAC;YAC9C,MAAM,KAAK,GACT,GAAG,EAAE,YAAY,CAAC,KAAK,CAAC,IAAI,GAAG,EAAE,YAAY,CAAC,UAAU,CAAC,IAAI,IAAI,CAAC;YAEpE,GAAG,CAAC,IAAI,CAAC;gBACP,OAAO;gBACP,KAAK;gBACL,KAAK;gBACL,QAAQ;gBACR,QAAQ,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE;gBACxC,OAAO,EAAE,IAAI;gBACb,QAAQ,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE;gBAClE,IAAI,EAAE,EAAE;gBACR,KAAK,EAAE,KAAK;gBACZ,QAAQ,EAAE,IAAI;gBACd,GAAG,EAAE,qDAAqD,OAAO,EAAE;gBACnE,KAAK;aACN,CAAC,CAAC;QACL,CAAC;QAED,OAAO,GAAG,CAAC;IACb,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,WAAW,CAAC,MAAe,EAAE,OAAe;IACnD,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,wBAAwB,OAAO,MAAM,CAAC,CAAC;QAC5D,OAAO;IACT,CAAC;IACD,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC;IACvC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QACtB,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;QAC3C,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,IAAI,IAAI,OAAO,CAAC;QACtC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,KAAK,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC;QAC7C,MAAM,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAC9B,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,GAAG,KAAK,EAAE,CAAC,CAAC;QACvC,IAAI,CAAC,CAAC,QAAQ;YAAE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC3D,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC3B,MAAM,OAAO,GAAG;YACd,CAAC,CAAC,QAAQ,CAAC,IAAI;YACf,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,IAAI;SACjD;aACE,MAAM,CAAC,OAAO,CAAC;aACf,IAAI,CAAC,KAAK,CAAC,CAAC;QACf,IAAI,OAAO;YAAE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,GAAG,OAAO,IAAI,CAAC,CAAC;QACxD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;QACzC,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,GAAG,CAAC;YAAE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -2,6 +2,8 @@ import { dispatch } from '../session/dispatch.js';
|
|
|
2
2
|
import { emit, info } from '../io/output.js';
|
|
3
3
|
import { CliError } from '../io/errors.js';
|
|
4
4
|
import { withRecovery } from '../session/recovery.js';
|
|
5
|
+
import { sleep } from '../session/wait.js';
|
|
6
|
+
import { clickConversationByName, clickImSendButton, findImInput, waitForConversationActivated, waitForMessageSent, } from '../session/im-locators.js';
|
|
5
7
|
import { readState } from '../session/state.js';
|
|
6
8
|
const IM_BASE = 'https://air.1688.com/app/ocms-fusion-components-1688/def_cbu_web_im/index.html';
|
|
7
9
|
export async function execute(ctx, args) {
|
|
@@ -51,15 +53,8 @@ export async function executeRaw(ctx, args) {
|
|
|
51
53
|
if (/login\.1688\.com|login\.taobao\.com/.test(page.url())) {
|
|
52
54
|
throw new CliError(3, 'NOT_LOGGED_IN', 'Session expired. Run `1688 login`.');
|
|
53
55
|
}
|
|
54
|
-
const
|
|
55
|
-
|
|
56
|
-
try {
|
|
57
|
-
await input.waitFor({ state: 'visible', timeout: 20000 });
|
|
58
|
-
}
|
|
59
|
-
catch {
|
|
60
|
-
throw new CliError(22, 'CHAT_NOT_LOADED', 'Failed to open 旺旺 IM (page never loaded chat input).');
|
|
61
|
-
}
|
|
62
|
-
await new Promise((r) => setTimeout(r, 3000));
|
|
56
|
+
const input = await findImInput(page);
|
|
57
|
+
await sleep(3000);
|
|
63
58
|
// If scoped URL (order/offer) was used, conversation should auto-activate.
|
|
64
59
|
// Otherwise (sidebar mode), find + click the seller in sidebar.
|
|
65
60
|
let matchedName = null;
|
|
@@ -69,20 +64,7 @@ export async function executeRaw(ctx, args) {
|
|
|
69
64
|
}
|
|
70
65
|
else {
|
|
71
66
|
info(`Searching sidebar for: ${args.searchNames.join(' / ')}`);
|
|
72
|
-
|
|
73
|
-
if (!name)
|
|
74
|
-
continue;
|
|
75
|
-
const item = imFrame.locator(`text=${name}`).first();
|
|
76
|
-
const visible = await item
|
|
77
|
-
.isVisible({ timeout: 2000 })
|
|
78
|
-
.catch(() => false);
|
|
79
|
-
if (visible) {
|
|
80
|
-
info(`Found "${name}" in sidebar; clicking...`);
|
|
81
|
-
await item.click({ force: true });
|
|
82
|
-
matchedName = name;
|
|
83
|
-
break;
|
|
84
|
-
}
|
|
85
|
-
}
|
|
67
|
+
matchedName = await clickConversationByName(page, args.searchNames);
|
|
86
68
|
if (!matchedName) {
|
|
87
69
|
throw new CliError(29, 'SELLER_NOT_IN_SIDEBAR', `Seller not found in 旺旺 conversation list (tried: ${args.searchNames
|
|
88
70
|
.filter(Boolean)
|
|
@@ -90,53 +72,18 @@ export async function executeRaw(ctx, args) {
|
|
|
90
72
|
'auto-activate the conversation.');
|
|
91
73
|
}
|
|
92
74
|
}
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
.waitForFunction(() => {
|
|
96
|
-
const iframe = document.querySelector('iframe[src*="def_cbu_web_im_core"]');
|
|
97
|
-
const body = iframe?.contentDocument?.body?.innerText ?? '';
|
|
98
|
-
return !/您尚未选择联系人/.test(body) && body.length > 50;
|
|
99
|
-
}, { timeout: 25000 })
|
|
100
|
-
.then(() => true)
|
|
101
|
-
.catch(() => false);
|
|
102
|
-
if (!activated) {
|
|
103
|
-
throw new CliError(26, 'CONVERSATION_NOT_SELECTED', `Conversation panel did not activate for ${matchedName}. ` +
|
|
104
|
-
(args.orderId
|
|
105
|
-
? `OrderId ${args.orderId} was passed but conversation never opened.`
|
|
106
|
-
: 'Sidebar click did not switch to conversation.'));
|
|
107
|
-
}
|
|
108
|
-
await new Promise((r) => setTimeout(r, 1500));
|
|
75
|
+
await waitForConversationActivated(page, matchedName, args);
|
|
76
|
+
await sleep(1500);
|
|
109
77
|
// 4. Type the message and send.
|
|
110
78
|
info(`Typing message (${args.message.length} chars)...`);
|
|
111
79
|
await input.click({ force: true });
|
|
112
80
|
await input.fill('');
|
|
113
81
|
await page.keyboard.type(args.message, { delay: 20 });
|
|
114
|
-
await
|
|
82
|
+
await sleep(500);
|
|
115
83
|
info('Sending...');
|
|
116
|
-
await
|
|
117
|
-
.locator('button.send-btn:has-text("发送")')
|
|
118
|
-
.first()
|
|
119
|
-
.click({ force: true });
|
|
120
|
-
// 5. Verify: input clears OR message appears in chat body
|
|
84
|
+
await clickImSendButton(page);
|
|
121
85
|
const sentAt = new Date().toISOString();
|
|
122
|
-
|
|
123
|
-
.waitForFunction((msg) => {
|
|
124
|
-
const iframe = document.querySelector('iframe[src*="def_cbu_web_im_core"]');
|
|
125
|
-
const doc = iframe?.contentDocument;
|
|
126
|
-
if (!doc)
|
|
127
|
-
return false;
|
|
128
|
-
const edit = doc.querySelector('pre.edit[contenteditable="true"]');
|
|
129
|
-
const editText = (edit?.innerText ?? '').replace(/\s+/g, '');
|
|
130
|
-
if (editText.length === 0)
|
|
131
|
-
return true;
|
|
132
|
-
const body = doc.body?.innerText ?? '';
|
|
133
|
-
return body.includes(msg);
|
|
134
|
-
}, args.message, { timeout: 10000 })
|
|
135
|
-
.then(() => true)
|
|
136
|
-
.catch(() => false);
|
|
137
|
-
if (!sent) {
|
|
138
|
-
throw new CliError(24, 'SEND_UNCONFIRMED', 'Send clicked but neither input cleared nor message appeared in scrollback.');
|
|
139
|
-
}
|
|
86
|
+
await waitForMessageSent(page, args.message);
|
|
140
87
|
return {
|
|
141
88
|
ok: true,
|
|
142
89
|
sentTo: matchedName,
|
|
@@ -201,7 +148,7 @@ export async function run(opts) {
|
|
|
201
148
|
const orderUrl = `https://trade.1688.com/order/new_step_order_detail.htm?orderId=${opts.target}`;
|
|
202
149
|
info(`Sending message 1/2: order link card`);
|
|
203
150
|
await dispatch('seller-chat', { ...baseArgs, message: orderUrl, headed: opts.headed }, { headed: opts.headed, profile: opts.profile });
|
|
204
|
-
await
|
|
151
|
+
await sleep(1500);
|
|
205
152
|
info(`Sending message 2/2: question`);
|
|
206
153
|
}
|
|
207
154
|
const data = await dispatch('seller-chat', { ...baseArgs, message: finalMessage, headed: opts.headed }, { headed: opts.headed, profile: opts.profile });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"seller-chat.js","sourceRoot":"","sources":["../../src/commands/seller-chat.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"seller-chat.js","sourceRoot":"","sources":["../../src/commands/seller-chat.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import { dispatch } from '../session/dispatch.js';
|
|
|
2
2
|
import { emit, info } from '../io/output.js';
|
|
3
3
|
import { CliError } from '../io/errors.js';
|
|
4
4
|
import { readState } from '../session/state.js';
|
|
5
|
+
import { sleep } from '../session/wait.js';
|
|
5
6
|
const PRODUCT_URL = (id) => `https://detail.1688.com/offer/${id}.html`;
|
|
6
7
|
export async function run(opts) {
|
|
7
8
|
if (!opts.offerId || !/^\d+$/.test(opts.offerId)) {
|
|
@@ -42,7 +43,7 @@ export async function run(opts) {
|
|
|
42
43
|
info(`Sending message 1/2: product link`);
|
|
43
44
|
await dispatch('seller-chat', { ...chatBaseArgs, message: productUrl }, { headed: opts.headed, profile: opts.profile });
|
|
44
45
|
// Small pause so the 2 sends look natural (and avoid hammering)
|
|
45
|
-
await
|
|
46
|
+
await sleep(1500);
|
|
46
47
|
info(`Sending message 2/2: question`);
|
|
47
48
|
const data = await dispatch('seller-chat', { ...chatBaseArgs, message: opts.message }, { headed: opts.headed, profile: opts.profile });
|
|
48
49
|
emit({
|
|
@@ -96,7 +97,7 @@ export async function scrapeFeGlobals(ctx, args) {
|
|
|
96
97
|
await page.goto(`https://detail.1688.com/offer/${args.offerId}.html`, { waitUntil: 'domcontentloaded', timeout: 25000 });
|
|
97
98
|
// The script tag containing FE_GLOBALS is in the initial HTML, so we don't
|
|
98
99
|
// need to wait for JS to run — but a small delay helps if redirects happen.
|
|
99
|
-
await
|
|
100
|
+
await sleep(1500);
|
|
100
101
|
const result = await page.evaluate(() => {
|
|
101
102
|
const w = window;
|
|
102
103
|
return { offerLoginId: w.FE_GLOBALS?.offerLoginId ?? null };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"seller-inquire.js","sourceRoot":"","sources":["../../src/commands/seller-inquire.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAE3C,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"seller-inquire.js","sourceRoot":"","sources":["../../src/commands/seller-inquire.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,8 @@ import { dispatch } from '../session/dispatch.js';
|
|
|
3
3
|
import { emit, info, isJson } from '../io/output.js';
|
|
4
4
|
import { CliError } from '../io/errors.js';
|
|
5
5
|
import { withRecovery } from '../session/recovery.js';
|
|
6
|
+
import { clickConversationByName, findImInput, waitForConversationActivated, } from '../session/im-locators.js';
|
|
7
|
+
import { sleep } from '../session/wait.js';
|
|
6
8
|
import { readState } from '../session/state.js';
|
|
7
9
|
const IM_BASE = 'https://air.1688.com/app/ocms-fusion-components-1688/def_cbu_web_im/index.html';
|
|
8
10
|
function formatBeijingTime(ms) {
|
|
@@ -145,7 +147,7 @@ async function waitForWsMessages(frames, timeoutMs) {
|
|
|
145
147
|
midToMethod.get(f.mid) === '/r/MessageManager/listUserMessages');
|
|
146
148
|
if (hit)
|
|
147
149
|
return true;
|
|
148
|
-
await
|
|
150
|
+
await sleep(250);
|
|
149
151
|
}
|
|
150
152
|
return false;
|
|
151
153
|
}
|
|
@@ -245,28 +247,12 @@ export async function executeRaw(ctx, args) {
|
|
|
245
247
|
if (/login\.1688\.com|login\.taobao\.com/.test(page.url())) {
|
|
246
248
|
throw new CliError(3, 'NOT_LOGGED_IN', 'Session expired. Run `1688 login`.');
|
|
247
249
|
}
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
try {
|
|
251
|
-
await input.waitFor({ state: 'visible', timeout: 20000 });
|
|
252
|
-
}
|
|
253
|
-
catch {
|
|
254
|
-
throw new CliError(22, 'CHAT_NOT_LOADED', 'Failed to open 旺旺 IM.');
|
|
255
|
-
}
|
|
256
|
-
await new Promise((r) => setTimeout(r, 3000));
|
|
250
|
+
await findImInput(page);
|
|
251
|
+
await sleep(3000);
|
|
257
252
|
// If sidebar mode: find + click the seller
|
|
258
253
|
let matched = null;
|
|
259
254
|
if (!args.sellerLoginId || (!args.orderId && !args.offerId)) {
|
|
260
|
-
|
|
261
|
-
if (!name)
|
|
262
|
-
continue;
|
|
263
|
-
const item = imFrame.locator(`text=${name}`).first();
|
|
264
|
-
if (await item.isVisible({ timeout: 2000 }).catch(() => false)) {
|
|
265
|
-
await item.click({ force: true });
|
|
266
|
-
matched = name;
|
|
267
|
-
break;
|
|
268
|
-
}
|
|
269
|
-
}
|
|
255
|
+
matched = await clickConversationByName(page, args.searchNames);
|
|
270
256
|
if (!matched) {
|
|
271
257
|
throw new CliError(29, 'SELLER_NOT_IN_SIDEBAR', `Seller not in 旺旺 sidebar: ${args.searchNames.join(', ')}. ` +
|
|
272
258
|
'Use orderId instead to auto-activate via order context.');
|
|
@@ -275,29 +261,18 @@ export async function executeRaw(ctx, args) {
|
|
|
275
261
|
else {
|
|
276
262
|
matched = args.searchNames[0] ?? args.sellerLoginId;
|
|
277
263
|
}
|
|
278
|
-
|
|
279
|
-
const activated = await page
|
|
280
|
-
.waitForFunction(() => {
|
|
281
|
-
const iframe = document.querySelector('iframe[src*="def_cbu_web_im_core"]');
|
|
282
|
-
const body = iframe?.contentDocument?.body?.innerText ?? '';
|
|
283
|
-
return !/您尚未选择联系人/.test(body) && body.length > 50;
|
|
284
|
-
}, { timeout: 25000 })
|
|
285
|
-
.then(() => true)
|
|
286
|
-
.catch(() => false);
|
|
287
|
-
if (!activated) {
|
|
288
|
-
throw new CliError(26, 'CONVERSATION_NOT_SELECTED', `Conversation did not activate for ${matched}.`);
|
|
289
|
-
}
|
|
264
|
+
await waitForConversationActivated(page, matched, args);
|
|
290
265
|
// Wait for IM page to fire `/r/MessageManager/listUserMessages` and the
|
|
291
266
|
// server's recv frame to arrive. Falls through after timeout so we can
|
|
292
267
|
// still fall back to DOM extraction.
|
|
293
268
|
const gotWsMessages = await waitForWsMessages(wsFrames, 8000);
|
|
294
269
|
if (gotWsMessages) {
|
|
295
270
|
// Give a tiny grace window in case a second page-load batch is in flight.
|
|
296
|
-
await
|
|
271
|
+
await sleep(800);
|
|
297
272
|
}
|
|
298
273
|
else {
|
|
299
274
|
// No WS response captured — wait a bit more for DOM render.
|
|
300
|
-
await
|
|
275
|
+
await sleep(2500);
|
|
301
276
|
}
|
|
302
277
|
// Try the WebSocket path first — server-truth data (messageId, createAt,
|
|
303
278
|
// readStatus, URLs in plain text). If empty, fall back to DOM scraping.
|
|
@@ -374,7 +349,7 @@ export async function executeRaw(ctx, args) {
|
|
|
374
349
|
}
|
|
375
350
|
// Probe mode: wait longer for response frames.
|
|
376
351
|
if (process.env.BB1688_PROBE === '1') {
|
|
377
|
-
await
|
|
352
|
+
await sleep(15000);
|
|
378
353
|
}
|
|
379
354
|
// Probe: dump (1) suspected card item HTML, (2) all mtop calls fired
|
|
380
355
|
// during the IM load, (3) any WebSocket connections + global state.
|
|
@@ -609,7 +584,7 @@ export async function run(opts) {
|
|
|
609
584
|
// Poll loop
|
|
610
585
|
// eslint-disable-next-line no-constant-condition
|
|
611
586
|
while (true) {
|
|
612
|
-
await
|
|
587
|
+
await sleep(intervalSec * 1000);
|
|
613
588
|
let next;
|
|
614
589
|
try {
|
|
615
590
|
next = await fetchOnce();
|