@build-script/package-tools 0.0.26 → 0.0.28

package/src/common/package-manager/proxy.ts

@@ -1,5 +1,5 @@
+import { logger as defaultLogger, type IMyLogger } from '@idlebox/cli';
 import { escapeRegExp } from '@idlebox/common';
-import { logger } from '@idlebox/cli';
 import { getEnvironment } from '@idlebox/node';
 import type { IPackageManager } from './package-manager.js';
 
@@ -13,7 +13,7 @@ function makeRe(str: string) {
 	return new RegExp(`^${reTxt}$`, 'i');
 }
 
-export function getProxyValue(url: string) {
+export function getProxyValue(url: string, logger: IMyLogger = defaultLogger): string {
 	const proxyValue = process.env.http_proxy;
 	if (!proxyValue) {
 		return '';
@@ -65,21 +65,21 @@ export function getProxyValue(url: string) {
 export async function reconfigureProxyWithNpmrc(pm: IPackageManager) {
 	if (proxy_override_by_env) return;
 
-	logger.debug('通过npm设置代理服务器:');
+	pm.logger.debug('通过npm设置代理服务器:');
 	const p = await pm.getConfig('proxy');
 	const np = await pm.getConfig('noproxy');
 
 	if (p) {
-		logger.debug(`   * proxy server = ${p}`);
+		pm.logger.debug(`   * proxy server = ${p}`);
 	}
 	if (np) {
-		logger.debug(`   * no_proxy = ${np}`);
+		pm.logger.debug(`   * no_proxy = ${np}`);
 	}
 
 	applyEnv(p || '', np || '');
 }
 
-export function configureProxyFromEnvironment() {
+export function configureProxyFromEnvironment(logger: IMyLogger = defaultLogger) {
 	// bootstrap({
 	// 	environmentVariableNamespace: '',
 	// 	forceGlobalAgent: true,

package/src/common/shared-jobs/detect-change-job.ts

@@ -1,4 +1,3 @@
-import { logger } from '@idlebox/cli';
 import { PathEnvironment } from '@idlebox/node';
 import { resolve } from 'node:path';
 import { gt } from 'semver';
@@ -21,7 +20,8 @@ interface IDetectOptions {
 
 export async function executeChangeDetect(pm: IPackageManager, options: IDetectOptions = {}): Promise<IResult> {
 	const packageJson = await pm.loadPackageJson();
-	logger.debug('修改检测 | 包名: %s', packageJson.name);
+
+	pm.logger.debug('修改检测 | 包名: %s', packageJson.name);
 	if (!packageJson.name) {
 		throw new Error(`${pm.projectPath}/package.json 中缺少 name 字段`);
 	}
@@ -38,16 +38,16 @@ export async function executeChangeDetect(pm: IPackageManager, options: IDetectO
 	}
 
 	if (packageJson.private && !options.forcePrivate) {
-		logger.debug('检测到私有包，禁止运行');
+		pm.logger.debug('检测到私有包，禁止运行');
 		return { changedFiles: [], hasChange: false };
 	}
 
 	const remotePackage = await cache.fetchVersion(packageJson.name, distTagInput);
-	logger.debug(' -> npm 远程版本 = %s', remotePackage?.version);
-	logger.debug(' -> package.json 本地版本 = %s', packageJson.version);
+	pm.logger.debug(' -> npm 远程版本 = %s', remotePackage?.version);
+	pm.logger.debug(' -> package.json 本地版本 = %s', packageJson.version);
 
 	if (!remotePackage || gt(packageJson.version, remotePackage.version)) {
-		logger.debug('本地版本 (%s) 已经大于远程版本 (%s)，无需进一步检测', packageJson.version, remotePackage?.version);
+		pm.logger.debug('本地版本 (%s) 已经大于远程版本 (%s)，无需进一步检测', packageJson.version, remotePackage?.version);
 		return {
 			changedFiles: ['package.json'],
 			hasChange: false,
@@ -55,33 +55,33 @@ export async function executeChangeDetect(pm: IPackageManager, options: IDetectO
 			packageJsonDiff: `短路检测: "version" 本地为 ${packageJson.version}, 远程版本为 ${remotePackage?.version}`,
 		};
 	}
-	logger.debug('本地版本 (%s) 小于或等于远程版本 (%s)，尝试检测更改...', packageJson.version, remotePackage.version);
+	pm.logger.debug('本地版本 (%s) 小于或等于远程版本 (%s)，尝试检测更改...', packageJson.version, remotePackage.version);
 
 	const tarball = await cache.downloadTarball(packageJson.name, distTagInput);
 
-	const tempFolder = new TempWorkingFolder(pm.workspace, 'package-change-detect');
+	const tempFolder = new TempWorkingFolder(pm.workspace, 'package-change-detect', pm.logger);
 	const workingRoot = tempFolder.resolve('working');
 	await workingRoot.unpack(tarball);
 	await makePackageJsonOrderConsistence(workingRoot.path);
 
-	const gitrepo = new GitWorkingTree(workingRoot.path);
+	const gitrepo = new GitWorkingTree(workingRoot.path, pm.logger);
 	await gitrepo.init();
 
 	const pack = await pm.pack(tempFolder.joinpath('local-pack.tgz'));
-	logger.verbose('  --> %s', pack);
+	pm.logger.verbose('  --> %s', pack);
 
 	await workingRoot.unpack(pack);
-	logger.verbose('  unpacked successfully');
+	pm.logger.verbose('  unpacked successfully');
 
 	await makePackageJsonOrderConsistence(workingRoot.path);
 
 	const changedFiles = await gitrepo.commitChanges();
-	logger.verbose`  changed files: list<${changedFiles}>`;
+	pm.logger.verbose`  changed files: list<${changedFiles}>`;
 
 	let packageJsonDiff = '';
 	if (changedFiles.includes('package.json')) {
 		packageJsonDiff = await gitrepo.fileDiff('package.json');
-		logger.debug(`    - package.json 文件的修改:\n${packageJsonDiff}`);
+		pm.logger.debug(`    - package.json 文件的修改:\n${packageJsonDiff}`);
 	}
 
 	return { changedFiles, hasChange: changedFiles.length > 0, remoteVersion: remotePackage.version, packageJsonDiff };

package/src/common/taball/decompress.ts

@@ -1,11 +1,11 @@
+import { logger as defaultLogger, type IMyLogger } from '@idlebox/cli';
 import { convertCatchedError } from '@idlebox/common';
-import { logger } from '@idlebox/cli';
 import { existsSync, unlinkSync } from 'node:fs';
 import tgz from 'targz';
 
 const packageFolder = /^package\//;
 
-export async function decompressPack(src: string, dest: string) {
+export async function decompressPack(src: string, dest: string, logger: IMyLogger = defaultLogger) {
 	logger.debug(`解压文件: ${src}\n\u3000\u3000目录: ${dest}`);
 	await new Promise<void>((resolve, reject) => {
 		if (!existsSync(src)) {

package/src/common/taball/file-download.ts

@@ -1,4 +1,4 @@
-import { logger } from '@idlebox/cli';
+import { logger as defaultLogger, type IMyLogger } from '@idlebox/cli';
 import { sleep } from '@idlebox/common';
 import { exists, streamPromise } from '@idlebox/node';
 import { createWriteStream } from 'node:fs';
@@ -14,33 +14,124 @@ interface IMetaInfo {
 	url: string;
 }
 
-export async function downloadFileCached(url: string, file: string) {
-	const metadata = `${file}.meta.json`;
-	logger.debug`下载文件:\n    地址: long<${url}>\n    保存到: long<${file}>`;
-	let meta: IMetaInfo | undefined;
-	if ((await exists(metadata)) && (await exists(file))) {
-		try {
-			meta = JSON.parse(await readFile(metadata, 'utf-8'));
-		} catch {}
-
-		if (meta?.url === url) {
-			logger.debug('     -> 已经下载');
-			return file;
+export class FileDownloader {
+	constructor(public readonly logger: IMyLogger = defaultLogger) {}
+
+	public async download(url: string, file: string) {
+		const metadata = `${file}.meta.json`;
+		this.logger.debug`下载文件:\n    地址: long<${url}>\n    保存到: long<${file}>`;
+		let meta: IMetaInfo | undefined;
+		if ((await exists(metadata)) && (await exists(file))) {
+			try {
+				meta = JSON.parse(await readFile(metadata, 'utf-8'));
+			} catch {}
+
+			if (meta?.url === url) {
+				this.logger.debug('     -> 已经下载');
+				return file;
+			}
 		}
+		const response = await this.http_stream(url);
+
+		await mkdir(dirname(file), { recursive: true });
+		const writeOut = createWriteStream(`${file}.downloading`);
+		await streamPromise(response.stream.pipe(writeOut));
+
+		meta = { headers: response.headers, url };
+		await writeFile(metadata, JSON.stringify(meta), 'utf-8');
+
+		await rename(`${file}.downloading`, file);
+		this.logger.debug('     -> 下载完成');
+
+		return file;
 	}
-	const response = await http_stream(url);
 
-	await mkdir(dirname(file), { recursive: true });
-	const writeOut = createWriteStream(`${file}.downloading`);
-	await streamPromise(response.stream.pipe(writeOut));
+	private async http_stream(url: string, headers?: OutgoingHttpHeaders): Promise<INormalizedResponse> {
+		let try_remain = 3;
+		let redirect_cnt = 0;
+		while (try_remain-- > 0) {
+			try {
+				return await this.send_request(url, headers || {});
+			} catch (e: unknown) {
+				if (RedirectError.is(e)) {
+					redirect_cnt++;
+					if (redirect_cnt > 8) {
+						throw new HttpError(url, 0, '重定向次数过多');
+					}
+
+					this.logger.debug(`[http] 重定向到 ${e.location}`);
+					url = e.location;
+					try_remain++;
+					continue;
+				}
+
+				this.logger.error('获取 %s 失败 [剩余尝试次数 %s]', url, try_remain);
+				if (try_remain === 0) throw e;
 
-	meta = { headers: response.headers, url };
-	await writeFile(metadata, JSON.stringify(meta), 'utf-8');
+				await sleep(2000);
+			}
+		}
+		throw new Error('不可能的错误');
+	}
 
-	await rename(`${file}.downloading`, file);
-	logger.debug('     -> 下载完成');
+	private send_request(url: string, headers: OutgoingHttpHeaders): Promise<any> {
+		headers['Accept-Encoding'] = 'br,gzip,deflate';
+		return new Promise<any>((resolve, reject) => {
+			this.logger.debug(`[http] 请求 ${url}`);
+
+			const request = get(url, { headers }, (response) => {
+				this.logger.debug(`[http] 响应 ${response.statusCode} [encoding: ${response.headers['content-encoding']}][${response.headers['content-length']} bytes]`);
+				if (response.statusCode === 200) {
+					const bytes = Number.parseInt(response.headers['content-length'] ?? '--', 10);
+
+					if (bytes > 5 * 1024 * 1024 && process.stderr.isTTY) {
+						let downloaded = 0;
+						response.on('data', (bs) => {
+							downloaded += bs.length;
+							process.stderr.write(`\x1B[2mdownload: ${downloaded} of ${bytes} bytes (${Math.round((downloaded / bytes) * 100)}%)\x1B[0m\r`);
+						});
+						response.on('end', () => {
+							process.stderr.write('\x1B[K');
+						});
+					}
+
+					let stream: Readable;
+					switch (response.headers['content-encoding']) {
+						case 'br':
+							stream = response.pipe(createBrotliDecompress());
+							break;
+						// Or, just use zlib.createUnzip() to handle both of the following cases:
+						case 'gzip':
+							stream = response.pipe(createGunzip());
+							break;
+						case 'deflate':
+							stream = response.pipe(createInflate());
+							break;
+						default:
+							stream = response;
+							break;
+					}
+					resolve(Object.assign(response, { stream }));
+				} else if (
+					(response.statusCode === 302 ||
+						response.statusCode === 301 ||
+						response.statusCode === 303 ||
+						response.statusCode === 307 ||
+						response.statusCode === 308) &&
+					response.headers.location
+				) {
+					reject(new RedirectError(url, response.headers.location, response.statusCode));
+				} else {
+					reject(new HttpError(url, response.statusCode as number, response.statusMessage as string));
+				}
+			});
 
-	return file;
+			request.on('error', (err) => {
+				reject(err);
+			});
+			request.end();
+		});
+	}
 }
 
 class RedirectError extends Error {
@@ -73,86 +164,3 @@ export class HttpError extends Error {
 
 type IStream = { stream: Readable };
 export type INormalizedResponse = Omit<IncomingMessage, keyof Readable> & IStream;
-
-async function http_stream(url: string, headers?: OutgoingHttpHeaders): Promise<INormalizedResponse> {
-	let try_remain = 3;
-	let redirect_cnt = 0;
-	while (try_remain-- > 0) {
-		try {
-			return await send_request(url, headers || {});
-		} catch (e: unknown) {
-			if (RedirectError.is(e)) {
-				redirect_cnt++;
-				if (redirect_cnt > 8) {
-					throw new HttpError(url, 0, '重定向次数过多');
-				}
-
-				logger.debug(`[http] 重定向到 ${e.location}`);
-				url = e.location;
-				try_remain++;
-				continue;
-			}
-
-			logger.error('获取 %s 失败 [剩余尝试次数 %s]', url, try_remain);
-			if (try_remain === 0) throw e;
-
-			await sleep(2000);
-		}
-	}
-	throw new Error('不可能的错误');
-}
-
-function send_request(url: string, headers: OutgoingHttpHeaders): Promise<any> {
-	headers['Accept-Encoding'] = 'br,gzip,deflate';
-	return new Promise<any>((resolve, reject) => {
-		logger.debug(`[http] 请求 ${url}`);
-
-		const request = get(url, { headers }, (response) => {
-			logger.debug(`[http] 响应 ${response.statusCode} [encoding: ${response.headers['content-encoding']}][${response.headers['content-length']} bytes]`);
-			if (response.statusCode === 200) {
-				const bytes = Number.parseInt(response.headers['content-length'] ?? '--', 10);
-
-				if (bytes > 5 * 1024 * 1024 && process.stderr.isTTY) {
-					let downloaded = 0;
-					response.on('data', (bs) => {
-						downloaded += bs.length;
-						process.stderr.write(`\x1B[2mdownload: ${downloaded} of ${bytes} bytes (${Math.round((downloaded / bytes) * 100)}%)\x1B[0m\r`);
-					});
-					response.on('end', () => {
-						process.stderr.write('\x1B[K');
-					});
-				}
-
-				let stream: Readable;
-				switch (response.headers['content-encoding']) {
-					case 'br':
-						stream = response.pipe(createBrotliDecompress());
-						break;
-					// Or, just use zlib.createUnzip() to handle both of the following cases:
-					case 'gzip':
-						stream = response.pipe(createGunzip());
-						break;
-					case 'deflate':
-						stream = response.pipe(createInflate());
-						break;
-					default:
-						stream = response;
-						break;
-				}
-				resolve(Object.assign(response, { stream }));
-			} else if (
-				(response.statusCode === 302 || response.statusCode === 301 || response.statusCode === 303 || response.statusCode === 307 || response.statusCode === 308) &&
-				response.headers.location
-			) {
-				reject(new RedirectError(url, response.headers.location, response.statusCode));
-			} else {
-				reject(new HttpError(url, response.statusCode as number, response.statusMessage as string));
-			}
-		});
-
-		request.on('error', (err) => {
-			reject(err);
-		});
-		request.end();
-	});
-}

package/src/common/temp-work-folder.ts

@@ -1,7 +1,7 @@
 import type { WorkspaceBase } from '@build-script/monorepo-lib';
+import { logger as defaultLogger, type IMyLogger } from '@idlebox/cli';
 import { registerGlobalLifecycle } from '@idlebox/common';
 import { writeJsonFile } from '@idlebox/json-edit';
-import { logger } from '@idlebox/cli';
 import { emptyDir } from '@idlebox/node';
 import { randomBytes } from 'node:crypto';
 import { rmSync } from 'node:fs';
@@ -17,6 +17,7 @@ export class TempWorkingFolder {
 	constructor(
 		private readonly workspace: WorkspaceBase,
 		name: string,
+		public readonly logger: IMyLogger = defaultLogger,
 		__internal_isChild = false,
 	) {
 		if (!__internal_isChild) {
@@ -27,7 +28,7 @@ export class TempWorkingFolder {
 	}
 
 	resolve(p0: string, ...paths: string[]) {
-		return new TempWorkingFolder(this.workspace, this.joinpath(p0, ...paths), true);
+		return new TempWorkingFolder(this.workspace, this.joinpath(p0, ...paths), this.logger, true);
 	}
 
 	joinpath(p0: string, ...paths: string[]) {
@@ -39,7 +40,7 @@ export class TempWorkingFolder {
 	}
 
 	async mkdir() {
-		logger.debug('临时工作目录: %s', this.path);
+		this.logger.debug`临时工作目录: long<${this.path}>`;
 		await mkdir(this.path, { recursive: true });
 		this._exists = true;
 	}
@@ -66,15 +67,15 @@ export class TempWorkingFolder {
 	}
 
 	unpack(tarball: string, dest = '.') {
-		return decompressPack(tarball, resolve(this.path, dest));
+		return decompressPack(tarball, resolve(this.path, dest), this.logger);
 	}
 
 	dispose() {
 		if (!isDebugMode) {
-			logger.debug('  * 删除临时目录: %s', this.path);
+			this.logger.debug`  * 删除临时目录: long<${this.path}>`;
 			rmSync(this.path, { force: true, recursive: true });
 		} else {
-			logger.debug('  * 由于是调试模式，不删除临时文件夹: %s', this.path);
+			this.logger.debug`  * 由于是调试模式，不删除临时文件夹: long<${this.path}>`;
 		}
 	}
 }

package/src/common/version.generated.ts

@@ -13,7 +13,7 @@
  ******************************************************************************/
 
 
-export const self_package_version = "0.0.26";
+export const self_package_version = "0.0.28";
 export const self_package_name = "@build-script/package-tools";
 export const self_package_repository = "https://github.com/GongT/baobao";
 

package/src/tsconfig.json

@@ -4,7 +4,6 @@
 		"typeRoots": ["../node_modules/@types", "../node_modules"],
 		"outDir": "../lib",
 		"rootDir": "./",
-		"types": ["node"],
 		"noEmitOnError": false
 	},
 	"exclude": ["**/*.generator.ts"]

package/src/command-file-map.generator.ts

@@ -1,10 +0,0 @@
-import type { GenerateContext } from '@build-script/codegen';
-import { makeIndexFile } from '@idlebox/cli/builder';
-
-export async function generate(ctx: GenerateContext) {
-	ctx.watchFiles(`${__dirname}/commands/*.ts`);
-	ctx.watchFiles(`${__dirname}/commands`);
-
-	const content = await makeIndexFile(__dirname, ['commands/*.ts']);
-	ctx.file('commands.ts').append(content);
-}

package/src/common/version.generator.ts

@@ -1,19 +0,0 @@
-import type { FileBuilder, IOutputShim } from '@build-script/codegen';
-import { execa } from 'execa';
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-
-export async function generate(_builder: FileBuilder, logger: IOutputShim) {
-	const pkgFile = path.resolve(__dirname, '../../package.json');
-	const pkg = JSON.parse(fs.readFileSync(pkgFile, 'utf-8'));
-
-	logger.log(`package info = ${pkg.name} @ ${pkg.version}`);
-
-	const { stdout } = await execa('git', ['remote', 'get-url', 'origin']);
-	const repository = stdout.trim().replace(/\.git$/, '');
-
-	return `export const self_package_version = "${pkg.version}";
-export const self_package_name = "${pkg.name}";
-export const self_package_repository = "${repository}";
-`;
-}