vodorod/parcer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: add check to match action url and return

Browse Source
This commit is contained in:
RohitR311
2024-12-07 21:16:58 +05:30
parent 0ee50e1c26
commit d6be2683fd
1 changed files with 37 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
maxun-core/src/interpret.ts
View File

@@ -179,54 +179,62 @@ export default class Interpreter extends EventEmitter {
* @param workflow Current **initialized** workflow (array of where-what pairs). * @param workflow Current **initialized** workflow (array of where-what pairs).
* @returns {PageState} State of the current page. * @returns {PageState} State of the current page.
*/ */
private async getState(page: Page, workflow: Workflow, selectors: string[]): Promise<PageState> { private async getState(page: Page, workflowCopy: Workflow, selectors: string[]): Promise<PageState> {
/** /**
* All the selectors present in the current Workflow * All the selectors present in the current Workflow
*/ */
// const selectors = Preprocessor.extractSelectors(workflow); // const selectors = Preprocessor.extractSelectors(workflow);
// console.log("Current selectors:", selectors);
console.log("All selectors:", selectors);
/** /**
* Determines whether the element targetted by the selector is [actionable](https://playwright.dev/docs/actionability). * Determines whether the element targetted by the selector is [actionable](https://playwright.dev/docs/actionability).
* @param selector Selector to be queried * @param selector Selector to be queried
* @returns True if the targetted element is actionable, false otherwise. * @returns True if the targetted element is actionable, false otherwise.
*/ */
const actionable = async (selector: string): Promise<boolean> => { // const actionable = async (selector: string): Promise<boolean> => {
try { // try {
const proms = [ // const proms = [
page.isEnabled(selector, { timeout: 500 }), // page.isEnabled(selector, { timeout: 5000 }),
page.isVisible(selector, { timeout: 500 }), // page.isVisible(selector, { timeout: 5000 }),
]; // ];
return await Promise.all(proms).then((bools) => bools.every((x) => x)); // return await Promise.all(proms).then((bools) => bools.every((x) => x));
} catch (e) { // } catch (e) {
// log(<Error>e, Level.ERROR); // // log(<Error>e, Level.ERROR);
return false; // return false;
} // }
}; // };
/** /**
* Object of selectors present in the current page. * Object of selectors present in the current page.
*/ */
const presentSelectors: SelectorArray = await Promise.all( // const presentSelectors: SelectorArray = await Promise.all(
selectors.map(async (selector) => { // selectors.map(async (selector) => {
if (await actionable(selector)) { // if (await actionable(selector)) {
return [selector]; // return [selector];
} // }
return []; // return [];
}), // }),
).then((x) => x.flat()); // ).then((x) => x.flat());
const action = workflowCopy[workflowCopy.length - 1];
console.log("Next action:", action)
let url: any = page.url();
if (action && action.where.url !== url && action.where.url !== "about:blank") {
url = action.where.url;
}
return { return {
url: page.url(), url,
cookies: (await page.context().cookies([page.url()])) cookies: (await page.context().cookies([page.url()]))
.reduce((p, cookie) => ( .reduce((p, cookie) => (
{ {
...p, ...p,
[cookie.name]: cookie.value, [cookie.name]: cookie.value,
}), {}), }), {}),
selectors: selectors, selectors,
}; };
} }
@@ -622,6 +630,7 @@ export default class Interpreter extends EventEmitter {
const usedActions: string[] = []; const usedActions: string[] = [];
let selectors: string[] = []; let selectors: string[] = [];
let lastAction = null; let lastAction = null;
let actionId = -1
let repeatCount = 0; let repeatCount = 0;
/** /**
@@ -649,9 +658,11 @@ export default class Interpreter extends EventEmitter {
} }
let pageState = {}; let pageState = {};
let getStateTest = "Hello";
try { try {
pageState = await this.getState(p, workflowCopy, selectors); pageState = await this.getState(p, workflowCopy, selectors);
selectors = []; selectors = [];
console.log("Empty selectors:", selectors)
} catch (e: any) { } catch (e: any) {
this.log('The browser has been closed.'); this.log('The browser has been closed.');
return; return;
@@ -671,7 +682,7 @@ export default class Interpreter extends EventEmitter {
// return isApplicable; // return isApplicable;
// }); // });
const actionId = this.getMatchingActionId(workflowCopy, pageState, usedActions); actionId = this.getMatchingActionId(workflowCopy, pageState, usedActions);
const action = workflowCopy[actionId]; const action = workflowCopy[actionId];