tries to fix infinite loop during analysis

Author: dstriotto

src/content-script/content.ts

@@ -142,6 +142,12 @@ getTabId(communicationChannel).then(async (tabId) => {
 
 	const specMutex: Mutex = new Mutex('spec-mutex');
 
+	const lastPageRedirectStorage = new BackgroundIndexedDBObjectStorage<number>(
+		IndexedDBDatabases.LastPageRedirect, 
+		IndexedDBDatabases.LastPageRedirect, 
+		communicationChannel
+	);
+
 	const crawler: Crawler = new Crawler(
 		browserContext,
 		pageStorage,
@@ -155,7 +161,8 @@ getTabId(communicationChannel).then(async (tabId) => {
 		specMutex,
 		analysisElementXPathStorage,
 		pageAnalysisStorage,
-		config
+		config,
+		lastPageRedirectStorage
 	);
 
 	communicationChannel.setMessageListener(async function (message: Message) {

src/content-script/crawler/Crawler.ts

@@ -28,6 +28,7 @@ import { PageAnalysis } from './PageAnalysis';
 import { Message } from '../../shared/comm/Message';
 import { Command } from '../../shared/comm/Command';
 import { Config } from '../../shared/config';
+import { ElementAnalysis } from './ElementAnalysis';
 
 export class Crawler {
 	private lastPageKey: string;
@@ -45,7 +46,8 @@ export class Crawler {
 		private specMutex: Mutex,
 		private analysisElementXPathStorage: ObjectStorage<string>,
 		private pageAnalysisStorage: PageAnalysisStorage,
-		private config: Config
+		private config: Config,
+		private lastPageRedirectStorage: ObjectStorage<number>
 	) {
 		this.lastPageKey = 'last-page';
 	}
@@ -76,12 +78,31 @@ export class Crawler {
 				const pageAnalysisStatus = await this.pageAnalysisStorage.getPageAnalysisStatus(this.browserContext.getUrl());
 				if(pageAnalysisStatus != PageAnalysisStatus.Pending){
 					window.location.href = lastUnanalyzed.getPageUrl().href;
-					// verifica se o href esta salvo como ultima url redirecionado
-					// se nao, salvar novo href como "ultima url redirecionada", com contador 1
-					// se sim, incrementar o contador
-						// se contador >= 5 (exemplo)
-							// salvar pagina com status DONE
-							// salvar elemento como analisado (para ele nao ser mais localizado no lastUnanalyzed)
+					const amountRedirect = await this.lastPageRedirectStorage.get(getURLasString(lastUnanalyzed.getPageUrl(), this.config));
+					if(amountRedirect != null){
+						const newAmount = amountRedirect + 1;
+						await this.lastPageRedirectStorage.set(getURLasString(lastUnanalyzed.getPageUrl(), this.config), newAmount);
+						if(newAmount >= 5){
+							const pageAnalysis = new PageAnalysis(this.browserContext.getUrl(), PageAnalysisStatus.Done);
+							await this.pageAnalysisStorage.set(getURLasString(this.browserContext.getUrl(), this.config), pageAnalysis);
+							const elementAnalysis = new ElementAnalysis(
+								document.body, 
+								lastUnanalyzed.getPageUrl(), 
+								ElementAnalysisStatus.Done, 
+								this.browserContext.getTabId(),
+								this.config
+							);
+							const elementSelector = lastUnanalyzed.getElementSelector();
+							if(elementSelector){
+								elementAnalysis.setPathToElement(elementSelector);
+							} else {
+								throw new Error('ElementSelector was null');
+							}
+						}
+					} else {
+						await this.lastPageRedirectStorage.set(getURLasString(lastUnanalyzed.getPageUrl(), this.config), 1);
+					}
+					
 					return false;
 				}
 			}

src/content-script/crawler/ElementAnalysis.ts

@@ -70,4 +70,8 @@ export class ElementAnalysis {
 	public getTabId(): string {
 		return this.tabId;
 	}
+
+	public setPathToElement(pathToElement: string): void {
+		this.pathToElement = pathToElement;
+	}
 }

src/content-script/storage/BackgroundIndexedDBObjectStorage.ts

@@ -10,8 +10,8 @@ export class BackgroundIndexedDBObjectStorage<Type> implements ObjectStorage<Typ
 		classe no construtor também 
 	*/
 	constructor(
-		private dbName: string,
-		private storeName: string,
+		protected dbName: string,
+		protected storeName: string,
 		private communicationChannel: CommunicationChannel,
 		private typeConstructor?: ClassConstructor<unknown>,
 		private getCommand: Command = Command.GetValueFromBackgroundIndexedDB

src/content-script/storage/ElementAnalysisStorage.ts

@@ -6,6 +6,8 @@ import { CommunicationChannel } from '../../shared/comm/CommunicationChannel';
 import { BackgroundIndexedDBObjectStorage } from './BackgroundIndexedDBObjectStorage';
 import { IndexedDBDatabases } from '../../shared/storage/IndexedDBDatabases';
 import { Config } from '../../shared/config';
+import { Command } from '../../shared/comm/Command';
+import { Message } from '../../shared/comm/Message';
 
 // TODO Trocar o nome da classe
 export class ElementAnalysisStorage extends BackgroundIndexedDBObjectStorage<ElementAnalysis> {

src/shared/storage/IndexedDBDatabases.ts

@@ -5,4 +5,5 @@ export enum IndexedDBDatabases {
     ElementAnalysis = 'element-analysis',
     PageAnalysis = 'page-analysis',
     RunningStatus = 'running-status',
+    LastPageRedirect = 'last-page-redirect',
 }