@verdaccio/tarball 13.0.0-next-8.1 → 13.0.0-next-8.3

package/.babelrc

@@ -5,7 +5,7 @@
       "@babel/env",
       {
         "targets": {
-          "node": 12
+          "node": 18
         }
       }
     ],

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # Change Log
 
+## 13.0.0-next-8.3
+
+### Patch Changes
+
+- 5cfbc14: fix(api): add logging when requesting tarball
+  - @verdaccio/core@8.0.0-next-8.3
+  - @verdaccio/url@13.0.0-next-8.3
+  - @verdaccio/utils@8.1.0-next-8.3
+
+## 13.0.0-next-8.2
+
+### Minor Changes
+
+- 6a8154c: feat: update logger pino to latest
+
+### Patch Changes
+
+- Updated dependencies [6a8154c]
+  - @verdaccio/core@8.0.0-next-8.2
+  - @verdaccio/url@13.0.0-next-8.2
+  - @verdaccio/utils@7.1.0-next-8.2
+
 ## 13.0.0-next-8.1
 
 ### Patch Changes

package/build/getLocalRegistryTarballUri.js

@@ -20,8 +20,7 @@ function extractTarballFromUrl(url) {
  * @return {String} a parsed url
  */
 function getLocalRegistryTarballUri(uri, pkgName, requestOptions, urlPrefix) {
-  var _requestOptions$heade;
-  const currentHost = requestOptions === null || requestOptions === void 0 || (_requestOptions$heade = requestOptions.headers) === null || _requestOptions$heade === void 0 ? void 0 : _requestOptions$heade.host;
+  const currentHost = requestOptions?.headers?.host;
   if (!currentHost) {
     return uri;
   }

package/build/getLocalRegistryTarballUri.js.map

@@ -1 +1 @@
-{"version":3,"file":"getLocalRegistryTarballUri.js","names":["_debug","_interopRequireDefault","require","_url","_url2","e","__esModule","default","debug","buildDebug","extractTarballFromUrl","url","URL","parse","pathname","replace","getLocalRegistryTarballUri","uri","pkgName","requestOptions","urlPrefix","_requestOptions$heade","currentHost","headers","host","tarballName","domainRegistry","getPublicUrl"],"sources":["../src/getLocalRegistryTarballUri.ts"],"sourcesContent":["import buildDebug from 'debug';\nimport URL from 'url';\n\nimport { RequestOptions } from '@verdaccio/url';\nimport { getPublicUrl } from '@verdaccio/url';\n\nconst debug = buildDebug('verdaccio:core:url');\n\nexport function extractTarballFromUrl(url: string): string {\n  // @ts-ignore\n  return URL.parse(url).pathname.replace(/^.*\\//, '');\n}\n/**\n * Filter a tarball url.\n * @param {*} uri\n * @return {String} a parsed url\n */\nexport function getLocalRegistryTarballUri(\n  uri: string,\n  pkgName: string,\n  requestOptions: RequestOptions,\n  urlPrefix: string | void\n): string {\n  const currentHost = requestOptions?.headers?.host;\n\n  if (!currentHost) {\n    return uri;\n  }\n  const tarballName = extractTarballFromUrl(uri);\n  debug('tarball name %o', tarballName);\n  // header only set with proxy that setup with HTTPS\n  const domainRegistry = getPublicUrl(urlPrefix || '', requestOptions);\n\n  return `${domainRegistry}${pkgName}/-/${tarballName}`;\n}\n"],"mappings":";;;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,IAAA,GAAAF,sBAAA,CAAAC,OAAA;AAGA,IAAAE,KAAA,GAAAF,OAAA;AAA8C,SAAAD,uBAAAI,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAE9C,MAAMG,KAAK,GAAG,IAAAC,cAAU,EAAC,oBAAoB,CAAC;AAEvC,SAASC,qBAAqBA,CAACC,GAAW,EAAU;EACzD;EACA,OAAOC,YAAG,CAACC,KAAK,CAACF,GAAG,CAAC,CAACG,QAAQ,CAACC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;AACrD;AACA;AACA;AACA;AACA;AACA;AACO,SAASC,0BAA0BA,CACxCC,GAAW,EACXC,OAAe,EACfC,cAA8B,EAC9BC,SAAwB,EAChB;EAAA,IAAAC,qBAAA;EACR,MAAMC,WAAW,GAAGH,cAAc,aAAdA,cAAc,gBAAAE,qBAAA,GAAdF,cAAc,CAAEI,OAAO,cAAAF,qBAAA,uBAAvBA,qBAAA,CAAyBG,IAAI;EAEjD,IAAI,CAACF,WAAW,EAAE;IAChB,OAAOL,GAAG;EACZ;EACA,MAAMQ,WAAW,GAAGf,qBAAqB,CAACO,GAAG,CAAC;EAC9CT,KAAK,CAAC,iBAAiB,EAAEiB,WAAW,CAAC;EACrC;EACA,MAAMC,cAAc,GAAG,IAAAC,kBAAY,EAACP,SAAS,IAAI,EAAE,EAAED,cAAc,CAAC;EAEpE,OAAO,GAAGO,cAAc,GAAGR,OAAO,MAAMO,WAAW,EAAE;AACvD","ignoreList":[]}
+{"version":3,"file":"getLocalRegistryTarballUri.js","names":["_debug","_interopRequireDefault","require","_url","_url2","e","__esModule","default","debug","buildDebug","extractTarballFromUrl","url","URL","parse","pathname","replace","getLocalRegistryTarballUri","uri","pkgName","requestOptions","urlPrefix","currentHost","headers","host","tarballName","domainRegistry","getPublicUrl"],"sources":["../src/getLocalRegistryTarballUri.ts"],"sourcesContent":["import buildDebug from 'debug';\nimport URL from 'url';\n\nimport { RequestOptions } from '@verdaccio/url';\nimport { getPublicUrl } from '@verdaccio/url';\n\nconst debug = buildDebug('verdaccio:core:url');\n\nexport function extractTarballFromUrl(url: string): string {\n  // @ts-ignore\n  return URL.parse(url).pathname.replace(/^.*\\//, '');\n}\n/**\n * Filter a tarball url.\n * @param {*} uri\n * @return {String} a parsed url\n */\nexport function getLocalRegistryTarballUri(\n  uri: string,\n  pkgName: string,\n  requestOptions: RequestOptions,\n  urlPrefix: string | void\n): string {\n  const currentHost = requestOptions?.headers?.host;\n\n  if (!currentHost) {\n    return uri;\n  }\n  const tarballName = extractTarballFromUrl(uri);\n  debug('tarball name %o', tarballName);\n  // header only set with proxy that setup with HTTPS\n  const domainRegistry = getPublicUrl(urlPrefix || '', requestOptions);\n\n  return `${domainRegistry}${pkgName}/-/${tarballName}`;\n}\n"],"mappings":";;;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,IAAA,GAAAF,sBAAA,CAAAC,OAAA;AAGA,IAAAE,KAAA,GAAAF,OAAA;AAA8C,SAAAD,uBAAAI,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAE9C,MAAMG,KAAK,GAAG,IAAAC,cAAU,EAAC,oBAAoB,CAAC;AAEvC,SAASC,qBAAqBA,CAACC,GAAW,EAAU;EACzD;EACA,OAAOC,YAAG,CAACC,KAAK,CAACF,GAAG,CAAC,CAACG,QAAQ,CAACC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;AACrD;AACA;AACA;AACA;AACA;AACA;AACO,SAASC,0BAA0BA,CACxCC,GAAW,EACXC,OAAe,EACfC,cAA8B,EAC9BC,SAAwB,EAChB;EACR,MAAMC,WAAW,GAAGF,cAAc,EAAEG,OAAO,EAAEC,IAAI;EAEjD,IAAI,CAACF,WAAW,EAAE;IAChB,OAAOJ,GAAG;EACZ;EACA,MAAMO,WAAW,GAAGd,qBAAqB,CAACO,GAAG,CAAC;EAC9CT,KAAK,CAAC,iBAAiB,EAAEgB,WAAW,CAAC;EACrC;EACA,MAAMC,cAAc,GAAG,IAAAC,kBAAY,EAACN,SAAS,IAAI,EAAE,EAAED,cAAc,CAAC;EAEpE,OAAO,GAAGM,cAAc,GAAGP,OAAO,MAAMM,WAAW,EAAE;AACvD","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@verdaccio/tarball",
-  "version": "13.0.0-next-8.1",
+  "version": "13.0.0-next-8.3",
   "description": "tarball utilities resolver",
   "keywords": [
     "private",
@@ -19,7 +19,7 @@
   "license": "MIT",
   "homepage": "https://verdaccio.org",
   "engines": {
-    "node": ">=14"
+    "node": ">=18"
   },
   "repository": {
     "type": "https",
@@ -33,16 +33,16 @@
     "access": "public"
   },
   "dependencies": {
-    "@verdaccio/core": "8.0.0-next-8.1",
-    "@verdaccio/url": "13.0.0-next-8.1",
-    "@verdaccio/utils": "7.0.1-next-8.1",
+    "@verdaccio/core": "8.0.0-next-8.3",
+    "@verdaccio/url": "13.0.0-next-8.3",
+    "@verdaccio/utils": "8.1.0-next-8.3",
     "debug": "4.3.7",
     "gunzip-maybe": "^1.4.2",
     "lodash": "4.17.21",
     "tar-stream": "^3.1.7"
   },
   "devDependencies": {
-    "@verdaccio/types": "13.0.0-next-8.0",
+    "@verdaccio/types": "13.0.0-next-8.1",
     "node-mocks-http": "1.14.1"
   },
   "funding": {

package/tests/convertDistRemoteToLocalTarballUrls.spec.ts

@@ -78,3 +78,41 @@ describe('convertDistRemoteToLocalTarballUrls', () => {
     );
   });
 });
+
+describe('convertDistRemoteToLocalTarballUrls - scoped', () => {
+  const fakeHost = 'fake.com';
+  const buildURI = (host, version) => `http://${host}/@org/npm_test/-/npm_test-${version}.tgz`;
+  const cloneMetadata = (pkg = metadata) => Object.assign({}, pkg);
+  const metadata: any = {
+    name: '@org/npm_test',
+    versions: {
+      '1.0.0': {
+        dist: {
+          tarball: 'http://registry.org/@org/npm_test/-/npm_test-1.0.0.tgz',
+        },
+      },
+      '1.0.1': {
+        dist: {
+          tarball: 'http://registry.org/@org/npm_test/-/npm_test-1.0.1.tgz',
+        },
+      },
+    },
+  };
+  test('should build a URI for dist tarball based on new domain', () => {
+    const req = httpMocks.createRequest({
+      method: 'GET',
+      headers: {
+        host: fakeHost,
+        [HEADERS.FORWARDED_PROTO]: 'http',
+      },
+      url: '/',
+    });
+    const convertDist = convertDistRemoteToLocalTarballUrls(cloneMetadata(), {
+      host: req.hostname,
+      headers: req.headers as any,
+      protocol: req.protocol,
+    });
+    expect(convertDist.versions['1.0.0'].dist.tarball).toEqual(buildURI(fakeHost, '1.0.0'));
+    expect(convertDist.versions['1.0.1'].dist.tarball).toEqual(buildURI(fakeHost, '1.0.1'));
+  });
+});

package/tests/getLocalRegistryTarballUri.spec.ts

@@ -21,6 +21,11 @@ describe('extractTarballFromUrl', () => {
           tarball: 'https://localhost/npm_test-1.0.2.tgz',
         },
       },
+      '1.0.3': {
+        dist: {
+          tarball: 'http://registry.org/@org/npm_test/-/npm_test-1.0.3.tgz',
+        },
+      },
     },
   };
 
@@ -34,5 +39,8 @@ describe('extractTarballFromUrl', () => {
     expect(extractTarballFromUrl(metadata.versions['1.0.2'].dist.tarball)).toEqual(
       'npm_test-1.0.2.tgz'
     );
+    expect(extractTarballFromUrl(metadata.versions['1.0.3'].dist.tarball)).toEqual(
+      'npm_test-1.0.3.tgz'
+    );
   });
 });