@milaboratories/pl-drivers 1.5.79 → 1.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@milaboratories/pl-drivers",
-  "version": "1.5.79",
+  "version": "1.6.0",
   "engines": {
     "node": ">=20"
   },
@@ -32,11 +32,11 @@
     "zod": "~3.23.8",
     "upath": "^2.0.1",
     "@milaboratories/ts-helpers": "^1.4.1",
-    "@milaboratories/pl-client": "^2.11.2",
-    "@milaboratories/pl-tree": "^1.6.12",
+    "@milaboratories/computable": "^2.6.0",
     "@milaboratories/helpers": "^1.6.17",
-    "@milaboratories/computable": "^2.5.1",
-    "@milaboratories/pl-model-common": "^1.15.9"
+    "@milaboratories/pl-model-common": "^1.16.0",
+    "@milaboratories/pl-client": "^2.11.2",
+    "@milaboratories/pl-tree": "^1.7.0"
   },
   "devDependencies": {
     "eslint": "^9.25.1",
@@ -47,8 +47,8 @@
     "vitest": "^2.1.9",
     "@vitest/coverage-v8": "^2.1.9",
     "@types/tar-fs": "^2.0.4",
-    "@milaboratories/eslint-config": "^1.0.4",
-    "@milaboratories/build-configs": "1.0.4"
+    "@milaboratories/build-configs": "1.0.4",
+    "@milaboratories/eslint-config": "^1.0.4"
   },
   "scripts": {
     "type-check": "tsc --noEmit --composite false",

package/src/drivers/download_blob/download_blob.ts

@@ -8,7 +8,7 @@ import {
   Computable,
 } from '@milaboratories/computable';
 import type { ResourceId, ResourceType } from '@milaboratories/pl-client';
-import { stringifyWithResourceId } from '@milaboratories/pl-client';
+import { resourceIdToString, stringifyWithResourceId } from '@milaboratories/pl-client';
 import type {
   AnyLogHandle,
   BlobDriver,
@@ -563,7 +563,7 @@ export class DownloadDriver implements BlobDriver {
 
   private removeTask(task: DownloadBlobTask, reason: string) {
     task.abort(reason);
-    task.change.markChanged();
+    task.change.markChanged(`download task for ${task.path} removed: ${reason}`);
     this.keyToDownload.delete(pathToKey(task.path));
     this.idToLastLines.delete(blobKey(task.rInfo.id));
     this.idToProgressLog.delete(blobKey(task.rInfo.id));
@@ -580,7 +580,7 @@ export class DownloadDriver implements BlobDriver {
 
     this.keyToDownload.forEach((task, key) => {
       this.keyToDownload.delete(key);
-      task.change.markChanged();
+      task.change.markChanged(`task ${resourceIdToString(task.rInfo.id)} released`);
     });
   }
 }
@@ -639,14 +639,14 @@ class LastLinesGetter {
     try {
       const newLogs = await getLastLines(this.path, this.lines, this.patternToSearch);
 
-      if (this.log != newLogs) this.change.markChanged();
+      if (this.log != newLogs) this.change.markChanged(`logs for ${this.path} updated`);
       this.log = newLogs;
     } catch (e: any) {
       if (e.name == 'RpcError' && e.code == 'NOT_FOUND') {
         // No resource
         this.log = '';
         this.error = e;
-        this.change.markChanged();
+        this.change.markChanged(`log update for ${this.path} failed, resource not found`);
         return;
       }
 

package/src/drivers/download_blob/download_blob_task.ts

@@ -19,7 +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';
+import { resourceIdToString, stringifyWithResourceId } from '@milaboratories/pl-client';
 
 /** Downloads a blob and holds callers and watchers for the blob. */
 export class DownloadBlobTask {
@@ -59,12 +59,12 @@ export class DownloadBlobTask {
     try {
       const size = await this.ensureDownloaded();
       this.setDone(size);
-      this.change.markChanged();
+      this.change.markChanged(`blob download for ${resourceIdToString(this.rInfo.id)} finished`);
     } catch (e: any) {
       this.logger.error(`download blob ${stringifyWithResourceId(this.rInfo)} failed: ${e}, state: ${JSON.stringify(this.state)}`);
       if (nonRecoverableError(e)) {
         this.setError(e);
-        this.change.markChanged();
+        this.change.markChanged(`blob download for ${resourceIdToString(this.rInfo.id)} failed`);
         // Just in case we were half-way extracting an archive.
         await fsp.rm(this.path, { force: true });
       }

package/src/drivers/download_blob_url/driver.ts

@@ -10,7 +10,7 @@ import { randomUUID } from 'node:crypto';
 import * as path from 'node:path';
 import { FilesCache } from '../helpers/files_cache';
 import type { ResourceId } from '@milaboratories/pl-client';
-import { stringifyWithResourceId } from '@milaboratories/pl-client';
+import { resourceIdToString, stringifyWithResourceId } from '@milaboratories/pl-client';
 import type { ArchiveFormat, BlobToURLDriver, FolderURL } from '@milaboratories/pl-model-common';
 import type { DownloadableBlobSnapshot } from './snapshot';
 import { makeDownloadableBlobSnapshot } from './snapshot';
@@ -215,7 +215,7 @@ export class DownloadBlobToURLDriver implements BlobToURLDriver {
 
   private removeTask(task: DownloadAndUnarchiveTask, reason: string) {
     task.abort(reason);
-    task.change.markChanged();
+    task.change.markChanged(`task for ${resourceIdToString(task.rInfo.id)} removed: ${reason}`);
     this.idToDownload.delete(newId(task.rInfo.id, task.format));
   }
 

package/src/drivers/download_blob_url/task.ts

@@ -15,7 +15,7 @@ import type { ArchiveFormat, FolderURL } from '@milaboratories/pl-model-common';
 import { newFolderURL } from './url';
 import decompress from 'decompress';
 import { assertNever } from '@protobuf-ts/runtime';
-import { stringifyWithResourceId } from '@milaboratories/pl-client';
+import { resourceIdToString, stringifyWithResourceId } from '@milaboratories/pl-client';
 
 export type URLResult = {
   url?: FolderURL;
@@ -65,7 +65,7 @@ export class DownloadAndUnarchiveTask {
     try {
       const size = await this.downloadAndDecompress(this.signalCtl.signal);
       this.setDone(size);
-      this.change.markChanged();
+      this.change.markChanged(`download and decompress for ${resourceIdToString(this.rInfo.id)} finished`);
 
       this.logger.info(`blob to URL task is done: ${stringifyWithResourceId(this.info())}`);
     } catch (e: any) {
@@ -73,7 +73,7 @@ export class DownloadAndUnarchiveTask {
 
       if (nonRecoverableError(e)) {
         this.setError(e);
-        this.change.markChanged();
+        this.change.markChanged(`download and decompress for ${resourceIdToString(this.rInfo.id)} failed`);
         // Just in case we were half-way extracting an archive.
         await rmRFDir(this.path);
         return;

package/src/drivers/download_url.ts

@@ -180,7 +180,7 @@ export class DownloadUrlDriver implements DownloadUrlSyncReader {
 
   private removeTask(task: DownloadByUrlTask, reason: string) {
     task.abort(reason);
-    task.change.markChanged();
+    task.change.markChanged(`task for url ${task.url} removed: ${reason}`);
     this.urlToDownload.delete(task.url.toString());
   }
 
@@ -224,11 +224,11 @@ class DownloadByUrlTask {
     try {
       const size = await this.downloadAndUntar(clientDownload, withGunzip, this.signalCtl.signal);
       this.setDone(size);
-      this.change.markChanged();
+      this.change.markChanged(`download of ${this.url} finished`);
     } catch (e: any) {
       if (e instanceof URLAborted || e instanceof NetworkError400) {
         this.setError(e);
-        this.change.markChanged();
+        this.change.markChanged(`download of ${this.url} failed`);
         // Just in case we were half-way extracting an archive.
         await rmRFDir(this.path);
         return;

package/src/drivers/logs_stream.ts

@@ -358,9 +358,8 @@ class LogGetter {
         this.patternToSearch,
       );
 
-      const newLogs = resp.data.toString();
-
-      if (this.logs != newLogs) this.change.markChanged();
+      const newLogs = new TextDecoder().decode(resp.data);
+      if (this.logs != newLogs) this.change.markChanged(`logs for ${resourceIdToString(this.rInfo.id)} updated`);
       this.logs = newLogs;
       this.error = undefined;
 

package/src/drivers/upload_task.ts

@@ -1,6 +1,6 @@
 import type { Watcher } from '@milaboratories/computable';
 import { ChangeSource } from '@milaboratories/computable';
-import { stringifyWithResourceId } from '@milaboratories/pl-client';
+import { resourceIdToString, stringifyWithResourceId } from '@milaboratories/pl-client';
 import type * as sdk from '@milaboratories/pl-model-common';
 import type { AsyncPoolController, MiLogger, Signer } from '@milaboratories/ts-helpers';
 import { asyncPool, CallersCounter } from '@milaboratories/ts-helpers';
@@ -78,20 +78,20 @@ export class UploadTask {
           maxSpeed: this.maxNConcurrentPartsUpload,
         },
       );
-      this.change.markChanged();
+      this.change.markChanged(`blob upload for ${resourceIdToString(this.res.id)} finished`);
     } catch (e: any) {
       this.setRetriableError(e);
 
       if (isResourceWasDeletedError(e)) {
         this.logger.warn(`resource was deleted while uploading a blob: ${e}`);
-        this.change.markChanged();
+        this.change.markChanged(`blob upload for ${resourceIdToString(this.res.id)} aborted, resource was deleted`);
         this.setDone(true);
 
         return;
       }
 
       this.logger.error(`error while uploading a blob: ${e}`);
-      this.change.markChanged();
+      this.change.markChanged(`blob upload for ${resourceIdToString(this.res.id)} failed`);
 
       if (nonRecoverableError(e)) {
         this.setTerminalError(e);
@@ -118,7 +118,7 @@ export class UploadTask {
       this.setDone(status.done);
 
       if (status.done || this.progress.status.progress != oldStatus?.progress) {
-        this.change.markChanged();
+        this.change.markChanged(`upload status for ${resourceIdToString(this.res.id)} changed`);
       }
     } catch (e: any) {
       this.setRetriableError(e);
@@ -132,7 +132,7 @@ export class UploadTask {
         this.logger.warn(
           `resource was not found while updating a status of BlobImport: ${e}, ${stringifyWithResourceId(this.res)}`,
         );
-        this.change.markChanged();
+        this.change.markChanged(`upload status for ${resourceIdToString(this.res.id)} changed, resource not found`);
         this.setDone(true);
         return;
       }