From 16a541127cfe7ea8cfd475d055950f8169d9bef0 Mon Sep 17 00:00:00 2001 From: babayaga Date: Fri, 26 Dec 2025 01:17:00 +0100 Subject: [PATCH] email cancel --- packages/search/dist-in/lib/email.d.ts | 3 +- packages/search/dist-in/lib/email.js | 55 +++++++++++++++-- packages/search/dist-in/lib/googlemaps-zod.js | 6 +- packages/search/dist-in/lib/googlemaps.js | 6 +- packages/search/src/lib/email.ts | 59 +++++++++++++++++-- packages/search/src/lib/googlemaps-zod.ts | 4 +- packages/search/src/lib/googlemaps.ts | 4 +- 7 files changed, 114 insertions(+), 23 deletions(-) diff --git a/packages/search/dist-in/lib/email.d.ts b/packages/search/dist-in/lib/email.d.ts index 7bfff6b5..5deb5260 100644 --- a/packages/search/dist-in/lib/email.d.ts +++ b/packages/search/dist-in/lib/email.d.ts @@ -8,7 +8,7 @@ export declare class HtmlToTextTransformer extends MappingDocumentTransformer { }>>; } export declare const cheerioLoader: (url: string) => Promise; -export declare const puppeteerLoader: (url: string, headless: boolean, location: LocalResult) => Promise; +export declare const puppeteerLoader: (url: string, headless: boolean, location: LocalResult, checkCancelled?: () => Promise) => Promise; export declare const findEMail: (question: string, url: string, opts: { headless?: boolean; searchFrom?: string; @@ -18,5 +18,6 @@ export declare const findEmailEach: (location: LocalResult, opts: { headless?: boolean; searchFrom?: string; abortAfter?: number; + checkCancelled?: () => Promise; [key: string]: any; }, onProgress?: (page: Page) => Promise) => Promise; diff --git a/packages/search/dist-in/lib/email.js b/packages/search/dist-in/lib/email.js index ce0f4ddc..1058f45e 100644 --- a/packages/search/dist-in/lib/email.js +++ b/packages/search/dist-in/lib/email.js @@ -6,7 +6,7 @@ import { MappingDocumentTransformer, Document } from "@langchain/core/documents" import { isValidUrl } from './html.js'; const emailRegex = /[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}/g; const mailtoRegex = /^mailto:([^\s@]+@[^\s@]+\.[^\s@]+)$/i; -import { PuppeteerWebBaseLoader as loader } from './pupeteer.js'; +import { PuppeteerWebBaseLoader as loader, getBrowser } from './pupeteer.js'; export class HtmlToTextTransformer extends MappingDocumentTransformer { static lc_name() { return "HtmlToTextTransformer"; @@ -37,10 +37,14 @@ export const cheerioLoader = async (url) => { const ret = await sequence.invoke(docs); return ret; }; -export const puppeteerLoader = async (url, headless, location) => { +export const puppeteerLoader = async (url, headless, location, checkCancelled) => { if (isValidUrl(url) === false || url.indexOf('mailto') !== -1) { return []; } + if (checkCancelled && await checkCancelled()) { + logger.info('Cancelled before loading ' + url); + return []; + } let loaderWithOptions; try { // Function to detect a valid URL loaderWithOptions = new loader(url, { @@ -53,12 +57,39 @@ export const puppeteerLoader = async (url, headless, location) => { waitUntil: "networkidle0", }, async evaluate(page, browser) { + if (checkCancelled && await checkCancelled()) { + debugger; + const pid = browser.process()?.pid; + logger.warn(`Killing browser process ${pid} due to cancellation`); + await browser.close(); + throw new Error('CancelledByUser'); + } const result = await page.evaluate(() => document.body.innerHTML); // await browser.close() return result; } }); - const docs = await loaderWithOptions.load(); + // Race load against cancellation + const loadPromise = loaderWithOptions.load(); + const cancelPromise = new Promise(async (_, reject) => { + if (!checkCancelled) + return; + // Poll for cancellation + while (true) { + await new Promise(r => setTimeout(r, 1000)); + if (await checkCancelled()) { + const browser = await getBrowser(); + if (browser) { + const pid = browser.process()?.pid; + logger.info(`Killing browser process ${pid} due to cancellation`); + await browser.close(); + } + reject(new Error('CancelledByUser')); + break; + } + } + }); + const docs = await Promise.race([loadPromise, cancelPromise]); const splitter = RecursiveCharacterTextSplitter.fromLanguage("html"); const transformer = new HtmlToTextTransformer(); const sequence = splitter.pipe(transformer); @@ -66,7 +97,10 @@ export const puppeteerLoader = async (url, headless, location) => { return ret; } catch (error) { - logger.warn('Error loading page: ' + url, error.message); + if (error instanceof Error && error.message === 'CancelledByUser') { + throw error; + } + logger.warn('Error loading page: ' + url, error instanceof Error ? error.message : String(error)); location.rejected = true; // loader.browser && loader.browser.close() return []; @@ -98,7 +132,7 @@ export const findEMail = async (question, url, opts, location) => { return false; } let pageUrl = url; - let docs = await puppeteerLoader(pageUrl, opts.headless, location); + let docs = await puppeteerLoader(pageUrl, opts.headless, location, opts.checkCancelled); let emails = []; docs.forEach((d) => { if (d.pageContent && d.pageContent.indexOf('@') !== -1) { @@ -123,6 +157,11 @@ export const findEmailEach = async (location, opts, onProgress) => { const emails = []; const abortAfter = opts.abortAfter ?? 1; for (const page of location.meta.pages) { + if (opts.checkCancelled && await opts.checkCancelled()) { + debugger; + logger.info(`[findEmailEach] Cancellation requested for ${location.title}`); + break; + } if (emails.length >= abortAfter) { break; } @@ -139,6 +178,10 @@ export const findEmailEach = async (location, opts, onProgress) => { page.status = 'SEARCHED_EMAIL'; } catch (error) { + if (error.message === 'CancelledByUser') { + debugger; + throw error; + } page.status = 'FAILED'; page.error = error.message; logger.error(`Error scraping email from ${page.url}:`, error); @@ -157,4 +200,4 @@ export const findEmailEach = async (location, opts, onProgress) => { } return emails; }; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZW1haWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbGliL2VtYWlsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxhQUFhLENBQUE7QUFDcEMsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sd0NBQXdDLENBQUE7QUFDN0UsT0FBTyxFQUFFLDhCQUE4QixFQUFFLE1BQU0seUJBQXlCLENBQUE7QUFDeEUsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGNBQWMsQ0FBQTtBQUN6QyxPQUFPLEVBQUUsMEJBQTBCLEVBQUUsUUFBUSxFQUFFLE1BQU0sMkJBQTJCLENBQUE7QUFFaEYsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLFdBQVcsQ0FBQTtBQUV0QyxNQUFNLFVBQVUsR0FBRyxpREFBaUQsQ0FBQTtBQUNwRSxNQUFNLFdBQVcsR0FBRyxzQ0FBc0MsQ0FBQTtBQUUxRCxPQUFPLEVBQUUsc0JBQXNCLElBQUksTUFBTSxFQUFFLE1BQU0sZUFBZSxDQUFBO0FBRWhFLE1BQU0sT0FBTyxxQkFBc0IsU0FBUSwwQkFBMEI7SUFDakUsTUFBTSxDQUFDLE9BQU87UUFDVixPQUFPLHVCQUF1QixDQUFBO0lBQ2xDLENBQUM7SUFDRCxZQUFZLE9BQU8sR0FBRyxFQUFFO1FBQ3BCLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUNmLE1BQU0sQ0FBQyxjQUFjLENBQUMsSUFBSSxFQUFFLFNBQVMsRUFBRTtZQUNuQyxVQUFVLEVBQUUsSUFBSTtZQUNoQixZQUFZLEVBQUUsSUFBSTtZQUNsQixRQUFRLEVBQUUsSUFBSTtZQUNkLEtBQUssRUFBRSxPQUFPO1NBQ2pCLENBQUMsQ0FBQTtJQUNOLENBQUM7SUFDRCxLQUFLLENBQUMsa0JBQWtCLENBQUMsUUFBa0I7UUFDdkMsTUFBTSxnQkFBZ0IsR0FBRyxVQUFVLENBQUMsUUFBUSxDQUFDLFdBQVcsRUFBRSxJQUFJLENBQUMsU0FBUyxDQUFDLENB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 \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"email.js","sourceRoot":"","sources":["../../src/lib/email.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACpC,OAAO,EAAE,oBAAoB,EAAE,MAAM,wCAAwC,CAAA;AAC7E,OAAO,EAAE,8BAA8B,EAAE,MAAM,yBAAyB,CAAA;AACxE,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,0BAA0B,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAA;AAEhF,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AAEtC,MAAM,UAAU,GAAG,iDAAiD,CAAA;AACpE,MAAM,WAAW,GAAG,sCAAsC,CAAA;AAE1D,OAAO,EAAE,sBAAsB,IAAI,MAAM,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAE5E,MAAM,OAAO,qBAAsB,SAAQ,0BAA0B;IACjE,MAAM,CAAC,OAAO;QACV,OAAO,uBAAuB,CAAA;IAClC,CAAC;IACD,YAAY,OAAO,GAAG,EAAE;QACpB,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,SAAS,EAAE;YACnC,UAAU,EAAE,IAAI;YAChB,YAAY,EAAE,IAAI;YAClB,QAAQ,EAAE,IAAI;YACd,KAAK,EAAE,OAAO;SACjB,CAAC,CAAA;IACN,CAAC;IACD,KAAK,CAAC,kBAAkB,CAAC,QAAkB;QACvC,MAAM,gBAAgB,GAAG,UAAU,CAAC,QAAQ,CAAC,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;QAC3E,OAAO,IAAI,QAAQ,CAAC;YAChB,WAAW,EAAE,gBAAgB;YAC7B,QAAQ,EAAE,EAAE,GAAG,QAAQ,CAAC,QAAQ,EAAE;SACrC,CAAC,CAAC;IACP,CAAC;CACJ;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,EAAE,GAAW,EAAE,EAAE;IAC/C,MAAM,MAAM,GAAG,IAAI,oBAAoB,CAAC,GAAG,CAAC,CAAA;IAC5C,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAA;IAChC,MAAM,QAAQ,GAAG,8BAA8B,CAAC,YAAY,CAAC,MAAM,CAAC,CAAA;IACpE,MAAM,WAAW,GAAG,IAAI,qBAAqB,EAAE,CAAA;IAC/C,MAAM,QAAQ,GAAG,QAAQ,CAAC,IAAI,CAAC,WAAkB,CAAC,CAAA;IAClD,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IACvC,OAAO,GAAG,CAAA;AACd,CAAC,CAAA;AAGD,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,EAAE,GAAW,EAAE,QAAiB,EAAE,QAAqB,EAAE,cAAuC,EAAE,EAAE;IACpI,IAAI,UAAU,CAAC,GAAG,CAAC,KAAK,KAAK,IAAI,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;QAC5D,OAAO,EAAE,CAAA;IACb,CAAC;IAED,IAAI,cAAc,IAAI,MAAM,cAAc,EAAE,EAAE,CAAC;QAC3C,MAAM,CAAC,IAAI,CAAC,2BAA2B,GAAG,GAAG,CAAC,CAAC;QAC/C,OAAO,EAAE,CAAC;IACd,CAAC;IAED,IAAI,iBAAiB,CAAA;IACrB,IAAI,CAAC,CAAQ,iCAAiC;QAC1C,iBAAiB,GAAG,IAAI,MAAM,CAC1B,GAAG,EACH;YACI,aAAa,EAAE;gBACX,QAAQ;gBACR,iBAAiB,EAAE,IAAI;aAC1B;YAED,WAAW,EAAE;gBACT,OAAO,EAAE,KAAK;gBACd,SAAS,EAAE,cAAc;aAC5B;YACD,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO;gBACxB,IAAI,cAAc,IAAI,MAAM,cAAc,EAAE,EAAE,CAAC;oBAC3C,QAAQ,CAAA;oBACR,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,EAAE,EAAE,GAAG,CAAC;oBACnC,MAAM,CAAC,IAAI,CAAC,2BAA2B,GAAG,sBAAsB,CAAC,CAAC;oBAClE,MAAM,OAAO,CAAC,KAAK,EAAE,CAAC;oBACtB,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;gBACvC,CAAC;gBACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;gBACjE,wBAAwB;gBACxB,OAAO,MAAM,CAAA;YACjB,CAAC;SACJ,CACJ,CAAA;QACD,iCAAiC;QACjC,MAAM,WAAW,GAAG,iBAAiB,CAAC,IAAI,EAAE,CAAC;QAE7C,MAAM,aAAa,GAAG,IAAI,OAAO,CAAQ,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE;YACzD,IAAI,CAAC,cAAc;gBAAE,OAAO;YAC5B,wBAAwB;YACxB,OAAO,IAAI,EAAE,CAAC;gBACV,MAAM,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;gBAC5C,IAAI,MAAM,cAAc,EAAE,EAAE,CAAC;oBACzB,MAAM,OAAO,GAAG,MAAM,UAAU,EAAE,CAAC;oBACnC,IAAI,OAAO,EAAE,CAAC;wBACV,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,EAAE,EAAE,GAAG,CAAC;wBACnC,MAAM,CAAC,IAAI,CAAC,2BAA2B,GAAG,sBAAsB,CAAC,CAAC;wBAClE,MAAM,OAAO,CAAC,KAAK,EAAE,CAAC;oBAC1B,CAAC;oBACD,MAAM,CAAC,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC;oBACrC,MAAM;gBACV,CAAC;YACL,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC;QAC9D,MAAM,QAAQ,GAAG,8BAA8B,CAAC,YAAY,CAAC,MAAM,CAAC,CAAA;QACpE,MAAM,WAAW,GAAG,IAAI,qBAAqB,EAAE,CAAA;QAC/C,MAAM,QAAQ,GAAG,QAAQ,CAAC,IAAI,CAAC,WAAkB,CAAC,CAAA;QAClD,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QACvC,OAAO,GAAG,CAAA;IACd,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,IAAI,KAAK,YAAY,KAAK,IAAI,KAAK,CAAC,OAAO,KAAK,iBAAiB,EAAE,CAAC;YAChE,MAAM,KAAK,CAAC;QAChB,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,sBAAsB,GAAG,GAAG,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAA;QACjG,QAAQ,CAAC,QAAQ,GAAG,IAAI,CAAA;QACxB,2CAA2C;QAE3C,OAAO,EAAE,CAAA;IACb,CAAC;AACL,CAAC,CAAA;AACD,MAAM,qBAAqB,GAAG,CAAC,IAAY,EAAY,EAAE;IACrD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;IACjC,MAAM,cAAc,GAAa,EAAE,CAAA;IACnC,MAAM,eAAe,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IAE7G,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACvB,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;QACtC,IAAI,OAAO,EAAE,CAAC;YACV,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;gBAC1B,uEAAuE;gBACvE,MAAM,UAAU,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;gBACvC,MAAM,OAAO,GAAG,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;gBACtE,IAAI,CAAC,OAAO,EAAE,CAAC;oBACX,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBAC/B,CAAC;YACL,CAAC;QACL,CAAC;IACL,CAAC;IACD,OAAO,cAAc,CAAA;AACzB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,SAAS,GAAG,KAAK,EAAE,QAAgB,EAAE,GAAW,EAAE,IAAqE,EAAE,QAAqB,EAAE,EAAE;IAC3J,+CAA+C;IAC/C,IAAI,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;QAClF,MAAM,CAAC,IAAI,CAAC,oBAAoB,EAAE,GAAG,CAAC,CAAA;QACtC,OAAO,KAAK,CAAA;IAChB,CAAC;IACD,IAAI,OAAO,GAAG,GAAG,CAAA;IACjB,IAAI,IAAI,GAAG,MAAM,eAAe,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,CAAC,cAAc,CAAQ,CAAA;IAC9F,IAAI,MAAM,GAAa,EAAE,CAAA;IACzB,IAAI,CAAC,OAAO,CAAC,CAAC,CAAM,EAAE,EAAE;QACpB,IAAI,CAAC,CAAC,WAAW,IAAI,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;YACrD,MAAM,KAAK,GAAG,qBAAqB,CAAC,CAAC,CAAC,WAAW,CAAC,CAAA;YAClD,IAAI,KAAK,EAAE,CAAC;gBACR,MAAM,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAA;YACzB,CAAC;QACL,CAAC;IACL,CAAC,CAAC,CAAA;IACF,MAAM,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC,CAAA;IAC7B,QAAQ,CAAC,MAAM,GAAG,MAAM,CAAA;IACxB,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;QAChB,QAAQ,CAAC,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;IAC9B,CAAC;IACD,QAAQ,CAAC,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC,mBAAmB,GAAG,MAAM,QAAQ,CAAC,KAAK,MAAM,QAAQ,CAAC,IAAI,MAAM,QAAQ,CAAC,KAAK,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC,CAAA;IACxI,OAAO,MAAM,CAAA;AACjB,CAAC,CAAA;AAGD,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,EAAE,QAAqB,EAAE,IAAmI,EAAE,UAA0C,EAAE,EAAE;IAC1O,IAAI,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;QACzC,OAAO,EAAE,CAAA;IACb,CAAC;IAED,MAAM,MAAM,GAAa,EAAE,CAAA;IAC3B,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,IAAI,CAAC,CAAA;IAEvC,KAAK,MAAM,IAAI,IAAI,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;QACrC,IAAI,IAAI,CAAC,cAAc,IAAI,MAAM,IAAI,CAAC,cAAc,EAAE,EAAE,CAAC;YACrD,QAAQ,CAAA;YACR,MAAM,CAAC,IAAI,CAAC,8CAA8C,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;YAC5E,MAAM;QACV,CAAC;QAED,IAAI,MAAM,CAAC,MAAM,IAAI,UAAU,EAAE,CAAC;YAC9B,MAAK;QACT,CAAC;QAED,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YAC5B,SAAQ;QACZ,CAAC;QAED,IAAI,CAAC,MAAM,GAAG,iBAAiB,CAAA;QAC/B,IAAI,CAAC;YACD,MAAM,CAAC,IAAI,CAAC,uBAAuB,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;YAC/C,MAAM,UAAU,GAAG,MAAM,SAAS,CAAC,YAAY,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAA;YAC1E,IAAI,UAAU,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;gBAC1C,MAAM,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,CAAA;YAC9B,CAAC;YACD,IAAI,CAAC,MAAM,GAAG,gBAAgB,CAAA;QAClC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,IAAI,KAAK,CAAC,OAAO,KAAK,iBAAiB,EAAE,CAAC;gBACtC,QAAQ,CAAA;gBACR,MAAM,KAAK,CAAC;YAChB,CAAC;YACD,IAAI,CAAC,MAAM,GAAG,QAAQ,CAAA;YACtB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,OAAO,CAAA;YAC1B,MAAM,CAAC,KAAK,CAAC,6BAA6B,IAAI,CAAC,GAAG,GAAG,EAAE,KAAK,CAAC,CAAA;QACjE,CAAC;QAED,IAAI,UAAU,EAAE,CAAC;YACb,MAAM,UAAU,CAAC,IAAI,CAAC,CAAA;QAC1B,CAAC;IACL,CAAC;IAED,yBAAyB;IACzB,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACpB,MAAM,YAAY,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,IAAI,EAAE,CAAC,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;QAC1E,QAAQ,CAAC,MAAM,GAAG,YAAY,CAAA;QAC9B,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC1B,QAAQ,CAAC,KAAK,GAAG,YAAY,CAAC,CAAC,CAAC,CAAA;QACpC,CAAC;IACL,CAAC;IAED,OAAO,MAAM,CAAA;AACjB,CAAC,CAAA"} \ No newline at end of file diff --git a/packages/search/dist-in/lib/googlemaps-zod.js b/packages/search/dist-in/lib/googlemaps-zod.js index eb4863fd..9cd27ed7 100644 --- a/packages/search/dist-in/lib/googlemaps-zod.js +++ b/packages/search/dist-in/lib/googlemaps-zod.js @@ -27,7 +27,7 @@ export const zodSchemaBase = () => z.object({ google_domain: z.string().default('google.com'), headless: z.boolean().default(true).describe('Headless mode'), language: z.string().default('en'), - limit: z.number().default(5), + limit: z.number().default(250), logLevel: z.string().default('info'), meta: z.boolean().default(false), searchCache: z.boolean().default(false).describe('Use search cache'), @@ -37,7 +37,7 @@ export const zodSchemaBase = () => z.object({ searchFrom: z.string().optional().default('barcelona, spain'), source: z.union([z.string(), z.record(z.string(), z.array(z.string()))]).optional(), type: z.string().optional().default('search'), - zoom: z.number().optional().default(13), + zoom: z.number().optional().default(12), //index: z.string().optional().default('${OSR_ROOT}/osr-directory/meta/index.json').describe('Index file'), //store: z.string().optional().default('${OSR_ROOT}/osr-directory/meta/index.db').describe('Index store'), index: z.string().optional().describe('Index file'), @@ -140,4 +140,4 @@ export const meta_schema = z.object({ "@context": z.string() })) }); -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"googlemaps-zod.js","sourceRoot":"","sources":["../../src/lib/googlemaps-zod.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"googlemaps-zod.js","sourceRoot":"","sources":["../../src/lib/googlemaps-zod.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/packages/search/dist-in/lib/googlemaps.js b/packages/search/dist-in/lib/googlemaps.js index e7f129c5..c9797a09 100644 --- a/packages/search/dist-in/lib/googlemaps.js +++ b/packages/search/dist-in/lib/googlemaps.js @@ -150,7 +150,7 @@ export const searchGoogleMap = async (query, key, opts) => { results = results.filter((r) => r.geo.city.toLowerCase() === opts.filterCity.toLowerCase()); } if (opts.filterCountry) { - results = results.filter((r) => r.geo.countryName.toLowerCase() === opts.filterCountry.toLowerCase()); + // results = results.filter((r) => r.geo.countryName.toLowerCase() === opts.filterCountry.toLowerCase()) } if (opts.filterContinent) { results = results.filter((r) => r.geo.continent.toLowerCase() === opts.filterContinent.toLowerCase()); @@ -163,7 +163,7 @@ export const searchGoogleMap = async (query, key, opts) => { const newResults = results.filter((r) => { return index[r.title] == null || !index[r.title].geo || !index[r.title].meta; }); - logger.info(`found ${newResults.length} new items for "${query}" from "${params.searchFrom}" | ${beforeCached} total before cache filtering`); + logger.info(`found ${newResults.length} new items for "${query}" (Zoom: ${opts.zoom} | Limit: ${opts.limit}) from "${params.searchFrom}" | ${beforeCached} total before cache filtering`); const processedResults = newResults.slice(0, opts.limit); await enrichResults(processedResults, index, opts); return results; @@ -480,4 +480,4 @@ export const each = async (opts) => { opts.log && write(path.resolve(resolve(opts.log)), all); return all; }; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"googlemaps.js","sourceRoot":"","sources":["../../src/lib/googlemaps.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"googlemaps.js","sourceRoot":"","sources":["../../src/lib/googlemaps.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/packages/search/src/lib/email.ts b/packages/search/src/lib/email.ts index e7c789be..4332eadd 100644 --- a/packages/search/src/lib/email.ts +++ b/packages/search/src/lib/email.ts @@ -9,7 +9,7 @@ import { isValidUrl } from './html.js' const emailRegex = /[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}/g const mailtoRegex = /^mailto:([^\s@]+@[^\s@]+\.[^\s@]+)$/i -import { PuppeteerWebBaseLoader as loader } from './pupeteer.js' +import { PuppeteerWebBaseLoader as loader, getBrowser } from './pupeteer.js' export class HtmlToTextTransformer extends MappingDocumentTransformer { static lc_name() { @@ -44,10 +44,16 @@ export const cheerioLoader = async (url: string) => { } -export const puppeteerLoader = async (url: string, headless: boolean, location: LocalResult) => { +export const puppeteerLoader = async (url: string, headless: boolean, location: LocalResult, checkCancelled?: () => Promise) => { if (isValidUrl(url) === false || url.indexOf('mailto') !== -1) { return [] } + + if (checkCancelled && await checkCancelled()) { + logger.info('Cancelled before loading ' + url); + return []; + } + let loaderWithOptions try { // Function to detect a valid URL loaderWithOptions = new loader( @@ -63,20 +69,51 @@ export const puppeteerLoader = async (url: string, headless: boolean, location: waitUntil: "networkidle0", }, async evaluate(page, browser) { + if (checkCancelled && await checkCancelled()) { + debugger + const pid = browser.process()?.pid; + logger.warn(`Killing browser process ${pid} due to cancellation`); + await browser.close(); + throw new Error('CancelledByUser'); + } const result = await page.evaluate(() => document.body.innerHTML) // await browser.close() return result } } ) - const docs = await loaderWithOptions.load() + // Race load against cancellation + const loadPromise = loaderWithOptions.load(); + + const cancelPromise = new Promise(async (_, reject) => { + if (!checkCancelled) return; + // Poll for cancellation + while (true) { + await new Promise(r => setTimeout(r, 1000)); + if (await checkCancelled()) { + const browser = await getBrowser(); + if (browser) { + const pid = browser.process()?.pid; + logger.info(`Killing browser process ${pid} due to cancellation`); + await browser.close(); + } + reject(new Error('CancelledByUser')); + break; + } + } + }); + + const docs = await Promise.race([loadPromise, cancelPromise]); const splitter = RecursiveCharacterTextSplitter.fromLanguage("html") const transformer = new HtmlToTextTransformer() const sequence = splitter.pipe(transformer as any) const ret = await sequence.invoke(docs) return ret } catch (error) { - logger.warn('Error loading page: ' + url, error.message) + if (error instanceof Error && error.message === 'CancelledByUser') { + throw error; + } + logger.warn('Error loading page: ' + url, error instanceof Error ? error.message : String(error)) location.rejected = true // loader.browser && loader.browser.close() @@ -111,7 +148,7 @@ export const findEMail = async (question: string, url: string, opts: { headless? return false } let pageUrl = url - let docs = await puppeteerLoader(pageUrl, opts.headless, location) as any + let docs = await puppeteerLoader(pageUrl, opts.headless, location, opts.checkCancelled) as any let emails: string[] = [] docs.forEach((d: any) => { if (d.pageContent && d.pageContent.indexOf('@') !== -1) { @@ -131,7 +168,7 @@ export const findEMail = async (question: string, url: string, opts: { headless? } -export const findEmailEach = async (location: LocalResult, opts: { headless?: boolean, searchFrom?: string, abortAfter?: number, [key: string]: any }, onProgress?: (page: Page) => Promise) => { +export const findEmailEach = async (location: LocalResult, opts: { headless?: boolean, searchFrom?: string, abortAfter?: number, checkCancelled?: () => Promise, [key: string]: any }, onProgress?: (page: Page) => Promise) => { if (!location.meta || !location.meta.pages) { return [] } @@ -140,6 +177,12 @@ export const findEmailEach = async (location: LocalResult, opts: { headless?: bo const abortAfter = opts.abortAfter ?? 1 for (const page of location.meta.pages) { + if (opts.checkCancelled && await opts.checkCancelled()) { + debugger + logger.info(`[findEmailEach] Cancellation requested for ${location.title}`); + break; + } + if (emails.length >= abortAfter) { break } @@ -157,6 +200,10 @@ export const findEmailEach = async (location: LocalResult, opts: { headless?: bo } page.status = 'SEARCHED_EMAIL' } catch (error) { + if (error.message === 'CancelledByUser') { + debugger + throw error; + } page.status = 'FAILED' page.error = error.message logger.error(`Error scraping email from ${page.url}:`, error) diff --git a/packages/search/src/lib/googlemaps-zod.ts b/packages/search/src/lib/googlemaps-zod.ts index 375fb2b5..dc0285db 100644 --- a/packages/search/src/lib/googlemaps-zod.ts +++ b/packages/search/src/lib/googlemaps-zod.ts @@ -33,7 +33,7 @@ export const zodSchemaBase = () => google_domain: z.string().default('google.com'), headless: z.boolean().default(true).describe('Headless mode'), language: z.string().default('en'), - limit: z.number().default(5), + limit: z.number().default(250), logLevel: z.string().default('info'), meta: z.boolean().default(false), searchCache: z.boolean().default(false).describe('Use search cache'), @@ -43,7 +43,7 @@ export const zodSchemaBase = () => searchFrom: z.string().optional().default('barcelona, spain'), source: z.union([z.string(), z.record(z.string(), z.array(z.string()))]).optional(), type: z.string().optional().default('search'), - zoom: z.number().optional().default(13), + zoom: z.number().optional().default(12), //index: z.string().optional().default('${OSR_ROOT}/osr-directory/meta/index.json').describe('Index file'), //store: z.string().optional().default('${OSR_ROOT}/osr-directory/meta/index.db').describe('Index store'), index: z.string().optional().describe('Index file'), diff --git a/packages/search/src/lib/googlemaps.ts b/packages/search/src/lib/googlemaps.ts index e8ca1edc..0b603e51 100644 --- a/packages/search/src/lib/googlemaps.ts +++ b/packages/search/src/lib/googlemaps.ts @@ -200,7 +200,7 @@ export const searchGoogleMap = async ( results = results.filter((r) => r.geo.city.toLowerCase() === opts.filterCity.toLowerCase()) } if (opts.filterCountry) { - results = results.filter((r) => r.geo.countryName.toLowerCase() === opts.filterCountry.toLowerCase()) + // results = results.filter((r) => r.geo.countryName.toLowerCase() === opts.filterCountry.toLowerCase()) } if (opts.filterContinent) { results = results.filter((r) => r.geo.continent.toLowerCase() === opts.filterContinent.toLowerCase()) @@ -215,7 +215,7 @@ export const searchGoogleMap = async ( return index[r.title] == null || !index[r.title].geo || !index[r.title].meta }) logger.info( - `found ${newResults.length} new items for "${query}" from "${params.searchFrom}" | ${beforeCached} total before cache filtering`, + `found ${newResults.length} new items for "${query}" (Zoom: ${opts.zoom} | Limit: ${opts.limit}) from "${params.searchFrom}" | ${beforeCached} total before cache filtering`, ) const processedResults = newResults.slice(0, opts.limit) await enrichResults(processedResults, index, opts)