cnpmcore 2.4.0 → 2.4.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/History.md
CHANGED
|
@@ -1,4 +1,14 @@
|
|
|
1
1
|
|
|
2
|
+
2.4.1 / 2022-10-28
|
|
3
|
+
==================
|
|
4
|
+
|
|
5
|
+
**features**
|
|
6
|
+
* [[`92350a8`](http://github.com/cnpm/cnpmcore/commit/92350a864313ee42a048d9e83886ef42db3419de)] - 👌 IMPROVE: Show changes stream create task log (#347) (fengmk2 <<fengmk2@gmail.com>>)
|
|
7
|
+
|
|
8
|
+
**fixes**
|
|
9
|
+
* [[`28eeeaf`](http://github.com/cnpm/cnpmcore/commit/28eeeafd9870c6b1c5b4f4c23916f6ae73ddda12)] - fix: registry host config (#346) (elrrrrrrr <<elrrrrrrr@gmail.com>>)
|
|
10
|
+
* [[`cd5bd92`](http://github.com/cnpm/cnpmcore/commit/cd5bd923b8d47bf90b5f077ce04777b38653b850)] - 🐛 FIX: Catch all error on changes stream handler (#344) (fengmk2 <<fengmk2@gmail.com>>)
|
|
11
|
+
|
|
2
12
|
2.4.0 / 2022-10-25
|
|
3
13
|
==================
|
|
4
14
|
|
|
@@ -21,7 +21,7 @@ export declare class NPMRegistry {
|
|
|
21
21
|
contentDownload: number;
|
|
22
22
|
} | undefined;
|
|
23
23
|
};
|
|
24
|
-
method: import("_undici@5.
|
|
24
|
+
method: import("_undici@5.12.0@undici/types/dispatcher").HttpMethod;
|
|
25
25
|
url: string;
|
|
26
26
|
}>;
|
|
27
27
|
createSyncTask(fullname: string): Promise<{
|
|
@@ -38,7 +38,7 @@ export declare class NPMRegistry {
|
|
|
38
38
|
contentDownload: number;
|
|
39
39
|
} | undefined;
|
|
40
40
|
};
|
|
41
|
-
method: import("_undici@5.
|
|
41
|
+
method: import("_undici@5.12.0@undici/types/dispatcher").HttpMethod;
|
|
42
42
|
url: string;
|
|
43
43
|
}>;
|
|
44
44
|
getSyncTask(fullname: string, id: string, offset: number): Promise<{
|
|
@@ -55,7 +55,7 @@ export declare class NPMRegistry {
|
|
|
55
55
|
contentDownload: number;
|
|
56
56
|
} | undefined;
|
|
57
57
|
};
|
|
58
|
-
method: import("_undici@5.
|
|
58
|
+
method: import("_undici@5.12.0@undici/types/dispatcher").HttpMethod;
|
|
59
59
|
url: string;
|
|
60
60
|
}>;
|
|
61
61
|
getDownloadRanges(registry: string, fullname: string, start: string, end: string): Promise<{
|
|
@@ -72,7 +72,7 @@ export declare class NPMRegistry {
|
|
|
72
72
|
contentDownload: number;
|
|
73
73
|
} | undefined;
|
|
74
74
|
};
|
|
75
|
-
method: import("_undici@5.
|
|
75
|
+
method: import("_undici@5.12.0@undici/types/dispatcher").HttpMethod;
|
|
76
76
|
url: string;
|
|
77
77
|
}>;
|
|
78
78
|
private request;
|
|
@@ -17,6 +17,7 @@ const Task_1 = require("../../common/enum/Task");
|
|
|
17
17
|
const AbstractService_1 = require("../../common/AbstractService");
|
|
18
18
|
const Task_2 = require("../entity/Task");
|
|
19
19
|
const PackageSyncerService_1 = require("./PackageSyncerService");
|
|
20
|
+
const Registry_1 = require("../../common/enum/Registry");
|
|
20
21
|
const egg_errors_1 = require("egg-errors");
|
|
21
22
|
const AbstractChangesStream_1 = require("../../common/adapter/changesStream/AbstractChangesStream");
|
|
22
23
|
const PackageUtil_1 = require("../../common/PackageUtil");
|
|
@@ -77,14 +78,14 @@ let ChangesStreamService = class ChangesStreamService extends AbstractService_1.
|
|
|
77
78
|
return registry;
|
|
78
79
|
}
|
|
79
80
|
// 从配置文件默认生成
|
|
80
|
-
const { changesStreamRegistryMode, changesStreamRegistry: host } = this.config.cnpmcore;
|
|
81
|
-
const type = changesStreamRegistryMode === 'json' ?
|
|
81
|
+
const { changesStreamRegistryMode, changesStreamRegistry: changesStreamHost, sourceRegistry: host } = this.config.cnpmcore;
|
|
82
|
+
const type = changesStreamRegistryMode === 'json' ? Registry_1.RegistryType.Cnpmcore : Registry_1.RegistryType.Npm;
|
|
82
83
|
const registry = await this.registryManagerService.createRegistry({
|
|
83
84
|
name: 'default',
|
|
84
|
-
type
|
|
85
|
+
type,
|
|
85
86
|
userPrefix: 'npm:',
|
|
86
87
|
host,
|
|
87
|
-
changeStream: `${
|
|
88
|
+
changeStream: `${changesStreamHost}/_changes`,
|
|
88
89
|
});
|
|
89
90
|
task.data = {
|
|
90
91
|
...(task.data || {}),
|
|
@@ -141,21 +142,26 @@ let ChangesStreamService = class ChangesStreamService extends AbstractService_1.
|
|
|
141
142
|
const valid = await this.needSync(registry, fullname);
|
|
142
143
|
if (valid) {
|
|
143
144
|
taskCount++;
|
|
145
|
+
const tips = `Sync cause by changes_stream(${registry.changeStream}) update seq: ${seq}`;
|
|
144
146
|
try {
|
|
145
|
-
await this.packageSyncerService.createTask(fullname, {
|
|
147
|
+
const task = await this.packageSyncerService.createTask(fullname, {
|
|
146
148
|
authorIp: Task_2.HOST_NAME,
|
|
147
149
|
authorId: 'ChangesStreamService',
|
|
148
150
|
registryId: registry.registryId,
|
|
149
151
|
skipDependencies: true,
|
|
150
|
-
tips
|
|
152
|
+
tips,
|
|
151
153
|
});
|
|
154
|
+
this.logger.info('[ChangesStreamService.createTask:success] fullname: %s, task: %s, tips: %s', fullname, task.id, tips);
|
|
152
155
|
}
|
|
153
|
-
catch (
|
|
154
|
-
if (
|
|
155
|
-
this.logger.warn('[ChangesStreamService.executeSync:skip] %s',
|
|
156
|
+
catch (err) {
|
|
157
|
+
if (err instanceof PackageSyncerService_1.RegistryNotMatchError) {
|
|
158
|
+
this.logger.warn('[ChangesStreamService.executeSync:skip] fullname: %s, error: %s, tips: %s', fullname, err, tips);
|
|
156
159
|
continue;
|
|
157
160
|
}
|
|
158
|
-
|
|
161
|
+
// only log error, make sure changes still reading
|
|
162
|
+
this.logger.error('[ChangesStreamService.executeSync:error] fullname: %s, error: %s, tips: %s', fullname, err, tips);
|
|
163
|
+
this.logger.error(err);
|
|
164
|
+
continue;
|
|
159
165
|
}
|
|
160
166
|
}
|
|
161
167
|
// 实时更新 task 信息
|
|
@@ -206,4 +212,4 @@ ChangesStreamService = __decorate([
|
|
|
206
212
|
})
|
|
207
213
|
], ChangesStreamService);
|
|
208
214
|
exports.ChangesStreamService = ChangesStreamService;
|
|
209
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
215
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ChangesStreamService.js","sourceRoot":"","sources":["../../../../app/core/service/ChangesStreamService.ts"],"names":[],"mappings":"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"}
|