Merge branch 'esm' into 'main'

refactor: esm

See merge request malware-filter/botnet-filter!2
This commit is contained in:
Ming Di Leom 2023-10-01 09:36:44 +00:00
commit 317a3d49a1
2 changed files with 14 additions and 12 deletions

View File

@ -6,9 +6,10 @@
}, },
"dependencies": { "dependencies": {
"extract-zip": "^2.0.1", "extract-zip": "^2.0.1",
"got": "^11.8.3" "got": "^13.0.0"
}, },
"engines": { "engines": {
"node": ">= 14.15.0" "node": ">= 18.12.0"
} },
"type": "module"
} }

View File

@ -2,14 +2,15 @@
// for deployment outside of GitLab CI, e.g. Cloudflare Pages and Netlify // for deployment outside of GitLab CI, e.g. Cloudflare Pages and Netlify
const { stream: gotStream } = require('got') import got from 'got'
const got = require('got') import unzip from 'extract-zip'
const unzip = require('extract-zip') import { dirname, join } from 'node:path'
const { join } = require('path') import { mkdir } from 'node:fs/promises'
const { mkdir } = require('fs/promises') import { createWriteStream } from 'node:fs'
const { createWriteStream } = require('fs') import { pipeline } from 'node:stream/promises'
const { pipeline } = require('stream/promises') import { fileURLToPath } from 'node:url'
const __dirname = dirname(fileURLToPath(import.meta.url))
const rootPath = join(__dirname, '..') const rootPath = join(__dirname, '..')
const tmpPath = join(rootPath, 'tmp') const tmpPath = join(rootPath, 'tmp')
const publicPath = join(rootPath, 'public') const publicPath = join(rootPath, 'public')
@ -35,7 +36,7 @@ const f = async () => {
console.log(`Downloading artifacts.zip from "${artifactsUrl}"`) console.log(`Downloading artifacts.zip from "${artifactsUrl}"`)
try { try {
await pipeline( await pipeline(
gotStream(artifactsUrl), got.stream(artifactsUrl),
createWriteStream(zipPath) createWriteStream(zipPath)
) )
await pipelineStatus(pipelineUrl) await pipelineStatus(pipelineUrl)
@ -50,7 +51,7 @@ const f = async () => {
try { try {
await pipeline( await pipeline(
gotStream(ghMirror), got.stream(ghMirror),
createWriteStream(zipPath) createWriteStream(zipPath)
) )
} catch ({ message }) { } catch ({ message }) {