@milaboratories/pl-middle-layer 1.10.36 → 1.10.39
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/block_registry/watcher.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/index.mjs +240 -230
- package/dist/index.mjs.map +1 -1
- package/package.json +9 -8
- package/src/block_registry/watcher.ts +21 -11
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@milaboratories/pl-middle-layer",
|
|
3
|
-
"version": "1.10.
|
|
3
|
+
"version": "1.10.39",
|
|
4
4
|
"description": "Pl Middle Layer",
|
|
5
5
|
"types": "./dist/index.d.ts",
|
|
6
6
|
"main": "./dist/index.js",
|
|
@@ -27,15 +27,15 @@
|
|
|
27
27
|
"utility-types": "^3.11.0",
|
|
28
28
|
"yaml": "^2.5.1",
|
|
29
29
|
"zod": "^3.23.8",
|
|
30
|
-
"@milaboratories/computable": "^2.1.
|
|
31
|
-
"@
|
|
30
|
+
"@milaboratories/computable": "^2.1.10",
|
|
31
|
+
"@platforma-sdk/block-tools": "^2.3.9",
|
|
32
32
|
"@milaboratories/pl-client": "^2.4.17",
|
|
33
|
-
"@
|
|
34
|
-
"@milaboratories/pl-drivers": "^1.2.26",
|
|
33
|
+
"@milaboratories/resolve-helper": "^1.0.1",
|
|
35
34
|
"@milaboratories/pl-model-common": "^1.3.13",
|
|
35
|
+
"@milaboratories/pl-drivers": "^1.2.27",
|
|
36
36
|
"@milaboratories/pl-model-middle-layer": "^1.4.3",
|
|
37
|
-
"@milaboratories/pl-tree": "^1.3.
|
|
38
|
-
"@platforma-sdk/model": "^1.2.
|
|
37
|
+
"@milaboratories/pl-tree": "^1.3.16",
|
|
38
|
+
"@platforma-sdk/model": "^1.2.30",
|
|
39
39
|
"@milaboratories/ts-helpers": "^1.0.28",
|
|
40
40
|
"@platforma-sdk/workflow-tengo": "1.2.10"
|
|
41
41
|
},
|
|
@@ -52,6 +52,7 @@
|
|
|
52
52
|
"scripts": {
|
|
53
53
|
"type-check": "tsc --noEmit --composite false",
|
|
54
54
|
"build": "vite build",
|
|
55
|
-
"test": "NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules\" jest"
|
|
55
|
+
"test": "NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules\" jest",
|
|
56
|
+
"do-pack": "rm *.tgz && pnpm pack && mv *.tgz package.tgz"
|
|
56
57
|
}
|
|
57
58
|
}
|
|
@@ -3,7 +3,7 @@ import { blockPackIdEquals, BlockPackSpec } from '@milaboratories/pl-model-middl
|
|
|
3
3
|
import { Dispatcher } from 'undici';
|
|
4
4
|
import { getDevV1PacketMtime, getDevV2PacketMtime } from './registry';
|
|
5
5
|
import { RegistryV2Reader, tryLoadPackDescription } from '@platforma-sdk/block-tools';
|
|
6
|
-
import { MiLogger } from '@milaboratories/ts-helpers';
|
|
6
|
+
import { assertNever, MiLogger } from '@milaboratories/ts-helpers';
|
|
7
7
|
import { V2RegistryProvider } from './registry-v2-provider';
|
|
8
8
|
|
|
9
9
|
export const DefaultBlockUpdateWatcherOps: PollPoolOps = {
|
|
@@ -36,7 +36,7 @@ export class BlockUpdateWatcher extends PollComputablePool<
|
|
|
36
36
|
case 'dev-v2':
|
|
37
37
|
return `dev_2_${req.folder}_${req.mtime}`;
|
|
38
38
|
case 'from-registry-v2':
|
|
39
|
-
return `from_registry_v2_${req.registryUrl}_${req.id.organization}_${req.id.name}`;
|
|
39
|
+
return `from_registry_v2_${req.registryUrl}_${req.id.organization}_${req.id.name}_${req.id.version}`;
|
|
40
40
|
default:
|
|
41
41
|
return NoUpdatesKey;
|
|
42
42
|
}
|
|
@@ -58,7 +58,7 @@ export class BlockUpdateWatcher extends PollComputablePool<
|
|
|
58
58
|
|
|
59
59
|
case 'dev-v2': {
|
|
60
60
|
try {
|
|
61
|
-
const description = await tryLoadPackDescription(req.folder);
|
|
61
|
+
const description = await tryLoadPackDescription(req.folder, this.logger);
|
|
62
62
|
if (description === undefined) return undefined;
|
|
63
63
|
const mtime = await getDevV2PacketMtime(description);
|
|
64
64
|
if (mtime === req.mtime) return undefined;
|
|
@@ -86,6 +86,7 @@ export class BlockUpdateWatcher extends PollComputablePool<
|
|
|
86
86
|
return undefined;
|
|
87
87
|
}
|
|
88
88
|
} catch (e: unknown) {
|
|
89
|
+
this.logger.warn(e);
|
|
89
90
|
return undefined;
|
|
90
91
|
}
|
|
91
92
|
}
|
|
@@ -96,13 +97,22 @@ export class BlockUpdateWatcher extends PollComputablePool<
|
|
|
96
97
|
): boolean {
|
|
97
98
|
if (res1 === undefined && res2 === undefined) return true;
|
|
98
99
|
if (res1 === undefined || res2 === undefined) return false;
|
|
99
|
-
if (
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
100
|
+
if (res1.type !== res2.type) return false;
|
|
101
|
+
switch (res1.type) {
|
|
102
|
+
case 'from-registry-v1':
|
|
103
|
+
if (res2.type !== 'from-registry-v1') return false;
|
|
104
|
+
return res1.registryUrl === res2.registryUrl && blockPackIdEquals(res1.id, res2.id);
|
|
105
|
+
case 'from-registry-v2':
|
|
106
|
+
if (res2.type !== 'from-registry-v2') return false;
|
|
107
|
+
return res1.registryUrl === res2.registryUrl && blockPackIdEquals(res1.id, res2.id);
|
|
108
|
+
case 'dev-v1':
|
|
109
|
+
if (res2.type !== 'dev-v1') return false;
|
|
110
|
+
return res1.folder === res2.folder && res1.mtime === res2.mtime;
|
|
111
|
+
case 'dev-v2':
|
|
112
|
+
if (res2.type !== 'dev-v2') return false;
|
|
113
|
+
return res1.folder === res2.folder && res1.mtime === res2.mtime;
|
|
114
|
+
default:
|
|
115
|
+
assertNever(res1);
|
|
116
|
+
}
|
|
107
117
|
}
|
|
108
118
|
}
|