From 68bb39f09af5032c57090cbd2881171057c99d25 Mon Sep 17 00:00:00 2001 From: shmyga Date: Mon, 2 Nov 2026 01:26:42 +0300 Subject: [PATCH] feat: add link module --- src/common/template.ts | 4 ++- src/core/link.ts | 40 ++++++++++++++++++++++++++++++ src/core/sdk.ts | 12 ++++++--- src/impl/android.ts | 51 ++++++++++++++++++++------------------ src/impl/flashplayer.ts | 19 ++++---------- src/impl/haxe.ts | 20 ++++----------- src/impl/neko.ts | 49 +++++------------------------------- src/impl/ruffle.ts | 21 +++------------- src/index.ts | 2 ++ test/download.test.js | 22 +++++++---------- test/link.test.js | 55 +++++++++++++++++++++++++++++++++++++++++ 11 files changed, 165 insertions(+), 130 deletions(-) create mode 100644 src/core/link.ts create mode 100644 test/link.test.js diff --git a/src/common/template.ts b/src/common/template.ts index 53d5ea4..1085b0e 100644 --- a/src/common/template.ts +++ b/src/common/template.ts @@ -5,10 +5,12 @@ import { fileURLToPath } from "url"; const __filename = fileURLToPath(import.meta.url); const __dirname = path.dirname(__filename); -export default new Eta({ +export const template = new Eta({ autoFilter: true, escapeFunction: (val: unknown): string => String(val), filterFunction: (val: unknown): string => (val === null || val === undefined ? "" : String(val)), useWith: true, views: path.join(__dirname, "template"), }); + +export default template; diff --git a/src/core/link.ts b/src/core/link.ts new file mode 100644 index 0000000..7adff12 --- /dev/null +++ b/src/core/link.ts @@ -0,0 +1,40 @@ +import os from "os"; +import template from "../common/template"; + +export type Params = Record; + +export interface Link { + version?: string; + url: string; +} + +export const DefaultParams: string[][] = [ + ["debug", "<%= false %>"], + ["os_name", "<%= {Linux:'linux',Windows_NT:'win'}[os.type()] %>"], + ["os_name_long", "<%= {linux:'linux',win:'windows'}[os_name] %>"], + ["os_arch", "<%= {x64:'64',ia32:''}[os.arch()] %>"], + ["os_archive_ext", "<%= {linux:'tar.gz',win:'zip'}[os_name] %>"], +]; + +export const resolveParams = (source: Params, custom?: Params): Params => { + const params: Params = { ...source, os, debug: false }; + if (custom) { + for (const [k, v] of Object.entries(custom)) { + params[k] = template.renderString(v, params); + } + } + for (const [k, v] of DefaultParams) { + if (!Object.hasOwn(params, k)) { + params[k] = template.renderString(v, params); + } + } + return params; +}; + +export const resolveLink = (link: Link | string, params?: Params): string => { + if (typeof link === "string") { + return template.renderString(link, resolveParams({}, params)); + } else { + return template.renderString(link.url, resolveParams(link, params)); + } +}; diff --git a/src/core/sdk.ts b/src/core/sdk.ts index 5b1ba55..6dd4ec7 100755 --- a/src/core/sdk.ts +++ b/src/core/sdk.ts @@ -2,10 +2,13 @@ import os from "os"; import path from "path"; import download from "../common/download"; import { Logger } from "../common/log"; +import { resolveLink, type Link } from "./link"; export class Sdk { static _dir: string; + url!: string; + static set dir(value) { Sdk._dir = value; } @@ -45,8 +48,11 @@ export class Sdk { throw "Not implemented"; } - get link(): string { - throw "Not implemented"; + get link(): string | Link { + return { + version: this.version, + url: this.url, + }; } prepare(strip = 1): Promise { @@ -55,7 +61,7 @@ export class Sdk { return Promise.resolve(); } else { this.log.i("download: *%s*", this.link); - return download(this.link, this.path, { strip }); + return download(resolveLink(this.link, this), this.path, { strip }); } } } diff --git a/src/impl/android.ts b/src/impl/android.ts index 1076b23..4047979 100755 --- a/src/impl/android.ts +++ b/src/impl/android.ts @@ -2,31 +2,47 @@ import fs from "fs"; import os from "os"; import path from "path"; import through from "through2"; -import download from "../common/download"; import env from "../common/env"; import exec from "../common/exec"; -import { System } from "../common/system"; import { HandlerWriter } from "../common/tail"; import { Sdk } from "../core/sdk"; import { Command } from "../run/command"; +export class AndroidNdk extends Sdk { + static ID = "android-ndk"; + + static VERSION_R15C = "r15c"; + static VERSION_R21E = "r21e"; + static VERSION = AndroidNdk.VERSION_R21E; + + url = "https://dl.google.com/android/repository/android-ndk-<%= version %>-<%= os_name_long %>-x86_64.zip"; + + constructor(version?: string) { + super(AndroidNdk.ID, version || AndroidNdk.VERSION); + } + + get prepared(): boolean { + try { + return fs.existsSync(`${this.path}/build/ndk-build`); + } catch (e) { + return false; + } + } +} + export class Android extends Sdk { static ID = "android"; static VERSION_7302050 = "7302050"; static VERSION = Android.VERSION_7302050; - static NDK_VERSION_R15C = "r15c"; - static NDK_VERSION_R21E = "r21e"; - static NDK_VERSION = Android.NDK_VERSION_R21E; + private ndk: AndroidNdk; - private ndk_version: string; - private repository: string; + url = "https://dl.google.com/android/repository/commandlinetools-<%= os_name %>-<%= version %>_latest.zip"; constructor(version?: string, ndkVersion?: string) { super(Android.ID, version || Android.VERSION); - this.ndk_version = ndkVersion || Android.NDK_VERSION; - this.repository = "https://dl.google.com/android/repository"; + this.ndk = new AndroidNdk(ndkVersion); } get prepared(): boolean { @@ -37,16 +53,12 @@ export class Android extends Sdk { } } - get link(): string { - return `${this.repository}/commandlinetools-${System.os}-${this.version}_latest.zip`; - } - get android_home(): string { return this.path; } get ndk_home(): string { - return Sdk.path('android-ndk', this.ndk_version); + return this.ndk.path; } get sdkmanager_bin(): string { @@ -56,19 +68,10 @@ export class Android extends Sdk { prepare(): Promise { const result = []; result.push(super.prepare(0)); - if (!fs.existsSync(path.join(this.ndk_home))) { - result.push(this.prepare_ndk()); - } + result.push(this.ndk.prepare()); return Promise.all(result); } - prepare_ndk(): Promise { - // TODO: support windows - const url = `${this.repository}/android-ndk-${this.ndk_version}-${System.os}-x86_64.zip`; - this.log.d("download: *%s*", url); - return download(url, this.ndk_home, { executable: true }); - } - sdkmanager(packages: string[]) { this.log.i("sdkmanager: *%s*", packages.join(", ")); const installedFile = path.join(this.path, ".installed"); diff --git a/src/impl/flashplayer.ts b/src/impl/flashplayer.ts index 18efd3f..a4fc362 100755 --- a/src/impl/flashplayer.ts +++ b/src/impl/flashplayer.ts @@ -2,7 +2,6 @@ import fs from "fs"; import fse from "fs-extra"; import os from "os"; import path from "path"; -import env from "../common/env"; import { System } from "../common/system"; import { watch } from "../common/watch"; import { Sdk } from "../core/sdk"; @@ -26,12 +25,15 @@ export class FlashPlayer extends Sdk { BASE_URL = "https://fpdownload.macromedia.com/pub/flashplayer/updaters"; private debug: boolean; - protected baseUrl: string; + + url = + "https://fpdownload.macromedia.com/pub/flashplayer/updaters/" + + "<%= version %>/" + + "<%= {linux:'flash_player_sa_linux' + (debug ? '_debug' : '') +'.x86_64.tar.gz','win':'flashplayer_'+version+'_sa'+(debug ? '_debug' : '')+'.exe'}[os_name] %>"; constructor(debug: boolean = false, version?: string, playerId = FlashPlayer.ID) { super(playerId, version || FlashPlayer.VERSION); this.debug = debug; - this.baseUrl = env.get("FLASHPLAYER_URL") || this.BASE_URL; } prepare() { @@ -46,17 +48,6 @@ export class FlashPlayer extends Sdk { } } - get link(): string { - const baseUrl = `${this.baseUrl}/${this.version}`; - if (System.isWindows) { - return baseUrl + `/flashplayer_${this.version}_sa${this.debug ? "_debug" : ""}.exe`; - } else if (System.isLinux) { - return baseUrl + `/flash_player_sa_linux${this.debug ? "_debug" : ""}.x86_64.tar.gz`; - } else { - throw `Unsupported os '${os.type()}'`; - } - } - get flashPlayerBin(): string { if (System.isWindows) { const playerName = `flashplayer_${this.version}_sa${this.debug ? "_debug" : ""}.exe`; diff --git a/src/impl/haxe.ts b/src/impl/haxe.ts index a28c59b..b70bd60 100755 --- a/src/impl/haxe.ts +++ b/src/impl/haxe.ts @@ -33,6 +33,11 @@ export class Haxe extends Sdk { static buildDir = path.join(process.cwd(), "build"); + url = + "https://github.com/HaxeFoundation/haxe/releases/download/" + + "<%= version %>/" + + "haxe-<%= version %>-<%= os_name %><%= os_arch %>.<%= os_archive_ext %>"; + getBin(name: string) { if (System.isWindows) { return path.join(this.path, name + ".exe"); @@ -93,21 +98,6 @@ export class Haxe extends Sdk { } } - static buildLink(version: string): string { - if (System.isWindows) { - return `https://github.com/HaxeFoundation/haxe/releases/download/${version}/haxe-${version}-win.zip`; - } else if (System.isLinux) { - let arch = System.archInt; - return `https://github.com/HaxeFoundation/haxe/releases/download/${version}/haxe-${version}-linux${arch}.tar.gz`; - } else { - throw `Unsupported os: ${System.os}`; - } - } - - get link(): string { - return Haxe.buildLink(this.version); - } - haxe(args: any) { this.activate(); return exec(".", [this.haxeBin].concat(args).join(" ")); diff --git a/src/impl/neko.ts b/src/impl/neko.ts index 50a20f2..a0c362f 100644 --- a/src/impl/neko.ts +++ b/src/impl/neko.ts @@ -5,41 +5,6 @@ import env from "../common/env"; import { Sdk } from "../core/sdk"; import run from "../run/index"; -export class NekoLink { - static get type() { - switch (os.type()) { - case "Linux": - return "linux"; - case "Windows_NT": - return "win"; - } - } - - static get arch() { - switch (os.arch()) { - case "ia32": - return ""; - case "x64": - return "64"; - } - } - - static get ext() { - switch (os.type()) { - case "Linux": - return "tar.gz"; - case "Windows_NT": - return "zip"; - } - } - - static get(version: string) { - const vv = version.split("\.").join("-"); - const filename = `neko-${version}-${NekoLink.type}${NekoLink.arch}.${NekoLink.ext}`; - return `https://github.com/HaxeFoundation/neko/releases/download/v${vv}/${filename}`; - } -} - export class Neko extends Sdk { static ID = "neko"; @@ -48,14 +13,15 @@ export class Neko extends Sdk { static VERSION_2_4_1 = "2.4.1"; static VERSION = Neko.VERSION_2_4_1; + url = + "https://github.com/HaxeFoundation/neko/releases/download/" + + "v<%= version.split('.').join('-') %>/" + + "neko-<%= version %>-<%= os_name %><%= os_arch %>.<%= os_archive_ext %>"; + constructor(version?: string) { super(Neko.ID, version || Neko.VERSION); } - get link() { - return NekoLink.get(this.version); - } - get prepared() { try { return fs.existsSync(this.nekoBin); @@ -72,10 +38,7 @@ export class Neko extends Sdk { prepare() { return Promise.all([super.prepare()]).then(() => { - fs.copyFileSync( - path.resolve(import.meta.dirname, "template/neko/activate"), - path.resolve(this.path, "activate"), - ); + fs.copyFileSync(path.resolve(import.meta.dirname, "template/neko/activate"), path.resolve(this.path, "activate")); }); } diff --git a/src/impl/ruffle.ts b/src/impl/ruffle.ts index 28618bd..a321284 100755 --- a/src/impl/ruffle.ts +++ b/src/impl/ruffle.ts @@ -1,6 +1,5 @@ import os from "os"; import path from "path"; -import env from "../common/env"; import { System } from "../common/system"; import { watch } from "../common/watch"; import run from "../run"; @@ -9,30 +8,18 @@ import { FlashPlayer } from "./flashplayer"; export class RufflePlayer extends FlashPlayer { static ID = "ruffle"; - static VERSION_2026_05_15 = "nightly-2026_05_15"; - static VERSION_2026_10_13 = "nightly-2026_10_13"; static VERSION_0_5_0 = "0.5.0"; static VERSION_0_6_0 = "0.6.0"; static VERSION_0_7_1 = "0.7.1"; static VERSION = RufflePlayer.VERSION_0_7_1; - BASE_URL = "https://github.com/ruffle-rs/ruffle/releases/download"; + url = + "https://github.com/ruffle-rs/ruffle/releases/download/" + + "v<%= version %>/" + + "ruffle-<%= version %>-<%= os_name_long %>-x86_64.<%= os_archive_ext %>"; constructor(debug: boolean, version: string) { super(debug, version || RufflePlayer.VERSION, RufflePlayer.ID); - this.baseUrl = env.get("RUFFLE_URL") || this.BASE_URL; - } - - get link(): string { - const nightly = this.version.includes("nightly"); - const baseUrl = `${this.baseUrl}/${nightly ? "" : "v"}${this.version.replaceAll("_", "-")}`; - if (System.isWindows) { - return baseUrl + `/ruffle-${this.version}-windows-x86_64.zip`; - } else if (System.isLinux) { - return baseUrl + `/ruffle-${this.version}-linux-x86_64.tar.gz`; - } else { - throw `Unsupported os '${os.type()}'`; - } } get flashPlayerBin(): string { diff --git a/src/index.ts b/src/index.ts index fdb5cbb..b650afb 100644 --- a/src/index.ts +++ b/src/index.ts @@ -2,7 +2,9 @@ export * from "./common/download"; export * from "./common/log"; export * from "./common/output"; export * from "./common/system"; +export * from "./common/template"; export * from "./core/config"; +export * from "./core/link"; export * from "./core/sdk"; export * from "./core/type"; export * from "./impl/android"; diff --git a/test/download.test.js b/test/download.test.js index f39c490..c47e6ad 100644 --- a/test/download.test.js +++ b/test/download.test.js @@ -5,18 +5,14 @@ import { join } from "node:path"; import test from "node:test"; import { download } from "../dist/lib/index.mjs"; -const resolveTargetDir = () => mkdtempSync(join(tmpdir(), "test-")); - -const TEST_DATA = { - "https://home.shmyga.ru/public/sdk/haxe/haxe-4.2.5-win.zip": "haxe.exe", - "https://home.shmyga.ru/public/sdk/haxe/haxe-4.2.5-linux64.tar.gz": "haxe", - "https://home.shmyga.ru/public/test.txt": "test.txt", +const testUrl = async (url, file) => { + const target = mkdtempSync(join(tmpdir(), "test-")); + await download(url, target); + assert(existsSync(join(target, file))); }; -for (const [url, file] of Object.entries(TEST_DATA)) { - test(`Test download: ${url}`, async () => { - const target = resolveTargetDir(); - await download(url, target); - assert(existsSync(join(target, file))); - }); -} +test("zip", async () => await testUrl("https://home.shmyga.ru/public/sdk/haxe/haxe-4.2.5-win.zip", "haxe.exe")); + +test("tar.gz", async () => await testUrl("https://home.shmyga.ru/public/sdk/haxe/haxe-4.2.5-linux64.tar.gz", "haxe")); + +test("plain", async () => await testUrl("https://home.shmyga.ru/public/test.txt", "test.txt")); diff --git a/test/link.test.js b/test/link.test.js new file mode 100644 index 0000000..9d8fe49 --- /dev/null +++ b/test/link.test.js @@ -0,0 +1,55 @@ +import assert from "node:assert/strict"; +import test from "node:test"; +import { Android, AndroidNdk, FlashPlayer, Haxe, Neko, resolveLink, RufflePlayer } from "../dist/lib/index.mjs"; + +const testLink = (link, args) => { + for (const [params, targetUrl] of args) { + const url = resolveLink(link, params); + assert.equal(url, targetUrl); + } +}; + +test("neko", () => + testLink(new Neko().link, [ + [{ os_name: "linux" }, "https://github.com/HaxeFoundation/neko/releases/download/v2-4-1/neko-2.4.1-linux64.tar.gz"], + [{ os_name: "win" }, "https://github.com/HaxeFoundation/neko/releases/download/v2-4-1/neko-2.4.1-win64.zip"], + ])); + +test("haxe", () => + testLink(new Haxe().link, [ + [{ os_name: "linux" }, "https://github.com/HaxeFoundation/haxe/releases/download/4.2.5/haxe-4.2.5-linux64.tar.gz"], + [{ os_name: "win" }, "https://github.com/HaxeFoundation/haxe/releases/download/4.2.5/haxe-4.2.5-win64.zip"], + ])); + +test("flashplayer", () => + testLink(new FlashPlayer().link, [ + [ + { os_name: "linux" }, + "https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz", + ], + [{ os_name: "win" }, "https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flashplayer_32_sa.exe"], + ])); + +test("ruffle", () => + testLink(new RufflePlayer().link, [ + [ + { os_name: "linux" }, + "https://github.com/ruffle-rs/ruffle/releases/download/v0.7.1/ruffle-0.7.1-linux-x86_64.tar.gz", + ], + [ + { os_name: "win" }, + "https://github.com/ruffle-rs/ruffle/releases/download/v0.7.1/ruffle-0.7.1-windows-x86_64.zip", + ], + ])); + +test("android", () => + testLink(new Android().link, [ + [{ os_name: "linux" }, "https://dl.google.com/android/repository/commandlinetools-linux-7302050_latest.zip"], + [{ os_name: "win" }, "https://dl.google.com/android/repository/commandlinetools-win-7302050_latest.zip"], + ])); + +test("android-ndk", () => + testLink(new AndroidNdk().link, [ + [{ os_name: "linux" }, "https://dl.google.com/android/repository/android-ndk-r21e-linux-x86_64.zip"], + [{ os_name: "win" }, "https://dl.google.com/android/repository/android-ndk-r21e-windows-x86_64.zip"], + ]));