@milaboratories/pl-middle-layer 1.18.1 → 1.19.1

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,EAKV,MAAM,sBAAsB,CAAC;AAqH9B,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;IAQlF,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;IAanB,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"}
+{"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,EAKV,MAAM,sBAAsB,CAAC;AAqH9B,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;IAoDhD,YAAY,CAAC,GAAG,EAAE,SAAS,CAAC,kBAAkB,CAAC,EAAE,GAAG,EAAE,aAAa,GAAG,YAAY;IAQlF,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;IAanB,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.18.1",
+  "version": "1.19.1",
   "description": "Pl Middle Layer",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -28,19 +28,19 @@
     "utility-types": "^3.11.0",
     "yaml": "^2.6.1",
     "zod": "^3.23.8",
-    "@milaboratories/computable": "^2.3.2",
     "@milaboratories/resolve-helper": "^1.0.2",
-    "@platforma-sdk/block-tools": "^2.3.30",
-    "@milaboratories/pl-client": "^2.6.1",
+    "@milaboratories/pl-client": "^2.6.3",
+    "@platforma-sdk/block-tools": "^2.4.1",
     "@milaboratories/pl-model-common": "^1.8.0",
-    "@milaboratories/pl-drivers": "^1.3.25",
-    "@milaboratories/pl-model-middle-layer": "^1.5.13",
-    "@milaboratories/pl-tree": "^1.4.16",
+    "@milaboratories/pl-drivers": "^1.4.0",
+    "@milaboratories/pl-tree": "^1.4.18",
+    "@milaboratories/pl-model-middle-layer": "^1.6.0",
     "@platforma-sdk/model": "^1.14.1",
-    "@milaboratories/ts-helpers": "^1.1.1",
-    "@milaboratories/pl-config": "^1.3.1",
+    "@milaboratories/computable": "^2.3.3",
     "@platforma-sdk/workflow-tengo": "2.5.0",
-    "@milaboratories/pl-local": "^1.8.0"
+    "@milaboratories/ts-helpers": "^1.1.2",
+    "@milaboratories/pl-config": "^1.3.2",
+    "@milaboratories/pl-local": "^1.8.1"
   },
   "devDependencies": {
     "typescript": "~5.5.4",

package/src/block_registry/registry.ts

@@ -13,11 +13,15 @@ import { LegacyDevBlockPackFiles } from '../dev_env';
 import { tryLoadPackDescription } from '@platforma-sdk/block-tools';
 import { V2RegistryProvider } from './registry-v2-provider';
 import {
+  AnyChannel,
   BlockPackListing,
   BlockPackOverview,
   RegistryEntry,
-  RegistryStatus
+  RegistryStatus,
+  SingleBlockPackOverview,
+  StableChannel
 } from '@milaboratories/pl-model-middle-layer';
+import { version } from 'node:process';
 
 async function getFileContent(path: string) {
   try {
@@ -88,8 +92,7 @@ export class BlockPackRegistry {
             name: pkg,
             version: latestVersion
           };
-          result.push({
-            registryId: regEntry.id,
+          const latestOverview: SingleBlockPackOverview = {
             id,
             meta: {
               title: latestMeta['title'] ?? 'No title',
@@ -103,17 +106,36 @@ export class BlockPackRegistry {
               type: 'from-registry-v1',
               id,
               registryUrl: regSpec.url
+            }
+          };
+          result.push({
+            registryId: regEntry.id,
+            id,
+            latestByChannel: {
+              [AnyChannel]: latestOverview,
+              [StableChannel]: latestOverview
             },
-            otherVersions: overviewEntry.allVersions
+            allVersions: overviewEntry.allVersions.map((v) => ({ version: v, channels: [] }))
           });
         }
         return result;
 
       case 'remote-v2':
-        return (await this.v2Provider.getRegistry(regSpec.url).listBlockPacks()).map((e) => ({
-          ...e,
-          registryId: regEntry.id
-        }));
+        return (await this.v2Provider.getRegistry(regSpec.url).listBlockPacks()).map((e) =>
+          e.latestByChannel[StableChannel]
+            ? {
+                ...e,
+                registryId: regEntry.id
+              }
+            : {
+                ...e,
+                latestByChannel: {
+                  ...e.latestByChannel,
+                  [StableChannel]: e.latestByChannel[AnyChannel]
+                },
+                registryId: regEntry.id
+              }
+        );
 
       case 'local-dev':
         for (const entry of await fs.promises.readdir(regSpec.path, { withFileTypes: true })) {
@@ -134,8 +156,7 @@ export class BlockPackRegistry {
               version: 'DEV'
             };
 
-            result.push({
-              registryId: regEntry.id,
+            const latestOverview: SingleBlockPackOverview = {
               id,
               meta: {
                 title: (config.meta['title'] as string) ?? 'No title',
@@ -149,33 +170,51 @@ export class BlockPackRegistry {
                 type: 'dev-v2',
                 folder: devPath,
                 mtime
+              }
+            };
+
+            result.push({
+              registryId: regEntry.id,
+              id,
+              latestByChannel: {
+                [AnyChannel]: latestOverview,
+                [StableChannel]: latestOverview
               },
-              otherVersions: []
+              allVersions: []
             });
           } else {
             let actualDevPath = devPath;
             let v2Description = await tryLoadPackDescription(actualDevPath);
-            
+
             if (v2Description === undefined)
               // iterating over expected subfolder names where block developer may put root block-pack package
               for (const bpSubfolder of ['block', 'meta']) {
-                actualDevPath = path.join(devPath, bpSubfolder)
+                actualDevPath = path.join(devPath, bpSubfolder);
                 v2Description = await tryLoadPackDescription(actualDevPath);
                 if (v2Description !== undefined) break;
               }
 
             if (v2Description !== undefined) {
               const mtime = await getDevV2PacketMtime(v2Description);
-              result.push({
-                registryId: regEntry.id,
+
+              const latestOverview: SingleBlockPackOverview = {
                 id: v2Description.id,
                 meta: await BlockPackMetaEmbedAbsoluteBytes.parseAsync(v2Description.meta),
                 spec: {
                   type: 'dev-v2',
-                  folder: actualDevPath,
+                  folder: devPath,
                   mtime
+                }
+              };
+
+              result.push({
+                registryId: regEntry.id,
+                id: v2Description.id,
+                latestByChannel: {
+                  [AnyChannel]: latestOverview,
+                  [StableChannel]: latestOverview
                 },
-                otherVersions: []
+                allVersions: []
               });
             }
           }

package/src/block_registry/watcher.ts

@@ -1,5 +1,12 @@
 import { PollComputablePool, PollPoolOps } from '@milaboratories/computable';
-import { blockPackIdEquals, BlockPackSpec } from '@milaboratories/pl-model-middle-layer';
+import {
+  AnyChannel,
+  BlockPackFromRegistryV2,
+  blockPackIdEquals,
+  blockPackIdToString,
+  BlockPackSpec,
+  StableChannel
+} from '@milaboratories/pl-model-middle-layer';
 import { Dispatcher } from 'undici';
 import { getDevV1PacketMtime, getDevV2PacketMtime } from './registry';
 import { tryLoadPackDescription } from '@platforma-sdk/block-tools';
@@ -72,7 +79,35 @@ export class BlockUpdateWatcher extends PollComputablePool<
         case 'from-registry-v2': {
           try {
             const registry = this.registryProvider.getRegistry(req.registryUrl);
-            const spec = (await registry.getOverviewForSpec(req.id))?.spec;
+            let spec: BlockPackSpec | undefined;
+
+            if (req.channel === undefined) {
+              const a1 = await registry.getLatestOverview(req.id, StableChannel);
+              if (a1) spec = a1.spec;
+              else {
+                // forcing update from non-existent channel to stable
+                const a2 = await registry.getLatestOverview(req.id, AnyChannel);
+                if (a2 === undefined) {
+                  this.logger.error(`No any channel record for ${blockPackIdToString(req.id)}`);
+                  return undefined;
+                }
+                spec = { ...(a2.spec as BlockPackFromRegistryV2), channel: StableChannel };
+              }
+            } else {
+              const a1 = await registry.getLatestOverview(req.id, req.channel);
+              if (a1) spec = a1.spec;
+              else if(req.channel === StableChannel) {
+                // we were not able to find a stable package because there are none for the block pack yet
+                const a2 = await registry.getLatestOverview(req.id, AnyChannel);
+                if (a2 === undefined) {
+                  this.logger.error(`No any channel record for ${blockPackIdToString(req.id)}`);
+                  return undefined;
+                }
+                // providing "any" channel package as a substitute and marking it as stable
+                spec = { ...(a2.spec as BlockPackFromRegistryV2), channel: StableChannel };
+              }
+            }
+
             if (spec?.type !== 'from-registry-v2') throw new Error('Unexpected');
             if (blockPackIdEquals(spec.id, req.id)) return undefined;
 

package/src/middle_layer/render.test.ts

@@ -1,7 +1,58 @@
-import { test, expect } from '@jest/globals';
-import { awaitBlockDone, withMl } from './middle_layer.test';
-import { getQuickJS, Scope, shouldInterruptAfterDeadline } from 'quickjs-emscripten';
+import { expect, test } from '@jest/globals';
 import * as tp from 'node:timers/promises';
+import path from 'path';
+import { getQuickJS, Scope, shouldInterruptAfterDeadline } from 'quickjs-emscripten';
+import { randomUUID } from 'node:crypto';
+import { MiddleLayer } from './middle_layer';
+import { PlClient, TestHelpers } from '@milaboratories/pl-client';
+import { Project } from './project';
+
+export async function withMl(
+  cb: (ml: MiddleLayer, workFolder: string) => Promise<void>
+): Promise<void> {
+  const workFolder = path.resolve(`work/${randomUUID()}`);
+
+  await TestHelpers.withTempRoot(async (pl: PlClient) => {
+    const ml = await MiddleLayer.init(pl, workFolder, {
+      defaultTreeOptions: { pollingInterval: 250, stopPollingDelay: 500 },
+      devBlockUpdateRecheckInterval: 300,
+      localSecret: MiddleLayer.generateLocalSecret(),
+      localProjections: [], // TODO must be different with local pl
+      openFileDialogCallback: () => {
+        throw new Error('Not implemented.');
+      }
+    });
+    try {
+      await cb(ml, workFolder);
+    } finally {
+      await ml.close();
+    }
+  });
+}
+
+export async function awaitBlockDone(prj: Project, blockId: string, timeout: number = 2000) {
+  const abortSignal = AbortSignal.timeout(timeout);
+  const overview = prj.overview;
+  const state = prj.getBlockState(blockId);
+  // const stateAndOverview = Computable.make(() => ({ overview, state: undefined }));
+  while (true) {
+    // const {
+    //   overview: overviewSnapshot,
+    //   state: stateSnapshot
+    // } = await stateAndOverview.getValue();
+    const overviewSnapshot = (await overview.getValue())!;
+    const blockOverview = overviewSnapshot.blocks.find((b) => b.id == blockId);
+    if (blockOverview === undefined) throw new Error(`Blocks not found: ${blockId}`);
+    if (blockOverview.outputErrors) return;
+    if (blockOverview.calculationStatus === 'Done') return;
+    try {
+      await overview.awaitChange(abortSignal);
+    } catch (e: any) {
+      console.dir(await state.getValue(), { depth: 5 });
+      throw new Error('Aborted.', { cause: e });
+    }
+  }
+}
 
 test('test JS render enter numbers', async () => {
   await withMl(async (ml) => {

package/src/pool/driver.ts

@@ -162,6 +162,7 @@ export class PFrameDriver implements SdkPFrameDriver {
     const concurrencyLimiter = new ConcurrencyLimitingExecutor(1);
     this.blobContentCache = blobContentCache;
     this.concurrencyLimiter = concurrencyLimiter;
+    
     this.pFrames = new (class extends RefCountResourcePool<InternalPFrameData, PFrameHolder> {
       constructor(private readonly blobDriver: DownloadDriver) {
         super();