Skip to content

Commit

Permalink
Chore: housekeeping
Browse files Browse the repository at this point in the history
  • Loading branch information
SukkaW committed Apr 16, 2024
1 parent 9c61416 commit f9a0445
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion Build/build-anti-bogus-domain.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const getBogusNxDomainIPsPromise = fsFetchCache.apply(
async () => {
const result: string[] = [];
for await (const line of await fetchRemoteTextByLine(URL)) {
if (line && line.startsWith('bogus-nxdomain=')) {
if (line.startsWith('bogus-nxdomain=')) {
const ip = line.slice(15).trim();
if (isProbablyIpv4(ip)) {
result.push(`IP-CIDR,${ip}/32,no-resolve`);
Expand Down
2 changes: 1 addition & 1 deletion Build/lib/aho-corasick.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// eslint-disable-next-line import/no-unresolved -- bun
// eslint-disable-next-line import-x/no-unresolved -- bun
import { describe, expect, it } from 'bun:test';
import createKeywordFilter from './aho-corasick';

Expand Down
2 changes: 1 addition & 1 deletion Build/lib/cache-filesystem.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// eslint-disable-next-line import/no-unresolved -- bun built-in module
// eslint-disable-next-line import-x/no-unresolved -- bun built-in module
import { Database } from 'bun:sqlite';
import os from 'os';
import path from 'path';
Expand Down
4 changes: 2 additions & 2 deletions Build/lib/fetch-assets.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ class CustomAbortError extends Error {

const sleepWithAbort = (ms: number, signal: AbortSignal) => new Promise<void>((resolve, reject) => {
if (signal.aborted) {
reject(signal.reason);
reject(signal.reason as Error);
return;
}

function stop(this: AbortSignal) { reject(this.reason); }
function stop(this: AbortSignal) { reject(this.reason as Error); }

signal.addEventListener('abort', stop, { once: true });
Bun.sleep(ms).then(resolve).catch(reject).finally(() => signal.removeEventListener('abort', stop));
Expand Down
15 changes: 8 additions & 7 deletions Build/lib/fetch-retry.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@ const MAX_RETRIES = 5;
const MAX_RETRY_AFTER = 20;
const FACTOR = 6;

function isClientError(err: any): err is NodeJS.ErrnoException {
if (!err) return false;
return (
err.code === 'ERR_UNESCAPED_CHARACTERS'
|| err.message === 'Request path contains unescaped characters'
);
function isClientError(err: unknown): err is NodeJS.ErrnoException {
if (!err || typeof err !== 'object') return false;

if ('code' in err) return err.code === 'ERR_UNESCAPED_CHARACTERS';
if ('message' in err) return err.message === 'Request path contains unescaped characters';

return false;
}

export class ResponseError extends Error {
Expand Down Expand Up @@ -70,7 +71,7 @@ function createFetchRetry($fetch: typeof fetch): FetchWithRetry {
return await retry<Response>(async (bail) => {
try {
// this will be retried
const res = (await $fetch(url, opts)) as Response;
const res = (await $fetch(url, opts));

if ((res.status >= 500 && res.status < 600) || res.status === 429) {
// NOTE: doesn't support http-date format
Expand Down
2 changes: 1 addition & 1 deletion Build/lib/trie.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { createTrie } from './trie';
// eslint-disable-next-line import/no-unresolved -- fuck eslint-import
// eslint-disable-next-line import-x/no-unresolved -- fuck eslint-import
import { describe, expect, it } from 'bun:test';

describe('Trie', () => {
Expand Down
1 change: 0 additions & 1 deletion Build/validate-domestic.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { fetchRemoteTextByLine, readFileByLine } from './lib/fetch-text-by-line';
import { Readable } from 'stream';
import { parse } from 'csv-parse/sync';
import { createTrie } from './lib/trie';
import path from 'path';
Expand Down
Binary file modified bun.lockb
Binary file not shown.
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@
"tldts": "^6.1.16"
},
"devDependencies": {
"@eslint-sukka/node": "5.1.2",
"@eslint-sukka/ts": "5.1.2",
"@eslint-sukka/node": "6.0.0-beta.3",
"@eslint-sukka/ts": "6.0.0-beta.3",
"@types/async-retry": "^1.4.8",
"@types/bun": "^1.0.12",
"@types/tar-stream": "^3.1.3",
"bun-types": "^1.1.3",
"eslint": "^8.57.0",
"eslint-config-sukka": "5.1.2",
"eslint-formatter-sukka": "5.1.2",
"eslint": "^9.0.0",
"eslint-config-sukka": "6.0.0-beta.3",
"eslint-formatter-sukka": "6.0.0-beta.3",
"mitata": "^0.1.11",
"typescript": "^5.4.5"
},
Expand Down

0 comments on commit f9a0445

Please sign in to comment.