@teambit/objects 0.0.0-88ab80613e4bb3e2fcd1d088ecb7db90e0268b8d → 0.0.0-88c3189444012c6c8a62e2bab7a1bff09db29f89

package/models/model-component.ts

@@ -738,8 +738,8 @@ export default class Component extends BitObject {
       else
         throw new Error(`unable to add a new version for "${this.id()}" on main.
 this version started from an older version (${previouslyUsedVersion}), and not from the head (${head}).
-if this is done intentionally, please re-run with --detach-head (or --override-head if available).
-otherwise, please run "bit checkout head" to be up to date, then snap/tag your changes.`);
+please run "bit checkout head" to be up to date, then snap/tag your changes.
+if this is done intentionally, you can use --detach-head (or --override-head if available), but make sure you understand the implications as this is an experimental feature that may not be fully stable.`);
     } else {
       this.setHead(version.hash());
       this.detachedHeads.clearCurrent();
@@ -1205,6 +1205,27 @@ consider using --ignore-missing-artifacts flag if you're sure the artifacts are
     await this.setDivergeData(repo, undefined, undefined, workspaceId);
     const divergeData = this.getDivergeData();
     const localHashes = divergeData.snapsOnSourceOnly;
+
+    // When there's a detached head, divergeData only includes the detached head lineage.
+    // We also need to include unexported versions from the main head lineage.
+    const hasDetachedHead = this.detachedHeads && this.detachedHeads.getAllHeads().length > 0;
+    if (hasDetachedHead && this.head) {
+      // Calculate divergence from the main head as well
+      const mainHeadDivergeData = await getDivergeData({
+        repo,
+        modelComponent: this,
+        targetHead: (this.laneId ? this.calculatedRemoteHeadWhenOnLane : this.remoteHead) || null,
+        sourceHead: this.head,
+        throws: false,
+      });
+      // Add main head local versions that aren't already in localHashes
+      for (const hash of mainHeadDivergeData.snapsOnSourceOnly) {
+        if (!localHashes.find((h) => h.isEqual(hash))) {
+          localHashes.push(hash);
+        }
+      }
+    }
+
     if (!localHashes.length) return [];
     return localHashes.reverse(); // reverse to get the older first
   }

package/objects/object-list.ts

@@ -2,6 +2,7 @@ import tarStream from 'tar-stream';
 import { pMapPool } from '@teambit/toolbox.promise.map-pool';
 import { compact } from 'lodash';
 import { Readable, PassThrough, pipeline } from 'stream';
+import crypto from 'crypto';
 import BitObject from './object';
 import { BitObjectList } from './bit-object-list';
 import Ref from './ref';
@@ -52,6 +53,19 @@ export class ObjectList {
     return this.objects.length;
   }
 
+  /**
+   * Generates a SHA1 hash from all object buffers.
+   * Used to identify duplicate export requests during retries.
+   * Performance wise, it's not too bad. ~98ms for 150 components on CircleCI.
+   */
+  getSha1Hash(): string {
+    const hash = crypto.createHash('sha1');
+    for (const obj of this.objects) {
+      hash.update(new Uint8Array(obj.buffer));
+    }
+    return hash.digest('hex');
+  }
+
   static mergeMultipleInstances(objectLists: ObjectList[]): ObjectList {
     const objectList = new ObjectList();
     objectLists.forEach((objList) => objectList.mergeObjectList(objList));
@@ -120,7 +134,10 @@ export class ObjectList {
     const extract = tarStream.extract();
     let startData: StartFile | undefined;
     let endData: EndFile | undefined;
+    let entriesReceived = 0;
+
     extract.on('entry', (header, stream, next) => {
+      entriesReceived += 1;
       const data: Buffer[] = [];
       stream.on('data', (chunk) => {
         data.push(chunk);
@@ -154,24 +171,40 @@ export class ObjectList {
     });
 
     // not sure if needed
-    extract.on('error', (err) => {
-      passThrough.emit('error', err);
+    extract.on('error', (err: any) => {
+      logger.error(`fromTarToObjectStream tar extraction error after receiving ${entriesReceived} entries`, err);
+
+      // Enhanced error message for tar corruption with entry count
+      if (err.message?.includes('invalid tar header') || err.message?.includes('Invalid tar header')) {
+        const enhancedError = new Error(
+          `Invalid tar header after receiving ${entriesReceived} entries. Possible causes: 1) Server aborted request mid-stream, 2) Network corruption during transfer. Original error: ${err.message}`
+        );
+        enhancedError.stack = err.stack;
+        passThrough.emit('error', enhancedError);
+      } else {
+        passThrough.emit('error', err);
+      }
     });
 
     extract.on('finish', () => {
       if (startData?.schema === OBJECT_LIST_CURRENT_SCHEMA && !endData) {
         // wasn't able to find a better way to indicate whether the server aborted the request
         // see https://github.com/node-fetch/node-fetch/issues/1117
+        logger.error(
+          `fromTarToObjectStream, server terminated the stream unexpectedly. Start: ${JSON.stringify(startData)}, entries received: ${entriesReceived}`
+        );
         passThrough.emit(
           'error',
-          new Error(`server terminated the stream unexpectedly (metadata: ${JSON.stringify(startData)})`)
+          new Error(
+            `server terminated the stream unexpectedly (metadata: ${JSON.stringify(startData)}, entries received: ${entriesReceived})`
+          )
         );
       }
       passThrough.end();
     });
     pipeline(packStream, extract, (err) => {
       if (err) {
-        logger.error('fromTarToObjectStream, pipeline', err);
+        logger.error(`fromTarToObjectStream, pipeline error after ${entriesReceived} entries`, err);
         passThrough.emit('error', err);
       } else {
         logger.debug('fromTarToObjectStream, pipeline is completed');
@@ -187,19 +220,34 @@ export class ObjectList {
     logger.debug('fromObjectStreamToTar, start sending data', startFile);
     pack.entry({ name: TAR_STREAM_START_FILENAME }, JSON.stringify(startFile));
     let numOfFiles = 0;
+    let isFinalized = false;
+
     readable.on('data', (obj: ObjectItem) => {
       numOfFiles += 1;
       pack.entry({ name: ObjectList.combineScopeAndHash(obj) }, obj.buffer);
     });
     readable.on('end', () => {
+      if (isFinalized) {
+        logger.warn(`fromObjectStreamToTar (${scopeName}), received 'end' event but pack already finalized`);
+        return;
+      }
+      isFinalized = true;
       const endFile: EndFile = { numOfFiles, scopeName };
       logger.debug('fromObjectStreamToTar, finished sending data', endFile);
       pack.entry({ name: TAR_STREAM_END_FILENAME }, JSON.stringify(endFile));
       pack.finalize();
     });
     readable.on('error', (err) => {
+      if (isFinalized) {
+        logger.error(
+          `ObjectList.fromObjectStreamToTar, received error but pack already finalized. Files sent: ${numOfFiles}`,
+          err
+        );
+        return;
+      }
+      isFinalized = true;
       const errorMessage = err.message || `unexpected error (${err.name})`;
-      logger.error(`ObjectList.fromObjectStreamToTar, streaming an error as a file`, err);
+      logger.error(`ObjectList.fromObjectStreamToTar, streaming an error as a file after ${numOfFiles} files`, err);
       pack.entry({ name: TAR_STREAM_ERROR_FILENAME }, errorMessage);
       pack.finalize();
     });

package/objects/repository.ts

@@ -10,7 +10,8 @@ import { pMapPool } from '@teambit/toolbox.promise.map-pool';
 import { OBJECTS_DIR } from '@teambit/legacy.constants';
 import { logger } from '@teambit/legacy.logger';
 import type { ChownOptions, PathOsBasedAbsolute } from '@teambit/legacy.utils';
-import { glob, writeFile } from '@teambit/legacy.utils';
+import { writeFile } from '@teambit/legacy.utils';
+import { glob } from 'glob';
 import { removeEmptyDir } from '@teambit/toolbox.fs.remove-empty-dir';
 import { concurrentIOLimit } from '@teambit/harmony.modules.concurrency';
 import type { Types, ScopeJson } from '@teambit/legacy.scope';

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@teambit/objects",
-  "version": "0.0.0-88ab80613e4bb3e2fcd1d088ecb7db90e0268b8d",
+  "version": "0.0.0-88c3189444012c6c8a62e2bab7a1bff09db29f89",
   "homepage": "https://bit.cloud/teambit/scope/objects",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.scope",
     "name": "objects",
-    "version": "88ab80613e4bb3e2fcd1d088ecb7db90e0268b8d"
+    "version": "88c3189444012c6c8a62e2bab7a1bff09db29f89"
   },
   "dependencies": {
-    "@pnpm/dependency-path": "1001.1.2",
-    "@pnpm/lockfile.types": "^1002.0.1",
+    "@pnpm/dependency-path": "1001.1.7",
+    "@pnpm/lockfile.types": "^1002.0.6",
     "semver": "7.7.1",
     "lodash": "4.17.21",
     "uuid": "8.3.2",
@@ -18,45 +18,46 @@
     "p-map-series": "2.1.0",
     "tar-stream": "2.2.0",
     "fs-extra": "10.0.0",
+    "glob": "13.0.0",
     "uid-number": "0.0.6",
     "@teambit/harmony": "0.4.7",
+    "@teambit/cli": "0.0.1291",
     "@teambit/component-id": "1.2.4",
-    "@teambit/legacy.utils": "0.0.28",
+    "@teambit/legacy.utils": "0.0.31",
+    "@teambit/harmony.modules.get-basic-log": "0.0.92",
     "@teambit/bit-error": "0.0.404",
     "@teambit/component-version": "1.0.4",
+    "@teambit/component.snap-distance": "0.0.92",
+    "@teambit/config-store": "0.0.171",
     "@teambit/lane-id": "0.0.312",
-    "@teambit/legacy.cli.error": "0.0.30",
-    "@teambit/legacy.constants": "0.0.19",
-    "@teambit/legacy.logger": "0.0.30",
-    "@teambit/toolbox.crypto.sha1": "0.0.10",
+    "@teambit/legacy.cli.error": "0.0.32",
+    "@teambit/legacy.constants": "0.0.21",
+    "@teambit/legacy.logger": "0.0.32",
+    "@teambit/legacy.scope": "0.0.91",
+    "@teambit/toolbox.crypto.sha1": "0.0.12",
+    "@teambit/component.sources": "0.0.143",
     "@teambit/legacy-bit-id": "1.1.3",
-    "@teambit/legacy-component-log": "0.0.412",
-    "@teambit/pkg.modules.semver-helper": "0.0.17",
+    "@teambit/legacy-component-log": "0.0.414",
+    "@teambit/legacy.consumer-component": "0.0.92",
+    "@teambit/legacy.consumer-config": "0.0.91",
+    "@teambit/legacy.extension-data": "0.0.93",
+    "@teambit/pkg.modules.semver-helper": "0.0.19",
     "@teambit/toolbox.array.duplications-finder": "0.0.3",
     "@teambit/graph.cleargraph": "0.0.11",
-    "@teambit/bit.get-bit-version": "0.0.10",
-    "@teambit/harmony.modules.concurrency": "0.0.20",
-    "@teambit/toolbox.promise.map-pool": "0.0.9",
-    "@teambit/harmony.modules.in-memory-cache": "0.0.23",
-    "@teambit/toolbox.fs.remove-empty-dir": "0.0.8",
-    "@teambit/cli": "0.0.0-7d14187e4739b4945237e8906005a2bae28bcc9a",
-    "@teambit/harmony.modules.get-basic-log": "0.0.0-9f6db8f335ec03fc66d341a96065c96b86d0a3d8",
-    "@teambit/component.snap-distance": "0.0.0-82e6c51cb176c70c23cfb92f1cfbd6c6b547e994",
-    "@teambit/config-store": "0.0.0-c4e05245954af17ed0c4162a9d6cbf34c42cb443",
-    "@teambit/legacy.scope": "0.0.0-c32668839bcf4cb6a47ba02f7cd030b23d74bf05",
-    "@teambit/component.sources": "0.0.0-a4971b5977d69d39b1792fee1e0db9b0c0cd706a",
-    "@teambit/legacy.consumer-component": "0.0.0-14f43d8debcbec788902a51d60380f8d3621f02a",
-    "@teambit/legacy.consumer-config": "0.0.0-34a420f64c17159bf165b41daa827ce38b6136d3",
-    "@teambit/legacy.extension-data": "0.0.0-6b520eb3c957d51e9a5ddb0a128f4603247ea55c",
-    "@teambit/semantics.doc-parser": "0.0.0-26fa0bb84695ee7ced06020217b1a33c5988223c",
-    "@teambit/graph": "0.0.0-ae654f5a8955455c443956c1e9a29f7e164e95d8"
+    "@teambit/bit.get-bit-version": "0.0.12",
+    "@teambit/semantics.doc-parser": "0.0.99",
+    "@teambit/harmony.modules.concurrency": "0.0.22",
+    "@teambit/toolbox.promise.map-pool": "0.0.11",
+    "@teambit/harmony.modules.in-memory-cache": "0.0.25",
+    "@teambit/toolbox.fs.remove-empty-dir": "0.0.10",
+    "@teambit/graph": "0.0.0-026390d487bea07b6774b4c396cc309bca3e39f0"
   },
   "devDependencies": {
     "@types/semver": "7.5.8",
     "@types/lodash": "4.14.165",
     "@types/uuid": "8.3.4",
     "@types/fs-extra": "9.0.7",
-    "@teambit/harmony.envs.core-aspect-env": "0.0.79"
+    "@teambit/harmony.envs.core-aspect-env": "0.1.0"
   },
   "peerDependencies": {
     "chai": "5.2.1",