cnpmcore 2.6.1 → 2.7.1

package/History.md

@@ -1,4 +1,16 @@
 
+2.7.1 / 2022-11-25
+==================
+
+**fixes**
+  * [[`c6b8aec`](http://github.com/cnpm/cnpmcore/commit/c6b8aecfd0c2b0d454389e931747c431dac5742b)] - fix: request binary error (#360) (Ke Wu <<gemwuu@163.com>>)
+
+2.7.0 / 2022-11-25
+==================
+
+**others**
+  * [[`5738d56`](http://github.com/cnpm/cnpmcore/commit/5738d569ea691c05c3f3b0b74a454a33fefb8fc7)] - refactor: binary sync task use binaryName by default (#358) (Ke Wu <<gemwuu@163.com>>)
+
 2.6.1 / 2022-11-23
 ==================
 

package/dist/app/common/adapter/binary/AbstractBinary.d.ts

@@ -16,7 +16,8 @@ export declare abstract class AbstractBinary {
     protected httpclient: EggContextHttpClient;
     protected logger: EggLogger;
     protected binaryConfig: BinaryTaskConfig;
-    constructor(httpclient: EggContextHttpClient, logger: EggLogger, binaryConfig: BinaryTaskConfig);
+    protected binaryName: string;
+    constructor(httpclient: EggContextHttpClient, logger: EggLogger, binaryConfig: BinaryTaskConfig, binaryName: string);
     abstract fetch(dir: string, params?: any): Promise<FetchResult | undefined>;
     protected requestXml(url: string): Promise<string>;
     protected requestJSON(url: string): Promise<any>;

package/dist/app/common/adapter/binary/AbstractBinary.js

@@ -2,10 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AbstractBinary = void 0;
 class AbstractBinary {
-    constructor(httpclient, logger, binaryConfig) {
+    constructor(httpclient, logger, binaryConfig, binaryName) {
         this.httpclient = httpclient;
         this.logger = logger;
         this.binaryConfig = binaryConfig;
+        this.binaryName = binaryName;
     }
     async requestXml(url) {
         const { status, data, headers } = await this.httpclient.request(url, {
@@ -73,4 +74,4 @@ class AbstractBinary {
     }
 }
 exports.AbstractBinary = AbstractBinary;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQWJzdHJhY3RCaW5hcnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9hcHAvY29tbW9uL2FkYXB0ZXIvYmluYXJ5L0Fic3RyYWN0QmluYXJ5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQWlCQSxNQUFzQixjQUFjO0lBS2xDLFlBQVksVUFBZ0MsRUFBRSxNQUFpQixFQUFFLFlBQThCO1FBQzdGLElBQUksQ0FBQyxVQUFVLEdBQUcsVUFBVSxDQUFDO1FBQzdCLElBQUksQ0FBQyxNQUFNLEdBQUcsTUFBTSxDQUFDO1FBQ3JCLElBQUksQ0FBQyxZQUFZLEdBQUcsWUFBWSxDQUFDO0lBQ25DLENBQUM7SUFJUyxLQUFLLENBQUMsVUFBVSxDQUFDLEdBQVc7UUFDcEMsTUFBTSxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsT0FBTyxFQUFFLEdBQUcsTUFBTSxJQUFJLENBQUMsVUFBVSxDQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUU7WUFDbkUsT0FBTyxFQUFFLEtBQUs7WUFDZCxjQUFjLEVBQUUsSUFBSTtZQUNwQixJQUFJLEVBQUUsSUFBSTtTQUNYLENBQUMsQ0FBQztRQUNILE1BQU0sR0FBRyxHQUFHLElBQUksQ0FBQyxRQUFRLEVBQVksQ0FBQztRQUN0QyxJQUFJLE1BQU0sS0FBSyxHQUFHLEVBQUU7WUFDbEIsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsc0ZBQXNGLEVBQUUsR0FBRyxFQUFFLE1BQU0sRUFBRSxPQUFPLEVBQUUsR0FBRyxDQUFDLENBQUM7WUFDcEksT0FBTyxFQUFFLENBQUM7U0FDWDtRQUNELE9BQU8sR0FBRyxDQUFDO0lBQ2IsQ0FBQztJQUVTLEtBQUssQ0FBQyxXQUFXLENBQUMsR0FBVztRQUNyQyxNQUFNLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxPQUFPLEVBQUUsR0FBRyxNQUFNLElBQUksQ0FBQyxVQUFVLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRTtZQUNuRSxPQUFPLEVBQUUsS0FBSztZQUNkLFFBQVEsRUFBRSxNQUFNO1lBQ2hCLGNBQWMsRUFBRSxJQUFJO1lBQ3BCLElBQUksRUFBRSxJQUFJO1NBQ1gsQ0FBQyxDQUFDO1FBQ0gsSUFBSSxNQUFNLEtBQUssR0FBRyxFQUFFO1lBQ2xCLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLDhFQUE4RSxFQUFFLEdBQUcsRUFBRSxNQUFNLEVBQUUsT0FBTyxDQUFDLENBQUM7WUFDdkgsT0FBTyxJQUFJLENBQUM7U0FDYjtRQUNELE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUVELGtFQUFrRTtJQUN4RCxLQUFLLENBQUMsbUJBQW1CO1FBQ2pDLE1BQU0sZUFBZSxHQUFhLEVBQUUsQ0FBQztRQUNyQyxNQUFNLFFBQVEsR0FBRyxNQUFNLElBQUksQ0FBQyxXQUFXLENBQUMsb0NBQW9DLENBQUMsQ0FBQztRQUM5RSxLQUFLLE1BQU0sT0FBTyxJQUFJLFFBQVEsRUFBRTtZQUM5QixJQUFJLENBQUMsT0FBTyxDQUFDLE9BQU87Z0JBQUUsU0FBUztZQUMvQixNQUFNLGNBQWMsR0FBRyxRQUFRLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1lBQ2pELDZCQUE2QjtZQUM3QixJQUFJLGNBQWMsSUFBSSxFQUFFLElBQUksQ0FBQyxlQUFlLENBQUMsUUFBUSxDQUFDLGNBQWMsQ0FBQyxFQUFFO2dCQUNyRSxlQUFlLENBQUMsSUFBSSxDQUFDLGNBQWMsQ0FBQyxDQUFDO2FBQ3RDO1NBQ0Y7UUFDRCxPQUFPLGVBQWUsQ0FBQztJQUN6QixDQUFDO0lBRVMsaUJBQWlCO1FBQ3pCLDRDQUE0QztRQUM1QyxPQUFPLENBQUUsUUFBUSxFQUFFLE9BQU8sRUFBRSxPQUFPLENBQUUsQ0FBQztJQUN4QyxDQUFDO0lBRVMsYUFBYTs7UUFDckIsSUFBSSxNQUFBLElBQUksQ0FBQyxZQUFZLENBQUMsT0FBTywwQ0FBRSxTQUFTO1lBQUUsT0FBTyxJQUFJLENBQUMsWUFBWSxDQUFDLE9BQU8sQ0FBQyxTQUFTLENBQUM7UUFDckYsd0NBQXdDO1FBQ3hDLE9BQU87WUFDTCxLQUFLLEVBQUUsQ0FBRSxLQUFLLEVBQUUsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLEVBQUUsS0FBSyxDQUFFO1lBQ2pELE1BQU0sRUFBRSxDQUFFLE9BQU8sRUFBRSxNQUFNLEVBQUUsS0FBSyxDQUFFO1lBQ2xDLEtBQUssRUFBRSxDQUFFLE1BQU0sRUFBRSxLQUFLLENBQUU7U0FDekIsQ0FBQztJQUNKLENBQUM7SUFFUyxhQUFhO1FBQ3JCLDJFQUEyRTtRQUMzRSxPQUFPO1lBQ0wsS0FBSyxFQUFFLENBQUUsT0FBTyxFQUFFLE1BQU0sQ0FBRTtZQUMxQixNQUFNLEVBQUUsQ0FBRSxTQUFTLENBQUU7WUFDckIsS0FBSyxFQUFFLENBQUUsU0FBUyxDQUFFO1NBQ3JCLENBQUM7SUFDSixDQUFDO0NBQ0Y7QUEvRUQsd0NBK0VDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQWJzdHJhY3RCaW5hcnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9hcHAvY29tbW9uL2FkYXB0ZXIvYmluYXJ5L0Fic3RyYWN0QmluYXJ5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQWlCQSxNQUFzQixjQUFjO0lBTWxDLFlBQVksVUFBZ0MsRUFBRSxNQUFpQixFQUFFLFlBQThCLEVBQUUsVUFBa0I7UUFDakgsSUFBSSxDQUFDLFVBQVUsR0FBRyxVQUFVLENBQUM7UUFDN0IsSUFBSSxDQUFDLE1BQU0sR0FBRyxNQUFNLENBQUM7UUFDckIsSUFBSSxDQUFDLFlBQVksR0FBRyxZQUFZLENBQUM7UUFDakMsSUFBSSxDQUFDLFVBQVUsR0FBRyxVQUFVLENBQUM7SUFDL0IsQ0FBQztJQUlTLEtBQUssQ0FBQyxVQUFVLENBQUMsR0FBVztRQUNwQyxNQUFNLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxPQUFPLEVBQUUsR0FBRyxNQUFNLElBQUksQ0FBQyxVQUFVLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRTtZQUNuRSxPQUFPLEVBQUUsS0FBSztZQUNkLGNBQWMsRUFBRSxJQUFJO1lBQ3BCLElBQUksRUFBRSxJQUFJO1NBQ1gsQ0FBQyxDQUFDO1FBQ0gsTUFBTSxHQUFHLEdBQUcsSUFBSSxDQUFDLFFBQVEsRUFBWSxDQUFDO1FBQ3RDLElBQUksTUFBTSxLQUFLLEdBQUcsRUFBRTtZQUNsQixJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxzRkFBc0YsRUFBRSxHQUFHLEVBQUUsTUFBTSxFQUFFLE9BQU8sRUFBRSxHQUFHLENBQUMsQ0FBQztZQUNwSSxPQUFPLEVBQUUsQ0FBQztTQUNYO1FBQ0QsT0FBTyxHQUFHLENBQUM7SUFDYixDQUFDO0lBRVMsS0FBSyxDQUFDLFdBQVcsQ0FBQyxHQUFXO1FBQ3JDLE1BQU0sRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxHQUFHLE1BQU0sSUFBSSxDQUFDLFVBQVUsQ0FBQyxPQUFPLENBQUMsR0FBRyxFQUFFO1lBQ25FLE9BQU8sRUFBRSxLQUFLO1lBQ2QsUUFBUSxFQUFFLE1BQU07WUFDaEIsY0FBYyxFQUFFLElBQUk7WUFDcEIsSUFBSSxFQUFFLElBQUk7U0FDWCxDQUFDLENBQUM7UUFDSCxJQUFJLE1BQU0sS0FBSyxHQUFHLEVBQUU7WUFDbEIsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsOEVBQThFLEVBQUUsR0FBRyxFQUFFLE1BQU0sRUFBRSxPQUFPLENBQUMsQ0FBQztZQUN2SCxPQUFPLElBQUksQ0FBQztTQUNiO1FBQ0QsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBRUQsa0VBQWtFO0lBQ3hELEtBQUssQ0FBQyxtQkFBbUI7UUFDakMsTUFBTSxlQUFlLEdBQWEsRUFBRSxDQUFDO1FBQ3JDLE1BQU0sUUFBUSxHQUFHLE1BQU0sSUFBSSxDQUFDLFdBQVcsQ0FBQyxvQ0FBb0MsQ0FBQyxDQUFDO1FBQzlFLEtBQUssTUFBTSxPQUFPLElBQUksUUFBUSxFQUFFO1lBQzlCLElBQUksQ0FBQyxPQUFPLENBQUMsT0FBTztnQkFBRSxTQUFTO1lBQy9CLE1BQU0sY0FBYyxHQUFHLFFBQVEsQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLENBQUM7WUFDakQsNkJBQTZCO1lBQzdCLElBQUksY0FBYyxJQUFJLEVBQUUsSUFBSSxDQUFDLGVBQWUsQ0FBQyxRQUFRLENBQUMsY0FBYyxDQUFDLEVBQUU7Z0JBQ3JFLGVBQWUsQ0FBQyxJQUFJLENBQUMsY0FBYyxDQUFDLENBQUM7YUFDdEM7U0FDRjtRQUNELE9BQU8sZUFBZSxDQUFDO0lBQ3pCLENBQUM7SUFFUyxpQkFBaUI7UUFDekIsNENBQTRDO1FBQzVDLE9BQU8sQ0FBRSxRQUFRLEVBQUUsT0FBTyxFQUFFLE9BQU8sQ0FBRSxDQUFDO0lBQ3hDLENBQUM7SUFFUyxhQUFhOztRQUNyQixJQUFJLE1BQUEsSUFBSSxDQUFDLFlBQVksQ0FBQyxPQUFPLDBDQUFFLFNBQVM7WUFBRSxPQUFPLElBQUksQ0FBQyxZQUFZLENBQUMsT0FBTyxDQUFDLFNBQVMsQ0FBQztRQUNyRix3Q0FBd0M7UUFDeEMsT0FBTztZQUNMLEtBQUssRUFBRSxDQUFFLEtBQUssRUFBRSxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sRUFBRSxLQUFLLENBQUU7WUFDakQsTUFBTSxFQUFFLENBQUUsT0FBTyxFQUFFLE1BQU0sRUFBRSxLQUFLLENBQUU7WUFDbEMsS0FBSyxFQUFFLENBQUUsTUFBTSxFQUFFLEtBQUssQ0FBRTtTQUN6QixDQUFDO0lBQ0osQ0FBQztJQUVTLGFBQWE7UUFDckIsMkVBQTJFO1FBQzNFLE9BQU87WUFDTCxLQUFLLEVBQUUsQ0FBRSxPQUFPLEVBQUUsTUFBTSxDQUFFO1lBQzFCLE1BQU0sRUFBRSxDQUFFLFNBQVMsQ0FBRTtZQUNyQixLQUFLLEVBQUUsQ0FBRSxTQUFTLENBQUU7U0FDckIsQ0FBQztJQUNKLENBQUM7Q0FDRjtBQWpGRCx3Q0FpRkMifQ==

package/dist/app/common/adapter/binary/ApiBinary.d.ts

@@ -3,6 +3,6 @@ import { AbstractBinary, FetchResult } from './AbstractBinary';
 import { BinaryTaskConfig } from '../../../../config/binaries';
 export declare class ApiBinary extends AbstractBinary {
     private apiUrl;
-    constructor(httpclient: EggContextHttpClient, logger: EggLogger, binaryConfig: BinaryTaskConfig, apiUrl: string);
+    constructor(httpclient: EggContextHttpClient, logger: EggLogger, binaryConfig: BinaryTaskConfig, apiUrl: string, binaryName: string);
     fetch(dir: string): Promise<FetchResult | undefined>;
 }

package/dist/app/common/adapter/binary/ApiBinary.js

@@ -3,12 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ApiBinary = void 0;
 const AbstractBinary_1 = require("./AbstractBinary");
 class ApiBinary extends AbstractBinary_1.AbstractBinary {
-    constructor(httpclient, logger, binaryConfig, apiUrl) {
-        super(httpclient, logger, binaryConfig);
+    constructor(httpclient, logger, binaryConfig, apiUrl, binaryName) {
+        super(httpclient, logger, binaryConfig, binaryName);
         this.apiUrl = apiUrl;
     }
     async fetch(dir) {
-        const url = `${this.apiUrl}/${this.binaryConfig.category}${dir}`;
+        const url = `${this.apiUrl}/${this.binaryName}${dir}`;
         const data = await this.requestJSON(url);
         if (!Array.isArray(data)) {
             this.logger.warn('[ApiBinary.fetch:response-data-not-array] data: %j', data);
@@ -28,4 +28,4 @@ class ApiBinary extends AbstractBinary_1.AbstractBinary {
     }
 }
 exports.ApiBinary = ApiBinary;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXBpQmluYXJ5LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vYXBwL2NvbW1vbi9hZGFwdGVyL2JpbmFyeS9BcGlCaW5hcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQ0EscURBQTJFO0FBRzNFLE1BQWEsU0FBVSxTQUFRLCtCQUFjO0lBRTNDLFlBQVksVUFBZ0MsRUFBRSxNQUFpQixFQUFFLFlBQThCLEVBQUUsTUFBYztRQUM3RyxLQUFLLENBQUMsVUFBVSxFQUFFLE1BQU0sRUFBRSxZQUFZLENBQUMsQ0FBQztRQUN4QyxJQUFJLENBQUMsTUFBTSxHQUFHLE1BQU0sQ0FBQztJQUN2QixDQUFDO0lBRUQsS0FBSyxDQUFDLEtBQUssQ0FBQyxHQUFXO1FBQ3JCLE1BQU0sR0FBRyxHQUFHLEdBQUcsSUFBSSxDQUFDLE1BQU0sSUFBSSxJQUFJLENBQUMsWUFBWSxDQUFDLFFBQVEsR0FBRyxHQUFHLEVBQUUsQ0FBQztRQUNqRSxNQUFNLElBQUksR0FBRyxNQUFNLElBQUksQ0FBQyxXQUFXLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDekMsSUFBSSxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLEVBQUU7WUFDeEIsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsb0RBQW9ELEVBQUUsSUFBSSxDQUFDLENBQUM7WUFDN0UsT0FBTztTQUNSO1FBQ0QsTUFBTSxLQUFLLEdBQWlCLEVBQUUsQ0FBQztRQUMvQixLQUFLLE1BQU0sSUFBSSxJQUFJLElBQUksRUFBRTtZQUN2QixLQUFLLENBQUMsSUFBSSxDQUFDO2dCQUNULElBQUksRUFBRSxJQUFJLENBQUMsSUFBSTtnQkFDZixLQUFLLEVBQUUsSUFBSSxDQUFDLElBQUksS0FBSyxLQUFLO2dCQUMxQixHQUFHLEVBQUUsSUFBSSxDQUFDLEdBQUc7Z0JBQ2IsSUFBSSxFQUFFLElBQUksQ0FBQyxJQUFJLElBQUksR0FBRztnQkFDdEIsSUFBSSxFQUFFLElBQUksQ0FBQyxJQUFJO2FBQ2hCLENBQUMsQ0FBQztTQUNKO1FBQ0QsT0FBTyxFQUFFLEtBQUssRUFBRSxDQUFDO0lBQ25CLENBQUM7Q0FDRjtBQTFCRCw4QkEwQkMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXBpQmluYXJ5LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vYXBwL2NvbW1vbi9hZGFwdGVyL2JpbmFyeS9BcGlCaW5hcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQ0EscURBQTJFO0FBRzNFLE1BQWEsU0FBVSxTQUFRLCtCQUFjO0lBRTNDLFlBQVksVUFBZ0MsRUFBRSxNQUFpQixFQUFFLFlBQThCLEVBQUUsTUFBYyxFQUFFLFVBQWtCO1FBQ2pJLEtBQUssQ0FBQyxVQUFVLEVBQUUsTUFBTSxFQUFFLFlBQVksRUFBRSxVQUFVLENBQUMsQ0FBQztRQUNwRCxJQUFJLENBQUMsTUFBTSxHQUFHLE1BQU0sQ0FBQztJQUN2QixDQUFDO0lBRUQsS0FBSyxDQUFDLEtBQUssQ0FBQyxHQUFXO1FBQ3JCLE1BQU0sR0FBRyxHQUFHLEdBQUcsSUFBSSxDQUFDLE1BQU0sSUFBSSxJQUFJLENBQUMsVUFBVSxHQUFHLEdBQUcsRUFBRSxDQUFDO1FBQ3RELE1BQU0sSUFBSSxHQUFHLE1BQU0sSUFBSSxDQUFDLFdBQVcsQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUN6QyxJQUFJLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsRUFBRTtZQUN4QixJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxvREFBb0QsRUFBRSxJQUFJLENBQUMsQ0FBQztZQUM3RSxPQUFPO1NBQ1I7UUFDRCxNQUFNLEtBQUssR0FBaUIsRUFBRSxDQUFDO1FBQy9CLEtBQUssTUFBTSxJQUFJLElBQUksSUFBSSxFQUFFO1lBQ3ZCLEtBQUssQ0FBQyxJQUFJLENBQUM7Z0JBQ1QsSUFBSSxFQUFFLElBQUksQ0FBQyxJQUFJO2dCQUNmLEtBQUssRUFBRSxJQUFJLENBQUMsSUFBSSxLQUFLLEtBQUs7Z0JBQzFCLEdBQUcsRUFBRSxJQUFJLENBQUMsR0FBRztnQkFDYixJQUFJLEVBQUUsSUFBSSxDQUFDLElBQUksSUFBSSxHQUFHO2dCQUN0QixJQUFJLEVBQUUsSUFBSSxDQUFDLElBQUk7YUFDaEIsQ0FBQyxDQUFDO1NBQ0o7UUFDRCxPQUFPLEVBQUUsS0FBSyxFQUFFLENBQUM7SUFDbkIsQ0FBQztDQUNGO0FBMUJELDhCQTBCQyJ9

package/dist/app/common/adapter/binary/ImageminBinary.js

@@ -7,7 +7,7 @@ class ImageminBinary extends AbstractBinary_1.AbstractBinary {
         var _a, _b;
         if (!this.dirItems) {
             this.dirItems = {};
-            const npmPackageName = (_b = (_a = this.binaryConfig.options) === null || _a === void 0 ? void 0 : _a.npmPackageName) !== null && _b !== void 0 ? _b : this.binaryConfig.category;
+            const npmPackageName = (_b = (_a = this.binaryConfig.options) === null || _a === void 0 ? void 0 : _a.npmPackageName) !== null && _b !== void 0 ? _b : this.binaryName;
             const pkgUrl = `https://registry.npmjs.com/${npmPackageName}`;
             const data = await this.requestJSON(pkgUrl);
             this.dirItems = {};
@@ -93,4 +93,4 @@ class ImageminBinary extends AbstractBinary_1.AbstractBinary {
     }
 }
 exports.ImageminBinary = ImageminBinary;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSW1hZ2VtaW5CaW5hcnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9hcHAvY29tbW9uL2FkYXB0ZXIvYmluYXJ5L0ltYWdlbWluQmluYXJ5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLHFEQUEyRTtBQUUzRSxNQUFhLGNBQWUsU0FBUSwrQkFBYztJQUtoRCxLQUFLLENBQUMsS0FBSyxDQUFDLEdBQVc7O1FBQ3JCLElBQUksQ0FBQyxJQUFJLENBQUMsUUFBUSxFQUFFO1lBQ2xCLElBQUksQ0FBQyxRQUFRLEdBQUcsRUFBRSxDQUFDO1lBQ25CLE1BQU0sY0FBYyxHQUFHLE1BQUEsTUFBQSxJQUFJLENBQUMsWUFBWSxDQUFDLE9BQU8sMENBQUUsY0FBYyxtQ0FBSSxJQUFJLENBQUMsWUFBWSxDQUFDLFFBQVEsQ0FBQztZQUMvRixNQUFNLE1BQU0sR0FBRyw4QkFBOEIsY0FBYyxFQUFFLENBQUM7WUFDOUQsTUFBTSxJQUFJLEdBQUcsTUFBTSxJQUFJLENBQUMsV0FBVyxDQUFDLE1BQU0sQ0FBQyxDQUFDO1lBQzVDLElBQUksQ0FBQyxRQUFRLEdBQUcsRUFBRSxDQUFDO1lBQ25CLElBQUksQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLEdBQUcsRUFBRSxDQUFDO1lBQ3hCLHFCQUFxQjtZQUNyQixvRUFBb0U7WUFDcEUsb0VBQW9FO1lBQ3BFLEtBQUssTUFBTSxPQUFPLElBQUksSUFBSSxDQUFDLFFBQVEsRUFBRTtnQkFDbkMsTUFBTSxLQUFLLEdBQUcsUUFBUSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7Z0JBQ2pELElBQUksS0FBSyxHQUFHLENBQUM7b0JBQUUsU0FBUztnQkFDeEIsV0FBVztnQkFDWCxNQUFNLElBQUksR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDO2dCQUNoQyxtRkFBbUY7Z0JBQ25G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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSW1hZ2VtaW5CaW5hcnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9hcHAvY29tbW9uL2FkYXB0ZXIvYmluYXJ5L0ltYWdlbWluQmluYXJ5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLHFEQUEyRTtBQUUzRSxNQUFhLGNBQWUsU0FBUSwrQkFBYztJQUtoRCxLQUFLLENBQUMsS0FBSyxDQUFDLEdBQVc7O1FBQ3JCLElBQUksQ0FBQyxJQUFJLENBQUMsUUFBUSxFQUFFO1lBQ2xCLElBQUksQ0FBQyxRQUFRLEdBQUcsRUFBRSxDQUFDO1lBQ25CLE1BQU0sY0FBYyxHQUFHLE1BQUEsTUFBQSxJQUFJLENBQUMsWUFBWSxDQUFDLE9BQU8sMENBQUUsY0FBYyxtQ0FBSSxJQUFJLENBQUMsVUFBVSxDQUFDO1lBQ3BGLE1BQU0sTUFBTSxHQUFHLDhCQUE4QixjQUFjLEVBQUUsQ0FBQztZQUM5RCxNQUFNLElBQUksR0FBRyxNQUFNLElBQUksQ0FBQyxXQUFXLENBQUMsTUFBTSxDQUFDLENBQUM7WUFDNUMsSUFBSSxDQUFDLFFBQVEsR0FBRyxFQUFFLENBQUM7WUFDbkIsSUFBSSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsR0FBRyxFQUFFLENBQUM7WUFDeEIscUJBQXFCO1lBQ3JCLG9FQUFvRTtZQUNwRSxvRUFBb0U7WUFDcEUsS0FBSyxNQUFNLE9BQU8sSUFBSSxJQUFJLENBQUMsUUFBUSxFQUFFO2dCQUNuQyxNQUFNLEtBQUssR0FBRyxRQUFRLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxHQUFHLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztnQkFDakQsSUFBSSxLQUFLLEdBQUcsQ0FBQztvQkFBRSxTQUFTO2dCQUN4QixXQUFXO2dCQUNYLE1BQU0sSUFBSSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUM7Z0JBQ2hDLG1GQUFtRjtnQkFDbkYsSUFBSSxDQUFD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

package/dist/app/common/adapter/binary/NodePreGypBinary.js

@@ -9,7 +9,7 @@ class NodePreGypBinary extends AbstractBinary_1.AbstractBinary {
         var _a, _b;
         if (!this.dirItems) {
             this.dirItems = {};
-            const pkgUrl = `https://registry.npmjs.com/${this.binaryConfig.category}`;
+            const pkgUrl = `https://registry.npmjs.com/${this.binaryName}`;
             const data = await this.requestJSON(pkgUrl);
             this.dirItems = {};
             this.dirItems['/'] = [];
@@ -77,7 +77,7 @@ class NodePreGypBinary extends AbstractBinary_1.AbstractBinary {
                                         date,
                                         size: '-',
                                         isDir: false,
-                                        url: `${this.binaryConfig.distUrl}/${this.binaryConfig.category}${versionPrefix}/${name}`,
+                                        url: `${this.binaryConfig.distUrl}/${this.binaryName}${versionPrefix}/${name}`,
                                         ignoreDownloadStatuses: [404],
                                     });
                                 }
@@ -100,7 +100,7 @@ class NodePreGypBinary extends AbstractBinary_1.AbstractBinary {
                                     date,
                                     size: '-',
                                     isDir: false,
-                                    url: `${this.binaryConfig.distUrl}/${this.binaryConfig.category}${versionPrefix}/${name}`,
+                                    url: `${this.binaryConfig.distUrl}/${this.binaryName}${versionPrefix}/${name}`,
                                     ignoreDownloadStatuses: [404],
                                 });
                             }
@@ -166,7 +166,7 @@ class NodePreGypBinary extends AbstractBinary_1.AbstractBinary {
                             const binaryFileName = binaryFile.replace('{platform}', platform)
                                 .replace('{arch}', arch);
                             remotePath = remotePath.replace('{module_name}', moduleName)
-                                .replace('{name}', this.binaryConfig.category)
+                                .replace('{name}', this.binaryName)
                                 .replace('{version}', version)
                                 .replace('{configuration}', 'Release');
                             const binaryFilePath = (0, path_1.join)('/', remotePath, binaryFileName);
@@ -188,4 +188,4 @@ class NodePreGypBinary extends AbstractBinary_1.AbstractBinary {
     }
 }
 exports.NodePreGypBinary = NodePreGypBinary;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTm9kZVByZUd5cEJpbmFyeS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL2FwcC9jb21tb24vYWRhcHRlci9iaW5hcnkvTm9kZVByZUd5cEJpbmFyeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSwrQkFBNEI7QUFDNUIscURBQTJFO0FBRTNFLE1BQWEsZ0JBQWlCLFNBQVEsK0JBQWM7SUFLbEQseUNBQXlDO0lBQ3pDLEtBQUssQ0FBQyxLQUFLLENBQUMsR0FBVzs7UUFDckIsSUFBSSxDQUFDLElBQUksQ0FBQyxRQUFRLEVBQUU7WUFDbEIsSUFBSSxDQUFDLFFBQVEsR0FBRyxFQUFFLENBQUM7WUFDbkIsTUFBTSxNQUFNLEdBQUcsOEJBQThCLElBQUksQ0FBQyxZQUFZLENBQUMsUUFBUSxFQUFFLENBQUM7WUFDMUUsTUFBTSxJQUFJLEdBQUcsTUFBTSxJQUFJLENBQUMsV0FBVyxDQUFDLE1BQU0sQ0FBQyxDQUFDO1lBQzVDLElBQUksQ0FBQyxRQUFRLEdBQUcsRUFBRSxDQUFDO1lBQ25CLElBQUksQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLEdBQUcsRUFBRSxDQUFDO1lBQ3hCLE1BQU0sZUFBZSxHQUFHLE1BQU0sSUFBSSxDQUFDLG1CQUFtQixFQUFFLENBQUM7WUFDekQsTUFBTSxhQUFhLEdBQUcsSUFBSSxDQUFDLGlCQUFpQixFQUFFLENBQUM7WUFDL0MsTUFBTSxTQUFTLEdBQUcsSUFBSSxDQUFDLGFBQWEsRUFBRSxDQUFDO1lBQ3ZDLE1BQU0sU0FBUyxHQUFHLElBQUksQ0FBQyxhQUFhLEVBQUUsQ0FBQztZQUN2QyxLQUFLLE1BQU0sT0FBTyxJQUFJLElBQUksQ0FBQyxRQUFRLEVBQUU7Z0JBQ25DLE1BQU0sSUFBSSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUM7Z0JBQ2hDLE1BQU0sVUFBVSxHQUFHLElBQUksQ0FBQyxRQUFRLENBQUMsT0FBTyxDQUFDLENBQUM7Z0JBQzFD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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTm9kZVByZUd5cEJpbmFyeS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL2FwcC9jb21tb24vYWRhcHRlci9iaW5hcnkvTm9kZVByZUd5cEJpbmFyeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSwrQkFBNEI7QUFDNUIscURBQTJFO0FBRTNFLE1BQWEsZ0JBQWlCLFNBQVEsK0JBQWM7SUFLbEQseUNBQXlDO0lBQ3pDLEtBQUssQ0FBQyxLQUFLLENBQUMsR0FBVzs7UUFDckIsSUFBSSxDQUFDLElBQUksQ0FBQyxRQUFRLEVBQUU7WUFDbEIsSUFBSSxDQUFDLFFBQVEsR0FBRyxFQUFFLENBQUM7WUFDbkIsTUFBTSxNQUFNLEdBQUcsOEJBQThCLElBQUksQ0FBQyxVQUFVLEVBQUUsQ0FBQztZQUMvRCxNQUFNLElBQUksR0FBRyxNQUFNLElBQUksQ0FBQyxXQUFXLENBQUMsTUFBTSxDQUFDLENBQUM7WUFDNUMsSUFBSSxDQUFDLFFBQVEsR0FBRyxFQUFFLENBQUM7WUFDbkIsSUFBSSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsR0FBRyxFQUFFLENBQUM7WUFDeEIsTUFBTSxlQUFlLEdBQUcsTUFBTSxJQUFJLENBQUMsbUJBQW1CLEVBQUUsQ0FBQztZQUN6RCxNQUFNLGFBQWEsR0FBRyxJQUFJLENBQUMsaUJBQWlCLEVBQUUsQ0FBQztZQUMvQyxNQUFNLFNBQVMsR0FBRyxJQUFJLENBQUMsYUFBYSxFQUFFLENBQUM7WUFDdkMsTUFBTSxTQUFTLEdBQUcsSUFBSSxDQUFDLGFBQWEsRUFBRSxDQUFDO1lBQ3ZDLEtBQUssTUFBTSxPQUFPLElBQUksSUFBSSxDQUFDLFFBQVEsRUFBRTtnQkFDbkMsTUFBTSxJQUFJLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQztnQkFDaEMsTUFBTSxVQUFVLEdBQUcsSUFBSSxDQUFDLFFBQVEsQ0FBQyxPQUFPLENBQUMsQ0FBQztnQkFDMUMsSUFBSSxDQUFD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

package/dist/app/core/service/BinarySyncerService.js

@@ -80,12 +80,12 @@ let BinarySyncerService = class BinarySyncerService extends AbstractService_1.Ab
     async listRootBinaries(binaryName) {
         // 通常 binaryName 和 category 是一样的，但是有些特殊的 binaryName 会有多个 category，比如 canvas
         // 所以查询 canvas 的时候，需要将 binaryName 和 category 的数据都查出来
-        const { category, mergeCategory, } = binaries_1.default[binaryName];
+        const { category, } = binaries_1.default[binaryName];
         const reqs = [
             this.binaryRepository.listBinaries(binaryName, '/'),
         ];
-        if (mergeCategory && mergeCategory !== category) {
-            reqs.push(this.binaryRepository.listBinaries(mergeCategory, '/'));
+        if (category && category !== binaryName) {
+            reqs.push(this.binaryRepository.listBinaries(category, '/'));
         }
         const [rootBinary, categoryBinary,] = await Promise.all(reqs);
         const versions = rootBinary.map(b => b.name);
@@ -277,16 +277,12 @@ let BinarySyncerService = class BinarySyncerService extends AbstractService_1.Ab
     }
     createBinaryInstance(binaryName) {
         const config = this.config.cnpmcore;
+        const binaryConfig = binaries_1.default[binaryName];
         if (config.sourceRegistryIsCNpm) {
-            const binaryConfig = binaries_1.default[binaryName];
             const syncBinaryFromAPISource = config.syncBinaryFromAPISource || `${config.sourceRegistry}/-/binary`;
-            return new ApiBinary_1.ApiBinary(this.httpclient, this.logger, binaryConfig, syncBinaryFromAPISource);
-        }
-        for (const binaryConfig of Object.values(binaries_1.default)) {
-            if (binaryConfig.category === binaryName) {
-                return new BinaryClasses[binaryConfig.syncer](this.httpclient, this.logger, binaryConfig);
-            }
+            return new ApiBinary_1.ApiBinary(this.httpclient, this.logger, binaryConfig, syncBinaryFromAPISource, binaryName);
         }
+        return new BinaryClasses[binaryConfig.syncer](this.httpclient, this.logger, binaryConfig, binaryName);
     }
 };
 __decorate([
@@ -310,4 +306,4 @@ BinarySyncerService = __decorate([
     })
 ], BinarySyncerService);
 exports.BinarySyncerService = BinarySyncerService;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"BinarySyncerService.js","sourceRoot":"","sources":["../../../../app/core/service/BinarySyncerService.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"BinarySyncerService.js","sourceRoot":"","sources":["../../../../app/core/service/BinarySyncerService.ts"],"names":[],"mappings":"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"}

package/dist/app/port/controller/BinarySyncController.d.ts

@@ -6,7 +6,7 @@ export declare class BinarySyncController extends AbstractController {
     showBinaryHTML(ctx: EggContext): Promise<string>;
     listBinaries(): Promise<{
         name: string;
-        mergeCategory: string;
+        category: string;
         description: string;
         distUrl: string;
         repoUrl: string;

package/dist/app/port/controller/BinarySyncController.js

@@ -24,10 +24,10 @@ let BinarySyncController = class BinarySyncController extends AbstractController
         return ctx.app.binaryHTML;
     }
     async listBinaries() {
-        return Object.values(binaries_1.default).map(binaryConfig => {
+        return Object.entries(binaries_1.default).map(([binaryName, binaryConfig]) => {
             return {
-                name: `${binaryConfig.category}/`,
-                mergeCategory: `${binaryConfig.mergeCategory}/`,
+                name: `${binaryName}/`,
+                category: `${binaryConfig.category}/`,
                 description: binaryConfig.description,
                 distUrl: binaryConfig.distUrl,
                 repoUrl: /^https?:\/\//.test(binaryConfig.repo) ? binaryConfig.repo : `https://github.com/${binaryConfig.repo}`,
@@ -51,11 +51,11 @@ let BinarySyncController = class BinarySyncController extends AbstractController
         let binary = await this.binarySyncerService.findBinary(binaryName, parent, name);
         if (!binary) {
             // 查询不到再去查询 mergeCategory 的情况
-            const mergeCategory = (_a = binaries_1.default === null || binaries_1.default === void 0 ? void 0 : binaries_1.default[binaryName]) === null || _a === void 0 ? void 0 : _a.mergeCategory;
-            if (mergeCategory) {
+            const category = (_a = binaries_1.default === null || binaries_1.default === void 0 ? void 0 : binaries_1.default[binaryName]) === null || _a === void 0 ? void 0 : _a.category;
+            if (category) {
                 // canvas/v2.6.1/canvas-v2.6.1-node-v57-linux-glibc-x64.tar.gz
                 // -> node-canvas-prebuilt/v2.6.1/node-canvas-prebuilt-v2.6.1-node-v57-linux-glibc-x64.tar.gz
-                binary = await this.binarySyncerService.findBinary(mergeCategory, parent, name.replace(new RegExp(`^${binaryName}-`), `${mergeCategory}-`));
+                binary = await this.binarySyncerService.findBinary(category, parent, name.replace(new RegExp(`^${binaryName}-`), `${category}-`));
             }
         }
         if (!binary) {
@@ -132,4 +132,4 @@ BinarySyncController = __decorate([
     (0, tegg_1.HTTPController)()
 ], BinarySyncController);
 exports.BinarySyncController = BinarySyncController;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQmluYXJ5U3luY0NvbnRyb2xsZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9hcHAvcG9ydC9jb250cm9sbGVyL0JpbmFyeVN5bmNDb250cm9sbGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHNDQVFxQjtBQUNyQixnREFBd0I7QUFDeEIsMkNBQTJDO0FBQzNDLDZEQUEwRDtBQUcxRCx3RUFBZ0Q7QUFHaEQsSUFBYSxvQkFBb0IsR0FBakMsTUFBYSxvQkFBcUIsU0FBUSx1Q0FBa0I7SUFRMUQsS0FBSyxDQUFDLGNBQWMsQ0FBWSxHQUFlO1FBQzdDLEdBQUcsQ0FBQyxJQUFJLEdBQUcsTUFBTSxDQUFDO1FBQ2xCLE9BQU8sR0FBRyxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUM7SUFDNUIsQ0FBQztJQU1ELEtBQUssQ0FBQyxZQUFZO1FBQ2hCLE9BQU8sTUFBTSxDQUFDLE1BQU0sQ0FBQyxrQkFBUSxDQUFDLENBQUMsR0FBRyxDQUFDLFlBQVksQ0FBQyxFQUFFO1lBQ2hELE9BQU87Z0JBQ0wsSUFBSSxFQUFFLEdBQUcsWUFBWSxDQUFDLFFBQVEsR0FBRztnQkFDakMsYUFBYSxFQUFFLEdBQUcsWUFBWSxDQUFDLGFBQWEsR0FBRztnQkFDL0MsV0FBVyxFQUFFLFlBQVksQ0FBQyxXQUFXO2dCQUNyQyxPQUFPLEVBQUUsWUFBWSxDQUFDLE9BQU87Z0JBQzdCLE9BQU8sRUFBRSxjQUFjLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsc0JBQXNCLFlBQVksQ0FBQyxJQUFJLEVBQUU7Z0JBQy9HLElBQUksRUFBRSxLQUFLO2dCQUNYLEdBQUcsRUFBRSxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLFFBQVEsYUFBYSxZQUFZLENBQUMsUUFBUSxHQUFHO2FBQzNFLENBQUM7UUFDSixD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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQmluYXJ5U3luY0NvbnRyb2xsZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9hcHAvcG9ydC9jb250cm9sbGVyL0JpbmFyeVN5bmNDb250cm9sbGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHNDQVFxQjtBQUNyQixnREFBd0I7QUFDeEIsMkNBQTJDO0FBQzNDLDZEQUEwRDtBQUcxRCx3RUFBZ0Q7QUFHaEQsSUFBYSxvQkFBb0IsR0FBakMsTUFBYSxvQkFBcUIsU0FBUSx1Q0FBa0I7SUFRMUQsS0FBSyxDQUFDLGNBQWMsQ0FBWSxHQUFlO1FBQzdDLEdBQUcsQ0FBQyxJQUFJLEdBQUcsTUFBTSxDQUFDO1FBQ2xCLE9BQU8sR0FBRyxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUM7SUFDNUIsQ0FBQztJQU1ELEtBQUssQ0FBQyxZQUFZO1FBQ2hCLE9BQU8sTUFBTSxDQUFDLE9BQU8sQ0FBQyxrQkFBUSxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBRSxVQUFVLEVBQUUsWUFBWSxDQUFFLEVBQUUsRUFBRTtZQUNuRSxPQUFPO2dCQUNMLElBQUksRUFBRSxHQUFHLFVBQVUsR0FBRztnQkFDdEIsUUFBUSxFQUFFLEdBQUcsWUFBWSxDQUFDLFFBQVEsR0FBRztnQkFDckMsV0FBVyxFQUFFLFlBQVksQ0FBQyxXQUFXO2dCQUNyQyxPQUFPLEVBQUUsWUFBWSxDQUFDLE9BQU87Z0JBQzdCLE9BQU8sRUFBRSxjQUFjLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsc0JBQXNCLFlBQVksQ0FBQyxJQUFJLEVBQUU7Z0JBQy9HLElBQUksRUFBRSxLQUFLO2dCQUNYLEdBQUcsRUFBRSxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLFFBQVEsYUFBYSxZQUFZLENBQUMsUUFBUSxHQUFHO2FB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

package/dist/app/port/schedule/CreateSyncBinaryTask.js

@@ -17,12 +17,15 @@ let CreateSyncBinaryTask = class CreateSyncBinaryTask {
     async subscribe() {
         if (!this.config.cnpmcore.enableSyncBinary)
             return;
-        for (const binary of Object.values(binaries_1.default)) {
-            if (this.config.env === 'unittest' && binary.category !== 'node')
+        for (const [binaryName, binary] of Object.entries(binaries_1.default)) {
+            if (this.config.env === 'unittest' && binaryName !== 'node')
                 continue;
             if (binary.disable)
                 continue;
-            await this.binarySyncerService.createTask(binary.category);
+            // 默认只同步 binaryName 的二进制，即使有不一致的 category，会在同名的 binaryName 任务中同步
+            // 例如 canvas 只同步 binaryName 为 canvas 的二进制，不同步 category 为 node-canvas-prebuilt 的二进制
+            // node-canvas-prebuilt 的二进制会在 node-canvas-prebuilt 的任务中同步
+            await this.binarySyncerService.createTask(binaryName);
         }
     }
 };
@@ -42,4 +45,4 @@ CreateSyncBinaryTask = __decorate([
     })
 ], CreateSyncBinaryTask);
 exports.CreateSyncBinaryTask = CreateSyncBinaryTask;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ3JlYXRlU3luY0JpbmFyeVRhc2suanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9hcHAvcG9ydC9zY2hlZHVsZS9DcmVhdGVTeW5jQmluYXJ5VGFzay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7QUFDQSxtREFBOEU7QUFDOUUsc0NBQXFDO0FBRXJDLHdFQUFnRDtBQVNoRCxJQUFhLG9CQUFvQixHQUFqQyxNQUFhLG9CQUFvQjtJQU8vQixLQUFLLENBQUMsU0FBUztRQUNiLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxnQkFBZ0I7WUFBRSxPQUFPO1FBRW5ELEtBQUssTUFBTSxNQUFNLElBQUksTUFBTSxDQUFDLE1BQU0sQ0FBQyxrQkFBUSxDQUFDLEVBQUU7WUFDNUMsSUFBSSxJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsS0FBSyxVQUFVLElBQUksTUFBTSxDQUFDLFFBQVEsS0FBSyxNQUFNO2dCQUFFLFNBQVM7WUFDM0UsSUFBSSxNQUFNLENBQUMsT0FBTztnQkFBRSxTQUFTO1lBQzdCLE1BQU0sSUFBSSxDQUFDLG1CQUFtQixDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLENBQUM7U0FDNUQ7SUFDSCxDQUFDO0NBQ0YsQ0FBQTtBQWRDO0lBREMsSUFBQSxhQUFNLEdBQUU7b0RBQzZCO0FBR3RDO0lBREMsSUFBQSxhQUFNLEdBQUU7aUVBQ2lEO0FBTC9DLG9CQUFvQjtJQVBoQyxJQUFBLG1CQUFRLEVBQWlCO1FBQ3hCLElBQUksRUFBRSx1QkFBWSxDQUFDLE1BQU07UUFDekIsWUFBWSxFQUFFO1lBQ1osZUFBZTtZQUNmLFFBQVEsRUFBRSxLQUFLLEdBQUcsQ0FBQztTQUNwQjtLQUNGLENBQUM7R0FDVyxvQkFBb0IsQ0FnQmhDO0FBaEJZLG9EQUFvQiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ3JlYXRlU3luY0JpbmFyeVRhc2suanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9hcHAvcG9ydC9zY2hlZHVsZS9DcmVhdGVTeW5jQmluYXJ5VGFzay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7QUFDQSxtREFBOEU7QUFDOUUsc0NBQXFDO0FBRXJDLHdFQUFnRDtBQVNoRCxJQUFhLG9CQUFvQixHQUFqQyxNQUFhLG9CQUFvQjtJQU8vQixLQUFLLENBQUMsU0FBUztRQUNiLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxnQkFBZ0I7WUFBRSxPQUFPO1FBRW5ELEtBQUssTUFBTSxDQUFFLFVBQVUsRUFBRSxNQUFNLENBQUUsSUFBSSxNQUFNLENBQUMsT0FBTyxDQUFDLGtCQUFRLENBQUMsRUFBRTtZQUM3RCxJQUFJLElBQUksQ0FBQyxNQUFNLENBQUMsR0FBRyxLQUFLLFVBQVUsSUFBSSxVQUFVLEtBQUssTUFBTTtnQkFBRSxTQUFTO1lBQ3RFLElBQUksTUFBTSxDQUFDLE9BQU87Z0JBQUUsU0FBUztZQUU3QixnRUFBZ0U7WUFDaEUsa0ZBQWtGO1lBQ2xGLDBEQUEwRDtZQUMxRCxNQUFNLElBQUksQ0FBQyxtQkFBbUIsQ0FBQyxVQUFVLENBQUMsVUFBVSxDQUFDLENBQUM7U0FDdkQ7SUFDSCxDQUFDO0NBQ0YsQ0FBQTtBQWxCQztJQURDLElBQUEsYUFBTSxHQUFFO29EQUM2QjtBQUd0QztJQURDLElBQUEsYUFBTSxHQUFFO2lFQUNpRDtBQUwvQyxvQkFBb0I7SUFQaEMsSUFBQSxtQkFBUSxFQUFpQjtRQUN4QixJQUFJLEVBQUUsdUJBQVksQ0FBQyxNQUFNO1FBQ3pCLFlBQVksRUFBRTtZQUNaLGVBQWU7WUFDZixRQUFRLEVBQUUsS0FBSyxHQUFHLENBQUM7U0FDcEI7S0FDRixDQUFDO0dBQ1csb0JBQW9CLENBb0JoQztBQXBCWSxvREFBb0IifQ==

package/dist/config/binaries.d.ts

@@ -17,7 +17,6 @@ export declare type BinaryTaskConfig = {
     syncer: SyncerClass;
     repo: string;
     distUrl: string;
-    mergeCategory?: string;
     ignoreDirs?: string[];
     ignoreFiles?: string[];
     options?: {

package/dist/config/binaries.js

@@ -830,9 +830,8 @@ const binaries = {
         distUrl: 'https://github.com/dragonflyoss/image-service/releases',
     },
     canvas: {
-        category: 'canvas',
         // canvas@<=2.6.1 二进制需要从 node-canvas-prebuilt 下载
-        mergeCategory: 'node-canvas-prebuilt',
+        category: 'node-canvas-prebuilt',
         description: 'Node canvas is a Cairo backed Canvas implementation for NodeJS.',
         syncer: SyncerClass.GithubBinary,
         repo: 'Automattic/node-canvas',
@@ -868,4 +867,4 @@ const binaries = {
     },
 };
 exports.default = binaries;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"binaries.js","sourceRoot":"","sources":["../../config/binaries.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"binaries.js","sourceRoot":"","sources":["../../config/binaries.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnpmcore",
-  "version": "2.6.1",
+  "version": "2.7.1",
   "description": "npm core",
   "files": [
     "dist/**/*"