@milaboratories/pl-drivers 1.3.3 → 1.3.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@milaboratories/pl-drivers",
-  "version": "1.3.3",
+  "version": "1.3.4",
   "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",
@@ -26,11 +26,11 @@
     "tar-fs": "^3.0.6",
     "undici": "^6.19.8",
     "zod": "^3.23.8",
-    "@milaboratories/pl-tree": "^1.4.5",
     "@milaboratories/ts-helpers": "^1.1.0",
-    "@milaboratories/pl-model-common": "^1.4.0",
-    "@milaboratories/pl-client": "^2.5.4",
-    "@milaboratories/computable": "^2.2.0"
+    "@milaboratories/computable": "^2.2.0",
+    "@milaboratories/pl-tree": "^1.4.5",
+    "@milaboratories/pl-model-common": "^1.5.0",
+    "@milaboratories/pl-client": "^2.5.4"
   },
   "devDependencies": {
     "typescript": "~5.5.4",

package/src/drivers/ls.test.ts

@@ -19,7 +19,6 @@ test('should ok when get all storages from ls driver', async () => {
       logger,
       client,
       signer,
-      await DefaultVirtualLocalStorages(),
       [],
       () => {
         throw Error();
@@ -46,7 +45,6 @@ test('should ok when list files from remote storage in ls driver', async () => {
       logger,
       client,
       signer,
-      await DefaultVirtualLocalStorages(),
       [],
       () => {
         throw Error();
@@ -88,7 +86,6 @@ test('should ok when list files from local storage in ls driver', async () => {
       logger,
       client,
       signer,
-      await DefaultVirtualLocalStorages(),
       [],
       () => {
         throw Error();
@@ -112,7 +109,6 @@ test('should ok when list files from local storage in ls driver and correctly ap
       logger,
       client,
       signer,
-      await DefaultVirtualLocalStorages(),
       [{ storageId: 'test_storage', localPath: path.join(assetsPath, 'ls_dir_structure_test') }],
       async () => [dialogRet]
     );
@@ -154,7 +150,6 @@ test('should ok when get file using local dialog, and read its content', async (
       logger,
       client,
       signer,
-      await DefaultVirtualLocalStorages(),
       [],
       async () => [path.join(assetsPath, 'answer_to_the_ultimate_question.txt')]
     );

package/src/drivers/ls.ts

@@ -27,6 +27,7 @@ import {
 import { LocalStorageProjection, VirtualLocalStorageSpec } from './types';
 import { createLsFilesClient } from '../clients/helpers';
 import { validateAbsolute } from '../helpers/validate';
+import { DefaultVirtualLocalStorages } from './virtual_storages';
 
 /**
  * Extends public and safe SDK's driver API with methods used internally in the middle
@@ -161,8 +162,7 @@ export class LsDriver implements InternalLsDriver {
     const virtualStorages = [...this.virtualStoragesMap.values()].map((s) => ({
       name: s.name,
       handle: createLocalStorageHandle(s.name, s.root),
-      initialFullPath: s.initialPath,
-      isInitialPathHome: s.isInitialPathHome
+      initialFullPath: s.initialPath
     }));
 
     const otherStorages = Object.entries(this.storageIdToResourceId!).map(
@@ -234,13 +234,15 @@ export class LsDriver implements InternalLsDriver {
     logger: MiLogger,
     client: PlClient,
     signer: Signer,
-    virtualStorages: VirtualLocalStorageSpec[],
     /** Pl storages available locally */
     localProjections: LocalStorageProjection[],
-    openFileDialogCallback: OpenFileDialogCallback
+    openFileDialogCallback: OpenFileDialogCallback,
+    virtualStorages?: VirtualLocalStorageSpec[]
   ): Promise<LsDriver> {
     const lsClient = createLsFilesClient(client, logger);
 
+    if (!virtualStorages) virtualStorages = await DefaultVirtualLocalStorages();
+
     // validating inputs
     for (const vp of virtualStorages) validateAbsolute(vp.root);
     for (const lp of localProjections) if (lp.localPath !== '') validateAbsolute(lp.localPath);

package/src/drivers/types.ts

@@ -50,7 +50,4 @@ export type VirtualLocalStorageSpec = {
 
   /** Used as hint to UI controls to, set as initial path during browsing */
   readonly initialPath: string;
-
-  /** Shows if the initial path is home, so this storage should be chosen by default. */
-  readonly isInitialPathHome: boolean;
 };

package/src/drivers/virtual_storages.ts

@@ -11,34 +11,31 @@ export async function DefaultVirtualLocalStorages(): Promise<VirtualLocalStorage
       {
         name: 'local',
         root: '/',
-        initialPath: home,
-        isInitialPathHome: true
+        initialPath: home
       }
     ];
+  else {
+    // determine the drive on which user's home folder is stored
+    const homeRoot = path.parse(home).root; // e.g. C:\
+    const homeDrive = homeRoot.replaceAll(':\\', ''); // e.g. C drive.
 
-  const homeRoot = path.parse(home).root; // e.g. C:\
-  const homeDrive = homeRoot.replaceAll(':\\', ''); // e.g. C drive.
-  const wmic = await util.promisify(exec)('wmic logicaldisk get name');
-  const drives = windowsDrives(wmic.stdout);
+    // code below inspired by
+    // https://stackoverflow.com/a/52411712/769192
 
-  return windowsStorages(drives, homeDrive, home);
-}
-
-export function windowsDrives(wmicStdout: string): string[] {
-  return wmicStdout
-    .split('\r\n')
-    .filter((line) => line.includes(':'))
-    .map((line) => line.trim().replaceAll(':', ''));
-}
+    const wmic = await util.promisify(exec)('wmic logicaldisk get name');
+    // parsing wmic output
+    const drives = wmic.stdout
+      .split('\r\n')
+      .filter((line) => line.includes(':'))
+      .map((line) => line.trim().replaceAll(':', ''));
 
-export function windowsStorages(drives: string[], homeDrive: string, home: string) {
-  return drives.map((d) => {
-    const isInitialPathHome = d == homeDrive;
-    return {
-      name: `local_disk_${d}`,
-      root: `${d}:\\`,
-      initialPath: isInitialPathHome ? home : `${d}:\\`,
-      isInitialPathHome
-    };
-  });
+    return drives.map((drive) => {
+      const isHomeDrive = drive == homeDrive;
+      return {
+        name: `local_disk_${drive}`,
+        root: `${drive}:\\`,
+        initialPath: isHomeDrive ? home : `${drive}:\\`
+      }
+    });
+  }
 }