cnpmcore 3.43.4 → 3.44.0

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

@@ -1,5 +1,7 @@
 import { AbstractBinary, FetchResult } from './AbstractBinary';
 export declare class ChromeForTestingBinary extends AbstractBinary {
+    #private;
+    static lastTimestamp: string;
     private dirItems?;
     initFetch(): Promise<void>;
     fetch(dir: string): Promise<FetchResult | undefined>;

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

@@ -5,67 +5,121 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    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 ChromeForTestingBinary_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ChromeForTestingBinary = void 0;
+const path_1 = require("path");
 const tegg_1 = require("@eggjs/tegg");
 const Binary_1 = require("../../enum/Binary");
 const AbstractBinary_1 = require("./AbstractBinary");
-let ChromeForTestingBinary = class ChromeForTestingBinary extends AbstractBinary_1.AbstractBinary {
+let ChromeForTestingBinary = ChromeForTestingBinary_1 = _a = class ChromeForTestingBinary extends AbstractBinary_1.AbstractBinary {
+    constructor() {
+        super(...arguments);
+        _ChromeForTestingBinary_instances.add(this);
+    }
     async initFetch() {
         this.dirItems = undefined;
     }
     async fetch(dir) {
+        // use https://github.com/GoogleChromeLabs/chrome-for-testing#json-api-endpoints
         if (!this.dirItems) {
-            this.dirItems = {};
-            this.dirItems['/'] = [];
-            let chromeVersion = '';
-            // exports.PUPPETEER_REVISIONS = Object.freeze({
-            //   chrome: '113.0.5672.63',
-            //   firefox: 'latest',
-            // });
-            const unpkgURL = 'https://unpkg.com/puppeteer-core@latest/lib/cjs/puppeteer/revisions.js';
-            const text = await this.requestXml(unpkgURL);
-            const m = /chrome:\s+\'([\d\.]+)\'\,/.exec(text);
-            if (m) {
-                chromeVersion = m[1];
-            }
-            const platforms = ['linux64', 'mac-arm64', 'mac-x64', 'win32', 'win64'];
-            const date = new Date().toISOString();
-            this.dirItems['/'].push({
-                name: `${chromeVersion}/`,
-                date,
-                size: '-',
-                isDir: true,
-                url: '',
-            });
-            this.dirItems[`/${chromeVersion}/`] = [];
-            for (const platform of platforms) {
-                this.dirItems[`/${chromeVersion}/`].push({
-                    name: `${platform}/`,
-                    date,
+            await __classPrivateFieldGet(this, _ChromeForTestingBinary_instances, "m", _ChromeForTestingBinary_syncDirItems).call(this);
+        }
+        return { items: this.dirItems[dir], nextParams: null };
+    }
+};
+exports.ChromeForTestingBinary = ChromeForTestingBinary;
+_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, {
+        dataType: 'json',
+        timeout: 30000,
+        followRedirect: true,
+        gzip: true,
+    });
+    if (data.timestamp === ChromeForTestingBinary_1.lastTimestamp)
+        return;
+    // "timestamp": "2023-09-16T00:21:21.964Z",
+    // "versions": [
+    //   {
+    //     "version": "113.0.5672.0",
+    //     "revision": "1121455",
+    //     "downloads": {
+    //       "chrome": [
+    //         {
+    //           "platform": "linux64",
+    //           "url": "https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/113.0.5672.0/linux64/chrome-linux64.zip"
+    //         },
+    //         {
+    //           "platform": "mac-arm64",
+    //           "url": "https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/113.0.5672.0/mac-arm64/chrome-mac-arm64.zip"
+    //         },
+    //         {
+    //           "platform": "mac-x64",
+    //           "url": "https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/113.0.5672.0/mac-x64/chrome-mac-x64.zip"
+    //         },
+    //         {
+    //           "platform": "win32",
+    //           "url": "https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/113.0.5672.0/win32/chrome-win32.zip"
+    //         },
+    //         {
+    //           "platform": "win64",
+    //           "url": "https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/113.0.5672.0/win64/chrome-win64.zip"
+    //         }
+    //       ]
+    //     }
+    //   },
+    const versions = data.versions;
+    for (const item of versions) {
+        this.dirItems['/'].push({
+            name: `${item.version}/`,
+            date: item.revision,
+            size: '-',
+            isDir: true,
+            url: '',
+        });
+        const versionDir = `/${item.version}/`;
+        if (!this.dirItems[versionDir]) {
+            this.dirItems[versionDir] = [];
+        }
+        for (const category in item.downloads) {
+            const downloads = item.downloads[category];
+            for (const download of downloads) {
+                const platformDir = `${versionDir}${download.platform}/`;
+                if (!this.dirItems[platformDir]) {
+                    this.dirItems[platformDir] = [];
+                    this.dirItems[versionDir].push({
+                        name: `${download.platform}/`,
+                        date: item.revision,
+                        size: '-',
+                        isDir: true,
+                        url: '',
+                    });
+                }
+                this.dirItems[platformDir].push({
+                    name: (0, path_1.basename)(download.url),
+                    date: data.timestamp,
                     size: '-',
-                    isDir: true,
-                    url: '',
+                    isDir: false,
+                    url: download.url,
                 });
-                // https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/113.0.5672.63/mac-arm64/chrome-mac-arm64.zip
-                const name = `chrome-${platform}.zip`;
-                this.dirItems[`/${chromeVersion}/${platform}/`] = [
-                    {
-                        name,
-                        date,
-                        size: '-',
-                        isDir: false,
-                        url: `https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/${chromeVersion}/${platform}/${name}`,
-                    },
-                ];
             }
         }
-        return { items: this.dirItems[dir], nextParams: null };
     }
+    ChromeForTestingBinary_1.lastTimestamp = data.timestamp;
 };
-exports.ChromeForTestingBinary = ChromeForTestingBinary;
-exports.ChromeForTestingBinary = ChromeForTestingBinary = __decorate([
+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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ2hyb21lRm9yVGVzdGluZ0JpbmFyeS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL2FwcC9jb21tb24vYWRhcHRlci9iaW5hcnkvQ2hyb21lRm9yVGVzdGluZ0JpbmFyeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQSxzQ0FBNkM7QUFDN0MsOENBQStDO0FBQy9DLHFEQUEwRjtBQUluRixJQUFNLHNCQUFzQixHQUE1QixNQUFNLHNCQUF1QixTQUFRLCtCQUFjO0lBS3hELEtBQUssQ0FBQyxTQUFTO1FBQ2IsSUFBSSxDQUFDLFFBQVEsR0FBRyxTQUFTLENBQUM7SUFDNUIsQ0FBQztJQUVELEtBQUssQ0FBQyxLQUFLLENBQUMsR0FBVztRQUNyQixJQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsRUFBRTtZQUNsQixJQUFJLENBQUMsUUFBUSxHQUFHLEVBQUUsQ0FBQztZQUNuQixJQUFJLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxHQUFHLEVBQUUsQ0FBQztZQUN4QixJQUFJLGFBQWEsR0FBRyxFQUFFLENBQUM7WUFFdkIsZ0RBQWdEO1lBQ2hELDZCQUE2QjtZQUM3Qix1QkFBdUI7WUFDdkIsTUFBTTtZQUNOLE1BQU0sUUFBUSxHQUFHLHdFQUF3RSxDQUFDO1lBQzFGLE1BQU0sSUFBSSxHQUFHLE1BQU0sSUFBSSxDQUFDLFVBQVUsQ0FBQyxRQUFRLENBQUMsQ0FBQztZQUM3QyxNQUFNLENBQUMsR0FBRywyQkFBMkIsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDakQsSUFBSSxDQUFDLEVBQUU7Z0JBQ0wsYUFBYSxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQzthQUN0QjtZQUVELE1BQU0sU0FBUyxHQUFHLENBQUUsU0FBUyxFQUFFLFdBQVcsRUFBRSxTQUFTLEVBQUUsT0FBTyxFQUFFLE9BQU8sQ0FBRSxDQUFDO1lBQzFFLE1BQU0sSUFBSSxHQUFHLElBQUksSUFBSSxFQUFFLENBQUMsV0FBVyxFQUFFLENBQUM7WUFDdEMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUM7Z0JBQ3RCLElBQUksRUFBRSxHQUFHLGFBQWEsR0FBRztnQkFDekIsSUFBSTtnQkFDSixJQUFJLEVBQUUsR0FBRztnQkFDVCxLQUFLLEVBQUUsSUFBSTtnQkFDWCxHQUFHLEVBQUUsRUFBRTthQUNSLENBQUMsQ0FBQztZQUNILElBQUksQ0FBQyxRQUFRLENBQUMsSUFBSSxhQUFhLEdBQUcsQ0FBQyxHQUFHLEVBQUUsQ0FBQztZQUV6QyxLQUFLLE1BQU0sUUFBUSxJQUFJLFNBQVMsRUFBRTtnQkFDaEMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxJQUFJLGFBQWEsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFDO29CQUN2QyxJQUFJLEVBQUUsR0FBRyxRQUFRLEdBQUc7b0JBQ3BCLElBQUk7b0JBQ0osSUFBSSxFQUFFLEdBQUc7b0JBQ1QsS0FBSyxFQUFFLElBQUk7b0JBQ1gsR0FBRyxFQUFFLEVBQUU7aUJBQ1IsQ0FBQyxDQUFDO2dCQUVILDJHQUEyRztnQkFDM0csTUFBTSxJQUFJLEdBQUcsVUFBVSxRQUFRLE1BQU0sQ0FBQztnQkFDdEMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxJQUFJLGFBQWEsSUFBSSxRQUFRLEdBQUcsQ0FBQyxHQUFHO29CQUNoRDt3QkFDRSxJQUFJO3dCQUNKLElBQUk7d0JBQ0osSUFBSSxFQUFFLEdBQUc7d0JBQ1QsS0FBSyxFQUFFLEtBQUs7d0JBQ1osR0FBRyxFQUFFLCtEQUErRCxhQUFhLElBQUksUUFBUSxJQUFJLElBQUksRUFBRTtxQkFDeEc7aUJBQ0YsQ0FBQzthQUNIO1NBQ0Y7UUFFRCxPQUFPLEVBQUUsS0FBSyxFQUFFLElBQUksQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLEVBQUUsVUFBVSxFQUFFLElBQUksRUFBRSxDQUFDO0lBQ3pELENBQUM7Q0FDRixDQUFBO0FBOURZLHdEQUFzQjtpQ0FBdEIsc0JBQXNCO0lBRmxDLElBQUEscUJBQWMsR0FBRTtJQUNoQixJQUFBLDhCQUFhLEVBQUMsbUJBQVUsQ0FBQyxnQkFBZ0IsQ0FBQztHQUM5QixzQkFBc0IsQ0E4RGxDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ2hyb21lRm9yVGVzdGluZ0JpbmFyeS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL2FwcC9jb21tb24vYWRhcHRlci9iaW5hcnkvQ2hyb21lRm9yVGVzdGluZ0JpbmFyeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsK0JBQWdDO0FBQ2hDLHNDQUE2QztBQUM3Qyw4Q0FBK0M7QUFDL0MscURBQTBGO0FBSW5GLElBQU0sc0JBQXNCLG1DQUE1QixNQUFNLHNCQUF1QixTQUFRLCtCQUFjO0lBQW5EOzs7SUE2R1AsQ0FBQztJQXRHQyxLQUFLLENBQUMsU0FBUztRQUNiLElBQUksQ0FBQyxRQUFRLEdBQUcsU0FBUyxDQUFDO0lBQzVCLENBQUM7SUE2RkQsS0FBSyxDQUFDLEtBQUssQ0FBQyxHQUFXO1FBQ3JCLGdGQUFnRjtRQUNoRixJQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsRUFBRTtZQUNsQixNQUFNLHVCQUFBLElBQUksK0VBQWMsTUFBbEIsSUFBSSxDQUFnQixDQUFDO1NBQzVCO1FBQ0QsT0FBTyxFQUFFLEtBQUssRUFBRSxJQUFJLENBQUMsUUFBUyxDQUFDLEdBQUcsQ0FBQyxFQUFFLFVBQVUsRUFBRSxJQUFJLEVBQUUsQ0FBQztJQUMxRCxDQUFDOztBQTVHVSx3REFBc0I7O3VDQVdqQyxLQUFLO0lBQ0gsSUFBSSxDQUFDLFFBQVEsR0FBRyxFQUFFLENBQUM7SUFDbkIsSUFBSSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsR0FBRyxFQUFFLENBQUM7SUFDeEIsTUFBTSxlQUFlLEdBQUcsK0ZBQStGLENBQUM7SUFDeEgsTUFBTSxFQUFFLElBQUksRUFBRSxHQUFHLE1BQU0sSUFBSSxDQUFDLFVBQVUsQ0FBQyxPQUFPLENBQUMsZUFBZSxFQUFFO1FBQzlELFFBQVEsRUFBRSxNQUFNO1FBQ2hCLE9BQU8sRUFBRSxLQUFLO1FBQ2QsY0FBYyxFQUFFLElBQUk7UUFDcEIsSUFBSSxFQUFF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

package/dist/app/core/service/BinarySyncerService.d.ts

@@ -13,10 +13,10 @@ export declare class BinarySyncerService extends AbstractService {
     findBinary(targetName: BinaryName | CategoryName, parent: string, name: string): Promise<Binary | null>;
     listDirBinaries(binary: Binary): Promise<Binary[]>;
     listRootBinaries(binaryName: BinaryName): Promise<Binary[]>;
-    downloadBinary(binary: Binary): Promise<string | import("stream").Readable | undefined>;
+    downloadBinary(binary: Binary): Promise<string | import("node:stream").Readable | undefined>;
     createTask(binaryName: BinaryName, lastData?: any): Promise<Task<import("../entity/Task").TaskBaseData> | undefined>;
     findTask(taskId: string): Promise<Task<import("../entity/Task").TaskBaseData> | null>;
-    findTaskLog(task: Task): Promise<string | import("stream").Readable | undefined>;
+    findTaskLog(task: Task): Promise<string | import("node:stream").Readable | undefined>;
     findExecuteTask(): Promise<Task<import("../entity/Task").TaskBaseData> | null>;
     executeTask(task: Task): Promise<void>;
     private syncDir;

package/dist/app/core/service/PackageManagerService.d.ts

@@ -80,7 +80,7 @@ export declare class PackageManagerService extends AbstractService {
         blockReason: null;
         pkg: Package;
     }>;
-    downloadPackageVersionTar(packageVersion: PackageVersion): Promise<string | import("stream").Readable | undefined>;
+    downloadPackageVersionTar(packageVersion: PackageVersion): Promise<string | import("node:stream").Readable | undefined>;
     plusPackageVersionCounter(fullname: string, version: string): void;
     savePackageVersionCounters(): Promise<void>;
     saveDeprecatedVersions(pkg: Package, deprecatedList: {

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

@@ -60,7 +60,7 @@ let PackageSearchService = class PackageSearchService extends AbstractService_1.
             keywords: manifest.keywords || [],
             versions: Object.keys(manifest.versions),
             description: manifest.description,
-            license: manifest.license,
+            license: typeof manifest.license === 'object' ? manifest.license?.type : manifest.license,
             maintainers: manifest.maintainers,
             author: (0, PackageUtil_1.formatAuthor)(manifest.author),
             'dist-tags': manifest['dist-tags'],
@@ -229,4 +229,4 @@ exports.PackageSearchService = PackageSearchService = __decorate([
         accessLevel: tegg_1.AccessLevel.PUBLIC,
     })
 ], PackageSearchService);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUGFja2FnZVNlYXJjaFNlcnZpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9hcHAvY29yZS9zZXJ2aWNlL1BhY2thZ2VTZWFyY2hTZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHNDQUFrRTtBQUVsRSxrREFBMEI7QUFFMUIsa0VBQStEO0FBQy9ELDBEQUF5RTtBQUN6RSxtRUFBZ0U7QUFDaEUsd0VBQTRHO0FBQzVHLHdHQUFxRztBQUNyRywwRUFBdUU7QUFNaEUsSUFBTSxvQkFBb0IsR0FBMUIsTUFBTSxvQkFBcUIsU0FBUSxpQ0FBZTtJQVV2RCxLQUFLLENBQUMsV0FBVyxDQUFDLFFBQWdCLEVBQUUsTUFBTSxHQUFHLElBQUk7UUFDL0MsTUFBTSxDQUFFLEtBQUssRUFBRSxJQUFJLENBQUUsR0FBRyxJQUFBLDZCQUFlLEVBQUMsUUFBUSxDQUFDLENBQUM7UUFDbEQsTUFBTSxhQUFhLEdBQUcsTUFBTSxJQUFJLENBQUMscUJBQXFCLENBQUMsd0JBQXdCLENBQUMsS0FBSyxFQUFFLElBQUksRUFBRSxNQUFNLENBQUMsQ0FBQztRQUVyRyxJQUFJLENBQUMsYUFBYSxDQUFDLElBQUksRUFBRTtZQUN2QixJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyw4REFBOEQsRUFBRSxRQUFRLENBQUMsQ0FBQztZQUMzRixPQUFPO1NBQ1I7UUFFRCxNQUFNLEdBQUcsR0FBRyxNQUFNLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxXQUFXLENBQUMsS0FBSyxFQUFFLElBQUksQ0FBQyxDQUFDO1FBQ2xFLElBQUksQ0FBQyxHQUFHLEVBQUU7WUFDUixJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyw2REFBNkQsRUFBRSxRQUFRLENBQUMsQ0FBQztZQUMxRixPQUFPO1NBQ1I7UUFFRCw4QkFBOEI7UUFDOUIsTUFBTSxTQUFTLEdBQUcsSUFBQSxlQUFLLEdBQUUsQ0FBQyxRQUFRLENBQUMs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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUGFja2FnZVNlYXJjaFNlcnZpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9hcHAvY29yZS9zZXJ2aWNlL1BhY2thZ2VTZWFyY2hTZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHNDQUFrRTtBQUVsRSxrREFBMEI7QUFFMUIsa0VBQStEO0FBQy9ELDBEQUF5RTtBQUN6RSxtRUFBZ0U7QUFDaEUsd0VBQTRHO0FBQzVHLHdHQUFxRztBQUNyRywwRUFBdUU7QUFNaEUsSUFBTSxvQkFBb0IsR0FBMUIsTUFBTSxvQkFBcUIsU0FBUSxpQ0FBZTtJQVV2RCxLQUFLLENBQUMsV0FBVyxDQUFDLFFBQWdCLEVBQUUsTUFBTSxHQUFHLElBQUk7UUFDL0MsTUFBTSxDQUFFLEtBQUssRUFBRSxJQUFJLENBQUUsR0FBRyxJQUFBLDZCQUFlLEVBQUMsUUFBUSxDQUFDLENBQUM7UUFDbEQsTUFBTSxhQUFhLEdBQUcsTUFBTSxJQUFJLENBQUMscUJBQXFCLENBQUMsd0JBQXdCLENBQUMsS0FBSyxFQUFFLElBQUksRUFBRSxNQUFNLENBQUMsQ0FBQztRQUVyRyxJQUFJLENBQUMsYUFBYSxDQUFDLElBQUksRUFBRTtZQUN2QixJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyw4REFBOEQsRUFBRSxRQUFRLENBQUMsQ0FBQztZQUMzRixPQUFPO1NBQ1I7UUFFRCxNQUFNLEdBQUcsR0FBRyxNQUFNLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxXQUFXLENBQUMsS0FBSyxFQUFFLElBQUksQ0FBQyxDQUFDO1FBQ2xFLElBQUksQ0FBQyxHQUFHLEVBQUU7WUFDUixJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyw2REFBNkQsRUFBRSxRQUFRLENBQUMsQ0FBQztZQUMxRixPQUFPO1NBQ1I7UUFFRCw4QkFBOEI7UUFDOUIsTUFBTSxTQUFTLEdBQUcsSUFBQSxlQUFLLEdBQUUsQ0FBQyxRQUFRLENBQUMsQ0FBQyxFQUFFLE1BQU0sQ0FBQyxDQUFDO1FBQzlDLE1BQU0sT0FBTyxHQUFHLElBQUEsZUFBSyxHQUFFLENBQUM7UUFFeEIsTUFBTSxRQUFRLEdBQUcsTUFBTSxJQUFJLENBQUMsZ0NBQWdDLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxTQUFTLEVBQUUsU0FBUyxDQUFDLE1BQU0sRUFBRSxFQUFFLE9BQU8sQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQUFDO1FBQ3hILElBQUksWUFBWSxHQUFHLENBQUMsQ0FBQztRQUNyQixLQUFLLE1BQU0sTUFBTSxJQUFJLFFBQVEsRUFBRTtZQUM3QixLQUFLLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLElBQUksRUFBRSxFQUFFLENBQUMsRUFBRSxFQUFFO2dCQUM1QixNQUFNLEdBQUcsR0FBRyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLENBQUMsRUFBRSxHQUFHLENBQUMsQ0FBQztnQkFDdkMsTUFBTSxLQUFLLEdBQUcsSUFBSSxHQUFHLEVBQUUsQ0FBQztnQkFDeEIsTUFBTSxPQUFPLEdBQUcsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDO2dCQUM5QixJQUFJLENBQUMsT0FBTztvQkFBRSxTQUFTO2dCQUN2QixZQUFZLElBQUksT0FBTyxDQUFDO2FBQ3pCO1NBQ0Y7UUFFRCxNQUFNLEVBQUUsSUFBSSxFQUFFLFFBQVEsRUFBRSxHQUFHLGFBQWEsQ0FBQztRQUV6QyxNQUFNLGFBQWEsR0FBRyxRQUFRLENBQUMsV0FBVyxDQUFDLENBQUMsTUFBTSxDQUFDO1FBQ25ELE1BQU0sY0FBYyxHQUFHLFFBQVEsQ0FBQyxRQUFRLENBQUMsYUFBYSxDQUFDLENBQUM7UUFFeEQsTUFBTSxVQUFVLEdBQXNCO1lBQ3BDLElBQUksRUFBRSxRQUFRLENBQUMsSUFBSTtZQUNuQixPQUFPLEVBQUUsYUFBYTtZQUN0QixJQUFJLEVBQUUsUUFBUSxDQUFDLElBQUk7WUFDbkIsS0FBSyxFQUFFLEtBQUssQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLFVBQVU7WUFDbEQsUUFBUSxFQUFFLFFBQVEsQ0FBQyxRQUFRLElBQUksRUFBRTtZQUNqQyxRQUFRLEVBQUUsTUFBTSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsUUFBUSxDQUFDO1lBQ3hDLFdBQVcsRUFBRSxRQUFRLENBQUMsV0FBVztZQUNqQyxPQUFPLEVBQUUsT0FBTyxRQUFRLENBQUMsT0FBTyxLQUFLLFFBQVEsQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLE9BQU8sRUFBRSxJQUFJLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxPQUFPO1lBQ3pGLFdBQVcsRUFBRSxRQUFRLENBQUMsV0FBVztZQUNqQyxNQUFNLEVBQUUsSUFBQSwwQkFBWSxFQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUM7WUFDckMsV0FBVyxFQUFFLFFBQVEsQ0FBQyxXQUFXLENBQUM7WUFDbEMsSUFBSSxFQUFFLFFBQVEsQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDO1lBQ2xDLE9BQU8sRUFBRSxRQUFRLENBQUMsSUFBSSxDQUFDLE9BQU87WUFDOUIsUUFBUSxFQUFFLFFBQVEsQ0FBQyxJQUFJLENBQUMsUUFBUTtZQUNoQywyQkFBMkI7WUFDM0IscUJBQXFCLEVBQUUsUUFBUSxDQUFDLHFCQUFxQjtZQUNyRCxvQkFBb0I7WUFDcEIsUUFBUSxFQUFFLGNBQWMsRUFBRSxRQUFRO1lBQ2xDLFdBQVc7WUFDWCxZQUFZLEVBQUUsY0FBYyxFQUFFLFlBQVk7U0FDM0MsQ0FBQztRQUVGLHFGQUFxRjtRQUNyRix5QkFBeUI7UUFDekIsSUFBSSxVQUFVLENBQUMsV0FBVyxFQUFFO1lBQzFCLFVBQVUsQ0FBQyxXQUFXLEdBQUcsVUFBVSxDQUFDLFdBQVcsQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLEVBQUU7Z0JBQy9ELE9BQU87b0JBQ0wsUUFBUSxFQUFFLFVBQVUsQ0FBQyxJQUFJO29CQUN6QixHQUFHLFVBQVU7aUJBQ2QsQ0FBQztZQUNKLENBQUMsQ0FBQyxDQUFDO1NBQ0o7UUFFRCxNQUFNLFFBQVEsR0FBdUI7WUFDbkMsT0FBTyxFQUFFLFVBQVU7WUFDbkIsU0FBUyxFQUFFO2dCQUNULEdBQUcsRUFBRSxZQUFZO2FBQ2xCO1NBQ0YsQ0FBQztRQUVGLE9BQU8sTUFBTSxJQUFJLENBQUMsZ0JBQWdCLENBQUMsYUFBYSxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQzdELENBQUM7SUFFRCxLQUFLLENBQUMsYUFBYSxDQUFDLElBQVksRUFBRSxJQUFZLEVBQUUsSUFBWTtRQUMxRCxNQUFNLFlBQVksR0FBRyxJQUFJLENBQUMsa0JBQWtCLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDbkQsTUFBTSxXQUFXLEdBQUcsSUFBSSxDQUFDLGlCQUFpQixDQUFDO1lBQ3pDLElBQUk7WUFDSixXQUFXLEVBQUUsSUFBSTtTQUNsQixDQUFDLENBQUM7UUFFSCxNQUFNLEdBQUcsR0FBRyxNQUFNLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxhQUFhLENBQUM7WUFDcEQsSUFBSSxFQUFFO2dCQUNKLElBQUk7Z0JBQ0osSUFBSTtnQkFDSixLQUFLLEVBQUU7b0JBQ0wsY0FBYyxFQUFFO3dCQUNkLFVBQVUsRUFBRSxTQUFTO3dCQUNyQixLQUFLLEVBQUU7NEJBQ0wsSUFBSSxFQUFFO2dDQUNKLE1BQU0sRUFBRSxZQUFZO2dDQUNwQixvQkFBb0IsRUFBRSxZQUFZLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7NkJBQ2xEO3lCQUNGO3dCQUNELFlBQVksRUFBRSxXQUFXO3FCQUMxQjtpQkFDRjthQUNGO1NBQ0YsQ0FBQyxDQUFDO1FBQ0gsTUFBTSxFQUFFLElBQUksRUFBRSxLQUFLLEVBQUUsR0FBRyxHQUFHLENBQUM7UUFDNUIsT0FBTztZQUNMLE9BQU8sRUFBRSxJQUFJLEVBQUUsR0FBRyxDQUFDLElBQUksQ0FBQyxFQUFFO2dCQUN4QixPQUFPLElBQUksQ0FBQyxPQUFPLENBQUM7WUFDdEIsQ0FBQyxDQUFDO1lBQ0YsS0FBSyxFQUFHLEtBQWlDLENBQUMsS0FBSztTQUNoRCxDQUFDO0lBQ0osQ0FBQztJQUVELEtBQUssQ0FBQyxhQUFhLENBQUMsUUFBZ0I7UUFDbEMsT0FBTyxNQUFNLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxhQUFhLENBQUMsUUFBUSxDQUFDLENBQUM7SUFDN0QsQ0FBQztJQUVELDBFQUEwRTtJQUNsRSxrQkFBa0IsQ0FBQyxJQUFZO1FBQ3JDLE9BQU87WUFDTCxvQ0FBb0M7WUFDcEM7Z0JBQ0UsV0FBVyxFQUFFO29CQUNYLEtBQUssRUFBRSxJQUFJO29CQUNYLFFBQVEsRUFBRSxLQUFLO29CQUNmLE1BQU0sRUFBRTt3QkFDTix5QkFBeUI7d0JBQ3pCLDhCQUE4Qjt3QkFDOUIsNkJBQTZCO3FCQUM5QjtvQkFDRCxJQUFJLEVBQUUsY0FBYztvQkFDcEIsS0FBSyxFQUFFLENBQUM7b0JBQ1IsV0FBVyxFQUFFLEdBQUc7aUJBQ2pCO2FBQ0Y7WUFFRCxpQ0FBaUM7WUFDakM7Z0JBQ0UsV0FBVyxFQUFFO29CQUNYLEtBQUssRUFBRSxJQUFJO29CQUNYLFFBQVEsRUFBRSxLQUFLO29CQUNmLE1BQU0sRUFBRTt3QkFDTiwyQkFBMkI7d0JBQzNCLGdDQUFnQzt3QkFDaEMsK0JBQStCO3FCQUNoQztvQkFDRCxJQUFJLEVBQUUsUUFBUTtvQkFDZCxJQUFJLEVBQUUsQ0FBQztvQkFDUCxLQUFLLEVBQUUsQ0FBQztvQkFDUixXQUFXLEVBQUUsR0FBRztpQkFDakI7YUFDRjtZQUVELDRDQUE0QztZQUM1QztnQkFDRSxXQUFXLEVBQUU7b0JBQ1gsS0FBSyxFQUFFLElBQUk7b0JBQ1gsUUFBUSxFQUFFLEtBQUs7b0JBQ2YsTUFBTSxFQUFFO3dCQUNOLDZCQUE2Qjt3QkFDN0Isa0NBQWtDO3dCQUNsQyxpQ0FBaUM7cUJBQ2xDO29CQUNELElBQUksRUFBRSxjQUFjO29CQUNwQixLQUFLLEVBQUUsQ0FBQztvQkFDUixXQUFXLEVBQUUsR0FBRztpQkFDakI7YUFDRjtZQUVELDhFQUE4RTtZQUM5RTtnQkFDRSxXQUFXLEVBQUU7b0JBQ1gsS0FBSyxFQUFFLElBQUk7b0JBQ1gsUUFBUSxFQUFFLEtBQUs7b0JBQ2YsTUFBTSxFQUFFO3dCQUNOLHdDQUF3Qzt3QkFDeEMsNkNBQTZDO3dCQUM3Qyw0Q0FBNEM7cUJBQzdDO29CQUNELElBQUksRUFBRSxjQUFjO29CQUNwQixXQUFXLEVBQUUsR0FBRztpQkFDakI7YUFDRjtTQUNGLENBQUM7SUFDSixDQUFDO0lBRU8saUJBQWlCLENBQUMsTUFBeUQ7UUFDakYsZ0RBQWdEO1FBQ2hELE1BQU0sU0FBUyxHQUFHLDRCQUE0QixDQUFDO1FBQy9DLE1BQU0sTUFBTSxHQUFHLHlDQUF5QyxNQUFNLENBQUMsSUFBSSxpQkFBaUIsU0FBUyx3QkFBd0IsU0FBUyxLQUFLLE1BQU0sQ0FBQyxXQUFXLEdBQUcsQ0FBQztRQUN6SixPQUFPO1lBQ0wsTUFBTSxFQUFFO2dCQUNOLE1BQU07Z0JBQ04sTUFBTSxFQUFFO29CQUNOLElBQUksRUFBRSxNQUFNLENBQUMsSUFBSSxJQUFJLEVBQUU7b0JBQ3ZCLFdBQVcsRUFBRSxNQUFNLENBQUMsV0FBVztpQkFDaEM7YUFDRjtTQUNGLENBQUM7SUFDSixDQUFDO0NBQ0YsQ0FBQTtBQW5OWSxvREFBb0I7QUFFZDtJQURoQixJQUFBLGFBQU0sR0FBRTs4QkFDK0IsNkNBQXFCO21FQUFDO0FBRTdDO0lBRGhCLElBQUEsYUFBTSxHQUFFOzhCQUMwQixtQ0FBZ0I7OERBQUM7QUFFNUM7SUFEUCxJQUFBLGFBQU0sR0FBRTs4QkFDaUMsbUVBQWdDOzhFQUFDO0FBRWpFO0lBRFQsSUFBQSxhQUFNLEdBQUU7OEJBQ29CLHFDQUFpQjsrREFBQzsrQkFScEMsb0JBQW9CO0lBSGhDLElBQUEscUJBQWMsRUFBQztRQUNkLFdBQVcsRUFBRSxrQkFBVyxDQUFDLE1BQU07S0FDaEMsQ0FBQztHQUNXLG9CQUFvQixDQW1OaEMifQ==

package/dist/app/core/service/PackageSyncerService.d.ts

@@ -21,7 +21,7 @@ export declare class PackageSyncerService extends AbstractService {
     private readonly scopeManagerService;
     createTask(fullname: string, options?: SyncPackageTaskOptions): Promise<Task<import("../entity/Task").TaskBaseData>>;
     findTask(taskId: string): Promise<Task<import("../entity/Task").TaskBaseData> | null>;
-    findTaskLog(task: Task): Promise<string | import("stream").Readable | undefined>;
+    findTaskLog(task: Task): Promise<string | import("node:stream").Readable | undefined>;
     findExecuteTask(): Promise<CreateSyncPackageTask>;
     get allowSyncDownloadData(): boolean;
     private syncDownloadData;

package/dist/app/core/service/TaskService.d.ts

@@ -11,7 +11,7 @@ export declare class TaskService extends AbstractService {
     retryTask(task: Task, appendLog?: string): Promise<void>;
     findTask(taskId: string): Promise<Task<import("../entity/Task").TaskBaseData> | null>;
     findTasks(taskIdList: Array<string>): Promise<Task<import("../entity/Task").TaskBaseData>[]>;
-    findTaskLog(task: Task): Promise<string | import("stream").Readable | undefined>;
+    findTaskLog(task: Task): Promise<string | import("node:stream").Readable | undefined>;
     findExecuteTask(taskType: TaskType): Promise<Task<import("../entity/Task").TaskBaseData> | null>;
     retryExecuteTimeoutTasks(): Promise<{
         processing: number;

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

@@ -14,7 +14,7 @@ export declare class BinarySyncController extends AbstractController {
         type: string;
         url: string;
     }[]>;
-    showBinary(ctx: EggContext, binaryName: BinaryName, subpath: string): Promise<import("stream").Readable | {
+    showBinary(ctx: EggContext, binaryName: BinaryName, subpath: string): Promise<import("node:stream").Readable | {
         id: string;
         category: string;
         name: string;
@@ -24,7 +24,7 @@ export declare class BinarySyncController extends AbstractController {
         url: string;
         modified: Date;
     }[] | undefined>;
-    showBinaryIndex(ctx: EggContext, binaryName: BinaryName): Promise<import("stream").Readable | {
+    showBinaryIndex(ctx: EggContext, binaryName: BinaryName): Promise<import("node:stream").Readable | {
         id: string;
         category: string;
         name: string;

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

@@ -22,7 +22,7 @@ export declare class PackageSyncController extends AbstractController {
         logUrl: string | undefined;
         error: string | undefined;
     }>;
-    showSyncTaskLog(ctx: EggContext, fullname: string, taskId: string): Promise<import("stream").Readable | undefined>;
+    showSyncTaskLog(ctx: EggContext, fullname: string, taskId: string): Promise<import("node:stream").Readable | undefined>;
     deprecatedCreateSyncTask(ctx: EggContext, fullname: string, nodeps: string): Promise<{
         ok: boolean;
         logId: string;

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

@@ -21,6 +21,6 @@ export declare class PackageVersionFileController extends AbstractController {
     private distRepository;
     sync(ctx: EggContext, fullname: string, versionSpec: string): Promise<FileItem[]>;
     listFiles(ctx: EggContext, fullname: string, versionSpec: string, meta: string): Promise<DirectoryItem | undefined>;
-    raw(ctx: EggContext, fullname: string, versionSpec: string, path: string, meta: string): Promise<import("stream").Readable | FileItem | DirectoryItem | undefined>;
+    raw(ctx: EggContext, fullname: string, versionSpec: string, path: string, meta: string): Promise<import("node:stream").Readable | FileItem | DirectoryItem | undefined>;
 }
 export {};

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

@@ -4,6 +4,6 @@ import { AbstractController } from '../AbstractController';
 export declare class DownloadPackageVersionTarController extends AbstractController {
     private packageManagerService;
     private nfsAdapter;
-    download(ctx: EggContext, fullname: string, filenameWithVersion: string): Promise<import("stream").Readable | undefined>;
-    deprecatedDownload(ctx: EggContext, fullname: string, fullnameWithVersion: string): Promise<import("stream").Readable | undefined>;
+    download(ctx: EggContext, fullname: string, filenameWithVersion: string): Promise<import("node:stream").Readable | undefined>;
+    deprecatedDownload(ctx: EggContext, fullname: string, fullnameWithVersion: string): Promise<import("node:stream").Readable | undefined>;
 }

package/dist/app/repository/DistRepository.d.ts

@@ -9,9 +9,9 @@ export declare class DistRepository {
     readDistBytesToJSON<T>(dist: Dist): Promise<T | undefined>;
     readDistBytesToString(dist: Dist): Promise<string>;
     readDistBytes(dist: Dist): Promise<Uint8Array | undefined>;
-    getDistStream(dist: Dist): Promise<import("stream").Readable | undefined>;
+    getDistStream(dist: Dist): Promise<import("node:stream").Readable | undefined>;
     saveDist(dist: Dist, buf: Uint8Array | string): Promise<void>;
     destroyDist(dist: Dist): Promise<void>;
-    downloadDist(dist: Dist): Promise<string | import("stream").Readable | undefined>;
+    downloadDist(dist: Dist): Promise<string | import("node:stream").Readable | undefined>;
     downloadDistToFile(dist: Dist, file: string): Promise<void>;
 }

package/dist/app/repository/PackageRepository.d.ts

@@ -35,7 +35,7 @@ export type PackageJSONType = CnpmcorePatchInfo & {
         url?: string;
         email?: string;
     };
-    license?: string;
+    license?: LicenseType | string;
     author?: AuthorType | string;
     contributors?: ContributorType[] | string[];
     maintainers?: ContributorType[] | string[];
@@ -109,6 +109,10 @@ export type AuthorType = {
     email?: string;
     url?: string;
 };
+type LicenseType = {
+    type: string;
+    url: string;
+};
 type ContributorType = {
     name?: string;
     email?: string;

package/dist/app/repository/PackageRepository.js

@@ -362,4 +362,4 @@ exports.PackageRepository = PackageRepository = __decorate([
         accessLevel: tegg_1.AccessLevel.PUBLIC,
     })
 ], PackageRepository);
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PackageRepository.js","sourceRoot":"","sources":["../../../app/repository/PackageRepository.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PackageRepository.js","sourceRoot":"","sources":["../../../app/repository/PackageRepository.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnpmcore",
-  "version": "3.43.4",
+  "version": "3.44.0",
   "description": "npm core",
   "files": [
     "dist/**/*"
@@ -120,22 +120,22 @@
     "@cnpmjs/npm-cli-login": "^1.1.0",
     "@elastic/elasticsearch-mock": "^2.0.0",
     "@simplewebauthn/typescript-types": "^7.0.0",
+    "@types/lodash": "^4.14.196",
     "@types/mime-types": "^2.1.1",
     "@types/mocha": "^10.0.1",
     "@types/mysql": "^2.15.21",
+    "@types/npm-package-arg": "^6.1.1",
     "@types/semver": "^7.3.12",
     "@types/tar": "^6.1.4",
+    "@types/ua-parser-js": "^0.7.36",
+    "@types/validate-npm-package-name": "^4.0.0",
     "coffee": "^5.4.0",
     "egg-bin": "^6.0.0",
     "egg-mock": "^5.10.4",
     "eslint": "^8.29.0",
-    "eslint-config-egg": "^12.1.0",
+    "eslint-config-egg": "^13.0.0",
     "git-contributor": "2",
-    "typescript": "^5.0.4",
-    "@types/ua-parser-js": "^0.7.36",
-    "@types/lodash": "^4.14.196",
-    "@types/npm-package-arg": "^6.1.1",
-    "@types/validate-npm-package-name": "^4.0.0"
+    "typescript": "^5.2.2"
   },
   "author": "killagu",
   "license": "MIT",