@powernukkitx/cli 0.0.3 → 1.0.0

package/dist/utils/github.js

@@ -1,187 +1,60 @@
-import https from 'node:https';
-import http from 'node:http';
-import { randomBytes } from 'node:crypto';
-import { createWriteStream, existsSync } from 'node:fs';
+import { fetchJSON } from '../core/network.js';
+import { platform } from 'node:os';
+import { existsSync } from 'node:fs';
 import { readFile, writeFile, mkdir } from 'node:fs/promises';
-import { homedir, platform } from 'node:os';
+import { homedir } from 'node:os';
 import { join } from 'node:path';
-import chalk from 'chalk';
-import { step } from './logger.js';
-import { t } from '../lang/index.js';
 const CACHE_DIR = join(homedir(), '.pnx-cli');
 const CACHE_FILE = join(CACHE_DIR, 'latest-release.json');
 const CACHE_TTL = 3_600_000;
-export async function fetchJSON(url, redirects = 5) {
-    if (redirects <= 0)
-        return Promise.reject(new Error('Too many redirects'));
-    return new Promise((resolve, reject) => {
-        const mod = url.startsWith('https') ? https : http;
-        mod.get(url, { timeout: 15_000, headers: { 'User-Agent': 'pnx-cli' } }, (res) => {
-            const code = res.statusCode ?? 0;
-            if ([301, 302, 303, 307, 308].includes(code)) {
-                if (res.headers.location) {
-                    resolve(fetchJSON(res.headers.location, redirects - 1));
-                    return;
-                }
-            }
-            if (code !== 200) {
-                reject(new Error(`HTTP ${code}`));
-                return;
-            }
-            let data = '';
-            res.on('data', (chunk) => (data += chunk));
-            res.on('end', () => {
-                try {
-                    resolve(JSON.parse(data));
-                }
-                catch {
-                    reject(new Error('Invalid JSON response'));
-                }
-            });
-        })
-            .on('error', reject)
-            .on('timeout', function () {
-            this?.destroy();
-            reject(new Error(t('errors.timeout')));
-        });
-    });
-}
-async function getCachedRelease() {
+async function getCached() {
     try {
         if (existsSync(CACHE_FILE)) {
-            const raw = await readFile(CACHE_FILE, 'utf-8');
-            const cached = JSON.parse(raw);
-            if (Date.now() - cached.fetchedAt < CACHE_TTL) {
-                return cached.data;
-            }
+            const c = JSON.parse(await readFile(CACHE_FILE, 'utf-8'));
+            if (Date.now() - c.fetchedAt < CACHE_TTL)
+                return c.data;
         }
     }
-    catch { /* ignore */ }
+    catch { }
     return null;
 }
-async function setCachedRelease(data) {
+async function setCache(data) {
     try {
         await mkdir(CACHE_DIR, { recursive: true });
         await writeFile(CACHE_FILE, JSON.stringify({ fetchedAt: Date.now(), data }), 'utf-8');
     }
-    catch { /* ignore */ }
+    catch { }
 }
 export async function getLatestRelease() {
-    const cached = await getCachedRelease();
+    const cached = await getCached();
     if (cached)
         return cached;
     const data = await fetchJSON('https://api.github.com/repos/PowerNukkitX/PowerNukkitX/releases/latest');
-    await setCachedRelease(data);
+    await setCache(data);
     return data;
 }
-export async function findAsset(release, name) {
-    return release.assets.find((a) => a.name === name);
-}
-export async function findPluginAsset(repo, assetName) {
-    try {
-        const data = await fetchJSON(`https://api.github.com/repos/${repo}/releases/latest`);
-        const asset = data.assets.find((a) => a.name === assetName);
-        if (asset)
-            return { url: asset.browser_download_url, size: asset.size };
-    }
-    catch { /* not found */ }
-    return null;
+export function findAsset(release, name) {
+    return release.assets.find(a => a.name === name);
 }
-export function downloadFile(url, dest, label) {
-    const fileName = label || dest.split(/[/\\]/).pop() || 'file';
-    step(chalk.cyan(fileName));
-    function doGet(targetUrl, redirects = 5) {
-        if (redirects <= 0)
-            return Promise.reject(new Error('Too many redirects'));
-        return new Promise((resolve, reject) => {
-            const file = createWriteStream(dest);
-            const mod = targetUrl.startsWith('https') ? https : http;
-            mod.get(targetUrl, { timeout: 120_000, headers: { 'User-Agent': 'pnx-cli' } }, (res) => {
-                const code = res.statusCode ?? 0;
-                if ([301, 302, 303, 307, 308].includes(code)) {
-                    if (res.headers.location) {
-                        file.close();
-                        resolve(doGet(res.headers.location, redirects - 1));
-                        return;
-                    }
-                }
-                if (code !== 200) {
-                    file.close();
-                    reject(new Error(`HTTP ${code}`));
-                    return;
-                }
-                const total = parseInt(res.headers['content-length'] || '0', 10);
-                let downloaded = 0;
-                let lastPercent = -1;
-                res.on('data', (chunk) => {
-                    downloaded += chunk.length;
-                    if (total > 0) {
-                        const percent = Math.round((downloaded / total) * 100);
-                        if (percent !== lastPercent && percent % 5 === 0) {
-                            const done = '━'.repeat(Math.floor(percent / 5));
-                            const left = '─'.repeat(20 - Math.floor(percent / 5));
-                            process.stdout.write(`\r  ${chalk.hex('#4ECDC4')(done)}${chalk.dim(left)} ${chalk.bold(String(percent))}%`);
-                            lastPercent = percent;
-                        }
-                    }
-                });
-                res.pipe(file);
-                file.on('finish', () => {
-                    if (total > 0)
-                        process.stdout.write('\n');
-                    file.close();
-                    resolve();
-                });
-            })
-                .on('error', (err) => {
-                file.close();
-                reject(err);
-            })
-                .on('timeout', function () {
-                this?.destroy();
-                file.close();
-                reject(new Error(t('errors.timeout')));
-            });
-        });
-    }
-    return doGet(url);
-}
-export function generateServerId() {
-    return randomBytes(4).toString('hex');
+export function getStartScripts() {
+    const base = 'https://raw.githubusercontent.com/PowerNukkitX/scripts/master';
+    if (platform() === 'win32')
+        return [
+            { url: `${base}/start.bat`, name: 'start.bat' },
+            { url: `${base}/start.ps1`, name: 'start.ps1' },
+        ];
+    return [{ url: `${base}/start.sh`, name: 'start.sh' }];
 }
 export function getDefaultJavaArgs() {
     return [
-        '-Dfile.encoding=UTF-8',
-        '-Dstdout.encoding=UTF-8',
-        '-Dstderr.encoding=UTF-8',
-        '-Djansi.passthrough=true',
-        '-Dterminal.ansi=true',
-        '-XX:+UseZGC',
-        '-XX:+ZGenerational',
-        '-XX:+UseStringDeduplication',
+        '-Dfile.encoding=UTF-8', '-Dstdout.encoding=UTF-8', '-Dstderr.encoding=UTF-8',
+        '-Djansi.passthrough=true', '-Dterminal.ansi=true',
+        '-XX:+UseZGC', '-XX:+ZGenerational', '-XX:+UseStringDeduplication',
         '--add-opens', 'java.base/java.lang=ALL-UNNAMED',
         '--add-opens', 'java.base/java.io=ALL-UNNAMED',
         '--add-opens', 'java.base/java.net=ALL-UNNAMED',
     ];
 }
 export function getJavaEnv() {
-    return {
-        ...process.env,
-        JAVA_TOOL_OPTIONS: '-Dfile.encoding=UTF-8',
-        LANG: process.env.LANG || 'en_US.UTF-8',
-    };
-}
-const RAW_BASE = 'https://raw.githubusercontent.com/PowerNukkitX/scripts/master';
-export function getStartScripts() {
-    const os = platform();
-    if (os === 'win32') {
-        return [
-            { url: `${RAW_BASE}/start.bat`, name: 'start.bat' },
-            { url: `${RAW_BASE}/start.ps1`, name: 'start.ps1' },
-        ];
-    }
-    // linux, darwin, etc.
-    return [
-        { url: `${RAW_BASE}/start.sh`, name: 'start.sh' },
-    ];
+    return { ...process.env, JAVA_TOOL_OPTIONS: '-Dfile.encoding=UTF-8', LANG: process.env.LANG ?? 'en_US.UTF-8' };
 }

package/dist/utils/server.d.ts

@@ -1,3 +1,3 @@
-export declare function detectServer(startPath?: string): string | null;
 export declare function detectAllServers(startPath?: string): string[];
-export declare function resolveServerDir(label?: string): Promise<string | null>;
+export declare function detectServer(startPath?: string): string | null;
+export declare function resolveServerDir(): Promise<string | null>;

package/dist/utils/server.js

@@ -1,39 +1,32 @@
 import { existsSync } from 'node:fs';
 import { join, dirname, resolve } from 'node:path';
 import { cwd } from 'node:process';
-import { select } from '@inquirer/prompts';
-import { highlight } from './logger.js';
-export function detectServer(startPath) {
-    const all = detectAllServers(startPath);
-    return all[0] || null;
-}
+import { getDefaultServer } from '../core/config.js';
 export function detectAllServers(startPath) {
     const found = [];
-    const checkPaths = [
+    const paths = [
         startPath || cwd(),
         join(startPath || cwd(), 'pnx-server'),
         startPath ? dirname(resolve(startPath)) : dirname(cwd()),
     ];
-    for (const dir of checkPaths) {
-        if (existsSync(join(dir, 'powernukkitx.jar')) && !found.includes(dir)) {
+    for (const dir of paths) {
+        if (existsSync(join(dir, 'powernukkitx.jar')) && !found.includes(dir))
             found.push(dir);
-        }
     }
     return found;
 }
-export async function resolveServerDir(label) {
-    const servers = detectAllServers();
-    if (servers.length === 0)
+export function detectServer(startPath) {
+    return detectAllServers(startPath)[0] ?? null;
+}
+export async function resolveServerDir() {
+    const def = await getDefaultServer();
+    if (def && existsSync(join(def, 'powernukkitx.jar')))
+        return def;
+    const all = detectAllServers();
+    if (all.length === 0)
         return null;
-    if (servers.length === 1)
-        return servers[0];
-    const choice = await select({
-        message: label || 'Multiple servers found. Which one to manage?',
-        pageSize: 10,
-        choices: servers.map((s) => ({
-            name: highlight(s),
-            value: s,
-        })),
-    });
-    return choice;
+    if (all.length === 1)
+        return all[0];
+    const { select } = await import('@inquirer/prompts');
+    return select({ message: 'Plusieurs serveurs détectés. Lequel ?', choices: all.map(s => ({ name: s, value: s })) });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@powernukkitx/cli",
-  "version": "0.0.3",
+  "version": "1.0.0",
   "description": "PowerNukkitX CLI — Manage your Minecraft Bedrock servers with style",
   "keywords": [
     "powernukkitx",
@@ -13,51 +13,34 @@
   "license": "MIT",
   "author": "AzaleeX",
   "type": "module",
-  "main": "dist/index.js",
+  "main": "dist/cli.js",
   "bin": {
-    "pnx": "dist/index.js"
+    "pnx": "dist/cli.js"
   },
   "files": [
     "dist"
   ],
+  "engines": {
+    "node": ">=20.12.0"
+  },
   "scripts": {
-    "build": "tsc",
-    "start": "node dist/index.js",
-    "prepublishOnly": "npm run build",
+    "build": "tsc && node scripts/copy-assets.mjs",
     "dev": "tsc --watch",
-    "generate-icon": "node scripts/generate-icon.js",
-    "set-icon": "node scripts/apply-icon.js",
-    "bundle": "esbuild src/index.ts --bundle --platform=node --format=cjs --outfile=dist/bundle.js --tsconfig=tsconfig.json --external:@yao-pkg/pkg",
-    "build:exe": "npm run bundle && pkg dist/bundle.js --targets node18-win-x64,node18-linux-x64,node18-macos-x64 --output pnx-cli",
-    "build:exe:win": "npm run generate-icon && npm run bundle && pkg dist/bundle.js --targets node18-win-x64 --output pnx-cli.exe && npm run set-icon",
-    "build:exe:linux": "npm run bundle && pkg dist/bundle.js --targets node18-linux-x64 --output pnx-cli-linux",
-    "build:exe:mac": "npm run bundle && pkg dist/bundle.js --targets node18-macos-x64 --output pnx-cli-macos"
+    "start": "node dist/cli.js",
+    "test": "node --import tsx --test src/**/*.test.ts",
+    "prepublishOnly": "npm run build",
+    "build:sea": "npm run build && node scripts/build-sea.mjs"
   },
   "dependencies": {
-    "@inquirer/prompts": "^7.10.1",
+    "@clack/prompts": "^1.7.0",
     "chalk": "^5.6.2",
-    "commander": "^12.1.0"
+    "citty": "^0.2.2"
   },
   "devDependencies": {
     "@types/node": "^22.19.19",
-    "@yao-pkg/pkg": "^6.19.0",
     "esbuild": "^0.28.0",
-    "rcedit": "^5.0.2",
+    "postject": "^1.0.0-alpha.6",
+    "tsx": "^4.19.2",
     "typescript": "^5.9.3"
-  },
-  "engines": {
-    "node": ">=18.0.0"
-  },
-  "pkg": {
-    "assets": [
-      "dist/lang/*.json",
-      "dist/plugins.json"
-    ],
-    "targets": [
-      "node18-win-x64",
-      "node18-linux-x64",
-      "node18-macos-x64"
-    ],
-    "public": true
   }
 }