lix-project/lix-install-action
1
0
Fork 0
Code Issues 11 Pull requests Packages Projects Releases Wiki Activity

retries: interate on stream handling, remove downcast

Browse source
This commit is contained in:
Cole Mickens 2023-10-19 11:17:41 +02:00
parent 58853de798
commit 5c1457fc8d
No known key found for this signature in database
3 changed files with 10 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
dist/index.js vendored
View file

@ -50,11 +50,10 @@ const node_crypto_1 = __nccwpck_require__(6005);
const node_path_1 = __nccwpck_require__(9411);
const node_os_1 = __nccwpck_require__(612);
const node_stream_1 = __importDefault(__nccwpck_require__(4492));
const promises_2 = __nccwpck_require__(6402);
const node_fs_1 = __importDefault(__nccwpck_require__(7561));
const string_argv_1 = __importDefault(__nccwpck_require__(9663));
const fetch_retry_1 = __importDefault(__nccwpck_require__(9068));
const retry_fetch = (0, fetch_retry_1.default)(global.fetch);
const fetchRetry = (0, fetch_retry_1.default)(global.fetch);
class NixInstallerAction {
constructor() {
this.platform = get_nix_platform();
@ -348,7 +347,7 @@ class NixInstallerAction {
return __awaiter(this, void 0, void 0, function* () {
if (!this.local_root) {
actions_core.info(`Fetching binary from ${this.nix_installer_url}`);
const response = yield retry_fetch(this.nix_installer_url, {
const response = yield fetchRetry(this.nix_installer_url, {
retries: 5,
retryDelay(attempt, _error, _response) {
return Math.pow(2, attempt) * 1000; // 1000, 2000, 4000
@ -363,10 +362,9 @@ class NixInstallerAction {
throw new Error(`unexpected response ${response.statusText}`);
}
if (response.body !== null) {
// shameless: https://stackoverflow.com/a/51302466
const fileStream = node_fs_1.default.createWriteStream(tempfile);
const responseBodyCast = response.body; // eslint-disable-line @typescript-eslint/no-explicit-any
yield (0, promises_2.finished)(node_stream_1.default.Readable.fromWeb(responseBodyCast).pipe(fileStream));
const fileStreamWeb = node_stream_1.default.Writable.toWeb(fileStream);
yield response.body.pipeTo(fileStreamWeb);
actions_core.info(`Downloaded \`nix-installer\` to \`${tempfile}\``);
}
else {
@ -13591,14 +13589,6 @@ module.exports = require("node:stream");
/***/ }),
/***/ 6402:
/***/ ((module) => {
"use strict";
module.exports = require("node:stream/promises");
/***/ }),
/***/ 2037:
/***/ ((module) => {

2
dist/index.js.map vendored
View file

File diff suppressed because one or more lines are too long

16
src/main.ts
View file

@ -6,13 +6,11 @@ import { randomUUID } from "node:crypto";
import { join } from "node:path";
import { tmpdir } from "node:os";
import stream from "node:stream";
import stream_web from "node:stream/web";
import { finished } from "node:stream/promises";
import fs from "node:fs";
import stringArgv from "string-argv";
import fetchRetry from "fetch-retry";
const retry_fetch = fetchRetry(global.fetch);
import fetchRetry_ from "fetch-retry";
const fetchRetry = fetchRetry_(global.fetch);
class NixInstallerAction {
platform: string;
@ -411,7 +409,7 @@ class NixInstallerAction {
private async fetch_binary(): Promise<string> {
if (!this.local_root) {
actions_core.info(`Fetching binary from ${this.nix_installer_url}`);
const response = await retry_fetch(this.nix_installer_url, {
const response = await fetchRetry(this.nix_installer_url, {
retries: 5,
retryDelay(
attempt: number,
@ -436,13 +434,9 @@ class NixInstallerAction {
}
if (response.body !== null) {
// shameless: https://stackoverflow.com/a/51302466
const fileStream = fs.createWriteStream(tempfile);
const responseBodyCast =
response.body as stream_web.ReadableStream<any>; // eslint-disable-line @typescript-eslint/no-explicit-any
await finished(
stream.Readable.fromWeb(responseBodyCast).pipe(fileStream),
);
const fileStreamWeb = stream.Writable.toWeb(fileStream);
await response.body.pipeTo(fileStreamWeb);
actions_core.info(`Downloaded \`nix-installer\` to \`${tempfile}\``);
} else {