cnpmcore 3.67.1 → 3.68.0
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/ErrorUtil.d.ts +1 -0
- package/dist/app/common/ErrorUtil.js +31 -0
- package/dist/app/common/adapter/NPMRegistry.js +8 -3
- package/dist/app/common/adapter/binary/AbstractBinary.js +1 -1
- package/dist/app/common/adapter/changesStream/NpmChangesStream.js +1 -1
- package/dist/app/core/service/BinarySyncerService.js +14 -15
- package/dist/app/core/service/ChangesStreamService.d.ts +1 -1
- package/dist/app/core/service/ChangesStreamService.js +16 -17
- package/dist/app/port/schedule/SyncBinaryWorker.js +3 -3
- package/dist/app/repository/SearchRepository.d.ts +2 -1
- package/dist/app/repository/SearchRepository.js +1 -1
- package/dist/config/config.default.js +2 -1
- package/package.json +2 -2
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare function isTimeoutError(err: Error): boolean;
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.isTimeoutError = void 0;
|
|
4
|
+
const TimeoutErrorNames = [
|
|
5
|
+
'HttpClientRequestTimeoutError',
|
|
6
|
+
'HttpClientConnectTimeoutError',
|
|
7
|
+
'ConnectionError',
|
|
8
|
+
'ConnectTimeoutError',
|
|
9
|
+
'BodyTimeoutError',
|
|
10
|
+
'ResponseTimeoutError',
|
|
11
|
+
];
|
|
12
|
+
function isTimeoutError(err) {
|
|
13
|
+
if (TimeoutErrorNames.includes(err.name)) {
|
|
14
|
+
return true;
|
|
15
|
+
}
|
|
16
|
+
if (err instanceof AggregateError && err.errors) {
|
|
17
|
+
for (const subError of err.errors) {
|
|
18
|
+
if (TimeoutErrorNames.includes(subError.name)) {
|
|
19
|
+
return true;
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
if ('cause' in err && err.cause instanceof Error) {
|
|
24
|
+
if (TimeoutErrorNames.includes(err.cause.name)) {
|
|
25
|
+
return true;
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
return false;
|
|
29
|
+
}
|
|
30
|
+
exports.isTimeoutError = isTimeoutError;
|
|
31
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRXJyb3JVdGlsLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vYXBwL2NvbW1vbi9FcnJvclV0aWwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsTUFBTSxpQkFBaUIsR0FBRztJQUN4QiwrQkFBK0I7SUFDL0IsK0JBQStCO0lBQy9CLGlCQUFpQjtJQUNqQixxQkFBcUI7SUFDckIsa0JBQWtCO0lBQ2xCLHNCQUFzQjtDQUN2QixDQUFDO0FBRUYsU0FBZ0IsY0FBYyxDQUFDLEdBQVU7SUFDdkMsSUFBSSxpQkFBaUIsQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxFQUFFO1FBQ3hDLE9BQU8sSUFBSSxDQUFDO0tBQ2I7SUFDRCxJQUFJLEdBQUcsWUFBWSxjQUFjLElBQUksR0FBRyxDQUFDLE1BQU0sRUFBRTtRQUMvQyxLQUFLLE1BQU0sUUFBUSxJQUFJLEdBQUcsQ0FBQyxNQUFNLEVBQUU7WUFDakMsSUFBSSxpQkFBaUIsQ0FBQyxRQUFRLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxFQUFFO2dCQUM3QyxPQUFPLElBQUksQ0FBQzthQUNiO1NBQ0Y7S0FDRjtJQUNELElBQUksT0FBTyxJQUFJLEdBQUcsSUFBSSxHQUFHLENBQUMsS0FBSyxZQUFZLEtBQUssRUFBRTtRQUNoRCxJQUFJLGlCQUFpQixDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxFQUFFO1lBQzlDLE9BQU8sSUFBSSxDQUFDO1NBQ2I7S0FDRjtJQUNELE9BQU8sS0FBSyxDQUFDO0FBQ2YsQ0FBQztBQWpCRCx3Q0FpQkMifQ==
|
|
@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.NPMRegistry = void 0;
|
|
13
13
|
const promises_1 = require("timers/promises");
|
|
14
14
|
const tegg_1 = require("@eggjs/tegg");
|
|
15
|
+
const ErrorUtil_1 = require("../ErrorUtil");
|
|
15
16
|
const INSTANCE_NAME = 'npmRegistry';
|
|
16
17
|
let NPMRegistry = class NPMRegistry {
|
|
17
18
|
constructor() {
|
|
@@ -34,11 +35,15 @@ let NPMRegistry = class NPMRegistry {
|
|
|
34
35
|
// large package: https://r.cnpmjs.org/%40procore%2Fcore-icons
|
|
35
36
|
// https://r.cnpmjs.org/intraactive-sdk-ui 44s
|
|
36
37
|
const authorization = this.genAuthorizationHeader(optionalConfig?.remoteAuthToken);
|
|
37
|
-
return await this.request('GET', url, undefined, {
|
|
38
|
+
return await this.request('GET', url, undefined, {
|
|
39
|
+
timeout: 120000,
|
|
40
|
+
headers: { authorization },
|
|
41
|
+
});
|
|
38
42
|
}
|
|
39
43
|
catch (err) {
|
|
40
|
-
if (err
|
|
44
|
+
if ((0, ErrorUtil_1.isTimeoutError)(err)) {
|
|
41
45
|
throw err;
|
|
46
|
+
}
|
|
42
47
|
lastError = err;
|
|
43
48
|
}
|
|
44
49
|
retries--;
|
|
@@ -113,4 +118,4 @@ exports.NPMRegistry = NPMRegistry = __decorate([
|
|
|
113
118
|
accessLevel: tegg_1.AccessLevel.PUBLIC,
|
|
114
119
|
})
|
|
115
120
|
], NPMRegistry);
|
|
116
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
121
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTlBNUmVnaXN0cnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9hcHAvY29tbW9uL2FkYXB0ZXIvTlBNUmVnaXN0cnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7O0FBQUEsOENBQTZDO0FBQzdDLHNDQUlxQjtBQVNyQiw0Q0FBOEM7QUFJOUMsTUFBTSxhQUFhLEdBQUcsYUFBYSxDQUFDO0FBUTdCLElBQU0sV0FBVyxHQUFqQixNQUFNLFdBQVc7SUFBakI7UUFPRyxZQUFPLEdBQUcsS0FBSyxDQUFDO0lBeUYxQixDQUFDO0lBdEZDLElBQUksUUFBUTtRQUNWLE9BQU8sSUFBSSxDQUFDLFlBQVksSUFBSSxJQUFJLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxjQUFjLENBQUM7SUFDbEUsQ0FBQztJQUVNLGVBQWUsQ0FBQyxZQUFZLEdBQUcsRUFBRTtRQUN0QyxJQUFJLENBQUMsWUFBWSxHQUFHLFlBQVksQ0FBQztJQUNuQyxDQUFDO0lBRU0sS0FBSyxDQUFDLGdCQUFnQixDQUFDLFFBQWdCLEVBQUUsY0FBK0Q7UUFDN0csSUFBSSxPQUFPLEdBQUcsY0FBYyxFQUFFLE9BQU8sSUFBSSxDQUFDLENBQUM7UUFDM0MscURBQXFEO1FBQ3JELHNDQUFzQztRQUN0QyxNQUFNLEdBQUcsR0FBRyxHQUFHLElBQUksQ0FBQyxRQUFRLElBQUksa0JBQWtCLENBQUMsUUFBUSxDQUFDLE1BQU0sSUFBSSxDQUFDLEdBQUcsRUFBRSxVQUFVLENBQUM7UUFDdkYsSUFBSSxTQUFjLENBQUM7UUFDbkIsT0FBTyxPQUFPLEdBQUcsQ0FBQyxFQUFFO1lBQ2xCLElBQUk7Z0JBQ0YsOERBQThEO2dCQUM5RCw4Q0FBOEM7Z0JBQzlDLE1BQU0sYUFBYSxHQUFHLElBQUksQ0FBQyxzQkFBc0IsQ0FBQyxjQUFjLEVBQUUsZUFBZSxDQUFDLENBQUM7Z0JBQ25GLE9BQU8sTUFBTSxJQUFJLENBQUMsT0FBTyxDQUFDLEtBQUssRUFBRSxHQUFH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
|
|
@@ -53,7 +53,7 @@ class AbstractBinary {
|
|
|
53
53
|
if (!version.modules)
|
|
54
54
|
continue;
|
|
55
55
|
const modulesVersion = parseInt(version.modules);
|
|
56
|
-
// node v6.0.0
|
|
56
|
+
// node v6.0.0 modules 48 min
|
|
57
57
|
if (modulesVersion >= 48 && !nodeABIVersions.includes(modulesVersion)) {
|
|
58
58
|
nodeABIVersions.push(modulesVersion);
|
|
59
59
|
}
|
|
@@ -30,7 +30,7 @@ let NpmChangesStream = class NpmChangesStream extends AbstractChangesStream_1.Ab
|
|
|
30
30
|
const db = this.getChangesStreamUrl(registry, since);
|
|
31
31
|
const { res } = await this.httpclient.request(db, {
|
|
32
32
|
streaming: true,
|
|
33
|
-
timeout:
|
|
33
|
+
timeout: 60000,
|
|
34
34
|
});
|
|
35
35
|
let buf = '';
|
|
36
36
|
for await (const chunk of res) {
|
|
@@ -16,18 +16,19 @@ exports.BinarySyncerService = void 0;
|
|
|
16
16
|
const promises_1 = require("fs/promises");
|
|
17
17
|
const tegg_1 = require("@eggjs/tegg");
|
|
18
18
|
const promises_2 = __importDefault(require("fs/promises"));
|
|
19
|
+
const lodash_1 = require("lodash");
|
|
19
20
|
const binaries_1 = __importDefault(require("../../../config/binaries"));
|
|
20
|
-
const NFSAdapter_1 = require("../../common/adapter/NFSAdapter");
|
|
21
|
-
const Task_1 = require("../../common/enum/Task");
|
|
22
|
-
const FileUtil_1 = require("../../common/FileUtil");
|
|
23
21
|
const BinaryRepository_1 = require("../../repository/BinaryRepository");
|
|
24
|
-
const
|
|
22
|
+
const Task_1 = require("../entity/Task");
|
|
25
23
|
const Binary_1 = require("../entity/Binary");
|
|
26
24
|
const TaskService_1 = require("./TaskService");
|
|
25
|
+
const NFSAdapter_1 = require("../../common/adapter/NFSAdapter");
|
|
26
|
+
const FileUtil_1 = require("../../common/FileUtil");
|
|
27
|
+
const ErrorUtil_1 = require("../../common/ErrorUtil");
|
|
27
28
|
const AbstractBinary_1 = require("../../common/adapter/binary/AbstractBinary");
|
|
28
29
|
const AbstractService_1 = require("../../common/AbstractService");
|
|
29
30
|
const Binary_2 = require("../../common/enum/Binary");
|
|
30
|
-
const
|
|
31
|
+
const Task_2 = require("../../common/enum/Task");
|
|
31
32
|
function isoNow() {
|
|
32
33
|
return new Date().toISOString();
|
|
33
34
|
}
|
|
@@ -67,7 +68,7 @@ let BinarySyncerService = class BinarySyncerService extends AbstractService_1.Ab
|
|
|
67
68
|
}
|
|
68
69
|
async createTask(binaryName, lastData) {
|
|
69
70
|
try {
|
|
70
|
-
return await this.taskService.createTask(
|
|
71
|
+
return await this.taskService.createTask(Task_1.Task.createSyncBinary(binaryName, lastData), false);
|
|
71
72
|
}
|
|
72
73
|
catch (e) {
|
|
73
74
|
this.logger.error('[BinarySyncerService.createTask] binaryName: %s, error: %s', binaryName, e);
|
|
@@ -80,7 +81,7 @@ let BinarySyncerService = class BinarySyncerService extends AbstractService_1.Ab
|
|
|
80
81
|
return await this.taskService.findTaskLog(task);
|
|
81
82
|
}
|
|
82
83
|
async findExecuteTask() {
|
|
83
|
-
return await this.taskService.findExecuteTask(
|
|
84
|
+
return await this.taskService.findExecuteTask(Task_2.TaskType.SyncBinary);
|
|
84
85
|
}
|
|
85
86
|
async executeTask(task) {
|
|
86
87
|
const binaryName = task.targetName;
|
|
@@ -93,7 +94,7 @@ let BinarySyncerService = class BinarySyncerService extends AbstractService_1.Ab
|
|
|
93
94
|
logs.push(`[${isoNow()}] ❌ Synced "${binaryName}" fail, ${task.error}, log: ${logUrl}`);
|
|
94
95
|
logs.push(`[${isoNow()}] ❌❌❌❌❌ "${binaryName}" ❌❌❌❌❌`);
|
|
95
96
|
this.logger.error('[BinarySyncerService.executeTask:fail] taskId: %s, targetName: %s, %s', task.taskId, task.targetName, task.error);
|
|
96
|
-
await this.taskService.finishTask(task,
|
|
97
|
+
await this.taskService.finishTask(task, Task_2.TaskState.Fail, logs.join('\n'));
|
|
97
98
|
return;
|
|
98
99
|
}
|
|
99
100
|
await this.taskService.appendTaskLog(task, logs.join('\n'));
|
|
@@ -103,18 +104,16 @@ let BinarySyncerService = class BinarySyncerService extends AbstractService_1.Ab
|
|
|
103
104
|
const [hasDownloadError] = await this.syncDir(binaryAdapter, task, '/');
|
|
104
105
|
logs.push(`[${isoNow()}] 🟢 log: ${logUrl}`);
|
|
105
106
|
logs.push(`[${isoNow()}] 🟢🟢🟢🟢🟢 "${binaryName}" 🟢🟢🟢🟢🟢`);
|
|
106
|
-
await this.taskService.finishTask(task,
|
|
107
|
+
await this.taskService.finishTask(task, Task_2.TaskState.Success, logs.join('\n'));
|
|
107
108
|
// 确保没有下载异常才算 success
|
|
108
109
|
await binaryAdapter.finishFetch(!hasDownloadError, binaryName);
|
|
109
110
|
this.logger.info('[BinarySyncerService.executeTask:success] taskId: %s, targetName: %s, log: %s, hasDownloadError: %s', task.taskId, task.targetName, logUrl, hasDownloadError);
|
|
110
111
|
}
|
|
111
112
|
catch (err) {
|
|
112
|
-
task.error = err.message
|
|
113
|
+
task.error = `${err.name}: ${err.message}`;
|
|
113
114
|
logs.push(`[${isoNow()}] ❌ Synced "${binaryName}" fail, ${task.error}, log: ${logUrl}`);
|
|
114
115
|
logs.push(`[${isoNow()}] ❌❌❌❌❌ "${binaryName}" ❌❌❌❌❌`);
|
|
115
|
-
if (err
|
|
116
|
-
|| err.name === 'ConnectionError'
|
|
117
|
-
|| err.name === 'ConnectTimeoutError') {
|
|
116
|
+
if ((0, ErrorUtil_1.isTimeoutError)(err)) {
|
|
118
117
|
this.logger.warn('[BinarySyncerService.executeTask:fail] taskId: %s, targetName: %s, %s', task.taskId, task.targetName, task.error);
|
|
119
118
|
this.logger.warn(err);
|
|
120
119
|
}
|
|
@@ -123,7 +122,7 @@ let BinarySyncerService = class BinarySyncerService extends AbstractService_1.Ab
|
|
|
123
122
|
this.logger.error(err);
|
|
124
123
|
}
|
|
125
124
|
await binaryAdapter.finishFetch(false, binaryName);
|
|
126
|
-
await this.taskService.finishTask(task,
|
|
125
|
+
await this.taskService.finishTask(task, Task_2.TaskState.Fail, logs.join('\n'));
|
|
127
126
|
}
|
|
128
127
|
}
|
|
129
128
|
async syncDir(binaryAdapter, task, dir, parentIndex = '', latestVersionParent = '/') {
|
|
@@ -320,4 +319,4 @@ exports.BinarySyncerService = BinarySyncerService = __decorate([
|
|
|
320
319
|
accessLevel: tegg_1.AccessLevel.PUBLIC,
|
|
321
320
|
})
|
|
322
321
|
], BinarySyncerService);
|
|
323
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"BinarySyncerService.js","sourceRoot":"","sources":["../../../../app/core/service/BinarySyncerService.ts"],"names":[],"mappings":"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"}
|
|
322
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"BinarySyncerService.js","sourceRoot":"","sources":["../../../../app/core/service/BinarySyncerService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { AbstractService } from '../../common/AbstractService';
|
|
2
1
|
import { ChangesStreamTask } from '../entity/Task';
|
|
3
2
|
import { Registry } from '../entity/Registry';
|
|
3
|
+
import { AbstractService } from '../../common/AbstractService';
|
|
4
4
|
export declare class ChangesStreamService extends AbstractService {
|
|
5
5
|
private readonly taskRepository;
|
|
6
6
|
private readonly packageSyncerService;
|
|
@@ -16,33 +16,34 @@ exports.ChangesStreamService = void 0;
|
|
|
16
16
|
const os_1 = __importDefault(require("os"));
|
|
17
17
|
const promises_1 = require("timers/promises");
|
|
18
18
|
const tegg_1 = require("@eggjs/tegg");
|
|
19
|
-
const
|
|
20
|
-
const AbstractService_1 = require("../../common/AbstractService");
|
|
21
|
-
const TaskRepository_1 = require("../../repository/TaskRepository");
|
|
22
|
-
const Task_2 = require("../entity/Task");
|
|
19
|
+
const egg_errors_1 = require("egg-errors");
|
|
23
20
|
const PackageSyncerService_1 = require("./PackageSyncerService");
|
|
24
21
|
const TaskService_1 = require("./TaskService");
|
|
25
22
|
const RegistryManagerService_1 = require("./RegistryManagerService");
|
|
26
|
-
const
|
|
23
|
+
const ScopeManagerService_1 = require("./ScopeManagerService");
|
|
24
|
+
const PackageRepository_1 = require("../../repository/PackageRepository");
|
|
25
|
+
const TaskRepository_1 = require("../../repository/TaskRepository");
|
|
26
|
+
const Task_1 = require("../entity/Task");
|
|
27
27
|
const AbstractChangesStream_1 = require("../../common/adapter/changesStream/AbstractChangesStream");
|
|
28
28
|
const PackageUtil_1 = require("../../common/PackageUtil");
|
|
29
|
+
const ErrorUtil_1 = require("../../common/ErrorUtil");
|
|
29
30
|
const constants_1 = require("../../common/constants");
|
|
30
|
-
const
|
|
31
|
-
const
|
|
31
|
+
const Task_2 = require("../../common/enum/Task");
|
|
32
|
+
const AbstractService_1 = require("../../common/AbstractService");
|
|
32
33
|
let ChangesStreamService = class ChangesStreamService extends AbstractService_1.AbstractService {
|
|
33
34
|
// 出于向下兼容考虑, changes_stream 类型 Task 分为
|
|
34
35
|
// GLOBAL_WORKER: 默认的同步源
|
|
35
36
|
// `{registryName}_WORKER`: 自定义 scope 的同步源
|
|
36
37
|
async findExecuteTask() {
|
|
37
38
|
const targetName = constants_1.GLOBAL_WORKER;
|
|
38
|
-
const globalRegistryTask = await this.taskRepository.findTaskByTargetName(targetName,
|
|
39
|
+
const globalRegistryTask = await this.taskRepository.findTaskByTargetName(targetName, Task_2.TaskType.ChangesStream);
|
|
39
40
|
// 如果没有配置默认同步源,先进行初始化
|
|
40
41
|
if (!globalRegistryTask) {
|
|
41
|
-
await this.taskService.createTask(
|
|
42
|
+
await this.taskService.createTask(Task_1.Task.createChangesStream(targetName), false);
|
|
42
43
|
}
|
|
43
44
|
// 自定义 scope 由 admin 手动创建
|
|
44
45
|
// 根据 TaskType.ChangesStream 从队列中获取
|
|
45
|
-
return await this.taskService.findExecuteTask(
|
|
46
|
+
return await this.taskService.findExecuteTask(Task_2.TaskType.ChangesStream);
|
|
46
47
|
}
|
|
47
48
|
async suspendSync(exit = false) {
|
|
48
49
|
this.logger.info('[ChangesStreamService.suspendSync:start]');
|
|
@@ -53,9 +54,9 @@ let ChangesStreamService = class ChangesStreamService extends AbstractService_1.
|
|
|
53
54
|
}
|
|
54
55
|
const authorIp = os_1.default.hostname();
|
|
55
56
|
// 暂停当前机器所有的 changesStream 任务
|
|
56
|
-
const tasks = await this.taskRepository.findTaskByAuthorIpAndType(authorIp,
|
|
57
|
+
const tasks = await this.taskRepository.findTaskByAuthorIpAndType(authorIp, Task_2.TaskType.ChangesStream);
|
|
57
58
|
for (const task of tasks) {
|
|
58
|
-
if (task.state ===
|
|
59
|
+
if (task.state === Task_2.TaskState.Processing) {
|
|
59
60
|
this.logger.info('[ChangesStreamService.suspendSync:suspend] taskId: %s', task.taskId);
|
|
60
61
|
// 1. 更新任务状态为 waiting
|
|
61
62
|
// 2. 重新推入任务队列供其他机器执行
|
|
@@ -89,9 +90,7 @@ let ChangesStreamService = class ChangesStreamService extends AbstractService_1.
|
|
|
89
90
|
}
|
|
90
91
|
catch (err) {
|
|
91
92
|
this.logger.warn('[ChangesStreamService.executeTask:error] %s, exit now', err.message);
|
|
92
|
-
if (err
|
|
93
|
-
|| err.name === 'ConnectTimeoutError'
|
|
94
|
-
|| err.name === 'BodyTimeoutError') {
|
|
93
|
+
if ((0, ErrorUtil_1.isTimeoutError)(err)) {
|
|
95
94
|
this.logger.warn(err);
|
|
96
95
|
}
|
|
97
96
|
else {
|
|
@@ -173,7 +172,7 @@ let ChangesStreamService = class ChangesStreamService extends AbstractService_1.
|
|
|
173
172
|
const tips = `Sync cause by changes_stream(${registry.changeStream}) update seq: ${seq}`;
|
|
174
173
|
try {
|
|
175
174
|
const task = await this.packageSyncerService.createTask(fullname, {
|
|
176
|
-
authorIp:
|
|
175
|
+
authorIp: Task_1.HOST_NAME,
|
|
177
176
|
authorId: 'ChangesStreamService',
|
|
178
177
|
registryId: registry.registryId,
|
|
179
178
|
skipDependencies: true,
|
|
@@ -247,4 +246,4 @@ exports.ChangesStreamService = ChangesStreamService = __decorate([
|
|
|
247
246
|
accessLevel: tegg_1.AccessLevel.PUBLIC,
|
|
248
247
|
})
|
|
249
248
|
], ChangesStreamService);
|
|
250
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
249
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ChangesStreamService.js","sourceRoot":"","sources":["../../../../app/core/service/ChangesStreamService.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,6 +13,7 @@ exports.SyncBinaryWorker = void 0;
|
|
|
13
13
|
const schedule_1 = require("@eggjs/tegg/schedule");
|
|
14
14
|
const tegg_1 = require("@eggjs/tegg");
|
|
15
15
|
const BinarySyncerService_1 = require("../../core/service/BinarySyncerService");
|
|
16
|
+
const ErrorUtil_1 = require("../../common/ErrorUtil");
|
|
16
17
|
let SyncBinaryWorker = class SyncBinaryWorker {
|
|
17
18
|
async subscribe() {
|
|
18
19
|
if (!this.config.cnpmcore.enableSyncBinary)
|
|
@@ -28,8 +29,7 @@ let SyncBinaryWorker = class SyncBinaryWorker {
|
|
|
28
29
|
catch (err) {
|
|
29
30
|
const use = Date.now() - startTime;
|
|
30
31
|
this.logger.warn('[SyncBinaryWorker:executeTask:error] taskId: %s, targetName: %s, use %sms, error: %s', task.taskId, task.targetName, use, err.message);
|
|
31
|
-
if (err
|
|
32
|
-
|| err.name === 'HttpClientRequestTimeoutError') {
|
|
32
|
+
if ((0, ErrorUtil_1.isTimeoutError)(err)) {
|
|
33
33
|
this.logger.warn(err);
|
|
34
34
|
}
|
|
35
35
|
else {
|
|
@@ -62,4 +62,4 @@ exports.SyncBinaryWorker = SyncBinaryWorker = __decorate([
|
|
|
62
62
|
},
|
|
63
63
|
})
|
|
64
64
|
], SyncBinaryWorker);
|
|
65
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
65
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU3luY0JpbmFyeVdvcmtlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL2FwcC9wb3J0L3NjaGVkdWxlL1N5bmNCaW5hcnlXb3JrZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7O0FBQ0EsbURBQThFO0FBQzlFLHNDQUFxQztBQUNyQyxnRkFBNkU7QUFDN0Usc0RBQXdEO0FBUWpELElBQU0sZ0JBQWdCLEdBQXRCLE1BQU0sZ0JBQWdCO0lBVTNCLEtBQUssQ0FBQyxTQUFTO1FBQ2IsSUFBSSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLGdCQUFnQjtZQUFFLE9BQU87UUFFbkQsTUFBTSxJQUFJLEdBQUcsTUFBTSxJQUFJLENBQUMsbUJBQW1CLENBQUMsZUFBZSxFQUFFLENBQUM7UUFDOUQsSUFBSSxDQUFDLElBQUk7WUFBRSxPQUFPO1FBRWxCLE1BQU0sU0FBUyxHQUFHLElBQUksQ0FBQyxHQUFHLEVBQUUsQ0FBQztRQUM3QixJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxzSEFBc0gsRUFDckksSUFBSSxDQUFDLE1BQU0sRUFBRSxJQUFJLENBQUMsVUFBVSxFQUFFLElBQUksQ0FBQyxRQUFRLEVBQUUsSUFBSSxDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsU0FBUyxFQUN0RSxTQUFTLEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFDO1FBQ3hDLElBQUk7WUFDRixNQUFNLElBQUksQ0FBQyxtQkFBbUIsQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDLENBQUM7U0FDbEQ7UUFBQyxPQUFPLEdBQUcsRUFBRTtZQUNaLE1BQU0sR0FBRyxHQUFHLElBQUksQ0FBQyxHQUFHLEVBQUUsR0FBRyxTQUFTLENBQUM7WUFDbkMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsc0ZBQXNGLEVBQ3JHLElBQUksQ0FBQyxNQUFNLEVBQUUsSUFBSSxDQUFDLFVBQVUsRUFBRSxHQUFHLEVBQUUsR0FBRyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1lBQ2xELElBQUksSUFBQSwwQkFBYyxFQUFDLEdBQUcsQ0FBQyxFQUFFO2dCQUN2QixJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQzthQUN2QjtpQkFBTTtnQkFDTCxJQUFJLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQzthQUN4QjtZQUNELE9BQU87U0FDUjtRQUNELE1BQU0sR0FBRyxHQUFHLElBQUksQ0FBQyxHQUFHLEVBQUUsR0FBRyxTQUFTLENBQUM7UUFDbkMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsNkVBQTZFLEVBQzVGLElBQUksQ0FBQyxNQUFNLEVBQUUsSUFBSSxDQUFDLFVBQVUsRUFBRSxHQUFHLENBQUMsQ0FBQztJQUN2QyxDQUFDO0NBQ0YsQ0FBQTtBQXJDWSw0Q0FBZ0I7QUFFVjtJQURoQixJQUFBLGFBQU0sR0FBRTs4QkFDNkIseUNBQW1COzZEQUFDO0FBR3pDO0lBRGhCLElBQUEsYUFBTSxHQUFFOztnREFDNkI7QUFHckI7SUFEaEIsSUFBQSxhQUFNLEdBQUU7O2dEQUMwQjsyQkFSeEIsZ0JBQWdCO0lBTjVCLElBQUEsbUJBQVEsRUFBaUI7UUFDeEIsSUFBSSxFQUFFLHVCQUFZLENBQUMsR0FBRztRQUN0QixZQUFZLEVBQUU7WUFDWixRQUFRLEVBQUUsS0FBSztTQUNoQjtLQUNGLENBQUM7R0FDVyxnQkFBZ0IsQ0FxQzVCIn0=
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { AuthorType, CnpmcorePatchInfo, PackageManifestType } from './PackageRepository';
|
|
2
|
+
import { estypes } from '@elastic/elasticsearch';
|
|
2
3
|
export type SearchJSONPickKey = '_rev' | 'name' | 'description' | 'keywords' | 'license' | 'maintainers' | 'dist-tags' | '_source_registry_name';
|
|
3
4
|
export type SearchMappingType = Pick<PackageManifestType, SearchJSONPickKey> & CnpmcorePatchInfo & {
|
|
4
5
|
scope: string;
|
|
@@ -21,7 +22,7 @@ export type SearchManifestType = {
|
|
|
21
22
|
};
|
|
22
23
|
export declare class SearchRepository {
|
|
23
24
|
private readonly searchAdapter;
|
|
24
|
-
searchPackage(query: any): Promise<
|
|
25
|
+
searchPackage(query: any): Promise<estypes.SearchHitsMetadata<SearchManifestType>>;
|
|
25
26
|
upsertPackage(document: SearchManifestType): Promise<string>;
|
|
26
27
|
removePackage(fullname: string): Promise<string>;
|
|
27
28
|
}
|
|
@@ -32,4 +32,4 @@ exports.SearchRepository = SearchRepository = __decorate([
|
|
|
32
32
|
accessLevel: tegg_1.AccessLevel.PUBLIC,
|
|
33
33
|
})
|
|
34
34
|
], SearchRepository);
|
|
35
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
35
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2VhcmNoUmVwb3NpdG9yeS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL2FwcC9yZXBvc2l0b3J5L1NlYXJjaFJlcG9zaXRvcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7O0FBQUEsc0NBQWtFO0FBZ0MzRCxJQUFNLGdCQUFnQixHQUF0QixNQUFNLGdCQUFnQjtJQUszQixLQUFLLENBQUMsYUFBYSxDQUFDLEtBQUs7UUFDdkIsT0FBTyxNQUFNLElBQUksQ0FBQyxhQUFhLENBQUMsTUFBTSxDQUFxQixLQUFLLENBQUMsQ0FBQztJQUNwRSxDQUFDO0lBRUQsS0FBSyxDQUFDLGFBQWEsQ0FBQyxRQUE0QjtRQUM5QyxPQUFPLE1BQU0sSUFBSSxDQUFDLGFBQWEsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUUsUUFBUSxDQUFDLENBQUM7SUFDMUUsQ0FBQztJQUVELEtBQUssQ0FBQyxhQUFhLENBQUMsUUFBZ0I7UUFDbEMsT0FBTyxNQUFNLElBQUksQ0FBQyxhQUFhLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQ25ELENBQUM7Q0FDRixDQUFBO0FBaEJZLDRDQUFnQjtBQUVWO0lBRGhCLElBQUEsYUFBTSxHQUFFOzt1REFDcUM7MkJBRm5DLGdCQUFnQjtJQUg1QixJQUFBLHFCQUFjLEVBQUM7UUFDZCxXQUFXLEVBQUUsa0JBQVcsQ0FBQyxNQUFNO0tBQ2hDLENBQUM7R0FDVyxnQkFBZ0IsQ0FnQjVCIn0=
|
|
@@ -178,6 +178,7 @@ exports.default = (appInfo) => {
|
|
|
178
178
|
config.typeboxValidate = { patchAjv: typebox_1.patchAjv };
|
|
179
179
|
config.httpclient = {
|
|
180
180
|
useHttpClientNext: true,
|
|
181
|
+
allowH2: true,
|
|
181
182
|
};
|
|
182
183
|
config.view = {
|
|
183
184
|
root: (0, node_path_1.join)(appInfo.baseDir, 'app/port'),
|
|
@@ -202,4 +203,4 @@ exports.default = (appInfo) => {
|
|
|
202
203
|
}
|
|
203
204
|
return config;
|
|
204
205
|
};
|
|
205
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
206
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"config.default.js","sourceRoot":"","sources":["../../config/config.default.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "cnpmcore",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.68.0",
|
|
4
4
|
"description": "npm core",
|
|
5
5
|
"files": [
|
|
6
6
|
"dist/**/*"
|
|
@@ -146,6 +146,6 @@
|
|
|
146
146
|
},
|
|
147
147
|
"homepage": "https://github.com/cnpm/npmcore#readme",
|
|
148
148
|
"engines": {
|
|
149
|
-
"node": ">=
|
|
149
|
+
"node": ">= 18.20.0"
|
|
150
150
|
}
|
|
151
151
|
}
|