cnpmcore 4.6.2 → 4.7.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.
|
@@ -9,7 +9,7 @@ import { XMLParser } from 'fast-xml-parser';
|
|
|
9
9
|
import { BinaryType } from '../../enum/Binary.js';
|
|
10
10
|
import { AbstractBinary, BinaryAdapter, } from './AbstractBinary.js';
|
|
11
11
|
export const platforms = ['Linux_x64', 'Mac', 'Mac_Arm', 'Win', 'Win_x64'];
|
|
12
|
-
const MAX_DEPTH =
|
|
12
|
+
const MAX_DEPTH = 1;
|
|
13
13
|
let PuppeteerBinary = class PuppeteerBinary extends AbstractBinary {
|
|
14
14
|
async initFetch() {
|
|
15
15
|
this.dirItems = undefined;
|
|
@@ -38,7 +38,7 @@ let PuppeteerBinary = class PuppeteerBinary extends AbstractBinary {
|
|
|
38
38
|
this.dirItems[`/${platform}/`] = [];
|
|
39
39
|
let i = 0;
|
|
40
40
|
do {
|
|
41
|
-
let requestUrl = s3Url + '?prefix=' + platform;
|
|
41
|
+
let requestUrl = s3Url + '?prefix=' + platform + '&max-keys=100';
|
|
42
42
|
if (marker) {
|
|
43
43
|
requestUrl += '&marker=' + marker;
|
|
44
44
|
}
|
|
@@ -115,4 +115,4 @@ PuppeteerBinary = __decorate([
|
|
|
115
115
|
BinaryAdapter(BinaryType.Puppeteer)
|
|
116
116
|
], PuppeteerBinary);
|
|
117
117
|
export { PuppeteerBinary };
|
|
118
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
118
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUHVwcGV0ZWVyQmluYXJ5LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vYXBwL2NvbW1vbi9hZGFwdGVyL2JpbmFyeS9QdXBwZXRlZXJCaW5hcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUM3QyxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFFNUMsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ2xELE9BQU8sRUFDTCxjQUFjLEVBQ2QsYUFBYSxHQUdkLE1BQU0scUJBQXFCLENBQUM7QUFFN0IsTUFBTSxDQUFDLE1BQU0sU0FBUyxHQUFHLENBQUMsV0FBVyxFQUFFLEtBQUssRUFBRSxTQUFTLEVBQUUsS0FBSyxFQUFFLFNBQVMsQ0FBQyxDQUFDO0FBRTNFLE1BQU0sU0FBUyxHQUFHLENBQUMsQ0FBQztBQUliLElBQU0sZUFBZSxHQUFyQixNQUFNLGVBQWdCLFNBQVEsY0FBYztJQUtqRCxLQUFLLENBQUMsU0FBUztRQUNiLElBQUksQ0FBQyxRQUFRLEdBQUcsU0FBUyxDQUFDO0lBQzVCLENBQUM7SUFFRCxLQUFLLENBQUMsS0FBSyxDQUNULEdBQVcsRUFDWCxXQUFtQixFQUNuQixRQUFrQztRQUVsQyxJQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsRUFBRSxDQUFDO1lBQ25CLE1BQU0sS0FBSyxHQUFHLDJEQUEyRCxDQUFDO1lBQzFFLE1BQU0saUJBQWlCLEdBQUcsSUFBSSxHQUFHLEVBQWtCLENBQUM7WUFDcEQsSUFBSSxDQUFDLFFBQVEsR0FBRyxFQUFFLENBQUM7WUFDbkIsSUFBSSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsR0FBRyxFQUFFLENBQUM7WUFDeEIsS0FBSyxNQUFNLFFBQVEsSUFBSSxTQUFTLEVBQUUsQ0FBQztnQkFDakMsTUFBTSxRQUFRLEdBQUcsUUFBUSxFQUFF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
|
|
@@ -6,6 +6,7 @@ export declare const HOST_NAME: string;
|
|
|
6
6
|
export declare const PID: number;
|
|
7
7
|
export interface TaskBaseData {
|
|
8
8
|
taskWorker: string;
|
|
9
|
+
shouldNotMerge?: boolean;
|
|
9
10
|
}
|
|
10
11
|
export interface TaskData<T = TaskBaseData> extends EntityData {
|
|
11
12
|
taskId: string;
|
|
@@ -99,7 +100,7 @@ export declare class Task<T extends TaskBaseData = TaskBaseData> extends Entity
|
|
|
99
100
|
static createCreateHookTask(hookEvent: HookEvent): CreateHookTask;
|
|
100
101
|
static createTriggerHookTask(hookEvent: HookEvent, hookId: string): TriggerHookTask;
|
|
101
102
|
static createSyncBinary(targetName: string, lastData?: Record<string, unknown>): Task;
|
|
102
|
-
|
|
103
|
+
needMergeWhenWaiting(): boolean;
|
|
103
104
|
static createUpdateProxyCache(targetName: string, options: UpdateProxyCacheTaskOptions): CreateUpdateProxyCacheTask;
|
|
104
105
|
start(): TaskUpdateCondition;
|
|
105
106
|
}
|
|
@@ -139,8 +139,14 @@ export class Task extends Entity {
|
|
|
139
139
|
task.logPath = `/binaries/${targetName}/syncs/${dayjs().format('YYYY/MM/DDHHmm')}-${task.taskId}.log`;
|
|
140
140
|
return task;
|
|
141
141
|
}
|
|
142
|
-
|
|
143
|
-
|
|
142
|
+
needMergeWhenWaiting() {
|
|
143
|
+
// 历史任务补偿时,将 shouldNotMerge 设置为 true,避免合并
|
|
144
|
+
// 补偿任务单独执行
|
|
145
|
+
if (this.data.shouldNotMerge === true) {
|
|
146
|
+
return false;
|
|
147
|
+
}
|
|
148
|
+
// 仅合并二进制镜像与 npm 包
|
|
149
|
+
return [TaskType.SyncBinary, TaskType.SyncPackage].includes(this.type);
|
|
144
150
|
}
|
|
145
151
|
static createUpdateProxyCache(targetName, options) {
|
|
146
152
|
if (!isPkgManifest(options.fileType)) {
|
|
@@ -176,4 +182,4 @@ export class Task extends Entity {
|
|
|
176
182
|
return condition;
|
|
177
183
|
}
|
|
178
184
|
}
|
|
179
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
185
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Task.js","sourceRoot":"","sources":["../../../../app/core/entity/Task.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { TaskState, TaskType } from '../../common/enum/Task.js';
|
|
2
2
|
import { AbstractService } from '../../common/AbstractService.js';
|
|
3
|
-
import { Task } from '../entity/Task.js';
|
|
3
|
+
import type { Task } from '../entity/Task.js';
|
|
4
4
|
export declare class TaskService extends AbstractService {
|
|
5
5
|
private readonly taskRepository;
|
|
6
6
|
private readonly nfsAdapter;
|
|
@@ -10,7 +10,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
10
10
|
import { AccessLevel, Inject, SingletonProto } from '@eggjs/tegg';
|
|
11
11
|
import { TaskState, TaskType } from '../../common/enum/Task.js';
|
|
12
12
|
import { AbstractService } from '../../common/AbstractService.js';
|
|
13
|
-
import { Task } from '../entity/Task.js';
|
|
14
13
|
let TaskService = class TaskService extends AbstractService {
|
|
15
14
|
async getTaskQueueLength(taskType) {
|
|
16
15
|
return await this.queueAdapter.length(taskType);
|
|
@@ -18,7 +17,7 @@ let TaskService = class TaskService extends AbstractService {
|
|
|
18
17
|
async createTask(task, addTaskQueueOnExists) {
|
|
19
18
|
const existsTask = await this.taskRepository.findTaskByTargetName(task.targetName, task.type);
|
|
20
19
|
// 只在包同步场景下做任务合并,其余场景通过 bizId 来进行任务幂等
|
|
21
|
-
if (existsTask &&
|
|
20
|
+
if (existsTask && task.needMergeWhenWaiting()) {
|
|
22
21
|
// 在包同步场景,如果任务还未被触发,就不继续重复创建
|
|
23
22
|
// 如果任务正在执行,可能任务状态已更新,这种情况需要继续创建
|
|
24
23
|
if (existsTask.state === TaskState.Waiting) {
|
|
@@ -188,4 +187,4 @@ TaskService = __decorate([
|
|
|
188
187
|
})
|
|
189
188
|
], TaskService);
|
|
190
189
|
export { TaskService };
|
|
191
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
190
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"TaskService.js","sourceRoot":"","sources":["../../../../app/core/service/TaskService.ts"],"names":[],"mappings":"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"}
|