@milaboratories/pl-middle-layer 1.26.2 → 1.26.3

package/dist/pool/driver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../src/pool/driver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAEjE,OAAO,KAAK,EAAE,kBAAkB,EAAgB,MAAM,yBAAyB,CAAC;AAEhF,OAAO,KAAK,EAAE,aAAa,EAA2B,MAAM,4BAA4B,CAAC;AACzF,OAAO,KAAK,EACV,yBAAyB,EACzB,0BAA0B,EAC1B,kBAAkB,EAClB,mBAAmB,EAEnB,gBAAgB,EAChB,WAAW,EACX,YAAY,EACZ,SAAS,EACT,gBAAgB,EAChB,YAAY,EACZ,WAAW,EACX,YAAY,EACZ,UAAU,EACV,mBAAmB,EACnB,oBAAoB,EACpB,YAAY,IAAI,eAAe,EAC/B,OAAO,EACP,SAAS,EAET,SAAS,EAIT,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAS9C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAqI3D,qBAAa,YAAa,YAAW,eAAe;IAQhD,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,MAAM;IARzB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAyD;IACjF,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAwE;IAChG,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAA+B;IAChE,0FAA0F;IAC1F,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA8B;gBAG9C,UAAU,EAAE,cAAc,EAC1B,MAAM,EAAE,QAAQ;IAmE5B,YAAY,CACjB,GAAG,EAAE,SAAS,CAAC,kBAAkB,GAAG,aAAa,CAAC,EAClD,GAAG,EAAE,aAAa,GACjB,YAAY;IAaR,YAAY,CACjB,GAAG,EAAE,SAAS,CAAC,OAAO,CAAC,kBAAkB,GAAG,aAAa,CAAC,CAAC,EAC3D,GAAG,EAAE,aAAa,GACjB,YAAY;IAmBF,WAAW,CACtB,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,mBAAmB,CAAC;IAsBlB,aAAa,CAAC,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC;IAM9E,WAAW,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAM9D,kBAAkB,CAC7B,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,yBAAyB,CAAC,SAAS,CAAC,GAC5C,OAAO,CAAC,0BAA0B,CAAC;IAgCzB,eAAe,CAC1B,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC,oBAAoB,CAAC;IAiBnB,QAAQ,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,WAAW,CAAC;IAKpD,OAAO,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAK1D,OAAO,CAClB,MAAM,EAAE,YAAY,EACpB,aAAa,EAAE,MAAM,EAAE,EACvB,KAAK,CAAC,EAAE,UAAU,GACjB,OAAO,CAAC,YAAY,EAAE,CAAC;CAM3B"}
+{"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../src/pool/driver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAEjE,OAAO,KAAK,EAAE,kBAAkB,EAAgB,MAAM,yBAAyB,CAAC;AAEhF,OAAO,KAAK,EAAE,aAAa,EAA2B,MAAM,4BAA4B,CAAC;AACzF,OAAO,KAAK,EACV,yBAAyB,EACzB,0BAA0B,EAC1B,kBAAkB,EAClB,mBAAmB,EAEnB,gBAAgB,EAChB,WAAW,EACX,YAAY,EACZ,SAAS,EACT,gBAAgB,EAChB,YAAY,EACZ,WAAW,EACX,YAAY,EACZ,UAAU,EACV,mBAAmB,EACnB,oBAAoB,EACpB,YAAY,IAAI,eAAe,EAC/B,OAAO,EACP,SAAS,EAET,SAAS,EAIT,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAS9C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAuK3D,qBAAa,YAAa,YAAW,eAAe;IAQhD,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,MAAM;IARzB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAyD;IACjF,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAwE;IAChG,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAA+B;IAChE,0FAA0F;IAC1F,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA8B;gBAG9C,UAAU,EAAE,cAAc,EAC1B,MAAM,EAAE,QAAQ;IAoE5B,YAAY,CACjB,GAAG,EAAE,SAAS,CAAC,kBAAkB,GAAG,aAAa,CAAC,EAClD,GAAG,EAAE,aAAa,GACjB,YAAY;IAaR,YAAY,CACjB,GAAG,EAAE,SAAS,CAAC,OAAO,CAAC,kBAAkB,GAAG,aAAa,CAAC,CAAC,EAC3D,GAAG,EAAE,aAAa,GACjB,YAAY;IAmBF,WAAW,CACtB,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,mBAAmB,CAAC;IAsBlB,aAAa,CAAC,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC;IAM9E,WAAW,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAM9D,kBAAkB,CAC7B,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,yBAAyB,CAAC,SAAS,CAAC,GAC5C,OAAO,CAAC,0BAA0B,CAAC;IAiCzB,eAAe,CAC1B,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC,oBAAoB,CAAC;IAkBnB,QAAQ,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,WAAW,CAAC;IAKpD,OAAO,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAK1D,OAAO,CAClB,MAAM,EAAE,YAAY,EACpB,aAAa,EAAE,MAAM,EAAE,EACvB,KAAK,CAAC,EAAE,UAAU,GACjB,OAAO,CAAC,YAAY,EAAE,CAAC;CAM3B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@milaboratories/pl-middle-layer",
-  "version": "1.26.2",
+  "version": "1.26.3",
   "description": "Pl Middle Layer",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -29,14 +29,14 @@
     "yaml": "^2.6.1",
     "zod": "~3.23.8",
     "@milaboratories/pl-http": "^1.0.3",
-    "@milaboratories/computable": "^2.3.4",
-    "@milaboratories/resolve-helper": "^1.0.2",
-    "@milaboratories/pl-client": "^2.7.3",
     "@platforma-sdk/block-tools": "^2.5.7",
     "@milaboratories/pl-drivers": "^1.5.11",
-    "@milaboratories/pl-model-backend": "^1.0.1",
+    "@milaboratories/pl-client": "^2.7.3",
+    "@milaboratories/computable": "^2.3.4",
+    "@milaboratories/resolve-helper": "^1.0.2",
     "@milaboratories/pl-model-middle-layer": "^1.7.1",
     "@milaboratories/pl-tree": "^1.4.22",
+    "@milaboratories/pl-model-backend": "^1.0.1",
     "@milaboratories/ts-helpers": "^1.1.3",
     "@milaboratories/pl-model-common": "^1.10.4",
     "@platforma-sdk/model": "^1.22.2",

package/src/pool/driver.ts

@@ -80,46 +80,80 @@ function migrateFilters(filters: PTableRecordFilter[]): PTableRecordSingleValueF
 const bigintReplacer = (_: string, v: unknown) => (typeof v === 'bigint' ? v.toString() : v);
 
 class PFrameHolder implements PFrameInternal.PFrameDataSource, Disposable {
-  public readonly pFrame;
+  public readonly specPFrame: PFrameInternal.PFrameV2;
   private readonly blobIdToResource = new Map<string, ResourceInfo>();
   private readonly blobHandleComputables = new Map<
     string,
     ComputableStableDefined<LocalBlobHandleAndSize>
   >();
 
+  private readonly createDataPFrame: () => PFrameInternal.PFrameV2;
+  public get disposableDataPFrame() {
+    const dataPFrame = this.createDataPFrame();
+    return {
+      dataPFrame,
+      [Symbol.dispose]: () => {
+        dataPFrame.dispose();
+      },
+    };
+  }
+
   constructor(
     private readonly blobDriver: DownloadDriver,
     private readonly logger: MiLogger,
     private readonly blobContentCache: LRUCache<string, Uint8Array>,
     private readonly columns: InternalPFrameData,
   ) {
-    // pframe initialization
-    this.pFrame = new PFrame(
-      (level: 'info' | 'warn' | 'error', message: string) => {
-        switch (level) {
-          default:
-          case 'info':
-            return this.logger.info(message);
-          case 'warn':
-            return this.logger.warn(message);
-          case 'error':
-            return this.logger.error(message);
-        }
-      },
-    );
-    this.pFrame.setDataSource(this);
+    const logFunc: PFrameInternal.Logger = (level: 'info' | 'warn' | 'error', message: string) => {
+      switch (level) {
+        default:
+        case 'info':
+          return this.logger.info(message);
+        case 'warn':
+          return this.logger.warn(message);
+        case 'error':
+          return this.logger.error(message);
+      }
+    };
+
     for (const column of columns) {
-      for (const blob of allBlobs(column.data)) this.blobIdToResource.set(blobKey(blob), blob);
-      const dataInfo = mapBlobs(column.data, blobKey);
-      try {
-        this.pFrame.addColumnSpec(column.id, column.spec);
-        this.pFrame.setColumnData(column.id, dataInfo);
-      } catch (err: unknown) {
-        throw new Error(
-          `Adding column ${column.id} to PFrame failed: ${err as Error}; Spec: ${JSON.stringify(column.spec)}, DataInfo: ${JSON.stringify(dataInfo)}.`,
-        );
+      for (const blob of allBlobs(column.data)) {
+        this.blobIdToResource.set(blobKey(blob), blob);
       }
     }
+
+    const createSpecPFrame = (): PFrameInternal.PFrameV2 => {
+      const pFrame = new PFrame(getDebugFlags().logPFrameRequests ? logFunc : undefined);
+      for (const column of columns) {
+        try {
+          pFrame.addColumnSpec(column.id, column.spec);
+        } catch (err: unknown) {
+          throw new Error(
+            `Adding column ${column.id} to PFrame failed: ${err as Error}; Spec: ${JSON.stringify(column.spec)}.`,
+          );
+        }
+      }
+      return pFrame;
+    };
+
+    const createDataPFrame = (): PFrameInternal.PFrameV2 => {
+      const pFrame = createSpecPFrame();
+      pFrame.setDataSource(this);
+      for (const column of columns) {
+        const dataInfo = mapBlobs(column.data, blobKey);
+        try {
+          pFrame.setColumnData(column.id, dataInfo);
+        } catch (err: unknown) {
+          throw new Error(
+            `Setting column ${column.id} data to PFrame failed: ${err as Error}; Spec: ${JSON.stringify(column.spec)}, DataInfo: ${JSON.stringify(dataInfo)}.`,
+          );
+        }
+      }
+      return pFrame;
+    };
+
+    this.specPFrame = createSpecPFrame();
+    this.createDataPFrame = createDataPFrame;
   }
 
   private getOrCreateComputableForBlob(blobId: string) {
@@ -161,7 +195,7 @@ class PFrameHolder implements PFrameInternal.PFrameDataSource, Disposable {
 
   [Symbol.dispose](): void {
     for (const computable of this.blobHandleComputables.values()) computable.resetState();
-    this.pFrame.dispose();
+    this.specPFrame.dispose();
   }
 }
 
@@ -222,13 +256,14 @@ export class PFrameDriver implements SdkPFrameDriver {
       }
 
       protected async createNewResource(params: FullPTableDef): Promise<PFrameInternal.PTableV2> {
-        const pFrame = this.pFrames.getByKey(params.pFrameHandle);
+        const handle: PFrameHandle = params.pFrameHandle;
         const rawPTable = await concurrencyLimiter.run(async () => {
           if (getDebugFlags().logPFrameRequests)
             logger.info(
               `PTable creation (pTableHandle = ${this.calculateParamsKey(params)}): ${JSON.stringify(params, bigintReplacer)}`,
             );
-          return await pFrame.pFrame.createTable({
+          using disposableDataPFrame = this.pFrames.getByKey(handle).disposableDataPFrame;
+          return await disposableDataPFrame.dataPFrame.createTable({
             src: joinEntryToInternal(params.def.src),
             filters: migrateFilters(params.def.filters),
           });
@@ -296,7 +331,7 @@ export class PFrameDriver implements SdkPFrameDriver {
           : [],
     };
     const responce = await this.concurrencyLimiter.run(
-      async () => await this.pFrames.getByKey(handle).pFrame.findColumns(iRequest),
+      async () => await this.pFrames.getByKey(handle).specPFrame.findColumns(iRequest),
     );
     return {
       hits: responce.hits
@@ -311,13 +346,13 @@ export class PFrameDriver implements SdkPFrameDriver {
 
   public async getColumnSpec(handle: PFrameHandle, columnId: PObjectId): Promise<PColumnSpec> {
     return await this.concurrencyLimiter.run(
-      async () => await this.pFrames.getByKey(handle).pFrame.getColumnSpec(columnId),
+      async () => await this.pFrames.getByKey(handle).specPFrame.getColumnSpec(columnId),
     );
   }
 
   public async listColumns(handle: PFrameHandle): Promise<PColumnIdAndSpec[]> {
     return await this.concurrencyLimiter.run(
-      async () => await this.pFrames.getByKey(handle).pFrame.listColumns(),
+      async () => await this.pFrames.getByKey(handle).specPFrame.listColumns(),
     );
   }
 
@@ -330,7 +365,8 @@ export class PFrameDriver implements SdkPFrameDriver {
         this.logger.info(
           `Call calculateTableData, handle = ${handle}, request = ${JSON.stringify(request, bigintReplacer)}`,
         );
-      return await this.pFrames.getByKey(handle).pFrame.createTable({
+      using disposableDataPFrame = this.pFrames.getByKey(handle).disposableDataPFrame;
+      return await disposableDataPFrame.dataPFrame.createTable({
         src: joinEntryToInternal(request.src),
         filters: migrateFilters(request.filters),
       });
@@ -365,7 +401,8 @@ export class PFrameDriver implements SdkPFrameDriver {
         this.logger.info(
           `Call getUniqueValues, handle = ${handle}, request = ${JSON.stringify(request, bigintReplacer)}`,
         );
-      return await this.pFrames.getByKey(handle).pFrame.getUniqueValues({
+      using disposableDataPFrame = this.pFrames.getByKey(handle).disposableDataPFrame;
+      return await disposableDataPFrame.dataPFrame.getUniqueValues({
         ...request,
         filters: migrateFilters(request.filters),
       });