cnpmcore 3.53.0 → 3.53.2

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

@@ -21,6 +21,7 @@ export declare abstract class AbstractBinary {
     protected httpclient: EggHttpClient;
     abstract initFetch(binaryName: BinaryName): Promise<void>;
     abstract fetch(dir: string, binaryName: BinaryName): Promise<FetchResult | undefined>;
+    finishFetch(_success: boolean, _binaryName: BinaryName): Promise<void>;
     protected requestXml(url: string): Promise<string>;
     protected requestJSON(url: string, requestHeaders?: Record<string, string>): Promise<any>;
     protected listNodeABIVersions(): Promise<number[]>;

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

@@ -14,6 +14,10 @@ const tegg_1 = require("@eggjs/tegg");
 const platforms = ['darwin', 'linux', 'win32'];
 exports.BINARY_ADAPTER_ATTRIBUTE = Symbol('BINARY_ADAPTER_ATTRIBUTE');
 class AbstractBinary {
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    async finishFetch(_success, _binaryName) {
+        // do not thing by default
+    }
     async requestXml(url) {
         const { status, data, headers } = await this.httpclient.request(url, {
             timeout: 30000,
@@ -89,4 +93,4 @@ __decorate([
     __metadata("design:type", Object)
 ], AbstractBinary.prototype, "httpclient", void 0);
 exports.BinaryAdapter = tegg_1.QualifierImplDecoratorUtil.generatorDecorator(AbstractBinary, exports.BINARY_ADAPTER_ATTRIBUTE);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQWJzdHJhY3RCaW5hcnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9hcHAvY29tbW9uL2FkYXB0ZXIvYmluYXJ5L0Fic3RyYWN0QmluYXJ5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7OztBQUFBLHNDQUFnRjtBQW1CaEYsTUFBTSxTQUFTLEdBQUcsQ0FBRSxRQUFRLEVBQUUsT0FBTyxFQUFFLE9BQU8sQ0FBVyxDQUFDO0FBRTdDLFFBQUEsd0JBQXdCLEdBQUcsTUFBTSxDQUFDLDBCQUEwQixDQUFDLENBQUM7QUFFM0UsTUFBc0IsY0FBYztJQVV4QixLQUFLLENBQUMsVUFBVSxDQUFDLEdBQVc7UUFDcEMsTUFBTSxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsT0FBTyxFQUFFLEdBQUcsTUFBTSxJQUFJLENBQUMsVUFBVSxDQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUU7WUFDbkUsT0FBTyxFQUFFLEtBQUs7WUFDZCxjQUFjLEVBQUUsSUFBSTtZQUNwQixJQUFJLEVBQUUsSUFBSTtTQUNYLENBQUMsQ0FBQztRQUNILE1BQU0sR0FBRyxHQUFHLElBQUksQ0FBQyxRQUFRLEVBQVksQ0FBQztRQUN0QyxJQUFJLE1BQU0sS0FBSyxHQUFHLEVBQUU7WUFDbEIsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsc0ZBQXNGLEVBQUUsR0FBRyxFQUFFLE1BQU0sRUFBRSxPQUFPLEVBQUUsR0FBRyxDQUFDLENBQUM7WUFDcEksT0FBTyxFQUFFLENBQUM7U0FDWDtRQUNELE9BQU8sR0FBRyxDQUFDO0lBQ2IsQ0FBQztJQUVTLEtBQUssQ0FBQyxXQUFXLENBQUMsR0FBVyxFQUFFLGNBQXVDO1FBQzlFLE1BQU0sRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxHQUFHLE1BQU0sSUFBSSxDQUFDLFVBQVUsQ0FBQyxPQUFPLENBQUMsR0FBRyxFQUFFO1lBQ25FLE9BQU8sRUFBRSxLQUFLO1lBQ2QsUUFBUSxFQUFFLE1BQU07WUFDaEIsY0FBYyxFQUFFLElBQUk7WUFDcEIsSUFBSSxFQUFFLElBQUk7WUFDVixPQUFPLEVBQUUsY0FBYztTQUN4QixDQUFDLENBQUM7UUFDSCxJQUFJLE1BQU0sS0FBSyxHQUFHLEVBQUU7WUFDbEIsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsOEVBQThFLEVBQUUsR0FBRyxFQUFFLE1BQU0sRUFBRSxPQUFPLENBQUMsQ0FBQztZQUN2SCxPQUFPLElBQUksQ0FBQztTQUNiO1FBQ0QsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBRUQsa0VBQWtFO0lBQ3hELEtBQUssQ0FBQyxtQkFBbUI7UUFDakMsTUFBTSxlQUFlLEdBQWEsRUFBRSxDQUFDO1FBQ3JDLE1BQU0sUUFBUSxHQUFHLE1BQU0sSUFBSSxDQUFDLFdBQVcsQ0FBQyxvQ0FBb0MsQ0FBQyxDQUFDO1FBQzlFLEtBQUssTUFBTSxPQUFPLElBQUksUUFBUSxFQUFFO1lBQzlCLElBQUksQ0FBQyxPQUFPLENBQUMsT0FBTztnQkFBRSxTQUFTO1lBQy9CLE1BQU0sY0FBYyxHQUFHLFFBQVEsQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLENBQUM7WUFDakQsNkJBQTZCO1lBQzdCLElBQUksY0FBYyxJQUFJLEVBQUUsSUFBSSxDQUFDLGVBQWUsQ0FBQyxRQUFRLENBQUMsY0FBYyxDQUFDLEVBQUU7Z0JBQ3JFLGVBQWUsQ0FBQyxJQUFJLENBQUMsY0FBYyxDQUFDLENBQUM7YUFDdEM7U0FDRjtRQUNELE9BQU8sZUFBZSxDQUFDO0lBQ3pCLENBQUM7SUFFUyxpQkFBaUI7UUFDekIsNENBQTRDO1FBQzVDLE9BQU8sU0FBUyxDQUFDO0lBQ25CLENBQUM7SUFFUyxhQUFhLENBQUMsWUFBK0I7UUFDckQsSUFBSSxZQUFZLEVBQUUsT0FBTyxFQUFFLFNBQVM7WUFBRSxPQUFPLFlBQVksQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFDO1FBQzVFLHdDQUF3QztRQUN4QyxPQUFPO1lBQ0wsS0FBSyxFQUFFLENBQUUsS0FBSyxFQUFFLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxFQUFFLEtBQUssQ0FBRTtZQUNqRCxNQUFNLEVBQUUsQ0FBRSxPQUFPLEVBQUUsTUFBTSxFQUFFLEtBQUssQ0FBRTtZQUNsQyxLQUFLLEVBQUUsQ0FBRSxNQUFNLEVBQUUsS0FBSyxDQUFFO1NBQ3pCLENBQUM7SUFDSixDQUFDO0lBRVMsYUFBYTtRQUNyQiwyRUFBMkU7UUFDM0UsT0FBTztZQUNMLE1BQU0sRUFBRSxDQUFFLFNBQVMsQ0FBRTtZQUNyQixLQUFLLEVBQUUsQ0FBRSxPQUFPLEVBQUUsTUFBTSxDQUFFO1lBQzFCLEtBQUssRUFBRSxDQUFFLFNBQVMsQ0FBRTtTQUNyQixDQUFDO0lBQ0osQ0FBQztDQUNGO0FBN0VELHdDQTZFQztBQTNFVztJQURULElBQUEsYUFBTSxHQUFFOzs4Q0FDbUI7QUFHbEI7SUFEVCxJQUFBLGFBQU0sR0FBRTs7a0RBQzJCO0FBMEV6QixRQUFBLGFBQWEsR0FDeEIsaUNBQTBCLENBQUMsa0JBQWtCLENBQUMsY0FBYyxFQUFFLGdDQUF3QixDQUFDLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQWJzdHJhY3RCaW5hcnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9hcHAvY29tbW9uL2FkYXB0ZXIvYmluYXJ5L0Fic3RyYWN0QmluYXJ5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7OztBQUFBLHNDQUFnRjtBQW1CaEYsTUFBTSxTQUFTLEdBQUcsQ0FBRSxRQUFRLEVBQUUsT0FBTyxFQUFFLE9BQU8sQ0FBVyxDQUFDO0FBRTdDLFFBQUEsd0JBQXdCLEdBQUcsTUFBTSxDQUFDLDBCQUEwQixDQUFDLENBQUM7QUFFM0UsTUFBc0IsY0FBYztJQVVsQyw2REFBNkQ7SUFDN0QsS0FBSyxDQUFDLFdBQVcsQ0FBQyxRQUFpQixFQUFFLFdBQXVCO1FBQzFELDBCQUEwQjtJQUM1QixDQUFDO0lBRVMsS0FBSyxDQUFDLFVBQVUsQ0FBQyxHQUFXO1FBQ3BDLE1BQU0sRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxHQUFHLE1BQU0sSUFBSSxDQUFDLFVBQVUsQ0FBQyxPQUFPLENBQUMsR0FBRyxFQUFFO1lBQ25FLE9BQU8sRUFBRSxLQUFLO1lBQ2QsY0FBYyxFQUFFLElBQUk7WUFDcEIsSUFBSSxFQUFFLElBQUk7U0FDWCxDQUFDLENBQUM7UUFDSCxNQUFNLEdBQUcsR0FBRyxJQUFJLENBQUMsUUFBUSxFQUFZLENBQUM7UUFDdEMsSUFBSSxNQUFNLEtBQUssR0FBRyxFQUFFO1lBQ2xCLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLHNGQUFzRixFQUFFLEdBQUcsRUFBRSxNQUFNLEVBQUUsT0FBTyxFQUFFLEdBQUcsQ0FBQyxDQUFDO1lBQ3BJLE9BQU8sRUFBRSxDQUFDO1NBQ1g7UUFDRCxPQUFPLEdBQUcsQ0FBQztJQUNiLENBQUM7SUFFUyxLQUFLLENBQUMsV0FBVyxDQUFDLEdBQVcsRUFBRSxjQUF1QztRQUM5RSxNQUFNLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxPQUFPLEVBQUUsR0FBRyxNQUFNLElBQUksQ0FBQyxVQUFVLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRTtZQUNuRSxPQUFPLEVBQUUsS0FBSztZQUNkLFFBQVEsRUFBRSxNQUFNO1lBQ2hCLGNBQWMsRUFBRSxJQUFJO1lBQ3BCLElBQUksRUFBRSxJQUFJO1lBQ1YsT0FBTyxFQUFFLGNBQWM7U0FDeEIsQ0FBQyxDQUFDO1FBQ0gsSUFBSSxNQUFNLEtBQUssR0FBRyxFQUFFO1lBQ2xCLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLDhFQUE4RSxFQUFFLEdBQUcsRUFBRSxNQUFNLEVBQUUsT0FBTyxDQUFDLENBQUM7WUFDdkgsT0FBTyxJQUFJLENBQUM7U0FDYjtRQUNELE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUVELGtFQUFrRTtJQUN4RCxLQUFLLENBQUMsbUJBQW1CO1FBQ2pDLE1BQU0sZUFBZSxHQUFhLEVBQUUsQ0FBQztRQUNyQyxNQUFNLFFBQVEsR0FBRyxNQUFNLElBQUksQ0FBQyxXQUFXLENBQUMsb0NBQW9DLENBQUMsQ0FBQztRQUM5RSxLQUFLLE1BQU0sT0FBTyxJQUFJLFFBQVEsRUFBRTtZQUM5QixJQUFJLENBQUMsT0FBTyxDQUFDLE9BQU87Z0JBQUUsU0FBUztZQUMvQixNQUFNLGNBQWMsR0FBRyxRQUFRLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1lBQ2pELDZCQUE2QjtZQUM3QixJQUFJLGNBQWMsSUFBSSxFQUFFLElBQUksQ0FBQyxlQUFlLENBQUMsUUFBUSxDQUFDLGNBQWMsQ0FBQyxFQUFFO2dCQUNyRSxlQUFlLENBQUMsSUFBSSxDQUFDLGNBQWMsQ0FBQyxDQUFDO2FBQ3RDO1NBQ0Y7UUFDRCxPQUFPLGVBQWUsQ0FBQztJQUN6QixDQUFDO0lBRVMsaUJBQWlCO1FBQ3pCLDRDQUE0QztRQUM1QyxPQUFPLFNBQVMsQ0FBQztJQUNuQixDQUFDO0lBRVMsYUFBYSxDQUFDLFlBQStCO1FBQ3JELElBQUksWUFBWSxFQUFFLE9BQU8sRUFBRSxTQUFTO1lBQUUsT0FBTyxZQUFZLENBQUMsT0FBTyxDQUFDLFNBQVMsQ0FBQztRQUM1RSx3Q0FBd0M7UUFDeEMsT0FBTztZQUNMLEtBQUssRUFBRSxDQUFFLEtBQUssRUFBRSxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sRUFBRSxLQUFLLENBQUU7WUFDakQsTUFBTSxFQUFFLENBQUUsT0FBTyxFQUFFLE1BQU0sRUFBRSxLQUFLLENBQUU7WUFDbEMsS0FBSyxFQUFFLENBQUUsTUFBTSxFQUFFLEtBQUssQ0FBRTtTQUN6QixDQUFDO0lBQ0osQ0FBQztJQUVTLGFBQWE7UUFDckIsMkVBQTJFO1FBQzNFLE9BQU87WUFDTCxNQUFNLEVBQUUsQ0FBRSxTQUFTLENBQUU7WUFDckIsS0FBSyxFQUFFLENBQUUsT0FBTyxFQUFFLE1BQU0sQ0FBRTtZQUMxQixLQUFLLEVBQUUsQ0FBRSxTQUFTLENBQUU7U0FDckIsQ0FBQztJQUNKLENBQUM7Q0FDRjtBQWxGRCx3Q0FrRkM7QUFoRlc7SUFEVCxJQUFBLGFBQU0sR0FBRTs7OENBQ21CO0FBR2xCO0lBRFQsSUFBQSxhQUFNLEdBQUU7O2tEQUMyQjtBQStFekIsUUFBQSxhQUFhLEdBQ3hCLGlDQUEwQixDQUFDLGtCQUFrQixDQUFDLGNBQWMsRUFBRSxnQ0FBd0IsQ0FBQyxDQUFDIn0=

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

@@ -4,5 +4,6 @@ export declare class ChromeForTestingBinary extends AbstractBinary {
     static lastTimestamp: string;
     private dirItems?;
     initFetch(): Promise<void>;
+    finishFetch(success: boolean): Promise<void>;
     fetch(dir: string): Promise<FetchResult | undefined>;
 }

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

@@ -10,7 +10,13 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _ChromeForTestingBinary_instances, _a, _ChromeForTestingBinary_syncDirItems;
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var _ChromeForTestingBinary_instances, _a, _ChromeForTestingBinary_timestamp, _ChromeForTestingBinary_syncDirItems;
 var ChromeForTestingBinary_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ChromeForTestingBinary = void 0;
@@ -22,10 +28,16 @@ let ChromeForTestingBinary = ChromeForTestingBinary_1 = _a = class ChromeForTest
     constructor() {
         super(...arguments);
         _ChromeForTestingBinary_instances.add(this);
+        _ChromeForTestingBinary_timestamp.set(this, '');
     }
     async initFetch() {
         this.dirItems = undefined;
     }
+    async finishFetch(success) {
+        if (success && __classPrivateFieldGet(this, _ChromeForTestingBinary_timestamp, "f") && ChromeForTestingBinary_1.lastTimestamp !== __classPrivateFieldGet(this, _ChromeForTestingBinary_timestamp, "f")) {
+            ChromeForTestingBinary_1.lastTimestamp = __classPrivateFieldGet(this, _ChromeForTestingBinary_timestamp, "f");
+        }
+    }
     async fetch(dir) {
         // use https://github.com/GoogleChromeLabs/chrome-for-testing#json-api-endpoints
         if (!this.dirItems) {
@@ -35,19 +47,28 @@ let ChromeForTestingBinary = ChromeForTestingBinary_1 = _a = class ChromeForTest
     }
 };
 exports.ChromeForTestingBinary = ChromeForTestingBinary;
+_ChromeForTestingBinary_timestamp = new WeakMap();
 _ChromeForTestingBinary_instances = new WeakSet();
 _ChromeForTestingBinary_syncDirItems = async function _ChromeForTestingBinary_syncDirItems() {
     this.dirItems = {};
     this.dirItems['/'] = [];
     const jsonApiEndpoint = 'https://googlechromelabs.github.io/chrome-for-testing/known-good-versions-with-downloads.json';
-    const { data } = await this.httpclient.request(jsonApiEndpoint, {
+    const { data, status, headers } = await this.httpclient.request(jsonApiEndpoint, {
         dataType: 'json',
         timeout: 30000,
         followRedirect: true,
         gzip: true,
     });
-    if (data.timestamp === ChromeForTestingBinary_1.lastTimestamp)
+    if (status !== 200) {
+        this.logger.warn('[ChromeForTestingBinary.request:non-200-status] url: %s, status: %s, headers: %j, data: %j', jsonApiEndpoint, status, headers, data);
         return;
+    }
+    __classPrivateFieldSet(this, _ChromeForTestingBinary_timestamp, data.timestamp, "f");
+    const hasNewData = __classPrivateFieldGet(this, _ChromeForTestingBinary_timestamp, "f") !== ChromeForTestingBinary_1.lastTimestamp;
+    this.logger.info('[ChromeForTestingBinary] remote data timestamp: %j, last timestamp: %j, hasNewData: %s', __classPrivateFieldGet(this, _ChromeForTestingBinary_timestamp, "f"), ChromeForTestingBinary_1.lastTimestamp, hasNewData);
+    if (!hasNewData) {
+        return;
+    }
     // "timestamp": "2023-09-16T00:21:21.964Z",
     // "versions": [
     //   {
@@ -115,11 +136,10 @@ _ChromeForTestingBinary_syncDirItems = async function _ChromeForTestingBinary_sy
             }
         }
     }
-    ChromeForTestingBinary_1.lastTimestamp = data.timestamp;
 };
 ChromeForTestingBinary.lastTimestamp = '';
 exports.ChromeForTestingBinary = ChromeForTestingBinary = ChromeForTestingBinary_1 = __decorate([
     (0, tegg_1.SingletonProto)(),
     (0, AbstractBinary_1.BinaryAdapter)(Binary_1.BinaryType.ChromeForTesting)
 ], ChromeForTestingBinary);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ2hyb21lRm9yVGVzdGluZ0JpbmFyeS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL2FwcC9jb21tb24vYWRhcHRlci9iaW5hcnkvQ2hyb21lRm9yVGVzdGluZ0JpbmFyeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsK0JBQWdDO0FBQ2hDLHNDQUE2QztBQUM3Qyw4Q0FBK0M7QUFDL0MscURBQTBGO0FBSW5GLElBQU0sc0JBQXNCLG1DQUE1QixNQUFNLHNCQUF1QixTQUFRLCtCQUFjO0lBQW5EOzs7SUE2R1AsQ0FBQztJQXRHQyxLQUFLLENBQUMsU0FBUztRQUNiLElBQUksQ0FBQyxRQUFRLEdBQUcsU0FBUyxDQUFDO0lBQzVCLENBQUM7SUE2RkQsS0FBSyxDQUFDLEtBQUssQ0FBQyxHQUFXO1FBQ3JCLGdGQUFnRjtRQUNoRixJQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsRUFBRTtZQUNsQixNQUFNLHVCQUFBLElBQUksK0VBQWMsTUFBbEIsSUFBSSxDQUFnQixDQUFDO1NBQzVCO1FBQ0QsT0FBTyxFQUFFLEtBQUssRUFBRSxJQUFJLENBQUMsUUFBUyxDQUFDLEdBQUcsQ0FBQyxFQUFFLFVBQVUsRUFBRSxJQUFJLEVBQUUsQ0FBQztJQUMxRCxDQUFDOztBQTVHVSx3REFBc0I7O3VDQVdqQyxLQUFLO0lBQ0gsSUFBSSxDQUFDLFFBQVEsR0FBRyxFQUFFLENBQUM7SUFDbkIsSUFBSSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsR0FBRyxFQUFFLENBQUM7SUFDeEIsTUFBTSxlQUFlLEdBQUcsK0ZBQStGLENBQUM7SUFDeEgsTUFBTSxFQUFFLElBQUksRUFBRSxHQUFHLE1BQU0sSUFBSSxDQUFDLFVBQVUsQ0FBQyxPQUFPLENBQUMsZUFBZSxFQUFFO1FBQzlELFFBQVEsRUFBRSxNQUFNO1FBQ2hCLE9BQU8sRUFBRSxLQUFLO1FBQ2QsY0FBYyxFQUFFLElBQUk7UUFDcEIsSUFBSSxFQUFF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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ2hyb21lRm9yVGVzdGluZ0JpbmFyeS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL2FwcC9jb21tb24vYWRhcHRlci9iaW5hcnkvQ2hyb21lRm9yVGVzdGluZ0JpbmFyeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsK0JBQWdDO0FBQ2hDLHNDQUE2QztBQUM3Qyw4Q0FBK0M7QUFDL0MscURBQTBGO0FBSW5GLElBQU0sc0JBQXNCLG1DQUE1QixNQUFNLHNCQUF1QixTQUFRLCtCQUFjO0lBQW5EOzs7UUFFTCw0Q0FBYSxFQUFFLEVBQUM7SUE0SGxCLENBQUM7SUF0SEMsS0FBSyxDQUFDLFNBQVM7UUFDYixJQUFJLENBQUMsUUFBUSxHQUFHLFNBQVMsQ0FBQztJQUM1QixDQUFDO0lBRUQsS0FBSyxDQUFDLFdBQVcsQ0FBQyxPQUFnQjtRQUNoQyxJQUFJLE9BQU8sSUFBSSx1QkFBQSxJQUFJLHlDQUFXLElBQUksd0JBQXNCLENBQUMsYUFBYSxLQUFLLHVCQUFBLElBQUkseUNBQVcsRUFBRTtZQUMxRix3QkFBc0IsQ0FBQyxhQUFhLEdBQUcsdUJBQUEsSUFBSSx5Q0FBVyxDQUFDO1NBQ3hEO0lBQ0gsQ0FBQztJQXVHRCxLQUFLLENBQUMsS0FBSyxDQUFDLEdBQVc7UUFDckIsZ0ZBQWdGO1FBQ2hGLElBQUksQ0FBQyxJQUFJLENBQUMsUUFBUSxFQUFFO1lBQ2xCLE1BQU0sdUJBQUEsSUFBSSwrRUFBYyxNQUFsQixJQUFJLENBQWdCLENBQUM7U0FDNUI7UUFDRCxPQUFPLEVBQUUsS0FBSyxFQUFFLElBQUksQ0FBQyxRQUFTLENBQUMsR0FBRyxDQUFDLEVBQUUsVUFBVSxFQUFFLElBQUksRUFBRSxDQUFDO0lBQzFELENBQUM7O0FBN0hVLHdEQUFzQjs7O3VDQWtCakMsS0FBSztJQUNILElBQUksQ0FBQyxRQUFRLEdBQUcsRUFBRSxDQUFDO0lBQ25CLElBQUksQ0FBQyxRQUFRLENB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

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

@@ -104,6 +104,7 @@ let BinarySyncerService = class BinarySyncerService extends AbstractService_1.Ab
             logs.push(`[${isoNow()}] 🟢 log: ${logUrl}`);
             logs.push(`[${isoNow()}] 🟢🟢🟢🟢🟢 "${binaryName}" 🟢🟢🟢🟢🟢`);
             await this.taskService.finishTask(task, Task_1.TaskState.Success, logs.join('\n'));
+            await binaryAdapter.finishFetch(true, binaryName);
             this.logger.info('[BinarySyncerService.executeTask:success] taskId: %s, targetName: %s, log: %s', task.taskId, task.targetName, logUrl);
         }
         catch (err) {
@@ -120,6 +121,7 @@ let BinarySyncerService = class BinarySyncerService extends AbstractService_1.Ab
                 this.logger.error('[BinarySyncerService.executeTask:fail] taskId: %s, targetName: %s, %s', task.taskId, task.targetName, task.error);
                 this.logger.error(err);
             }
+            await binaryAdapter.finishFetch(false, binaryName);
             await this.taskService.finishTask(task, Task_1.TaskState.Fail, logs.join('\n'));
         }
     }
@@ -204,7 +206,7 @@ let BinarySyncerService = class BinarySyncerService extends AbstractService_1.Ab
                 logs.push(`[${isoNow()}][${dir}] ❌ Synced dir fail`);
             }
             else {
-                logs.push(`[${isoNow()}][${dir}] 🟢 Synced dir success`);
+                logs.push(`[${isoNow()}][${dir}] 🟢 Synced dir success, hasItems: ${hasItems}`);
             }
             await this.taskService.appendTaskLog(task, logs.join('\n'));
         }
@@ -313,4 +315,4 @@ exports.BinarySyncerService = BinarySyncerService = __decorate([
         accessLevel: tegg_1.AccessLevel.PUBLIC,
     })
 ], BinarySyncerService);
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"BinarySyncerService.js","sourceRoot":"","sources":["../../../../app/core/service/BinarySyncerService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,0CAAiC;AACjC,sCAKqB;AAIrB,2DAA6B;AAC7B,wEAA8E;AAC9E,gEAA6D;AAC7D,iDAA6D;AAC7D,oDAA2D;AAC3D,wEAAqE;AACrE,yCAAsC;AACtC,6CAA0C;AAC1C,+CAA4C;AAC5C,+EAAwF;AACxF,kEAA+D;AAC/D,qDAAsD;AACtD,mCAAgC;AAEhC,SAAS,MAAM;IACb,OAAO,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;AAClC,CAAC;AAKM,IAAM,mBAAmB,GAAzB,MAAM,mBAAoB,SAAQ,iCAAe;IAYtD,8DAA8D;IAC9D,6FAA6F;IAC7F,4CAA4C;IACrC,KAAK,CAAC,UAAU,CAAC,UAAqC,EAAE,MAAc,EAAE,IAAY;QACzF,OAAO,MAAM,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;IAC1E,CAAC;IAEM,KAAK,CAAC,eAAe,CAAC,MAAc;QACzC,OAAO,MAAM,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,MAAM,CAAC,QAAQ,EAAE,GAAG,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;IACrG,CAAC;IAEM,KAAK,CAAC,gBAAgB,CAAC,UAAsB;QAClD,2EAA2E;QAC3E,oDAAoD;QACpD,MAAM,EACJ,QAAQ,GACT,GAAG,kBAAQ,CAAC,UAAU,CAAC,CAAC;QACzB,MAAM,IAAI,GAAG;YACX,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,UAAU,EAAE,GAAG,CAAC;SACpD,CAAC;QACF,IAAI,QAAQ,IAAI,QAAQ,KAAK,UAAU,EAAE;YACvC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC;SAC9D;QAED,MAAM,CACJ,UAAU,EACV,cAAc,EACf,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAE5B,MAAM,QAAQ,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAC7C,cAAc,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE;YAC1B,MAAM,OAAO,GAAG,CAAC,CAAC,IAAI,CAAC;YACvB,cAAc;YACd,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;gBAC/B,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;aACpB;QACH,CAAC,CAAC,CAAC;QAEH,OAAO,UAAU,CAAC;IACpB,CAAC;IAEM,KAAK,CAAC,cAAc,CAAC,MAAc;QACxC,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,sBAAsB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IACxE,CAAC;IAEM,KAAK,CAAC,UAAU,CAAC,UAAsB,EAAE,QAAc;QAC5D,IAAI;YACF,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,WAAI,CAAC,gBAAgB,CAAC,UAAU,EAAE,QAAQ,CAAC,EAAE,KAAK,CAAC,CAAC;SAC9F;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,4DAA4D,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC;SAChG;IACH,CAAC;IAEM,KAAK,CAAC,QAAQ,CAAC,MAAc;QAClC,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IACjD,CAAC;IAEM,KAAK,CAAC,WAAW,CAAC,IAAU;QACjC,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IAClD,CAAC;IAEM,KAAK,CAAC,eAAe;QAC1B,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,eAAQ,CAAC,UAAU,CAAC,CAAC;IACrE,CAAC;IAEM,KAAK,CAAC,WAAW,CAAC,IAAU;QACjC,MAAM,UAAU,GAAG,IAAI,CAAC,UAAwB,CAAC;QACjD,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;QAC9D,MAAM,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,aAAa,UAAU,UAAU,IAAI,CAAC,MAAM,MAAM,CAAC;QAClG,IAAI,IAAI,GAAa,EAAE,CAAC;QACxB,IAAI,CAAC,IAAI,CAAC,IAAI,MAAM,EAAE,mCAAmC,UAAU,cAAc,CAAC,CAAC;QACnF,IAAI,CAAC,aAAa,EAAE;YAClB,IAAI,CAAC,KAAK,GAAG,mBAAmB,CAAC;YACjC,IAAI,CAAC,IAAI,CAAC,IAAI,MAAM,EAAE,eAAe,UAAU,WAAW,IAAI,CAAC,KAAK,UAAU,MAAM,EAAE,CAAC,CAAC;YACxF,IAAI,CAAC,IAAI,CAAC,IAAI,MAAM,EAAE,YAAY,UAAU,SAAS,CAAC,CAAC;YACvD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uEAAuE,EACvF,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;YAC5C,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,IAAI,EAAE,gBAAS,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YACzE,OAAO;SACR;QAED,MAAM,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAC5D,IAAI,GAAG,EAAE,CAAC;QACV,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,6EAA6E,EAC5F,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QACxC,IAAI;YACF,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;YAC7C,IAAI,CAAC,IAAI,CAAC,IAAI,MAAM,EAAE,aAAa,MAAM,EAAE,CAAC,CAAC;YAC7C,IAAI,CAAC,IAAI,CAAC,IAAI,MAAM,EAAE,iBAAiB,UAAU,cAAc,CAAC,CAAC;YACjE,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,IAAI,EAAE,gBAAS,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YAC5E,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,+EAA+E,EAC9F,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;SACzC;QAAC,OAAO,GAAQ,EAAE;YACjB,IAAI,CAAC,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC;YACzB,IAAI,CAAC,IAAI,CAAC,IAAI,MAAM,EAAE,eAAe,UAAU,WAAW,IAAI,CAAC,KAAK,UAAU,MAAM,EAAE,CAAC,CAAC;YACxF,IAAI,CAAC,IAAI,CAAC,IAAI,MAAM,EAAE,YAAY,UAAU,SAAS,CAAC,CAAC;YACvD,IAAI,GAAG,CAAC,IAAI,KAAK,+BAA+B;mBAC3C,GAAG,CAAC,IAAI,KAAK,iBAAiB;mBAC9B,GAAG,CAAC,IAAI,KAAK,qBAAqB,EAAE;gBACvC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,uEAAuE,EACtF,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;gBAC5C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aACvB;iBAAM;gBACL,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uEAAuE,EACvF,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;gBAC5C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;aACxB;YACD,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,IAAI,EAAE,gBAAS,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;SAC1E;IACH,CAAC;IAEO,KAAK,CAAC,OAAO,CAAC,aAA6B,EAAE,IAAU,EAAE,GAAW,EAAE,WAAW,GAAG,EAAE,EAAE,mBAAmB,GAAG,GAAG;QACvH,MAAM,UAAU,GAAG,IAAI,CAAC,UAAwB,CAAC;QACjD,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,KAAK,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;QAC1D,IAAI,gBAAgB,GAAG,KAAK,CAAC;QAC7B,IAAI,QAAQ,GAAG,KAAK,CAAC;QACrB,IAAI,MAAM,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;YACrC,QAAQ,GAAG,IAAI,CAAC;YAChB,IAAI,IAAI,GAAa,EAAE,CAAC;YACxB,MAAM,EAAE,QAAQ,EAAE,gBAAgB,EAAE,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,GAAG,EAAE,MAAM,CAAC,KAAK,EAAE,mBAAmB,CAAC,CAAC;YAC3G,IAAI,CAAC,IAAI,CAAC,IAAI,MAAM,EAAE,KAAK,GAAG,sBAAsB,MAAM,CAAC,KAAK,CAAC,MAAM,OAAO,QAAQ,CAAC,MAAM,mBAAmB,aAAa,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC;YAClJ,0BAA0B;YAC1B,KAAK,MAAM,CAAE,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,IAAI,QAAQ,CAAC,OAAO,EAAE,EAAE;gBAC3D,IAAI,IAAI,CAAC,KAAK,EAAE;oBACd,IAAI,CAAC,IAAI,CAAC,IAAI,MAAM,EAAE,KAAK,GAAG,SAAS,WAAW,GAAG,KAAK,oBAAoB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,MAAM,EAAE,CAAC,CAAC;oBACzH,MAAM,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;oBAC5D,IAAI,GAAG,EAAE,CAAC;oBACV,MAAM,CAAE,QAAQ,EAAE,WAAW,CAAE,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,IAAI,EAAE,GAAG,GAAG,GAAG,IAAI,CAAC,IAAI,EAAE,EAAE,GAAG,WAAW,GAAG,KAAK,GAAG,EAAE,gBAAgB,CAAC,CAAC;oBAC7I,IAAI,QAAQ,EAAE;wBACZ,gBAAgB,GAAG,IAAI,CAAC;qBACzB;yBAAM;wBACL,2DAA2D;wBAC3D,8BAA8B;wBAC9B,IAAI,WAAW,EAAE;4BACf,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;yBACjC;qBACF;iBACF;qBAAM;oBACL,kBAAkB;oBAClB,IAAI,CAAC,IAAI,CAAC,IAAI,MAAM,EAAE,KAAK,GAAG,SAAS,WAAW,GAAG,KAAK,iBAAiB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,MAAM,EAAE,CAAC,CAAC;oBACtH,0BAA0B;oBAC1B,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;oBACnG,IAAI,YAAY,IAAI,YAAY,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,EAAE;wBACnD,IAAI,CAAC,IAAI,CAAC,IAAI,MAAM,EAAE,KAAK,GAAG,SAAS,WAAW,GAAG,KAAK,kDAAkD,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAC;wBACrI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,+EAA+E,EAC9F,YAAY,CAAC,QAAQ,EAAE,YAAY,CAAC,SAAS,CAAC,CAAC;wBACjD,SAAS;qBACV;oBACD,MAAM,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;oBAC5D,IAAI,GAAG,EAAE,CAAC;oBACV,IAAI,SAAS,GAAG,EAAE,CAAC;oBACnB,IAAI;wBACF,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,GAChC,MAAM,IAAA,6BAAkB,EACtB,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,SAAU,EAAE,EAAE,sBAAsB,EAAE,IAAI,CAAC,sBAAsB,EAAE,CAAC,CAAC;wBACpH,MAAM,GAAG,GAAG,IAAI,MAAM,EAAE,KAAK,GAAG,SAAS,WAAW,GAAG,KAAK,0BAA0B,OAAO,CAAC,gBAAgB,CAAC,aAAa,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC,SAAS,OAAO,OAAO,EAAE,CAAC;wBACtL,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;wBACf,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,qDAAqD,EAAE,GAAG,CAAC,CAAC;wBAC7E,SAAS,GAAG,OAAO,CAAC;wBACpB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;wBACxD,IAAI,CAAC,IAAI,CAAC,IAAI,MAAM,EAAE,KAAK,GAAG,SAAS,WAAW,GAAG,KAAK,oCAAoC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;wBACjH,MAAM,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;wBAC5D,IAAI,GAAG,EAAE,CAAC;qBACX;oBAAC,OAAO,GAAQ,EAAE;wBACjB,IAAI,GAAG,CAAC,IAAI,KAAK,uBAAuB,EAAE;4BACxC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,uBAAuB,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;4BAC1D,IAAI,CAAC,IAAI,CAAC,IAAI,MAAM,EAAE,KAAK,GAAG,UAAU,WAAW,GAAG,KAAK,cAAc,IAAI,CAAC,SAAS,qBAAqB,CAAC,CAAC;yBAC/G;6BAAM;4BACL,IAAI,GAAG,CAAC,IAAI,KAAK,4BAA4B,EAAE;gCAC7C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,uBAAuB,EAAE,IAAI,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;6BAChE;iCAAM;gCACL,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uBAAuB,EAAE,IAAI,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;6BACjE;4BACD,gBAAgB,GAAG,IAAI,CAAC;4BACxB,IAAI,CAAC,IAAI,CAAC,IAAI,MAAM,EAAE,KAAK,GAAG,QAAQ,WAAW,GAAG,KAAK,cAAc,IAAI,CAAC,SAAS,WAAW,GAAG,EAAE,CAAC,CAAC;yBACxG;wBACD,MAAM,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;wBAC5D,IAAI,GAAG,EAAE,CAAC;qBACX;4BAAS;wBACR,IAAI,SAAS,EAAE;4BACb,MAAM,IAAA,aAAE,EAAC,SAAS,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;yBACtC;qBACF;iBACF;aACF;YACD,IAAI,gBAAgB,EAAE;gBACpB,IAAI,CAAC,IAAI,CAAC,IAAI,MAAM,EAAE,KAAK,GAAG,qBAAqB,CAAC,CAAC;aACtD;iBAAM;gBACL,IAAI,CAAC,IAAI,CAAC,IAAI,MAAM,EAAE,KAAK,GAAG,yBAAyB,CAAC,CAAC;aAC1D;YACD,MAAM,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;SAC7D;QACD,OAAO,CAAE,gBAAgB,EAAE,QAAQ,CAAE,CAAC;IACxC,CAAC;IAGD,kDAAkD;IAClD,qCAAqC;IACrC,iDAAiD;IACjD,8CAA8C;IACtC,KAAK,CAAC,IAAI,CAAC,UAAsB,EAAE,GAAW,EAAE,UAAwB,EAAE,mBAAmB,GAAG,GAAG;QACzG,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;QAC9E,MAAM,SAAS,GAAG,IAAI,GAAG,EAAkB,CAAC;QAC5C,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE;YAC9B,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;SAChC;QACD,MAAM,SAAS,GAAuC,EAAE,CAAC;QACzD,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE;YAC7B,MAAM,UAAU,GAAG,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC5C,IAAI,CAAC,UAAU,EAAE;gBACf,SAAS,CAAC,IAAI,CAAC;oBACb,IAAI,EAAE,eAAM,CAAC,MAAM,CAAC;wBAClB,QAAQ,EAAE,UAAU;wBACpB,MAAM,EAAE,GAAG;wBACX,IAAI,EAAE,IAAI,CAAC,IAAI;wBACf,KAAK,EAAE,IAAI,CAAC,KAAK;wBACjB,IAAI,EAAE,CAAC;wBACP,IAAI,EAAE,IAAI,CAAC,IAAI;wBACf,SAAS,EAAE,IAAI,CAAC,GAAG;wBACnB,sBAAsB,EAAE,IAAI,CAAC,sBAAsB;qBACpD,CAAC;oBACF,MAAM,EAAE,UAAU;iBACnB,CAAC,CAAC;aACJ;iBAAM,IAAI,UAAU,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,EAAE;gBACxC,SAAS,CAAC,IAAI,CAAC;oBACb,IAAI,EAAE,UAAU;oBAChB,MAAM,EAAE,qBAAqB,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,aAAa,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;iBACrG,CAAC,CAAC;gBACH,UAAU,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC;gBAChC,UAAU,CAAC,sBAAsB,GAAG,IAAI,CAAC,sBAAsB,CAAC;gBAChE,UAAU,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;aAC7B;iBAAM,IAAI,GAAG,CAAC,QAAQ,CAAC,mBAAmB,CAAC,EAAE;gBAC5C,MAAM,YAAY,GAAG,IAAA,eAAM,EAAC,UAAU,EAAE,CAAE,MAAM,CAAE,CAAC,CAAC,GAAG,EAAE,EAAE,IAAI,KAAK,IAAI,CAAC,IAAI,CAAC;gBAC9E,IAAI,YAAY,IAAI,UAAU,CAAC,KAAK,EAAE;oBACpC,SAAS,CAAC,IAAI,CAAC;wBACb,IAAI,EAAE,UAAU;wBAChB,MAAM,EAAE,mDAAmD,mBAAmB,oBAAoB,GAAG,qBAAqB,UAAU,CAAC,IAAI,EAAE;qBAC5I,CAAC,CAAC;oBACH,mBAAmB,GAAG,GAAG,mBAAmB,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC;iBAClE;aACF;SACF;QAGD,OAAO;YACL,QAAQ,EAAE,SAAS;YACnB,gBAAgB,EAAE,mBAAmB;SACtC,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,cAAc,CAAC,MAAc,EAAE,OAAgB;QAC3D,IAAI,OAAO,EAAE;YACX,MAAM,IAAI,GAAG,MAAM,kBAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACpC,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;YACxB,MAAM,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC5D,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,kFAAkF,EACjG,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC;SAC1D;QACD,MAAM,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAC/C,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAAC,UAAsB;QACnD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;QACpC,MAAM,YAAY,GAAG,kBAAQ,CAAC,UAAU,CAAC,CAAC;QAE1C,IAAI,aAA6B,CAAC;QAClC,IAAI,MAAM,CAAC,oBAAoB,EAAE;YAC/B,aAAa,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,+BAAc,EAAE,mBAAU,CAAC,GAAG,CAAC,CAAC;SAC1F;aAAM;YACL,aAAa,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,+BAAc,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC;SAC7F;QACD,MAAM,aAAa,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QAC1C,OAAO,aAAa,CAAC;IACvB,CAAC;CACF,CAAA;AA/RY,kDAAmB;AAEb;IADhB,IAAA,aAAM,GAAE;8BAC0B,mCAAgB;6DAAC;AAEnC;IADhB,IAAA,aAAM,GAAE;8BACqB,yBAAW;wDAAC;AAEzB;IADhB,IAAA,aAAM,GAAE;;uDACkC;AAE1B;IADhB,IAAA,aAAM,GAAE;8BACoB,uBAAU;uDAAC;AAEvB;IADhB,IAAA,aAAM,GAAE;;6DAC2C;8BAVzC,mBAAmB;IAH/B,IAAA,qBAAc,EAAC;QACd,WAAW,EAAE,kBAAW,CAAC,MAAM;KAChC,CAAC;GACW,mBAAmB,CA+R/B"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"BinarySyncerService.js","sourceRoot":"","sources":["../../../../app/core/service/BinarySyncerService.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnpmcore",
-  "version": "3.53.0",
+  "version": "3.53.2",
   "description": "npm core",
   "files": [
     "dist/**/*"
@@ -60,6 +60,9 @@
     "url": "git@github.com:cnpm/cnpmcore.git"
   },
   "egg": {
+    "revert": [
+      "CVE-2023-46809"
+    ],
     "typescript": true
   },
   "keywords": [
@@ -90,7 +93,7 @@
     "egg-cors": "^3.0.0",
     "egg-errors": "^2.3.0",
     "egg-redis": "^2.4.0",
-    "egg-scripts": "^2.15.2",
+    "egg-scripts": "^3.0.0",
     "egg-status": "^1.0.0",
     "egg-tracer": "^1.1.0",
     "egg-typebox-validate": "^2.0.0",