cnpmcore 3.1.1 → 3.2.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/adapter/binary/AbstractBinary.d.ts +8 -7
- package/dist/app/common/adapter/binary/AbstractBinary.js +20 -11
- package/dist/app/common/adapter/binary/ApiBinary.d.ts +2 -5
- package/dist/app/common/adapter/binary/ApiBinary.js +21 -9
- package/dist/app/common/adapter/binary/BucketBinary.d.ts +3 -2
- package/dist/app/common/adapter/binary/BucketBinary.js +23 -9
- package/dist/app/common/adapter/binary/CypressBinary.js +15 -3
- package/dist/app/common/adapter/binary/ElectronBinary.js +22 -5
- package/dist/app/common/adapter/binary/GithubBinary.d.ts +4 -3
- package/dist/app/common/adapter/binary/GithubBinary.js +29 -12
- package/dist/app/common/adapter/binary/ImageminBinary.d.ts +1 -2
- package/dist/app/common/adapter/binary/ImageminBinary.js +87 -73
- package/dist/app/common/adapter/binary/NodeBinary.d.ts +1 -1
- package/dist/app/common/adapter/binary/NodeBinary.js +23 -6
- package/dist/app/common/adapter/binary/NodePreGypBinary.d.ts +1 -2
- package/dist/app/common/adapter/binary/NodePreGypBinary.js +196 -144
- package/dist/app/common/adapter/binary/NwjsBinary.js +23 -5
- package/dist/app/common/adapter/binary/PlaywrightBinary.js +15 -3
- package/dist/app/common/adapter/binary/PuppeteerBinary.js +15 -3
- package/dist/app/common/adapter/binary/SqlcipherBinary.d.ts +0 -1
- package/dist/app/common/adapter/binary/SqlcipherBinary.js +78 -68
- package/dist/app/common/constants.d.ts +1 -0
- package/dist/app/common/constants.js +3 -2
- package/dist/app/common/enum/Binary.d.ts +14 -0
- package/dist/app/common/enum/Binary.js +19 -0
- package/dist/app/core/service/BinarySyncerService.d.ts +2 -1
- package/dist/app/core/service/BinarySyncerService.js +17 -61
- package/dist/app/core/service/CacheService.d.ts +21 -14
- package/dist/app/core/service/CacheService.js +2 -1
- package/dist/app/core/service/ChangesStreamService.js +3 -2
- package/dist/app/port/controller/HomeController.d.ts +27 -28
- package/dist/app/port/controller/HomeController.js +8 -1
- package/dist/app/port/schedule/UpdateTotalData.d.ts +2 -0
- package/dist/app/port/schedule/UpdateTotalData.js +33 -5
- package/dist/app/repository/PackageRepository.d.ts +3 -0
- package/dist/app/repository/PackageRepository.js +30 -6
- package/dist/app/repository/TaskRepository.d.ts +5 -0
- package/dist/app/repository/TaskRepository.js +5 -1
- package/dist/config/binaries.d.ts +2 -14
- package/dist/config/binaries.js +81 -95
- package/package.json +1 -1
|
@@ -1,37 +1,36 @@
|
|
|
1
1
|
import { EggContext } from '@eggjs/tegg';
|
|
2
2
|
import { AbstractController } from './AbstractController';
|
|
3
|
+
import { DownloadInfo, UpstreamRegistryInfo } from '../../core/service/CacheService';
|
|
4
|
+
type SiteTotalData = LegacyInfo & SiteEnvInfo & TotalInfo;
|
|
5
|
+
type LegacyInfo = {
|
|
6
|
+
source_registry: string;
|
|
7
|
+
changes_stream_registry: string;
|
|
8
|
+
sync_changes_steam: any;
|
|
9
|
+
};
|
|
10
|
+
type SiteEnvInfo = {
|
|
11
|
+
sync_model: string;
|
|
12
|
+
sync_binary: string;
|
|
13
|
+
instance_start_time: Date;
|
|
14
|
+
node_version: string;
|
|
15
|
+
app_version: string;
|
|
16
|
+
engine: string;
|
|
17
|
+
cache_time: string;
|
|
18
|
+
};
|
|
19
|
+
type TotalInfo = {
|
|
20
|
+
last_package: string;
|
|
21
|
+
last_package_version: string;
|
|
22
|
+
doc_count: number | bigint;
|
|
23
|
+
doc_version_count: number | bigint;
|
|
24
|
+
update_seq: number | bigint;
|
|
25
|
+
download: DownloadInfo;
|
|
26
|
+
upstream_registries?: UpstreamRegistryInfo[];
|
|
27
|
+
};
|
|
3
28
|
export declare class HomeController extends AbstractController {
|
|
4
29
|
private readonly cacheService;
|
|
5
|
-
showTotal(): Promise<
|
|
6
|
-
last_package: string;
|
|
7
|
-
last_package_version: string;
|
|
8
|
-
doc_count: number;
|
|
9
|
-
doc_version_count: number;
|
|
10
|
-
download: {
|
|
11
|
-
today: number;
|
|
12
|
-
yesterday: number;
|
|
13
|
-
samedayLastweek: number;
|
|
14
|
-
thisweek: number;
|
|
15
|
-
thismonth: number;
|
|
16
|
-
thisyear: number;
|
|
17
|
-
lastweek: number;
|
|
18
|
-
lastmonth: number;
|
|
19
|
-
lastyear: number;
|
|
20
|
-
};
|
|
21
|
-
update_seq: number | bigint;
|
|
22
|
-
sync_model: any;
|
|
23
|
-
sync_changes_steam: object;
|
|
24
|
-
sync_binary: any;
|
|
25
|
-
instance_start_time: Date;
|
|
26
|
-
node_version: string;
|
|
27
|
-
app_version: any;
|
|
28
|
-
engine: any;
|
|
29
|
-
source_registry: any;
|
|
30
|
-
changes_stream_registry: any;
|
|
31
|
-
cache_time: string;
|
|
32
|
-
}>;
|
|
30
|
+
showTotal(): Promise<SiteTotalData>;
|
|
33
31
|
ping(ctx: EggContext): Promise<{
|
|
34
32
|
pong: boolean;
|
|
35
33
|
use: number;
|
|
36
34
|
}>;
|
|
37
35
|
}
|
|
36
|
+
export {};
|
|
@@ -15,6 +15,9 @@ const tegg_1 = require("@eggjs/tegg");
|
|
|
15
15
|
const AbstractController_1 = require("./AbstractController");
|
|
16
16
|
const startTime = new Date();
|
|
17
17
|
let HomeController = class HomeController extends AbstractController_1.AbstractController {
|
|
18
|
+
// 2023-1-20
|
|
19
|
+
// 原有 LegacyInfo 字段继续保留,由于 ChangesStream 信息通过 registry 表配置,可能会过期
|
|
20
|
+
// 新增 upstream_registries 字段,展示上游源站 registry 信息列表
|
|
18
21
|
async showTotal() {
|
|
19
22
|
const totalData = await this.cacheService.getTotalData();
|
|
20
23
|
const data = {
|
|
@@ -34,6 +37,7 @@ let HomeController = class HomeController extends AbstractController_1.AbstractC
|
|
|
34
37
|
source_registry: this.config.cnpmcore.sourceRegistry,
|
|
35
38
|
changes_stream_registry: this.config.cnpmcore.changesStreamRegistry,
|
|
36
39
|
cache_time: totalData.cacheTime,
|
|
40
|
+
upstream_registries: totalData.upstreamRegistries,
|
|
37
41
|
};
|
|
38
42
|
return data;
|
|
39
43
|
}
|
|
@@ -56,6 +60,9 @@ __decorate([
|
|
|
56
60
|
path: '/',
|
|
57
61
|
method: tegg_1.HTTPMethodEnum.GET,
|
|
58
62
|
})
|
|
63
|
+
// 2023-1-20
|
|
64
|
+
// 原有 LegacyInfo 字段继续保留,由于 ChangesStream 信息通过 registry 表配置,可能会过期
|
|
65
|
+
// 新增 upstream_registries 字段,展示上游源站 registry 信息列表
|
|
59
66
|
], HomeController.prototype, "showTotal", null);
|
|
60
67
|
__decorate([
|
|
61
68
|
(0, tegg_1.HTTPMethod)({
|
|
@@ -69,4 +76,4 @@ HomeController = __decorate([
|
|
|
69
76
|
(0, tegg_1.HTTPController)()
|
|
70
77
|
], HomeController);
|
|
71
78
|
exports.HomeController = HomeController;
|
|
72
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
79
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSG9tZUNvbnRyb2xsZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9hcHAvcG9ydC9jb250cm9sbGVyL0hvbWVDb250cm9sbGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7OztBQUFBLDJDQUF5QztBQUN6QyxzQ0FPcUI7QUFDckIsNkRBQTBEO0FBRzFELE1BQU0sU0FBUyxHQUFHLElBQUksSUFBSSxFQUFFLENBQUM7QUFxQ3RCLElBQU0sY0FBYyxHQUFwQixNQUFNLGNBQWUsU0FBUSx1Q0FBa0I7SUFhOUMsQUFITixZQUFZO0lBQ1osZ0VBQWdFO0lBQ2hFLGlEQUFpRDtJQUNqRCxLQUFLLENBQUMsU0FBUztRQUNiLE1BQU0sU0FBUyxHQUFHLE1BQU0sSUFBSSxDQUFDLFlBQVksQ0FBQyxZQUFZLEVBQUUsQ0FBQztRQUN6RCxNQUFNLElBQUksR0FBa0I7WUFDMUIsWUFBWSxFQUFFLFNBQVMsQ0FBQyxXQUFXO1lBQ25DLG9CQUFvQixFQUFFLFNBQVMsQ0FBQyxrQkFBa0I7WUFDbEQsU0FBUyxFQUFFLFNBQVMsQ0FBQyxZQUFZO1lBQ2pDLGlCQUFpQixFQUFFLFNBQVMsQ0FBQyxtQkFBbUI7WUFDaEQsUUFBUSxFQUFFLFNBQVMsQ0FBQyxRQUFRO1lBQzVCLFVBQVUsRUFBRSxTQUFTLENBQUMsWUFBWTtZQUNsQyxVQUFVLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsUUFBUTtZQUN6QyxrQkFBa0IsRUFBRSxTQUFTLENBQUMsYUFBYTtZQUMzQyxXQUFXLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsZ0JBQWdCO1lBQ2xELG1CQUFtQixFQUFFLFNBQVM7WUFDOUIsWUFBWSxFQUFFLE9BQU8sQ0FBQyxPQUFPO1lBQzdCLFdBQVcsRUFBRSxJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxPQUFPO1lBQ3BDLE1BQU0sRUFBRSxJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxNQUFNO1lBQzlCLGVBQWUsRUFBRSxJQUFJLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxjQUFjO1lBQ3BELHVCQUF1QixFQUFFLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLHFCQUFxQjtZQUNuRSxVQUFVLEVBQUUsU0FBUyxDQUFDLFNBQVM7WUFDL0IsbUJBQW1CLEVBQUUsU0FBUyxDQUFDLGtCQUFrQjtTQUNsRCxDQUFDO1FBQ0YsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBRUQsOERBQThEO0lBQzlELCtDQUErQztJQU16QyxBQUFOLEtBQUssQ0FBQyxJQUFJLENBQVksR0FBZTtRQUNuQyxPQUFPO1lBQ0wsSUFBSSxFQUFFLElBQUk7WUFDVixHQUFHLEVBQUUsd0JBQVcsQ0FBQyxHQUFHLEVBQUUsR0FBRyxHQUFHLENBQUMsb0JBQXFCO1NBQ25ELENBQUM7SUFDSixDQUFDO0NBQ0YsQ0FBQTtBQWhEQztJQURDLElBQUEsYUFBTSxHQUFFO29EQUNtQztBQVd0QztJQVRMLElBQUEsaUJBQVUsRUFBQztRQUNWLFFBQVE7UUFDUiw2RUFBNkU7UUFDN0UsSUFBSSxFQUFFLEdBQUc7UUFDVCxNQUFNLEVBQUUscUJBQWMsQ0FBQyxHQUFHO0tBQzNCLENBQUM7SUFDRixZQUFZO0lBQ1osZ0VBQWdFO0lBQ2hFLGlEQUFpRDsrQ0F1QmhEO0FBU0s7SUFMTCxJQUFBLGlCQUFVLEVBQUM7UUFDVixjQUFjO1FBQ2QsSUFBSSxFQUFFLFNBQVM7UUFDZixNQUFNLEVBQUUscUJBQWMsQ0FBQyxHQUFHO0tBQzNCLENBQUM7SUFDVSxXQUFBLElBQUEsY0FBTyxHQUFFLENBQUE7MENBS3BCO0FBakRVLGNBQWM7SUFEMUIsSUFBQSxxQkFBYyxHQUFFO0dBQ0osY0FBYyxDQWtEMUI7QUFsRFksd0NBQWMifQ==
|
|
@@ -5,5 +5,7 @@ export declare class UpdateTotalData {
|
|
|
5
5
|
private readonly changeRepository;
|
|
6
6
|
private readonly packageVersionDownloadRepository;
|
|
7
7
|
private readonly cacheService;
|
|
8
|
+
private readonly registryManagerService;
|
|
9
|
+
private calculateDownloadInfo;
|
|
8
10
|
subscribe(): Promise<void>;
|
|
9
11
|
}
|
|
@@ -13,11 +13,11 @@ exports.UpdateTotalData = void 0;
|
|
|
13
13
|
const schedule_1 = require("@eggjs/tegg/schedule");
|
|
14
14
|
const tegg_1 = require("@eggjs/tegg");
|
|
15
15
|
const Task_1 = require("../../common/enum/Task");
|
|
16
|
+
const constants_1 = require("../../common/constants");
|
|
16
17
|
const dayjs_1 = __importDefault(require("../../common/dayjs"));
|
|
17
18
|
let UpdateTotalData = class UpdateTotalData {
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
const packageTotal = await this.packageRepository.queryTotal();
|
|
19
|
+
// 计算下载量相关信息,不区分不同 changesStream
|
|
20
|
+
async calculateDownloadInfo() {
|
|
21
21
|
const download = {
|
|
22
22
|
today: 0,
|
|
23
23
|
yesterday: 0,
|
|
@@ -77,14 +77,39 @@ let UpdateTotalData = class UpdateTotalData {
|
|
|
77
77
|
}
|
|
78
78
|
}
|
|
79
79
|
}
|
|
80
|
+
return download;
|
|
81
|
+
}
|
|
82
|
+
async subscribe() {
|
|
83
|
+
const packageTotal = await this.packageRepository.queryTotal();
|
|
84
|
+
const download = await this.calculateDownloadInfo();
|
|
80
85
|
const lastChange = await this.changeRepository.getLastChange();
|
|
81
86
|
const totalData = {
|
|
82
87
|
...packageTotal,
|
|
83
88
|
download,
|
|
84
|
-
changesStream: changesStreamTask && changesStreamTask.data || {},
|
|
85
89
|
lastChangeId: lastChange && lastChange.id || 0,
|
|
86
90
|
cacheTime: new Date().toISOString(),
|
|
91
|
+
changesStream: {},
|
|
92
|
+
upstreamRegistries: [],
|
|
87
93
|
};
|
|
94
|
+
const tasks = await this.taskRepository.findTasksByCondition({ type: Task_1.TaskType.ChangesStream });
|
|
95
|
+
for (const task of tasks) {
|
|
96
|
+
// 全局 changesStream
|
|
97
|
+
const data = task.data;
|
|
98
|
+
// 补充录入 upstreamRegistries
|
|
99
|
+
const registry = await this.registryManagerService.findByRegistryId(data.registryId);
|
|
100
|
+
if (registry) {
|
|
101
|
+
totalData.upstreamRegistries.push({
|
|
102
|
+
...data,
|
|
103
|
+
source_registry: registry?.host,
|
|
104
|
+
changes_stream_url: registry?.changeStream,
|
|
105
|
+
registry_name: registry?.name,
|
|
106
|
+
});
|
|
107
|
+
}
|
|
108
|
+
// 兼容 LegacyInfo 字段
|
|
109
|
+
if (task.targetName === constants_1.GLOBAL_WORKER) {
|
|
110
|
+
totalData.changesStream = data;
|
|
111
|
+
}
|
|
112
|
+
}
|
|
88
113
|
await this.cacheService.saveTotalData(totalData);
|
|
89
114
|
this.logger.info('[UpdateTotalData.subscribe] total data: %j', totalData);
|
|
90
115
|
}
|
|
@@ -107,6 +132,9 @@ __decorate([
|
|
|
107
132
|
__decorate([
|
|
108
133
|
(0, tegg_1.Inject)()
|
|
109
134
|
], UpdateTotalData.prototype, "cacheService", void 0);
|
|
135
|
+
__decorate([
|
|
136
|
+
(0, tegg_1.Inject)()
|
|
137
|
+
], UpdateTotalData.prototype, "registryManagerService", void 0);
|
|
110
138
|
UpdateTotalData = __decorate([
|
|
111
139
|
(0, schedule_1.Schedule)({
|
|
112
140
|
type: schedule_1.ScheduleType.WORKER,
|
|
@@ -119,4 +147,4 @@ UpdateTotalData = __decorate([
|
|
|
119
147
|
})
|
|
120
148
|
], UpdateTotalData);
|
|
121
149
|
exports.UpdateTotalData = UpdateTotalData;
|
|
122
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
150
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVXBkYXRlVG90YWxEYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vYXBwL3BvcnQvc2NoZWR1bGUvVXBkYXRlVG90YWxEYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7OztBQUNBLG1EQUE4RTtBQUM5RSxzQ0FBcUM7QUFRckMsaURBQWtEO0FBQ2xELHNEQUF1RDtBQUN2RCwrREFBdUM7QUFXaEMsSUFBTSxlQUFlLEdBQXJCLE1BQU0sZUFBZTtJQXNCMUIsZ0NBQWdDO0lBQ3hCLEtBQUssQ0FBQyxxQkFBcUI7UUFDakMsTUFBTSxRQUFRLEdBQWlCO1lBQzdCLEtBQUssRUFBRSxDQUFDO1lBQ1IsU0FBUyxFQUFFLENBQUM7WUFDWixlQUFlLEVBQUUsQ0FBQztZQUNsQixRQUFRLEVBQUUsQ0FBQztZQUNYLFNBQVMsRUFBRSxDQUFDO1lBQ1osUUFBUSxFQUFFLENBQUM7WUFDWCxRQUFRLEVBQUUsQ0FBQztZQUNYLFNBQVMsRUFBRSxDQUFDO1lBQ1osUUFBUSxFQUFFLENBQUM7U0FDWixDQUFDO1FBQ0YsTUFBTSxLQUFLLEdBQUcsSUFBQSxlQUFLLEdBQUUsQ0FBQztRQUN0QixNQUFNLGdCQUFnQixHQUFHLEtBQUssQ0FBQyxRQUFRLENBQUMsQ0FBQyxFQUFFLE1BQU0sQ0FBQyxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUNuRSxNQUFNLElBQUksR0FBRyxNQUFNLElBQUksQ0FBQyxnQ0FBZ0MsQ0FBQyxLQUFLLENBQUMsT0FBTyxFQUFFLGdCQUFnQixDQUFDLE1BQU0sRUFBRSxFQUFFLEtBQUssQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQUFDO1FBQ25ILElBQUksSUFBSSxDQUFDLE1BQU0sR0FBRyxDQUFDLEVBQUU7WUFDbkIsTUFBTSxRQUFRLEdBQUcsTUFBTSxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQztZQUNsRCxNQUFNLFlBQVksR0FBRyxNQUFNLENB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
|
|
@@ -13,6 +13,8 @@ export declare class PackageRepository extends AbstractRepository {
|
|
|
13
13
|
private readonly PackageTag;
|
|
14
14
|
private readonly Maintainer;
|
|
15
15
|
private readonly User;
|
|
16
|
+
private readonly config;
|
|
17
|
+
private readonly orm;
|
|
16
18
|
findPackage(scope: string, name: string): Promise<PackageEntity | null>;
|
|
17
19
|
findPackageId(scope: string, name: string): Promise<string | null>;
|
|
18
20
|
savePackage(pkgEntity: PackageEntity): Promise<void>;
|
|
@@ -32,6 +34,7 @@ export declare class PackageRepository extends AbstractRepository {
|
|
|
32
34
|
removePackageVersion(pkgVersion: PackageVersionEntity): Promise<void>;
|
|
33
35
|
savePackageVersionManifest(manifestEntity: PackageVersionManifestEntity): Promise<void>;
|
|
34
36
|
findPackageVersionManifest(packageVersionId: string): Promise<PackageVersionManifestModel | null>;
|
|
37
|
+
private getCountSql;
|
|
35
38
|
queryTotal(): Promise<{
|
|
36
39
|
packageCount: number;
|
|
37
40
|
packageVersionCount: number;
|
|
@@ -8,9 +8,11 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.PackageRepository = void 0;
|
|
10
10
|
const tegg_1 = require("@eggjs/tegg");
|
|
11
|
-
const Package_1 = require("
|
|
11
|
+
const Package_1 = require("./model/Package");
|
|
12
|
+
const Package_2 = require("../core/entity/Package");
|
|
12
13
|
const ModelConvertor_1 = require("./util/ModelConvertor");
|
|
13
14
|
const PackageVersion_1 = require("../core/entity/PackageVersion");
|
|
15
|
+
const PackageVersion_2 = require("./model/PackageVersion");
|
|
14
16
|
const Dist_1 = require("../core/entity/Dist");
|
|
15
17
|
const PackageTag_1 = require("../core/entity/PackageTag");
|
|
16
18
|
const User_1 = require("../core/entity/User");
|
|
@@ -26,7 +28,7 @@ let PackageRepository = class PackageRepository extends AbstractRepository_1.Abs
|
|
|
26
28
|
manifestsDist: manifestsDistModel && ModelConvertor_1.ModelConvertor.convertModelToEntity(manifestsDistModel, Dist_1.Dist),
|
|
27
29
|
abbreviatedsDist: abbreviatedsDistModel && ModelConvertor_1.ModelConvertor.convertModelToEntity(abbreviatedsDistModel, Dist_1.Dist),
|
|
28
30
|
};
|
|
29
|
-
const entity = ModelConvertor_1.ModelConvertor.convertModelToEntity(model,
|
|
31
|
+
const entity = ModelConvertor_1.ModelConvertor.convertModelToEntity(model, Package_2.Package, data);
|
|
30
32
|
return entity;
|
|
31
33
|
}
|
|
32
34
|
async findPackageId(scope, name) {
|
|
@@ -117,7 +119,7 @@ let PackageRepository = class PackageRepository extends AbstractRepository_1.Abs
|
|
|
117
119
|
async listPackagesByUserId(userId) {
|
|
118
120
|
const models = await this.Maintainer.find({ userId });
|
|
119
121
|
const packageModels = await this.Package.find({ packageId: models.map(m => m.packageId) });
|
|
120
|
-
return packageModels.map(pkg => ModelConvertor_1.ModelConvertor.convertModelToEntity(pkg,
|
|
122
|
+
return packageModels.map(pkg => ModelConvertor_1.ModelConvertor.convertModelToEntity(pkg, Package_2.Package));
|
|
121
123
|
}
|
|
122
124
|
async createPackageVersion(pkgVersionEntity) {
|
|
123
125
|
await this.PackageVersion.transaction(async (transaction) => {
|
|
@@ -201,6 +203,19 @@ let PackageRepository = class PackageRepository extends AbstractRepository_1.Abs
|
|
|
201
203
|
return null;
|
|
202
204
|
return ModelConvertor_1.ModelConvertor.convertModelToEntity(model, this.PackageVersionManifest);
|
|
203
205
|
}
|
|
206
|
+
getCountSql(model) {
|
|
207
|
+
const { database } = this.config.orm;
|
|
208
|
+
const sql = `
|
|
209
|
+
SELECT
|
|
210
|
+
TABLE_ROWS
|
|
211
|
+
FROM
|
|
212
|
+
information_schema.tables
|
|
213
|
+
WHERE
|
|
214
|
+
table_schema = '${database}'
|
|
215
|
+
AND table_name = '${model.table}'
|
|
216
|
+
`;
|
|
217
|
+
return sql;
|
|
218
|
+
}
|
|
204
219
|
async queryTotal() {
|
|
205
220
|
const lastPkg = await this.Package.findOne().order('id', 'desc');
|
|
206
221
|
const lastVersion = await this.PackageVersion.findOne().order('id', 'desc');
|
|
@@ -211,7 +226,9 @@ let PackageRepository = class PackageRepository extends AbstractRepository_1.Abs
|
|
|
211
226
|
if (lastPkg) {
|
|
212
227
|
lastPackage = lastPkg.scope ? `${lastPkg.scope}/${lastPkg.name}` : lastPkg.name;
|
|
213
228
|
// FIXME: id will be out of range number
|
|
214
|
-
|
|
229
|
+
// 可能存在 id 增长不连续的情况,通过 count 查询
|
|
230
|
+
const queryRes = await this.orm.client.query(this.getCountSql(Package_1.Package));
|
|
231
|
+
packageCount = queryRes.rows?.[0].TABLE_ROWS;
|
|
215
232
|
}
|
|
216
233
|
if (lastVersion) {
|
|
217
234
|
const pkg = await this.Package.findOne({ packageId: lastVersion.packageId });
|
|
@@ -219,7 +236,8 @@ let PackageRepository = class PackageRepository extends AbstractRepository_1.Abs
|
|
|
219
236
|
const fullname = pkg.scope ? `${pkg.scope}/${pkg.name}` : pkg.name;
|
|
220
237
|
lastPackageVersion = `${fullname}@${lastVersion.version}`;
|
|
221
238
|
}
|
|
222
|
-
|
|
239
|
+
const queryRes = await this.orm.client.query(this.getCountSql(PackageVersion_2.PackageVersion));
|
|
240
|
+
packageVersionCount = queryRes.rows?.[0].TABLE_ROWS;
|
|
223
241
|
}
|
|
224
242
|
return {
|
|
225
243
|
packageCount,
|
|
@@ -299,10 +317,16 @@ __decorate([
|
|
|
299
317
|
__decorate([
|
|
300
318
|
(0, tegg_1.Inject)()
|
|
301
319
|
], PackageRepository.prototype, "User", void 0);
|
|
320
|
+
__decorate([
|
|
321
|
+
(0, tegg_1.Inject)()
|
|
322
|
+
], PackageRepository.prototype, "config", void 0);
|
|
323
|
+
__decorate([
|
|
324
|
+
(0, tegg_1.Inject)()
|
|
325
|
+
], PackageRepository.prototype, "orm", void 0);
|
|
302
326
|
PackageRepository = __decorate([
|
|
303
327
|
(0, tegg_1.SingletonProto)({
|
|
304
328
|
accessLevel: tegg_1.AccessLevel.PUBLIC,
|
|
305
329
|
})
|
|
306
330
|
], PackageRepository);
|
|
307
331
|
exports.PackageRepository = PackageRepository;
|
|
308
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PackageRepository.js","sourceRoot":"","sources":["../../../app/repository/PackageRepository.ts"],"names":[],"mappings":"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"}
|
|
332
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PackageRepository.js","sourceRoot":"","sources":["../../../app/repository/PackageRepository.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,11 @@ export declare class TaskRepository extends AbstractRepository {
|
|
|
10
10
|
findTask(taskId: string): Promise<TaskEntity<import("../core/entity/Task").TaskBaseData> | null>;
|
|
11
11
|
findTaskByBizId(bizId: string): Promise<TaskEntity<import("../core/entity/Task").TaskBaseData> | null>;
|
|
12
12
|
findTasks(taskIds: Array<string>): Promise<Array<TaskEntity>>;
|
|
13
|
+
findTasksByCondition(where: {
|
|
14
|
+
targetName?: string;
|
|
15
|
+
state?: TaskState;
|
|
16
|
+
type: TaskType;
|
|
17
|
+
}): Promise<Array<TaskEntity>>;
|
|
13
18
|
findTaskByTargetName(targetName: string, type: TaskType, state?: TaskState): Promise<TaskEntity<import("../core/entity/Task").TaskBaseData> | null>;
|
|
14
19
|
findTimeoutTasks(taskState: TaskState, timeout: number): Promise<TaskEntity<import("../core/entity/Task").TaskBaseData>[]>;
|
|
15
20
|
findTaskByAuthorIpAndType(authorIp: string, type: TaskType): Promise<TaskEntity<import("../core/entity/Task").TaskBaseData>[]>;
|
|
@@ -91,6 +91,10 @@ let TaskRepository = class TaskRepository extends AbstractRepository_1.AbstractR
|
|
|
91
91
|
const tasks = await this.HistoryTask.find({ taskId: { $in: taskIds } });
|
|
92
92
|
return tasks.map(task => ModelConvertor_1.ModelConvertor.convertModelToEntity(task, Task_1.Task));
|
|
93
93
|
}
|
|
94
|
+
async findTasksByCondition(where) {
|
|
95
|
+
const tasks = await this.Task.find(where);
|
|
96
|
+
return tasks.map(task => ModelConvertor_1.ModelConvertor.convertModelToEntity(task, Task_1.Task));
|
|
97
|
+
}
|
|
94
98
|
async findTaskByTargetName(targetName, type, state) {
|
|
95
99
|
const where = { targetName, type };
|
|
96
100
|
if (state) {
|
|
@@ -133,4 +137,4 @@ TaskRepository = __decorate([
|
|
|
133
137
|
})
|
|
134
138
|
], TaskRepository);
|
|
135
139
|
exports.TaskRepository = TaskRepository;
|
|
136
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
140
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVGFza1JlcG9zaXRvcnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9hcHAvcmVwb3NpdG9yeS9UYXNrUmVwb3NpdG9yeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7QUFBQSxvREFBNEI7QUFDNUIsc0NBQWtFO0FBQ2xFLDBEQUF1RDtBQUd2RCw4Q0FBOEU7QUFDOUUsNkRBQTBEO0FBTW5ELElBQU0sY0FBYyxHQUFwQixNQUFNLGNBQWUsU0FBUSx1Q0FBa0I7SUFPcEQsS0FBSyxDQUFDLFFBQVEsQ0FBQyxJQUFnQjtRQUM3QixJQUFJLElBQUksQ0FBQyxFQUFFLEVBQUU7WUFDWCxNQUFNLEtBQUssR0FBRyxNQUFNLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLEVBQUUsRUFBRSxFQUFFLElBQUksQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1lBQ3ZELElBQUksQ0FBQyxLQUFLO2dCQUFFLE9BQU87WUFDbkIsTUFBTSwrQkFBYyxDQUFDLGlCQUFpQixDQUFDLElBQUksRUFBRSxLQUFLLENBQUMsQ0FBQztTQUNyRDthQUFNO1lBQ0wsSUFBSTtnQkFDRixNQUFNLCtCQUFjLENBQUMsb0JBQW9CLENBQUMsSUFBSSxFQUFFLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQzthQUM1RDtZQUFDLE9BQU8sQ0FBQyxFQUFFO2dCQUNWLENBQUMsQ0FBQyxPQUFPLEdBQUcsdUNBQXVDLEdBQUcsQ0FBQyxDQUFDLE9BQU8sQ0FBQztnQkFDaEUsSUFBSSxDQUFDLENBQUMsSUFBSSxLQUFLLGNBQWMsRUFBRTtvQkFDN0IsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7b0JBQ3BCLE1BQU0sU0FBUyxHQUFHLE1BQU0sSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsRUFBRSxLQUFLLEVBQUUsSUFBSSxDQUFDLEtBQUssRUFBRSxDQUFDLENBQUM7b0JBQ2pFLDJCQUEyQjtvQkFDM0Is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
|
|
@@ -1,20 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
NwjsBinary = "NwjsBinary",
|
|
3
|
-
NodeBinary = "NodeBinary",
|
|
4
|
-
CypressBinary = "CypressBinary",
|
|
5
|
-
BucketBinary = "BucketBinary",
|
|
6
|
-
GithubBinary = "GithubBinary",
|
|
7
|
-
ElectronBinary = "ElectronBinary",
|
|
8
|
-
SqlcipherBinary = "SqlcipherBinary",
|
|
9
|
-
PuppeteerBinary = "PuppeteerBinary",
|
|
10
|
-
NodePreGypBinary = "NodePreGypBinary",
|
|
11
|
-
ImageminBinary = "ImageminBinary",
|
|
12
|
-
PlaywrightBinary = "PlaywrightBinary"
|
|
13
|
-
}
|
|
1
|
+
import { BinaryType } from 'app/common/enum/Binary';
|
|
14
2
|
export type BinaryTaskConfig = {
|
|
15
3
|
category: string;
|
|
16
4
|
description: string;
|
|
17
|
-
|
|
5
|
+
type: BinaryType;
|
|
18
6
|
repo: string;
|
|
19
7
|
distUrl: string;
|
|
20
8
|
ignoreDirs?: string[];
|