@milaboratories/pl-drivers 1.13.0 → 1.14.0

package/src/clients/logs.ts

@@ -3,7 +3,13 @@ import type { MiLogger } from "@milaboratories/ts-helpers";
 import { notEmpty } from "@milaboratories/ts-helpers";
 import type { Dispatcher } from "undici";
 import type { WireClientProvider, WireClientProviderFactory } from "@milaboratories/pl-client";
-import { addRTypeToMetadata, createRTypeRoutingHeader, RestAPI } from "@milaboratories/pl-client";
+import {
+  addRTypeToMetadata,
+  createRTypeRoutingHeader,
+  RestAPI,
+  parseSignedResourceId,
+  signatureToBase64Url,
+} from "@milaboratories/pl-client";
 import type { StreamingAPI_Response } from "../proto-grpc/github.com/milaboratory/pl/controllers/shared/grpc/streamingapi/protocol";
 import { StreamingClient } from "../proto-grpc/github.com/milaboratory/pl/controllers/shared/grpc/streamingapi/protocol.client";
 import type { StreamingApiPaths, StreamingRestClientType } from "../proto-rest";
@@ -43,11 +49,18 @@ export class ClientLogs {
     searchStr?: string,
     options?: RpcOptions,
   ): Promise<StreamingAPI_Response> {
+    const { globalId: rIdGlobal, signature: rIdSig } = parseSignedResourceId(rId);
     const client = this.wire.get();
     if (client instanceof StreamingClient) {
       return (
         await client.lastLines(
-          { resourceId: rId, lineCount: lineCount, offset: offsetBytes, search: searchStr },
+          {
+            resourceId: rIdGlobal,
+            resourceSignature: rIdSig,
+            lineCount: lineCount,
+            offset: offsetBytes,
+            search: searchStr,
+          },
           addRTypeToMetadata(rType, options),
         )
       ).response;
@@ -56,8 +69,8 @@ export class ClientLogs {
     const resp = (
       await client.POST("/v1/last-lines", {
         body: {
-          resourceId: rId.toString(),
-          resourceSignature: "",
+          resourceId: rIdGlobal.toString(),
+          resourceSignature: signatureToBase64Url(rIdSig),
           lineCount: lineCount,
           offset: offsetBytes.toString(),
           search: searchStr ?? "",
@@ -84,13 +97,15 @@ export class ClientLogs {
     searchStr?: string,
     options?: RpcOptions,
   ): Promise<StreamingAPI_Response> {
+    const { globalId: rIdGlobal2, signature: rIdSig2 } = parseSignedResourceId(rId);
     const client = this.wire.get();
 
     if (client instanceof StreamingClient) {
       return (
         await client.readText(
           {
-            resourceId: notEmpty(rId),
+            resourceId: notEmpty(rIdGlobal2),
+            resourceSignature: rIdSig2,
             readLimit: BigInt(lineCount),
             offset: offsetBytes,
             search: searchStr,
@@ -103,8 +118,8 @@ export class ClientLogs {
     const resp = (
       await client.POST("/v1/read/text", {
         body: {
-          resourceId: rId.toString(),
-          resourceSignature: "",
+          resourceId: rIdGlobal2.toString(),
+          resourceSignature: signatureToBase64Url(rIdSig2),
           readLimit: lineCount.toString(),
           offset: offsetBytes.toString(),
           search: searchStr ?? "",

package/src/clients/ls_api.ts

@@ -1,7 +1,7 @@
 import type { MiLogger } from "@milaboratories/ts-helpers";
 import type { RpcOptions } from "@protobuf-ts/runtime-rpc";
 import type { WireClientProvider, WireClientProviderFactory } from "@milaboratories/pl-client";
-import { RestAPI } from "@milaboratories/pl-client";
+import { RestAPI, parseSignedResourceId, signatureToBase64Url } from "@milaboratories/pl-client";
 import { addRTypeToMetadata, createRTypeRoutingHeader } from "@milaboratories/pl-client";
 import type {
   LsAPI_List_Response,
@@ -42,10 +42,12 @@ export class ClientLs {
   ): Promise<LsAPI_List_Response> {
     const client = this.wire.get();
 
+    const { globalId, signature } = parseSignedResourceId(rInfo.id);
     if (client instanceof LSClient) {
       return await client.list(
         {
-          resourceId: rInfo.id,
+          resourceId: globalId,
+          resourceSignature: signature,
           location: path,
         },
         addRTypeToMetadata(rInfo.type, options),
@@ -54,8 +56,8 @@ export class ClientLs {
       const resp = (
         await client.POST("/v1/list", {
           body: {
-            resourceId: rInfo.id.toString(),
-            resourceSignature: "",
+            resourceId: globalId.toString(),
+            resourceSignature: signatureToBase64Url(signature),
             location: path,
           },
           headers: { ...createRTypeRoutingHeader(rInfo.type) },

package/src/clients/progress.ts

@@ -4,7 +4,13 @@ import type {
   WireClientProviderFactory,
   PlClient,
 } from "@milaboratories/pl-client";
-import { addRTypeToMetadata, createRTypeRoutingHeader, RestAPI } from "@milaboratories/pl-client";
+import {
+  addRTypeToMetadata,
+  createRTypeRoutingHeader,
+  RestAPI,
+  parseSignedResourceId,
+  signatureToBase64Url,
+} from "@milaboratories/pl-client";
 import type { MiLogger } from "@milaboratories/ts-helpers";
 import { notEmpty } from "@milaboratories/ts-helpers";
 import type { Dispatcher } from "undici";
@@ -53,16 +59,24 @@ export class ClientProgress {
   async getStatus({ id, type }: ResourceInfo, options?: RpcOptions): Promise<ProgressStatus> {
     const client = this.wire.get();
 
+    const { globalId, signature } = parseSignedResourceId(id);
     let report: ProgressAPI_Report;
     if (client instanceof ProgressClient) {
       report = notEmpty(
-        (await client.getStatus({ resourceId: id }, addRTypeToMetadata(type, options)).response)
-          .report,
+        (
+          await client.getStatus(
+            { resourceId: globalId, resourceSignature: signature },
+            addRTypeToMetadata(type, options),
+          ).response
+        ).report,
       );
     } else {
       const resp = (
         await client.POST("/v1/get-progress", {
-          body: { resourceId: id.toString(), resourceSignature: "" },
+          body: {
+            resourceId: globalId.toString(),
+            resourceSignature: signatureToBase64Url(signature),
+          },
           headers: { ...createRTypeRoutingHeader(type) },
         })
       ).data!.report;

package/src/clients/upload.ts

@@ -3,7 +3,13 @@ import type {
   WireClientProviderFactory,
   PlClient,
 } from "@milaboratories/pl-client";
-import { addRTypeToMetadata, createRTypeRoutingHeader, RestAPI } from "@milaboratories/pl-client";
+import {
+  addRTypeToMetadata,
+  createRTypeRoutingHeader,
+  RestAPI,
+  parseSignedResourceId,
+  signatureToBase64Url,
+} 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";
@@ -78,11 +84,16 @@ export class ClientUpload {
     checksumAlgorithm: UploadAPI_ChecksumAlgorithm;
     checksumHeader: string;
   }> {
+    const { globalId, signature } = parseSignedResourceId(id);
     const client = this.wire.get();
 
     if (client instanceof UploadClient) {
-      const init = (await client.init({ resourceId: id }, addRTypeToMetadata(type, options)))
-        .response;
+      const init = (
+        await client.init(
+          { resourceId: globalId, resourceSignature: signature },
+          addRTypeToMetadata(type, options),
+        )
+      ).response;
 
       return {
         overall: init.partsCount,
@@ -95,8 +106,8 @@ export class ClientUpload {
     const init = (
       await client.POST("/v1/upload/init", {
         body: {
-          resourceId: id.toString(),
-          resourceSignature: "",
+          resourceId: globalId.toString(),
+          resourceSignature: signatureToBase64Url(signature),
         },
         headers: { ...createRTypeRoutingHeader(type) },
       })
@@ -119,6 +130,7 @@ export class ClientUpload {
     checksumHeader: string,
     options?: RpcOptions,
   ) {
+    const { globalId, signature } = parseSignedResourceId(id);
     const client = this.wire.get();
 
     let info: UploadAPI_GetPartURL_Response;
@@ -127,7 +139,8 @@ export class ClientUpload {
       info = (
         await client.getPartURL(
           {
-            resourceId: id,
+            resourceId: globalId,
+            resourceSignature: signature,
             partNumber,
             uploadedPartSize: 0n,
             isInternalUse: false,
@@ -140,8 +153,8 @@ export class ClientUpload {
       const resp = (
         await client.POST("/v1/upload/get-part-url", {
           body: {
-            resourceId: id.toString(),
-            resourceSignature: "",
+            resourceId: globalId.toString(),
+            resourceSignature: signatureToBase64Url(signature),
             partNumber: partNumber.toString(),
             uploadedPartSize: "0",
             isInternalUse: false,
@@ -216,12 +229,14 @@ export class ClientUpload {
   }
 
   public async finalize(info: ResourceInfo, options?: RpcOptions) {
+    const { globalId, signature } = parseSignedResourceId(info.id);
     const client = this.wire.get();
 
     if (client instanceof UploadClient) {
       await client.finalize(
         {
-          resourceId: info.id,
+          resourceId: globalId,
+          resourceSignature: signature,
           checksumAlgorithm: UploadAPI_ChecksumAlgorithm.UNSPECIFIED,
           checksum: new Uint8Array(0),
         },
@@ -230,8 +245,8 @@ export class ClientUpload {
     } else {
       await client.POST("/v1/upload/finalize", {
         body: {
-          resourceId: info.id.toString(),
-          resourceSignature: "",
+          resourceId: globalId.toString(),
+          resourceSignature: signatureToBase64Url(signature),
           checksumAlgorithm: 0,
           checksum: "",
         },
@@ -258,12 +273,14 @@ export class ClientUpload {
     bytesProcessed: bigint,
     options?: RpcOptions,
   ): Promise<void> {
+    const { globalId, signature } = parseSignedResourceId(id);
     const client = this.wire.get();
 
     if (client instanceof UploadClient) {
       await client.updateProgress(
         {
-          resourceId: id,
+          resourceId: globalId,
+          resourceSignature: signature,
           bytesProcessed,
         },
         addRTypeToMetadata(type, options),
@@ -273,8 +290,8 @@ export class ClientUpload {
 
     await client.POST("/v1/upload/update-progress", {
       body: {
-        resourceId: id.toString(),
-        resourceSignature: "",
+        resourceId: globalId.toString(),
+        resourceSignature: signatureToBase64Url(signature),
         bytesProcessed: bytesProcessed.toString(),
       },
       headers: { ...createRTypeRoutingHeader(type) },

package/src/drivers/download_blob/blob_key.ts

@@ -1,15 +1,11 @@
-import { bigintToResourceId, ResourceId } from "@milaboratories/pl-client";
+import { parseSignedResourceId, SignedResourceId } from "@milaboratories/pl-client";
 import * as path from "node:path";
 
-export function blobKey(rId: ResourceId): string {
-  return `${BigInt(rId)}`;
+export function blobKey(rId: SignedResourceId): string {
+  const { globalId } = parseSignedResourceId(rId);
+  return `${globalId}`;
 }
 
 export function pathToKey(fPath: string): string {
   return path.basename(fPath);
 }
-
-export function pathToBlobInfo(fPath: string): ResourceId | undefined {
-  const base = path.basename(fPath);
-  return bigintToResourceId(BigInt(base));
-}

package/src/drivers/download_blob/download_blob.ts

@@ -1,6 +1,6 @@
 import type { ComputableCtx, ComputableStableDefined, Watcher } from "@milaboratories/computable";
 import { ChangeSource, Computable } from "@milaboratories/computable";
-import type { ResourceId, ResourceType } from "@milaboratories/pl-client";
+import type { SignedResourceId, ResourceType } from "@milaboratories/pl-client";
 import {
   isNotFoundError,
   resourceIdToString,
@@ -630,7 +630,7 @@ export class DownloadDriver implements BlobDriver, AsyncDisposable {
     this.idToProgressLog.delete(blobKey(task.rInfo.id));
   }
 
-  private async releaseOnDemandBlob(blobId: ResourceId, callerId: string) {
+  private async releaseOnDemandBlob(blobId: SignedResourceId, callerId: string) {
     const deleted = this.keyToOnDemand.get(blobKey(blobId))?.release(callerId) ?? false;
     if (deleted) this.keyToOnDemand.delete(blobKey(blobId));
   }

package/src/drivers/download_blob_url/driver.ts

@@ -5,8 +5,12 @@ import { TaskProcessor } from "@milaboratories/ts-helpers";
 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 { resourceIdToString, stringifyWithResourceId } from "@milaboratories/pl-client";
+import type { SignedResourceId } from "@milaboratories/pl-client";
+import {
+  resourceIdToString,
+  stringifyWithResourceId,
+  parseSignedResourceId,
+} from "@milaboratories/pl-client";
 import {
   type ArchiveFormat,
   type BlobToURLDriver,
@@ -150,7 +154,7 @@ export class DownloadBlobToURLDriver implements BlobToURLDriver {
 
   /** Removes a directory and aborts a downloading task when all callers
    * are not interested in it. */
-  async releasePath(id: ResourceId, format: ArchiveFormat, callerId: string): Promise<void> {
+  async releasePath(id: SignedResourceId, format: ArchiveFormat, callerId: string): Promise<void> {
     const task = this.idToDownload.get(newId(id, format));
     if (task == undefined) return;
 
@@ -224,7 +228,8 @@ export class DownloadBlobToURLDriver implements BlobToURLDriver {
     this.idToDownload.delete(newId(task.rInfo.id, task.format));
   }
 
-  private getFilePath(id: ResourceId, format: ArchiveFormat): string {
-    return path.join(this.saveDir, `${String(BigInt(id))}_${format}`);
+  private getFilePath(id: SignedResourceId, format: ArchiveFormat): string {
+    const { globalId } = parseSignedResourceId(id);
+    return path.join(this.saveDir, `${String(globalId)}_${format}`);
   }
 }

package/src/drivers/download_blob_url/driver_id.ts

@@ -1,11 +1,13 @@
-import type { ResourceId } from "@milaboratories/pl-client";
+import type { SignedResourceId } from "@milaboratories/pl-client";
+import { parseSignedResourceId } from "@milaboratories/pl-client";
 import type { ArchiveFormat } from "@milaboratories/pl-model-common";
 
 /** A key in the driver task queue. */
 export type Id = string;
 
-export function newId(id: ResourceId, format: ArchiveFormat): Id {
-  return `id:${String(BigInt(id))}-${format}`;
+export function newId(id: SignedResourceId, format: ArchiveFormat): Id {
+  const { globalId } = parseSignedResourceId(id);
+  return `id:${String(globalId)}-${format}`;
 }
 
 // export function

package/src/drivers/download_url/task.ts

@@ -56,7 +56,11 @@ export class DownloadByUrlTask {
       this.setDone(size);
       this.change.markChanged(`download of ${this.url} finished`);
     } catch (e: unknown) {
-      if (e instanceof URLAborted || isDownloadNetworkError400(e)) {
+      if (
+        e instanceof URLAborted ||
+        isDownloadNetworkError400(e) ||
+        this.signalCtl.signal.aborted
+      ) {
         this.setError(e);
         this.change.markChanged(`download of ${this.url} failed`);
         // Just in case we were half-way extracting an archive.

package/src/drivers/helpers/download_remote_handle.ts

@@ -4,19 +4,27 @@
 import type { Signer } from "@milaboratories/ts-helpers";
 import type { OnDemandBlobResourceSnapshot } from "../types";
 import type { RemoteBlobHandle } from "@milaboratories/pl-model-common";
-import { bigintToResourceId } from "@milaboratories/pl-client";
+import {
+  createSignedResourceId,
+  parseSignedResourceId,
+  signatureToBase64Url,
+  base64UrlToSignature,
+} from "@milaboratories/pl-client";
 import { ResourceInfo } from "@milaboratories/pl-tree";
 import { getSize } from "../types";
 
 // https://regex101.com/r/Q4YdTa/5
+// resourceSig segment is base64url-encoded signature (may be empty)
 const remoteHandleRegex =
-  /^blob\+remote:\/\/download\/(?<content>(?<resourceType>.+)\/(?<resourceVersion>.+?)\/(?<resourceId>\d+?)\/(?<size>\d+?))#(?<signature>.*)$/;
+  /^blob\+remote:\/\/download\/(?<content>(?<resourceType>.+)\/(?<resourceVersion>.+?)\/(?<resourceId>\d+?)\/(?<resourceSig>[A-Za-z0-9_-]*)\/(?<size>\d+?))#(?<signature>.*)$/;
 
 export function newRemoteHandle(
   rInfo: OnDemandBlobResourceSnapshot,
   signer: Signer,
 ): RemoteBlobHandle {
-  let content = `${rInfo.type.name}/${rInfo.type.version}/${BigInt(rInfo.id)}/${getSize(rInfo)}`;
+  const { globalId, signature: resourceSig } = parseSignedResourceId(rInfo.id);
+  const sigSegment = signatureToBase64Url(resourceSig);
+  let content = `${rInfo.type.name}/${rInfo.type.version}/${globalId}/${sigSegment}/${getSize(rInfo)}`;
 
   return `blob+remote://download/${content}#${signer.sign(content)}` as RemoteBlobHandle;
 }
@@ -37,13 +45,16 @@ export function parseRemoteHandle(
     throw new Error(`Remote handle is malformed: ${handle}, matches: ${parsed}`);
   }
 
-  const { content, resourceType, resourceVersion, resourceId, size, signature } = parsed.groups!;
+  const { content, resourceType, resourceVersion, resourceId, resourceSig, size, signature } =
+    parsed.groups!;
 
   signer.verify(content, signature, `Signature verification failed for ${handle}`);
 
+  const sig = resourceSig ? base64UrlToSignature(resourceSig) : undefined;
+
   return {
     info: {
-      id: bigintToResourceId(BigInt(resourceId)),
+      id: createSignedResourceId(BigInt(resourceId), sig),
       type: { name: resourceType, version: resourceVersion },
     },
     size: Number(size),

package/src/drivers/helpers/logs_handle.ts

@@ -3,14 +3,21 @@
 
 import type { ResourceInfo } from "@milaboratories/pl-tree";
 import type * as sdk from "@milaboratories/pl-model-common";
-import { bigintToResourceId } from "@milaboratories/pl-client";
+import {
+  createSignedResourceId,
+  parseSignedResourceId,
+  signatureToBase64Url,
+  base64UrlToSignature,
+} from "@milaboratories/pl-client";
 
 export function newLogHandle(live: boolean, rInfo: ResourceInfo): sdk.AnyLogHandle {
+  const { globalId, signature } = parseSignedResourceId(rInfo.id);
+  const sigSegment = signatureToBase64Url(signature);
   if (live) {
-    return `log+live://log/${rInfo.type.name}/${rInfo.type.version}/${BigInt(rInfo.id)}` as sdk.LiveLogHandle;
+    return `log+live://log/${rInfo.type.name}/${rInfo.type.version}/${globalId}/${sigSegment}` as sdk.LiveLogHandle;
   }
 
-  return `log+ready://log/${rInfo.type.name}/${rInfo.type.version}/${BigInt(rInfo.id)}` as sdk.ReadyLogHandle;
+  return `log+ready://log/${rInfo.type.name}/${rInfo.type.version}/${globalId}/${sigSegment}` as sdk.ReadyLogHandle;
 }
 
 /** Handle of the live logs of a program.
@@ -18,7 +25,7 @@ export function newLogHandle(live: boolean, rInfo: ResourceInfo): sdk.AnyLogHand
  * in this case the handle should be refreshed. */
 
 export const liveHandleRegex =
-  /^log\+live:\/\/log\/(?<resourceType>.*)\/(?<resourceVersion>.*)\/(?<resourceId>.*)$/;
+  /^log\+live:\/\/log\/(?<resourceType>.+)\/(?<resourceVersion>[^/]+)\/(?<resourceId>\d+)\/(?<resourceSig>[A-Za-z0-9_\-=]*)$/;
 
 export function isLiveLogHandle(handle: string): handle is sdk.LiveLogHandle {
   return liveHandleRegex.test(handle);
@@ -27,7 +34,7 @@ export function isLiveLogHandle(handle: string): handle is sdk.LiveLogHandle {
 /** Handle of the ready logs of a program. */
 
 export const readyHandleRegex =
-  /^log\+ready:\/\/log\/(?<resourceType>.*)\/(?<resourceVersion>.*)\/(?<resourceId>.*)$/;
+  /^log\+ready:\/\/log\/(?<resourceType>.+)\/(?<resourceVersion>.+)\/(?<resourceId>\d+)\/(?<resourceSig>[A-Za-z0-9_\-=]*)$/;
 
 export function isReadyLogHandle(handle: string): handle is sdk.ReadyLogHandle {
   return readyHandleRegex.test(handle);
@@ -43,10 +50,12 @@ export function getResourceInfoFromLogHandle(handle: sdk.AnyLogHandle): Resource
   } else throw new Error(`Log handle is malformed: ${handle}`);
   if (parsed == null) throw new Error(`Log handle wasn't parsed: ${handle}`);
 
-  const { resourceType, resourceVersion, resourceId } = parsed.groups!;
+  const { resourceType, resourceVersion, resourceId, resourceSig } = parsed.groups!;
+
+  const sig = resourceSig ? base64UrlToSignature(resourceSig) : undefined;
 
   return {
-    id: bigintToResourceId(BigInt(resourceId)),
+    id: createSignedResourceId(BigInt(resourceId), sig),
     type: { name: resourceType, version: resourceVersion },
   };
 }

package/src/drivers/helpers/ls_remote_import_handle.ts

@@ -3,11 +3,11 @@ import type { Signer } from "@milaboratories/ts-helpers";
 import { ImportFileHandleIndexData, ImportFileHandleUploadData } from "../types";
 
 export function createIndexImportHandle(
-  storageName: string,
+  storageId: string,
   path: string,
 ): sdk.ImportFileHandleIndex {
   const data: ImportFileHandleIndexData = {
-    storageId: storageName,
+    storageId: storageId,
     path: path,
   };
 

package/src/drivers/helpers/ls_storage_entry.ts

@@ -1,6 +1,6 @@
 import type * as sdk from "@milaboratories/pl-model-common";
-import type { ResourceId, ResourceType } from "@milaboratories/pl-client";
-import { bigintToResourceId } from "@milaboratories/pl-client";
+import type { ResourceType, SignedResourceId, StorageInfo } from "@milaboratories/pl-client";
+import { resourceTypeToString, parseResourceType } from "@milaboratories/pl-client";
 import { assertNever } from "@milaboratories/ts-helpers";
 
 export type StorageHandleData = RemoteStorageHandleData | LocalStorageHandleData;
@@ -45,9 +45,9 @@ function parseLocalStorageHandle(handle: string): LocalStorageHandleData {
   const { name, path } = parsed.groups!;
 
   return {
+    isRemote: false,
     rootPath: decodeURIComponent(path),
     name,
-    isRemote: false,
   };
 }
 
@@ -57,12 +57,12 @@ function parseLocalStorageHandle(handle: string): LocalStorageHandleData {
 
 export type RemoteStorageHandleData = {
   isRemote: true;
-  name: string;
-  id: ResourceId;
-  type: ResourceType;
+  storageId: string;
+  resourceType: ResourceType;
+  resourceId: SignedResourceId;
 };
 
-const remoteHandleRegex = /^remote:\/\/(?<name>.*)\/(?<resourceId>.*)$/;
+const remoteHandleRegex = /^remote:\/\/(?<storageId>.*)\/(?<resourceType>.*)\/(?<resourceId>.*)$/;
 
 export function isRemoteStorageHandle(
   handle: sdk.StorageHandle,
@@ -70,23 +70,21 @@ export function isRemoteStorageHandle(
   return remoteHandleRegex.test(handle);
 }
 
-export function createRemoteStorageHandle(name: string, rId: ResourceId): sdk.StorageHandleRemote {
-  return `remote://${name}/${BigInt(rId)}`;
+export function createRemoteStorageHandle(info: StorageInfo): sdk.StorageHandleRemote {
+  return `remote://${info.storageId}/${encodeURIComponent(resourceTypeToString(info.resourceType))}/${encodeURIComponent(info.resourceId)}`;
 }
 
 function parseRemoteStorageHandle(handle: string): RemoteStorageHandleData {
   const parsed = handle.match(remoteHandleRegex);
   if (parsed == null) throw new Error(`Remote list handle wasn't parsed: ${handle}`);
-  const { name, resourceId } = parsed.groups!;
+  const { storageId, resourceType: encodedRType, resourceId: encodedRId } = parsed.groups!;
 
+  const resourceType = parseResourceType(decodeURIComponent(encodedRType));
+  const resourceId = decodeURIComponent(encodedRId) as SignedResourceId; // lint-allow-cast
   return {
-    id: bigintToResourceId(BigInt(resourceId)),
-    type: storageType(name),
-    name,
     isRemote: true,
+    storageId,
+    resourceType: resourceType,
+    resourceId: resourceId,
   };
 }
-
-function storageType(name: string): ResourceType {
-  return { name: `LS/${name}`, version: "1" };
-}

package/src/drivers/logs_stream.ts

@@ -1,6 +1,6 @@
 import type { ComputableCtx, Watcher } from "@milaboratories/computable";
 import { ChangeSource, Computable, PollingComputableHooks } from "@milaboratories/computable";
-import type { ResourceId, ResourceType } from "@milaboratories/pl-client";
+import type { SignedResourceId, ResourceType } from "@milaboratories/pl-client";
 import {
   isNotFoundError,
   resourceIdToString,
@@ -26,10 +26,10 @@ export type LogsStreamDriverOps = PollingOps & {
 
 export class LogsStreamDriver implements sdk.LogsDriver {
   /** Holds a map of StreamManager Resource Id to all logs of this stream. */
-  private readonly idToLastLines: Map<ResourceId, LogGetter> = new Map();
+  private readonly idToLastLines: Map<SignedResourceId, LogGetter> = new Map();
 
   /** Holds a map of StreamManager Resource Id to the last log line of this stream. */
-  private readonly idToProgressLog: Map<ResourceId, LogGetter> = new Map();
+  private readonly idToProgressLog: Map<SignedResourceId, LogGetter> = new Map();
 
   /** Holds a map of StreamManager Resource Id to log id smart object. */
   private readonly hooks: PollingComputableHooks;
@@ -239,12 +239,12 @@ export class LogsStreamDriver implements sdk.LogsDriver {
     }
   }
 
-  private async releaseLastLogs(rId: ResourceId, callerId: string) {
+  private async releaseLastLogs(rId: SignedResourceId, callerId: string) {
     const deleted = this.idToLastLines.get(rId)?.release(callerId);
     if (deleted) this.idToLastLines.delete(rId);
   }
 
-  private async releaseProgressLog(rId: ResourceId, callerId: string) {
+  private async releaseProgressLog(rId: SignedResourceId, callerId: string) {
     const deleted = this.idToProgressLog.get(rId)?.release(callerId);
     if (deleted) this.idToProgressLog.delete(rId);
   }

package/src/drivers/ls.test.ts

@@ -19,8 +19,8 @@ test("should ok when get all storages from ls driver", async () => {
     const got = await driver.getStorageList();
 
     expect(got.length).toBeGreaterThanOrEqual(1);
-    expect(got.find((se) => se.name == env.libraryStorage)?.handle).toContain(env.libraryStorage);
-    expect(got.find((se) => se.name == env.libraryStorage)?.initialFullPath).toEqual("");
+    expect(got.find((se) => se.id == env.libraryStorage)?.handle).toContain(env.libraryStorage);
+    expect(got.find((se) => se.id == env.libraryStorage)?.initialFullPath).toEqual("");
     // expect(got.find((se) => se.name == 'local')?.handle).toContain('/');
     // expect(got.find((se) => se.name == 'local')?.initialFullPath).toEqual(os.homedir());
 
@@ -39,7 +39,7 @@ test("should ok when list files from remote storage in ls driver", async () => {
     const universalPath = (path: string) => (path.startsWith("/") ? path.slice(1) : path);
 
     const storages = await driver.getStorageList();
-    const library = storages.find((se) => se.name == env.libraryStorage)!.handle;
+    const library = storages.find((se) => se.id == env.libraryStorage)!.handle;
 
     const topLevelDir = await driver.listFiles(library, "");
     expect(topLevelDir.entries.length).toBeGreaterThan(1);
@@ -75,7 +75,7 @@ test("should ok when list files from local storage in ls driver", async () => {
     });
 
     const storages = await driver.getStorageList();
-    const local = storages.find((se) => se.name == "local")!;
+    const local = storages.find((se) => se.id == "local")!;
 
     const defaultDir = await driver.listFiles(local.handle, local.initialFullPath);
     expect(defaultDir.entries.length).toBeGreaterThan(1);