revert #4600 (#4623)

verdaccio · May 5, 2024 · 7400830 · 7400830
1 parent f83c157
commit 7400830
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 189 deletions.
diff --git a/.changeset/poor-seals-turn.md b/.changeset/poor-seals-turn.md
@@ -0,0 +1,6 @@
+---
+'@verdaccio/tarball': patch
+'@verdaccio/store': patch
+---
+
+revert #4600
diff --git a/packages/core/tarball/package.json b/packages/core/tarball/package.json
@@ -37,9 +37,7 @@
     "@verdaccio/url": "workspace:12.0.0-next-7.14",
     "@verdaccio/utils": "workspace:7.0.0-next-7.14",
     "debug": "4.3.4",
-    "gunzip-maybe": "^1.4.2",
-    "lodash": "4.17.21",
-    "tar-stream": "^3.1.7"
+    "lodash": "4.17.21"
   },
   "devDependencies": {
     "@verdaccio/types": "workspace:12.0.0-next.2",

diff --git a/packages/core/tarball/src/getTarballDetails.ts b/packages/core/tarball/src/getTarballDetails.ts
diff --git a/packages/core/tarball/src/index.ts b/packages/core/tarball/src/index.ts
@@ -5,6 +5,5 @@ export {
   convertDistVersionToLocalTarballsUrl,
 } from './convertDistRemoteToLocalTarballUrls';
 export { extractTarballFromUrl, getLocalRegistryTarballUri } from './getLocalRegistryTarballUri';
-export { TarballDetails, getTarballDetails } from './getTarballDetails';
 
 export { RequestOptions };
diff --git a/packages/core/tarball/tests/assets/tarball.tar b/packages/core/tarball/tests/assets/tarball.tar
diff --git a/packages/core/tarball/tests/assets/tarball.tgz b/packages/core/tarball/tests/assets/tarball.tgz
diff --git a/packages/core/tarball/tests/getTarballDetails.spec.ts b/packages/core/tarball/tests/getTarballDetails.spec.ts
diff --git a/packages/store/src/storage.ts b/packages/store/src/storage.ts
@@ -34,11 +34,9 @@ import {
 } from '@verdaccio/proxy';
 import Search from '@verdaccio/search';
 import {
-  TarballDetails,
   convertDistRemoteToLocalTarballUrls,
   convertDistVersionToLocalTarballsUrl,
   extractTarballFromUrl,
-  getTarballDetails,
 } from '@verdaccio/tarball';
 import {
   AbbreviatedManifest,
@@ -1046,8 +1044,6 @@ class Storage {
     // at this point document is either created or existed before
     const [firstAttachmentKey] = Object.keys(_attachments);
     const buffer = this.getBufferManifest(body._attachments[firstAttachmentKey].data as string);
-    const readable = Readable.from(buffer);
-    const tarballStats = await this.getTarballStats(versions[versionToPublish], readable);
 
     try {
       // we check if package exist already locally
@@ -1086,7 +1082,7 @@ class Storage {
           _.isNil(manifest.readme) === false ? String(manifest.readme) : '';
       }
       // addVersion will move the readme from the the published version to the root level
-      await this.addVersion(name, versionToPublish, versions[versionToPublish], null, tarballStats);
+      await this.addVersion(name, versionToPublish, versions[versionToPublish], null);
     } catch (err: any) {
       logger.error({ err: err.message }, 'updated version has failed: @{err}');
       debug('error on create a version for %o with error %o', name, err.message);
@@ -1114,6 +1110,7 @@ class Storage {
 
     // 3. upload the tarball to the storage
     try {
+      const readable = Readable.from(buffer);
       await this.uploadTarball(name, basename(firstAttachmentKey), readable, {
         signal: options.signal,
       });
@@ -1286,8 +1283,7 @@ class Storage {
     name: string,
     version: string,
     metadata: Version,
-    tag: StringValue,
-    tarballStats: TarballDetails
+    tag: StringValue
   ): Promise<void> {
     debug(`add version %s package for %s`, version, name);
     await this.updatePackage(name, async (data: Manifest): Promise<Manifest> => {
@@ -1299,12 +1295,6 @@ class Storage {
       metadata.contributors = normalizeContributors(metadata.contributors as Author[]);
       debug('%s` contributors normalized', name);
 
-      // Update tarball stats
-      if (metadata.dist) {
-        metadata.dist.fileCount = tarballStats.fileCount;
-        metadata.dist.unpackedSize = tarballStats.unpackedSize;
-      }
-
       // if uploaded tarball has a different shasum, it's very likely that we
       // have some kind of error
       if (validatioUtils.isObject(metadata.dist) && _.isString(metadata.dist.tarball)) {
@@ -1915,25 +1905,6 @@ class Storage {
       return cacheManifest;
     }
   }
-
-  private async getTarballStats(version: Version, readable: Readable): Promise<TarballDetails> {
-    if (
-      version.dist == undefined ||
-      version.dist?.fileCount == undefined ||
-      version.dist?.unpackedSize == undefined
-    ) {
-      debug('tarball stats not found, calculating');
-      try {
-        return await getTarballDetails(readable);
-      } catch (err: any) {
-        logger.error({ err: err.message }, 'getting tarball details has failed: @{err}');
-        throw err;
-      }
-    } else {
-      debug('tarball stats found');
-      return { fileCount: version.dist.fileCount, unpackedSize: version.dist.unpackedSize };
-    }
-  }
 }
 
 export { Storage };
diff --git a/packages/store/test/storage.spec.ts b/packages/store/test/storage.spec.ts
@@ -262,12 +262,10 @@ describe('storage', () => {
         expect(manifestVersion._id).toEqual(`${pkgName}@1.0.1`);
         expect(manifestVersion.description).toEqual('package generated');
         expect(manifestVersion.dist).toEqual({
-          fileCount: 4,
           integrity:
             'sha512-6gHiERpiDgtb3hjqpQH5/i7zRmvYi9pmCjQf2ZMy3QEa9wVk9RgdZaPWUt7ZOnWUPFjcr9cmE6dUBf+XoPoH4g==',
           shasum: '2c03764f651a9f016ca0b7620421457b619151b9',
           tarball: 'http://localhost:5555/upstream/-/upstream-1.0.1.tgz',
-          unpackedSize: 543,
         });
 
         expect(manifestVersion.contributors).toEqual([]);