@milaboratories/pl-drivers 1.5.71 → 1.5.72

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@milaboratories/pl-drivers",
-  "version": "1.5.71",
+  "version": "1.5.72",
   "engines": {
     "node": ">=20"
   },
@@ -32,11 +32,11 @@
     "zod": "~3.23.8",
     "upath": "^2.0.1",
     "@milaboratories/helpers": "^1.6.14",
+    "@milaboratories/pl-tree": "^1.6.10",
+    "@milaboratories/pl-model-common": "^1.15.5",
     "@milaboratories/ts-helpers": "^1.4.0",
     "@milaboratories/computable": "^2.5.0",
-    "@milaboratories/pl-tree": "^1.6.10",
-    "@milaboratories/pl-client": "^2.11.1",
-    "@milaboratories/pl-model-common": "^1.15.5"
+    "@milaboratories/pl-client": "^2.11.1"
   },
   "devDependencies": {
     "eslint": "^9.25.1",

package/src/clients/download.ts

@@ -1,6 +1,6 @@
 /* eslint-disable n/no-unsupported-features/node-builtins */
 import type { GrpcClientProvider, GrpcClientProviderFactory } from '@milaboratories/pl-client';
-import { addRTypeToMetadata } from '@milaboratories/pl-client';
+import { addRTypeToMetadata, stringifyWithResourceId } from '@milaboratories/pl-client';
 import type { ResourceInfo } from '@milaboratories/pl-tree';
 import type { MiLogger } from '@milaboratories/ts-helpers';
 import type { RpcOptions } from '@protobuf-ts/runtime-rpc';
@@ -55,7 +55,7 @@ export class ClientDownload {
     const { downloadUrl, headers } = await this.grpcGetDownloadUrl(info, options, signal);
 
     const remoteHeaders = toHeadersMap(headers, fromBytes, toBytes);
-    this.logger.info(`download blob from url ${downloadUrl}, headers: ${JSON.stringify(remoteHeaders)}`);
+    this.logger.info(`download blob ${stringifyWithResourceId(info)} from url ${downloadUrl}, headers: ${JSON.stringify(remoteHeaders)}`);
 
     return isLocal(downloadUrl)
       ? await this.readLocalFile(downloadUrl, fromBytes, toBytes)

package/src/drivers/download_blob/download_blob_task.ts

@@ -19,6 +19,7 @@ import { Writable } from 'node:stream';
 import type { ClientDownload } from '../../clients/download';
 import { UnknownStorageError, WrongLocalFileUrl } from '../../clients/download';
 import { NetworkError400 } from '../../helpers/download';
+import { stringifyWithResourceId } from '@milaboratories/pl-client';
 
 /** Downloads a blob and holds callers and watchers for the blob. */
 export class DownloadBlobTask {
@@ -60,7 +61,7 @@ export class DownloadBlobTask {
       this.setDone(size);
       this.change.markChanged();
     } catch (e: any) {
-      this.logger.error(`task failed: ${e}, ${JSON.stringify(this.state)}`);
+      this.logger.error(`download blob ${stringifyWithResourceId(this.rInfo)} failed: ${e}, state: ${JSON.stringify(this.state)}`);
       if (nonRecoverableError(e)) {
         this.setError(e);
         this.change.markChanged();
@@ -73,15 +74,21 @@ export class DownloadBlobTask {
   }
 
   private async ensureDownloaded() {
+    this.signalCtl.signal.throwIfAborted();
+
     this.state = {};
     this.state.filePath = this.path;
     await ensureDirExists(path.dirname(this.state.filePath));
+    this.signalCtl.signal.throwIfAborted();
     this.state.dirExists = true;
 
-    if (await fileExists(this.state.filePath)) {
+    const alreadyExists = await fileExists(this.state.filePath);
+    this.signalCtl.signal.throwIfAborted();
+    if (alreadyExists) {
       this.state.fileExists = true;
       this.logger.info(`a blob was already downloaded: ${this.state.filePath}`);
       const stat = await fsp.stat(this.state.filePath);
+      this.signalCtl.signal.throwIfAborted();
       this.state.fileSize = stat.size;
 
       return this.state.fileSize;
@@ -90,14 +97,14 @@ export class DownloadBlobTask {
     const { content, size } = await this.clientDownload.downloadBlob(
       this.rInfo,
       {},
-      undefined,
+      this.signalCtl.signal,
     );
     this.state.fileSize = size;
     this.state.downloaded = true;
 
     await createPathAtomically(this.logger, this.state.filePath, async (fPath: string) => {
       const f = Writable.toWeb(fs.createWriteStream(fPath, { flags: 'wx' }));
-      await content.pipeTo(f);
+      await content.pipeTo(f, { signal: this.signalCtl.signal });
       this.state.tempWritten = true;
     });