Fix typescript errors
This commit is contained in:
Kuba Orlik
parent
f647a07d94
commit
9c1eb31224
|
|
@ -6,7 +6,7 @@ import { getshorthost, unique } from '../util';
|
|||
function handleNewFile(
|
||||
element: HTMLInputElement,
|
||||
entries: StolenDataEntry[],
|
||||
setFiltered: (Blob) => void
|
||||
setFiltered: (arg0: Blob) => void
|
||||
): void {
|
||||
const reader = new FileReader();
|
||||
reader.addEventListener('load', () => {
|
||||
|
|
|
|||
|
|
@ -2,15 +2,8 @@ import React, { Fragment, useEffect, useState } from 'react';
|
|||
import ReactDOM from 'react-dom';
|
||||
import Options from '../options';
|
||||
import { StolenData } from './stolen-data';
|
||||
import { getshorthost, useEmitter } from '../util';
|
||||
import { useEmitter } from '../util';
|
||||
import { getMemory } from '../memory';
|
||||
import InfoCircleIcon from '../assets/icons/info_circle_outline.svg';
|
||||
import SettingsIcon from '../assets/icons/settings.svg';
|
||||
import TrashIcon from '../assets/icons/trash_full.svg';
|
||||
import MailIcon from '../assets/icons/mail.svg';
|
||||
import ShortLeftIcon from '../assets/icons/short_left.svg';
|
||||
import CloseBigIcon from '../assets/icons/close_big.svg';
|
||||
import CookiesIcon from '../assets/icons/cookie.svg';
|
||||
|
||||
async function getCurrentTab() {
|
||||
const [tab] = await browser.tabs.query({
|
||||
|
|
@ -110,11 +103,19 @@ const Sidebar = () => {
|
|||
</div>
|
||||
{stolenDataView ? (
|
||||
<a href="https://internet-czas-dzialac.pl">
|
||||
<InfoCircleIcon />
|
||||
<img
|
||||
src="/assets/icons/info_circle_outline.svg"
|
||||
width="20"
|
||||
height="20"
|
||||
/>
|
||||
</a>
|
||||
) : (
|
||||
<button onClick={() => setStolenDataView(true)}>
|
||||
<ShortLeftIcon />
|
||||
<img
|
||||
src="/assets/icons/short_left.svg"
|
||||
width="20"
|
||||
height="20"
|
||||
/>
|
||||
</button>
|
||||
)}
|
||||
</header>
|
||||
|
|
@ -122,7 +123,11 @@ const Sidebar = () => {
|
|||
{stolenDataView ? (
|
||||
<nav>
|
||||
<button onClick={() => setStolenDataView(!stolenDataView)}>
|
||||
<SettingsIcon width={20} height={20} />
|
||||
<img
|
||||
src="/assets/icons/settings.svg"
|
||||
width="20"
|
||||
height="20"
|
||||
/>
|
||||
<span>Ustawienia</span>
|
||||
</button>
|
||||
<button
|
||||
|
|
@ -132,7 +137,11 @@ const Sidebar = () => {
|
|||
setMarksOccurrence(false);
|
||||
}}
|
||||
>
|
||||
<TrashIcon width={20} height={20} />
|
||||
<img
|
||||
src="/assets/icons/trash_full.svg"
|
||||
width="20"
|
||||
height="20"
|
||||
/>
|
||||
<span>Wyczyść historię wtyczki</span>
|
||||
</button>
|
||||
<button
|
||||
|
|
@ -142,7 +151,11 @@ const Sidebar = () => {
|
|||
setMarksOccurrence(false);
|
||||
}}
|
||||
>
|
||||
<CookiesIcon width={20} height={20} />
|
||||
<img
|
||||
src="/assets/icons/cookie.svg"
|
||||
width="20"
|
||||
height="20"
|
||||
/>
|
||||
<span>Wyczyść ciasteczka</span>
|
||||
</button>
|
||||
<button
|
||||
|
|
@ -165,7 +178,11 @@ const Sidebar = () => {
|
|||
);
|
||||
}}
|
||||
>
|
||||
<MailIcon width={20} height={20} />
|
||||
<img
|
||||
src="/assets/icons/mail.svg"
|
||||
width="20"
|
||||
height="20"
|
||||
/>
|
||||
<span>Utwórz wiadomość dla administratora witryny</span>
|
||||
</button>
|
||||
</nav>
|
||||
|
|
@ -192,7 +209,11 @@ const Sidebar = () => {
|
|||
);
|
||||
}}
|
||||
>
|
||||
<CloseBigIcon width={16} height={16} />
|
||||
<img
|
||||
src="/assets/icons/close_big.svg"
|
||||
width="16"
|
||||
height="16"
|
||||
/>
|
||||
</button>
|
||||
</section>
|
||||
) : null}
|
||||
|
|
|
|||
|
|
@ -3,8 +3,6 @@ import { getMemory } from '../memory';
|
|||
import { StolenDataEntry } from '../stolen-data-entry';
|
||||
|
||||
import { maskString, useEmitter } from '../util';
|
||||
import CookieIcon from '../assets/icons/cookie.svg';
|
||||
import WarningIcon from '../assets/icons/warning.svg';
|
||||
|
||||
import './stolen-data-cluster.scss';
|
||||
|
||||
|
|
@ -80,7 +78,8 @@ function StolenDataRow({
|
|||
<td className="icons">
|
||||
{entry.source === 'cookie' ? (
|
||||
<span title="Dane przechowywane w Cookies">
|
||||
<CookieIcon
|
||||
<img
|
||||
src="/assets/icons/cookie.svg"
|
||||
height={16}
|
||||
width={16}
|
||||
className="cookie-data"
|
||||
|
|
@ -91,7 +90,8 @@ function StolenDataRow({
|
|||
title="Wysłane w zapytaniu opatrzonym Cookies"
|
||||
style={{ opacity: 0.25 }}
|
||||
>
|
||||
<CookieIcon
|
||||
<img
|
||||
src="/assets/icons/cookie.svg"
|
||||
height={16}
|
||||
width={16}
|
||||
className="request-with-cookie"
|
||||
|
|
@ -100,7 +100,8 @@ function StolenDataRow({
|
|||
) : null}
|
||||
{entry.exposesOrigin() ? (
|
||||
<span title="Pokazuje część historii przeglądania">
|
||||
<WarningIcon
|
||||
<img
|
||||
src="/assets/icons/warning.svg"
|
||||
height={16}
|
||||
width={16}
|
||||
className="show-history-part"
|
||||
|
|
@ -111,7 +112,8 @@ function StolenDataRow({
|
|||
title="Jest częścią zapytania, które ujawnia historię przeglądania"
|
||||
style={{ opacity: 0.25 }}
|
||||
>
|
||||
<WarningIcon
|
||||
<img
|
||||
src="/assets/icons/warning.svg"
|
||||
height={16}
|
||||
width={16}
|
||||
className="request-with-history-part"
|
||||
|
|
|
|||
|
|
@ -154,6 +154,11 @@ export class StolenDataEntry extends EventEmitter {
|
|||
let object = StolenDataEntry.parseValue(this.value);
|
||||
for (const key of key_path.split('.')) {
|
||||
if (key === '') continue;
|
||||
if (typeof key === 'string') {
|
||||
throw new Error(
|
||||
'something went wrong when parsing ' + key_path
|
||||
);
|
||||
}
|
||||
object = StolenDataEntry.parseValue(object[key]);
|
||||
}
|
||||
return object;
|
||||
|
|
|
|||
|
|
@ -1,10 +1,12 @@
|
|||
{
|
||||
"compilerOptions": {
|
||||
"jsx": "react",
|
||||
"noImplicitAny": true,
|
||||
"esModuleInterop": true,
|
||||
"lib": ["es2017", "dom", "es2019"],
|
||||
"typeRoots": ["node_modules/@types", "node_modules/web-ext-types"],
|
||||
"target": "es2019",
|
||||
"outDir": "lib"
|
||||
"outDir": "lib",
|
||||
"skipLibCheck": true
|
||||
}
|
||||
}
|
||||
|
|
|
|||
74
util.ts
74
util.ts
|
|
@ -1,11 +1,5 @@
|
|||
import { EventEmitter } from "events";
|
||||
import {
|
||||
Dispatch,
|
||||
ReactChildren,
|
||||
SetStateAction,
|
||||
useEffect,
|
||||
useState,
|
||||
} from "react";
|
||||
import { EventEmitter } from 'events';
|
||||
import { Dispatch, SetStateAction, useEffect, useState } from 'react';
|
||||
|
||||
export type Unpromisify<T> = T extends Promise<infer R> ? R : T;
|
||||
export type Unarray<T> = T extends Array<infer R> ? R : T;
|
||||
|
|
@ -39,16 +33,16 @@ export type Request = {
|
|||
|
||||
export function getshorthost(host: string) {
|
||||
const parts = host
|
||||
.replace(/^.*:\/\//, "")
|
||||
.replace(/\/.*$/, "")
|
||||
.split(".");
|
||||
.replace(/^.*:\/\//, '')
|
||||
.replace(/\/.*$/, '')
|
||||
.split('.');
|
||||
let lookback = !['co', 'com'].includes(parts.at(-2)) ? -2 : -3;
|
||||
if (parts.at(-2) == "doubleclick" || parts.at(-2) == "google") {
|
||||
if (parts.at(-2) == 'doubleclick' || parts.at(-2) == 'google') {
|
||||
lookback = -4; // to distinguish between google ads and stats
|
||||
} else if (parts.at(-2) == "google") {
|
||||
} else if (parts.at(-2) == 'google') {
|
||||
lookback = -3; // to distinguish various google services
|
||||
}
|
||||
return parts.slice(lookback).join(".");
|
||||
return parts.slice(lookback).join('.');
|
||||
}
|
||||
|
||||
export function useEmitter(
|
||||
|
|
@ -59,9 +53,9 @@ export function useEmitter(
|
|||
const callback = () => {
|
||||
setCounter((counter) => counter + 1);
|
||||
};
|
||||
e.on("change", callback);
|
||||
e.on('change', callback);
|
||||
return () => {
|
||||
e.removeListener("change", callback);
|
||||
e.removeListener('change', callback);
|
||||
};
|
||||
}, []);
|
||||
return [counter, setCounter];
|
||||
|
|
@ -69,8 +63,8 @@ export function useEmitter(
|
|||
|
||||
export function parseCookie(cookie: string): Record<string, string> {
|
||||
return cookie
|
||||
.split(";")
|
||||
.map((l) => l.split("="))
|
||||
.split(';')
|
||||
.map((l) => l.split('='))
|
||||
.reduce(
|
||||
(acc, [key, value]) => ({
|
||||
...acc,
|
||||
|
|
@ -88,15 +82,16 @@ export async function getTabByID(id: number) {
|
|||
export function parseToObject(str: unknown): Record<string | symbol, unknown> {
|
||||
let result: Record<string | symbol, unknown>;
|
||||
let original_string: string;
|
||||
if (typeof str === "string") {
|
||||
if (typeof str === 'string') {
|
||||
original_string = str;
|
||||
result = JSON.parse(str);
|
||||
} else if (typeof str == "object") {
|
||||
} else if (typeof str == 'object') {
|
||||
result = str as Record<string | symbol, unknown>;
|
||||
original_string =
|
||||
(result[Symbol.for("originalString")] as string) || JSON.stringify(str);
|
||||
(result[Symbol.for('originalString')] as string) ||
|
||||
JSON.stringify(str);
|
||||
}
|
||||
result[Symbol.for("originalString")] = original_string;
|
||||
result[Symbol.for('originalString')] = original_string;
|
||||
return result;
|
||||
}
|
||||
|
||||
|
|
@ -105,7 +100,7 @@ export function isJSONObject(
|
|||
): str is Record<string, unknown> | string | number {
|
||||
try {
|
||||
const firstChar = JSON.stringify(parseToObject(str))[0];
|
||||
return ["{", "["].includes(firstChar);
|
||||
return ['{', '['].includes(firstChar);
|
||||
} catch (e) {
|
||||
return false;
|
||||
}
|
||||
|
|
@ -113,7 +108,7 @@ export function isJSONObject(
|
|||
|
||||
export function isURL(str: unknown): str is string {
|
||||
try {
|
||||
return !!(typeof str === "string" && new URL(str));
|
||||
return !!(typeof str === 'string' && new URL(str));
|
||||
} catch (e) {
|
||||
return false;
|
||||
}
|
||||
|
|
@ -128,10 +123,10 @@ export function unique<T>(array: T[]): Array<T> {
|
|||
}
|
||||
|
||||
export function allSubhosts(host: string) {
|
||||
const parts = host.split(".");
|
||||
const parts = host.split('.');
|
||||
const result = [];
|
||||
for (let i = 0; i < parts.length - 2; i++) {
|
||||
result.push(parts.slice(i).join("."));
|
||||
result.push(parts.slice(i).join('.'));
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
|
@ -144,13 +139,13 @@ export function getDate() {
|
|||
const d = new Date();
|
||||
return `${d.getFullYear()}-${(d.getMonth() + 1)
|
||||
.toString()
|
||||
.padStart(2, "0")}-${d.getDate().toString().padStart(2, "0")}`;
|
||||
.padStart(2, '0')}-${d.getDate().toString().padStart(2, '0')}`;
|
||||
}
|
||||
|
||||
export function toBase64(file: File): Promise<string> {
|
||||
return new Promise((resolve) => {
|
||||
const FR = new FileReader();
|
||||
FR.addEventListener("load", (e) => {
|
||||
FR.addEventListener('load', (e) => {
|
||||
resolve(e.target.result as string);
|
||||
});
|
||||
FR.readAsDataURL(file);
|
||||
|
|
@ -179,8 +174,8 @@ export function isSameURL(url1: string, url2: string): boolean {
|
|||
if (url1 === url2) {
|
||||
return true;
|
||||
}
|
||||
url1 = url1.replace(/^https?:\/\//, "").replace(/\/$/, "");
|
||||
url2 = url2.replace(/^https?:\/\//, "").replace(/\/$/, "");
|
||||
url1 = url1.replace(/^https?:\/\//, '').replace(/\/$/, '');
|
||||
url2 = url2.replace(/^https?:\/\//, '').replace(/\/$/, '');
|
||||
return url1 === url2;
|
||||
}
|
||||
|
||||
|
|
@ -193,18 +188,18 @@ export function isBase64(s: string): boolean {
|
|||
}
|
||||
|
||||
export function isBase64JSON(s: unknown): s is string {
|
||||
return typeof s === "string" && isBase64(s) && isJSONObject(atob(s));
|
||||
return typeof s === 'string' && isBase64(s) && isJSONObject(atob(s));
|
||||
}
|
||||
|
||||
export function flattenObject(
|
||||
obj: unknown,
|
||||
parser: (to_parse: unknown) => string | Record<string, unknown> = (id) =>
|
||||
id.toString(),
|
||||
key = "",
|
||||
ret = [],
|
||||
key = '',
|
||||
ret = [] as [string, string][],
|
||||
parsed = false
|
||||
): [string, string][] {
|
||||
const prefix = key === "" ? "" : `${key}.`;
|
||||
const prefix = key === '' ? '' : `${key}.`;
|
||||
if (Array.isArray(obj)) {
|
||||
if (obj.length == 1) {
|
||||
flattenObject(obj[0], parser, key, ret);
|
||||
|
|
@ -213,14 +208,16 @@ export function flattenObject(
|
|||
flattenObject(obj[i], parser, prefix + i, ret);
|
||||
}
|
||||
}
|
||||
} else if (typeof obj === "object") {
|
||||
} else if (typeof obj === 'object') {
|
||||
for (const [subkey, value] of Object.entries(obj)) {
|
||||
flattenObject(value, parser, prefix + subkey, ret);
|
||||
}
|
||||
} else if (!parsed) {
|
||||
flattenObject(parser(obj), parser, key, ret, true);
|
||||
} else {
|
||||
} else if (typeof obj === 'string') {
|
||||
ret.push([key, obj]);
|
||||
} else {
|
||||
throw new Error('Something went wrong when parsing ' + obj);
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
|
@ -239,13 +236,14 @@ export function maskString(
|
|||
max_chars_total: number
|
||||
): string {
|
||||
const amount_of_chars_to_cut =
|
||||
str.length - Math.min(str.length * max_fraction_remaining, max_chars_total);
|
||||
str.length -
|
||||
Math.min(str.length * max_fraction_remaining, max_chars_total);
|
||||
if (amount_of_chars_to_cut == 0) {
|
||||
return str;
|
||||
}
|
||||
return (
|
||||
str.slice(0, str.length / 2 - amount_of_chars_to_cut / 2) +
|
||||
"(...)" +
|
||||
'(...)' +
|
||||
str.slice(str.length / 2 + amount_of_chars_to_cut / 2)
|
||||
);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user