cnpmcore 3.81.0 → 3.82.1

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

@@ -10,16 +10,38 @@ 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 __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-var _EdgedriverBinary_instances, _EdgedriverBinary_syncDirItems, _EdgedriverBinary_parseItems;
+var _EdgedriverBinary_instances, _EdgedriverBinary_syncDirItems;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EdgedriverBinary = void 0;
-const node_path_1 = __importDefault(require("node:path"));
 const tegg_1 = require("@eggjs/tegg");
 const AbstractBinary_1 = require("./AbstractBinary");
 const Binary_1 = require("../../enum/Binary");
+// Microsoft moved Edge WebDriver binaries to https://msedgedriver.microsoft.com/
+// in July 2025 after `msedgedriver.azureedge.net` was retired, and around
+// 2026-04-07 also disabled public access on the legacy Azure Blob container
+// that used to host the XML file listing. There is still no paginated/filtered
+// listing API — the only "listing" endpoint on the new host is a ~1.2MB static
+// JSON dump (`/listing.json`, ~9000 entries covering every version since
+// 112.0.1722.39).
+//
+// To avoid hammering that 1.2MB dump for every version subdirectory during a
+// sync, we mirror the approach used by `FirefoxBinary` / `ChromeForTestingBinary`
+// and generate the per-version download URLs from a static list of known
+// platform filenames. cnpmcore's sync pipeline honors the per-item
+// `ignoreDownloadStatuses` field, so any version that doesn't ship a given
+// platform (e.g. older builds without `edgedriver_mac64_m1.zip`) gets a clean
+// 404 and is skipped rather than failing the sync.
+const EDGEDRIVER_DOWNLOAD_BASE = 'https://msedgedriver.microsoft.com/';
+// Platform filenames observed in Microsoft's current `listing.json` dump.
+// Every version since 112.0.1722.39 ships some subset of these six files.
+const EDGEDRIVER_PLATFORM_FILES = [
+    'edgedriver_arm64.zip',
+    'edgedriver_linux64.zip',
+    'edgedriver_mac64.zip',
+    'edgedriver_mac64_m1.zip',
+    'edgedriver_win32.zip',
+    'edgedriver_win64.zip',
+];
 let EdgedriverBinary = class EdgedriverBinary extends AbstractBinary_1.AbstractBinary {
     constructor() {
         super(...arguments);
@@ -36,13 +58,21 @@ let EdgedriverBinary = class EdgedriverBinary extends AbstractBinary_1.AbstractB
         if (dir === '/') {
             return { items: this.dirItems[dir], nextParams: null };
         }
-        // fetch sub dir
-        // /foo/ => foo/
+        // fetch sub dir: generate the known platform filenames for this version.
+        // We intentionally don't call any listing API — see the file-level
+        // comment for the rationale. Any platform that doesn't exist for a
+        // specific version is skipped cleanly via `ignoreDownloadStatuses`.
+        // /126.0.2578.0/ => 126.0.2578.0/
         const subDir = dir.substring(1);
-        // https://msedgewebdriverstorage.blob.core.windows.net/edgewebdriver?prefix=124.0.2478.97/&delimiter=/&maxresults=100&restype=container&comp=list
-        const url = `https://msedgewebdriverstorage.blob.core.windows.net/edgewebdriver?prefix=${encodeURIComponent(subDir)}&delimiter=/&maxresults=100&restype=container&comp=list`;
-        const xml = await this.requestXml(url);
-        return { items: __classPrivateFieldGet(this, _EdgedriverBinary_instances, "m", _EdgedriverBinary_parseItems).call(this, xml), nextParams: null };
+        const items = EDGEDRIVER_PLATFORM_FILES.map(name => ({
+            name,
+            isDir: false,
+            url: `${EDGEDRIVER_DOWNLOAD_BASE}${subDir}${name}`,
+            size: '-',
+            date: '-',
+            ignoreDownloadStatuses: [404],
+        }));
+        return { items, nextParams: null };
     }
 };
 exports.EdgedriverBinary = EdgedriverBinary;
@@ -62,91 +92,6 @@ _EdgedriverBinary_syncDirItems = async function _EdgedriverBinary_syncDirItems()
         return;
     }
     this.logger.info('[EdgedriverBinary] remote data length: %s', data.length);
-    // [
-    //   {
-    //     "Product": "Stable",
-    //     "Releases": [
-    //       {
-    //         "ReleaseId": 73376,
-    //         "Platform": "iOS",
-    //         "Architecture": "arm64",
-    //         "CVEs": [],
-    //         "ProductVersion": "124.0.2478.89",
-    //         "Artifacts": [],
-    //         "PublishedTime": "2024-05-07T02:57:00",
-    //         "ExpectedExpiryDate": "2025-05-07T02:57:00"
-    //       },
-    //       {
-    //         "ReleaseId": 73629,
-    //         "Platform": "Windows",
-    //         "Architecture": "x86",
-    //         "CVEs": [
-    //           "CVE-2024-4559",
-    //           "CVE-2024-4671"
-    //         ],
-    //         "ProductVersion": "124.0.2478.97",
-    //         "Artifacts": [
-    //           {
-    //             "ArtifactName": "msi",
-    //             "Location": "https://msedge.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/aa1c9fe3-bb9c-4a80-9ff7-5c109701fbfe/MicrosoftEdgeEnterpriseX86.msi",
-    //             "Hash": "4CEF7B907D3E2371E953C41190E32C3560CEE7D3F16D7550CA156DC976EBCB80",
-    //             "HashAlgorithm": "SHA256",
-    //             "SizeInBytes": 162029568
-    //           }
-    //         ],
-    //         "PublishedTime": "2024-05-11T06:47:00",
-    //         "ExpectedExpiryDate": "2025-05-10T16:59:00"
-    //       },
-    //       {
-    //         "ReleaseId": 73630,
-    //         "Platform": "Linux",
-    //         "Architecture": "x64",
-    //         "CVEs": [
-    //           "CVE-2024-4559"
-    //         ],
-    //         "ProductVersion": "124.0.2478.97",
-    //         "Artifacts": [
-    //           {
-    //             "ArtifactName": "rpm",
-    //             "Location": "https://packages.microsoft.com/yumrepos/edge/microsoft-edge-stable-124.0.2478.97-1.x86_64.rpm",
-    //             "Hash": "32D9C333544DDD9C56FED54844E89EF00F3E5620942C07B9B68D214016687895",
-    //             "HashAlgorithm": "SHA256",
-    //             "SizeInBytes": 169877932
-    //           },
-    //           {
-    //             "ArtifactName": "deb",
-    //             "Location": "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_124.0.2478.97-1_amd64.deb",
-    //             "Hash": "85D0AD1D63847B3DD54F0F214D18A2B54462BB43291536E773AD1B8B29BBF799",
-    //             "HashAlgorithm": "SHA256",
-    //             "SizeInBytes": 167546042
-    //           }
-    //         ],
-    //         "PublishedTime": "2024-05-10T17:01:00",
-    //         "ExpectedExpiryDate": "2025-05-10T17:01:00"
-    //       },
-    // {
-    //   "Product": "EdgeUpdate",
-    //   "Releases": [
-    //     {
-    //       "ReleaseId": 73493,
-    //       "Platform": "Windows",
-    //       "Architecture": "x86",
-    //       "CVEs": [],
-    //       "ProductVersion": "1.3.187.37",
-    //       "Artifacts": [
-    //         {
-    //           "ArtifactName": "exe",
-    //           "Location": "https://msedge.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/a2fa84fe-796b-4f80-b1cd-f4d1f5731aa8/MicrosoftEdgeUpdateSetup_X86_1.3.187.37.exe",
-    //           "Hash": "503088D22461FEE5D7B6B011609D73FFD5869D3ACE1DBB0F00F8F3B9D122C514",
-    //           "HashAlgorithm": "SHA256",
-    //           "SizeInBytes": 1622072
-    //         }
-    //       ],
-    //       "PublishedTime": "2024-05-08T05:44:00",
-    //       "ExpectedExpiryDate": "2025-05-08T05:44:00"
-    //     }
-    //   ]
-    // }
     const products = data;
     const existsVersions = new Set();
     for (const product of products) {
@@ -168,46 +113,8 @@ _EdgedriverBinary_syncDirItems = async function _EdgedriverBinary_syncDirItems()
         }
     }
 };
-_EdgedriverBinary_parseItems = function _EdgedriverBinary_parseItems(xml) {
-    const items = [];
-    // <Blob><Name>124.0.2478.97/edgedriver_arm64.zip</Name><Url>https://msedgewebdriverstorage.blob.core.windows.net/edgewebdriver/124.0.2478.97/edgedriver_arm64.zip</Url><Properties><Last-Modified>Fri, 10 May 2024 18:35:44 GMT</Last-Modified><Etag>0x8DC712000713C13</Etag><Content-Length>9191362</Content-Length><Content-Type>application/octet-stream</Content-Type><Content-Encoding /><Content-Language /><Content-MD5>1tjPTf5JU6KKB06Qf1JOGw==</Content-MD5><Cache-Control /><BlobType>BlockBlob</BlobType><LeaseStatus>unlocked</LeaseStatus></Properties></Blob>
-    const fileRe = /<Blob><Name>([^<]+?)<\/Name><Url>([^<]+?)<\/Url><Properties><Last\-Modified>([^<]+?)<\/Last\-Modified><Etag>(?:[^<]+?)<\/Etag><Content\-Length>(\d+)<\/Content\-Length>/g;
-    const matchItems = xml.matchAll(fileRe);
-    for (const m of matchItems) {
-        const fullname = m[1].trim();
-        // <Blob>
-        //   <Name>124.0.2478.97/edgedriver_arm64.zip</Name>
-        //   <Url>https://msedgewebdriverstorage.blob.core.windows.net/edgewebdriver/124.0.2478.97/edgedriver_arm64.zip</Url>
-        //   <Properties>
-        //     <Last-Modified>Fri, 10 May 2024 18:35:44 GMT</Last-Modified>
-        //     <Etag>0x8DC712000713C13</Etag>
-        //     <Content-Length>9191362</Content-Length>
-        //     <Content-Type>application/octet-stream</Content-Type>
-        //     <Content-Encoding/>
-        //     <Content-Language/>
-        //     <Content-MD5>1tjPTf5JU6KKB06Qf1JOGw==</Content-MD5>
-        //     <Cache-Control/>
-        //     <BlobType>BlockBlob</BlobType>
-        //     <LeaseStatus>unlocked</LeaseStatus>
-        //   </Properties>
-        // </Blob>
-        // ignore size = 0 dir
-        const name = node_path_1.default.basename(fullname);
-        const url = m[2].trim();
-        const date = m[3].trim();
-        const size = parseInt(m[4].trim());
-        items.push({
-            name,
-            isDir: false,
-            url,
-            size,
-            date,
-        });
-    }
-    return items;
-};
 exports.EdgedriverBinary = EdgedriverBinary = __decorate([
     (0, tegg_1.SingletonProto)(),
     (0, AbstractBinary_1.BinaryAdapter)(Binary_1.BinaryType.Edgedriver)
 ], EdgedriverBinary);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRWRnZWRyaXZlckJpbmFyeS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL2FwcC9jb21tb24vYWRhcHRlci9iaW5hcnkvRWRnZWRyaXZlckJpbmFyeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSwwREFBNkI7QUFDN0Isc0NBQTZDO0FBQzdDLHFEQUUwQjtBQUMxQiw4Q0FBK0M7QUFJeEMsSUFBTSxnQkFBZ0IsR0FBdEIsTUFBTSxnQkFBaUIsU0FBUSwrQkFBYztJQUE3Qzs7O0lBMk1QLENBQUM7SUF0TUMsS0FBSyxDQUFDLFNBQVM7UUFDYixJQUFJLENBQUMsUUFBUSxHQUFHLFNBQVMsQ0FBQztJQUM1QixDQUFDO0lBNElELEtBQUssQ0FBQyxLQUFLLENBQUMsR0FBVztRQUNyQixJQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsRUFBRTtZQUNsQixNQUFNLHVCQUFBLElBQUksbUVBQWMsTUFBbEIsSUFBSSxDQUFnQixDQUFDO1NBQzVCO1FBQ0QsaUJBQWlCO1FBQ2pCLElBQUksR0FBRyxLQUFLLEdBQUcsRUFBRTtZQUNmLE9BQU8sRUFBRSxLQUFLLEVBQUUsSUFBSSxDQUFDLFFBQVMsQ0FBQyxHQUFHLENBQUMsRUFBRSxVQUFVLEVBQUUsSUFBSSxFQUFFLENBQUM7U0FDekQ7UUFFRCxnQkFBZ0I7UUFDaEIsZ0JBQWdCO1FBQ2hCLE1BQU0sTUFBTSxHQUFHLEdBQUcsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDaEMsa0pBQWtKO1FBQ2xKLE1BQU0sR0FBRyxHQUFHLDZFQUE2RSxrQkFBa0IsQ0FBQyxNQUFNLENBQUMseURBQXlELENBQUM7UUFDN0ssTUFBTSxHQUFHLEdBQUcsTUFBTSxJQUFJLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQ3ZDLE9BQU8sRUFBRSxLQUFLLEVBQUUsdUJBQUEsSUFBSSxpRUFBWSxNQUFoQixJQUFJLEVBQWEsR0FBRyxDQUFD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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRWRnZWRyaXZlckJpbmFyeS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL2FwcC9jb21tb24vYWRhcHRlci9iaW5hcnkvRWRnZWRyaXZlckJpbmFyeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7QUFBQSxzQ0FBNkM7QUFDN0MscURBRTBCO0FBQzFCLDhDQUErQztBQUUvQyxpRkFBaUY7QUFDakYsMEVBQTBFO0FBQzFFLDRFQUE0RTtBQUM1RSwrRUFBK0U7QUFDL0UsK0VBQStFO0FBQy9FLHlFQUF5RTtBQUN6RSxrQkFBa0I7QUFDbEIsRUFBRTtBQUNGLDZFQUE2RTtBQUM3RSxrRkFBa0Y7QUFDbEYseUVBQXlFO0FBQ3pFLG1FQUFtRTtBQUNuRSwyRUFBMkU7QUFDM0UsOEVBQThFO0FBQzlFLG1EQUFtRDtBQUNuRCxNQUFNLHdCQUF3QixHQUFHLHFDQUFxQyxDQUFDO0FBQ3ZFLDBFQUEwRTtBQUMxRSwwRUFBMEU7QUFDMUUsTUFBTSx5QkFBeUIsR0FBRztJQUNoQyxzQkFBc0I7SUFDdEIsd0JBQXdCO0lBQ3hCLHNCQUFzQjtJQUN0Qix5QkFBeUI7SUFDekIsc0JBQXNCO0lBQ3RCLHNCQUFzQjtDQUNkLENBQUM7QUFJSixJQUFNLGdCQUFnQixHQUF0QixNQUFNLGdCQUFpQixTQUFRLCtCQUFjO0lBQTdDOzs7SUF1RlAsQ0FBQztJQWxGQyxLQUFLLENBQUMsU0FBUztRQUNiLElBQUksQ0FBQyxRQUFRLEdBQUcsU0FBUyxDQUFDO0lBQzVCLENBQUM7SUF1REQsS0FBSyxDQUFDLEtBQUssQ0FBQyxHQUFXO1FBQ3JCLElBQUksQ0FBQyxJQUFJLENBQUMsUUFBUSxFQUFFO1lBQ2xCLE1BQU0sdUJBQUEsSUFBSSxtRUFBYyxNQUFsQixJQUFJLENBQWdCLENBQUM7U0FDNUI7UUFDRCxpQkFBaUI7UUFDakIsSUFBSSxHQUFHLEtBQUssR0FBRyxFQUFFO1lBQ2YsT0FBTyxFQUFFLEtBQUssRUFBRSxJQUFJ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

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

@@ -17,5 +17,6 @@ export declare class DownloadController extends AbstractController {
             downloads: number;
         }[];
     }>;
+    private getDayRange;
     private checkAndGetRange;
 }

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

@@ -34,9 +34,11 @@ let DownloadController = class DownloadController extends AbstractController_1.A
         const days = {};
         const versions = {};
         for (const entity of entities) {
-            const yearMonth = String(entity.yearMonth);
-            const prefix = yearMonth.substring(0, 4) + '-' + yearMonth.substring(4, 6);
-            for (let i = 1; i <= 31; i++) {
+            const yearMonth = entity.yearMonth;
+            const yearMonthStr = String(yearMonth);
+            const prefix = yearMonthStr.substring(0, 4) + '-' + yearMonthStr.substring(4, 6);
+            const [fromDay, toDay] = this.getDayRange(yearMonth, startDate, endDate);
+            for (let i = fromDay; i <= toDay; i++) {
                 const day = String(i).padStart(2, '0');
                 const field = `d${day}`;
                 const counter = entity[field];
@@ -67,9 +69,11 @@ let DownloadController = class DownloadController extends AbstractController_1.A
         const entities = await this.packageVersionDownloadRepository.query(scope, startDate.toDate(), endDate.toDate());
         const days = {};
         for (const entity of entities) {
-            const yearMonth = String(entity.yearMonth);
-            const prefix = yearMonth.substring(0, 4) + '-' + yearMonth.substring(4, 6);
-            for (let i = 1; i <= 31; i++) {
+            const yearMonth = entity.yearMonth;
+            const yearMonthStr = String(yearMonth);
+            const prefix = yearMonthStr.substring(0, 4) + '-' + yearMonthStr.substring(4, 6);
+            const [fromDay, toDay] = this.getDayRange(yearMonth, startDate, endDate);
+            for (let i = fromDay; i <= toDay; i++) {
                 const day = String(i).padStart(2, '0');
                 const field = `d${day}`;
                 const counter = entity[field];
@@ -87,6 +91,24 @@ let DownloadController = class DownloadController extends AbstractController_1.A
             downloads,
         };
     }
+    // Get the valid day range [startDay, endDay] for a given entity's yearMonth
+    // considering the requested date range boundaries
+    getDayRange(yearMonth, startDate, endDate) {
+        const year = Math.floor(yearMonth / 100);
+        const month = yearMonth % 100;
+        const startYM = startDate.year() * 100 + startDate.month() + 1;
+        const endYM = endDate.year() * 100 + endDate.month() + 1;
+        const daysInMonth = (0, dayjs_1.default)(`${year}-${String(month).padStart(2, '0')}-01`).daysInMonth();
+        let fromDay = 1;
+        let toDay = daysInMonth;
+        if (yearMonth === startYM) {
+            fromDay = startDate.date();
+        }
+        if (yearMonth === endYM) {
+            toDay = endDate.date();
+        }
+        return [fromDay, toDay];
+    }
     checkAndGetRange(range) {
         const matchs = /^(\d{4}\-\d{2}\-\d{2}):(\d{4}\-\d{2}\-\d{2})$/.exec(range);
         if (!matchs) {
@@ -142,4 +164,4 @@ __decorate([
 exports.DownloadController = DownloadController = __decorate([
     (0, tegg_1.HTTPController)()
 ], DownloadController);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRG93bmxvYWRDb250cm9sbGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vYXBwL3BvcnQvY29udHJvbGxlci9Eb3dubG9hZENvbnRyb2xsZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsc0NBTXFCO0FBQ3JCLDJDQUFxRTtBQUNyRSw2REFBMEQ7QUFDMUQsMERBQWdGO0FBQ2hGLCtEQUF1QztBQUN2Qyx3R0FBcUc7QUFFckcsTUFBTSxXQUFXLEdBQUcsWUFBWSxDQUFDO0FBRzFCLElBQU0sa0JBQWtCLEdBQXhCLE1BQU0sa0JBQW1CLFNBQVEsdUNBQWtCO0lBUWxELEFBQU4sS0FBSyxDQUFDLG9CQUFvQixDQUFjLFFBQWdCLEVBQWUsS0FBYTtRQUNsRixNQUFNLENBQUUsU0FBUyxFQUFFLE9BQU8sQ0FBRSxHQUFHLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUM1RCxNQUFNLENBQUUsS0FBSyxFQUFFLElBQUksQ0FBRSxHQUFHLElBQUEsNkJBQWUsRUFBQyxRQUFRLENBQUMsQ0FBQztRQUNsRCxNQUFNLEdBQUcsR0FBRyxNQUFNLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxXQUFXLENBQUMsS0FBSyxFQUFFLElBQUksQ0FBQyxDQUFDO1FBQ2xFLElBQUksQ0FBQyxHQUFHO1lBQUUsTUFBTSxJQUFJLDBCQUFhLENBQUMsR0FBRyxRQUFRLFlBQVksQ0FBQyxDQUFDO1FBQzNELE1BQU0sUUFBUSxHQUFHLE1BQU0sSUFBSSxDQUFDLGdDQUFnQyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsU0FBUyxFQUFFLFNBQVMsQ0FBQyxNQUFNLEVBQUUsRUFBRSxPQUFPLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FBQztRQUN4SCxNQUFNLElBQUksR0FBMkIsRUFBRSxDQUFDO1FBQ3hDLE1BQU0sUUFBUSxHQUF5RCxFQUFFLENBQUM7UUFDMUUsS0FBSyxNQUFNLE1BQU0sSUFB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRG93bmxvYWRDb250cm9sbGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vYXBwL3BvcnQvY29udHJvbGxlci9Eb3dubG9hZENvbnRyb2xsZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsc0NBTXFCO0FBQ3JCLDJDQUFxRTtBQUNyRSw2REFBMEQ7QUFDMUQsMERBQWdGO0FBQ2hGLCtEQUF1QztBQUN2Qyx3R0FBcUc7QUFFckcsTUFBTSxXQUFXLEdBQUcsWUFBWSxDQUFDO0FBRzFCLElBQU0sa0JBQWtCLEdBQXhCLE1BQU0sa0JBQW1CLFNBQVEsdUNBQWtCO0lBUWxELEFBQU4sS0FBSyxDQUFDLG9CQUFvQixDQUFjLFFBQWdCLEVBQWUsS0FBYTtRQUNsRixNQUFNLENBQUUsU0FBUyxFQUFFLE9BQU8sQ0FBRSxHQUFHLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUM1RCxNQUFNLENBQUUsS0FBSyxFQUFFLElBQUksQ0FBRSxHQUFHLElBQUEsNkJBQWUsRUFBQyxRQUFRLENBQUMsQ0FBQztRQUNsRCxNQUFNLEdBQUcsR0FBRyxNQUFNLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxXQUFXLENBQUMsS0FBSyxFQUFFLElBQUksQ0FBQyxDQUFDO1FBQ2xFLElBQUksQ0FBQyxHQUFHO1lBQUUsTUFBTSxJQUFJLDBCQUFhLENBQUMsR0FBRyxRQUFRLFlBQVksQ0FBQyxDQUFDO1FBQzNELE1BQU0sUUFBUSxHQUFHLE1BQU0sSUFBSSxDQUFDLGdDQUFnQyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsU0FBUyxFQUFFLFNBQVMsQ0FBQyxNQUFNLEVBQUUsRUFBRSxPQUFPLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FBQztRQUN4SCxNQUFNLElBQUksR0FBMkIsRUFBRSxDQUFDO1FBQ3hDLE1BQU0sUUFBUSxHQUF5RCxFQUFFLENBQUM7UUFDMUUsS0FBSyxNQUFNLE1BQU0sSUFB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

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

@@ -67,19 +67,19 @@ let TeamController = class TeamController extends AbstractController_1.AbstractC
         }
         // Admin always has access
         if (isAdmin) {
-            return { org, team, authorizedUser };
+            return { org, team, authorizedUser, isAdmin };
         }
         // Org owner has access
         if (!this.isAllowScopeOrg(orgName)) {
             const orgMember = await this.orgRepository.findMember(org.orgId, authorizedUser.userId);
             if (orgMember && orgMember.role === 'owner') {
-                return { org, team, authorizedUser };
+                return { org, team, authorizedUser, isAdmin };
             }
         }
         // Team owner has access
         const teamMember = await this.teamRepository.findMember(team.teamId, authorizedUser.userId);
         if (teamMember && teamMember.role === 'owner') {
-            return { org, team, authorizedUser };
+            return { org, team, authorizedUser, isAdmin };
         }
         throw new egg_errors_1.ForbiddenError('Only team owner or admin can perform this action');
     }
@@ -230,7 +230,7 @@ let TeamController = class TeamController extends AbstractController_1.AbstractC
     }
     // npm access grant read-only @scope:team <pkg> → PUT /-/team/:orgName/:teamName/package
     async grantPackageAccess(ctx, orgName, teamName, body) {
-        const { team } = await this.requireTeamWriteAccess(ctx, orgName, teamName);
+        const { team, authorizedUser, isAdmin } = await this.requireTeamWriteAccess(ctx, orgName, teamName);
         if (!body.package) {
             throw new egg_errors_1.UnprocessableEntityError('package is required');
         }
@@ -239,6 +239,10 @@ let TeamController = class TeamController extends AbstractController_1.AbstractC
         if (!pkg) {
             throw new egg_errors_1.NotFoundError(`Package "${body.package}" not found`);
         }
+        // Non-admin users can only add packages they are a maintainer of
+        if (!isAdmin) {
+            await this.userRoleManager.requiredPackageMaintainer(pkg, authorizedUser);
+        }
         await this.teamService.grantPackageAccess(team.teamId, pkg.packageId);
         return { ok: true };
     }
@@ -426,4 +430,4 @@ __decorate([
 exports.TeamController = TeamController = __decorate([
     (0, tegg_1.HTTPController)()
 ], TeamController);
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"TeamController.js","sourceRoot":"","sources":["../../../../app/port/controller/TeamController.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"TeamController.js","sourceRoot":"","sources":["../../../../app/port/controller/TeamController.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnpmcore",
-  "version": "3.81.0",
+  "version": "3.82.1",
   "description": "Private NPM Registry for Enterprise",
   "files": [
     "dist/**/*"