cnpmcore 4.21.1 → 4.22.1
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/FirefoxBinary.d.ts +1 -0
- package/dist/app/common/adapter/binary/FirefoxBinary.js +169 -98
- package/dist/app/common/typing.d.ts +0 -6
- package/dist/config/binaries.d.ts +10 -0
- package/dist/config/binaries.js +11 -1
- package/dist/config/config.default.d.ts +2 -3
- package/dist/config/config.default.js +2 -2
- package/dist/config/config.unittest.js +5 -3
- package/dist/config/database.js +6 -1
- package/package.json +11 -12
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { type BinaryName } from '../../../../config/binaries.ts';
|
|
2
2
|
import { AbstractBinary, type FetchResult } from './AbstractBinary.ts';
|
|
3
3
|
export declare class FirefoxBinary extends AbstractBinary {
|
|
4
|
+
#private;
|
|
4
5
|
initFetch(): Promise<void>;
|
|
5
6
|
fetch(dir: string, binaryName: BinaryName): Promise<FetchResult | undefined>;
|
|
6
7
|
}
|
|
@@ -4,131 +4,202 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
4
4
|
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
5
5
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
6
6
|
};
|
|
7
|
+
var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
|
|
8
|
+
if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
|
|
9
|
+
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
|
|
10
|
+
return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
|
|
11
|
+
};
|
|
12
|
+
var _FirefoxBinary_instances, _FirefoxBinary_fetchRootDir, _FirefoxBinary_parseProductDetails, _FirefoxBinary_fetchSubDir;
|
|
7
13
|
import { basename } from 'node:path';
|
|
8
14
|
import { SingletonProto } from 'egg';
|
|
9
15
|
import binaries from "../../../../config/binaries.js";
|
|
10
16
|
import { BinaryType } from "../../enum/Binary.js";
|
|
11
17
|
import { AbstractBinary, BinaryAdapter } from "./AbstractBinary.js";
|
|
18
|
+
// Mozilla product-details API for listing Firefox versions
|
|
19
|
+
// https://product-details.mozilla.org/1.0/firefox.json
|
|
20
|
+
const PRODUCT_DETAILS_URL = 'https://product-details.mozilla.org/1.0/firefox.json';
|
|
12
21
|
let FirefoxBinary = class FirefoxBinary extends AbstractBinary {
|
|
22
|
+
constructor() {
|
|
23
|
+
super(...arguments);
|
|
24
|
+
_FirefoxBinary_instances.add(this);
|
|
25
|
+
}
|
|
13
26
|
async initFetch() {
|
|
14
27
|
// do nothing
|
|
15
28
|
return;
|
|
16
29
|
}
|
|
17
30
|
// Only fetch Firefox versions >= 100.0.0 to avoid too old versions
|
|
18
31
|
async fetch(dir, binaryName) {
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
const
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
32
|
+
// For root directory, use Mozilla's product-details JSON API
|
|
33
|
+
// This is more reliable than parsing the large HTML directory listing
|
|
34
|
+
if (dir === '/') {
|
|
35
|
+
return await __classPrivateFieldGet(this, _FirefoxBinary_instances, "m", _FirefoxBinary_fetchRootDir).call(this, binaryName);
|
|
36
|
+
}
|
|
37
|
+
return await __classPrivateFieldGet(this, _FirefoxBinary_instances, "m", _FirefoxBinary_fetchSubDir).call(this, dir, binaryName);
|
|
38
|
+
}
|
|
39
|
+
};
|
|
40
|
+
_FirefoxBinary_instances = new WeakSet();
|
|
41
|
+
_FirefoxBinary_fetchRootDir =
|
|
42
|
+
// Use Mozilla's product-details JSON API to list Firefox versions
|
|
43
|
+
async function _FirefoxBinary_fetchRootDir(binaryName) {
|
|
44
|
+
const binaryConfig = binaries[binaryName];
|
|
45
|
+
const data = await this.requestJSON(PRODUCT_DETAILS_URL);
|
|
46
|
+
const items = __classPrivateFieldGet(this, _FirefoxBinary_instances, "m", _FirefoxBinary_parseProductDetails).call(this, data, binaryConfig.options?.ignoreDownloadStatuses);
|
|
47
|
+
return { items, nextParams: null };
|
|
48
|
+
};
|
|
49
|
+
_FirefoxBinary_parseProductDetails = function _FirefoxBinary_parseProductDetails(data, ignoreDownloadStatuses) {
|
|
50
|
+
const versionSet = new Set();
|
|
51
|
+
for (const release of Object.values(data.releases)) {
|
|
52
|
+
const version = release.version;
|
|
53
|
+
versionSet.add(version);
|
|
54
|
+
}
|
|
55
|
+
const items = [];
|
|
56
|
+
for (const version of versionSet) {
|
|
57
|
+
// Filter out old Firefox versions (< 100.0.0)
|
|
58
|
+
const match = /^(\d+)/.exec(version);
|
|
59
|
+
if (match) {
|
|
60
|
+
const major = Number.parseInt(match[1]);
|
|
61
|
+
if (major < 100) {
|
|
62
|
+
continue;
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
const name = `${version}/`;
|
|
66
|
+
items.push({
|
|
67
|
+
name,
|
|
68
|
+
isDir: true,
|
|
69
|
+
url: '',
|
|
70
|
+
size: '-',
|
|
71
|
+
date: '-',
|
|
72
|
+
ignoreDownloadStatuses,
|
|
73
|
+
});
|
|
74
|
+
}
|
|
75
|
+
// Add special directories
|
|
76
|
+
for (const special of ['latest/', 'latest-beta/', 'latest-esr/']) {
|
|
77
|
+
items.push({
|
|
78
|
+
name: special,
|
|
79
|
+
isDir: true,
|
|
80
|
+
url: '',
|
|
81
|
+
size: '-',
|
|
82
|
+
date: '-',
|
|
83
|
+
ignoreDownloadStatuses,
|
|
84
|
+
});
|
|
85
|
+
}
|
|
86
|
+
return items;
|
|
87
|
+
};
|
|
88
|
+
_FirefoxBinary_fetchSubDir =
|
|
89
|
+
// Parse Mozilla archive HTML directory listing for subdirectories
|
|
90
|
+
async function _FirefoxBinary_fetchSubDir(dir, binaryName) {
|
|
91
|
+
const binaryConfig = binaries[binaryName];
|
|
92
|
+
const url = `${binaryConfig.distUrl}${dir}`;
|
|
93
|
+
const html = await this.requestXml(url);
|
|
94
|
+
// Mozilla archive has format like:
|
|
95
|
+
// <tr>
|
|
96
|
+
// <td>Dir</td>
|
|
97
|
+
// <td><a href="/pub/firefox/releases/131.0.3/update/">update/</a></td>
|
|
98
|
+
// <td></td>
|
|
99
|
+
// <td></td>
|
|
100
|
+
// </tr>
|
|
101
|
+
// <tr>
|
|
102
|
+
// <td>File</td>
|
|
103
|
+
// <td><a href="/pub/firefox/releases/131.0.3/SHA256SUMS.asc">SHA256SUMS.asc</a></td>
|
|
104
|
+
// <td>833</td>
|
|
105
|
+
// <td>12-Apr-2025 08:52</td>
|
|
106
|
+
// </tr>
|
|
107
|
+
// Parse Mozilla directory listing format - handles two different formats:
|
|
108
|
+
// Format 1 (main index): <td><a href="/path/">name/</a></td>
|
|
109
|
+
// Format 2 (version dir): <td>Type</td><td><a href="/path/">name</a></td><td>size</td><td>date</td>
|
|
110
|
+
// Try the detailed format first (with Type/Size/Date columns)
|
|
111
|
+
const detailedRe = /<tr>\s*<td>(Dir|File)<\/td>\s*<td><a href="([^"]+?)"[^>]*?>[^<]+?<\/a><\/td>\s*<td>([^<]*?)<\/td>\s*<td>([^<]*?)<\/td>\s*<\/tr>/gi;
|
|
112
|
+
const detailedMatches = Array.from(html.matchAll(detailedRe));
|
|
113
|
+
let matchs;
|
|
114
|
+
let useDetailedFormat = false;
|
|
115
|
+
if (detailedMatches.length > 0) {
|
|
116
|
+
// Use detailed format
|
|
117
|
+
matchs = detailedMatches;
|
|
118
|
+
useDetailedFormat = true;
|
|
119
|
+
}
|
|
120
|
+
else {
|
|
121
|
+
// Fallback to simple format
|
|
122
|
+
const simpleRe = /<td><a href="([^"]+?)"[^>]*?>[^<]+?<\/a><\/td>/gi;
|
|
123
|
+
matchs = Array.from(html.matchAll(simpleRe));
|
|
124
|
+
}
|
|
125
|
+
const items = [];
|
|
126
|
+
for (const m of matchs) {
|
|
127
|
+
let href;
|
|
128
|
+
let isDir;
|
|
129
|
+
let size;
|
|
130
|
+
let date;
|
|
131
|
+
if (useDetailedFormat) {
|
|
132
|
+
// Detailed format: [fullMatch, type, href, size, date]
|
|
133
|
+
const type = m[1]; // "Dir" or "File"
|
|
134
|
+
href = m[2];
|
|
135
|
+
size = m[3].trim() || '-';
|
|
136
|
+
date = m[4].trim() || '-';
|
|
137
|
+
isDir = type === 'Dir';
|
|
47
138
|
}
|
|
48
139
|
else {
|
|
49
|
-
//
|
|
50
|
-
|
|
51
|
-
|
|
140
|
+
// Simple format: [fullMatch, href]
|
|
141
|
+
href = m[1];
|
|
142
|
+
isDir = href.endsWith('/');
|
|
143
|
+
size = '-';
|
|
144
|
+
date = '-';
|
|
52
145
|
}
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
href = m[2];
|
|
63
|
-
size = m[3].trim() || '-';
|
|
64
|
-
date = m[4].trim() || '-';
|
|
65
|
-
isDir = type === 'Dir';
|
|
66
|
-
}
|
|
67
|
-
else {
|
|
68
|
-
// Simple format: [fullMatch, href]
|
|
69
|
-
href = m[1];
|
|
70
|
-
isDir = href.endsWith('/');
|
|
71
|
-
size = '-';
|
|
72
|
-
date = '-';
|
|
73
|
-
}
|
|
74
|
-
// Extract the name from the href path
|
|
75
|
-
// href could be "/pub/firefox/releases/130.0/" or just "130.0/"
|
|
76
|
-
let name = href;
|
|
77
|
-
if (href.startsWith('/')) {
|
|
78
|
-
// Extract the last part of the path
|
|
79
|
-
const parts = href.split('/').filter(Boolean);
|
|
80
|
-
name = parts[parts.length - 1] ?? '';
|
|
81
|
-
if (href.endsWith('/')) {
|
|
82
|
-
name += '/';
|
|
83
|
-
}
|
|
146
|
+
// Extract the name from the href path
|
|
147
|
+
// href could be "/pub/firefox/releases/130.0/" or just "130.0/"
|
|
148
|
+
let name = href;
|
|
149
|
+
if (href.startsWith('/')) {
|
|
150
|
+
// Extract the last part of the path
|
|
151
|
+
const parts = href.split('/').filter(Boolean);
|
|
152
|
+
name = parts[parts.length - 1] ?? '';
|
|
153
|
+
if (href.endsWith('/')) {
|
|
154
|
+
name += '/';
|
|
84
155
|
}
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
}
|
|
103
|
-
catch {
|
|
104
|
-
// If version parsing fails, skip this directory
|
|
105
|
-
continue;
|
|
156
|
+
}
|
|
157
|
+
if (!isDir) {
|
|
158
|
+
// Keep the full name for files
|
|
159
|
+
name = basename(name);
|
|
160
|
+
}
|
|
161
|
+
// Skip parent directory links
|
|
162
|
+
if (name === '../' || href === '/pub/firefox/' || href.endsWith('/..') || href === '/pub/firefox/releases/')
|
|
163
|
+
continue;
|
|
164
|
+
// Filter out old Firefox versions (< 100.0.0) for directories - apply to main index (root directory)
|
|
165
|
+
if (isDir && name !== '../' && dir === '/') {
|
|
166
|
+
const versionName = name.slice(0, -1); // Remove trailing '/'
|
|
167
|
+
// Skip non-version directories that are just special names
|
|
168
|
+
if (/^\d+\.\d+/.test(versionName)) {
|
|
169
|
+
try {
|
|
170
|
+
const major = Number.parseInt(versionName.split('.')[0]);
|
|
171
|
+
if (major < 100) {
|
|
172
|
+
continue; // Skip versions < 100.0.0
|
|
106
173
|
}
|
|
107
174
|
}
|
|
108
|
-
|
|
109
|
-
|
|
175
|
+
catch {
|
|
176
|
+
// If version parsing fails, skip this directory
|
|
110
177
|
continue;
|
|
111
178
|
}
|
|
112
179
|
}
|
|
113
|
-
|
|
114
|
-
if (
|
|
180
|
+
// Also skip named directories that aren't version numbers
|
|
181
|
+
else if (!['latest', 'latest-beta', 'latest-esr'].includes(versionName)) {
|
|
115
182
|
continue;
|
|
116
|
-
|
|
117
|
-
name,
|
|
118
|
-
isDir,
|
|
119
|
-
url: fileUrl,
|
|
120
|
-
size,
|
|
121
|
-
date,
|
|
122
|
-
ignoreDownloadStatuses: binaryConfig.options?.ignoreDownloadStatuses,
|
|
123
|
-
};
|
|
124
|
-
items.push(item);
|
|
183
|
+
}
|
|
125
184
|
}
|
|
126
|
-
|
|
185
|
+
const fileUrl = isDir ? '' : `${url}${name}`;
|
|
186
|
+
if (binaryConfig.ignoreFiles?.includes(`${dir}${name}`))
|
|
187
|
+
continue;
|
|
188
|
+
const item = {
|
|
189
|
+
name,
|
|
190
|
+
isDir,
|
|
191
|
+
url: fileUrl,
|
|
192
|
+
size,
|
|
193
|
+
date,
|
|
194
|
+
ignoreDownloadStatuses: binaryConfig.options?.ignoreDownloadStatuses,
|
|
195
|
+
};
|
|
196
|
+
items.push(item);
|
|
127
197
|
}
|
|
198
|
+
return { items, nextParams: null };
|
|
128
199
|
};
|
|
129
200
|
FirefoxBinary = __decorate([
|
|
130
201
|
SingletonProto(),
|
|
131
202
|
BinaryAdapter(BinaryType.Firefox)
|
|
132
203
|
], FirefoxBinary);
|
|
133
204
|
export { FirefoxBinary };
|
|
134
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
205
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRmlyZWZveEJpbmFyeS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL2FwcC9jb21tb24vYWRhcHRlci9iaW5hcnkvRmlyZWZveEJpbmFyeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7QUFBQSxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBRXJDLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFckMsT0FBTyxRQUE2QixNQUFNLGdDQUFnQyxDQUFDO0FBQzNFLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUNsRCxPQUFPLEVBQUUsY0FBYyxFQUFFLGFBQWEsRUFBcUMsTUFBTSxxQkFBcUIsQ0FBQztBQUV2RywyREFBMkQ7QUFDM0QsdURBQXVEO0FBQ3ZELE1BQU0sbUJBQW1CLEdBQUcsc0RBQXNELENBQUM7QUFrQjVFLElBQU0sYUFBYSxHQUFuQixNQUFNLGFBQWMsU0FBUSxjQUFjO0lBQTFDOzs7SUE4TFAsQ0FBQztJQTdMQyxLQUFLLENBQUMsU0FBUztRQUNiLGFBQWE7UUFDYixPQUFPO0lBQ1QsQ0FBQztJQUVELG1FQUFtRTtJQUNuRSxLQUFLLENBQUMsS0FBSyxDQUFDLEdBQVcsRUFBRSxVQUFzQjtRQUM3Qyw2REFBNkQ7UUFDN0Qsc0VBQXNFO1FBQ3RFLElBQUksR0FBRyxLQUFLLEdBQUcsRUFBRSxDQUFDO1lBQ2hCLE9BQU8sTUFBTSx1QkFBQSxJQUFJLDZEQUFjLE1BQWxCLElBQUksRUFBZSxVQUFVLENBQUMsQ0FBQztRQUM5QyxDQUFDO1FBQ0QsT0FBTyxNQUFNLHVCQUFBLElBQUksNERBQWEsTUFBakIsSUFBSSxFQUFjLEdBQUcsRUFBRSxVQUFVLENBQUMsQ0FBQztJQUNsRCxDQUFDO0NBZ0xGLENBQUE7OztBQTlLQyxrRUFBa0U7QUFDbEUsS0FBSyxzQ0FBZSxVQUFzQjtJQUN4QyxNQUFNLFlBQVksR0FBRyxRQUFRLENB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
|
|
@@ -2,7 +2,6 @@ import type { IncomingHttpHeaders } from 'node:http';
|
|
|
2
2
|
import type { Readable } from 'node:stream';
|
|
3
3
|
import type { estypes } from '@elastic/elasticsearch';
|
|
4
4
|
import type { Context } from 'egg';
|
|
5
|
-
import type { CnpmcoreConfig } from '../port/config.ts';
|
|
6
5
|
export interface UploadResult {
|
|
7
6
|
key: string;
|
|
8
7
|
}
|
|
@@ -53,8 +52,3 @@ export interface AuthClient {
|
|
|
53
52
|
getAuthUrl(ctx: Context): Promise<AuthUrlResult>;
|
|
54
53
|
ensureCurrentUser(): Promise<userResult | null>;
|
|
55
54
|
}
|
|
56
|
-
declare module 'egg' {
|
|
57
|
-
interface EggAppConfig {
|
|
58
|
-
cnpmcore: CnpmcoreConfig;
|
|
59
|
-
}
|
|
60
|
-
}
|
|
@@ -773,6 +773,16 @@ declare const binaries: {
|
|
|
773
773
|
readonly repo: "atom/node-keytar";
|
|
774
774
|
readonly distUrl: "https://github.com/atom/node-keytar/releases";
|
|
775
775
|
};
|
|
776
|
+
readonly 'isolated-vm': {
|
|
777
|
+
readonly category: "isolated-vm";
|
|
778
|
+
readonly description: "Secure & isolated JS environments for nodejs";
|
|
779
|
+
readonly type: BinaryType.GitHub;
|
|
780
|
+
readonly repo: "laverdet/isolated-vm";
|
|
781
|
+
readonly distUrl: "https://github.com/laverdet/isolated-vm/releases";
|
|
782
|
+
readonly options: {
|
|
783
|
+
readonly maxPage: 2;
|
|
784
|
+
};
|
|
785
|
+
};
|
|
776
786
|
readonly playwright: {
|
|
777
787
|
readonly category: "playwright";
|
|
778
788
|
readonly description: "Playwright is a framework for Web Testing and Automation.";
|
package/dist/config/binaries.js
CHANGED
|
@@ -813,6 +813,16 @@ const binaries = {
|
|
|
813
813
|
repo: 'atom/node-keytar',
|
|
814
814
|
distUrl: 'https://github.com/atom/node-keytar/releases',
|
|
815
815
|
},
|
|
816
|
+
'isolated-vm': {
|
|
817
|
+
category: 'isolated-vm',
|
|
818
|
+
description: 'Secure & isolated JS environments for nodejs',
|
|
819
|
+
type: BinaryType.GitHub,
|
|
820
|
+
repo: 'laverdet/isolated-vm',
|
|
821
|
+
distUrl: 'https://github.com/laverdet/isolated-vm/releases',
|
|
822
|
+
options: {
|
|
823
|
+
maxPage: 2,
|
|
824
|
+
},
|
|
825
|
+
},
|
|
816
826
|
// PlaywrightBinary
|
|
817
827
|
playwright: {
|
|
818
828
|
category: 'playwright',
|
|
@@ -956,4 +966,4 @@ export const BinaryConfigMap = {
|
|
|
956
966
|
...binaries,
|
|
957
967
|
};
|
|
958
968
|
export default BinaryConfigMap;
|
|
959
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"binaries.js","sourceRoot":"","sources":["../../config/binaries.ts"],"names":[],"mappings":"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"}
|
|
969
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"binaries.js","sourceRoot":"","sources":["../../config/binaries.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { EggAppConfig
|
|
1
|
+
import type { EggAppConfig } from 'egg';
|
|
2
2
|
import type { CnpmcoreConfig } from '../app/port/config.ts';
|
|
3
3
|
export declare const cnpmcoreConfig: CnpmcoreConfig;
|
|
4
4
|
export interface NFSConfig {
|
|
@@ -6,7 +6,6 @@ export interface NFSConfig {
|
|
|
6
6
|
dir: string;
|
|
7
7
|
removeBeforeUpload: boolean;
|
|
8
8
|
}
|
|
9
|
-
export
|
|
9
|
+
export default function startConfig(appInfo: EggAppConfig): Record<string, any> & {
|
|
10
10
|
nfs: NFSConfig;
|
|
11
11
|
};
|
|
12
|
-
export default function startConfig(appInfo: EggAppConfig): Config;
|
|
@@ -94,7 +94,7 @@ export default function startConfig(appInfo) {
|
|
|
94
94
|
port: env('CNPMCORE_REDIS_PORT', 'number', 6379),
|
|
95
95
|
host: env('CNPMCORE_REDIS_HOST', 'string', '127.0.0.1'),
|
|
96
96
|
password: env('CNPMCORE_REDIS_PASSWORD', 'string', ''),
|
|
97
|
-
db: env('CNPMCORE_REDIS_DB', 'number', 0),
|
|
97
|
+
db: env('CNPMCORE_REDIS_DB', 'number', 0) + Number(env('VITEST_POOL_ID', 'number', 0)),
|
|
98
98
|
},
|
|
99
99
|
};
|
|
100
100
|
config.security = {
|
|
@@ -210,4 +210,4 @@ export default function startConfig(appInfo) {
|
|
|
210
210
|
}
|
|
211
211
|
return config;
|
|
212
212
|
}
|
|
213
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
213
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"config.default.js","sourceRoot":"","sources":["../../config/config.default.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,9 +5,11 @@ import { database } from "./database.js";
|
|
|
5
5
|
export const mockES = new Mock();
|
|
6
6
|
export default function startConfig(appInfo) {
|
|
7
7
|
const config = {};
|
|
8
|
-
|
|
8
|
+
// database.name already includes per-worker pool ID suffix from database.ts
|
|
9
|
+
const dbName = database.name ?? 'cnpmcore_unittest';
|
|
10
|
+
config.dataDir = join(appInfo.root, `.${dbName}`);
|
|
9
11
|
config.orm = {
|
|
10
|
-
database:
|
|
12
|
+
database: dbName,
|
|
11
13
|
};
|
|
12
14
|
config.nfs = {
|
|
13
15
|
dir: join(config.dataDir, 'nfs'),
|
|
@@ -23,4 +25,4 @@ export default function startConfig(appInfo) {
|
|
|
23
25
|
};
|
|
24
26
|
return config;
|
|
25
27
|
}
|
|
26
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
28
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLnVuaXR0ZXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vY29uZmlnL2NvbmZpZy51bml0dGVzdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBRWpDLE9BQU8sSUFBSSxNQUFNLDZCQUE2QixDQUFDO0FBRy9DLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFFekMsK0NBQStDO0FBQy9DLE1BQU0sQ0FBQyxNQUFNLE1BQU0sR0FBRyxJQUFJLElBQUksRUFBRSxDQUFDO0FBRWpDLE1BQU0sQ0FBQyxPQUFPLFVBQVUsV0FBVyxDQUFDLE9BQW1CO0lBQ3JELE1BQU0sTUFBTSxHQUFHLEVBQXNCLENBQUM7SUFFdEMsNEVBQTRFO0lBQzVFLE1BQU0sTUFBTSxHQUFHLFFBQVEsQ0FBQyxJQUFJLElBQUksbUJBQW1CLENBQUM7SUFFcEQsTUFBTSxDQUFDLE9BQU8sR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksRUFBRSxJQUFJLE1BQU0sRUFBRSxDQUFDLENBQUM7SUFFbEQsTUFBTSxDQUFDLEdBQUcsR0FBRztRQUNYLFFBQVEsRUFBRSxNQUFNO0tBQ2pCLENBQUM7SUFFRixNQUFNLENBQUMsR0FBRyxHQUFHO1FBQ1gsR0FBRyxFQUFFLElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTyxFQUFFLEtBQUssQ0FBQztLQUNqQyxDQUFDO0lBRUYsTUFBTSxDQUFDLFFBQVEsR0FBRztRQUNoQiwwQkFBMEIsRUFBRSxFQUFFO0tBQy9CLENBQUM7SUFFRixNQUFNLENBQUMsYUFBYSxHQUFHO1FBQ3JCLE1BQU0sRUFBRTtZQUNOLElBQUksRUFBRSx1QkFBdUI7WUFDN0IsVUFBVSxFQUFFLE1BQU0sQ0FBQyxhQUFhLEVBQUU7U0FDbkM7S0FDRixDQUFDO0lBRUYsT0FBTyxNQUFNLENBQUM7QUFDaEIsQ0FBQyJ9
|
package/dist/config/database.js
CHANGED
|
@@ -35,6 +35,11 @@ else if (dbType === DATABASE_TYPE.SQLite) {
|
|
|
35
35
|
dbClient = 'sqlite';
|
|
36
36
|
dialect = 'sqlite';
|
|
37
37
|
}
|
|
38
|
+
// Per-worker database isolation for vitest parallel execution
|
|
39
|
+
const poolId = env('VITEST_POOL_ID', 'string');
|
|
40
|
+
if (poolId) {
|
|
41
|
+
dbName = `${dbName ?? 'cnpmcore_unittest'}_${poolId}`;
|
|
42
|
+
}
|
|
38
43
|
export const database = {
|
|
39
44
|
type: dbType,
|
|
40
45
|
dialect,
|
|
@@ -45,4 +50,4 @@ export const database = {
|
|
|
45
50
|
user: dbUser,
|
|
46
51
|
password: dbPassword,
|
|
47
52
|
};
|
|
48
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
53
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGF0YWJhc2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9jb25maWcvZGF0YWJhc2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEdBQUcsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBRXJDLE1BQU0sQ0FBTixJQUFZLGFBSVg7QUFKRCxXQUFZLGFBQWE7SUFDdkIsZ0NBQWUsQ0FBQTtJQUNmLDBDQUF5QixDQUFBO0lBQ3pCLGtDQUFpQixDQUFBO0FBQ25CLENBQUMsRUFKVyxhQUFhLEtBQWIsYUFBYSxRQUl4QjtBQUVELE1BQU0sTUFBTSxHQUFHLEdBQUcsQ0FBQyx3QkFBd0IsRUFBRSxRQUFRLEVBQUUsYUFBYSxDQUFDLEtBQUssQ0FBQyxDQUFDO0FBQzVFLElBQUksTUFBTSxHQUFHLEdBQUcsQ0FBQyx3QkFBd0IsRUFBRSxRQUFRLENBQUMsQ0FBQztBQUNyRCxJQUFJLE1BQU0sR0FBRyxHQUFHLENBQUMsd0JBQXdCLEVBQUUsUUFBUSxDQUFDLENBQUM7QUFDckQsSUFBSSxNQUFNLEdBQUcsR0FBRyxDQUFDLHdCQUF3QixFQUFFLFFBQVEsQ0FBQyxDQUFDO0FBQ3JELElBQUksTUFBTSxHQUFHLEdBQUcsQ0FBQyx3QkFBd0IsRUFBRSxRQUFRLENBQUMsQ0FBQztBQUNyRCxJQUFJLFVBQVUsR0FBRyxHQUFHLENBQUMsNEJBQTRCLEVBQUUsUUFBUSxDQUFDLENBQUM7QUFDN0QsSUFBSSxPQUFPLEdBQUcsT0FBTyxDQUFDO0FBQ3RCLElBQUksUUFBUSxHQUFHLFFBQVEsQ0FBQztBQUN4QixJQUFJLE1BQU0sS0FBSyxhQUFhLENBQUMsS0FBSyxFQUFFLENBQUM7SUFDbkMsa0NBQWtDO0lBQ2xDLE1BQU0sR0FBRyxNQUFNLElBQUksR0FBRyxDQUFDLHlCQUF5QixFQUFFLFFBQVEsQ0FBQyxJQUFJLEdBQUcsQ0FBQyxnQkFBZ0IsRUFBRSxRQUFRLENBQUMsQ0FBQztJQUMvRixNQUFNLEdBQUcsTUFBTSxJQUFJLEdBQUcsQ0FBQyxxQkFBcUIsRUFBRSxRQUFRLENBQUMsSUFBSSxHQUFHLENBQUMsWUFBWSxFQUFFLFFBQVEsQ0FBQyxJQUFJLFdBQVcsQ0FBQztJQUN0RyxNQUFNLEdBQUcsTUFBTSxJQUFJLEdBQUcsQ0FBQyxxQkFBcUIsRUFBRSxRQUFRLENBQUMsSUFBSSxHQUFHLENBQUMsWUFBWSxFQUFFLFFBQVEsQ0FBQyxJQUFJLElBQUksQ0FBQztJQUMvRixNQUFNLEdBQUcsTUFBTSxJQUFJLEdBQUcsQ0FBQyxxQkFBcUIsRUFBRSxRQUFRLENBQUMsSUFBSSxHQUFHLENBQUMsWUFBWSxFQUFFLFFBQVEsQ0FBQyxJQUFJLE1BQU0sQ0FBQztJQUNqRyxVQUFVLEdBQUcsVUFBVSxJQUFJLEdBQUcsQ0FBQyx5QkFBeUIsRUFBRSxRQUFRLENBQUMsSUFBSSxHQUFHLENBQUMsZ0JBQWdCLEVBQUUsUUFBUSxDQUFDLENBQUM7QUFDekcsQ0FBQztLQUFNLElBQUksTUFBTSxLQUFLLGFBQWEsQ0FBQyxVQUFVLEVBQUUsQ0FBQztJQUMvQyxRQUFRLEdBQUcsSUFBSSxDQUFDO0lBQ2hCLE9BQU8sR0FBRyxVQUFVLENBQUM7SUFDckIsTUFBTSxHQUFHLE1BQU0sSUFBSSxHQUFHLENBQUMsd0JBQXdCLEVBQUUsUUFBUSxDQUFDLElBQUksR0FBRyxDQUFDLGVBQWUsRUFBRSxRQUFRLENBQUMsSUFBSSxXQUFXLENBQUM7SUFDNUcsTUFBTSxHQUFHLE1BQU0sSUFBSSxHQUFHLENBQUMsd0JBQXdCLEVBQUUsUUFBUSxDQUFDLElBQUksR0FBRyxDQUFDLGVBQWUsRUFBRSxRQUFRLENBQUMsSUFBSSxJQUFJLENBQUM7SUFDckcsTUFBTSxHQUFHLE1BQU0sSUFBSSxHQUFHLENBQUMsd0JBQXdCLEVBQUUsUUFBUSxDQUFDLElBQUksR0FBRyxDQUFDLGVBQWUsRUFBRSxRQUFRLENBQUMsSUFBSSxVQUFVLENBQUM7SUFDM0csVUFBVTtRQUNSLFVBQVUsSUFBSSxHQUFHLENBQUMsNEJBQTRCLEVBQUUsUUFBUSxDQUFDLElBQUksR0FBRyxDQUFDLG1CQUFtQixFQUFFLFFBQVEsQ0FBQyxJQUFJLFVBQVUsQ0FBQztBQUNsSCxDQUFDO0tBQU0sSUFBSSxNQUFNLEtBQUssYUFBYSxDQUFDLE1BQU0sRUFBRSxDQUFDO0lBQzNDLHlCQUF5QjtJQUN6QixRQUFRLEdBQUcsUUFBUSxDQUFDO0lBQ3BCLE9BQU8sR0FBRyxRQUFRLENBQUM7QUFDckIsQ0FBQztBQUVELDhEQUE4RDtBQUM5RCxNQUFNLE1BQU0sR0FBRyxHQUFHLENBQUMsZ0JBQWdCLEVBQUUsUUFBUSxDQUFDLENBQUM7QUFDL0MsSUFBSSxNQUFNLEVBQUUsQ0FBQztJQUNYLE1BQU0sR0FBRyxHQUFHLE1BQU0sSUFBSSxtQkFBbUIsSUFBSSxNQUFNLEVBQUUsQ0FBQztBQUN4RCxDQUFDO0FBRUQsTUFBTSxDQUFDLE1BQU0sUUFBUSxHQUFHO0lBQ3RCLElBQUksRUFBRSxNQUFNO0lBQ1osT0FBTztJQUNQLE1BQU0sRUFBRSxRQUFRO0lBQ2hCLElBQUksRUFBRSxNQUFNO0lBQ1osSUFBSSxFQUFFLE1BQU07SUFDWixJQUFJLEVBQUUsTUFBTTtJQUNaLElBQUksRUFBRSxNQUFNO0lBQ1osUUFBUSxFQUFFLFVBQVU7Q0FDckIsQ0FBQyJ9
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "cnpmcore",
|
|
3
|
-
"version": "4.
|
|
3
|
+
"version": "4.22.1",
|
|
4
4
|
"description": "Private NPM Registry for Enterprise",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"npm",
|
|
@@ -89,17 +89,17 @@
|
|
|
89
89
|
},
|
|
90
90
|
"dependencies": {
|
|
91
91
|
"@cnpmjs/packument": "^1.7.0",
|
|
92
|
-
"@eggjs/redis": "beta",
|
|
93
|
-
"@eggjs/scripts": "beta",
|
|
94
|
-
"@eggjs/tracer": "beta",
|
|
95
|
-
"@eggjs/typebox-validate": "beta",
|
|
92
|
+
"@eggjs/redis": "^4.0.2-beta.2",
|
|
93
|
+
"@eggjs/scripts": "^5.0.2-beta.2",
|
|
94
|
+
"@eggjs/tracer": "^4.0.2-beta.2",
|
|
95
|
+
"@eggjs/typebox-validate": "^4.0.2-beta.2",
|
|
96
96
|
"@elastic/elasticsearch": "^8.19.1",
|
|
97
97
|
"@simplewebauthn/server": "^7.4.0",
|
|
98
98
|
"base-x": "^5.0.1",
|
|
99
99
|
"base64url": "^3.0.1",
|
|
100
100
|
"bson-objectid": "^2.0.4",
|
|
101
101
|
"dayjs": "^1.11.19",
|
|
102
|
-
"egg": "beta",
|
|
102
|
+
"egg": "^4.1.2-beta.2",
|
|
103
103
|
"egg-cors": "^3.0.1",
|
|
104
104
|
"egg-status": "^1.0.0",
|
|
105
105
|
"egg-view-nunjucks": "^2.3.0",
|
|
@@ -125,15 +125,14 @@
|
|
|
125
125
|
"validate-npm-package-name": "^7.0.0"
|
|
126
126
|
},
|
|
127
127
|
"devDependencies": {
|
|
128
|
-
"@eggjs/bin": "beta",
|
|
129
|
-
"@eggjs/mock": "beta",
|
|
128
|
+
"@eggjs/bin": "^8.0.2-beta.2",
|
|
129
|
+
"@eggjs/mock": "^7.0.2-beta.2",
|
|
130
130
|
"@eggjs/oxlint-config": "^1.0.0",
|
|
131
|
-
"@eggjs/tsconfig": "beta",
|
|
131
|
+
"@eggjs/tsconfig": "^3.1.2-beta.2",
|
|
132
132
|
"@elastic/elasticsearch-mock": "^2.1.0",
|
|
133
133
|
"@simplewebauthn/typescript-types": "^7.4.0",
|
|
134
134
|
"@types/lodash-es": "^4.17.12",
|
|
135
135
|
"@types/mime-types": "^3.0.1",
|
|
136
|
-
"@types/mocha": "^10.0.10",
|
|
137
136
|
"@types/mysql": "^2.15.27",
|
|
138
137
|
"@types/node": "^22.19.2",
|
|
139
138
|
"@types/node-rsa": "^1.1.4",
|
|
@@ -145,9 +144,9 @@
|
|
|
145
144
|
"coffee": "^5.5.1",
|
|
146
145
|
"husky": "^9.1.7",
|
|
147
146
|
"lint-staged": "^16.2.7",
|
|
148
|
-
"oxfmt": "^0.
|
|
147
|
+
"oxfmt": "^0.35.0",
|
|
149
148
|
"oxlint": "^1.32.0",
|
|
150
|
-
"oxlint-tsgolint": "^0.
|
|
149
|
+
"oxlint-tsgolint": "^0.14.2",
|
|
151
150
|
"typescript": "^5.9.3"
|
|
152
151
|
},
|
|
153
152
|
"optionalDependencies": {
|