@milaboratories/pl-middle-layer 1.58.4 → 1.59.1

package/src/network_check/template.ts

@@ -3,8 +3,8 @@ import {
   type PlTransaction,
   ContinuePolling,
   field,
-  isNotNullResourceId,
-  isNullResourceId,
+  isNotNullSignedResourceId,
+  isNullSignedResourceId,
   Pl,
   poll,
   toGlobalFieldId,
@@ -315,7 +315,7 @@ export async function downloadFromEveryStorage(
         ops.minLsRequests,
       );
       if (result.file === undefined) {
-        results[storage.name] = {
+        results[storage.id] = {
           status: "warn",
           message:
             `No file between ${ops.minFileSize} and ${ops.maxFileSize} bytes ` +
@@ -345,14 +345,14 @@ export async function downloadFromEveryStorage(
         ) as string;
 
         if (workdirTypeName?.startsWith("WorkingDirectory")) {
-          results[storage.name] = {
+          results[storage.id] = {
             status: "ok",
             message:
               `Workdir creation succeeded, size of file: ${result.file?.size}, ` +
               `checked ${result.nCheckedFiles} files, did ${result.nLsRequests} ls requests`,
           };
         } else {
-          results[storage.name] = {
+          results[storage.id] = {
             status: "failed",
             message:
               `Workdir creation failed: ${workdirTypeName}, size of file: ${result.file?.size}, ` +
@@ -494,7 +494,7 @@ async function runTemplate(
     const outputsIds: Record<string, FieldId> = {};
 
     for (const output of outputs) {
-      const fieldRef = field(client.clientRoot, output);
+      const fieldRef = field(client.clientRoot, output) as FieldId;
       tx.createField(fieldRef, "Dynamic", outputFields[output]);
       outputsIds[output] = await toGlobalFieldId(fieldRef);
     }
@@ -512,12 +512,12 @@ async function getFieldValue(client: PlClient, fieldId: FieldId): Promise<Resour
 
   return await poll(client, async (tx) => {
     const field = await tx.tx.getField(fieldId);
-    if (isNotNullResourceId(field.error)) {
+    if (isNotNullSignedResourceId(field.error)) {
       const err = await tx.tx.getResourceData(field.error, true);
       throw new Error(`getFieldValue of "${fieldId.fieldName}" field failed: ${err.data}`);
     }
 
-    if (isNullResourceId(field.value)) {
+    if (isNullSignedResourceId(field.value)) {
       throw new ContinuePolling();
     }
 

package/src/pool/data.ts

@@ -12,12 +12,13 @@ import {
 import { makeResourceSnapshot, type PlTreeNodeAccessor } from "@milaboratories/pl-tree";
 import canonicalize from "canonicalize";
 import {
-  isNullResourceId,
+  anyResourceIdToBigint,
+  isNullSignedResourceId,
   resourceIdToString,
   resourceType,
   resourceTypeToString,
   resourceTypesEqual,
-  type ResourceId,
+  type SignedResourceId,
   type ResourceType,
 } from "@milaboratories/pl-client";
 import type { Writable } from "utility-types";
@@ -40,7 +41,7 @@ import { OnDemandBlobResourceSnapshot } from "@milaboratories/pl-drivers";
  */
 export class BlobResourceRef {
   constructor(
-    public readonly resourceInfo: { readonly id: ResourceId; readonly type: ResourceType },
+    public readonly resourceInfo: { readonly id: SignedResourceId; readonly type: ResourceType },
     /** Present only for on-demand (remote) blobs; needed for size and signed handle. */
     public readonly onDemandSnapshot: OnDemandBlobResourceSnapshot | undefined,
   ) {}
@@ -324,7 +325,8 @@ export function traverseParquetChunkResource(
 export function deriveLegacyPObjectId(spec: PObjectSpec, data: PlTreeNodeAccessor): PObjectId {
   const hash = createHash("sha256");
   hash.update(canonicalize(spec)!);
-  hash.update(String(!isNullResourceId(data.originalId) ? data.originalId : data.id));
+  const rid = !isNullSignedResourceId(data.originalId) ? data.originalId : data.id;
+  hash.update(String(anyResourceIdToBigint(rid)));
   return hash.digest().toString("hex") as PObjectId;
 }
 

package/src/pool/driver.ts

@@ -36,9 +36,11 @@ import {
   traverseParquetChunkResource,
 } from "./data";
 import { isDownloadNetworkError400 } from "@milaboratories/pl-drivers";
+import { parseSignedResourceId } from "@milaboratories/pl-client";
 
 function makeBlobId(res: BlobResourceRef): PFrameInternal.PFrameBlobId {
-  return String(res.resourceInfo.id) as PFrameInternal.PFrameBlobId;
+  const { globalId } = parseSignedResourceId(res.resourceInfo.id);
+  return String(globalId) as PFrameInternal.PFrameBlobId;
 }
 
 type LocalBlob = ComputableStableDefined<LocalBlobHandleAndSize>;