@avaprotocol/sdk-js 2.4.3 → 2.5.0

package/dist/models/node/loop.js

@@ -1,6 +1,12 @@
 import * as avs_pb from "@/grpc_codegen/avs_pb";
 import Node from "./interface";
-import { NodeType, } from "@avaprotocol/types";
+import CustomCodeNode from "./customCode";
+import ETHTransferNode from "./ethTransfer";
+import RestAPINode from "./restApi";
+import GraphQLQueryNode from "./graphqlQuery";
+import ContractReadNode from "./contractRead";
+import ContractWriteNode from "./contractWrite";
+import { NodeType, ExecutionMode, } from "@avaprotocol/types";
 import { convertInputToProtobuf, extractInputFromProtobuf } from "../../utils";
 class LoopNode extends Node {
     constructor(props) {
@@ -16,16 +22,13 @@ class LoopNode extends Node {
         const configData = loopNode.getConfig()?.toObject();
         const loopNodeData = loopNode.toObject();
         // Since LoopNodeData is now Config.AsObject, we need to merge the config properties
-        // with the nested node data from the full object
+        // with the runner data from the protobuf structure
         const data = {
             ...configData,
-            // Keep the nested node structures from the full object
-            restApi: loopNodeData.restApi,
-            customCode: loopNodeData.customCode,
-            ethTransfer: loopNodeData.ethTransfer,
-            contractRead: loopNodeData.contractRead,
-            contractWrite: loopNodeData.contractWrite,
-            graphqlDataQuery: loopNodeData.graphqlDataQuery,
+            // Extract runner data from the oneof runner field
+            runner: this.extractRunnerFromProtobuf(loopNodeData),
+            // Map execution mode from protobuf enum to ExecutionMode enum
+            executionMode: this.mapExecutionModeFromProtobuf(configData?.executionMode),
         };
         // Extract input data from top-level TaskNode.input field (not nested LoopNode.input)
         // This matches where we set it in toRequest() and where the Go backend looks for it
@@ -40,6 +43,61 @@ class LoopNode extends Node {
             input: input,
         });
     }
+    static extractRunnerFromProtobuf(loopNodeData) {
+        // Define a mapping of runner types to their corresponding data keys
+        const runnerMapping = {
+            restApi: "restApi",
+            customCode: "customCode",
+            ethTransfer: "ethTransfer",
+            contractRead: "contractRead",
+            contractWrite: "contractWrite",
+            graphqlDataQuery: "graphqlDataQuery",
+        };
+        // Iterate over the mapping to find the matching runner type
+        for (const [type, key] of Object.entries(runnerMapping)) {
+            if (loopNodeData[key]) {
+                return { type, data: loopNodeData[key] };
+            }
+        }
+        return null;
+    }
+    static mapExecutionModeFromProtobuf(executionMode) {
+        // Map protobuf ExecutionMode enum to ExecutionMode enum
+        // EXECUTION_MODE_SEQUENTIAL = 0, EXECUTION_MODE_PARALLEL = 1
+        switch (executionMode) {
+            case 0:
+                return ExecutionMode.Sequential;
+            case 1:
+                return ExecutionMode.Parallel;
+            default:
+                return ExecutionMode.Sequential; // Default to sequential for safety
+        }
+    }
+    mapExecutionModeToProtobuf(executionMode) {
+        // Map ExecutionMode enum or string to protobuf ExecutionMode enum
+        // EXECUTION_MODE_SEQUENTIAL = 0, EXECUTION_MODE_PARALLEL = 1
+        if (!executionMode) {
+            return 0; // Default to sequential for safety
+        }
+        if (typeof executionMode === "string") {
+            switch (executionMode.toLowerCase()) {
+                case "parallel":
+                    return 1;
+                case "sequential":
+                default:
+                    return 0; // Default to sequential for safety
+            }
+        }
+        else {
+            switch (executionMode) {
+                case ExecutionMode.Parallel:
+                    return 1;
+                case ExecutionMode.Sequential:
+                default:
+                    return 0; // Default to sequential for safety
+            }
+        }
+    }
     toRequest() {
         const node = new avs_pb.TaskNode();
         const loopNode = new avs_pb.LoopNode();
@@ -51,6 +109,9 @@ class LoopNode extends Node {
         config.setSourceId(data.sourceId || "");
         config.setIterVal(data.iterVal || "");
         config.setIterKey(data.iterKey || "");
+        // Set execution mode - map ExecutionMode enum to protobuf enum
+        const executionMode = this.mapExecutionModeToProtobuf(data.executionMode);
+        config.setExecutionMode(executionMode);
         loopNode.setConfig(config);
         // Set input data on the top-level TaskNode, not the nested LoopNode
         // This matches where the Go backend's ExtractNodeInputData() looks for it
@@ -58,106 +119,97 @@ class LoopNode extends Node {
         if (inputValue) {
             node.setInput(inputValue);
         }
-        // Handle nested nodes - these still use the nested structure within LoopNodeData
-        if (data.ethTransfer) {
-            const ethTransfer = new avs_pb.ETHTransferNode();
-            if (data.ethTransfer.config) {
-                const config = new avs_pb.ETHTransferNode.Config();
-                config.setDestination(data.ethTransfer.config.destination);
-                config.setAmount(data.ethTransfer.config.amount);
-                ethTransfer.setConfig(config);
-            }
-            loopNode.setEthTransfer(ethTransfer);
+        // Handle runner - check the runner field and set the appropriate oneof field
+        if (data.runner) {
+            this.setRunnerOnProtobuf(loopNode, data.runner);
         }
-        else if (data.contractWrite) {
-            const contractWrite = new avs_pb.ContractWriteNode();
-            if (data.contractWrite.config) {
-                const config = new avs_pb.ContractWriteNode.Config();
-                config.setContractAddress(data.contractWrite.config.contractAddress);
-                config.setCallData(data.contractWrite.config.callData);
-                config.setContractAbi(data.contractWrite.config.contractAbi);
-                // Handle method calls array for ContractWrite
-                const methodCalls = data.contractWrite.config.methodCallsList || [];
-                methodCalls.forEach((methodCall) => {
-                    const methodCallMsg = new avs_pb.ContractWriteNode.MethodCall();
-                    methodCallMsg.setCallData(methodCall.callData);
-                    if (methodCall.methodName) {
-                        methodCallMsg.setMethodName(methodCall.methodName);
-                    }
-                    config.addMethodCalls(methodCallMsg);
-                });
-                contractWrite.setConfig(config);
-            }
-            loopNode.setContractWrite(contractWrite);
+        node.setLoop(loopNode);
+        return node;
+    }
+    setRunnerOnProtobuf(loopNode, runner) {
+        if (!runner || !runner.type || !runner.data) {
+            return;
         }
-        else if (data.contractRead) {
-            const contractRead = new avs_pb.ContractReadNode();
-            if (data.contractRead.config) {
-                const config = new avs_pb.ContractReadNode.Config();
-                config.setContractAddress(data.contractRead.config.contractAddress);
-                config.setContractAbi(data.contractRead.config.contractAbi);
-                // Handle method calls array
-                const methodCalls = data.contractRead.config.methodCallsList || [];
-                methodCalls.forEach((methodCall) => {
-                    const methodCallMsg = new avs_pb.ContractReadNode.MethodCall();
-                    methodCallMsg.setCallData(methodCall.callData);
-                    if (methodCall.methodName) {
-                        methodCallMsg.setMethodName(methodCall.methodName);
-                    }
-                    if (methodCall.applyToFields) {
-                        methodCallMsg.setApplyToFieldsList(methodCall.applyToFields);
-                    }
-                    config.addMethodCalls(methodCallMsg);
-                });
-                contractRead.setConfig(config);
+        switch (runner.type) {
+            case "ethTransfer": {
+                const ethTransferData = runner.data;
+                if (ethTransferData.config) {
+                    const ethConfig = ethTransferData.config;
+                    const ethTransfer = ETHTransferNode.createProtobufNode({
+                        destination: ethConfig.destination,
+                        amount: ethConfig.amount,
+                    });
+                    loopNode.setEthTransfer(ethTransfer);
+                }
+                break;
             }
-            loopNode.setContractRead(contractRead);
-        }
-        else if (data.graphqlDataQuery) {
-            const graphqlQuery = new avs_pb.GraphQLQueryNode();
-            if (data.graphqlDataQuery.config) {
-                const config = new avs_pb.GraphQLQueryNode.Config();
-                config.setUrl(data.graphqlDataQuery.config.url);
-                config.setQuery(data.graphqlDataQuery.config.query);
-                if (data.graphqlDataQuery.config.variablesMap &&
-                    data.graphqlDataQuery.config.variablesMap.length > 0) {
-                    data.graphqlDataQuery.config.variablesMap.forEach(([key, value]) => {
-                        config.getVariablesMap().set(key, value);
+            case "contractWrite": {
+                const contractWriteData = runner.data;
+                if (contractWriteData.config) {
+                    const writeConfig = contractWriteData.config;
+                    const contractWrite = ContractWriteNode.createProtobufNode({
+                        contractAddress: writeConfig.contractAddress,
+                        callData: writeConfig.callData,
+                        contractAbi: writeConfig.contractAbi,
+                        methodCalls: writeConfig.methodCallsList || [],
                     });
+                    loopNode.setContractWrite(contractWrite);
                 }
-                graphqlQuery.setConfig(config);
+                break;
             }
-            loopNode.setGraphqlDataQuery(graphqlQuery);
-        }
-        else if (data.restApi) {
-            const restApi = new avs_pb.RestAPINode();
-            if (data.restApi.config) {
-                const config = new avs_pb.RestAPINode.Config();
-                config.setUrl(data.restApi.config.url);
-                config.setMethod(data.restApi.config.method);
-                config.setBody(data.restApi.config.body || "");
-                if (data.restApi.config.headersMap &&
-                    data.restApi.config.headersMap.length > 0) {
-                    data.restApi.config.headersMap.forEach(([key, value]) => {
-                        config.getHeadersMap().set(key, value);
+            case "contractRead": {
+                const contractReadData = runner.data;
+                if (contractReadData.config) {
+                    const readConfig = contractReadData.config;
+                    const contractRead = ContractReadNode.createProtobufNode({
+                        contractAddress: readConfig.contractAddress,
+                        contractAbi: readConfig.contractAbi,
+                        methodCalls: readConfig.methodCallsList || [],
                     });
+                    loopNode.setContractRead(contractRead);
                 }
-                restApi.setConfig(config);
+                break;
             }
-            loopNode.setRestApi(restApi);
-        }
-        else if (data.customCode) {
-            const customCode = new avs_pb.CustomCodeNode();
-            if (data.customCode.config) {
-                const config = new avs_pb.CustomCodeNode.Config();
-                config.setLang(data.customCode.config.lang);
-                config.setSource(data.customCode.config.source);
-                customCode.setConfig(config);
+            case "graphqlDataQuery": {
+                const graphqlData = runner.data;
+                if (graphqlData.config) {
+                    const gqlConfig = graphqlData.config;
+                    const graphqlQuery = GraphQLQueryNode.createProtobufNode({
+                        url: gqlConfig.url,
+                        query: gqlConfig.query,
+                        variablesMap: gqlConfig.variablesMap,
+                    });
+                    loopNode.setGraphqlDataQuery(graphqlQuery);
+                }
+                break;
+            }
+            case "restApi": {
+                const restApiData = runner.data;
+                if (restApiData.config) {
+                    const apiConfig = restApiData.config;
+                    const restApi = RestAPINode.createProtobufNode({
+                        url: apiConfig.url,
+                        method: apiConfig.method,
+                        body: apiConfig.body || "",
+                        headersMap: apiConfig.headersMap,
+                    });
+                    loopNode.setRestApi(restApi);
+                }
+                break;
+            }
+            case "customCode": {
+                const customCodeData = runner.data;
+                if (customCodeData.config) {
+                    const codeConfig = customCodeData.config;
+                    const customCode = CustomCodeNode.createProtobufNode({
+                        lang: codeConfig.lang,
+                        source: codeConfig.source,
+                    });
+                    loopNode.setCustomCode(customCode);
+                }
+                break;
             }
-            loopNode.setCustomCode(customCode);
         }
-        node.setLoop(loopNode);
-        return node;
     }
     static fromOutputData(outputData) {
         // For immediate execution, data comes as CustomCode format
@@ -182,7 +234,7 @@ class LoopNode extends Node {
                 try {
                     return JSON.parse(loopObj.data);
                 }
-                catch (e) {
+                catch {
                     // If JSON parsing fails, return the raw data
                     return loopObj.data;
                 }

package/dist/models/node/restApi.d.ts

@@ -3,6 +3,17 @@ import * as avs_pb from "@/grpc_codegen/avs_pb";
 import { RestAPINodeProps } from "@avaprotocol/types";
 declare class RestAPINode extends Node {
     constructor(props: RestAPINodeProps);
+    /**
+     * Create a protobuf RestAPINode from config data
+     * @param configData - The configuration data for the REST API node
+     * @returns Configured avs_pb.RestAPINode
+     */
+    static createProtobufNode(configData: {
+        url: string;
+        method: string;
+        body?: string;
+        headersMap?: Array<[string, string]>;
+    }): avs_pb.RestAPINode;
     static fromResponse(raw: avs_pb.TaskNode): RestAPINode;
     toRequest(): avs_pb.TaskNode;
     static fromOutputData(outputData: avs_pb.RunNodeWithInputsResp): any;

package/dist/models/node/restApi.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"restApi.d.ts","sourceRoot":"","sources":["../../../src/models/node/restApi.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,aAAa,CAAC;AAC/B,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAGL,gBAAgB,EAEjB,MAAM,oBAAoB,CAAC;AAS5B,cAAM,WAAY,SAAQ,IAAI;gBAChB,KAAK,EAAE,gBAAgB;IAInC,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,QAAQ,GAAG,WAAW;IAmBtD,SAAS,IAAI,MAAM,CAAC,QAAQ;IAyC5B,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,CAAC,qBAAqB,GAAG,GAAG;CAerE;AAED,eAAe,WAAW,CAAC"}
+{"version":3,"file":"restApi.d.ts","sourceRoot":"","sources":["../../../src/models/node/restApi.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,aAAa,CAAC;AAC/B,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAGL,gBAAgB,EAEjB,MAAM,oBAAoB,CAAC;AAS5B,cAAM,WAAY,SAAQ,IAAI;gBAChB,KAAK,EAAE,gBAAgB;IAInC;;;;OAIG;IACH,MAAM,CAAC,kBAAkB,CAAC,UAAU,EAAE;QACpC,GAAG,EAAE,MAAM,CAAC;QACZ,MAAM,EAAE,MAAM,CAAC;QACf,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,UAAU,CAAC,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;KACtC,GAAG,MAAM,CAAC,WAAW;IAmBtB,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,QAAQ,GAAG,WAAW;IAmBtD,SAAS,IAAI,MAAM,CAAC,QAAQ;IAwB5B,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,CAAC,qBAAqB,GAAG,GAAG;CAerE;AAED,eAAe,WAAW,CAAC"}

package/dist/models/node/restApi.js

@@ -7,6 +7,26 @@ class RestAPINode extends Node {
     constructor(props) {
         super({ ...props, type: NodeType.RestAPI, data: props.data });
     }
+    /**
+     * Create a protobuf RestAPINode from config data
+     * @param configData - The configuration data for the REST API node
+     * @returns Configured avs_pb.RestAPINode
+     */
+    static createProtobufNode(configData) {
+        const node = new avs_pb.RestAPINode();
+        const config = new avs_pb.RestAPINode.Config();
+        config.setUrl(configData.url);
+        config.setMethod(configData.method);
+        config.setBody(configData.body || "");
+        if (configData.headersMap && configData.headersMap.length > 0) {
+            const headersMap = config.getHeadersMap();
+            configData.headersMap.forEach(([key, value]) => {
+                headersMap.set(key, value);
+            });
+        }
+        node.setConfig(config);
+        return node;
+    }
     static fromResponse(raw) {
         // Convert the raw object to RestAPINodeProps, which should keep name and id
         const obj = raw.toObject();
@@ -27,19 +47,7 @@ class RestAPINode extends Node {
         const request = new avs_pb.TaskNode();
         request.setId(this.id);
         request.setName(this.name);
-        const nodeData = new avs_pb.RestAPINode();
-        const config = new avs_pb.RestAPINode.Config();
-        config.setUrl(this.data.url);
-        config.setMethod(this.data.method);
-        config.setBody(this.data.body || "");
-        if (this.data.headersMap &&
-            this.data.headersMap.length > 0) {
-            const headersMap = config.getHeadersMap();
-            this.data.headersMap.forEach(([key, value]) => {
-                headersMap.set(key, value);
-            });
-        }
-        nodeData.setConfig(config);
+        const nodeData = RestAPINode.createProtobufNode(this.data);
         // Use the standard utility function to convert input field to protobuf format
         const inputValue = convertInputToProtobuf(this.input);
         if (inputValue) {

package/dist/models/step.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"step.d.ts","sourceRoot":"","sources":["../../src/models/step.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAC;AAMhD,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAEhE,cAAM,IAAK,YAAW,SAAS;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,MAAM,EAAE,eAAe,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;gBAEF,KAAK,EAAE,SAAS;IAc5B;;;OAGG;IACH,MAAM,IAAI,SAAS;IAgBnB,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI,GAAG,eAAe;IAiX9D,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI,GAAG,IAAI;CAqFvD;AAED,eAAe,IAAI,CAAC"}
+{"version":3,"file":"step.d.ts","sourceRoot":"","sources":["../../src/models/step.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAC;AAMhD,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAEhE,cAAM,IAAK,YAAW,SAAS;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,MAAM,EAAE,eAAe,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;gBAEF,KAAK,EAAE,SAAS;IAc5B;;;OAGG;IACH,MAAM,IAAI,SAAS;IAgBnB,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI,GAAG,eAAe;IAslB9D,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI,GAAG,IAAI;CAqFvD;AAED,eAAe,IAAI,CAAC"}