Skip to content

fixes for servers with no internet access, relying on https_proxy #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

fixes for servers with no internet access, relying on https_proxy #29

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions src/db.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import fs from 'fs/promises'
import fsSync from 'fs'
import { Readable } from 'node:stream'
import path from 'path'
import { fileURLToPath } from 'url'
import { createHash } from 'crypto'
Expand Down Expand Up @@ -296,8 +297,8 @@ const downloadZip = async () => {
url = 'https://raw.githubusercontent.com/sapics/node-geolite2-redist/master/redist/'
url += database.edition + '.' + database.suffix
}
var text = await axios.get(url)
var reg = /\w{50,}/, r = reg.exec(text.data)
var text = await (await fetch(url)).text()
var reg = /\w{50,}/, r = reg.exec(text)
if(!r) {
return consoleWarn('Cannot download sha256')
}
Expand Down Expand Up @@ -329,16 +330,13 @@ const downloadZip = async () => {
url = 'https://raw.githubusercontent.com/sapics/node-geolite2-redist/master/redist/'
url += database.edition + '.' + database.suffix.replace('.sha256', '')
}
return axios({
method: 'get',
url: url,
responseType: 'stream'
}).then(res => {
return fetch(url).then(res => {
let zipReadStream = Readable.fromWeb(res.body)
const dest = fsSync.createWriteStream(zipPath)
return new Promise((resolve, reject) => {
consoleLog('Decompressing', database.edition + '.zip')
res.data.pipe(dest)
res.data.on('end', () => {
zipReadStream.pipe(dest)
zipReadStream.on('end', () => {
yauzl.open(zipPath, {lazyEntries: true}, (err, zipfile) => {
if(err) return reject(err)
zipfile.readEntry()
Expand All @@ -361,7 +359,7 @@ const downloadZip = async () => {
zipfile.on('end', () => resolve(database.src))
})
})
res.data.on('error', reject)
zipReadStream.on('error', reject)
})
})
}
Expand Down