refactor: replace got with fetch

bun does not support fetch's readableStream -> node's Stream yet
https://github.com/oven-sh/bun/issues/9555
This commit is contained in:
Ming Di Leom 2024-04-04 11:26:37 +00:00
parent 317a3d49a1
commit e5757965db
No known key found for this signature in database
GPG Key ID: 32D3E28E96A695E8
2 changed files with 6 additions and 6 deletions

View File

@ -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"

View File

@ -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/botnet-filter/badges/main
const ghMirror = 'https://nightly.link/curbengh/botnet-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(artifactsUrl)).body),
createWriteStream(zipPath)
)
} catch ({ message }) {