cnpmcore 3.71.2 → 3.72.0

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

@@ -195,6 +195,35 @@ const DOWNLOAD_PATHS = {
         'mac14-arm64': 'builds/android/%s/android.zip',
         'win64': 'builds/android/%s/android.zip',
     },
+    'chromium-headless-shell': {
+        '<unknown>': undefined,
+        'ubuntu18.04-x64': undefined,
+        'ubuntu20.04-x64': 'builds/chromium/%s/chromium-headless-shell-linux.zip',
+        'ubuntu22.04-x64': 'builds/chromium/%s/chromium-headless-shell-linux.zip',
+        'ubuntu24.04-x64': 'builds/chromium/%s/chromium-headless-shell-linux.zip',
+        'ubuntu18.04-arm64': undefined,
+        'ubuntu20.04-arm64': 'builds/chromium/%s/chromium-headless-shell-linux-arm64.zip',
+        'ubuntu22.04-arm64': 'builds/chromium/%s/chromium-headless-shell-linux-arm64.zip',
+        'ubuntu24.04-arm64': 'builds/chromium/%s/chromium-headless-shell-linux-arm64.zip',
+        'debian11-x64': 'builds/chromium/%s/chromium-headless-shell-linux.zip',
+        'debian11-arm64': 'builds/chromium/%s/chromium-headless-shell-linux-arm64.zip',
+        'debian12-x64': 'builds/chromium/%s/chromium-headless-shell-linux.zip',
+        'debian12-arm64': 'builds/chromium/%s/chromium-headless-shell-linux-arm64.zip',
+        'mac10.13': undefined,
+        'mac10.14': undefined,
+        'mac10.15': undefined,
+        'mac11': 'builds/chromium/%s/chromium-headless-shell-mac.zip',
+        'mac11-arm64': 'builds/chromium/%s/chromium-headless-shell-mac-arm64.zip',
+        'mac12': 'builds/chromium/%s/chromium-headless-shell-mac.zip',
+        'mac12-arm64': 'builds/chromium/%s/chromium-headless-shell-mac-arm64.zip',
+        'mac13': 'builds/chromium/%s/chromium-headless-shell-mac.zip',
+        'mac13-arm64': 'builds/chromium/%s/chromium-headless-shell-mac-arm64.zip',
+        'mac14': 'builds/chromium/%s/chromium-headless-shell-mac.zip',
+        'mac14-arm64': 'builds/chromium/%s/chromium-headless-shell-mac-arm64.zip',
+        'mac15': 'builds/chromium/%s/chromium-headless-shell-mac.zip',
+        'mac15-arm64': 'builds/chromium/%s/chromium-headless-shell-mac-arm64.zip',
+        'win64': 'builds/chromium/%s/chromium-headless-shell-win64.zip',
+    },
 };
 let PlaywrightBinary = class PlaywrightBinary extends AbstractBinary_1.AbstractBinary {
     async initFetch() {
@@ -232,6 +261,22 @@ let PlaywrightBinary = class PlaywrightBinary extends AbstractBinary_1.AbstractB
                 /* c8 ignore next 2 */
                 this.logger.warn('[PlaywrightBinary.fetch:error] Playwright version %s browser data request failed: %s', version, err);
             })));
+            // if chromium-headless-shell not exists on browsers, copy chromium to chromium-headless-shell
+            if (!browsers.find(browser => browser.name === 'chromium-headless-shell')) {
+                const chromium = browsers.find(browser => browser.name === 'chromium');
+                // {
+                //   "name": "chromium",
+                //   "revision": "1155",
+                //   "installByDefault": true,
+                //   "browserVersion": "133.0.6943.16"
+                // }
+                if (chromium) {
+                    browsers.push({
+                        ...chromium,
+                        name: 'chromium-headless-shell',
+                    });
+                }
+            }
             for (const browser of browsers) {
                 const downloadPaths = DOWNLOAD_PATHS[browser.name];
                 if (!downloadPaths)
@@ -268,4 +313,4 @@ exports.PlaywrightBinary = PlaywrightBinary = __decorate([
     (0, tegg_1.SingletonProto)(),
     (0, AbstractBinary_1.BinaryAdapter)(Binary_1.BinaryType.Playwright)
 ], PlaywrightBinary);
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PlaywrightBinary.js","sourceRoot":"","sources":["../../../../../app/common/adapter/binary/PlaywrightBinary.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PlaywrightBinary.js","sourceRoot":"","sources":["../../../../../app/common/adapter/binary/PlaywrightBinary.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,qDAA0F;AAC1F,gDAAwB;AACxB,gDAAwB;AACxB,sCAA6C;AAC7C,8CAA+C;AAE/C,MAAM,WAAW,GAAG,4CAA4C,CAAC;AACjE,MAAM,aAAa,GAAG,mCAAmC,CAAC;AAE1D,0GAA0G;AAC1G,gCAAgC;AAChC,MAAM,cAAc,GAAG;IACrB,UAAU,EAAE;QACV,WAAW,EAAE,SAAS;QACtB,iBAAiB,EAAE,SAAS;QAC5B,iBAAiB,EAAE,uCAAuC;QAC1D,iBAAiB,EAAE,uCAAuC;QAC1D,mBAAmB,EAAE,SAAS;QAC9B,mBAAmB,EAAE,6CAA6C;QAClE,mBAAmB,EAAE,6CAA6C;QAClE,cAAc,EAAE,uCAAuC;QACvD,gBAAgB,EAAE,6CAA6C;QAC/D,cAAc,EAAE,uCAAuC;QACvD,gBAAgB,EAAE,6CAA6C;QAC/D,UAAU,EAAE,qCAAqC;QACjD,UAAU,EAAE,qCAAqC;QACjD,UAAU,EAAE,qCAAqC;QACjD,OAAO,EAAE,qCAAqC;QAC9C,aAAa,EAAE,2CAA2C;QAC1D,OAAO,EAAE,qCAAqC;QAC9C,aAAa,EAAE,2CAA2C;QAC1D,OAAO,EAAE,qCAAqC;QAC9C,aAAa,EAAE,2CAA2C;QAC1D,OAAO,EAAE,qCAAqC;QAC9C,aAAa,EAAE,2CAA2C;QAC1D,OAAO,EAAE,uCAAuC;KACjD;IACD,sBAAsB,EAAE;QACtB,WAAW,EAAE,SAAS;QACtB,iBAAiB,EAAE,SAAS;QAC5B,iBAAiB,EAAE,+DAA+D;QAClF,iBAAiB,EAAE,+DAA+D;QAClF,mBAAmB,EAAE,SAAS;QAC9B,mBAAmB,EAAE,qEAAqE;QAC1F,mBAAmB,EAAE,qEAAqE;QAC1F,cAAc,EAAE,+DAA+D;QAC/E,gBAAgB,EAAE,qEAAqE;QACvF,cAAc,EAAE,+DAA+D;QAC/E,gBAAgB,EAAE,qEAAqE;QACvF,UAAU,EAAE,6DAA6D;QACzE,UAAU,EAAE,6DAA6D;QACzE,UAAU,EAAE,6DAA6D;QACzE,OAAO,EAAE,6DAA6D;QACtE,aAAa,EAAE,mEAAmE;QAClF,OAAO,EAAE,6DAA6D;QACtE,aAAa,EAAE,mEAAmE;QAClF,OAAO,EAAE,6DAA6D;QACtE,aAAa,EAAE,mEAAmE;QAClF,OAAO,EAAE,6DAA6D;QACtE,aAAa,EAAE,mEAAmE;QAClF,OAAO,EAAE,+DAA+D;KACzE;IACD,SAAS,EAAE;QACT,WAAW,EAAE,SAAS;QACtB,iBAAiB,EAAE,SAAS;QAC5B,iBAAiB,EAAE,4CAA4C;QAC/D,iBAAiB,EAAE,4CAA4C;QAC/D,mBAAmB,EAAE,SAAS;QAC9B,mBAAmB,EAAE,kDAAkD;QACvE,mBAAmB,EAAE,kDAAkD;QACvE,cAAc,EAAE,yCAAyC;QACzD,gBAAgB,EAAE,+CAA+C;QACjE,cAAc,EAAE,yCAAyC;QACzD,gBAAgB,EAAE,+CAA+C;QACjE,UAAU,EAAE,sCAAsC;QAClD,UAAU,EAAE,sCAAsC;QAClD,UAAU,EAAE,sCAAsC;QAClD,OAAO,EAAE,sCAAsC;QAC/C,aAAa,EAAE,4CAA4C;QAC3D,OAAO,EAAE,sCAAsC;QAC/C,aAAa,EAAE,4CAA4C;QAC3D,OAAO,EAAE,sCAAsC;QAC/C,aAAa,EAAE,4CAA4C;QAC3D,OAAO,EAAE,sCAAsC;QAC/C,aAAa,EAAE,4CAA4C;QAC3D,OAAO,EAAE,qCAAqC;KAC/C;IACD,cAAc,EAAE;QACd,WAAW,EAAE,SAAS;QACtB,iBAAiB,EAAE,SAAS;QAC5B,iBAAiB,EAAE,sDAAsD;QACzE,iBAAiB,EAAE,sDAAsD;QACzE,mBAAmB,EAAE,SAAS;QAC9B,mBAAmB,EAAE,SAAS;QAC9B,mBAAmB,EAAE,4DAA4D;QACjF,cAAc,EAAE,mDAAmD;QACnE,gBAAgB,EAAE,yDAAyD;QAC3E,cAAc,EAAE,mDAAmD;QACnE,gBAAgB,EAAE,yDAAyD;QAC3E,UAAU,EAAE,gDAAgD;QAC5D,UAAU,EAAE,gDAAgD;QAC5D,UAAU,EAAE,gDAAgD;QAC5D,OAAO,EAAE,gDAAgD;QACzD,aAAa,EAAE,sDAAsD;QACrE,OAAO,EAAE,gDAAgD;QACzD,aAAa,EAAE,sDAAsD;QACrE,OAAO,EAAE,gDAAgD;QACzD,aAAa,EAAE,sDAAsD;QACrE,OAAO,EAAE,gDAAgD;QACzD,aAAa,EAAE,sDAAsD;QACrE,OAAO,EAAE,+CAA+C;KACzD;IACD,QAAQ,EAAE;QACR,WAAW,EAAE,SAAS;QACtB,iBAAiB,EAAE,SAAS;QAC5B,iBAAiB,EAAE,0CAA0C;QAC7D,iBAAiB,EAAE,0CAA0C;QAC7D,mBAAmB,EAAE,SAAS;QAC9B,mBAAmB,EAAE,gDAAgD;QACrE,mBAAmB,EAAE,gDAAgD;QACrE,cAAc,EAAE,uCAAuC;QACvD,gBAAgB,EAAE,6CAA6C;QAC/D,cAAc,EAAE,uCAAuC;QACvD,gBAAgB,EAAE,6CAA6C;QAC/D,UAAU,EAAE,SAAS;QACrB,UAAU,EAAE,uEAAuE;QACnF,UAAU,EAAE,uEAAuE;QACnF,OAAO,EAAE,oCAAoC;QAC7C,aAAa,EAAE,0CAA0C;QACzD,OAAO,EAAE,oCAAoC;QAC7C,aAAa,EAAE,0CAA0C;QACzD,OAAO,EAAE,oCAAoC;QAC7C,aAAa,EAAE,0CAA0C;QACzD,OAAO,EAAE,oCAAoC;QAC7C,aAAa,EAAE,0CAA0C;QACzD,OAAO,EAAE,mCAAmC;KAC7C;IACD,QAAQ,EAAE;QACR,WAAW,EAAE,SAAS;QACtB,iBAAiB,EAAE,SAAS;QAC5B,iBAAiB,EAAE,mCAAmC;QACtD,iBAAiB,EAAE,mCAAmC;QACtD,mBAAmB,EAAE,SAAS;QAC9B,mBAAmB,EAAE,yCAAyC;QAC9D,mBAAmB,EAAE,yCAAyC;QAC9D,cAAc,EAAE,mCAAmC;QACnD,gBAAgB,EAAE,yCAAyC;QAC3D,cAAc,EAAE,mCAAmC;QACnD,gBAAgB,EAAE,yCAAyC;QAC3D,UAAU,EAAE,iCAAiC;QAC7C,UAAU,EAAE,iCAAiC;QAC7C,UAAU,EAAE,iCAAiC;QAC7C,OAAO,EAAE,iCAAiC;QAC1C,aAAa,EAAE,uCAAuC;QACtD,OAAO,EAAE,iCAAiC;QAC1C,aAAa,EAAE,uCAAuC;QACtD,OAAO,EAAE,iCAAiC;QAC1C,aAAa,EAAE,uCAAuC;QACtD,OAAO,EAAE,iCAAiC;QAC1C,aAAa,EAAE,uCAAuC;QACtD,OAAO,EAAE,mCAAmC;KAC7C;IACD,SAAS,EAAE;QACT,WAAW,EAAE,+BAA+B;QAC5C,iBAAiB,EAAE,SAAS;QAC5B,iBAAiB,EAAE,+BAA+B;QAClD,iBAAiB,EAAE,+BAA+B;QAClD,mBAAmB,EAAE,SAAS;QAC9B,mBAAmB,EAAE,+BAA+B;QACpD,mBAAmB,EAAE,+BAA+B;QACpD,cAAc,EAAE,+BAA+B;QAC/C,gBAAgB,EAAE,+BAA+B;QACjD,cAAc,EAAE,+BAA+B;QAC/C,gBAAgB,EAAE,+BAA+B;QACjD,UAAU,EAAE,+BAA+B;QAC3C,UAAU,EAAE,+BAA+B;QAC3C,UAAU,EAAE,+BAA+B;QAC3C,OAAO,EAAE,+BAA+B;QACxC,aAAa,EAAE,+BAA+B;QAC9C,OAAO,EAAE,+BAA+B;QACxC,aAAa,EAAE,+BAA+B;QAC9C,OAAO,EAAE,+BAA+B;QACxC,aAAa,EAAE,+BAA+B;QAC9C,OAAO,EAAE,+BAA+B;QACxC,aAAa,EAAE,+BAA+B;QAC9C,OAAO,EAAE,+BAA+B;KACzC;IACD,yBAAyB,EAAE;QACzB,WAAW,EAAE,SAAS;QACtB,iBAAiB,EAAE,SAAS;QAC5B,iBAAiB,EAAE,sDAAsD;QACzE,iBAAiB,EAAE,sDAAsD;QACzE,iBAAiB,EAAE,sDAAsD;QACzE,mBAAmB,EAAE,SAAS;QAC9B,mBAAmB,EAAE,4DAA4D;QACjF,mBAAmB,EAAE,4DAA4D;QACjF,mBAAmB,EAAE,4DAA4D;QACjF,cAAc,EAAE,sDAAsD;QACtE,gBAAgB,EAAE,4DAA4D;QAC9E,cAAc,EAAE,sDAAsD;QACtE,gBAAgB,EAAE,4DAA4D;QAC9E,UAAU,EAAE,SAAS;QACrB,UAAU,EAAE,SAAS;QACrB,UAAU,EAAE,SAAS;QACrB,OAAO,EAAE,oDAAoD;QAC7D,aAAa,EAAE,0DAA0D;QACzE,OAAO,EAAE,oDAAoD;QAC7D,aAAa,EAAE,0DAA0D;QACzE,OAAO,EAAE,oDAAoD;QAC7D,aAAa,EAAE,0DAA0D;QACzE,OAAO,EAAE,oDAAoD;QAC7D,aAAa,EAAE,0DAA0D;QACzE,OAAO,EAAE,oDAAoD;QAC7D,aAAa,EAAE,0DAA0D;QACzE,OAAO,EAAE,sDAAsD;KAChE;CACO,CAAC;AAIJ,IAAM,gBAAgB,GAAtB,MAAM,gBAAiB,SAAQ,+BAAc;IAElD,KAAK,CAAC,SAAS;QACb,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,GAAW;QACrB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;YACxD,MAAM,UAAU,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;YAC5C,IAAI,CAAC,QAAQ,GAAG;gBACd,GAAG,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;gBAC7E,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,GAAG,CACzC,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,IAAI,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC;gBACpF,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAE,WAAW,IAAI,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC;aAC1F,CAAC;YAEF,kFAAkF;YAClF,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC;iBACtD,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAC;gBACtE,kCAAkC;iBACjC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;YACd,MAAM,QAAQ,GAAkI,EAAE,CAAC;YACnJ,MAAM,OAAO,CAAC,GAAG,CACf,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAC5B,IAAI,CAAC,WAAW,CACd,qCAAqC,OAAO,gBAAgB,CAC7D;iBACE,IAAI,CAAC,IAAI,CAAC,EAAE;gBACX,cAAc;gBACd,MAAM;gBACN,0BAA0B;gBAC1B,0BAA0B;gBAC1B,gCAAgC;gBAChC,yCAAyC;gBACzC,8BAA8B;gBAC9B,OAAO;gBACP,IAAI;gBACJ,QAAQ,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC;YAClC,CAAC,CAAC;iBACD,KAAK,CAAC,GAAG,CAAC,EAAE;gBACX,sBAAsB;gBACtB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,sFAAsF,EACrG,OAAO,EAAE,GAAG,CAAC,CAAC;YAClB,CAAC,CAAC,CACL,CACF,CAAC;YACF,8FAA8F;YAC9F,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,yBAAyB,CAAC,EAAE;gBACzE,MAAM,QAAQ,GAAG,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC;gBACvE,IAAI;gBACJ,wBAAwB;gBACxB,wBAAwB;gBACxB,8BAA8B;gBAC9B,sCAAsC;gBACtC,IAAI;gBACJ,IAAI,QAAQ,EAAE;oBACZ,QAAQ,CAAC,IAAI,CAAC;wBACZ,GAAG,QAAQ;wBACX,IAAI,EAAE,yBAAyB;qBAChC,CAAC,CAAC;iBACJ;aACF;YAED,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;gBAC9B,MAAM,aAAa,GAAG,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBACnD,IAAI,CAAC,aAAa;oBAAE,SAAS;gBAC7B,KAAK,MAAM,CAAE,QAAQ,EAAE,UAAU,CAAE,IAAI,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE;oBACpE,IAAI,OAAO,UAAU,KAAK,QAAQ;wBAAE,SAAS;oBAC7C,MAAM,QAAQ,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC,QAAQ,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC;oBAC3E,MAAM,QAAQ,GAAG,OAAO,CAAC,cAAc,IAAI,QAAQ,CAAC;oBACpD,MAAM,GAAG,GAAG,aAAa,GAAG,cAAI,CAAC,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;oBAC9D,MAAM,IAAI,GAAG,cAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;oBACvC,MAAM,GAAG,GAAG,WAAW,OAAO,CAAC,IAAI,IAAI,QAAQ,GAAG,CAAC;oBACnD,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;wBACvB,IAAI,CAAC,QAAQ,CAAC,WAAW,OAAO,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC;4BAC7C,IAAI,EAAE,GAAG,QAAQ,GAAG;4BACpB,KAAK,EAAE,IAAI;4BACX,GAAG,EAAE,EAAE;4BACP,IAAI,EAAE,GAAG;4BACT,IAAI,EAAE,QAAQ;yBACf,CAAC,CAAC;wBACH,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;qBACzB;oBACD,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,EAAE;wBACxD,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;qBACjF;iBACF;aACF;SACF;QAED,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;IAC/D,CAAC;CACF,CAAA;AA7FY,4CAAgB;2BAAhB,gBAAgB;IAF5B,IAAA,qBAAc,GAAE;IAChB,IAAA,8BAAa,EAAC,mBAAU,CAAC,UAAU,CAAC;GACxB,gBAAgB,CA6F5B"}

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

@@ -1,4 +1,4 @@
-import { HttpClientResponse } from 'egg';
+import { HttpClientRequestOptions, HttpClientResponse } from 'egg';
 import { EggContext } from '@eggjs/tegg';
 import { AbstractService } from '../../common/AbstractService';
 import { Task, UpdateProxyCacheTaskOptions, CreateUpdateProxyCacheTask } from '../entity/Task';
@@ -19,15 +19,12 @@ export declare class ProxyCacheService extends AbstractService {
     getPackageManifest(fullname: string, fileType: DIST_NAMES.FULL_MANIFESTS | DIST_NAMES.ABBREVIATED_MANIFESTS): Promise<AbbreviatedPackageManifestType | PackageManifestType>;
     getPackageVersionManifest(fullname: string, fileType: DIST_NAMES.ABBREVIATED | DIST_NAMES.MANIFEST, versionOrTag: string): Promise<AbbreviatedPackageJSONType | PackageJSONType>;
     removeProxyCache(fullname: string, fileType: DIST_NAMES, version?: string): Promise<void>;
+    replaceTarballUrl<T extends DIST_NAMES>(manifest: GetSourceManifestAndCacheReturnType<T>, fileType: T): GetSourceManifestAndCacheReturnType<T>;
     createTask(targetName: string, options: UpdateProxyCacheTaskOptions): Promise<CreateUpdateProxyCacheTask>;
     findExecuteTask(): Promise<Task<import("../entity/Task").TaskBaseData> | null>;
     executeTask(task: Task): Promise<void>;
-    getRewrittenManifest<T extends DIST_NAMES>(fullname: string, fileType: T, versionOrTag?: string): Promise<GetSourceManifestAndCacheReturnType<T>>;
+    private getRewrittenManifest;
     private storeRewrittenManifest;
-    private getProxyResponse;
-    private getUpstreamFullManifests;
-    private getUpstreamAbbreviatedManifests;
-    private getUpstreamPackageVersionManifest;
-    private getUpstreamAbbreviatedPackageVersionManifest;
+    getProxyResponse(ctx: Partial<EggContext>, options?: HttpClientRequestOptions): Promise<HttpClientResponse>;
 }
 export {};

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

@@ -42,12 +42,28 @@ let ProxyCacheService = class ProxyCacheService extends AbstractService_1.Abstra
         return await this.getProxyResponse(ctx);
     }
     async getPackageManifest(fullname, fileType) {
+        const isFullManifests = fileType === Package_1.DIST_NAMES.FULL_MANIFESTS;
         const cachedStoreKey = (await this.proxyCacheRepository.findProxyCache(fullname, fileType))?.filePath;
         if (cachedStoreKey) {
-            const nfsBytes = await this.nfsAdapter.getBytes(cachedStoreKey);
-            const nfsString = Buffer.from(nfsBytes).toString();
-            const nfsPkgManifgest = JSON.parse(nfsString);
-            return nfsPkgManifgest;
+            try {
+                const nfsBytes = await this.nfsAdapter.getBytes(cachedStoreKey);
+                if (!nfsBytes)
+                    throw new Error('not found proxy cache, try again later.');
+                const nfsBuffer = Buffer.from(nfsBytes);
+                const { shasum: etag } = await (0, PackageUtil_1.calculateIntegrity)(nfsBytes);
+                await this.cacheService.savePackageEtagAndManifests(fullname, isFullManifests, etag, nfsBuffer);
+                const nfsString = nfsBuffer.toString();
+                const nfsPkgManifest = JSON.parse(nfsString);
+                return nfsPkgManifest;
+            }
+            catch (error) {
+                /* c8 ignore next 6 */
+                if (error.message.includes('not found proxy cache') || error.message.includes('Unexpected token : in JSON at')) {
+                    await this.nfsAdapter.remove(cachedStoreKey);
+                    await this.proxyCacheRepository.removeProxyCache(fullname, fileType);
+                }
+                throw error;
+            }
         }
         const manifest = await this.getRewrittenManifest(fullname, fileType);
         this.backgroundTaskHelper.run(async () => {
@@ -70,9 +86,21 @@ let ProxyCacheService = class ProxyCacheService extends AbstractService_1.Abstra
         }
         const cachedStoreKey = (await this.proxyCacheRepository.findProxyCache(fullname, fileType, version))?.filePath;
         if (cachedStoreKey) {
-            const nfsBytes = await this.nfsAdapter.getBytes(cachedStoreKey);
-            const nfsString = Buffer.from(nfsBytes).toString();
-            return JSON.parse(nfsString);
+            try {
+                const nfsBytes = await this.nfsAdapter.getBytes(cachedStoreKey);
+                if (!nfsBytes)
+                    throw new Error('not found proxy cache, try again later.');
+                const nfsString = Buffer.from(nfsBytes).toString();
+                return JSON.parse(nfsString);
+            }
+            catch (error) {
+                /* c8 ignore next 6 */
+                if (error.message.includes('not found proxy cache') || error.message.includes('Unexpected token : in JSON at')) {
+                    await this.nfsAdapter.remove(cachedStoreKey);
+                    await this.proxyCacheRepository.removeProxyCache(fullname, fileType);
+                }
+                throw error;
+            }
         }
         const manifest = await this.getRewrittenManifest(fullname, fileType, versionOrTag);
         this.backgroundTaskHelper.run(async () => {
@@ -89,6 +117,27 @@ let ProxyCacheService = class ProxyCacheService extends AbstractService_1.Abstra
         await this.nfsAdapter.remove(storeKey);
         await this.proxyCacheRepository.removeProxyCache(fullname, fileType, version);
     }
+    replaceTarballUrl(manifest, fileType) {
+        const { sourceRegistry, registry } = this.config.cnpmcore;
+        if (isPkgManifest(fileType)) {
+            // pkg manifest
+            const versionMap = manifest?.versions;
+            for (const key in versionMap) {
+                const versionItem = versionMap[key];
+                if (versionItem?.dist?.tarball) {
+                    versionItem.dist.tarball = versionItem.dist.tarball.replace(sourceRegistry, registry);
+                }
+            }
+        }
+        else {
+            // pkg version manifest
+            const distItem = manifest.dist;
+            if (distItem?.tarball) {
+                distItem.tarball = distItem.tarball.replace(sourceRegistry, registry);
+            }
+        }
+        return manifest;
+    }
     async createTask(targetName, options) {
         return await this.taskService.createTask(Task_1.Task.createUpdateProxyCache(targetName, options), false);
     }
@@ -129,44 +178,36 @@ let ProxyCacheService = class ProxyCacheService extends AbstractService_1.Abstra
         }
         await this.taskService.finishTask(task, Task_2.TaskState.Success, logs.join('\n'));
     }
+    // only used by schedule task
     async getRewrittenManifest(fullname, fileType, versionOrTag) {
         let responseResult;
+        const USER_AGENT = 'npm_service.cnpmjs.org/cnpmcore';
         switch (fileType) {
-            case Package_1.DIST_NAMES.FULL_MANIFESTS:
-                responseResult = await this.getUpstreamFullManifests(fullname);
+            case Package_1.DIST_NAMES.FULL_MANIFESTS: {
+                const url = `/${encodeURIComponent(fullname)}?t=${Date.now()}&cache=0`;
+                responseResult = await this.getProxyResponse({ url, headers: { accept: 'application/json', 'user-agent': USER_AGENT } }, { dataType: 'json' });
                 break;
-            case Package_1.DIST_NAMES.ABBREVIATED_MANIFESTS:
-                responseResult = await this.getUpstreamAbbreviatedManifests(fullname);
+            }
+            case Package_1.DIST_NAMES.ABBREVIATED_MANIFESTS: {
+                const url = `/${encodeURIComponent(fullname)}?t=${Date.now()}&cache=0`;
+                responseResult = await this.getProxyResponse({ url, headers: { accept: constants_1.ABBREVIATED_META_TYPE, 'user-agent': USER_AGENT } }, { dataType: 'json' });
                 break;
-            case Package_1.DIST_NAMES.MANIFEST:
-                responseResult = await this.getUpstreamPackageVersionManifest(fullname, versionOrTag);
+            }
+            case Package_1.DIST_NAMES.MANIFEST: {
+                const url = `/${encodeURIComponent(fullname)}/${encodeURIComponent(versionOrTag)}`;
+                responseResult = await this.getProxyResponse({ url, headers: { accept: 'application/json', 'user-agent': USER_AGENT } }, { dataType: 'json' });
                 break;
-            case Package_1.DIST_NAMES.ABBREVIATED:
-                responseResult = await this.getUpstreamAbbreviatedPackageVersionManifest(fullname, versionOrTag);
+            }
+            case Package_1.DIST_NAMES.ABBREVIATED: {
+                const url = `/${encodeURIComponent(fullname)}/${encodeURIComponent(versionOrTag)}`;
+                responseResult = await this.getProxyResponse({ url, headers: { accept: constants_1.ABBREVIATED_META_TYPE, 'user-agent': USER_AGENT } }, { dataType: 'json' });
                 break;
+            }
             default:
                 break;
         }
         // replace tarball url
-        const manifest = responseResult.data;
-        const { sourceRegistry, registry } = this.config.cnpmcore;
-        if (isPkgManifest(fileType)) {
-            // pkg manifest
-            const versionMap = manifest.versions || {};
-            for (const key in versionMap) {
-                const versionItem = versionMap[key];
-                if (versionItem?.dist?.tarball) {
-                    versionItem.dist.tarball = versionItem.dist.tarball.replace(sourceRegistry, registry);
-                }
-            }
-        }
-        else {
-            // pkg version manifest
-            const distItem = manifest.dist || {};
-            if (distItem.tarball) {
-                distItem.tarball = distItem.tarball.replace(sourceRegistry, registry);
-            }
-        }
+        const manifest = this.replaceTarballUrl(responseResult.data, fileType);
         return manifest;
     }
     async storeRewrittenManifest(manifest, fullname, fileType) {
@@ -196,8 +237,8 @@ let ProxyCacheService = class ProxyCacheService extends AbstractService_1.Abstra
             compressed: true,
             ...options,
             headers: {
-                accept: ctx.header?.accept,
-                'user-agent': ctx.header?.['user-agent'],
+                accept: ctx.headers?.accept,
+                'user-agent': ctx.headers?.['user-agent'],
                 authorization,
                 'x-forwarded-for': ctx?.ip,
                 via: `1.1, ${this.config.cnpmcore.registry}`,
@@ -206,22 +247,6 @@ let ProxyCacheService = class ProxyCacheService extends AbstractService_1.Abstra
         this.logger.info('[ProxyCacheService:getProxyStreamResponse] %s, status: %s', url, res.status);
         return res;
     }
-    async getUpstreamFullManifests(fullname) {
-        const url = `/${encodeURIComponent(fullname)}?t=${Date.now()}&cache=0`;
-        return await this.getProxyResponse({ url }, { dataType: 'json' });
-    }
-    async getUpstreamAbbreviatedManifests(fullname) {
-        const url = `/${encodeURIComponent(fullname)}?t=${Date.now()}&cache=0`;
-        return await this.getProxyResponse({ url, headers: { accept: constants_1.ABBREVIATED_META_TYPE } }, { dataType: 'json' });
-    }
-    async getUpstreamPackageVersionManifest(fullname, versionOrTag) {
-        const url = `/${encodeURIComponent(fullname)}/${encodeURIComponent(versionOrTag)}`;
-        return await this.getProxyResponse({ url }, { dataType: 'json' });
-    }
-    async getUpstreamAbbreviatedPackageVersionManifest(fullname, versionOrTag) {
-        const url = `/${encodeURIComponent(fullname)}/${encodeURIComponent(versionOrTag)}`;
-        return await this.getProxyResponse({ url, headers: { accept: constants_1.ABBREVIATED_META_TYPE } }, { dataType: 'json' });
-    }
 };
 exports.ProxyCacheService = ProxyCacheService;
 __decorate([
@@ -261,4 +286,4 @@ exports.ProxyCacheService = ProxyCacheService = __decorate([
         accessLevel: tegg_1.AccessLevel.PUBLIC,
     })
 ], ProxyCacheService);
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ProxyCacheService.js","sourceRoot":"","sources":["../../../../app/core/service/ProxyCacheService.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ProxyCacheService.js","sourceRoot":"","sources":["../../../../app/core/service/ProxyCacheService.ts"],"names":[],"mappings":"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"}

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

@@ -5,18 +5,16 @@ import { QueryPageOptions } from '../typebox';
 export declare class ProxyCacheController extends AbstractController {
     private readonly proxyCacheRepository;
     private readonly proxyCacheService;
-    private readonly nfsAdapter;
+    private readonly cacheService;
     listProxyCache(pageSize: Static<typeof QueryPageOptions>['pageSize'], pageIndex: Static<typeof QueryPageOptions>['pageIndex']): Promise<import("../../core/util/EntityUtil").PageResult<import("../../core/entity/ProxyCache").ProxyCache>>;
     showProxyCaches(pageSize: Static<typeof QueryPageOptions>['pageSize'], pageIndex: Static<typeof QueryPageOptions>['pageIndex'], fullname: string): Promise<import("../../core/util/EntityUtil").PageResult<import("../../core/entity/ProxyCache").ProxyCache>>;
     refreshProxyCaches(fullname: string): Promise<{
         ok: boolean;
         tasks: import("../../core/entity/Task").CreateUpdateProxyCacheTask[];
     }>;
-    removeProxyCaches(ctx: EggContext, fullname: string): Promise<{
+    removeProxyCaches(fullname: string): Promise<{
         ok: boolean;
         result: import("leoric").Collection<import("../../repository/model/ProxyCache").ProxyCache>;
     }>;
-    truncateProxyCaches(ctx: EggContext): Promise<{
-        ok: boolean;
-    }>;
+    truncateProxyCaches(ctx: EggContext): Promise<void>;
 }

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

@@ -20,7 +20,7 @@ const ProxyCacheRepository_1 = require("../../repository/ProxyCacheRepository");
 const PackageUtil_1 = require("../../common/PackageUtil");
 const ProxyCacheService_1 = require("../../core/service/ProxyCacheService");
 const constants_1 = require("../../common/constants");
-const NFSAdapter_1 = require("../../common/adapter/NFSAdapter");
+const CacheService_1 = require("../../core/service/CacheService");
 let ProxyCacheController = class ProxyCacheController extends AbstractController_1.AbstractController {
     async listProxyCache(pageSize, pageIndex) {
         if (this.config.cnpmcore.syncMode !== constants_1.SyncMode.proxy) {
@@ -48,26 +48,24 @@ let ProxyCacheController = class ProxyCacheController extends AbstractController
         if (refreshList.length === 0) {
             throw new egg_errors_1.NotFoundError();
         }
+        await this.cacheService.removeCache(fullname);
         const taskList = refreshList
-            // 仅manifests需要更新，指定版本的package.json文件发布后不会改变
+            // only refresh package.json and abbreviated.json
             .filter(i => (0, ProxyCacheService_1.isPkgManifest)(i.fileType))
-            .map(async (item) => {
-            const task = await this.proxyCacheService.createTask(`${item.fullname}/${item.fileType}`, {
+            .map(item => {
+            const task = this.proxyCacheService.createTask(`${item.fullname}/${item.fileType}`, {
                 fullname: item.fullname,
                 fileType: item.fileType,
             });
             return task;
         });
+        const tasks = await Promise.all(taskList);
         return {
             ok: true,
-            tasks: await Promise.all(taskList),
+            tasks,
         };
     }
-    async removeProxyCaches(ctx, fullname) {
-        const isAdmin = await this.userRoleManager.isAdmin(ctx);
-        if (!isAdmin) {
-            throw new egg_errors_1.UnauthorizedError('only admin can do this');
-        }
+    async removeProxyCaches(fullname) {
         if (this.config.cnpmcore.syncMode !== constants_1.SyncMode.proxy) {
             throw new egg_errors_1.ForbiddenError('proxy mode is not enabled');
         }
@@ -75,6 +73,7 @@ let ProxyCacheController = class ProxyCacheController extends AbstractController
         if (proxyCachesList.length === 0) {
             throw new egg_errors_1.NotFoundError();
         }
+        await this.cacheService.removeCache(fullname);
         const removingList = proxyCachesList.map(item => {
             return this.proxyCacheService.removeProxyCache(item.fullname, item.fileType, item.version);
         });
@@ -92,19 +91,7 @@ let ProxyCacheController = class ProxyCacheController extends AbstractController
         if (this.config.cnpmcore.syncMode !== constants_1.SyncMode.proxy) {
             throw new egg_errors_1.ForbiddenError('proxy mode is not enabled');
         }
-        await this.proxyCacheRepository.truncateProxyCache();
-        // 尝试删除proxy cache目录，若失败可手动管理
-        ctx.runInBackground(async () => {
-            try {
-                await this.nfsAdapter.remove(`/${constants_1.PROXY_CACHE_DIR_NAME}`);
-            }
-            catch (err) {
-                this.logger.error('[ProxyCacheService.truncateProxyCaches] remove proxy cache dir error: %s', err);
-            }
-        });
-        return {
-            ok: true,
-        };
+        throw new egg_errors_1.NotImplementedError('not implemented yet');
     }
 };
 exports.ProxyCacheController = ProxyCacheController;
@@ -118,8 +105,8 @@ __decorate([
 ], ProxyCacheController.prototype, "proxyCacheService", void 0);
 __decorate([
     (0, tegg_1.Inject)(),
-    __metadata("design:type", NFSAdapter_1.NFSAdapter)
-], ProxyCacheController.prototype, "nfsAdapter", void 0);
+    __metadata("design:type", CacheService_1.CacheService)
+], ProxyCacheController.prototype, "cacheService", void 0);
 __decorate([
     (0, tegg_1.HTTPMethod)({
         method: tegg_1.HTTPMethodEnum.GET,
@@ -158,10 +145,9 @@ __decorate([
         method: tegg_1.HTTPMethodEnum.DELETE,
         path: `/-/proxy-cache/:fullname(${PackageUtil_1.FULLNAME_REG_STRING})`,
     }),
-    __param(0, (0, tegg_1.Context)()),
-    __param(1, (0, tegg_1.HTTPParam)()),
+    __param(0, (0, tegg_1.HTTPParam)()),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, String]),
+    __metadata("design:paramtypes", [String]),
     __metadata("design:returntype", Promise)
 ], ProxyCacheController.prototype, "removeProxyCaches", null);
 __decorate([
@@ -177,4 +163,4 @@ __decorate([
 exports.ProxyCacheController = ProxyCacheController = __decorate([
     (0, tegg_1.HTTPController)()
 ], ProxyCacheController);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUHJveHlDYWNoZUNvbnRyb2xsZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9hcHAvcG9ydC9jb250cm9sbGVyL1Byb3h5Q2FjaGVDb250cm9sbGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHNDQVNxQjtBQUNyQiwyQ0FBOEU7QUFDOUUsNkRBQTBEO0FBQzFELGdGQUE2RTtBQUc3RSwwREFBK0Q7QUFDL0QsNEVBRzhDO0FBQzlDLHNEQUF3RTtBQUN4RSxnRUFBNkQ7QUFHdEQsSUFBTSxvQkFBb0IsR0FBMUIsTUFBTSxvQkFBcUIsU0FBUSx1Q0FBa0I7SUFZcEQsQUFBTixLQUFLLENBQUMsY0FBYyxDQUNMLFFBQXFELEVBQ3JELFNBQXVEO1FBRXBFLElBQUksSUFBSSxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsUUFBUSxLQUFLLG9CQUFRLENBQUMsS0FBSyxFQUFFO1lBQ3BELE1BQU0sSUFBSSwyQkFBYyxDQUFDLDJCQUEyQixDQUFDLENBQUM7U0FDdkQ7UUFDRCxPQUFPLE1BQU0sSUFBSSxDQUFDLG9CQUFvQixDQUFDLGVBQWUsQ0FBQztZQUNyRCxRQUFRO1lBQ1IsU0FBUztTQUNWLENBQUMsQ0FBQztJQUNMLENBQUM7SUFNSyxBQUFOLEtBQUssQ0FBQyxlQUFlLENBQWMsUUFBcUQsRUFDM0UsU0FBdUQsRUFBZSxRQUFnQjtRQUNqRyxJQUFJLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLFFBQVEsS0FBSyxvQkFBUSxDQUFDLEtBQUssRUFBRTtZQUNwRCxNQUFNLElBQUksMkJBQWMsQ0FBQywyQkFBMkIsQ0FBQyxDQUFDO1NBQ3ZEO1FBQ0QsT0FBTyxNQUFNLElBQUksQ0FBQyxvQkFBb0IsQ0FBQyxlQUFlLENBQUM7WUFDckQsUUFBUTtZQUNSLFNBQVM7U0FDVixFQUFFLFFBQVEsQ0FBQyxDQUFDO0lBQ2YsQ0FBQztJQU1LLEFBQU4sS0FBSyxDQUFDLGtCQUFrQixDQUFj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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUHJveHlDYWNoZUNvbnRyb2xsZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9hcHAvcG9ydC9jb250cm9sbGVyL1Byb3h5Q2FjaGVDb250cm9sbGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHNDQVNxQjtBQUNyQiwyQ0FBbUc7QUFDbkcsNkRBQTBEO0FBQzFELGdGQUE2RTtBQUc3RSwwREFBK0Q7QUFDL0QsNEVBRzhDO0FBQzlDLHNEQUFrRDtBQUNsRCxrRUFBK0Q7QUFHeEQsSUFBTSxvQkFBb0IsR0FBMUIsTUFBTSxvQkFBcUIsU0FBUSx1Q0FBa0I7SUFZcEQsQUFBTixLQUFLLENBQUMsY0FBYyxDQUNMLFFBQXFELEVBQ3JELFNBQXVEO1FBRXBFLElBQUksSUFBSSxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsUUFBUSxLQUFLLG9CQUFRLENBQUMsS0FBSyxFQUFFO1lBQ3BELE1BQU0sSUFBSSwyQkFBYyxDQUFDLDJCQUEyQixDQUFDLENBQUM7U0FDdkQ7UUFDRCxPQUFPLE1BQU0sSUFBSSxDQUFDLG9CQUFvQixDQUFDLGVBQWUsQ0FBQztZQUNyRCxRQUFRO1lBQ1IsU0FBUztTQUNWLENBQUMsQ0FBQztJQUNMLENBQUM7SUFNSyxBQUFOLEtBQUssQ0FBQyxlQUFlLENBQWMsUUFBcUQsRUFDM0UsU0FBdUQsRUFBZSxRQUFnQjtRQUNqRyxJQUFJLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLFFBQVEsS0FBSyxvQkFBUSxDQUFDLEtBQUssRUFBRTtZQUNwRCxNQUFNLElBQUksMkJBQWMsQ0FBQywyQkFBMkIsQ0FBQyxDQUFDO1NBQ3ZEO1FBQ0QsT0FBTyxNQUFNLElBQUksQ0FBQyxvQkFBb0IsQ0FBQyxlQUFlLENBQUM7WUFDckQsUUFBUTtZQUNSLFNBQVM7U0FDVixFQUFFLFFBQVEsQ0FBQyxDQUFDO0lBQ2YsQ0FBQztJQU1LLEFBQU4sS0FBSyxDQUFDLGtCQUFrQixDQUFj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

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

@@ -63,7 +63,8 @@ let ShowPackageController = class ShowPackageController extends AbstractControll
         if (this.config.cnpmcore.syncMode === constants_1.SyncMode.proxy) {
             // proxy mode
             const fileType = isFullManifests ? Package_1.DIST_NAMES.FULL_MANIFESTS : Package_1.DIST_NAMES.ABBREVIATED_MANIFESTS;
-            const pkgManifest = await this.proxyCacheService.getPackageManifest(fullname, fileType);
+            const { data: sourceManifest } = await this.proxyCacheService.getProxyResponse(ctx, { dataType: 'json' });
+            const pkgManifest = this.proxyCacheService.replaceTarballUrl(sourceManifest, fileType);
             const nfsBytes = Buffer.from(JSON.stringify(pkgManifest));
             const { shasum: etag } = await (0, PackageUtil_2.calculateIntegrity)(nfsBytes);
             result = { data: pkgManifest, etag, blockReason: '' };
@@ -134,4 +135,4 @@ __decorate([
 exports.ShowPackageController = ShowPackageController = __decorate([
     (0, tegg_1.HTTPController)()
 ], ShowPackageController);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2hvd1BhY2thZ2VDb250cm9sbGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vYXBwL3BvcnQvY29udHJvbGxlci9wYWNrYWdlL1Nob3dQYWNrYWdlQ29udHJvbGxlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7QUFBQSxzQ0FRcUI7QUFDckIsOERBQTJEO0FBQzNELDZEQUFtRjtBQUNuRix1REFBK0Q7QUFDL0QsdUZBQW9GO0FBQ3BGLHFFQUFrRTtBQUNsRSx5REFBNEU7QUFDNUUsK0VBQTRFO0FBQzVFLDZEQUFpRTtBQUNqRSwwREFBMEQ7QUFHbkQsSUFBTSxxQkFBcUIsR0FBM0IsTUFBTSxxQkFBc0IsU0FBUSx1Q0FBa0I7SUFjckQsQUFBTixLQUFLLENBQUMsSUFBSSxDQUFZLEdBQWUsRUFBZSxRQUFnQjtRQUNsRSxNQUFNLENBQUUsS0FBSyxFQUFFLElBQUksQ0FBRSxHQUFHLElBQUEsNkJBQWUsRUFBQyxRQUFRLENBQUMsQ0FBQztRQUNsRCxNQUFNLE1BQU0sR0FBRyxJQUFBLDhCQUFtQixFQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQ3hDLE1BQU0sZUFBZSxHQUFHLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBRSxNQUFNLEVBQUUsaUNBQXFCLENBQUUsQ0FBQyxLQUFLLGlDQUFxQixDQUFDO1FBRWpHLGVBQWU7UUFDZixrQ0FBa0M7UUFDbEMsSUFBSTtZQUNGLE1BQU0sU0FBUyxHQUFHLE1BQU0sSUFBSSxDQUFDLFlBQVksQ0FBQyxjQUFjLENBQUMsUUFBUSxFQUFFLGVBQWUsQ0FBQyxDQUFDO1lBQ3BGLElBQUksQ0FBQyxNQUFNLElBQUksU0FBUyxFQUFFO2dCQUN4QixJQUFJLFdBQVcsR0FBRyxHQUFHLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxlQUFlLENBQUMsQ0FBQztnQkFDbkQsSUFBSSxXQUFXLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxFQUFFO29CQUNoQyxXQUFXLEdB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2hvd1BhY2thZ2VDb250cm9sbGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vYXBwL3BvcnQvY29udHJvbGxlci9wYWNrYWdlL1Nob3dQYWNrYWdlQ29udHJvbGxlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7QUFBQSxzQ0FRcUI7QUFDckIsOERBQTJEO0FBQzNELDZEQUFtRjtBQUNuRix1REFBK0Q7QUFDL0QsdUZBQW9GO0FBQ3BGLHFFQUFrRTtBQUNsRSx5REFBNEU7QUFDNUUsK0VBQTRFO0FBQzVFLDZEQUFpRTtBQUNqRSwwREFBMEQ7QUFHbkQsSUFBTSxxQkFBcUIsR0FBM0IsTUFBTSxxQkFBc0IsU0FBUSx1Q0FBa0I7SUFjckQsQUFBTixLQUFLLENBQUMsSUFBSSxDQUFZLEdBQWUsRUFBZSxRQUFnQjtRQUNsRSxNQUFNLENBQUUsS0FBSyxFQUFFLElBQUksQ0FBRSxHQUFHLElBQUEsNkJBQWUsRUFBQyxRQUFRLENBQUMsQ0FBQztRQUNsRCxNQUFNLE1BQU0sR0FBRyxJQUFBLDhCQUFtQixFQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQ3hDLE1BQU0sZUFBZSxHQUFHLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBRSxNQUFNLEVBQUUsaUNBQXFCLENBQUUsQ0FBQyxLQUFLLGlDQUFxQixDQUFDO1FBRWpHLGVBQWU7UUFDZixrQ0FBa0M7UUFDbEMsSUFBSTtZQUNGLE1BQU0sU0FBUyxHQUFHLE1BQU0sSUFBSSxDQUFDLFlBQVksQ0FBQyxjQUFjLENBQUMsUUFBUSxFQUFFLGVBQWUsQ0FBQyxDQUFDO1lBQ3BGLElBQUksQ0FBQyxNQUFNLElBQUksU0FBUyxFQUFFO2dCQUN4QixJQUFJLFdBQVcsR0FBRyxHQUFHLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxlQUFlLENBQUMsQ0FBQztnQkFDbkQsSUFBSSxXQUFXLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxFQUFFO29CQUNoQyxXQUFXLEdB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

package/package.json

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