icd/rentgen
icd/rentgen
3
2
Fork 1
Code Issues 73 Pull Requests 2 Projects Releases 6 Wiki Activity

Better documentURL detector. Closes #57

Browse Source
This commit is contained in:
Kuba Orlik 2022-07-09 16:04:52 +02:00
parent 416a6aa340
commit 256d44613f
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
extended-request.ts
View File

@ -104,21 +104,27 @@ export default class ExtendedRequest {
let url: string; let url: string;
let is_full_url = true; let is_full_url = true;
let url_comes_from: string;
if (this.data.type === 'main_frame') { if (this.data.type === 'main_frame') {
url = this.data.url; url = this.data.url;
url_comes_from = 'main_frame';
} else if (this.data.frameId === 0 && this.data.documentUrl) { } else if (this.data.frameId === 0 && this.data.documentUrl) {
url = this.data.documentUrl; url = this.data.documentUrl;
url_comes_from = 'documentUrl';
if (this.data.tabId == -1) { if (this.data.tabId == -1) {
//a service worker? //a service worker?
url_comes_from = 'documentUrl (webworker)';
is_full_url = false; is_full_url = false;
} }
} else if ( } else if (
(this.data as any)?.frameAncestors && (this.data as any)?.frameAncestors &&
(this.data as any).frameAncestors[0] !== undefined (this.data as any).frameAncestors[0] !== undefined
) { ) {
url = (this.data as any).frameAncestors[0].url || ''; url = (this.data as any).frameAncestors.at(-1).url || '';
url_comes_from = 'frameAncestors';
} else { } else {
url = this.data.documentUrl || this.data.originUrl; url = this.data.documentUrl || this.data.originUrl;
url_comes_from = 'last resort';
} }
this.originalURL = is_full_url ? url : null; this.originalURL = is_full_url ? url : null;