cnpmcore 4.1.5 → 4.1.6
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/dist/app/common/adapter/binary/AbstractBinary.d.ts +1 -1
- package/dist/app/common/adapter/binary/AbstractBinary.js +1 -1
- package/dist/app/common/adapter/binary/PuppeteerBinary.d.ts +2 -1
- package/dist/app/common/adapter/binary/PuppeteerBinary.js +31 -61
- package/dist/app/core/service/BinarySyncerService.js +18 -3
- package/dist/app/port/controller/BinarySyncController.d.ts +5 -0
- package/dist/app/port/controller/BinarySyncController.js +32 -2
- package/dist/app/repository/BinaryRepository.d.ts +1 -0
- package/dist/app/repository/BinaryRepository.js +8 -1
- package/package.json +2 -2
|
@@ -20,7 +20,7 @@ export declare abstract class AbstractBinary {
|
|
|
20
20
|
protected logger: EggLogger;
|
|
21
21
|
protected httpclient: EggHttpClient;
|
|
22
22
|
abstract initFetch(binaryName: BinaryName): Promise<void>;
|
|
23
|
-
abstract fetch(dir: string, binaryName: BinaryName): Promise<FetchResult | undefined>;
|
|
23
|
+
abstract fetch(dir: string, binaryName: BinaryName, lastData?: Record<string, unknown>): Promise<FetchResult | undefined>;
|
|
24
24
|
finishFetch(_success: boolean, _binaryName: BinaryName): Promise<void>;
|
|
25
25
|
protected requestXml(url: string): Promise<string>;
|
|
26
26
|
protected requestJSON<T = any>(url: string, requestHeaders?: Record<string, string>): Promise<T>;
|
|
@@ -90,4 +90,4 @@ __decorate([
|
|
|
90
90
|
__metadata("design:type", Function)
|
|
91
91
|
], AbstractBinary.prototype, "httpclient", void 0);
|
|
92
92
|
export const BinaryAdapter = QualifierImplDecoratorUtil.generatorDecorator(AbstractBinary, BINARY_ADAPTER_ATTRIBUTE);
|
|
93
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
93
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQWJzdHJhY3RCaW5hcnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9hcHAvY29tbW9uL2FkYXB0ZXIvYmluYXJ5L0Fic3RyYWN0QmluYXJ5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7OztBQUFBLE9BQU8sRUFDTCxNQUFNLEVBQ04sMEJBQTBCLEdBRTNCLE1BQU0sYUFBYSxDQUFDO0FBUXJCLE1BQU0sU0FBUyxHQUFHLENBQUMsUUFBUSxFQUFFLE9BQU8sRUFBRSxPQUFPLENBQVUsQ0FBQztBQWdCeEQsTUFBTSxDQUFDLE1BQU0sd0JBQXdCLEdBQUcsTUFBTSxDQUFDLDBCQUEwQixDQUFDLENBQUM7QUFFM0UsTUFBTSxPQUFnQixjQUFjO0lBY2xDLDZEQUE2RDtJQUM3RCxLQUFLLENBQUMsV0FBVyxDQUFDLFFBQWlCLEVBQUUsV0FBdUI7UUFDMUQsMEJBQTBCO0lBQzVCLENBQUM7SUFFUyxLQUFLLENBQUMsVUFBVSxDQUFDLEdBQVc7UUFDcEMsTUFBTSxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsT0FBTyxFQUFFLEdBQUcsTUFBTSxJQUFJLENBQUMsVUFBVSxDQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUU7WUFDbkUsT0FBTyxFQUFFLE1BQU07WUFDZixjQUFjLEVBQUUsSUFBSTtZQUNwQixJQUFJLEVBQUUsSUFBSTtTQUNYLENBQUMsQ0FBQztRQUNILE1BQU0sR0FBRyxHQUFHLElBQUksQ0FBQyxRQUFRLEVBQVksQ0FBQztRQUN0QyxJQUFJLE1BQU0sS0FBSyxHQUFHLEVBQUUsQ0FBQztZQUNuQixJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FDZCxzRkFBc0YsRUFDdEYsR0FBRyxFQUNILE1BQU0sRUFDTixPQUFPLEVBQ1AsR0FBRyxDQUNKLENBQUM7WUFDRixPQUFPLEVBQUUsQ0FBQztRQUNaLENBQUM7UUFDRCxPQUFPLEdBQUcsQ0FBQztJQUNiLENBQUM7SUFFRCw2REFBNkQ7SUFDbkQsS0FBSyxD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
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { AbstractBinary, type FetchResult } from './AbstractBinary.js';
|
|
2
|
+
export declare const platforms: string[];
|
|
2
3
|
export declare class PuppeteerBinary extends AbstractBinary {
|
|
3
4
|
private dirItems?;
|
|
4
5
|
initFetch(): Promise<void>;
|
|
5
|
-
fetch(dir: string): Promise<FetchResult | undefined>;
|
|
6
|
+
fetch(dir: string, _binaryName: string, lastData?: Record<string, unknown>): Promise<FetchResult | undefined>;
|
|
6
7
|
private archiveName;
|
|
7
8
|
}
|
|
@@ -5,76 +5,23 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
5
5
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
6
6
|
};
|
|
7
7
|
import { SingletonProto } from '@eggjs/tegg';
|
|
8
|
+
import { XMLParser } from 'fast-xml-parser';
|
|
8
9
|
import { BinaryType } from '../../enum/Binary.js';
|
|
9
10
|
import { AbstractBinary, BinaryAdapter, } from './AbstractBinary.js';
|
|
11
|
+
export const platforms = ['Linux_x64', 'Mac', 'Mac_Arm', 'Win', 'Win_x64'];
|
|
10
12
|
let PuppeteerBinary = class PuppeteerBinary extends AbstractBinary {
|
|
11
13
|
async initFetch() {
|
|
12
14
|
this.dirItems = undefined;
|
|
13
15
|
}
|
|
14
|
-
async fetch(dir) {
|
|
16
|
+
async fetch(dir, _binaryName, lastData) {
|
|
15
17
|
if (!this.dirItems) {
|
|
16
|
-
const
|
|
17
|
-
const
|
|
18
|
+
const s3Url = 'https://chromium-browser-snapshots.storage.googleapis.com';
|
|
19
|
+
const chromiumRevisions = new Map();
|
|
18
20
|
this.dirItems = {};
|
|
19
21
|
this.dirItems['/'] = [];
|
|
20
|
-
const chromiumRevisions = new Map();
|
|
21
|
-
for (const version in data.versions) {
|
|
22
|
-
// find chromium versions
|
|
23
|
-
const pkg = data.versions[version];
|
|
24
|
-
const revision = pkg.puppeteer?.chromium_revision
|
|
25
|
-
? String(pkg.puppeteer.chromium_revision)
|
|
26
|
-
: '';
|
|
27
|
-
if (revision && !chromiumRevisions.has(revision)) {
|
|
28
|
-
chromiumRevisions.set(revision, data.time[version]);
|
|
29
|
-
}
|
|
30
|
-
}
|
|
31
|
-
// https://unpkg.com/puppeteer@5.1.0/lib/cjs/revisions.js
|
|
32
|
-
// https://unpkg.com/puppeteer@latest/lib/cjs/puppeteer/revisions.js
|
|
33
|
-
// exports.PUPPETEER_REVISIONS = {
|
|
34
|
-
// chromium: '768783',
|
|
35
|
-
// firefox: 'latest',
|
|
36
|
-
// };
|
|
37
|
-
const unpkgURL = 'https://unpkg.com/puppeteer-core@latest/lib/cjs/puppeteer/revisions.js';
|
|
38
|
-
const text = await this.requestXml(unpkgURL);
|
|
39
|
-
const m = /chromium:\s+'(\d+)',/.exec(text);
|
|
40
|
-
if (m && !chromiumRevisions.has(m[1])) {
|
|
41
|
-
chromiumRevisions.set(m[1], new Date().toISOString());
|
|
42
|
-
}
|
|
43
|
-
// download LAST_CHANGE
|
|
44
|
-
// https://github.com/chaopeng/chromium-downloader/blob/master/get-chromium#L28
|
|
45
|
-
const LAST_CHANGE_URL = 'https://www.googleapis.com/download/storage/v1/b/chromium-browser-snapshots/o/Linux_x64%2FLAST_CHANGE?alt=media';
|
|
46
|
-
const lastRevision = await this.requestXml(LAST_CHANGE_URL);
|
|
47
|
-
if (lastRevision) {
|
|
48
|
-
chromiumRevisions.set(lastRevision, new Date().toISOString());
|
|
49
|
-
}
|
|
50
|
-
// old versions
|
|
51
|
-
// v5.0.0
|
|
52
|
-
chromiumRevisions.set('756035', data.time['5.0.0']);
|
|
53
|
-
// v5.2.0
|
|
54
|
-
chromiumRevisions.set('768783', data.time['5.2.0']);
|
|
55
|
-
// v5.2.1
|
|
56
|
-
chromiumRevisions.set('782078', data.time['5.2.1']);
|
|
57
|
-
// v5.3.0
|
|
58
|
-
chromiumRevisions.set('800071', data.time['5.3.0']);
|
|
59
|
-
// v5.4.0
|
|
60
|
-
chromiumRevisions.set('809590', data.time['5.4.0']);
|
|
61
|
-
// v5.5.0
|
|
62
|
-
chromiumRevisions.set('818858', data.time['5.5.0']);
|
|
63
|
-
// v6.0.0
|
|
64
|
-
chromiumRevisions.set('843427', data.time['6.0.0']);
|
|
65
|
-
// "7.0.0"
|
|
66
|
-
chromiumRevisions.set('848005', data.time['7.0.0']);
|
|
67
|
-
// https://github.com/puppeteer/puppeteer/blob/v8.0.0/src/revisions.ts#L23
|
|
68
|
-
// "8.0.0":"2021-02-26T08:36:50.107Z"
|
|
69
|
-
chromiumRevisions.set('856583', data.time['8.0.0']);
|
|
70
|
-
// "9.0.0":"2021-04-21T11:27:32.513Z"
|
|
71
|
-
chromiumRevisions.set('869685', data.time['9.0.0']);
|
|
72
|
-
// "10.0.0":"2021-05-31T12:42:27.486Z"
|
|
73
|
-
chromiumRevisions.set('884014', data.time['10.0.0']);
|
|
74
|
-
// "11.0.0":"2021-11-03T09:29:12.751Z"
|
|
75
|
-
chromiumRevisions.set('901912', data.time['11.0.0']);
|
|
76
|
-
const platforms = ['Linux_x64', 'Mac', 'Mac_Arm', 'Win', 'Win_x64'];
|
|
77
22
|
for (const platform of platforms) {
|
|
23
|
+
const revision = lastData?.[platform];
|
|
24
|
+
let marker = revision ? `${platform}/${revision}/REVISIONS` : undefined;
|
|
78
25
|
this.dirItems['/'].push({
|
|
79
26
|
name: `${platform}/`,
|
|
80
27
|
date: new Date().toISOString(),
|
|
@@ -83,6 +30,29 @@ let PuppeteerBinary = class PuppeteerBinary extends AbstractBinary {
|
|
|
83
30
|
url: '',
|
|
84
31
|
});
|
|
85
32
|
this.dirItems[`/${platform}/`] = [];
|
|
33
|
+
do {
|
|
34
|
+
let requestUrl = s3Url + '?prefix=' + platform;
|
|
35
|
+
if (marker) {
|
|
36
|
+
requestUrl += '&marker=' + marker;
|
|
37
|
+
}
|
|
38
|
+
const xml = await this.requestXml(requestUrl);
|
|
39
|
+
const parser = new XMLParser();
|
|
40
|
+
const obj = parser.parse(xml);
|
|
41
|
+
if (obj.ListBucketResult.IsTruncated === true &&
|
|
42
|
+
obj.ListBucketResult.NextMarker) {
|
|
43
|
+
marker = obj.ListBucketResult.NextMarker;
|
|
44
|
+
}
|
|
45
|
+
else {
|
|
46
|
+
marker = undefined;
|
|
47
|
+
}
|
|
48
|
+
for (const content of obj.ListBucketResult.Contents) {
|
|
49
|
+
// /Linux_x64/1041455/REVISIONS
|
|
50
|
+
if (content.Key.endsWith('/REVISIONS')) {
|
|
51
|
+
const revision = content.Key.split('/')[1].trim();
|
|
52
|
+
chromiumRevisions.set(revision, content.LastModified);
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
} while (marker !== undefined);
|
|
86
56
|
}
|
|
87
57
|
for (const [revision, date] of chromiumRevisions.entries()) {
|
|
88
58
|
// https://github.com/puppeteer/puppeteer/blob/eebf452d38b79bb2ea1a1ba84c3d2ea6f2f9f899/src/node/BrowserFetcher.ts#L40
|
|
@@ -137,4 +107,4 @@ PuppeteerBinary = __decorate([
|
|
|
137
107
|
BinaryAdapter(BinaryType.Puppeteer)
|
|
138
108
|
], PuppeteerBinary);
|
|
139
109
|
export { PuppeteerBinary };
|
|
140
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
110
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUHVwcGV0ZWVyQmluYXJ5LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vYXBwL2NvbW1vbi9hZGFwdGVyL2JpbmFyeS9QdXBwZXRlZXJCaW5hcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUM3QyxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFFNUMsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ2xELE9BQU8sRUFDTCxjQUFjLEVBQ2QsYUFBYSxHQUdkLE1BQU0scUJBQXFCLENBQUM7QUFFN0IsTUFBTSxDQUFDLE1BQU0sU0FBUyxHQUFHLENBQUMsV0FBVyxFQUFFLEtBQUssRUFBRSxTQUFTLEVBQUUsS0FBSyxFQUFFLFNBQVMsQ0FBQyxDQUFDO0FBSXBFLElBQU0sZUFBZSxHQUFyQixNQUFNLGVBQWdCLFNBQVEsY0FBYztJQUtqRCxLQUFLLENBQUMsU0FBUztRQUNiLElBQUksQ0FBQyxRQUFRLEdBQUcsU0FBUyxDQUFDO0lBQzVCLENBQUM7SUFFRCxLQUFLLENBQUMsS0FBSyxDQUNULEdBQVcsRUFDWCxXQUFtQixFQUNuQixRQUFrQztRQUVsQyxJQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsRUFBRSxDQUFDO1lBQ25CLE1BQU0sS0FBSyxHQUFHLDJEQUEyRCxDQUFDO1lBQzFFLE1BQU0saUJBQWlCLEdBQUcsSUFBSSxHQUFHLEVBQWtCLENBQUM7WUFDcEQsSUFBSSxDQUFDLFFBQVEsR0FBRyxFQUFFLENBQUM7WUFDbkIsSUFBSSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsR0FBRyxFQUFFLENBQUM7WUFDeEIsS0FBSyxNQUFNLFFBQVEsSUFBSSxTQUFTLEVBQUUsQ0FBQztnQkFDakMsTUFBTSxRQUFRLEdBQUcsUUFBUSxFQUFFLENBQUMsUUFBUSxDQUFXLENBQUM7Z0JBQ2hELElBQUksTUFBTSxHQUFHLFFBQVEsQ0FBQyxDQUFDLENBQUMsR0FBRyxRQUFRLElBQUksUUFBUSxZQUFZLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQztnQkFDeEUsSUFBSSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUM7b0JBQ3RCLElBQUksRUFBRSxHQUFHLFFBQVEsR0FBRztvQkFDcEIsSUFBSSxFQUFFLElBQUksSUFBSSxFQUFFLENBQUMsV0FBVyxFQUFFO29CQUM5QixJQUFJLEVBQUUsR0FBRztvQkFDVCxLQUFLLEVBQUUsSUFBSTtvQkFDWCxHQUFHLEVBQUUsRUFBRTtpQkFDUixDQUFDLENBQUM7Z0JBQ0gsSUFBSSxDQUFDLFFBQVEsQ0FBQyxJQUFJLFFBQVEsR0FBRyxDQUFDLEdBQUcsRUFBRSxDQUFDO2dCQUNwQyxHQUFHLENBQUM7b0JBQ0YsSUFBSSxVQUFVLEdBQUcsS0FBSyxHQUFHLFVBQVUsR0FBRyxRQUFRLENBQUM7b0JBQy9DLElBQUksTUFBTSxFQUFFLENBQUM7d0JBQ1gsVUFBVSxJQUFJLFVBQVUsR0FBRyxNQUFNLENBQUM7b0JBQ3BDLENBQUM7b0JBQ0QsTUFBTSxHQUFHLEdBQUcsTUFBTSxJQUFJLENBQUMsVUFBVSxDQUFDLFVBQVUsQ0FBQyxDQUFDO29CQUM5QyxNQUFNLE1BQU0sR0FBRyxJQUFJLFNBQVMsRUFBRSxDQUFDO29CQUMvQixNQUFNLEdBQUcsR0FBRyxNQUFNLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDO29CQUM5QixJQUNFLEdBQUcsQ0FBQyxnQkFBZ0IsQ0FBQyxXQUFXLEtBQUssSUFBSTt3QkFDekMsR0FBRyxDQUFDLGdCQUFnQixDQUFDLFVBQVUsRUFDL0IsQ0FBQzt3QkFDRCxNQUFNLEdBQUcsR0FBRyxDQUFDLGdCQUFnQixDQUFDLFVBQVUsQ0FBQztvQkFDM0MsQ0FBQzt5QkFBTSxDQUFDO3dCQUNOLE1BQU0sR0FBRyxTQUFTLENBQUM7b0JBQ3JCLENBQUM7b0JBQ0QsS0FBSyxNQUFNLE9BQU8sSUFBSSxHQUFHLENBQUMsZ0JBQWdCLENBQUMsUUFBUSxFQUFFLENBQUM7d0JBQ3BELCtCQUErQjt3QkFDL0IsSUFBSSxPQUFPLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxZQUFZLENBQUMsRUFBRSxDQUFDOzRCQUN2QyxNQUFNLFFBQVEsR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLEVBQUUsQ0FBQzs0QkFDbEQsaUJBQWlCLENBQUMsR0FBRyxDQUFDLFFBQVEsRUFBRSxPQUFPLENBQUMsWUFBWSxDQUFDLENBQUM7d0JBQ3hELENBQUM7b0JBQ0gsQ0FBQztnQkFDSCxDQUFDLFFBQVEsTUFBTSxLQUFLLFNBQVMsRUFBRTtZQUNqQyxDQUFDO1lBRUQsS0FBSyxNQUFNLENBQUMsUUFBUSxFQUFFLElBQUksQ0FBQyxJQUFJLGlCQUFpQixDQUFDLE9BQU8sRUFBRSxFQUFFLENBQUM7Z0JBQzNELHNIQUFzSDtnQkFDdEgsWUFBWTtnQkFDWixnRUFBZ0U7Z0JBQ2hFLHdEQUF3RDtnQkFDeEQsMERBQTBEO2dCQUMxRCw4REFBOEQ7Z0JBQzlELEtBQUs7Z0JBQ0wsVUFBVTtnQkFDVixLQUFLLE1BQU0sUUFBUSxJQUFJLFNBQVMsRUFBRSxDQUFDO29CQUNqQyxJQUFJLENBQUMsUUFBUSxDQUFDLElBQUksUUFBUSxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUM7d0JBQ2xDLElBQUksRUFBRSxHQUFHLFFBQVEsR0FBRzt3QkFDcEIsSUFBSTt3QkFDSixJQUFJLEVBQUUsR0FBRzt3QkFDVCxLQUFLLEVBQUUsSUFBSTt3QkFDWCxHQUFHLEVBQUUsRUFBRTtxQkFDUixDQUFDLENBQUM7b0JBQ0gsTUFBTSxJQUFJLEdBQUcsR0FBRyxJQUFJLENBQUMsV0FBVyxDQUFDLFFBQVEsRUFBRSxRQUFRLENBQUMsTUFBTSxDQUFDO29CQUMzRCxJQUFJLENBQUMsUUFBUSxDQUFDLElBQUksUUFBUSxJQUFJLFFBQVEsR0FBRyxDQUFDLEdBQUc7d0JBQzNDOzRCQUNFLElBQUk7NEJBQ0osSUFBSTs0QkFDSixJQUFJLEVBQUUsR0FBRzs0QkFDVCxLQUFLLEVBQUUsS0FBSzs0QkFDWixHQUFHLEVBQUUsNkRBQTZELFFBQVEsSUFBSSxRQUFRLElBQUksSUFBSSxFQUFFOzRCQUNoRyxzQkFBc0IsRUFBRSxDQUFDLEdBQUcsQ0FBQzt5QkFDOUI7cUJBQ0YsQ0FBQztnQkFDSixDQUFDO1lBQ0gsQ0FBQztRQUNILENBQUM7UUFFRCxPQUFPLEVBQUUsS0FBSyxFQUFFLElBQUksQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLEVBQUUsVUFBVSxFQUFFLElBQUksRUFBRSxDQUFDO0lBQ3pELENBQUM7SUFFRCxzSEFBc0g7SUFDOUcsV0FBVyxDQUFDLFFBQWdCLEVBQUUsUUFBZ0I7UUFDcEQsSUFBSSxRQUFRLEtBQUssV0FBVztZQUFFLE9BQU8sY0FBYyxDQUFDO1FBQ3BELElBQUksUUFBUSxLQUFLLEtBQUssSUFBSSxRQUFRLEtBQUssU0FBUztZQUFFLE9BQU8sWUFBWSxDQUFDO1FBQ3RFLElBQUksUUFBUSxLQUFLLEtBQUssSUFBSSxRQUFRLEtBQUssU0FBUyxFQUFFLENBQUM7WUFDakQsMkNBQTJDO1lBQzNDLE9BQU8sTUFBTSxDQUFDLFFBQVEsQ0FBQyxRQUFRLEVBQUUsRUFBRSxDQUFDLEdBQUcsT0FBTztnQkFDNUMsQ0FBQyxDQUFDLFlBQVk7Z0JBQ2QsQ0FBQyxDQUFDLGNBQWMsQ0FBQztRQUNyQixDQUFDO1FBQ0QsT0FBTyxFQUFFLENBQUM7SUFDWixDQUFDO0NBQ0YsQ0FBQTtBQXZHWSxlQUFlO0lBRjNCLGNBQWMsRUFBRTtJQUNoQixhQUFhLENBQUMsVUFBVSxDQUFDLFNBQVMsQ0FBQztHQUN2QixlQUFlLENBdUczQiJ9
|
|
@@ -19,6 +19,7 @@ import { AbstractBinary, } from '../../common/adapter/binary/AbstractBinary.js';
|
|
|
19
19
|
import { AbstractService } from '../../common/AbstractService.js';
|
|
20
20
|
import { BinaryType } from '../../common/enum/Binary.js';
|
|
21
21
|
import { TaskState, TaskType } from '../../common/enum/Task.js';
|
|
22
|
+
import { platforms } from '../../common/adapter/binary/PuppeteerBinary.js';
|
|
22
23
|
function isoNow() {
|
|
23
24
|
return new Date().toISOString();
|
|
24
25
|
}
|
|
@@ -57,6 +58,20 @@ let BinarySyncerService = class BinarySyncerService extends AbstractService {
|
|
|
57
58
|
return await this.nfsAdapter.getDownloadUrlOrStream(binary.storePath);
|
|
58
59
|
}
|
|
59
60
|
async createTask(binaryName, lastData) {
|
|
61
|
+
// chromium-browser-snapshots 产物极大,完整遍历 s3 bucket 耗时会太长
|
|
62
|
+
// 必须从上次同步的 revision 之后开始遍历
|
|
63
|
+
// 如果需要补偿数据,可以
|
|
64
|
+
if (binaryName === 'chromium-browser-snapshots') {
|
|
65
|
+
lastData = lastData || {};
|
|
66
|
+
for (const platform of platforms) {
|
|
67
|
+
if (lastData[platform])
|
|
68
|
+
continue;
|
|
69
|
+
const binaryDir = await this.binaryRepository.findLatestBinaryDir('chromium-browser-snapshots', `/${platform}/`);
|
|
70
|
+
if (binaryDir) {
|
|
71
|
+
lastData[platform] = binaryDir.name.slice(0, -1);
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
}
|
|
60
75
|
try {
|
|
61
76
|
return await this.taskService.createTask(Task.createSyncBinary(binaryName, lastData), false);
|
|
62
77
|
}
|
|
@@ -115,9 +130,9 @@ let BinarySyncerService = class BinarySyncerService extends AbstractService {
|
|
|
115
130
|
await this.taskService.finishTask(task, TaskState.Fail, logs.join('\n'));
|
|
116
131
|
}
|
|
117
132
|
}
|
|
118
|
-
async syncDir(binaryAdapter, task, dir, parentIndex = '', latestVersionParent = '/') {
|
|
133
|
+
async syncDir(binaryAdapter, task, dir, parentIndex = '', latestVersionParent = '/', lastData) {
|
|
119
134
|
const binaryName = task.targetName;
|
|
120
|
-
const result = await binaryAdapter.fetch(dir, binaryName);
|
|
135
|
+
const result = await binaryAdapter.fetch(dir, binaryName, lastData);
|
|
121
136
|
let hasDownloadError = false;
|
|
122
137
|
let hasItems = false;
|
|
123
138
|
if (result && result.items.length > 0) {
|
|
@@ -307,4 +322,4 @@ BinarySyncerService = __decorate([
|
|
|
307
322
|
})
|
|
308
323
|
], BinarySyncerService);
|
|
309
324
|
export { BinarySyncerService };
|
|
310
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"BinarySyncerService.js","sourceRoot":"","sources":["../../../../app/core/service/BinarySyncerService.ts"],"names":[],"mappings":"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"}
|
|
325
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"BinarySyncerService.js","sourceRoot":"","sources":["../../../../app/core/service/BinarySyncerService.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,6 +23,11 @@ export declare class BinarySyncController extends AbstractController {
|
|
|
23
23
|
url: string;
|
|
24
24
|
modified: Date;
|
|
25
25
|
}[] | undefined>;
|
|
26
|
+
syncBinary(ctx: EggContext, binaryName: BinaryName, lastData?: Record<string, string>): Promise<{
|
|
27
|
+
ok: boolean;
|
|
28
|
+
taskId: string | undefined;
|
|
29
|
+
logPath: string | undefined;
|
|
30
|
+
}>;
|
|
26
31
|
showBinaryIndex(ctx: EggContext, binaryName: BinaryName): Promise<import("stream").Readable | {
|
|
27
32
|
id: string;
|
|
28
33
|
category: string;
|
|
@@ -10,12 +10,13 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
10
10
|
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
11
11
|
return function (target, key) { decorator(target, key, paramIndex); }
|
|
12
12
|
};
|
|
13
|
-
import { Context, HTTPController, HTTPMethod, HTTPMethodEnum, HTTPParam, Inject, } from '@eggjs/tegg';
|
|
13
|
+
import { Context, HTTPController, HTTPMethod, HTTPMethodEnum, HTTPParam, Inject, Middleware, HTTPBody, } from '@eggjs/tegg';
|
|
14
14
|
import path from 'node:path';
|
|
15
15
|
import { NotFoundError } from 'egg-errors';
|
|
16
16
|
import { AbstractController } from './AbstractController.js';
|
|
17
17
|
import binaries from '../../../config/binaries.js';
|
|
18
18
|
import { BinaryNameRule, BinarySubpathRule } from '../typebox.js';
|
|
19
|
+
import { AdminAccess } from '../middleware/AdminAccess.js';
|
|
19
20
|
let BinarySyncController = class BinarySyncController extends AbstractController {
|
|
20
21
|
async showBinaryHTML(ctx) {
|
|
21
22
|
ctx.type = 'html';
|
|
@@ -89,6 +90,22 @@ let BinarySyncController = class BinarySyncController extends AbstractController
|
|
|
89
90
|
ctx.attachment(name);
|
|
90
91
|
return urlOrStream;
|
|
91
92
|
}
|
|
93
|
+
async syncBinary(ctx, binaryName, lastData) {
|
|
94
|
+
// check binaryName valid
|
|
95
|
+
try {
|
|
96
|
+
ctx.tValidate(BinaryNameRule, binaryName);
|
|
97
|
+
}
|
|
98
|
+
catch {
|
|
99
|
+
throw new NotFoundError(`Binary "${binaryName}" not found`);
|
|
100
|
+
}
|
|
101
|
+
this.logger.info('SyncBinary: %s, lastData: %j', binaryName, lastData);
|
|
102
|
+
const task = await this.binarySyncerService.createTask(binaryName, lastData);
|
|
103
|
+
return {
|
|
104
|
+
ok: true,
|
|
105
|
+
taskId: task?.taskId,
|
|
106
|
+
logPath: task?.logPath,
|
|
107
|
+
};
|
|
108
|
+
}
|
|
92
109
|
async showBinaryIndex(ctx, binaryName) {
|
|
93
110
|
// check binaryName valid
|
|
94
111
|
try {
|
|
@@ -149,6 +166,19 @@ __decorate([
|
|
|
149
166
|
__metadata("design:paramtypes", [Object, String, String]),
|
|
150
167
|
__metadata("design:returntype", Promise)
|
|
151
168
|
], BinarySyncController.prototype, "showBinary", null);
|
|
169
|
+
__decorate([
|
|
170
|
+
HTTPMethod({
|
|
171
|
+
path: '/-/binary/:binaryName/sync',
|
|
172
|
+
method: HTTPMethodEnum.POST,
|
|
173
|
+
}),
|
|
174
|
+
Middleware(AdminAccess),
|
|
175
|
+
__param(0, Context()),
|
|
176
|
+
__param(1, HTTPParam()),
|
|
177
|
+
__param(2, HTTPBody()),
|
|
178
|
+
__metadata("design:type", Function),
|
|
179
|
+
__metadata("design:paramtypes", [Object, String, Object]),
|
|
180
|
+
__metadata("design:returntype", Promise)
|
|
181
|
+
], BinarySyncController.prototype, "syncBinary", null);
|
|
152
182
|
__decorate([
|
|
153
183
|
HTTPMethod({
|
|
154
184
|
path: '/-/binary/:binaryName(@[^/]{1,220}/[^/]{1,220}|[^@/]{1,220})',
|
|
@@ -164,4 +194,4 @@ BinarySyncController = __decorate([
|
|
|
164
194
|
HTTPController()
|
|
165
195
|
], BinarySyncController);
|
|
166
196
|
export { BinarySyncController };
|
|
167
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
197
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQmluYXJ5U3luY0NvbnRyb2xsZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9hcHAvcG9ydC9jb250cm9sbGVyL0JpbmFyeVN5bmNDb250cm9sbGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7OztBQUFBLE9BQU8sRUFFTCxPQUFPLEVBQ1AsY0FBYyxFQUNkLFVBQVUsRUFDVixjQUFjLEVBQ2QsU0FBUyxFQUNULE1BQU0sRUFDTixVQUFVLEVBQ1YsUUFBUSxHQUNULE1BQU0sYUFBYSxDQUFDO0FBQ3JCLE9BQU8sSUFBSSxNQUFNLFdBQVcsQ0FBQztBQUM3QixPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sWUFBWSxDQUFDO0FBRTNDLE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRzdELE9BQU8sUUFBNkIsTUFBTSw2QkFBNkIsQ0FBQztBQUN4RSxPQUFPLEVBQUUsY0FBYyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQ2xFLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUdwRCxJQUFNLG9CQUFvQixHQUExQixNQUFNLG9CQUFxQixTQUFRLGtCQUFrQjtJQVFwRCxBQUFOLEtBQUssQ0FBQyxjQUFjLENBQVksR0FBZTtRQUM3QyxHQUFHLENBQUMsSUFBSSxHQUFHLE1BQU0sQ0FBQztRQUNsQixPQUFPLEdBQUcsQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDO0lBQzVCLENBQUM7SUFNSyxBQUFOLEtBQUssQ0FBQyxZQUFZO1FBQ2hCLE9BQU8sTUFBTSxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLFVBQVUsRUFBRSxZQUFZLENBQUMsRUFBRSxFQUFFO1lBQ2pFLE9BQU87Z0JBQ0wsSUFBSSxFQUFFLEdBQUcsVUFBVSxHQUFHO2dCQUN0QixRQUFRLEVBQUUsR0FBRyxZQUFZLENBQUMsUUFBUSxHQUFH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
|
|
@@ -5,4 +5,5 @@ export declare class BinaryRepository extends AbstractRepository {
|
|
|
5
5
|
saveBinary(binary: BinaryEntity): Promise<void>;
|
|
6
6
|
findBinary(category: string, parent: string, name: string): Promise<BinaryEntity | null>;
|
|
7
7
|
listBinaries(category: string, parent: string): Promise<BinaryEntity[]>;
|
|
8
|
+
findLatestBinaryDir(category: string, parent: string): Promise<BinaryEntity | null>;
|
|
8
9
|
}
|
|
@@ -34,6 +34,13 @@ let BinaryRepository = class BinaryRepository extends AbstractRepository {
|
|
|
34
34
|
const models = await this.Binary.find({ category, parent });
|
|
35
35
|
return models.map(model => ModelConvertor.convertModelToEntity(model, BinaryEntity));
|
|
36
36
|
}
|
|
37
|
+
async findLatestBinaryDir(category, parent) {
|
|
38
|
+
const model = await this.Binary.findOne({ category, parent }).order('gmt_create', 'desc');
|
|
39
|
+
if (model) {
|
|
40
|
+
return ModelConvertor.convertModelToEntity(model, BinaryEntity);
|
|
41
|
+
}
|
|
42
|
+
return null;
|
|
43
|
+
}
|
|
37
44
|
};
|
|
38
45
|
__decorate([
|
|
39
46
|
Inject(),
|
|
@@ -45,4 +52,4 @@ BinaryRepository = __decorate([
|
|
|
45
52
|
})
|
|
46
53
|
], BinaryRepository);
|
|
47
54
|
export { BinaryRepository };
|
|
48
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
55
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQmluYXJ5UmVwb3NpdG9yeS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL2FwcC9yZXBvc2l0b3J5L0JpbmFyeVJlcG9zaXRvcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7O0FBQUEsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLEVBQUUsY0FBYyxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBRWxFLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUUxRCxPQUFPLEVBQUUsTUFBTSxJQUFJLFlBQVksRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQ2xFLE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBS3RELElBQU0sZ0JBQWdCLEdBQXRCLE1BQU0sZ0JBQWlCLFNBQVEsa0JBQWtCO0lBSXRELEtBQUssQ0FBQyxVQUFVLENBQUMsTUFBb0I7UUFDbkMsSUFBSSxNQUFNLENBQUMsRUFBRSxFQUFFLENBQUM7WUFDZCxNQUFNLEtBQUssR0FBRyxNQUFNLElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLEVBQUUsRUFBRSxFQUFFLE1BQU0sQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1lBQzNELElBQUksQ0FBQyxLQUFLO2dCQUFFLE9BQU87WUFDbkIsTUFBTSxjQUFjLENBQUMsaUJBQWlCLENBQ3BDLE1BQTRDLEVBQzVDLEtBQUssQ0FDTixDQUFDO1FBQ0osQ0FBQzthQUFNLENBQUM7WUFDTixNQUFNLEtBQUssR0FBRyxNQUFNLGNBQWMsQ0FBQyxvQkFBb0IsQ0FDckQsTUFBNEMsRUFDNUMsSUFBSSxDQUFDLE1BQU0sQ0FDWixDQUFDO1lBQ0YsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQ2Qsd0RBQXdELEVBQ3hELEtBQUssQ0FBQyxFQUFFLEVBQ1IsS0FBSyxDQUFDLFFBQVEsQ0FDZixDQUFDO1FBQ0osQ0FBQztJQUNILENBQUM7SUFFRCxLQUFLLENBQUMsVUFBVSxDQUFDLFFBQWdCLEVBQUUsTUFBYyxFQUFFLElBQVk7UUFDN0QsTUFBTSxLQUFLLEdBQUcsTUFBTSxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxFQUFFLFFBQVEsRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztRQUNwRSxJQUFJLEtBQUs7WUFBRSxPQUFPLGNBQWMsQ0FBQyxvQkFBb0IsQ0FBQyxLQUFLLEVBQUUsWUFBWSxDQUFDLENBQUM7UUFDM0UsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBRUQsS0FBSyxDQUFDLFlBQVksQ0FDaEIsUUFBZ0IsRUFDaEIsTUFBYztRQUVkLE1BQU0sTUFBTSxHQUFHLE1BQU0sSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsRUFBRSxRQUFRLEVBQUUsTUFBTSxFQUFFLENBQUMsQ0FBQztRQUM1RCxPQUFPLE1BQU0sQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FDeEIsY0FBYyxDQUFDLG9CQUFvQixDQUFDLEtBQUssRUFBRSxZQUFZLENBQUMsQ0FDekQsQ0FBQztJQUNKLENBQUM7SUFFRCxLQUFLLENBQUMsbUJBQW1CLENBQ3ZCLFFBQWdCLEVBQ2hCLE1BQWM7UUFFZCxNQUFNLEtBQUssR0FBRyxNQUFNLElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLEVBQUUsUUFBUSxFQUFFLE1BQU0sRUFBRSxDQUFDLENBQUMsS0FBSyxDQUNqRSxZQUFZLEVBQ1osTUFBTSxDQUNQLENBQUM7UUFDRixJQUFJLEtBQUssRUFBRSxDQUFDO1lBQ1YsT0FBTyxjQUFjLENBQUMsb0JBQW9CLENBQUMsS0FBSyxFQUFFLFlBQVksQ0FBQyxDQUFDO1FBQ2xFLENBQUM7UUFDRCxPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7Q0FDRixDQUFBO0FBcERrQjtJQURoQixNQUFNLEVBQUU7O2dEQUNtQztBQUZqQyxnQkFBZ0I7SUFINUIsY0FBYyxDQUFDO1FBQ2QsV0FBVyxFQUFFLFdBQVcsQ0FBQyxNQUFNO0tBQ2hDLENBQUM7R0FDVyxnQkFBZ0IsQ0FzRDVCIn0=
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "cnpmcore",
|
|
3
|
-
"version": "4.1.
|
|
3
|
+
"version": "4.1.6",
|
|
4
4
|
"description": "Private NPM Registry for Enterprise",
|
|
5
5
|
"files": [
|
|
6
6
|
"dist/**/*"
|
|
@@ -110,6 +110,7 @@
|
|
|
110
110
|
"egg-typebox-validate": "^3.0.0",
|
|
111
111
|
"egg-view-nunjucks": "^2.3.0",
|
|
112
112
|
"eggjs-elasticsearch": "^0.0.6",
|
|
113
|
+
"fast-xml-parser": "^5.0.9",
|
|
113
114
|
"fs-cnpm": "^2.4.0",
|
|
114
115
|
"ioredis": "^5.3.1",
|
|
115
116
|
"leoric": "^2.12.3",
|
|
@@ -122,7 +123,6 @@
|
|
|
122
123
|
"p-map": "^4.0.0",
|
|
123
124
|
"pg": "^8.13.1",
|
|
124
125
|
"read-env-value": "^1.0.0",
|
|
125
|
-
"s3-cnpmcore": "^1.1.2",
|
|
126
126
|
"semver": "^7.3.5",
|
|
127
127
|
"ssri": "^8.0.1",
|
|
128
128
|
"type-fest": "^2.5.3",
|