@milaboratories/pl-middle-layer 1.43.60 → 1.43.63

package/dist/worker/workerApi.js

@@ -9,7 +9,9 @@ const workerApi = {
         const t1 = performance.now();
         const result = parseTemplate(payload);
         const t2 = performance.now();
-        console.info(`>>>> parseTemplate in worker took ${t2 - t1}ms`);
+        const dt = t2 - t1;
+        if (dt > 100)
+            console.warn(`parseTemplate in worker took ${dt}ms`);
         return result;
     },
 };

package/dist/worker/workerApi.js.map

@@ -1 +1 @@
-{"version":3,"file":"workerApi.js","sources":["../../src/worker/workerApi.ts"],"sourcesContent":["/* eslint-disable @typescript-eslint/require-await */\nimport { parseTemplate } from '@milaboratories/pl-model-backend';\n\n/**\n * Add there all heavy synchronous operations that can be moved to the worker thread.\n */\nexport const workerApi = {\n  parseTemplate: async (payload: Uint8Array) => {\n    const t1 = performance.now();\n    const result = parseTemplate(payload);\n    const t2 = performance.now();\n    console.info(`>>>> parseTemplate in worker took ${t2 - t1}ms`);\n    return result;\n  },\n} satisfies Record<string, (...args: any[]) => Promise<unknown>>;\n\ntype ToScheme<T extends Record<string, (...args: any[]) => any>> = {\n  [K in keyof T]: {\n    args: Parameters<T[K]>;\n    response: Awaited<ReturnType<T[K]>>;\n  };\n};\n\nexport type Scheme = ToScheme<typeof workerApi>;\n"],"names":[],"mappings":";;AAAA;AAGA;;AAEG;AACI,MAAM,SAAS,GAAG;AACvB,IAAA,aAAa,EAAE,OAAO,OAAmB,KAAI;AAC3C,QAAA,MAAM,EAAE,GAAG,WAAW,CAAC,GAAG,EAAE;AAC5B,QAAA,MAAM,MAAM,GAAG,aAAa,CAAC,OAAO,CAAC;AACrC,QAAA,MAAM,EAAE,GAAG,WAAW,CAAC,GAAG,EAAE;QAC5B,OAAO,CAAC,IAAI,CAAC,CAAA,kCAAA,EAAqC,EAAE,GAAG,EAAE,CAAA,EAAA,CAAI,CAAC;AAC9D,QAAA,OAAO,MAAM;IACf,CAAC;;;;;"}
+{"version":3,"file":"workerApi.js","sources":["../../src/worker/workerApi.ts"],"sourcesContent":["/* eslint-disable @typescript-eslint/require-await */\nimport { parseTemplate } from '@milaboratories/pl-model-backend';\n\n/**\n * Add there all heavy synchronous operations that can be moved to the worker thread.\n */\nexport const workerApi = {\n  parseTemplate: async (payload: Uint8Array) => {\n    const t1 = performance.now();\n    const result = parseTemplate(payload);\n    const t2 = performance.now();\n    const dt = t2 - t1;\n    if (dt > 100) console.warn(`parseTemplate in worker took ${dt}ms`);\n    return result;\n  },\n} satisfies Record<string, (...args: any[]) => Promise<unknown>>;\n\ntype ToScheme<T extends Record<string, (...args: any[]) => any>> = {\n  [K in keyof T]: {\n    args: Parameters<T[K]>;\n    response: Awaited<ReturnType<T[K]>>;\n  };\n};\n\nexport type Scheme = ToScheme<typeof workerApi>;\n"],"names":[],"mappings":";;AAAA;AAGA;;AAEG;AACI,MAAM,SAAS,GAAG;AACvB,IAAA,aAAa,EAAE,OAAO,OAAmB,KAAI;AAC3C,QAAA,MAAM,EAAE,GAAG,WAAW,CAAC,GAAG,EAAE;AAC5B,QAAA,MAAM,MAAM,GAAG,aAAa,CAAC,OAAO,CAAC;AACrC,QAAA,MAAM,EAAE,GAAG,WAAW,CAAC,GAAG,EAAE;AAC5B,QAAA,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE;QAClB,IAAI,EAAE,GAAG,GAAG;AAAE,YAAA,OAAO,CAAC,IAAI,CAAC,gCAAgC,EAAE,CAAA,EAAA,CAAI,CAAC;AAClE,QAAA,OAAO,MAAM;IACf,CAAC;;;;;"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@milaboratories/pl-middle-layer",
-  "version": "1.43.60",
+  "version": "1.43.63",
   "description": "Pl Middle Layer",
   "engines": {
     "node": ">=22.19.0"
@@ -28,21 +28,21 @@
     "remeda": "^2.28.0",
     "@milaboratories/pl-http": "1.2.0",
     "@milaboratories/resolve-helper": "1.1.1",
-    "@milaboratories/computable": "2.7.2",
-    "@milaboratories/pl-client": "2.16.3",
-    "@milaboratories/pl-drivers": "1.11.14",
-    "@platforma-sdk/block-tools": "2.6.17",
+    "@milaboratories/computable": "2.7.4",
+    "@milaboratories/pl-client": "2.16.6",
+    "@platforma-sdk/block-tools": "2.6.20",
     "@milaboratories/pl-model-common": "1.21.5",
-    "@milaboratories/pl-model-middle-layer": "1.8.36",
-    "@milaboratories/pl-model-backend": "1.1.20",
-    "@milaboratories/pl-tree": "1.8.10",
-    "@platforma-sdk/workflow-tengo": "5.5.17",
-    "@milaboratories/ts-helpers": "1.5.2",
+    "@milaboratories/pl-drivers": "1.11.17",
+    "@milaboratories/pl-model-middle-layer": "1.8.39",
+    "@milaboratories/pl-tree": "1.8.13",
+    "@milaboratories/pl-model-backend": "1.1.23",
+    "@milaboratories/ts-helpers": "1.5.4",
     "@platforma-sdk/model": "1.45.26",
-    "@milaboratories/pl-config": "1.7.7",
-    "@milaboratories/pl-deployments": "2.12.1",
-    "@milaboratories/pl-errors": "1.1.35",
-    "@milaboratories/pf-driver": "1.0.0"
+    "@milaboratories/pl-deployments": "2.12.3",
+    "@platforma-sdk/workflow-tengo": "5.5.17",
+    "@milaboratories/pl-errors": "1.1.38",
+    "@milaboratories/pf-driver": "1.0.3",
+    "@milaboratories/pl-config": "1.7.9"
   },
   "devDependencies": {
     "semver": "^7.7.2",
@@ -51,10 +51,10 @@
     "vitest": "^4.0.7",
     "@types/node": "~24.5.2",
     "tslib": "~2.7.0",
-    "@milaboratories/build-configs": "1.0.8",
     "@milaboratories/ts-builder": "1.0.5",
     "@milaboratories/ts-configs": "1.0.6",
-    "@milaboratories/eslint-config": "1.0.4"
+    "@milaboratories/build-configs": "1.0.8",
+    "@milaboratories/eslint-config": "1.0.5"
   },
   "scripts": {
     "type-check": "ts-builder types --target node",

package/src/middle_layer/project.ts

@@ -93,7 +93,10 @@ export class Project {
   private readonly refreshLoopResult: Promise<void>;
 
   private readonly abortController = new AbortController();
-  private destroyed = false;
+
+  private get destroyed() {
+    return this.abortController.signal.aborted;
+  }
 
   constructor(
     private readonly env: MiddleLayerEnvironment,
@@ -110,7 +113,7 @@ export class Project {
     this.rid = rid;
     this.refreshLoopResult = this.refreshLoop();
     this.refreshLoopResult.catch((err) => {
-      env.logger.error(err); // TODO (safe voiding for now)
+      env.logger.warn(new Error('Error during refresh loop', { cause: err })); // TODO (safe voiding for now)
     });
     this.activeConfigs = activeConfigs(projectTree.entry(), env);
   }
@@ -140,13 +143,25 @@ export class Project {
           }
         }
       } catch (e: unknown) {
+        // If we're destroyed, exit gracefully regardless of error type
+        if (this.destroyed) {
+          // Log just in case, to help with debugging if something unexpected happens during shutdown
+          this.env.logger.warn(new Error('Error during refresh loop shutdown', { cause: e }));
+          break;
+        }
+
         if (isNotFoundError(e)) {
           console.warn(
             'project refresh routine terminated, because project was externally deleted',
           );
           break;
-        } else if (!isTimeoutOrCancelError(e))
+        } else if (isTimeoutOrCancelError(e)) {
+          // Timeout during normal operation, continue the loop
+        } else {
+          // TODO: This stops the refresh loop permanently, leaving the project broken.
+          // Need to decide how to handle this case.
           throw new Error('Unexpected exception', { cause: e });
+        }
       }
     }
   }
@@ -471,12 +486,22 @@ export class Project {
   /** Called by middle layer on close */
   public async destroy(): Promise<void> {
     // terminating the project service loop
-    this.destroyed = true;
     this.abortController.abort();
-    await this.refreshLoopResult;
+    try {
+      await this.refreshLoopResult;
+    } catch (e: unknown) {
+      // Error was already logged in the constructor's catch handler, but log again for context
+      this.env.logger.warn(new Error('Refresh loop had terminated with error before destroy', { cause: e }));
+    }
 
     // terminating the synchronized project tree
-    await this.projectTree.terminate();
+    try {
+      await this.projectTree.terminate();
+    } catch (e: unknown) {
+      // TODO: SynchronizedTreeState.terminate() can throw if mainLoop had an error before termination
+      // Log error but continue cleanup - we must clean up remaining resources
+      this.env.logger.warn(new Error('Project tree termination failed', { cause: e }));
+    }
 
     // the following will deregister all external resource holders, like
     // downloaded files, running uploads and alike

package/src/mutator/project.ts

@@ -536,7 +536,7 @@ export class ProjectMutator {
           gzipped = isGzipped;
         }
         if (Buffer.compare(info.fields[fieldName]!.value!, data) === 0) continue;
-        console.log('setting', fieldName, gzipped, data.length);
+        // console.log('setting', fieldName, gzipped, data.length);
         const statePartRef = this.tx.createValue(gzipped ? Pl.JsonGzObject : Pl.JsonObject, data);
         this.setBlockField(req.blockId, fieldName, statePartRef, 'Ready', data);
 

package/src/pool/driver.ts

@@ -46,7 +46,7 @@ import {
 } from './data';
 
 function makeBlobId(res: PlTreeEntry): PFrameInternal.PFrameBlobId {
-  return String(res.rid);
+  return String(res.rid) as PFrameInternal.PFrameBlobId;
 }
 
 type LocalBlob = ComputableStableDefined<LocalBlobHandleAndSize>;
@@ -156,7 +156,7 @@ class BlobStore extends PFrameInternal.BaseObjectStore {
       callback: (response: PFrameInternal.ObjectStoreResponse) => Promise<void>;
     },
   ): Promise<void> {
-    const blobId = filename.slice(0, -PFrameInternal.ParquetExtension.length);
+    const blobId = filename.slice(0, -PFrameInternal.ParquetExtension.length) as PFrameInternal.PFrameBlobId;
     const respond = async (response: PFrameInternal.ObjectStoreResponse): Promise<void> => {
       try {
         await params.callback(response);
@@ -247,7 +247,7 @@ class RemoteBlobProviderImpl implements RemoteBlobProvider<PlTreeEntry> {
     return new RemoteBlobProviderImpl(pool, server);
   }
 
-  public acquire(params: PlTreeEntry): PoolEntry {
+  public acquire(params: PlTreeEntry): PoolEntry<PFrameInternal.PFrameBlobId> {
     return this.pool.acquire(params);
   }
 

package/src/worker/workerApi.ts

@@ -9,7 +9,8 @@ export const workerApi = {
     const t1 = performance.now();
     const result = parseTemplate(payload);
     const t2 = performance.now();
-    console.info(`>>>> parseTemplate in worker took ${t2 - t1}ms`);
+    const dt = t2 - t1;
+    if (dt > 100) console.warn(`parseTemplate in worker took ${dt}ms`);
     return result;
   },
 } satisfies Record<string, (...args: any[]) => Promise<unknown>>;