(
null
);
@@ -33,6 +32,7 @@ const Toolbar = () => {
const tab = await getCurrentTab();
if (tab !== undefined) {
+ if (!tab.url) return;
const url = new URL(tab.url);
if (url.origin.startsWith('moz-extension')) {
return;
@@ -58,23 +58,27 @@ const Toolbar = () => {
switch (exposedOriginDomains.length) {
case 0:
- return null;
+ break;
case 1:
- return setExposedOriginDomainCopy(`${exposedOriginDomains[0]}.`);
+ setExposedOriginDomainCopy(`${exposedOriginDomains[0]}.`);
+ break;
case 2:
- return setExposedOriginDomainCopy(
+ setExposedOriginDomainCopy(
`${exposedOriginDomains[0]} oraz ${exposedOriginDomains[1]}.`
);
+ break;
case 3:
- return setExposedOriginDomainCopy(
+ setExposedOriginDomainCopy(
`${exposedOriginDomains[0]}, ${exposedOriginDomains[1]} oraz ${exposedOriginDomains[2]}.`
);
+ break;
default:
- return setExposedOriginDomainCopy(
+ setExposedOriginDomainCopy(
`${exposedOriginDomains[0]}, ${exposedOriginDomains[1]} (i ${
exposedOriginDomains.length - 2 < 2 ? 2 : exposedOriginDomains.length - 2
} innych).`
);
+ break;
}
}, [eventCounts['*'], origin]);
@@ -86,25 +90,30 @@ const Toolbar = () => {
switch (cookieDomains.length) {
case 0:
- return null;
+ null;
case 1:
- return setCookieDomainCopy(`${cookieDomains[0]}.`);
+ setCookieDomainCopy(`${cookieDomains[0]}.`);
+ break;
case 2:
- return setCookieDomainCopy(`${cookieDomains[0]} oraz ${cookieDomains[1]}.`);
+ setCookieDomainCopy(`${cookieDomains[0]} oraz ${cookieDomains[1]}.`);
+ break;
case 3:
- return setCookieDomainCopy(
+ setCookieDomainCopy(
`${cookieDomains[0]}, ${cookieDomains[1]} oraz ${cookieDomains[2]}.`
);
+ break;
default:
- return setCookieDomainCopy(
+ setCookieDomainCopy(
`${cookieDomains[0]}, ${cookieDomains[1]} (i ${
cookieDomains.length - 2 < 2 ? 2 : cookieDomains.length - 2
} innych).`
);
+ break;
}
}, [eventCounts['*'], origin]);
React.useEffect(() => {
+ if (!origin) return;
for (const cluster of Object.values(getMemory().getClustersForOrigin(origin))) {
if (cluster.hasMarks()) {
return setMarksOccurrence(true);
@@ -115,12 +124,17 @@ const Toolbar = () => {
}, [eventCounts['*']]);
function autoMark() {
+ if (!origin) return;
for (const cluster of Object.values(getMemory().getClustersForOrigin(origin))) {
cluster.autoMark();
}
return setMarksOccurrence(true);
}
+ if (!origin) {
+ return Wczytywanie...
;
+ }
+
return (
diff --git a/extended-request.ts b/extended-request.ts
index 8a9d90c..ac9efa9 100644
--- a/extended-request.ts
+++ b/extended-request.ts
@@ -75,12 +75,12 @@ export default class ExtendedRequest {
public tabId: number;
public url: string;
public shorthost: string;
- public requestHeaders: Request['requestHeaders'] = [];
- public originalURL: string;
+ public requestHeaders: { name: string; value?: string; binaryValue?: number[] }[] = [];
+ public originalURL: string | null = null;
public origin: string;
public initialized = false;
- public stolenData: StolenDataEntry[];
- public originalPathname: string;
+ public stolenData: StolenDataEntry[] = [];
+ public originalPathname: string | null = null;
public requestBody: RequestBody;
static by_id = {} as Record;
@@ -97,20 +97,21 @@ export default class ExtendedRequest {
(this.data as any).frameAncestors = [
...(data as any).frameAncestors.map((e: any) => ({ url: e.url })),
];
+ this.origin = this.cacheOrigin();
}
addHeaders(headers: Request['requestHeaders']) {
- this.requestHeaders = headers;
+ this.requestHeaders = headers || [];
return this;
}
- async init() {
- await this.cacheOrigin();
+ init() {
+ this.cacheOrigin();
this.initialized = true;
this.stolenData = this.getAllStolenData();
}
- async cacheOrigin(): Promise {
+ cacheOrigin(): string {
let url: string;
if (this.data.type === 'main_frame') {
url = this.data.url;
@@ -135,6 +136,7 @@ export default class ExtendedRequest {
this.originalURL = url;
this.origin = new URL(url).origin;
this.originalPathname = new URL(url).pathname;
+ return this.origin;
}
isThirdParty() {
diff --git a/request-cluster.ts b/request-cluster.ts
index 8264804..ca4e4c6 100644
--- a/request-cluster.ts
+++ b/request-cluster.ts
@@ -1,4 +1,3 @@
-import { EventEmitter } from 'events';
import ExtendedRequest from './extended-request';
import { SaferEmitter } from './safer-emitter';
import { Sources, StolenDataEntry } from './stolen-data-entry';
@@ -11,12 +10,18 @@ export class RequestCluster extends SaferEmitter {
public requests: ExtendedRequest[] = [];
public representativeStolenData: StolenDataEntry[] = [];
public expanded: boolean;
+ public lastModified: number = 0;
+ public lastFullUrl: string | null = null;
constructor(public id: string) {
super();
}
add(request: ExtendedRequest) {
this.requests.push(request);
this.emit('change');
+ this.lastModified = Date.now();
+ if (request.originalURL) {
+ this.lastFullUrl = request.originalURL;
+ }
}
toggleExpanded(state: boolean) {
diff --git a/tsconfig.json b/tsconfig.json
index 50d873e..f2b501f 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -8,6 +8,8 @@
"typeRoots": ["node_modules/@types", "node_modules/web-ext-types"],
"target": "es2019",
"outDir": "lib",
- "skipLibCheck": true
+ "skipLibCheck": true,
+ "strictNullChecks": true,
+ "strict": true
}
}
diff --git a/util.ts b/util.ts
index caae362..ffb976b 100644
--- a/util.ts
+++ b/util.ts
@@ -36,7 +36,11 @@ export function getshorthost(host: string) {
.replace(/^.*:\/\//, '')
.replace(/\/.*$/, '')
.split('.');
- let lookback = !['co', 'com'].includes(parts.at(-2)) ? -2 : -3;
+ const second_last = parts.at(-2);
+ if (!second_last) {
+ throw new Error('url too short?');
+ }
+ let lookback = !['co', 'com'].includes(second_last) ? -2 : -3;
if (parts.at(-2) == 'doubleclick' || parts.at(-2) == 'google') {
lookback = -4; // to distinguish between google ads and stats
} else if (parts.at(-2) == 'google') {
@@ -89,7 +93,7 @@ export async function getTabByID(id: number) {
}
export function parseToObject(str: unknown): Record {
- let result: Record;
+ let result: Record = {};
let original_string: string;
if (typeof str === 'string') {
original_string = str;
@@ -97,6 +101,8 @@ export function parseToObject(str: unknown): Record {
} else if (typeof str == 'object') {
result = str as Record;
original_string = (result[Symbol.for('originalString')] as string) || JSON.stringify(str);
+ } else {
+ return {};
}
result[Symbol.for('originalString')] = original_string;
return result;
@@ -149,10 +155,11 @@ export function getDate() {
}
export function toBase64(file: File): Promise {
- return new Promise((resolve) => {
+ return new Promise((resolve, reject) => {
const FR = new FileReader();
FR.addEventListener('load', (e) => {
- resolve(e.target.result as string);
+ const target = e.target;
+ target ? resolve(target.result as string) : reject('empty file?');
});
FR.readAsDataURL(file);
});
@@ -199,7 +206,8 @@ export function isBase64JSON(s: unknown): s is string {
export function flattenObject(
obj: unknown,
- parser: (to_parse: unknown) => string | Record = (id) => id.toString(),
+ parser: (to_parse: { toString: () => string }) => string | Record = (id) =>
+ id.toString(),
key = '',
ret = [] as [string, string][],
parsed = false
@@ -220,7 +228,7 @@ export function flattenObject(
flattenObject(value, parser, prefix + subkey, ret);
}
} else if (!parsed) {
- flattenObject(parser(obj), parser, key, ret, true);
+ flattenObject(parser(obj as { toString: () => string }), parser, key, ret, true);
} else if (typeof obj === 'string') {
ret.push([key, obj]);
} else {
@@ -231,7 +239,8 @@ export function flattenObject(
export function flattenObjectEntries(
entries: [string, unknown][],
- parser: (to_parse: unknown) => string | Record = (id) => id.toString()
+ parser: (to_parse: { toString: () => string }) => string | Record = (id) =>
+ id.toString()
): [string, string][] {
return flattenObject(Object.fromEntries(entries), parser);
}