@milaboratories/pl-middle-layer 1.11.6 → 1.12.0

package/dist/pool/driver.d.ts

@@ -7,6 +7,8 @@ export declare class PFrameDriver implements SdkPFrameDriver {
     private readonly pFrames;
     private readonly pTables;
     private readonly blobContentCache;
+    /** Limits concurrent requests to PFrame API to prevent deadlock with Node's IO threads */
+    private readonly concurrencyLimiter;
     constructor(blobDriver: DownloadDriver);
     createPFrame(def: PFrameDef<PlTreeNodeAccessor>, ctx: ComputableCtx): PFrameHandle;
     createPTable(def: PTableDef<PColumn<PlTreeNodeAccessor>>, ctx: ComputableCtx): PTableHandle;

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,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,OAAO,EAAE,kBAAkB,EAAgB,MAAM,yBAAyB,CAAC;AAC3E,OAAO,EAAE,aAAa,EAA2B,MAAM,4BAA4B,CAAC;AACpF,OAAO,EACL,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,EAEP,SAAS,EACT,SAAS,EACT,SAAS,EAEV,MAAM,sBAAsB,CAAC;AAuF9B,qBAAa,YAAa,YAAW,eAAe;IAKtC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAJvC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAyD;IACjF,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAsE;IAC9F,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAA+B;gBAEnC,UAAU,EAAE,cAAc;IA8ChD,YAAY,CAAC,GAAG,EAAE,SAAS,CAAC,kBAAkB,CAAC,EAAE,GAAG,EAAE,aAAa,GAAG,YAAY;IAOlF,YAAY,CACjB,GAAG,EAAE,SAAS,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC,EAC3C,GAAG,EAAE,aAAa,GACjB,YAAY;IAYF,WAAW,CACtB,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,mBAAmB,CAAC;IAelB,aAAa,CAAC,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC;IAI9E,WAAW,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAI9D,kBAAkB,CAC7B,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,yBAAyB,CAAC,SAAS,CAAC,GAC5C,OAAO,CAAC,0BAA0B,CAAC;IAsBzB,eAAe,CAC1B,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC,oBAAoB,CAAC;IAQnB,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;CAI3B;AA+CD,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,KAAK,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAI/E"}
+{"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../src/pool/driver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,OAAO,EAAE,kBAAkB,EAAgB,MAAM,yBAAyB,CAAC;AAC3E,OAAO,EAAE,aAAa,EAA2B,MAAM,4BAA4B,CAAC;AACpF,OAAO,EACL,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,EAEP,SAAS,EACT,SAAS,EACT,SAAS,EAEV,MAAM,sBAAsB,CAAC;AAwF9B,qBAAa,YAAa,YAAW,eAAe;IAOtC,OAAO,CAAC,QAAQ,CAAC,UAAU;IANvC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAyD;IACjF,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAsE;IAC9F,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAA+B;IAChE,0FAA0F;IAC1F,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA8B;gBAEpC,UAAU,EAAE,cAAc;IAmDhD,YAAY,CAAC,GAAG,EAAE,SAAS,CAAC,kBAAkB,CAAC,EAAE,GAAG,EAAE,aAAa,GAAG,YAAY;IAOlF,YAAY,CACjB,GAAG,EAAE,SAAS,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC,EAC3C,GAAG,EAAE,aAAa,GACjB,YAAY;IAYF,WAAW,CACtB,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,mBAAmB,CAAC;IAiBlB,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;IA6BzB,eAAe,CAC1B,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC,oBAAoB,CAAC;IAUnB,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;AA+CD,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,KAAK,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAI/E"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@milaboratories/pl-middle-layer",
-  "version": "1.11.6",
+  "version": "1.12.0",
   "description": "Pl Middle Layer",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -19,7 +19,7 @@
   "keywords": [],
   "license": "UNLICENSED",
   "dependencies": {
-    "@milaboratories/pframes-node": "^1.5.10",
+    "@milaboratories/pframes-node": "^1.6.0",
     "canonicalize": "^2.0.0",
     "denque": "^2.1.0",
     "lru-cache": "^11.0.1",
@@ -28,19 +28,19 @@
     "utility-types": "^3.11.0",
     "yaml": "^2.5.1",
     "zod": "^3.23.8",
-    "@milaboratories/computable": "^2.1.12",
     "@milaboratories/resolve-helper": "^1.0.1",
-    "@platforma-sdk/block-tools": "^2.3.13",
-    "@milaboratories/pl-client": "^2.5.0",
+    "@platforma-sdk/block-tools": "^2.3.14",
+    "@milaboratories/computable": "^2.1.13",
+    "@milaboratories/pl-client": "^2.5.1",
+    "@milaboratories/pl-drivers": "^1.2.33",
     "@milaboratories/pl-model-common": "^1.3.14",
-    "@milaboratories/pl-drivers": "^1.2.32",
-    "@milaboratories/pl-model-middle-layer": "^1.4.5",
+    "@milaboratories/pl-model-middle-layer": "^1.5.0",
+    "@milaboratories/pl-tree": "^1.4.2",
     "@platforma-sdk/model": "^1.5.40",
-    "@milaboratories/ts-helpers": "^1.0.30",
-    "@milaboratories/pl-tree": "^1.4.1",
-    "@platforma-sdk/workflow-tengo": "1.4.2",
-    "@milaboratories/pl-config": "^1.2.6",
-    "@milaboratories/pl-local": "^1.2.5"
+    "@milaboratories/ts-helpers": "^1.1.0",
+    "@milaboratories/pl-config": "^1.2.7",
+    "@milaboratories/pl-local": "^1.2.6",
+    "@platforma-sdk/workflow-tengo": "1.4.2"
   },
   "devDependencies": {
     "typescript": "~5.5.4",

package/src/pool/driver.ts

@@ -35,6 +35,7 @@ import canonicalize from 'canonicalize';
 import { PFrame } from '@milaboratories/pframes-node';
 import * as fsp from 'node:fs/promises';
 import { LRUCache } from 'lru-cache';
+import { ConcurrencyLimitingExecutor } from '@milaboratories/ts-helpers';
 
 function blobKey(res: ResourceInfo): string {
   return String(res.id);
@@ -117,6 +118,8 @@ export class PFrameDriver implements SdkPFrameDriver {
   private readonly pFrames: RefCountResourcePool<InternalPFrameData, PFrameHolder>;
   private readonly pTables: RefCountResourcePool<FullPTableDef, Promise<PFrameInternal.PTable>>;
   private readonly blobContentCache: LRUCache<string, Uint8Array>;
+  /** Limits concurrent requests to PFrame API to prevent deadlock with Node's IO threads */
+  private readonly concurrencyLimiter: ConcurrencyLimitingExecutor;
 
   constructor(private readonly blobDriver: DownloadDriver) {
     const blobContentCache = new LRUCache<string, Uint8Array>({
@@ -124,7 +127,9 @@ export class PFrameDriver implements SdkPFrameDriver {
       fetchMethod: async (key) => await fsp.readFile(key),
       sizeCalculation: (v) => v.length
     });
+    const concurrencyLimiter = new ConcurrencyLimitingExecutor(2);
     this.blobContentCache = blobContentCache;
+    this.concurrencyLimiter = concurrencyLimiter;
     this.pFrames = new (class extends RefCountResourcePool<InternalPFrameData, PFrameHolder> {
       constructor(private readonly blobDriver: DownloadDriver) {
         super();
@@ -148,10 +153,13 @@ export class PFrameDriver implements SdkPFrameDriver {
       }
       protected async createNewResource(params: FullPTableDef): Promise<PFrameInternal.PTable> {
         const pFrame = this.pFrames.getByKey(params.pFrameHandle);
-        const rawPTable = await pFrame.pFrame.createTable({
-          src: joinEntryToInternal(params.def.src),
-          filters: params.def.filters
-        });
+        const rawPTable = await concurrencyLimiter.run(
+          async () =>
+            await pFrame.pFrame.createTable({
+              src: joinEntryToInternal(params.def.src),
+              filters: params.def.filters
+            })
+        );
         return params.def.sorting.length !== 0 ? rawPTable.sort(params.def.sorting) : rawPTable;
       }
       protected calculateParamsKey(params: FullPTableDef): string {
@@ -198,37 +206,50 @@ export class PFrameDriver implements SdkPFrameDriver {
           : []
     };
     return {
-      hits: (await this.pFrames.getByKey(handle).pFrame.findColumns(iRequest)).hits.map(
-        (h) => h.hit
-      )
+      hits: (
+        await this.concurrencyLimiter.run(
+          async () => await this.pFrames.getByKey(handle).pFrame.findColumns(iRequest)
+        )
+      ).hits.map((h) => h.hit)
     };
   }
 
   public async getColumnSpec(handle: PFrameHandle, columnId: PObjectId): Promise<PColumnSpec> {
-    return this.pFrames.getByKey(handle).pFrame.getColumnSpec(columnId);
+    return await this.concurrencyLimiter.run(
+      async () => await this.pFrames.getByKey(handle).pFrame.getColumnSpec(columnId)
+    );
   }
 
   public async listColumns(handle: PFrameHandle): Promise<PColumnIdAndSpec[]> {
-    return this.pFrames.getByKey(handle).pFrame.listColumns();
+    return await this.concurrencyLimiter.run(
+      async () => await this.pFrames.getByKey(handle).pFrame.listColumns()
+    );
   }
 
   public async calculateTableData(
     handle: PFrameHandle,
     request: CalculateTableDataRequest<PObjectId>
   ): Promise<CalculateTableDataResponse> {
-    let table = await this.pFrames.getByKey(handle).pFrame.createTable({
-      src: joinEntryToInternal(request.src),
-      filters: request.filters
-    });
+    let table = await this.concurrencyLimiter.run(
+      async () =>
+        await this.pFrames.getByKey(handle).pFrame.createTable({
+          src: joinEntryToInternal(request.src),
+          filters: request.filters
+        })
+    );
 
     if (request.sorting.length > 0) {
-      const sortedTable = await table.sort(request.sorting);
+      const sortedTable = await this.concurrencyLimiter.run(
+        async () => await table.sort(request.sorting)
+      );
       table.dispose();
       table = sortedTable;
     }
 
     const spec = table.getSpec();
-    const data = await table.getData([...spec.keys()]);
+    const data = await this.concurrencyLimiter.run(
+      async () => await table.getData([...spec.keys()])
+    );
     table.dispose();
 
     return spec.map((spec, i) => ({
@@ -241,7 +262,9 @@ export class PFrameDriver implements SdkPFrameDriver {
     handle: PFrameHandle,
     request: UniqueValuesRequest
   ): Promise<UniqueValuesResponse> {
-    return await this.pFrames.getByKey(handle).pFrame.getUniqueValues(request);
+    return await this.concurrencyLimiter.run(
+      async () => await this.pFrames.getByKey(handle).pFrame.getUniqueValues(request)
+    );
   }
 
   //
@@ -249,13 +272,13 @@ export class PFrameDriver implements SdkPFrameDriver {
   //
 
   public async getShape(handle: PTableHandle): Promise<PTableShape> {
-    const pTable = await this.pTables.getByKey(handle);
+    const pTable = await this.pTables.getByKey(handle); // internally concurrency limited
     return pTable.getShape();
   }
 
   public async getSpec(handle: PTableHandle): Promise<PTableColumnSpec[]> {
-    const pTable = await this.pTables.getByKey(handle);
-    return pTable.getSpec();
+    const pTable = await this.pTables.getByKey(handle); // internally concurrency limited
+    return pTable.getSpec(); // sync operation
   }
 
   public async getData(
@@ -263,8 +286,10 @@ export class PFrameDriver implements SdkPFrameDriver {
     columnIndices: number[],
     range?: TableRange
   ): Promise<PTableVector[]> {
-    const pTable = await this.pTables.getByKey(handle);
-    return pTable.getData(columnIndices, range);
+    const pTable = await this.pTables.getByKey(handle); // internally concurrency limited
+    return await this.concurrencyLimiter.run(
+      async () => await pTable.getData(columnIndices, range)
+    );
   }
 }