From 5e3b49cf1f23870f287d39ad523253512f174b7e Mon Sep 17 00:00:00 2001 From: Ming Di Leom <2809763-curben@users.noreply.gitlab.com> Date: Sun, 7 Apr 2024 00:58:16 +0000 Subject: [PATCH] refactor: replace got with fetch --- package.json | 3 +-- src/build.js | 9 +++++---- src/script.js | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 896bd10..6271be8 100644 --- a/package.json +++ b/package.json @@ -5,8 +5,7 @@ "build": "node src/build.js" }, "dependencies": { - "extract-zip": "^2.0.1", - "got": "^13.0.0" + "extract-zip": "^2.0.1" }, "engines": { "node": ">= 18.12.0" diff --git a/src/build.js b/src/build.js index e91cd90..966e443 100644 --- a/src/build.js +++ b/src/build.js @@ -2,13 +2,13 @@ // for deployment outside of GitLab CI, e.g. Cloudflare Pages and Netlify -import got from 'got' import unzip from 'extract-zip' import { dirname, join } from 'node:path' import { mkdir } from 'node:fs/promises' import { createWriteStream } from 'node:fs' import { pipeline } from 'node:stream/promises' import { fileURLToPath } from 'node:url' +import { Readable } from 'node:stream' const __dirname = dirname(fileURLToPath(import.meta.url)) const rootPath = join(__dirname, '..') @@ -20,8 +20,9 @@ const pipelineUrl = 'https://gitlab.com/malware-filter/tracking-filter/badges/ma const ghMirror = 'https://nightly.link/curbengh/tracking-filter/workflows/pages/main/public.zip' const pipelineStatus = async (url) => { + console.log(`Checking pipeline from "${url}"`) try { - const svg = await got(url).text() + const svg = await (await fetch(url)).text() if (!svg.includes('passed')) throw new Error('last gitlab pipeline failed') } catch ({ message }) { throw new Error(message) @@ -36,7 +37,7 @@ const f = async () => { console.log(`Downloading artifacts.zip from "${artifactsUrl}"`) try { await pipeline( - got.stream(artifactsUrl), + Readable.fromWeb((await fetch(artifactsUrl)).body), createWriteStream(zipPath) ) await pipelineStatus(pipelineUrl) @@ -51,7 +52,7 @@ const f = async () => { try { await pipeline( - got.stream(ghMirror), + Readable.fromWeb((await fetch(ghMirror)).body), createWriteStream(zipPath) ) } catch ({ message }) { diff --git a/src/script.js b/src/script.js index d8dbd49..2d84caa 100644 --- a/src/script.js +++ b/src/script.js @@ -9,7 +9,7 @@ const { parse } = JSON const f = async () => { // __dirname is src/ - const outputFile = join(__dirname, '..', 'tmp','tracking-data-raw.txt') + const outputFile = join(__dirname, '..', 'tmp', 'tracking-data-raw.txt') await rm(outputFile, { force: true }) const domains = join(__dirname, '..', 'tmp', 'tracker-radar', 'domains') const countries = await readdir(domains)