Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ jobs:
build:
runs-on: "ubuntu-latest"
steps:
- uses: "actions/checkout@v2"
- uses: "actions/checkout@v3"

- uses: "actions/setup-node@v2"
- uses: "actions/setup-node@v3"
with:
node-version: "14.x"

- run: npm install
- run: npm install --ignore-scripts --no-fund

- run: node test/index.js
- run: npm test -- --no-check-coverage --timeout=60
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
package-lock=false
2 changes: 1 addition & 1 deletion cancelable-pump/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict';

const pump = require('pump');
const {pipeline: pump} = require('stream');

const cancel = new Error('Canceled.');

Expand Down
39 changes: 20 additions & 19 deletions dl-tar/index.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
'use strict';

const {inspect, promisify} = require('util');
const {inspect} = require('util');
const {resolve} = require('path');
const {Transform} = require('stream');
const {promises: fs} = require('fs');

const cancelablePump = require('../cancelable-pump/index.js');
const {Unpack} = require('tar');
const isPlainObj = require('is-plain-obj');
const request = require('request');
const mkdirp = require('mkdirp');
const fetch = require('make-fetch-happen');
const Observable = require('zen-observable');

const promisifiedMkdirp = promisify(mkdirp);

class InternalUnpack extends Unpack {
constructor(options) {
super({
Expand Down Expand Up @@ -173,7 +171,7 @@ module.exports = function dlTar(...args) {
(async () => {
try {
if (absoluteDest !== cwd) {
await promisifiedMkdirp(absoluteDest);
await fs.mkdir(absoluteDest, {recursive: true});
}

if (ended) {
Expand All @@ -186,21 +184,24 @@ module.exports = function dlTar(...args) {
observer
});

const pipe = [
request({url, ...options, encoding: null})
.on('response', function(response) {
if (response.statusCode < 200 || 299 < response.statusCode) {
this.emit('error', new Error(`${response.statusCode} ${response.statusMessage}`));
return;
}
const {baseUrl, headers} = options;
const {href} = new URL(url, baseUrl);

if (typeof response.headers['content-length'] === 'string') {
response.headers['content-length'] = Number(response.headers['content-length']);
}
const res = await fetch(href, {headers}).then(response => {

unpackStream.url = response.request.uri.href;
unpackStream.responseHeaders = response.headers;
}),
if (response.ok !== true) {
throw new Error(`${response.status} ${response.statusText}`);
}

unpackStream.url = response.url;
unpackStream.responseHeaders = response.headers;

return response;

});

const pipe = [
res.body,
new Transform({
transform(chunk, encoding, cb) {
unpackStream.responseBytes += chunk.length;
Expand Down
3 changes: 1 addition & 2 deletions install-purescript/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,13 @@ const fs = require('fs');
const {execFile} = require('child_process');
const path = require('path');
const {inspect, promisify} = require('util');
const {Writable} = require('stream');
const {pipeline: pump} = require('stream');

const arch = require('arch');
const {create, Unpack} = require('tar');
const cacache = require('cacache');
const isPlainObj = require('is-plain-obj');
const Observable = require('zen-observable');
const pump = require('pump');
const envPaths = require('env-paths');

const downloadOrBuildPurescript = require('../download-or-build-purescript/index.js');
Expand Down
12 changes: 5 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"install-purescript": "index.js"
},
"engines": {
"node": ">=8.3.0"
"node": ">=12"
},
"dependencies": {
"arch": "^2.1.1",
Expand All @@ -18,21 +18,19 @@
"filesize": "^4.1.2",
"is-plain-obj": "^2.0.0",
"log-symbols": "^3.0.0",
"log-update": "^3.2.0",
"log-update": "^4.0.0",
"make-fetch-happen": "^10.0.0",
"minimist": "^1.2.0",
"mkdirp": "^0.5.1",
"ms": "^2.1.2",
"once": "^1.4.0",
"pump": "^3.0.0",
"request": "^2.88.0",
"rimraf": "^2.6.3",
"semver": "^7.3.7",
"tar": "^4.4.6",
"tar": "^6.1.11",
"which": "^1.3.1",
"zen-observable": "^0.8.14"
},
"devDependencies": {
"tap": "^14.2.3"
"tap": "^16.2.0"
},
"scripts": {
"test": "tap"
Expand Down