curben
/
malware-filter
mirror of https://gitlab.com/malware-filter/malware-filter
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor: replace got with fetch

This commit is contained in:
MDLeom 2024-04-06 22:49:24 +00:00
parent 7cb3cd0567
commit 565d2f9236
No known key found for this signature in database
GPG Key ID: 32D3E28E96A695E8
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
package.json
View File

@ -5,8 +5,7 @@
"build": "node src/build.js" "build": "node src/build.js"
}, },
"dependencies": { "dependencies": {
"extract-zip": "^2.0.1", "extract-zip": "^2.0.1"
"got": "^13.0.0"
}, },
"engines": { "engines": {
"node": ">= 18.12.0" "node": ">= 18.12.0"

11
src/build.js
View File

@ -7,13 +7,13 @@
// Instead of using the API, I find it easier to failover to GitHub. // Instead of using the API, I find it easier to failover to GitHub.
// ref: https://gitlab.com/gitlab-org/gitlab/-/issues/29257 // ref: https://gitlab.com/gitlab-org/gitlab/-/issues/29257
import got from 'got'
import unzip from 'extract-zip' import unzip from 'extract-zip'
import { basename, dirname, join } from 'node:path' import { basename, dirname, join } from 'node:path'
import { mkdir, readdir, rm } from 'node:fs/promises' import { mkdir, readdir, rm } from 'node:fs/promises'
import { createWriteStream } from 'node:fs' import { createWriteStream } from 'node:fs'
import { pipeline } from 'node:stream/promises' import { pipeline } from 'node:stream/promises'
import { fileURLToPath } from 'node:url' import { fileURLToPath } from 'node:url'
import { Readable } from 'node:stream'
const __dirname = dirname(fileURLToPath(import.meta.url)) const __dirname = dirname(fileURLToPath(import.meta.url))
const envVar = process.env const envVar = process.env
@ -44,8 +44,9 @@ const oisdFilters = {
} }
const pipelineStatus = async (url) => { const pipelineStatus = async (url) => {
console.log(`Checking pipeline from "${url}"`)
try { try {
const svg = await got(url).text() const svg = await (await fetch(url)).text()
if (svg.includes('failed')) throw new Error('last gitlab pipeline failed') if (svg.includes('failed')) throw new Error('last gitlab pipeline failed')
} catch ({ message }) { } catch ({ message }) {
throw new Error(message) throw new Error(message)
@ -62,7 +63,7 @@ const dl = async (project) => {
console.log(`Downloading ${filename} from "${link}"`) console.log(`Downloading ${filename} from "${link}"`)
try { try {
await pipeline( await pipeline(
got.stream(link), Readable.fromWeb((await fetch(link)).body),
createWriteStream(zipPath) createWriteStream(zipPath)
) )
await pipelineStatus(pipelineUrl) await pipelineStatus(pipelineUrl)
@ -79,7 +80,7 @@ const dl = async (project) => {
try { try {
await pipeline( await pipeline(
got.stream(mirrorLink), Readable.fromWeb((await fetch(mirrorLink)).body),
createWriteStream(zipPath) createWriteStream(zipPath)
) )
} catch ({ message }) { } catch ({ message }) {
@ -104,7 +105,7 @@ const oisdDl = async (link, filename) => {
console.log(`Downloading ${filename} from "${link}"`) console.log(`Downloading ${filename} from "${link}"`)
try { try {
await pipeline( await pipeline(
got.stream(link), Readable.fromWeb((await fetch(link)).body),
createWriteStream(txtPath) createWriteStream(txtPath)
) )
} catch ({ message }) { } catch ({ message }) {