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

refactor: extract zip from stream

This commit is contained in:
MDLeom 2024-10-27 05:34:06 +00:00
parent 7fc7d62cc2
commit 293507fead
No known key found for this signature in database
GPG Key ID: 32D3E28E96A695E8
2 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

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

28
src/build.js
View File

@ -2,19 +2,16 @@
// for deployment outside of GitLab CI, e.g. Cloudflare Pages and Netlify
import unzip from 'extract-zip'
import { Extract } from 'unzipper'
import { dirname, join } from 'node:path'
import { mkdir, rm } 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, '..')
const tmpPath = join(rootPath, 'tmp')
const publicPath = join(rootPath, 'public')
const zipPath = join(tmpPath, 'artifacts.zip')
const artifactsUrl = 'https://gitlab.com/malware-filter/phishing-filter/-/jobs/artifacts/main/download?job=pages'
const pipelineUrl = 'https://gitlab.com/malware-filter/phishing-filter/badges/main/pipeline.svg'
const ghMirror = 'https://nightly.link/curbengh/phishing-filter/workflows/pages/main/public.zip'
@ -30,15 +27,11 @@ const pipelineStatus = async (url) => {
}
const f = async () => {
let isMirror = false
await mkdir(tmpPath, { recursive: true })
console.log(`Downloading artifacts.zip from "${artifactsUrl}"`)
try {
await pipeline(
Readable.fromWeb((await fetch(artifactsUrl)).body),
createWriteStream(zipPath)
Extract({ path: rootPath })
)
await pipelineStatus(pipelineUrl)
} catch ({ message }) {
@ -48,12 +41,13 @@ const f = async () => {
}))
console.log(`Downloading artifacts.zip from "${ghMirror}"`)
isMirror = true
await mkdir(publicPath, { recursive: true })
try {
await pipeline(
Readable.fromWeb((await fetch(ghMirror)).body),
createWriteStream(zipPath)
Extract({ path: publicPath })
)
} catch ({ message }) {
throw new Error(JSON.stringify({
@ -63,16 +57,8 @@ const f = async () => {
}
}
console.log('Extracting artifacts.zip...')
if (isMirror === false) {
await unzip(zipPath, { dir: rootPath })
// snort2.rules is over 25MB limit of CF Pages
await rm(join(publicPath, 'phishing-filter-snort2.rules'), { force: true })
} else {
await mkdir(publicPath, { recursive: true })
await unzip(zipPath, { dir: publicPath })
await rm(join(publicPath, 'phishing-filter-snort2.rules'), { force: true })
}
// snort2.rules is over 25MB limit of CF Pages
await rm(join(publicPath, 'phishing-filter-snort2.rules'), { force: true })
}
f()