@milaboratories/pl-drivers 1.5.6 → 1.5.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@milaboratories/pl-drivers",
-  "version": "1.5.6",
+  "version": "1.5.7",
   "description": "Drivers and a low-level clients for log streaming, downloading and uploading files from and to pl",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -17,20 +17,20 @@
     "src/**/*"
   ],
   "dependencies": {
-    "@grpc/grpc-js": "^1.12.4",
+    "@grpc/grpc-js": "^1.12.5",
     "@protobuf-ts/grpc-transport": "^2.9.4",
     "@protobuf-ts/runtime": "^2.9.4",
     "@protobuf-ts/runtime-rpc": "^2.9.4",
     "@protobuf-ts/plugin": "^2.9.4",
     "denque": "^2.1.0",
     "tar-fs": "^3.0.6",
-    "undici": "^7.1.0",
+    "undici": "^7.2.0",
     "zod": "~3.23.8",
-    "@milaboratories/ts-helpers": "^1.1.3",
     "@milaboratories/computable": "^2.3.4",
+    "@milaboratories/ts-helpers": "^1.1.3",
     "@milaboratories/pl-client": "^2.7.1",
-    "@milaboratories/pl-tree": "^1.4.20",
-    "@milaboratories/pl-model-common": "^1.10.2"
+    "@milaboratories/pl-model-common": "^1.10.2",
+    "@milaboratories/pl-tree": "^1.4.20"
   },
   "devDependencies": {
     "typescript": "~5.5.4",

package/src/drivers/upload_task.ts

@@ -21,6 +21,10 @@ export class UploadTask {
   /** If failed, then getting a progress is terminally failed. */
   public failed?: boolean;
 
+  /** True if the blob was existed.
+   * At this case, the task will show progress == 1.0. */
+  private alreadyExisted = false;
+
   constructor(
     private readonly logger: MiLogger,
     private readonly clientBlob: ClientUpload,
@@ -107,10 +111,13 @@ export class UploadTask {
       const status = await this.clientProgress.getStatus(this.res);
 
       const oldStatus = this.progress.status;
-      this.progress.status = protoToStatus(status);
+      const newStatus = doneProgressIfExisted(this.alreadyExisted, protoToStatus(status));
+      this.progress.status = newStatus;
       this.setDone(status.done);
 
-      if (status.done || status.progress != oldStatus?.progress) this.change.markChanged();
+      if (status.done || this.progress.status.progress != oldStatus?.progress) {
+        this.change.markChanged();
+      }
     } catch (e: any) {
       this.setRetriableError(e);
 
@@ -147,7 +154,10 @@ export class UploadTask {
   }
 
   public setDoneIfOutputSet(res: ImportResourceSnapshot) {
-    if (isImportResourceOutputSet(res)) this.setDone(true);
+    if (isImportResourceOutputSet(res)) {
+      this.setDone(true);
+      this.alreadyExisted = true;
+    }
   }
 
   private setDone(done: boolean) {
@@ -239,6 +249,23 @@ function protoToStatus(proto: ProgressStatus): sdk.ImportStatus {
   };
 }
 
+/** Special hack: if we didn't even start to upload the blob
+  * to backend because the result was already there,
+  * the backend does show us a status that nothing were uploaded,
+  * but we need to show the client that everything is OK.
+  * Thus, here we set progress to be 1.0 and all bytes are become processed. */
+function doneProgressIfExisted(alreadyExisted: boolean, status: sdk.ImportStatus) {
+  if (alreadyExisted && status.bytesTotal != 0 && status.bytesProcessed == 0) {
+    return {
+      progress: 1.0,
+      bytesProcessed: Number(status.bytesTotal),
+      bytesTotal: Number(status.bytesTotal)
+    };
+  }
+
+  return status;
+}
+
 export function isResourceWasDeletedError(e: any) {
   return (
     e.name == 'RpcError' &&