@milaboratories/pl-middle-layer 1.28.20 → 1.29.0
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/index.js +18 -18
- package/dist/index.js.map +1 -1
- package/dist/index.mjs +891 -902
- package/dist/index.mjs.map +1 -1
- package/dist/mutator/block-pack/block_pack.d.ts +1 -0
- package/dist/mutator/block-pack/block_pack.d.ts.map +1 -1
- package/dist/mutator/project.d.ts +0 -1
- package/dist/mutator/project.d.ts.map +1 -1
- package/package.json +9 -9
- package/src/middle_layer/ops.ts +1 -1
- package/src/mutator/block-pack/block_pack.ts +29 -23
- package/src/mutator/project.ts +0 -15
- package/src/mutator/template/direct_template_loader.ts +7 -18
- package/src/pool/driver.ts +5 -5
|
@@ -12,6 +12,7 @@ export declare class BlockPackPreparer {
|
|
|
12
12
|
private readonly signer;
|
|
13
13
|
private readonly http?;
|
|
14
14
|
constructor(v2RegistryProvider: V2RegistryProvider, signer: Signer, http?: Dispatcher | undefined);
|
|
15
|
+
private readonly remoteContentCache;
|
|
15
16
|
getBlockConfigContainer(spec: BlockPackSpecAny): Promise<BlockConfigContainer>;
|
|
16
17
|
prepare(spec: BlockPackSpecAny): Promise<BlockPackSpecPrepared>;
|
|
17
18
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"block_pack.d.ts","sourceRoot":"","sources":["../../../src/mutator/block-pack/block_pack.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAG7F,OAAO,KAAK,EAAqB,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAC9F,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AAGzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAGzC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAKjE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2CAA2C,CAAC;
|
|
1
|
+
{"version":3,"file":"block_pack.d.ts","sourceRoot":"","sources":["../../../src/mutator/block-pack/block_pack.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAG7F,OAAO,KAAK,EAAqB,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAC9F,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AAGzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAGzC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAKjE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2CAA2C,CAAC;AAGpF,eAAO,MAAM,mBAAmB,EAAE,YAAwD,CAAC;AAC3F,eAAO,MAAM,sBAAsB,aAAa,CAAC;AACjD,eAAO,MAAM,sBAAsB,aAAa,CAAC;AAgBjD,qBAAa,iBAAiB;IAE1B,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC;gBAFL,kBAAkB,EAAE,kBAAkB,EACtC,MAAM,EAAE,MAAM,EACd,IAAI,CAAC,EAAE,UAAU,YAAA;IAGpC,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAQhC;IAEU,uBAAuB,CAAC,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAsC9E,OAAO,CAAC,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,qBAAqB,CAAC;CA0H7E;AAYD,wBAAgB,eAAe,CAAC,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,qBAAqB,GAAG,cAAc,CAO9F"}
|
|
@@ -85,7 +85,6 @@ export declare class ProjectMutator {
|
|
|
85
85
|
setArgs(requests: SetArgsRequest[]): void;
|
|
86
86
|
setUiState(blockId: string, newState: string | undefined): void;
|
|
87
87
|
setBlockSettings(blockId: string, newValue: BlockSettings): void;
|
|
88
|
-
/** Update block label */
|
|
89
88
|
private createProdCtx;
|
|
90
89
|
private createStagingCtx;
|
|
91
90
|
private exportCtx;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project.d.ts","sourceRoot":"","sources":["../../src/mutator/project.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"project.d.ts","sourceRoot":"","sources":["../../src/mutator/project.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@milaboratories/pl-middle-layer",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.29.0",
|
|
4
4
|
"description": "Pl Middle Layer",
|
|
5
5
|
"types": "./dist/index.d.ts",
|
|
6
6
|
"main": "./dist/index.js",
|
|
@@ -29,19 +29,19 @@
|
|
|
29
29
|
"utility-types": "^3.11.0",
|
|
30
30
|
"yaml": "^2.6.1",
|
|
31
31
|
"zod": "~3.23.8",
|
|
32
|
-
"@milaboratories/pl-http": "^1.0
|
|
33
|
-
"@milaboratories/computable": "^2.3.5",
|
|
34
|
-
"@platforma-sdk/block-tools": "^2.5.16",
|
|
32
|
+
"@milaboratories/pl-http": "^1.1.0",
|
|
35
33
|
"@milaboratories/resolve-helper": "^1.0.2",
|
|
34
|
+
"@milaboratories/computable": "^2.3.5",
|
|
35
|
+
"@platforma-sdk/block-tools": "^2.5.18",
|
|
36
|
+
"@milaboratories/pl-drivers": "^1.5.24",
|
|
36
37
|
"@milaboratories/pl-model-common": "^1.10.6",
|
|
37
|
-
"@milaboratories/pl-
|
|
38
|
-
"@milaboratories/pl-drivers": "^1.5.22",
|
|
38
|
+
"@milaboratories/pl-tree": "^1.4.30",
|
|
39
39
|
"@milaboratories/pl-model-backend": "^1.0.2",
|
|
40
|
-
"@milaboratories/pl-
|
|
41
|
-
"@milaboratories/pl-tree": "^1.4.28",
|
|
40
|
+
"@milaboratories/pl-client": "^2.7.11",
|
|
42
41
|
"@platforma-sdk/model": "^1.22.59",
|
|
42
|
+
"@milaboratories/pl-model-middle-layer": "^1.7.6",
|
|
43
43
|
"@milaboratories/ts-helpers": "^1.1.4",
|
|
44
|
-
"@platforma-sdk/workflow-tengo": "2.15.
|
|
44
|
+
"@platforma-sdk/workflow-tengo": "2.15.1",
|
|
45
45
|
"@milaboratories/pl-config": "^1.4.3",
|
|
46
46
|
"@milaboratories/pl-deployments": "^1.2.3"
|
|
47
47
|
},
|
package/src/middle_layer/ops.ts
CHANGED
|
@@ -120,7 +120,7 @@ export const DefaultDriverKitOpsSettings: Pick<
|
|
|
120
120
|
> = {
|
|
121
121
|
logger: new ConsoleLoggerAdapter(),
|
|
122
122
|
blobDriverOps: {
|
|
123
|
-
cacheSoftSizeBytes:
|
|
123
|
+
cacheSoftSizeBytes: 8 * 1024 * 1024 * 1024, // 8 GB
|
|
124
124
|
nConcurrentDownloads: 10,
|
|
125
125
|
},
|
|
126
126
|
downloadBlobToURLDriverOps: {
|
|
@@ -14,6 +14,7 @@ import type { BlockPackInfo } from '../../model/block_pack';
|
|
|
14
14
|
import { resolveDevPacket } from '../../dev_env';
|
|
15
15
|
import { getDevV2PacketMtime } from '../../block_registry';
|
|
16
16
|
import type { V2RegistryProvider } from '../../block_registry/registry-v2-provider';
|
|
17
|
+
import { LRUCache } from 'lru-cache';
|
|
17
18
|
|
|
18
19
|
export const BlockPackCustomType: ResourceType = { name: 'BlockPackCustom', version: '1' };
|
|
19
20
|
export const BlockPackTemplateField = 'template';
|
|
@@ -25,6 +26,14 @@ function tSlash(str: string): string {
|
|
|
25
26
|
else return `${str}/`;
|
|
26
27
|
}
|
|
27
28
|
|
|
29
|
+
function bufferToString(buffer: ArrayBuffer): string {
|
|
30
|
+
return Buffer.from(buffer).toString('utf8');
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
function bufferToJson(buffer: ArrayBuffer): unknown {
|
|
34
|
+
return JSON.parse(bufferToString(buffer));
|
|
35
|
+
}
|
|
36
|
+
|
|
28
37
|
export class BlockPackPreparer {
|
|
29
38
|
constructor(
|
|
30
39
|
private readonly v2RegistryProvider: V2RegistryProvider,
|
|
@@ -32,6 +41,16 @@ export class BlockPackPreparer {
|
|
|
32
41
|
private readonly http?: Dispatcher,
|
|
33
42
|
) {}
|
|
34
43
|
|
|
44
|
+
private readonly remoteContentCache = new LRUCache<string, ArrayBuffer>({
|
|
45
|
+
max: 500,
|
|
46
|
+
maxSize: 128 * 1024 * 1024,
|
|
47
|
+
fetchMethod: async (key) => {
|
|
48
|
+
const httpOptions = this.http !== undefined ? { dispatcher: this.http } : {};
|
|
49
|
+
return await (await request(key, httpOptions)).body.arrayBuffer();
|
|
50
|
+
},
|
|
51
|
+
sizeCalculation: (value) => value.byteLength,
|
|
52
|
+
});
|
|
53
|
+
|
|
35
54
|
public async getBlockConfigContainer(spec: BlockPackSpecAny): Promise<BlockConfigContainer> {
|
|
36
55
|
switch (spec.type) {
|
|
37
56
|
case 'explicit':
|
|
@@ -52,22 +71,17 @@ export class BlockPackPreparer {
|
|
|
52
71
|
}
|
|
53
72
|
|
|
54
73
|
case 'from-registry-v1': {
|
|
55
|
-
const httpOptions = this.http !== undefined ? { dispatcher: this.http } : {};
|
|
56
|
-
|
|
57
74
|
const urlPrefix = `${tSlash(spec.registryUrl)}${RegistryV1.packageContentPrefix({ organization: spec.id.organization, package: spec.id.name, version: spec.id.version })}`;
|
|
58
75
|
|
|
59
|
-
const configResponse = await
|
|
60
|
-
|
|
61
|
-
return (await configResponse.body.json()) as BlockConfigContainer;
|
|
76
|
+
const configResponse = await this.remoteContentCache.forceFetch(`${urlPrefix}/config.json`);
|
|
77
|
+
return bufferToJson(configResponse) as BlockConfigContainer;
|
|
62
78
|
}
|
|
63
79
|
|
|
64
80
|
case 'from-registry-v2': {
|
|
65
|
-
const httpOptions = this.http !== undefined ? { dispatcher: this.http } : {};
|
|
66
81
|
const registry = this.v2RegistryProvider.getRegistry(spec.registryUrl);
|
|
67
82
|
const components = await registry.getComponents(spec.id);
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
).body.json()) as BlockConfigContainer;
|
|
83
|
+
const configResponse = await this.remoteContentCache.forceFetch(components.model.url);
|
|
84
|
+
return bufferToJson(configResponse) as BlockConfigContainer;
|
|
71
85
|
}
|
|
72
86
|
|
|
73
87
|
default:
|
|
@@ -142,23 +156,16 @@ export class BlockPackPreparer {
|
|
|
142
156
|
}
|
|
143
157
|
|
|
144
158
|
case 'from-registry-v1': {
|
|
145
|
-
const httpOptions = this.http !== undefined ? { dispatcher: this.http } : {};
|
|
146
|
-
|
|
147
159
|
const urlPrefix = `${tSlash(spec.registryUrl)}${RegistryV1.packageContentPrefix({ organization: spec.id.organization, package: spec.id.name, version: spec.id.version })}`;
|
|
148
160
|
|
|
149
161
|
const templateUrl = `${urlPrefix}/template.plj.gz`;
|
|
150
162
|
// template
|
|
151
|
-
const templateResponse = await
|
|
152
|
-
|
|
153
|
-
throw new Error(
|
|
154
|
-
`Block not found in registry (url = ${templateUrl} ; code = ${templateResponse.statusCode}): `
|
|
155
|
-
+ JSON.stringify(spec),
|
|
156
|
-
);
|
|
157
|
-
const templateContent = new Uint8Array(await templateResponse.body.arrayBuffer());
|
|
163
|
+
const templateResponse = await this.remoteContentCache.forceFetch(templateUrl);
|
|
164
|
+
const templateContent = new Uint8Array(templateResponse);
|
|
158
165
|
|
|
159
166
|
// config
|
|
160
|
-
const configResponse = await
|
|
161
|
-
const config = (
|
|
167
|
+
const configResponse = await this.remoteContentCache.forceFetch(`${urlPrefix}/config.json`);
|
|
168
|
+
const config = bufferToJson(configResponse) as BlockConfigContainer;
|
|
162
169
|
|
|
163
170
|
return {
|
|
164
171
|
type: 'explicit',
|
|
@@ -176,13 +183,12 @@ export class BlockPackPreparer {
|
|
|
176
183
|
}
|
|
177
184
|
|
|
178
185
|
case 'from-registry-v2': {
|
|
179
|
-
const httpOptions = this.http !== undefined ? { dispatcher: this.http } : {};
|
|
180
186
|
const registry = this.v2RegistryProvider.getRegistry(spec.registryUrl);
|
|
181
187
|
const components = await registry.getComponents(spec.id);
|
|
182
188
|
const getModel = async () =>
|
|
183
|
-
(await (
|
|
189
|
+
bufferToJson(await this.remoteContentCache.forceFetch(components.model.url)) as BlockConfigContainer;
|
|
184
190
|
const getWorkflow = async () =>
|
|
185
|
-
await (
|
|
191
|
+
await this.remoteContentCache.forceFetch(components.workflow.main.url);
|
|
186
192
|
|
|
187
193
|
const [model, workflow] = await Promise.all([getModel(), getWorkflow()]);
|
|
188
194
|
|
package/src/mutator/project.ts
CHANGED
|
@@ -486,21 +486,6 @@ export class ProjectMutator {
|
|
|
486
486
|
this.updateLastModified();
|
|
487
487
|
}
|
|
488
488
|
|
|
489
|
-
/** Update block label */
|
|
490
|
-
// public setBlockLabel(blockId: string, label: string): void {
|
|
491
|
-
// const newStructure = this.structure;
|
|
492
|
-
// let ok = false;
|
|
493
|
-
// for (const block of allBlocks(newStructure))
|
|
494
|
-
// if (block.id === blockId) {
|
|
495
|
-
// block.label = label;
|
|
496
|
-
// ok = true;
|
|
497
|
-
// break;
|
|
498
|
-
// }
|
|
499
|
-
// if (!ok) throw new Error(`block ${blockId} not found`);
|
|
500
|
-
// this.updateStructure(newStructure);
|
|
501
|
-
// this.updateLastModified();
|
|
502
|
-
// }
|
|
503
|
-
|
|
504
489
|
private createProdCtx(upstream: Set<string>): AnyRef {
|
|
505
490
|
const upstreamContexts: AnyRef[] = [];
|
|
506
491
|
upstream.forEach((id) => {
|
|
@@ -70,27 +70,12 @@ const SoftwareInfoRenderer: Renderer<TemplateSoftwareData> = {
|
|
|
70
70
|
},
|
|
71
71
|
};
|
|
72
72
|
|
|
73
|
-
const HashOverrideRenderer: Renderer<TemplateData> = {
|
|
74
|
-
hash(resource, hash) {
|
|
75
|
-
hash
|
|
76
|
-
.update(PlTemplateOverrideV1.type.name)
|
|
77
|
-
.update(PlTemplateOverrideV1.type.version)
|
|
78
|
-
.update(resource.hashOverride ?? '');
|
|
79
|
-
},
|
|
80
|
-
render(resource, tx, _creator) {
|
|
81
|
-
return tx.createStruct(
|
|
82
|
-
PlTemplateOverrideV1.type,
|
|
83
|
-
JSON.stringify(PlTemplateOverrideV1.fromV2Data(resource)),
|
|
84
|
-
);
|
|
85
|
-
},
|
|
86
|
-
};
|
|
87
|
-
|
|
88
73
|
const TemplateRenderer: Renderer<TemplateData> = {
|
|
89
74
|
hash(resource, hash) {
|
|
90
75
|
hash
|
|
91
76
|
.update(PlTemplateV1.type.name)
|
|
92
77
|
.update(PlTemplateV1.type.version)
|
|
93
|
-
.update(resource.hashOverride ?? '')
|
|
78
|
+
.update(resource.hashOverride ?? 'no-override')
|
|
94
79
|
.update(resource.name)
|
|
95
80
|
.update(resource.version)
|
|
96
81
|
.update(resource.src);
|
|
@@ -153,11 +138,14 @@ const TemplateRenderer: Renderer<TemplateData> = {
|
|
|
153
138
|
if (!resource.hashOverride) return tplRef;
|
|
154
139
|
|
|
155
140
|
// Override template hash with proxy resource, when hash override is configured for template
|
|
156
|
-
const overrideRef =
|
|
141
|
+
const overrideRef = tx.createStruct(
|
|
142
|
+
PlTemplateOverrideV1.type,
|
|
143
|
+
JSON.stringify(PlTemplateOverrideV1.fromV2Data(resource)),
|
|
144
|
+
);
|
|
157
145
|
const fld = PlTemplateOverrideV1.tplField(overrideRef);
|
|
158
146
|
tx.createField(fld, 'Service');
|
|
159
147
|
tx.setField(fld, tplRef);
|
|
160
|
-
tx.lock(
|
|
148
|
+
tx.lock(overrideRef);
|
|
161
149
|
return overrideRef;
|
|
162
150
|
},
|
|
163
151
|
};
|
|
@@ -170,6 +158,7 @@ function createTemplateV2Tree(tx: PlTransaction, tplInfo: TemplateData): AnyRef
|
|
|
170
158
|
renderer.hash(resource, hasher);
|
|
171
159
|
|
|
172
160
|
const rKey = hasher.digest('hex');
|
|
161
|
+
|
|
173
162
|
if (!resourceCache.has(rKey)) {
|
|
174
163
|
const rId = renderer.render(resource, tx, createResource);
|
|
175
164
|
resourceCache.set(rKey, rId);
|
package/src/pool/driver.ts
CHANGED
|
@@ -142,7 +142,7 @@ class PFrameHolder implements PFrameInternal.PFrameDataSource, Disposable {
|
|
|
142
142
|
this.blobIdToResource.set(blobKey(blob), blob);
|
|
143
143
|
}
|
|
144
144
|
}
|
|
145
|
-
const
|
|
145
|
+
const distinctСolumns = [
|
|
146
146
|
...new Map(columns.map((column) => ({
|
|
147
147
|
...column,
|
|
148
148
|
data: mapBlobs(column.data, blobKey),
|
|
@@ -155,14 +155,14 @@ class PFrameHolder implements PFrameInternal.PFrameDataSource, Disposable {
|
|
|
155
155
|
try {
|
|
156
156
|
const pFrame = new PFrameRs(getDebugFlags().logPFrameRequests ? logFunc : undefined);
|
|
157
157
|
pFrame.setDataSource(this);
|
|
158
|
-
for (const column of
|
|
158
|
+
for (const column of distinctСolumns) {
|
|
159
159
|
pFrame.addColumnSpec(column.id, column.spec);
|
|
160
160
|
pFrame.setColumnData(column.id, column.data);
|
|
161
161
|
}
|
|
162
162
|
return pFrame;
|
|
163
163
|
} catch (err: unknown) {
|
|
164
164
|
throw new Error(
|
|
165
|
-
`Rust PFrame creation failed, columns: ${JSON.stringify(
|
|
165
|
+
`Rust PFrame creation failed, columns: ${JSON.stringify(distinctСolumns)}, error: ${err as Error}`,
|
|
166
166
|
);
|
|
167
167
|
}
|
|
168
168
|
})();
|
|
@@ -171,7 +171,7 @@ class PFrameHolder implements PFrameInternal.PFrameDataSource, Disposable {
|
|
|
171
171
|
try {
|
|
172
172
|
const pFrame = getDebugFlags().logPFrameRequests ? new PFrame(logFunc) : new PFrame();
|
|
173
173
|
pFrame.setDataSource(this);
|
|
174
|
-
for (const column of
|
|
174
|
+
for (const column of distinctСolumns) {
|
|
175
175
|
try {
|
|
176
176
|
pFrame.addColumnSpec(column.id, column.spec);
|
|
177
177
|
pFrame.setColumnData(column.id, column.data);
|
|
@@ -184,7 +184,7 @@ class PFrameHolder implements PFrameInternal.PFrameDataSource, Disposable {
|
|
|
184
184
|
return pFrame;
|
|
185
185
|
} catch (err: unknown) {
|
|
186
186
|
throw new Error(
|
|
187
|
-
`Data PFrame creation failed, columns: ${JSON.stringify(
|
|
187
|
+
`Data PFrame creation failed, columns: ${JSON.stringify(distinctСolumns)}, error: ${err as Error}`,
|
|
188
188
|
);
|
|
189
189
|
}
|
|
190
190
|
};
|