refactor(download): refactor download module
test / test (push) Failing after 6m1s

This commit is contained in:
2026-10-26 23:14:36 +03:00
parent 188fcc8e4c
commit 8edc7fd93c
7 changed files with 68 additions and 81 deletions
+1 -1
View File
@@ -3,5 +3,5 @@ import { Preset } from "gulp-haxetool";
import presetData from "./haxetool.json" with { type: "json" }; import presetData from "./haxetool.json" with { type: "json" };
import packageInfo from "./package.json" with { type: "json" }; import packageInfo from "./package.json" with { type: "json" };
const preset = new Preset(presetData, null, packageInfo); const preset = new Preset(presetData, { UseRuffle: true }, packageInfo);
export default preset.register(gulp); export default preset.register(gulp);
+18 -35
View File
@@ -1,54 +1,36 @@
import progress from "cli-progress"; import progress from "cli-progress";
import fs from "fs"; import fs from "fs";
import fse from "fs-extra"; import fse from "fs-extra";
import got from "got"; import got, { type Progress, type Request } from "got";
import path from "path"; import path from "path";
import ps from "promise-streams"; import ps from "promise-streams";
import type { Stream, Writable } from "stream"; import type { Stream, Writable } from "stream";
import * as tar from "tar"; import { x as tarX } from "tar";
import unzip from "unzip-stream"; import unzip from "unzip-stream";
export class Downloader { const progressBar: progress.MultiBar = new progress.MultiBar(
static bar: progress.MultiBar | null;
static createProgressBar() {
if (Downloader.bar == null) {
Downloader.bar = new progress.MultiBar(
{ {
clearOnComplete: true, stopOnComplete: true,
}, },
progress.Presets.shades_grey, progress.Presets.shades_classic,
); );
}
return Downloader.bar.create(0, 0);
}
static releaseProgressBar(bar: progress.SingleBar) { export const download = async (url: string, dest: string, strip = 1, executable = false): Promise<void> => {
bar.stop();
if (Downloader.bar != null) {
Downloader.bar.remove(bar);
if (!Downloader.bar.isActive) {
Downloader.bar.stop();
Downloader.bar = null;
}
}
}
static download(url: string, dest: string, strip = 1, executable = false) {
fse.ensureDirSync(dest); fse.ensureDirSync(dest);
const bar = Downloader.createProgressBar(); const bar = progressBar.create(0, 0);
let stream: Stream = got.stream(url); let stream: Stream = got.stream(url);
stream = stream stream = stream
.on("request", (r: any) => { .on("request", (r: Request) => {
if (bar) bar.start(1, 0); bar.start(1, 0);
}) })
.on("downloadProgress", (p: any) => { .on("downloadProgress", (p: Progress) => {
if (bar) { if (p.total) {
bar.setTotal(p.total); bar.setTotal(p.total);
}
bar.update(p.transferred); bar.update(p.transferred);
if (p.total === p.transferred) { if (p.total === p.transferred) {
Downloader.releaseProgressBar(bar); bar.stop();
} progressBar.remove(bar);
} }
}); });
if (url.endsWith(".zip")) { if (url.endsWith(".zip")) {
@@ -75,10 +57,11 @@ export class Downloader {
} }
}); });
} else if (url.endsWith("tar.gz")) { } else if (url.endsWith("tar.gz")) {
stream = stream.pipe(tar.x({ C: dest, strip }) as unknown as Writable); stream = stream.pipe(tarX({ C: dest, strip }) as unknown as Writable);
} else { } else {
stream = stream.pipe(fs.createWriteStream(path.join(dest, url.split("/").pop()!))); stream = stream.pipe(fs.createWriteStream(path.join(dest, url.split("/").pop()!)));
} }
return ps.wait(stream); return ps.wait(stream);
} };
}
export default download;
+3 -1
View File
@@ -52,4 +52,6 @@ export class OutputLogger extends Logger {
export const OUTPUT_LOGGER = new OutputLogger(); export const OUTPUT_LOGGER = new OutputLogger();
export default (line: string) => OUTPUT_LOGGER.log(line); export const output = (line: string) => OUTPUT_LOGGER.log(line);
export default output;
+2 -2
View File
@@ -1,6 +1,6 @@
import os from "os"; import os from "os";
import path from "path"; import path from "path";
import { Downloader } from "../common/download"; import download from "../common/download";
import { Logger } from "../common/log"; import { Logger } from "../common/log";
export class Sdk { export class Sdk {
@@ -55,7 +55,7 @@ export class Sdk {
return Promise.resolve(); return Promise.resolve();
} else { } else {
this.log.i("download: *%s*", this.link); this.log.i("download: *%s*", this.link);
return Downloader.download(this.link, this.path, strip); return download(this.link, this.path, strip);
} }
} }
} }
+2 -2
View File
@@ -2,7 +2,7 @@ import fs from "fs";
import os from "os"; import os from "os";
import path from "path"; import path from "path";
import through from "through2"; import through from "through2";
import { Downloader } from "../common/download"; import download from "../common/download";
import { Env } from "../common/env"; import { Env } from "../common/env";
import exec from "../common/exec"; import exec from "../common/exec";
import { System } from "../common/system"; import { System } from "../common/system";
@@ -65,7 +65,7 @@ export class Android extends Sdk {
// ToDo: support windows // ToDo: support windows
const url = `${this.repository}/android-ndk-${this.ndk_version}-${System.os}-x86_64.zip`; const url = `${this.repository}/android-ndk-${this.ndk_version}-${System.os}-x86_64.zip`;
this.log.d("download: *%s*", url); this.log.d("download: *%s*", url);
return Downloader.download(url, this.ndk_home, 1, true); return download(url, this.ndk_home, 1, true);
} }
sdkmanager(packages: string[]) { sdkmanager(packages: string[]) {
+3 -1
View File
@@ -1,6 +1,8 @@
export * from "./common/download";
export * from "./common/log";
export * from "./common/output";
export * from "./common/system"; export * from "./common/system";
export * from "./core/config"; export * from "./core/config";
export * from "./common/download";
export * from "./core/sdk"; export * from "./core/sdk";
export * from "./core/type"; export * from "./core/type";
export * from "./impl/android"; export * from "./impl/android";
+2 -2
View File
@@ -3,7 +3,7 @@ import { existsSync, mkdtempSync } from "node:fs";
import { tmpdir } from "node:os"; import { tmpdir } from "node:os";
import { join } from "node:path"; import { join } from "node:path";
import test from "node:test"; import test from "node:test";
import { Downloader } from "../dist/index.mjs"; import { download } from "../dist/index.mjs";
const resolveTargetDir = () => mkdtempSync(join(tmpdir(), "test-")); const resolveTargetDir = () => mkdtempSync(join(tmpdir(), "test-"));
@@ -16,7 +16,7 @@ const TEST_DATA = {
for (const [url, file] of Object.entries(TEST_DATA)) { for (const [url, file] of Object.entries(TEST_DATA)) {
test(`Test download: ${url}`, async () => { test(`Test download: ${url}`, async () => {
const target = resolveTargetDir(); const target = resolveTargetDir();
await Downloader.download(url, target); await download(url, target);
assert(existsSync(join(target, file))); assert(existsSync(join(target, file)));
}); });
} }