@build-script/package-tools 0.0.27 → 0.0.28
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/commands/monorepo-publish.d.ts.map +1 -1
- package/lib/commands/monorepo-publish.js +31 -15
- package/lib/commands/monorepo-publish.js.map +1 -1
- package/lib/common/cache/native.npm.d.ts +4 -1
- package/lib/common/cache/native.npm.d.ts.map +1 -1
- package/lib/common/cache/native.npm.js +13 -10
- package/lib/common/cache/native.npm.js.map +1 -1
- package/lib/common/git/git.d.ts +3 -1
- package/lib/common/git/git.d.ts.map +1 -1
- package/lib/common/git/git.js +12 -10
- package/lib/common/git/git.js.map +1 -1
- package/lib/common/package-manager/driver.abstract.d.ts +3 -1
- package/lib/common/package-manager/driver.abstract.d.ts.map +1 -1
- package/lib/common/package-manager/driver.abstract.js +16 -14
- package/lib/common/package-manager/driver.abstract.js.map +1 -1
- package/lib/common/package-manager/package-manager.d.ts +2 -1
- package/lib/common/package-manager/package-manager.d.ts.map +1 -1
- package/lib/common/package-manager/package-manager.js +4 -3
- package/lib/common/package-manager/package-manager.js.map +1 -1
- package/lib/common/package-manager/proxy.d.ts +3 -2
- package/lib/common/package-manager/proxy.d.ts.map +1 -1
- package/lib/common/package-manager/proxy.js +6 -6
- package/lib/common/package-manager/proxy.js.map +1 -1
- package/lib/common/shared-jobs/detect-change-job.d.ts.map +1 -1
- package/lib/common/shared-jobs/detect-change-job.js +12 -13
- package/lib/common/shared-jobs/detect-change-job.js.map +1 -1
- package/lib/common/taball/decompress.d.ts +2 -1
- package/lib/common/taball/decompress.d.ts.map +1 -1
- package/lib/common/taball/decompress.js +2 -2
- package/lib/common/taball/decompress.js.map +1 -1
- package/lib/common/taball/file-download.d.ts +8 -1
- package/lib/common/taball/file-download.d.ts.map +1 -1
- package/lib/common/taball/file-download.js +107 -97
- package/lib/common/taball/file-download.js.map +1 -1
- package/lib/common/temp-work-folder.d.ts +3 -1
- package/lib/common/temp-work-folder.d.ts.map +1 -1
- package/lib/common/temp-work-folder.js +9 -7
- package/lib/common/temp-work-folder.js.map +1 -1
- package/lib/common/version.generated.d.ts +1 -1
- package/lib/common/version.generated.js +1 -1
- package/package.json +11 -12
- package/src/commands/monorepo-publish.ts +33 -15
- package/src/common/cache/native.npm.ts +13 -10
- package/src/common/git/git.ts +13 -10
- package/src/common/package-manager/driver.abstract.ts +14 -13
- package/src/common/package-manager/package-manager.ts +10 -4
- package/src/common/package-manager/proxy.ts +6 -6
- package/src/common/shared-jobs/detect-change-job.ts +13 -13
- package/src/common/taball/decompress.ts +2 -2
- package/src/common/taball/file-download.ts +113 -105
- package/src/common/temp-work-folder.ts +7 -6
- package/src/common/version.generated.ts +1 -1
|
@@ -1,18 +1,19 @@
|
|
|
1
|
+
import { logger as defaultLogger } from '@idlebox/cli';
|
|
1
2
|
import { commandInPath, PathEnvironment } from '@idlebox/node';
|
|
2
3
|
import { NPM } from './driver.npm.js';
|
|
3
4
|
import { PNPM } from './driver.pnpm.js';
|
|
4
5
|
import { reconfigureProxyWithNpmrc } from './proxy.js';
|
|
5
6
|
let pmCls;
|
|
6
|
-
export async function createPackageManager(usage, workspace, subdir) {
|
|
7
|
+
export async function createPackageManager(usage, workspace, subdir, logger = defaultLogger) {
|
|
7
8
|
if (pmCls) {
|
|
8
|
-
return new pmCls(usage, workspace, subdir);
|
|
9
|
+
return new pmCls(usage, workspace, subdir, logger);
|
|
9
10
|
}
|
|
10
11
|
const supports = { pnpm: PNPM, npm: NPM };
|
|
11
12
|
for (const [name, Cls] of Object.entries(supports)) {
|
|
12
13
|
if (!(await commandInPath(name).catch(() => false))) {
|
|
13
14
|
continue;
|
|
14
15
|
}
|
|
15
|
-
const pm = new Cls(usage, workspace, subdir);
|
|
16
|
+
const pm = new Cls(usage, workspace, subdir, logger);
|
|
16
17
|
await reconfigureProxyWithNpmrc(pm);
|
|
17
18
|
pmCls = Cls;
|
|
18
19
|
return pm;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-manager.js","sourceRoot":"","sources":["../../../src/common/package-manager/package-manager.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAE/D,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AACtC,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACxC,OAAO,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAC;AAMvD,IAAI,KAA4C,CAAC;AAEjD,MAAM,CAAC,KAAK,UAAU,oBAAoB,
|
|
1
|
+
{"version":3,"file":"package-manager.js","sourceRoot":"","sources":["../../../src/common/package-manager/package-manager.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,IAAI,aAAa,EAAkB,MAAM,cAAc,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAE/D,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AACtC,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACxC,OAAO,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAC;AAMvD,IAAI,KAA4C,CAAC;AAEjD,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACzC,KAA8B,EAC9B,SAAwB,EACxB,MAAe,EACf,SAAoB,aAAa;IAEjC,IAAI,KAAK,EAAE,CAAC;QACX,OAAO,IAAI,KAAK,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACpD,CAAC;IAED,MAAM,QAAQ,GAA8C,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;IACrF,KAAK,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;QACpD,IAAI,CAAC,CAAC,MAAM,aAAa,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;YACrD,SAAS;QACV,CAAC;QAED,MAAM,EAAE,GAAG,IAAI,GAAG,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QAErD,MAAM,yBAAyB,CAAC,EAAE,CAAC,CAAC;QAEpC,KAAK,GAAG,GAAG,CAAC;QACZ,OAAO,EAAE,CAAC;IACX,CAAC;IAED,MAAM,OAAO,GAAG,IAAI,eAAe,EAAE,CAAC;IACtC,OAAO,CAAC,GAAG,CAAC,YAAY,OAAO,CAAC,GAAG,CAAC,IAAI,UAAU,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAC1F,MAAM,IAAI,KAAK,CAAC,uBAAuB,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;AAC3E,CAAC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
+
import { type IMyLogger } from '@idlebox/cli';
|
|
1
2
|
import type { IPackageManager } from './package-manager.js';
|
|
2
|
-
export declare function getProxyValue(url: string): string;
|
|
3
|
+
export declare function getProxyValue(url: string, logger?: IMyLogger): string;
|
|
3
4
|
export declare function reconfigureProxyWithNpmrc(pm: IPackageManager): Promise<void>;
|
|
4
|
-
export declare function configureProxyFromEnvironment(): void;
|
|
5
|
+
export declare function configureProxyFromEnvironment(logger?: IMyLogger): void;
|
|
5
6
|
//# sourceMappingURL=proxy.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../../src/common/package-manager/proxy.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../../src/common/package-manager/proxy.ts"],"names":[],"mappings":"AAAA,OAAO,EAA2B,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AAGvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAY5D,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,GAAE,SAAyB,GAAG,MAAM,CA+CpF;AAED,wBAAsB,yBAAyB,CAAC,EAAE,EAAE,eAAe,iBAelE;AAED,wBAAgB,6BAA6B,CAAC,MAAM,GAAE,SAAyB,QAwC9E"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
+
import { logger as defaultLogger } from '@idlebox/cli';
|
|
1
2
|
import { escapeRegExp } from '@idlebox/common';
|
|
2
|
-
import { logger } from '@idlebox/cli';
|
|
3
3
|
import { getEnvironment } from '@idlebox/node';
|
|
4
4
|
let proxy_override_by_env = false;
|
|
5
5
|
function makeRe(str) {
|
|
@@ -9,7 +9,7 @@ function makeRe(str) {
|
|
|
9
9
|
.join('.+');
|
|
10
10
|
return new RegExp(`^${reTxt}$`, 'i');
|
|
11
11
|
}
|
|
12
|
-
export function getProxyValue(url) {
|
|
12
|
+
export function getProxyValue(url, logger = defaultLogger) {
|
|
13
13
|
const proxyValue = process.env.http_proxy;
|
|
14
14
|
if (!proxyValue) {
|
|
15
15
|
return '';
|
|
@@ -58,18 +58,18 @@ export function getProxyValue(url) {
|
|
|
58
58
|
export async function reconfigureProxyWithNpmrc(pm) {
|
|
59
59
|
if (proxy_override_by_env)
|
|
60
60
|
return;
|
|
61
|
-
logger.debug('通过npm设置代理服务器:');
|
|
61
|
+
pm.logger.debug('通过npm设置代理服务器:');
|
|
62
62
|
const p = await pm.getConfig('proxy');
|
|
63
63
|
const np = await pm.getConfig('noproxy');
|
|
64
64
|
if (p) {
|
|
65
|
-
logger.debug(` * proxy server = ${p}`);
|
|
65
|
+
pm.logger.debug(` * proxy server = ${p}`);
|
|
66
66
|
}
|
|
67
67
|
if (np) {
|
|
68
|
-
logger.debug(` * no_proxy = ${np}`);
|
|
68
|
+
pm.logger.debug(` * no_proxy = ${np}`);
|
|
69
69
|
}
|
|
70
70
|
applyEnv(p || '', np || '');
|
|
71
71
|
}
|
|
72
|
-
export function configureProxyFromEnvironment() {
|
|
72
|
+
export function configureProxyFromEnvironment(logger = defaultLogger) {
|
|
73
73
|
// bootstrap({
|
|
74
74
|
// environmentVariableNamespace: '',
|
|
75
75
|
// forceGlobalAgent: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../../src/common/package-manager/proxy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../../src/common/package-manager/proxy.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"detect-change-job.d.ts","sourceRoot":"","sources":["../../../src/common/shared-jobs/detect-change-job.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"detect-change-job.d.ts","sourceRoot":"","sources":["../../../src/common/shared-jobs/detect-change-job.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAG7E,UAAU,OAAO;IAChB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,EAAE,OAAO,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,UAAU,cAAc;IACvB,YAAY,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,wBAAsB,mBAAmB,CAAC,EAAE,EAAE,eAAe,EAAE,OAAO,GAAE,cAAmB,GAAG,OAAO,CAAC,OAAO,CAAC,CAmE7G"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { logger } from '@idlebox/cli';
|
|
2
1
|
import { PathEnvironment } from '@idlebox/node';
|
|
3
2
|
import { resolve } from 'node:path';
|
|
4
3
|
import { gt } from 'semver';
|
|
@@ -8,7 +7,7 @@ import { makePackageJsonOrderConsistence } from '../package-manager/package-json
|
|
|
8
7
|
import { TempWorkingFolder } from '../temp-work-folder.js';
|
|
9
8
|
export async function executeChangeDetect(pm, options = {}) {
|
|
10
9
|
const packageJson = await pm.loadPackageJson();
|
|
11
|
-
logger.debug('修改检测 | 包名: %s', packageJson.name);
|
|
10
|
+
pm.logger.debug('修改检测 | 包名: %s', packageJson.name);
|
|
12
11
|
if (!packageJson.name) {
|
|
13
12
|
throw new Error(`${pm.projectPath}/package.json 中缺少 name 字段`);
|
|
14
13
|
}
|
|
@@ -22,14 +21,14 @@ export async function executeChangeDetect(pm, options = {}) {
|
|
|
22
21
|
}
|
|
23
22
|
}
|
|
24
23
|
if (packageJson.private && !options.forcePrivate) {
|
|
25
|
-
logger.debug('检测到私有包，禁止运行');
|
|
24
|
+
pm.logger.debug('检测到私有包，禁止运行');
|
|
26
25
|
return { changedFiles: [], hasChange: false };
|
|
27
26
|
}
|
|
28
27
|
const remotePackage = await cache.fetchVersion(packageJson.name, distTagInput);
|
|
29
|
-
logger.debug(' -> npm 远程版本 = %s', remotePackage?.version);
|
|
30
|
-
logger.debug(' -> package.json 本地版本 = %s', packageJson.version);
|
|
28
|
+
pm.logger.debug(' -> npm 远程版本 = %s', remotePackage?.version);
|
|
29
|
+
pm.logger.debug(' -> package.json 本地版本 = %s', packageJson.version);
|
|
31
30
|
if (!remotePackage || gt(packageJson.version, remotePackage.version)) {
|
|
32
|
-
logger.debug('本地版本 (%s) 已经大于远程版本 (%s)，无需进一步检测', packageJson.version, remotePackage?.version);
|
|
31
|
+
pm.logger.debug('本地版本 (%s) 已经大于远程版本 (%s)，无需进一步检测', packageJson.version, remotePackage?.version);
|
|
33
32
|
return {
|
|
34
33
|
changedFiles: ['package.json'],
|
|
35
34
|
hasChange: false,
|
|
@@ -37,25 +36,25 @@ export async function executeChangeDetect(pm, options = {}) {
|
|
|
37
36
|
packageJsonDiff: `短路检测: "version" 本地为 ${packageJson.version}, 远程版本为 ${remotePackage?.version}`,
|
|
38
37
|
};
|
|
39
38
|
}
|
|
40
|
-
logger.debug('本地版本 (%s) 小于或等于远程版本 (%s)，尝试检测更改...', packageJson.version, remotePackage.version);
|
|
39
|
+
pm.logger.debug('本地版本 (%s) 小于或等于远程版本 (%s)，尝试检测更改...', packageJson.version, remotePackage.version);
|
|
41
40
|
const tarball = await cache.downloadTarball(packageJson.name, distTagInput);
|
|
42
|
-
const tempFolder = new TempWorkingFolder(pm.workspace, 'package-change-detect');
|
|
41
|
+
const tempFolder = new TempWorkingFolder(pm.workspace, 'package-change-detect', pm.logger);
|
|
43
42
|
const workingRoot = tempFolder.resolve('working');
|
|
44
43
|
await workingRoot.unpack(tarball);
|
|
45
44
|
await makePackageJsonOrderConsistence(workingRoot.path);
|
|
46
|
-
const gitrepo = new GitWorkingTree(workingRoot.path);
|
|
45
|
+
const gitrepo = new GitWorkingTree(workingRoot.path, pm.logger);
|
|
47
46
|
await gitrepo.init();
|
|
48
47
|
const pack = await pm.pack(tempFolder.joinpath('local-pack.tgz'));
|
|
49
|
-
logger.verbose(' --> %s', pack);
|
|
48
|
+
pm.logger.verbose(' --> %s', pack);
|
|
50
49
|
await workingRoot.unpack(pack);
|
|
51
|
-
logger.verbose(' unpacked successfully');
|
|
50
|
+
pm.logger.verbose(' unpacked successfully');
|
|
52
51
|
await makePackageJsonOrderConsistence(workingRoot.path);
|
|
53
52
|
const changedFiles = await gitrepo.commitChanges();
|
|
54
|
-
logger.verbose ` changed files: list<${changedFiles}>`;
|
|
53
|
+
pm.logger.verbose ` changed files: list<${changedFiles}>`;
|
|
55
54
|
let packageJsonDiff = '';
|
|
56
55
|
if (changedFiles.includes('package.json')) {
|
|
57
56
|
packageJsonDiff = await gitrepo.fileDiff('package.json');
|
|
58
|
-
logger.debug(` - package.json 文件的修改:\n${packageJsonDiff}`);
|
|
57
|
+
pm.logger.debug(` - package.json 文件的修改:\n${packageJsonDiff}`);
|
|
59
58
|
}
|
|
60
59
|
return { changedFiles, hasChange: changedFiles.length > 0, remoteVersion: remotePackage.version, packageJsonDiff };
|
|
61
60
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"detect-change-job.js","sourceRoot":"","sources":["../../../src/common/shared-jobs/detect-change-job.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"detect-change-job.js","sourceRoot":"","sources":["../../../src/common/shared-jobs/detect-change-job.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,3 @@
|
|
|
1
|
-
|
|
1
|
+
import { type IMyLogger } from '@idlebox/cli';
|
|
2
|
+
export declare function decompressPack(src: string, dest: string, logger?: IMyLogger): Promise<void>;
|
|
2
3
|
//# sourceMappingURL=decompress.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"decompress.d.ts","sourceRoot":"","sources":["../../../src/common/taball/decompress.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"decompress.d.ts","sourceRoot":"","sources":["../../../src/common/taball/decompress.ts"],"names":[],"mappings":"AAAA,OAAO,EAA2B,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AAOvE,wBAAsB,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,GAAE,SAAyB,iBAuChG"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
+
import { logger as defaultLogger } from '@idlebox/cli';
|
|
1
2
|
import { convertCatchedError } from '@idlebox/common';
|
|
2
|
-
import { logger } from '@idlebox/cli';
|
|
3
3
|
import { existsSync, unlinkSync } from 'node:fs';
|
|
4
4
|
import tgz from 'targz';
|
|
5
5
|
const packageFolder = /^package\//;
|
|
6
|
-
export async function decompressPack(src, dest) {
|
|
6
|
+
export async function decompressPack(src, dest, logger = defaultLogger) {
|
|
7
7
|
logger.debug(`解压文件: ${src}\n\u3000\u3000目录: ${dest}`);
|
|
8
8
|
await new Promise((resolve, reject) => {
|
|
9
9
|
if (!existsSync(src)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"decompress.js","sourceRoot":"","sources":["../../../src/common/taball/decompress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"decompress.js","sourceRoot":"","sources":["../../../src/common/taball/decompress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,aAAa,EAAkB,MAAM,cAAc,CAAC;AACvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACjD,OAAO,GAAG,MAAM,OAAO,CAAC;AAExB,MAAM,aAAa,GAAG,YAAY,CAAC;AAEnC,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,GAAW,EAAE,IAAY,EAAE,SAAoB,aAAa;IAChG,MAAM,CAAC,KAAK,CAAC,SAAS,GAAG,qBAAqB,IAAI,EAAE,CAAC,CAAC;IACtD,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC3C,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YACtB,MAAM,IAAI,KAAK,CAAC,2BAA2B,GAAG,EAAE,CAAC,CAAC;QACnD,CAAC;QAED,GAAG,CAAC,UAAU,CACb;YACC,GAAG;YACH,IAAI;YACJ,GAAG,EAAE;gBACJ,MAAM,CAAC,CAAC,EAAE,MAAM;oBACf,OAAO,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;gBAChC,CAAC;gBACD,GAAG,CAAC,MAAM;oBACT,IAAI,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;wBACrC,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;oBACtD,CAAC;yBAAM,CAAC;wBACP,MAAM,CAAC,IAAI,GAAG,EAAE,CAAC;oBAClB,CAAC;oBACD,OAAO,MAAM,CAAC;gBACf,CAAC;aACD;SACD,EACD,CAAC,CAAC,EAAE,EAAE;YACL,IAAI,CAAC,EAAE,CAAC;gBACP,OAAO,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;gBAC5C,IAAI,CAAC;oBACJ,UAAU,CAAC,GAAG,CAAC,CAAC;gBACjB,CAAC;gBAAC,MAAM,CAAC,CAAA,CAAC;gBACV,MAAM,CAAC,CAAC,CAAC,CAAC;YACX,CAAC;iBAAM,CAAC;gBACP,OAAO,EAAE,CAAC;YACX,CAAC;QACF,CAAC,CACD,CAAC;IACH,CAAC,CAAC,CAAC;IACH,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;AACtB,CAAC"}
|
|
@@ -1,6 +1,13 @@
|
|
|
1
|
+
import { type IMyLogger } from '@idlebox/cli';
|
|
1
2
|
import type { IncomingMessage } from 'node:http';
|
|
2
3
|
import type { Readable } from 'node:stream';
|
|
3
|
-
export declare
|
|
4
|
+
export declare class FileDownloader {
|
|
5
|
+
readonly logger: IMyLogger;
|
|
6
|
+
constructor(logger?: IMyLogger);
|
|
7
|
+
download(url: string, file: string): Promise<string>;
|
|
8
|
+
private http_stream;
|
|
9
|
+
private send_request;
|
|
10
|
+
}
|
|
4
11
|
export declare class HttpError extends Error {
|
|
5
12
|
readonly url: string;
|
|
6
13
|
readonly code: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-download.d.ts","sourceRoot":"","sources":["../../../src/common/taball/file-download.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"file-download.d.ts","sourceRoot":"","sources":["../../../src/common/taball/file-download.ts"],"names":[],"mappings":"AAAA,OAAO,EAA2B,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AAKvE,OAAO,KAAK,EAAuB,eAAe,EAAuB,MAAM,WAAW,CAAC;AAG3F,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAQ5C,qBAAa,cAAc;aACE,MAAM,EAAE,SAAS;gBAAjB,MAAM,GAAE,SAAyB;IAEhD,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;YA6BjC,WAAW;IA4BzB,OAAO,CAAC,YAAY;CA0DpB;AAgBD,qBAAa,SAAU,SAAQ,KAAK;aAElB,GAAG,EAAE,MAAM;aACX,IAAI,EAAE,MAAM;gBADZ,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EAC5B,GAAG,EAAE,MAAM;IAKZ,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,IAAI,SAAS;CAGrC;AAED,KAAK,OAAO,GAAG;IAAE,MAAM,EAAE,QAAQ,CAAA;CAAE,CAAC;AACpC,MAAM,MAAM,mBAAmB,GAAG,IAAI,CAAC,eAAe,EAAE,MAAM,QAAQ,CAAC,GAAG,OAAO,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { logger } from '@idlebox/cli';
|
|
1
|
+
import { logger as defaultLogger } from '@idlebox/cli';
|
|
2
2
|
import { sleep } from '@idlebox/common';
|
|
3
3
|
import { exists, streamPromise } from '@idlebox/node';
|
|
4
4
|
import { createWriteStream } from 'node:fs';
|
|
@@ -6,29 +6,115 @@ import { mkdir, readFile, rename, writeFile } from 'node:fs/promises';
|
|
|
6
6
|
import { get } from 'node:https';
|
|
7
7
|
import { dirname } from 'node:path';
|
|
8
8
|
import { createBrotliDecompress, createGunzip, createInflate } from 'node:zlib';
|
|
9
|
-
export
|
|
10
|
-
|
|
11
|
-
logger
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
9
|
+
export class FileDownloader {
|
|
10
|
+
logger;
|
|
11
|
+
constructor(logger = defaultLogger) {
|
|
12
|
+
this.logger = logger;
|
|
13
|
+
}
|
|
14
|
+
async download(url, file) {
|
|
15
|
+
const metadata = `${file}.meta.json`;
|
|
16
|
+
this.logger.debug `下载文件:\n 地址: long<${url}>\n 保存到: long<${file}>`;
|
|
17
|
+
let meta;
|
|
18
|
+
if ((await exists(metadata)) && (await exists(file))) {
|
|
19
|
+
try {
|
|
20
|
+
meta = JSON.parse(await readFile(metadata, 'utf-8'));
|
|
21
|
+
}
|
|
22
|
+
catch { }
|
|
23
|
+
if (meta?.url === url) {
|
|
24
|
+
this.logger.debug(' -> 已经下载');
|
|
25
|
+
return file;
|
|
26
|
+
}
|
|
16
27
|
}
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
28
|
+
const response = await this.http_stream(url);
|
|
29
|
+
await mkdir(dirname(file), { recursive: true });
|
|
30
|
+
const writeOut = createWriteStream(`${file}.downloading`);
|
|
31
|
+
await streamPromise(response.stream.pipe(writeOut));
|
|
32
|
+
meta = { headers: response.headers, url };
|
|
33
|
+
await writeFile(metadata, JSON.stringify(meta), 'utf-8');
|
|
34
|
+
await rename(`${file}.downloading`, file);
|
|
35
|
+
this.logger.debug(' -> 下载完成');
|
|
36
|
+
return file;
|
|
37
|
+
}
|
|
38
|
+
async http_stream(url, headers) {
|
|
39
|
+
let try_remain = 3;
|
|
40
|
+
let redirect_cnt = 0;
|
|
41
|
+
while (try_remain-- > 0) {
|
|
42
|
+
try {
|
|
43
|
+
return await this.send_request(url, headers || {});
|
|
44
|
+
}
|
|
45
|
+
catch (e) {
|
|
46
|
+
if (RedirectError.is(e)) {
|
|
47
|
+
redirect_cnt++;
|
|
48
|
+
if (redirect_cnt > 8) {
|
|
49
|
+
throw new HttpError(url, 0, '重定向次数过多');
|
|
50
|
+
}
|
|
51
|
+
this.logger.debug(`[http] 重定向到 ${e.location}`);
|
|
52
|
+
url = e.location;
|
|
53
|
+
try_remain++;
|
|
54
|
+
continue;
|
|
55
|
+
}
|
|
56
|
+
this.logger.error('获取 %s 失败 [剩余尝试次数 %s]', url, try_remain);
|
|
57
|
+
if (try_remain === 0)
|
|
58
|
+
throw e;
|
|
59
|
+
await sleep(2000);
|
|
60
|
+
}
|
|
21
61
|
}
|
|
62
|
+
throw new Error('不可能的错误');
|
|
63
|
+
}
|
|
64
|
+
send_request(url, headers) {
|
|
65
|
+
headers['Accept-Encoding'] = 'br,gzip,deflate';
|
|
66
|
+
return new Promise((resolve, reject) => {
|
|
67
|
+
this.logger.debug(`[http] 请求 ${url}`);
|
|
68
|
+
const request = get(url, { headers }, (response) => {
|
|
69
|
+
this.logger.debug(`[http] 响应 ${response.statusCode} [encoding: ${response.headers['content-encoding']}][${response.headers['content-length']} bytes]`);
|
|
70
|
+
if (response.statusCode === 200) {
|
|
71
|
+
const bytes = Number.parseInt(response.headers['content-length'] ?? '--', 10);
|
|
72
|
+
if (bytes > 5 * 1024 * 1024 && process.stderr.isTTY) {
|
|
73
|
+
let downloaded = 0;
|
|
74
|
+
response.on('data', (bs) => {
|
|
75
|
+
downloaded += bs.length;
|
|
76
|
+
process.stderr.write(`\x1B[2mdownload: ${downloaded} of ${bytes} bytes (${Math.round((downloaded / bytes) * 100)}%)\x1B[0m\r`);
|
|
77
|
+
});
|
|
78
|
+
response.on('end', () => {
|
|
79
|
+
process.stderr.write('\x1B[K');
|
|
80
|
+
});
|
|
81
|
+
}
|
|
82
|
+
let stream;
|
|
83
|
+
switch (response.headers['content-encoding']) {
|
|
84
|
+
case 'br':
|
|
85
|
+
stream = response.pipe(createBrotliDecompress());
|
|
86
|
+
break;
|
|
87
|
+
// Or, just use zlib.createUnzip() to handle both of the following cases:
|
|
88
|
+
case 'gzip':
|
|
89
|
+
stream = response.pipe(createGunzip());
|
|
90
|
+
break;
|
|
91
|
+
case 'deflate':
|
|
92
|
+
stream = response.pipe(createInflate());
|
|
93
|
+
break;
|
|
94
|
+
default:
|
|
95
|
+
stream = response;
|
|
96
|
+
break;
|
|
97
|
+
}
|
|
98
|
+
resolve(Object.assign(response, { stream }));
|
|
99
|
+
}
|
|
100
|
+
else if ((response.statusCode === 302 ||
|
|
101
|
+
response.statusCode === 301 ||
|
|
102
|
+
response.statusCode === 303 ||
|
|
103
|
+
response.statusCode === 307 ||
|
|
104
|
+
response.statusCode === 308) &&
|
|
105
|
+
response.headers.location) {
|
|
106
|
+
reject(new RedirectError(url, response.headers.location, response.statusCode));
|
|
107
|
+
}
|
|
108
|
+
else {
|
|
109
|
+
reject(new HttpError(url, response.statusCode, response.statusMessage));
|
|
110
|
+
}
|
|
111
|
+
});
|
|
112
|
+
request.on('error', (err) => {
|
|
113
|
+
reject(err);
|
|
114
|
+
});
|
|
115
|
+
request.end();
|
|
116
|
+
});
|
|
22
117
|
}
|
|
23
|
-
const response = await http_stream(url);
|
|
24
|
-
await mkdir(dirname(file), { recursive: true });
|
|
25
|
-
const writeOut = createWriteStream(`${file}.downloading`);
|
|
26
|
-
await streamPromise(response.stream.pipe(writeOut));
|
|
27
|
-
meta = { headers: response.headers, url };
|
|
28
|
-
await writeFile(metadata, JSON.stringify(meta), 'utf-8');
|
|
29
|
-
await rename(`${file}.downloading`, file);
|
|
30
|
-
logger.debug(' -> 下载完成');
|
|
31
|
-
return file;
|
|
32
118
|
}
|
|
33
119
|
class RedirectError extends Error {
|
|
34
120
|
location;
|
|
@@ -54,80 +140,4 @@ export class HttpError extends Error {
|
|
|
54
140
|
return obj instanceof HttpError;
|
|
55
141
|
}
|
|
56
142
|
}
|
|
57
|
-
async function http_stream(url, headers) {
|
|
58
|
-
let try_remain = 3;
|
|
59
|
-
let redirect_cnt = 0;
|
|
60
|
-
while (try_remain-- > 0) {
|
|
61
|
-
try {
|
|
62
|
-
return await send_request(url, headers || {});
|
|
63
|
-
}
|
|
64
|
-
catch (e) {
|
|
65
|
-
if (RedirectError.is(e)) {
|
|
66
|
-
redirect_cnt++;
|
|
67
|
-
if (redirect_cnt > 8) {
|
|
68
|
-
throw new HttpError(url, 0, '重定向次数过多');
|
|
69
|
-
}
|
|
70
|
-
logger.debug(`[http] 重定向到 ${e.location}`);
|
|
71
|
-
url = e.location;
|
|
72
|
-
try_remain++;
|
|
73
|
-
continue;
|
|
74
|
-
}
|
|
75
|
-
logger.error('获取 %s 失败 [剩余尝试次数 %s]', url, try_remain);
|
|
76
|
-
if (try_remain === 0)
|
|
77
|
-
throw e;
|
|
78
|
-
await sleep(2000);
|
|
79
|
-
}
|
|
80
|
-
}
|
|
81
|
-
throw new Error('不可能的错误');
|
|
82
|
-
}
|
|
83
|
-
function send_request(url, headers) {
|
|
84
|
-
headers['Accept-Encoding'] = 'br,gzip,deflate';
|
|
85
|
-
return new Promise((resolve, reject) => {
|
|
86
|
-
logger.debug(`[http] 请求 ${url}`);
|
|
87
|
-
const request = get(url, { headers }, (response) => {
|
|
88
|
-
logger.debug(`[http] 响应 ${response.statusCode} [encoding: ${response.headers['content-encoding']}][${response.headers['content-length']} bytes]`);
|
|
89
|
-
if (response.statusCode === 200) {
|
|
90
|
-
const bytes = Number.parseInt(response.headers['content-length'] ?? '--', 10);
|
|
91
|
-
if (bytes > 5 * 1024 * 1024 && process.stderr.isTTY) {
|
|
92
|
-
let downloaded = 0;
|
|
93
|
-
response.on('data', (bs) => {
|
|
94
|
-
downloaded += bs.length;
|
|
95
|
-
process.stderr.write(`\x1B[2mdownload: ${downloaded} of ${bytes} bytes (${Math.round((downloaded / bytes) * 100)}%)\x1B[0m\r`);
|
|
96
|
-
});
|
|
97
|
-
response.on('end', () => {
|
|
98
|
-
process.stderr.write('\x1B[K');
|
|
99
|
-
});
|
|
100
|
-
}
|
|
101
|
-
let stream;
|
|
102
|
-
switch (response.headers['content-encoding']) {
|
|
103
|
-
case 'br':
|
|
104
|
-
stream = response.pipe(createBrotliDecompress());
|
|
105
|
-
break;
|
|
106
|
-
// Or, just use zlib.createUnzip() to handle both of the following cases:
|
|
107
|
-
case 'gzip':
|
|
108
|
-
stream = response.pipe(createGunzip());
|
|
109
|
-
break;
|
|
110
|
-
case 'deflate':
|
|
111
|
-
stream = response.pipe(createInflate());
|
|
112
|
-
break;
|
|
113
|
-
default:
|
|
114
|
-
stream = response;
|
|
115
|
-
break;
|
|
116
|
-
}
|
|
117
|
-
resolve(Object.assign(response, { stream }));
|
|
118
|
-
}
|
|
119
|
-
else if ((response.statusCode === 302 || response.statusCode === 301 || response.statusCode === 303 || response.statusCode === 307 || response.statusCode === 308) &&
|
|
120
|
-
response.headers.location) {
|
|
121
|
-
reject(new RedirectError(url, response.headers.location, response.statusCode));
|
|
122
|
-
}
|
|
123
|
-
else {
|
|
124
|
-
reject(new HttpError(url, response.statusCode, response.statusMessage));
|
|
125
|
-
}
|
|
126
|
-
});
|
|
127
|
-
request.on('error', (err) => {
|
|
128
|
-
reject(err);
|
|
129
|
-
});
|
|
130
|
-
request.end();
|
|
131
|
-
});
|
|
132
|
-
}
|
|
133
143
|
//# sourceMappingURL=file-download.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-download.js","sourceRoot":"","sources":["../../../src/common/taball/file-download.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"file-download.js","sourceRoot":"","sources":["../../../src/common/taball/file-download.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import type { WorkspaceBase } from '@build-script/monorepo-lib';
|
|
2
|
+
import { type IMyLogger } from '@idlebox/cli';
|
|
2
3
|
export declare class TempWorkingFolder {
|
|
3
4
|
private readonly workspace;
|
|
5
|
+
readonly logger: IMyLogger;
|
|
4
6
|
readonly path: string;
|
|
5
7
|
private _exists;
|
|
6
|
-
constructor(workspace: WorkspaceBase, name: string, __internal_isChild?: boolean);
|
|
8
|
+
constructor(workspace: WorkspaceBase, name: string, logger?: IMyLogger, __internal_isChild?: boolean);
|
|
7
9
|
resolve(p0: string, ...paths: string[]): TempWorkingFolder;
|
|
8
10
|
joinpath(p0: string, ...paths: string[]): string;
|
|
9
11
|
mkdir(): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"temp-work-folder.d.ts","sourceRoot":"","sources":["../../src/common/temp-work-folder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"temp-work-folder.d.ts","sourceRoot":"","sources":["../../src/common/temp-work-folder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EAA2B,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AAWvE,qBAAa,iBAAiB;IAK5B,OAAO,CAAC,QAAQ,CAAC,SAAS;aAEV,MAAM,EAAE,SAAS;IANlC,SAAgB,IAAI,EAAE,MAAM,CAAC;IAC7B,OAAO,CAAC,OAAO,CAAS;gBAGN,SAAS,EAAE,aAAa,EACzC,IAAI,EAAE,MAAM,EACI,MAAM,GAAE,SAAyB,EACjD,kBAAkB,UAAQ;IAS3B,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,MAAM,EAAE;IAItC,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,MAAM,EAAE;IAQjC,KAAK;IAMX,IAAI,MAAM,YAET;IAEK,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,GAAG,UAAU,EAAE,OAAO,SAAU;;;;;;IAiBhF,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,SAAM;IAIlC,OAAO;CAQP"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
+
import { logger as defaultLogger } from '@idlebox/cli';
|
|
1
2
|
import { registerGlobalLifecycle } from '@idlebox/common';
|
|
2
3
|
import { writeJsonFile } from '@idlebox/json-edit';
|
|
3
|
-
import { logger } from '@idlebox/cli';
|
|
4
4
|
import { emptyDir } from '@idlebox/node';
|
|
5
5
|
import { randomBytes } from 'node:crypto';
|
|
6
6
|
import { rmSync } from 'node:fs';
|
|
@@ -10,10 +10,12 @@ import { isDebugMode } from './functions/cli.js';
|
|
|
10
10
|
import { decompressPack } from './taball/decompress.js';
|
|
11
11
|
export class TempWorkingFolder {
|
|
12
12
|
workspace;
|
|
13
|
+
logger;
|
|
13
14
|
path;
|
|
14
15
|
_exists = false;
|
|
15
|
-
constructor(workspace, name, __internal_isChild = false) {
|
|
16
|
+
constructor(workspace, name, logger = defaultLogger, __internal_isChild = false) {
|
|
16
17
|
this.workspace = workspace;
|
|
18
|
+
this.logger = logger;
|
|
17
19
|
if (!__internal_isChild) {
|
|
18
20
|
registerGlobalLifecycle(this);
|
|
19
21
|
name += `-${randomBytes(6).toString('hex')}`;
|
|
@@ -21,7 +23,7 @@ export class TempWorkingFolder {
|
|
|
21
23
|
this.path = resolve(workspace.temp, name);
|
|
22
24
|
}
|
|
23
25
|
resolve(p0, ...paths) {
|
|
24
|
-
return new TempWorkingFolder(this.workspace, this.joinpath(p0, ...paths), true);
|
|
26
|
+
return new TempWorkingFolder(this.workspace, this.joinpath(p0, ...paths), this.logger, true);
|
|
25
27
|
}
|
|
26
28
|
joinpath(p0, ...paths) {
|
|
27
29
|
const r = resolve(this.path, p0, ...paths);
|
|
@@ -31,7 +33,7 @@ export class TempWorkingFolder {
|
|
|
31
33
|
throw new Error(`路径不在临时目录内: ${r}`);
|
|
32
34
|
}
|
|
33
35
|
async mkdir() {
|
|
34
|
-
logger.debug
|
|
36
|
+
this.logger.debug `临时工作目录: long<${this.path}>`;
|
|
35
37
|
await mkdir(this.path, { recursive: true });
|
|
36
38
|
this._exists = true;
|
|
37
39
|
}
|
|
@@ -53,15 +55,15 @@ export class TempWorkingFolder {
|
|
|
53
55
|
return packageJson;
|
|
54
56
|
}
|
|
55
57
|
unpack(tarball, dest = '.') {
|
|
56
|
-
return decompressPack(tarball, resolve(this.path, dest));
|
|
58
|
+
return decompressPack(tarball, resolve(this.path, dest), this.logger);
|
|
57
59
|
}
|
|
58
60
|
dispose() {
|
|
59
61
|
if (!isDebugMode) {
|
|
60
|
-
logger.debug
|
|
62
|
+
this.logger.debug ` * 删除临时目录: long<${this.path}>`;
|
|
61
63
|
rmSync(this.path, { force: true, recursive: true });
|
|
62
64
|
}
|
|
63
65
|
else {
|
|
64
|
-
logger.debug
|
|
66
|
+
this.logger.debug ` * 由于是调试模式，不删除临时文件夹: long<${this.path}>`;
|
|
65
67
|
}
|
|
66
68
|
}
|
|
67
69
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"temp-work-folder.js","sourceRoot":"","sources":["../../src/common/temp-work-folder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"temp-work-folder.js","sourceRoot":"","sources":["../../src/common/temp-work-folder.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
* https://github.com/GongT/baobao
|
|
7
7
|
*
|
|
8
8
|
******************************************************************************/
|
|
9
|
-
export declare const self_package_version = "0.0.
|
|
9
|
+
export declare const self_package_version = "0.0.28";
|
|
10
10
|
export declare const self_package_name = "@build-script/package-tools";
|
|
11
11
|
export declare const self_package_repository = "https://github.com/GongT/baobao";
|
|
12
12
|
//# sourceMappingURL=version.generated.d.ts.map
|