@comake/skl-js-engine 1.1.4 → 1.1.6
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/JsExecutor/jsExecutor.js +2 -1
- package/dist/JsExecutor/jsExecutor.js.map +1 -1
- package/dist/JsExecutor/transport/stdio/ChildStdioTransport.js +2 -2
- package/dist/JsExecutor/transport/stdio/ChildStdioTransport.js.map +1 -1
- package/dist/JsExecutor/transport/stdio/ParentStdioTransport.js +2 -2
- package/dist/JsExecutor/transport/stdio/ParentStdioTransport.js.map +1 -1
- package/dist/SklEngine.d.ts +2 -1
- package/dist/SklEngine.js +98 -49
- package/dist/SklEngine.js.map +1 -1
- package/dist/constants.d.ts +74 -86
- package/dist/constants.js +38 -50
- package/dist/constants.js.map +1 -1
- package/dist/storage/query-adapter/sparql/SparqlQueryBuilder.d.ts +1 -1
- package/dist/storage/query-adapter/sparql/SparqlQueryBuilder.js +107 -106
- package/dist/storage/query-adapter/sparql/SparqlQueryBuilder.js.map +1 -1
- package/dist/storage/query-adapter/sparql/query-executor/SparqlEndpointQueryExecutor.d.ts +1 -1
- package/dist/storage/query-adapter/sparql/query-executor/SparqlEndpointQueryExecutor.js +1 -1
- package/dist/storage/query-adapter/sparql/query-executor/SparqlEndpointQueryExecutor.js.map +1 -1
- package/dist/util/SparqlUtil.d.ts +2 -2
- package/dist/util/TripleUtil.d.ts +2 -2
- package/dist/util/TripleUtil.js +9 -9
- package/dist/util/TripleUtil.js.map +1 -1
- package/dist/util/Types.d.ts +1 -3
- package/dist/util/Vocabularies/Shared.d.ts +2 -2
- package/dist/util/Vocabularies/Shared.js +4 -4
- package/dist/util/Vocabularies/Shared.js.map +1 -1
- package/dist/util/Vocabularies/index.d.ts +6 -6
- package/dist/util/Vocabularies/index.js +43 -50
- package/dist/util/Vocabularies/index.js.map +1 -1
- package/package.json +1 -1
- package/dist/JsExecutor/transport/StdioTransport.d.ts +0 -0
- package/dist/JsExecutor/transport/StdioTransport.js +0 -641
- package/dist/JsExecutor/transport/StdioTransport.js.map +0 -1
|
@@ -61,7 +61,8 @@ class JSExecutor {
|
|
|
61
61
|
return;
|
|
62
62
|
}
|
|
63
63
|
this.server = new transport_1.JsonRpcServer({
|
|
64
|
-
|
|
64
|
+
// 1 hour
|
|
65
|
+
requestTimeout: 60 * 60 * 1000
|
|
65
66
|
});
|
|
66
67
|
// Register callbacks with the server
|
|
67
68
|
Object.entries(this.callbacks).forEach(([methodName, callback]) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jsExecutor.js","sourceRoot":"","sources":["../../src/JsExecutor/jsExecutor.ts"],"names":[],"mappings":";AAAA,yDAAyD;AACzD,oCAAoC;AACpC,qEAAqE;AACrE,+BAA+B;;;AAE/B,qCAA+C;AAE/C,2CAAoF;AAKpF;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,MAAa,UAAU;IAQrB,YACmB,kBAA0B,EAC1B,SAAkD;QADlD,uBAAkB,GAAlB,kBAAkB,CAAQ;QAC1B,cAAS,GAAT,SAAS,CAAyC;QAT7D,kBAAa,GAAG,KAAK,CAAC;QAGb,oBAAe,GAAG,IAAI,eAAe,EAAE,CAAC;IAOtD,CAAC;IAEJ;;;OAGG;IACI,MAAM,CAAC,cAAc;QAC1B,OAAO,UAAU,CAAC,qBAAqB,CAAC,MAAM,CAAC,OAAO,CAAC;IACzD,CAAC;IAED;;;OAGG;IACI,MAAM,CAAC,oBAAoB;QAChC,OAAO,UAAU,CAAC,qBAAqB,CAAC,MAAM,CAAC;IACjD,CAAC;IAEM,KAAK,CAAC,UAAU,CAAC,MAAwB,EAAE,gBAAmC;QACnF,IAAI,IAAI,CAAC,aAAa,EAAE;YACtB,OAAO;SACR;QAED,IAAI,CAAC,MAAM,GAAG,IAAI,yBAAa,CAAC;YAC9B,cAAc,EAAE,
|
|
1
|
+
{"version":3,"file":"jsExecutor.js","sourceRoot":"","sources":["../../src/JsExecutor/jsExecutor.ts"],"names":[],"mappings":"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"}
|
|
@@ -58,10 +58,10 @@ class ChildStdioTransport extends node_events_1.EventEmitter {
|
|
|
58
58
|
this.messageBuffer = new MessageUtils_1.MessageBuffer();
|
|
59
59
|
this.initialized = false;
|
|
60
60
|
this.server = new JsonRpcServer_1.JsonRpcServer({
|
|
61
|
-
requestTimeout:
|
|
61
|
+
requestTimeout: 60 * 60 * 1000
|
|
62
62
|
});
|
|
63
63
|
this.client = new JsonRpcClient_1.JsonRpcClient({
|
|
64
|
-
defaultTimeout:
|
|
64
|
+
defaultTimeout: 60 * 60 * 1000
|
|
65
65
|
});
|
|
66
66
|
// Set up the client transport that routes through our stdio
|
|
67
67
|
const clientTransport = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChildStdioTransport.js","sourceRoot":"","sources":["../../../../src/JsExecutor/transport/stdio/ChildStdioTransport.ts"],"names":[],"mappings":";;;AAAA,2BAA2B;AAC3B,6CAA2C;AAE3C,+DAA4D;AAC5D,+DAA4D;AAC5D,wDAAkE;AAElE;;GAEG;AACH,MAAM,kBAAkB;IAAxB;QAEU,aAAQ,GAAwB,EAAE,CAAC;IAyB7C,CAAC;IAvBQ,WAAW,CAAC,QAA6B;QAC9C,IAAI,CAAC,QAAQ,GAAG,EAAE,GAAG,IAAI,CAAC,QAAQ,EAAE,GAAG,QAAQ,EAAE,CAAC;IACpD,CAAC;IAEM,GAAG,CAAC,OAAe,EAAE,IAAU;QACpC,MAAM,QAAQ,GAAG;YACf,OAAO;YACP,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,GAAG,IAAI,IAAI,EAAE,IAAI,EAAE;SACpB,CAAC;QACF,4DAA4D;QAC5D,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,OAAO,IAAI,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;IAChH,CAAC;IAEM,KAAK,CAAC,OAAe,EAAE,KAAa;QACzC,MAAM,QAAQ,GAAG;YACf,KAAK,EAAE,OAAO;YACd,OAAO;YACP,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,GAAG,KAAK,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE;SACzD,CAAC;QACF,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC/D,CAAC;CACF;AAED;;;;;;;;;;;;;;;GAeG;AACH,MAAa,mBAAoB,SAAQ,0BAAY;IAQnD;QACE,KAAK,EAAE,CAAC;QANO,WAAM,GAAG,IAAI,kBAAkB,EAAE,CAAC;QAClC,kBAAa,GAAG,IAAI,4BAAa,EAAE,CAAC;QAE7C,gBAAW,GAAG,KAAK,CAAC;QAI1B,IAAI,CAAC,MAAM,GAAG,IAAI,6BAAa,CAAC;YAC9B,cAAc,EAAE,
|
|
1
|
+
{"version":3,"file":"ChildStdioTransport.js","sourceRoot":"","sources":["../../../../src/JsExecutor/transport/stdio/ChildStdioTransport.ts"],"names":[],"mappings":"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"}
|
|
@@ -48,8 +48,8 @@ class ParentStdioTransport extends BaseTransport_1.BaseTransport {
|
|
|
48
48
|
this.executorScriptPath = executorScriptPath;
|
|
49
49
|
this.server = server;
|
|
50
50
|
this.client = new JsonRpcClient_1.JsonRpcClient({
|
|
51
|
-
//
|
|
52
|
-
defaultTimeout:
|
|
51
|
+
// 1 hour
|
|
52
|
+
defaultTimeout: 60 * 60 * 1000
|
|
53
53
|
});
|
|
54
54
|
this.clientTransport = new StdioClientTransport(this.processManager);
|
|
55
55
|
this.setupServerMethods();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ParentStdioTransport.js","sourceRoot":"","sources":["../../../../src/JsExecutor/transport/stdio/ParentStdioTransport.ts"],"names":[],"mappings":";AAAA,qEAAqE;;;AAErE,4CAAyC;AAEzC,+DAA4D;AAG5D,+CAAuD;AAEvD,yDAAsD;AACtD,8DAA2D;AAE3D,4CAA+C;AAC/C,wDAAkE;AAClE,wDAAyD;AAEzD;;GAEG;AACH,MAAa,oBAAoB;IAK/B,YAAoC,cAA8B;QAA9B,mBAAc,GAAd,cAAc,CAAgB;QAFjD,WAAM,GAAG,eAAM,CAAC,WAAW,EAAE,CAAC;IAEsB,CAAC;IAE/D,OAAO,CAAC,IAAY;QACzB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,sBAAsB,EAAE,CAAC,CAAC;IACvE,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,OAAe;QAC/B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;QAC5C,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,GAAG,OAAO,IAAI,CAAC,CAAC;IAC5C,CAAC;IAEM,SAAS,CAAC,OAAkC;QACjD,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC;QAC9B,wEAAwE;QACxE,wCAAwC;IAC1C,CAAC;IAEM,KAAK,CAAC,KAAK;QAChB,IAAI,CAAC,cAAc,GAAG,SAAS,CAAC;IAClC,CAAC;CACF;AA1BD,oDA0BC;AAED;;;GAGG;AACH,MAAa,oBAAqB,SAAQ,6BAAa;IAQrD,YAAmB,kBAA0B,EAAE,MAAqB;QAClE,KAAK,EAAE,CAAC;QARO,mBAAc,GAAG,IAAI,+BAAc,EAAE,CAAC;QAKtC,kBAAa,GAAG,IAAI,4BAAa,EAAE,CAAC;QAInD,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;QAC7C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,IAAI,6BAAa,CAAC;YAC9B,
|
|
1
|
+
{"version":3,"file":"ParentStdioTransport.js","sourceRoot":"","sources":["../../../../src/JsExecutor/transport/stdio/ParentStdioTransport.ts"],"names":[],"mappings":"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"}
|
package/dist/SklEngine.d.ts
CHANGED
|
@@ -83,7 +83,7 @@ export declare class SKLEngine implements SKLEngineInterface {
|
|
|
83
83
|
private performReturnValueMappingWithFrameIfDefined;
|
|
84
84
|
private performParameterMappingOnArgsIfDefined;
|
|
85
85
|
private getDataAtReference;
|
|
86
|
-
private
|
|
86
|
+
private getIntegrationInterface;
|
|
87
87
|
private findSecurityCredentialsForAccountIfDefined;
|
|
88
88
|
private findgetOpenApiRuntimeAuthorizationCapabilityIfDefined;
|
|
89
89
|
private getRuntimeCredentialsWithSecurityCredentials;
|
|
@@ -108,6 +108,7 @@ export declare class SKLEngine implements SKLEngineInterface {
|
|
|
108
108
|
private ifCapabilityStreaming;
|
|
109
109
|
private isJavaScriptCode;
|
|
110
110
|
private ensureNodeObject;
|
|
111
|
+
private executeCodeBlocks;
|
|
111
112
|
private executeJavaScriptMapping;
|
|
112
113
|
get hooks(): typeof globalHooks;
|
|
113
114
|
}
|
package/dist/SklEngine.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
/* eslint-disable max-len */
|
|
2
3
|
/* eslint-disable no-div-regex */
|
|
3
4
|
/* eslint-disable line-comment-position */
|
|
4
5
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
@@ -417,10 +418,13 @@ class SKLEngine {
|
|
|
417
418
|
return await this.queryAdapter.destroyAll();
|
|
418
419
|
}
|
|
419
420
|
async performMapping(args, mapping, frame, capabilityConfig, jsExecutionOptions) {
|
|
420
|
-
|
|
421
|
-
|
|
422
|
-
this.isJavaScriptCode((0, Util_1.getValueIfDefined)(
|
|
423
|
-
|
|
421
|
+
const mappingArray = (0, Util_1.ensureArray)(mapping);
|
|
422
|
+
const codeBlocks = mappingArray.filter((mappingItem) => mappingItem[constants_1.PROP_ENTITY_TYPE] === constants_1.EngineConstants.spec.codeBlock &&
|
|
423
|
+
this.isJavaScriptCode((0, Util_1.getValueIfDefined)(mappingItem[constants_1.EngineConstants.prop.codeBody])));
|
|
424
|
+
// FIXME: Handle if we can combine the codeb blocks with triples map.
|
|
425
|
+
// As of now if there is any code block, triples map does not get executed.
|
|
426
|
+
if (codeBlocks.length > 0) {
|
|
427
|
+
return await this.executeCodeBlocks(codeBlocks, args, jsExecutionOptions ?? {});
|
|
424
428
|
}
|
|
425
429
|
const functions = {
|
|
426
430
|
...this.functions,
|
|
@@ -519,7 +523,7 @@ class SKLEngine {
|
|
|
519
523
|
}
|
|
520
524
|
}
|
|
521
525
|
const mappings = await this.findAllBy({
|
|
522
|
-
type: constants_1.EngineConstants.spec.
|
|
526
|
+
type: constants_1.EngineConstants.spec.capabilityMapping,
|
|
523
527
|
[constants_1.EngineConstants.prop.capability]: capabilityId,
|
|
524
528
|
[constants_1.EngineConstants.prop.integration]: (0, Not_1.Not)((0, Exists_1.Exists)()),
|
|
525
529
|
[constants_1.EngineConstants.prop.object]: (0, Not_1.Not)((0, Exists_1.Exists)())
|
|
@@ -541,28 +545,31 @@ class SKLEngine {
|
|
|
541
545
|
async executeMapping(mapping, args, capabilityConfig, account) {
|
|
542
546
|
args = await this.addPreProcessingMappingToArgs(mapping, args, capabilityConfig);
|
|
543
547
|
let returnValue;
|
|
544
|
-
|
|
545
|
-
|
|
546
|
-
|
|
547
|
-
|
|
548
|
-
|
|
548
|
+
// If (EngineConstants.prop.capability in mapping || EngineConstants.prop.capabilityMapping in mapping) {
|
|
549
|
+
// const capabilityId = await this.performCapabilityMappingWithArgs(args, mapping, capabilityConfig);
|
|
550
|
+
// const mappedArgs = await this.performParameterMappingOnArgsIfDefined(
|
|
551
|
+
// { ...args, capabilityId },
|
|
552
|
+
// mapping as MappingWithInputs,
|
|
553
|
+
// capabilityConfig
|
|
554
|
+
// );
|
|
555
|
+
// Logger.getInstance().log('Mapped args', mappedArgs);
|
|
556
|
+
// returnValue = await this.executeCapabilityMapping(mapping, args, mappedArgs, capabilityConfig);
|
|
557
|
+
// } else {
|
|
558
|
+
const mappedArgs = await this.performParameterMappingOnArgsIfDefined(args, mapping, capabilityConfig);
|
|
559
|
+
logger_1.Logger.getInstance().log('Mapped args', mappedArgs);
|
|
560
|
+
if (constants_1.EngineConstants.prop.operationId in mapping || constants_1.EngineConstants.prop.operationMapping in mapping) {
|
|
561
|
+
returnValue = (await this.executeOperationMapping(mapping, mappedArgs, args, account, capabilityConfig));
|
|
562
|
+
}
|
|
563
|
+
else if (constants_1.EngineConstants.prop.series in mapping) {
|
|
564
|
+
returnValue = await this.executeSeriesMapping(mapping, mappedArgs, capabilityConfig);
|
|
565
|
+
}
|
|
566
|
+
else if (constants_1.EngineConstants.prop.parallel in mapping) {
|
|
567
|
+
returnValue = await this.executeParallelMapping(mapping, mappedArgs, capabilityConfig);
|
|
549
568
|
}
|
|
550
569
|
else {
|
|
551
|
-
|
|
552
|
-
logger_1.Logger.getInstance().log('Mapped args', mappedArgs);
|
|
553
|
-
if (constants_1.EngineConstants.prop.operationId in mapping || constants_1.EngineConstants.prop.operationMapping in mapping) {
|
|
554
|
-
returnValue = (await this.executeOperationMapping(mapping, mappedArgs, args, account, capabilityConfig));
|
|
555
|
-
}
|
|
556
|
-
else if (constants_1.EngineConstants.prop.series in mapping) {
|
|
557
|
-
returnValue = await this.executeSeriesMapping(mapping, mappedArgs, capabilityConfig);
|
|
558
|
-
}
|
|
559
|
-
else if (constants_1.EngineConstants.prop.parallel in mapping) {
|
|
560
|
-
returnValue = await this.executeParallelMapping(mapping, mappedArgs, capabilityConfig);
|
|
561
|
-
}
|
|
562
|
-
else {
|
|
563
|
-
returnValue = mappedArgs;
|
|
564
|
-
}
|
|
570
|
+
returnValue = mappedArgs;
|
|
565
571
|
}
|
|
572
|
+
// }
|
|
566
573
|
return await this.performReturnValueMappingWithFrameIfDefined(returnValue, mapping, capabilityConfig);
|
|
567
574
|
}
|
|
568
575
|
shouldValidate(capabilityConfig) {
|
|
@@ -571,10 +578,16 @@ class SKLEngine {
|
|
|
571
578
|
: !capabilityConfig.disableValidation;
|
|
572
579
|
}
|
|
573
580
|
async executeOperationMapping(mapping, mappedArgs, originalArgs, account, capabilityConfig) {
|
|
574
|
-
const
|
|
575
|
-
|
|
576
|
-
|
|
577
|
-
|
|
581
|
+
const integration = mapping[constants_1.EngineConstants.prop.integration]?.[constants_1.PROP_ENTITY_ID];
|
|
582
|
+
// If the mapping has an integration, it means that the operation is an integration operation
|
|
583
|
+
if (integration) {
|
|
584
|
+
const operationInfo = await this.performOperationMappingWithArgs(originalArgs, mapping, capabilityConfig);
|
|
585
|
+
const response = await this.performOperation(operationInfo, mappedArgs, originalArgs, account, capabilityConfig);
|
|
586
|
+
logger_1.Logger.getInstance().log('Original response', JSON.stringify(response));
|
|
587
|
+
return response;
|
|
588
|
+
}
|
|
589
|
+
// If the mapping does not have an integration, it means that the operation is a capability operation
|
|
590
|
+
return await this.executeCapabilityMapping(mapping, originalArgs, mappedArgs, capabilityConfig);
|
|
578
591
|
}
|
|
579
592
|
async executeSeriesMapping(mapping, args, capabilityConfig) {
|
|
580
593
|
const seriesCapabilityMappingsList = this.rdfListToArray(mapping[constants_1.EngineConstants.prop.series]);
|
|
@@ -807,18 +820,22 @@ class SKLEngine {
|
|
|
807
820
|
}
|
|
808
821
|
return result;
|
|
809
822
|
}
|
|
810
|
-
async
|
|
811
|
-
|
|
812
|
-
|
|
813
|
-
|
|
814
|
-
|
|
815
|
-
|
|
816
|
-
|
|
823
|
+
async getIntegrationInterface(integratedProductId, integrationType = constants_1.EngineConstants.spec.integrationInterface) {
|
|
824
|
+
if (integrationType === constants_1.EngineConstants.spec.integrationInterface) {
|
|
825
|
+
const integrationInterface = await this.findBy({
|
|
826
|
+
type: integrationType,
|
|
827
|
+
[constants_1.EngineConstants.prop.type]: constants_1.EngineConstants.spec.openApi,
|
|
828
|
+
[constants_1.EngineConstants.prop.integration]: integratedProductId
|
|
829
|
+
});
|
|
830
|
+
return integrationInterface;
|
|
831
|
+
}
|
|
832
|
+
// Add support for other integration types
|
|
833
|
+
return null;
|
|
817
834
|
}
|
|
818
835
|
async findSecurityCredentialsForAccountIfDefined(accountId) {
|
|
819
836
|
return await this.findByIfExists({
|
|
820
837
|
type: constants_1.EngineConstants.spec.integrationAuthenticationCredential,
|
|
821
|
-
[constants_1.EngineConstants.prop.
|
|
838
|
+
[constants_1.EngineConstants.prop.accountOrUser]: accountId
|
|
822
839
|
});
|
|
823
840
|
}
|
|
824
841
|
async findgetOpenApiRuntimeAuthorizationCapabilityIfDefined() {
|
|
@@ -861,11 +878,11 @@ class SKLEngine {
|
|
|
861
878
|
}));
|
|
862
879
|
}
|
|
863
880
|
async performCapabilityMappingWithArgs(args, mapping, capabilityConfig) {
|
|
864
|
-
if (mapping[constants_1.EngineConstants.prop.
|
|
865
|
-
return (0, Util_1.getValueIfDefined)(mapping[constants_1.EngineConstants.prop.
|
|
881
|
+
if (mapping[constants_1.EngineConstants.prop.operationId]) {
|
|
882
|
+
return (0, Util_1.getValueIfDefined)(mapping[constants_1.EngineConstants.prop.operationId]);
|
|
866
883
|
}
|
|
867
|
-
const capabilityInfoJsonLd = await this.performMapping(args, mapping[constants_1.EngineConstants.prop.
|
|
868
|
-
return (0, Util_1.getValueIfDefined)(capabilityInfoJsonLd[constants_1.EngineConstants.prop.
|
|
884
|
+
const capabilityInfoJsonLd = await this.performMapping(args, mapping[constants_1.EngineConstants.prop.operationMapping], undefined, capabilityConfig);
|
|
885
|
+
return (0, Util_1.getValueIfDefined)(capabilityInfoJsonLd[constants_1.EngineConstants.prop.operationId]);
|
|
869
886
|
}
|
|
870
887
|
async assertCapabilityParamsMatchParameterSchemas(capabilityParams, capability) {
|
|
871
888
|
let parametersSchemaObject = capability[constants_1.EngineConstants.prop.inputs];
|
|
@@ -886,7 +903,11 @@ class SKLEngine {
|
|
|
886
903
|
}
|
|
887
904
|
async performOpenapiOperationWithCredentials(operationId, operationArgs, account, capabilityConfig) {
|
|
888
905
|
const integratedProductId = account[constants_1.EngineConstants.prop.integration][constants_1.PROP_ENTITY_ID];
|
|
889
|
-
const
|
|
906
|
+
const restAPIInterface = await this.getIntegrationInterface(integratedProductId);
|
|
907
|
+
if (!restAPIInterface) {
|
|
908
|
+
throw new Error(`No integration interface found for integrated product ${integratedProductId}`);
|
|
909
|
+
}
|
|
910
|
+
const openApiDescription = (0, Util_1.getValueIfDefined)(restAPIInterface[constants_1.EngineConstants.prop.declarativeApiDescription]);
|
|
890
911
|
const openApiExecutor = await this.createOpenApiOperationExecutorWithSpec(openApiDescription);
|
|
891
912
|
// eslint-disable-next-line @typescript-eslint/await-thenable
|
|
892
913
|
const openApiOperationInformation = await openApiExecutor.getOperationWithPathInfoMatchingOperationId(operationId);
|
|
@@ -907,8 +928,8 @@ class SKLEngine {
|
|
|
907
928
|
bearerToken: (0, Util_1.getValueIfDefined)(securityCredentials?.[constants_1.EngineConstants.prop.bearerToken]),
|
|
908
929
|
apiKey,
|
|
909
930
|
basePath: (0, Util_1.getValueIfDefined)(account[constants_1.EngineConstants.prop.overrideBasePath]),
|
|
910
|
-
username: (0, Util_1.getValueIfDefined)(securityCredentials?.[constants_1.EngineConstants.prop.
|
|
911
|
-
password: (0, Util_1.getValueIfDefined)(securityCredentials?.[constants_1.EngineConstants.prop.
|
|
931
|
+
username: (0, Util_1.getValueIfDefined)(securityCredentials?.[constants_1.EngineConstants.prop.username]),
|
|
932
|
+
password: (0, Util_1.getValueIfDefined)(securityCredentials?.[constants_1.EngineConstants.prop.password])
|
|
912
933
|
};
|
|
913
934
|
let response;
|
|
914
935
|
let executeOperationOptions;
|
|
@@ -962,8 +983,11 @@ class SKLEngine {
|
|
|
962
983
|
return undefined;
|
|
963
984
|
}
|
|
964
985
|
async isInvalidTokenError(error, integratedProductId) {
|
|
965
|
-
const
|
|
966
|
-
|
|
986
|
+
const integrationInterface = await this.getIntegrationInterface(integratedProductId);
|
|
987
|
+
if (!integrationInterface) {
|
|
988
|
+
return false;
|
|
989
|
+
}
|
|
990
|
+
const errorMatcher = integrationInterface[constants_1.EngineConstants.prop.invalidTokenErrorMatcher];
|
|
967
991
|
const errorMatcherStatus = errorMatcher && (0, Util_1.getValueIfDefined)(errorMatcher[constants_1.EngineConstants.prop.invalidTokenErrorMatcherStatus]);
|
|
968
992
|
const errorMatcherRegex = errorMatcher &&
|
|
969
993
|
(0, Util_1.getValueIfDefined)(errorMatcher[constants_1.EngineConstants.prop.invalidTokenErrorMatcherMessageRegex]);
|
|
@@ -1011,8 +1035,8 @@ class SKLEngine {
|
|
|
1011
1035
|
return { accessToken, bearerToken };
|
|
1012
1036
|
}
|
|
1013
1037
|
getOauthConfigurationFromSecurityCredentials(securityCredentialsSchema) {
|
|
1014
|
-
const username = (0, Util_1.getValueIfDefined)(securityCredentialsSchema[constants_1.EngineConstants.prop.
|
|
1015
|
-
const password = (0, Util_1.getValueIfDefined)(securityCredentialsSchema[constants_1.EngineConstants.prop.
|
|
1038
|
+
const username = (0, Util_1.getValueIfDefined)(securityCredentialsSchema[constants_1.EngineConstants.prop.username]);
|
|
1039
|
+
const password = (0, Util_1.getValueIfDefined)(securityCredentialsSchema[constants_1.EngineConstants.prop.password]);
|
|
1016
1040
|
const accessToken = (0, Util_1.getValueIfDefined)(securityCredentialsSchema[constants_1.EngineConstants.prop.accessToken]);
|
|
1017
1041
|
return { username, password, accessToken };
|
|
1018
1042
|
}
|
|
@@ -1076,12 +1100,16 @@ class SKLEngine {
|
|
|
1076
1100
|
}
|
|
1077
1101
|
async performOauthSecuritySchemeStageWithCredentials(operationInfo, operationParameters, account, securityCredentials) {
|
|
1078
1102
|
const integratedProductId = account[constants_1.EngineConstants.prop.integration][constants_1.PROP_ENTITY_ID];
|
|
1079
|
-
const
|
|
1103
|
+
const restAPIInterface = await this.getIntegrationInterface(integratedProductId);
|
|
1104
|
+
if (!restAPIInterface) {
|
|
1105
|
+
throw new Error(`No integration interface found for integrated product ${integratedProductId}`);
|
|
1106
|
+
}
|
|
1107
|
+
const openApiDescription = (0, Util_1.getValueIfDefined)(restAPIInterface[constants_1.EngineConstants.prop.declarativeApiDescription]);
|
|
1080
1108
|
securityCredentials || (securityCredentials = await this.findSecurityCredentialsForAccountIfDefined(account[constants_1.PROP_ENTITY_ID]));
|
|
1081
1109
|
let configuration;
|
|
1082
1110
|
if (securityCredentials) {
|
|
1083
1111
|
configuration = this.getOauthConfigurationFromSecurityCredentials(securityCredentials);
|
|
1084
|
-
operationParameters.client_id = (0, Util_1.getValueIfDefined)(securityCredentials[constants_1.EngineConstants.prop.
|
|
1112
|
+
operationParameters.client_id = (0, Util_1.getValueIfDefined)(securityCredentials[constants_1.EngineConstants.prop.username]);
|
|
1085
1113
|
}
|
|
1086
1114
|
else {
|
|
1087
1115
|
configuration = {};
|
|
@@ -1237,6 +1265,22 @@ class SKLEngine {
|
|
|
1237
1265
|
...result
|
|
1238
1266
|
};
|
|
1239
1267
|
}
|
|
1268
|
+
async executeCodeBlocks(codeBlocks, args, executionOptions) {
|
|
1269
|
+
const results = [];
|
|
1270
|
+
let updatedArgs = args || {};
|
|
1271
|
+
for (const codeBlock of codeBlocks) {
|
|
1272
|
+
const code = (0, Util_1.getValueIfDefined)(codeBlock[constants_1.EngineConstants.prop.codeBody]);
|
|
1273
|
+
if (code) {
|
|
1274
|
+
const result = await this.executeJavaScriptMapping(updatedArgs, code, executionOptions);
|
|
1275
|
+
updatedArgs = {
|
|
1276
|
+
...updatedArgs,
|
|
1277
|
+
...result
|
|
1278
|
+
};
|
|
1279
|
+
results.push(result);
|
|
1280
|
+
}
|
|
1281
|
+
}
|
|
1282
|
+
return results.length > 0 ? results[results.length - 1] : {};
|
|
1283
|
+
}
|
|
1240
1284
|
async executeJavaScriptMapping(args, code, _executionOptions) {
|
|
1241
1285
|
try {
|
|
1242
1286
|
// Configure execution options
|
|
@@ -1259,6 +1303,11 @@ class SKLEngine {
|
|
|
1259
1303
|
if (executionResult?.error) {
|
|
1260
1304
|
throw new Error(`Code execution error: ${executionResult.error?.message ?? 'Unknown error'}`);
|
|
1261
1305
|
}
|
|
1306
|
+
// This is a patch to return the output as it is without converting to NodeObject
|
|
1307
|
+
// This is needed for some api inputs. We can try doing this using the frame.
|
|
1308
|
+
if (executionResult?.result?.rawOutput) {
|
|
1309
|
+
return executionResult?.result?.rawOutput;
|
|
1310
|
+
}
|
|
1262
1311
|
// Convert the result to a NodeObject
|
|
1263
1312
|
return this.ensureNodeObject(executionResult?.result ?? executionResult);
|
|
1264
1313
|
}
|