Further change to make the origin -> originalURL transition work

This commit is contained in:
Kuba Orlik 2021-11-07 18:02:01 +01:00
parent dc28bd5fa2
commit e8075b384d
2 changed files with 8 additions and 8 deletions

View File

@ -7,19 +7,19 @@ export default class Memory extends EventEmitter {
origin_to_history = {} as Record<string, Record<string, RequestCluster>>; origin_to_history = {} as Record<string, Record<string, RequestCluster>>;
async register(request: ExtendedRequest) { async register(request: ExtendedRequest) {
await request.init(); await request.init();
console.log("registering request for", request.origin); console.log("registering request for", request.originalURL);
if (!request.isThirdParty()) { if (!request.isThirdParty()) {
return; return;
} }
if (!this.origin_to_history[request.origin]) { if (!this.origin_to_history[request.originalURL]) {
this.origin_to_history[request.origin] = {}; this.origin_to_history[request.originalURL] = {};
} }
const shorthost = getshorthost(new URL(request.url).host); const shorthost = getshorthost(new URL(request.url).host);
if (!this.origin_to_history[request.origin][shorthost]) { if (!this.origin_to_history[request.originalURL][shorthost]) {
const cluster = new RequestCluster(shorthost); const cluster = new RequestCluster(shorthost);
this.origin_to_history[request.origin][shorthost] = cluster; this.origin_to_history[request.originalURL][shorthost] = cluster;
} }
this.origin_to_history[request.origin][shorthost].add(request); this.origin_to_history[request.originalURL][shorthost].add(request);
this.emit("change"); this.emit("change");
} }

View File

@ -49,7 +49,7 @@ export class StolenDataEntry {
getPriority() { getPriority() {
let priority = 0; let priority = 0;
priority += Math.min(this.value.length, 50); priority += Math.min(this.value.length, 50);
const url = new URL(this.request.getOrigin()); const url = new URL(this.request.originalURL);
if (this.value.includes(url.host)) { if (this.value.includes(url.host)) {
priority += 100; priority += 100;
} }
@ -127,7 +127,7 @@ export class StolenDataEntry {
} }
private classify(): keyof typeof Classifications { private classify(): keyof typeof Classifications {
if (this.value.includes(this.request.origin)) { if (this.value.includes(this.request.originalURL)) {
return "history"; return "history";
} else { } else {
return "id"; return "id";