@avaprotocol/sdk-js 2.5.2-dev.1 → 2.6.1

package/dist/models/step.js

@@ -9,7 +9,7 @@ class Step {
         this.error = props.error;
         this.log = props.log;
         this.inputsList = props.inputsList;
-        this.input = props.input;
+        this.config = props.config;
         this.output = props.output;
         this.startAt = props.startAt;
         this.endAt = props.endAt;
@@ -27,411 +27,150 @@ class Step {
             error: this.error,
             log: this.log,
             inputsList: this.inputsList,
-            input: this.input,
+            config: this.config,
             output: this.output,
             startAt: this.startAt,
             endAt: this.endAt,
         };
     }
     static getOutput(step) {
-        // Handle both protobuf instances and plain objects
-        const getOutputDataCase = () => {
-            if (typeof step.getOutputDataCase === "function") {
-                return step.getOutputDataCase();
+        const outputData = this.extractOutputData(step);
+        if (!outputData)
+            return null;
+        // STANDARDIZED Direct Mapping - ALL triggers and nodes use the same logic
+        if (typeof outputData.hasData === "function" && outputData.hasData()) {
+            try {
+                return convertProtobufValueToJs(outputData.getData());
             }
-            // For plain objects, determine the case by checking which properties exist
-            const stepObj = step;
-            if (stepObj.blockTrigger)
-                return avs_pb.Execution.Step.OutputDataCase.BLOCK_TRIGGER;
-            if (stepObj.fixedTimeTrigger)
-                return avs_pb.Execution.Step.OutputDataCase.FIXED_TIME_TRIGGER;
-            if (stepObj.cronTrigger)
-                return avs_pb.Execution.Step.OutputDataCase.CRON_TRIGGER;
-            if (stepObj.eventTrigger)
-                return avs_pb.Execution.Step.OutputDataCase.EVENT_TRIGGER;
-            if (stepObj.manualTrigger)
-                return avs_pb.Execution.Step.OutputDataCase.MANUAL_TRIGGER;
-            if (stepObj.ethTransfer)
-                return avs_pb.Execution.Step.OutputDataCase.ETH_TRANSFER;
-            if (stepObj.graphql)
-                return avs_pb.Execution.Step.OutputDataCase.GRAPHQL;
-            if (stepObj.contractRead)
-                return avs_pb.Execution.Step.OutputDataCase.CONTRACT_READ;
-            if (stepObj.contractWrite)
-                return avs_pb.Execution.Step.OutputDataCase.CONTRACT_WRITE;
-            if (stepObj.customCode)
-                return avs_pb.Execution.Step.OutputDataCase.CUSTOM_CODE;
-            if (stepObj.restApi)
-                return avs_pb.Execution.Step.OutputDataCase.REST_API;
-            if (stepObj.branch)
-                return avs_pb.Execution.Step.OutputDataCase.BRANCH;
-            if (stepObj.filter)
-                return avs_pb.Execution.Step.OutputDataCase.FILTER;
-            if (stepObj.loop)
-                return avs_pb.Execution.Step.OutputDataCase.LOOP;
-            return avs_pb.Execution.Step.OutputDataCase.OUTPUT_DATA_NOT_SET;
-        };
-        switch (getOutputDataCase()) {
-            case avs_pb.Execution.Step.OutputDataCase.OUTPUT_DATA_NOT_SET:
-                return undefined;
-            // Trigger outputs
+            catch (error) {
+                console.warn("Failed to convert protobuf Value to JavaScript:", error);
+                return outputData.getData();
+            }
+        }
+        else if (outputData.data) {
+            // For plain objects, try to convert or use directly
+            return typeof outputData.data.getKindCase === "function"
+                ? convertProtobufValueToJs(outputData.data)
+                : outputData.data;
+        }
+        return null;
+    }
+    static extractOutputData(step) {
+        // Simple switch to get the output object - all handled identically
+        const outputCase = this.getOutputDataCase(step);
+        switch (outputCase) {
             case avs_pb.Execution.Step.OutputDataCase.BLOCK_TRIGGER:
-                const blockTrigger = typeof step.getBlockTrigger === "function"
-                    ? step.getBlockTrigger()?.toObject()
+                return typeof step.getBlockTrigger === "function"
+                    ? step.getBlockTrigger()
                     : step.blockTrigger;
-                return { data: blockTrigger }; // ✅ Use standard structure
             case avs_pb.Execution.Step.OutputDataCase.FIXED_TIME_TRIGGER:
-                const fixedTimeTrigger = typeof step.getFixedTimeTrigger === "function"
-                    ? step.getFixedTimeTrigger()?.toObject()
+                return typeof step.getFixedTimeTrigger === "function"
+                    ? step.getFixedTimeTrigger()
                     : step.fixedTimeTrigger;
-                return { data: fixedTimeTrigger }; // ✅ Use standard structure
             case avs_pb.Execution.Step.OutputDataCase.CRON_TRIGGER:
-                const cronTrigger = typeof step.getCronTrigger === "function"
-                    ? step.getCronTrigger()?.toObject()
+                return typeof step.getCronTrigger === "function"
+                    ? step.getCronTrigger()
                     : step.cronTrigger;
-                return { data: cronTrigger }; // ✅ Use standard structure
             case avs_pb.Execution.Step.OutputDataCase.EVENT_TRIGGER:
-                const eventTrigger = typeof step.getEventTrigger === "function"
+                return typeof step.getEventTrigger === "function"
                     ? step.getEventTrigger()
                     : step.eventTrigger;
-                if (eventTrigger) {
-                    // Check for the new data field structure
-                    if (typeof eventTrigger.hasData === "function" &&
-                        eventTrigger.hasData()) {
-                        try {
-                            const eventData = convertProtobufValueToJs(eventTrigger.getData());
-                            return { data: eventData }; // ✅ Use standard structure
-                        }
-                        catch (error) {
-                            console.warn("Failed to convert event trigger data from protobuf Value:", error);
-                            return { data: eventTrigger.getData() }; // ✅ Use standard structure
-                        }
-                    }
-                    else if (eventTrigger.data) {
-                        // For plain objects, try to convert or use directly
-                        const eventData = typeof eventTrigger.data.getKindCase === "function"
-                            ? convertProtobufValueToJs(eventTrigger.data)
-                            : eventTrigger.data;
-                        return { data: eventData }; // ✅ Use standard structure
-                    }
-                    // Fallback to old structure for backward compatibility
-                    if (typeof eventTrigger.hasEvmLog === "function" &&
-                        eventTrigger.hasEvmLog()) {
-                        return { data: eventTrigger.getEvmLog()?.toObject() }; // ✅ Use standard structure
-                    }
-                    else if (typeof eventTrigger.hasTransferLog === "function" &&
-                        eventTrigger.hasTransferLog()) {
-                        return { data: eventTrigger.getTransferLog()?.toObject() }; // ✅ Use standard structure
-                    }
-                    else if (eventTrigger.evmLog) {
-                        return { data: eventTrigger.evmLog }; // ✅ Use standard structure
-                    }
-                    else if (eventTrigger.transferLog) {
-                        return { data: eventTrigger.transferLog }; // ✅ Use standard structure
-                    }
-                }
-                return { data: null }; // ✅ Use standard structure
-            case avs_pb.Execution.Step.OutputDataCase.MANUAL_TRIGGER: {
-                const manualTrigger = typeof step.getManualTrigger === "function"
+            case avs_pb.Execution.Step.OutputDataCase.MANUAL_TRIGGER:
+                return typeof step.getManualTrigger === "function"
                     ? step.getManualTrigger()
                     : step.manualTrigger;
-                if (manualTrigger) {
-                    // For manual triggers, return the data content directly (similar to CustomCode)
-                    // Headers and pathParams are config-only fields, not output fields
-                    if (typeof manualTrigger.hasData === "function" &&
-                        manualTrigger.hasData()) {
-                        try {
-                            return convertProtobufValueToJs(manualTrigger.getData());
-                        }
-                        catch (error) {
-                            console.warn("Failed to convert manual trigger data from protobuf Value:", error);
-                            return manualTrigger.getData();
-                        }
-                    }
-                    else if (manualTrigger.data) {
-                        // For plain objects, try to convert or use directly
-                        return typeof manualTrigger.data.getKindCase === "function"
-                            ? convertProtobufValueToJs(manualTrigger.data)
-                            : manualTrigger.data;
-                    }
-                }
-                return null;
-            }
-            // Node outputs - RESTORE MISSING CASES
             case avs_pb.Execution.Step.OutputDataCase.ETH_TRANSFER:
                 return typeof step.getEthTransfer === "function"
-                    ? step.getEthTransfer()?.toObject()
+                    ? step.getEthTransfer()
                     : step.ethTransfer;
-            case avs_pb.Execution.Step.OutputDataCase.CUSTOM_CODE: {
-                const customCodeOutput = typeof step.getCustomCode === "function"
+            case avs_pb.Execution.Step.OutputDataCase.GRAPHQL:
+                return typeof step.getGraphql === "function"
+                    ? step.getGraphql()
+                    : step.graphql;
+            case avs_pb.Execution.Step.OutputDataCase.CONTRACT_READ:
+                return typeof step.getContractRead === "function"
+                    ? step.getContractRead()
+                    : step.contractRead;
+            case avs_pb.Execution.Step.OutputDataCase.CONTRACT_WRITE:
+                return typeof step.getContractWrite === "function"
+                    ? step.getContractWrite()
+                    : step.contractWrite;
+            case avs_pb.Execution.Step.OutputDataCase.CUSTOM_CODE:
+                return typeof step.getCustomCode === "function"
                     ? step.getCustomCode()
                     : step.customCode;
-                if (customCodeOutput) {
-                    if (typeof customCodeOutput.hasData === "function" &&
-                        customCodeOutput.hasData()) {
-                        try {
-                            return convertProtobufValueToJs(customCodeOutput.getData());
-                        }
-                        catch {
-                            // Fallback: if conversion fails, return the raw data
-                            return customCodeOutput.getData();
-                        }
-                    }
-                    else if (customCodeOutput.data) {
-                        // For plain objects, try to convert or use directly
-                        return typeof customCodeOutput.data.getKindCase === "function"
-                            ? convertProtobufValueToJs(customCodeOutput.data)
-                            : customCodeOutput.data;
-                    }
-                }
-                return undefined;
-            }
-            case avs_pb.Execution.Step.OutputDataCase.REST_API: {
-                const restApiOutput = typeof step.getRestApi === "function"
+            case avs_pb.Execution.Step.OutputDataCase.REST_API:
+                return typeof step.getRestApi === "function"
                     ? step.getRestApi()
                     : step.restApi;
-                if (restApiOutput) {
-                    if (typeof restApiOutput.hasData === "function" &&
-                        restApiOutput.hasData()) {
-                        try {
-                            return convertProtobufValueToJs(restApiOutput.getData());
-                        }
-                        catch {
-                            // Fallback: if conversion fails, return the raw data
-                            return restApiOutput.getData();
-                        }
-                    }
-                    else if (restApiOutput.data) {
-                        // For plain objects, try to convert or use directly
-                        return typeof restApiOutput.data.getKindCase === "function"
-                            ? convertProtobufValueToJs(restApiOutput.data)
-                            : restApiOutput.data;
-                    }
-                }
-                return undefined;
-            }
             case avs_pb.Execution.Step.OutputDataCase.BRANCH:
                 return typeof step.getBranch === "function"
-                    ? step.getBranch()?.toObject()
+                    ? step.getBranch()
                     : step.branch;
-            case avs_pb.Execution.Step.OutputDataCase.LOOP: {
-                const loopOutput = typeof step.getLoop === "function"
-                    ? step.getLoop()
-                    : step.loop;
-                if (loopOutput) {
-                    if (typeof loopOutput.getData === "function" &&
-                        loopOutput.getData()) {
-                        try {
-                            return JSON.parse(loopOutput.getData());
-                        }
-                        catch {
-                            return loopOutput.getData();
-                        }
-                    }
-                    else if (loopOutput.data) {
-                        // For plain objects
-                        try {
-                            return typeof loopOutput.data === "string"
-                                ? JSON.parse(loopOutput.data)
-                                : loopOutput.data;
-                        }
-                        catch {
-                            return loopOutput.data;
-                        }
-                    }
-                }
-                return undefined;
-            }
-            case avs_pb.Execution.Step.OutputDataCase.GRAPHQL: {
-                const graphqlOutput = typeof step.getGraphql === "function"
-                    ? step.getGraphql()
-                    : step.graphql;
-                if (graphqlOutput) {
-                    try {
-                        return typeof graphqlOutput.toObject === "function"
-                            ? graphqlOutput.toObject()
-                            : graphqlOutput;
-                    }
-                    catch {
-                        return undefined;
-                    }
-                }
-                return undefined;
-            }
-            case avs_pb.Execution.Step.OutputDataCase.CONTRACT_READ: {
-                const contractReadOutput = typeof step.getContractRead === "function"
-                    ? step.getContractRead()
-                    : step.contractRead;
-                if (contractReadOutput) {
-                    // Check if the output has a data field that's a protobuf Value
-                    if (typeof contractReadOutput.hasData === "function" &&
-                        contractReadOutput.hasData()) {
-                        try {
-                            // Convert protobuf Value to JavaScript object
-                            const data = convertProtobufValueToJs(contractReadOutput.getData());
-                            // Always return the array directly for contract read outputs
-                            if (Array.isArray(data)) {
-                                return data;
-                            }
-                            else {
-                                // If it's a single object, wrap it in an array for consistency
-                                return [data];
-                            }
-                        }
-                        catch (error) {
-                            console.warn("Failed to convert contract read data from protobuf Value:", error);
-                            // Fallback to raw data
-                            return contractReadOutput.getData();
-                        }
-                    }
-                    else if (contractReadOutput.data) {
-                        // For plain objects, try to convert or use directly
-                        const data = typeof contractReadOutput.data.getKindCase === "function"
-                            ? convertProtobufValueToJs(contractReadOutput.data)
-                            : contractReadOutput.data;
-                        // Always return the array directly for contract read outputs
-                        if (Array.isArray(data)) {
-                            return data;
-                        }
-                        else {
-                            // If it's a single object, wrap it in an array for consistency
-                            return [data];
-                        }
-                    }
-                    // Fallback to old structure for backward compatibility
-                    const outputObj = typeof contractReadOutput.toObject === "function"
-                        ? contractReadOutput.toObject()
-                        : contractReadOutput;
-                    // Convert resultsList to results for consistency with ContractReadNode.fromOutputData
-                    if (outputObj && outputObj.resultsList) {
-                        // Return the results array directly
-                        return outputObj.resultsList.map((result) => ({
-                            methodName: result.methodName,
-                            success: result.success,
-                            error: result.error,
-                            data: result.dataList || [],
-                        }));
-                    }
-                    return outputObj;
-                }
-                return undefined;
-            }
-            case avs_pb.Execution.Step.OutputDataCase.CONTRACT_WRITE: {
-                const contractWriteOutput = typeof step.getContractWrite === "function"
-                    ? step.getContractWrite()
-                    : step.contractWrite;
-                if (contractWriteOutput) {
-                    // Check if the output has a data field that's a protobuf Value
-                    if (typeof contractWriteOutput.hasData === "function" &&
-                        contractWriteOutput.hasData()) {
-                        try {
-                            // Convert protobuf Value to JavaScript object
-                            const data = convertProtobufValueToJs(contractWriteOutput.getData());
-                            // Always return the array directly for contract write outputs
-                            if (Array.isArray(data)) {
-                                return data;
-                            }
-                            else {
-                                // If it's a single object, wrap it in an array for consistency
-                                return [data];
-                            }
-                        }
-                        catch (error) {
-                            console.warn("Failed to convert contract write data from protobuf Value:", error);
-                            // Fallback to raw data
-                            return contractWriteOutput.getData();
-                        }
-                    }
-                    else if (contractWriteOutput.data) {
-                        // For plain objects, try to convert or use directly
-                        const data = typeof contractWriteOutput.data.getKindCase === "function"
-                            ? convertProtobufValueToJs(contractWriteOutput.data)
-                            : contractWriteOutput.data;
-                        // Always return the array directly for contract write outputs
-                        if (Array.isArray(data)) {
-                            return data;
-                        }
-                        else {
-                            // If it's a single object, wrap it in an array for consistency
-                            return [data];
-                        }
-                    }
-                    // Fallback to old structure for backward compatibility
-                    const outputObj = typeof contractWriteOutput.toObject === "function"
-                        ? contractWriteOutput.toObject()
-                        : contractWriteOutput;
-                    // Convert resultsList to results for consistency with ContractWriteNode.fromOutputData
-                    if (outputObj && outputObj.resultsList) {
-                        // Return the results array directly
-                        return outputObj.resultsList.map((result) => ({
-                            methodName: result.methodName,
-                            success: result.success,
-                            error: result.error,
-                            transaction: result.transaction,
-                            events: result.eventsList || [],
-                            returnData: result.returnData,
-                            inputData: result.inputData,
-                        }));
-                    }
-                    return outputObj;
-                }
-                return undefined;
-            }
-            case avs_pb.Execution.Step.OutputDataCase.FILTER: {
-                const filterOutput = typeof step.getFilter === "function"
+            case avs_pb.Execution.Step.OutputDataCase.FILTER:
+                return typeof step.getFilter === "function"
                     ? step.getFilter()
                     : step.filter;
-                if (filterOutput) {
-                    try {
-                        return typeof filterOutput.toObject === "function"
-                            ? filterOutput.toObject()
-                            : filterOutput;
-                    }
-                    catch {
-                        return undefined;
-                    }
-                }
-                return undefined;
-            }
+            case avs_pb.Execution.Step.OutputDataCase.LOOP:
+                return typeof step.getLoop === "function"
+                    ? step.getLoop()
+                    : step.loop;
             default:
-                console.warn(`Unhandled output data type in Step.getOutput: ${step.getOutputDataCase()}`);
-                return undefined;
+                return null;
+        }
+    }
+    static getOutputDataCase(step) {
+        if (typeof step.getOutputDataCase === "function") {
+            return step.getOutputDataCase();
         }
+        // For plain objects, determine the case by checking which properties exist
+        const stepObj = step;
+        if (stepObj.blockTrigger)
+            return avs_pb.Execution.Step.OutputDataCase.BLOCK_TRIGGER;
+        if (stepObj.fixedTimeTrigger)
+            return avs_pb.Execution.Step.OutputDataCase.FIXED_TIME_TRIGGER;
+        if (stepObj.cronTrigger)
+            return avs_pb.Execution.Step.OutputDataCase.CRON_TRIGGER;
+        if (stepObj.eventTrigger)
+            return avs_pb.Execution.Step.OutputDataCase.EVENT_TRIGGER;
+        if (stepObj.manualTrigger)
+            return avs_pb.Execution.Step.OutputDataCase.MANUAL_TRIGGER;
+        if (stepObj.ethTransfer)
+            return avs_pb.Execution.Step.OutputDataCase.ETH_TRANSFER;
+        if (stepObj.graphql)
+            return avs_pb.Execution.Step.OutputDataCase.GRAPHQL;
+        if (stepObj.contractRead)
+            return avs_pb.Execution.Step.OutputDataCase.CONTRACT_READ;
+        if (stepObj.contractWrite)
+            return avs_pb.Execution.Step.OutputDataCase.CONTRACT_WRITE;
+        if (stepObj.customCode)
+            return avs_pb.Execution.Step.OutputDataCase.CUSTOM_CODE;
+        if (stepObj.restApi)
+            return avs_pb.Execution.Step.OutputDataCase.REST_API;
+        if (stepObj.branch)
+            return avs_pb.Execution.Step.OutputDataCase.BRANCH;
+        if (stepObj.filter)
+            return avs_pb.Execution.Step.OutputDataCase.FILTER;
+        if (stepObj.loop)
+            return avs_pb.Execution.Step.OutputDataCase.LOOP;
+        return avs_pb.Execution.Step.OutputDataCase.OUTPUT_DATA_NOT_SET;
     }
     static fromResponse(step) {
         // Extract input data if present - USE PROPER PROTOBUF GETTER
-        let inputData = undefined;
+        let configData = undefined;
         // Check for input using proper protobuf methods
-        if (typeof step.hasInput === "function" &&
-            step.hasInput()) {
-            const inputValue = step.getInput();
-            if (inputValue) {
+        if (typeof step.hasConfig === "function" &&
+            step.hasConfig()) {
+            const configValue = step.getConfig();
+            if (configValue) {
                 // If it's a protobuf Value instance, convert it
                 try {
-                    inputData = convertProtobufValueToJs(inputValue);
+                    configData = convertProtobufValueToJs(configValue);
                 }
                 catch (error) {
                     console.warn("Failed to convert protobuf input value:", error);
                     // Fallback: if conversion fails, use the raw value
-                    inputData = inputValue;
-                }
-            }
-        }
-        else if (step.input) {
-            // Fallback for plain objects (from .toObject() calls)
-            const inputValue = step.input;
-            // If it's already a plain JavaScript object, use it directly
-            if (typeof inputValue === "object" && !inputValue.getKindCase) {
-                inputData = inputValue;
-            }
-            else {
-                // If it's a protobuf Value instance, convert it
-                try {
-                    inputData = convertProtobufValueToJs(inputValue);
-                }
-                catch (error) {
-                    // Fallback: if conversion fails, use the raw value
-                    inputData = inputValue;
+                    configData = configValue;
                 }
             }
         }
@@ -463,7 +202,7 @@ class Step {
             error: getError(),
             log: getLog(),
             inputsList: getInputsList(),
-            input: inputData,
+            config: configData,
             output: Step.getOutput(step),
             startAt: getStartAt(),
             endAt: getEndAt(),

package/dist/models/trigger/block.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"block.d.ts","sourceRoot":"","sources":["../../../src/models/trigger/block.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAC;AAChD,OAAO,OAAO,MAAM,aAAa,CAAC;AAClC,OAAO,EAAqC,kBAAkB,EAAE,iBAAiB,EAA+B,MAAM,oBAAoB,CAAC;AAM3I,cAAM,YAAa,SAAQ,OAAO;gBACpB,KAAK,EAAE,iBAAiB;IAIpC,SAAS,IAAI,MAAM,CAAC,WAAW;IAsC/B,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,WAAW,GAAG,YAAY;IA+B1D;;;;OAIG;IACH,SAAS,IAAI,kBAAkB,GAAG,SAAS;IAI3C;;;;OAIG;IACH,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,CAAC,cAAc,GAAG,GAAG;CAI9D;AAED,eAAe,YAAY,CAAC"}
+{"version":3,"file":"block.d.ts","sourceRoot":"","sources":["../../../src/models/trigger/block.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAC;AAChD,OAAO,OAAO,MAAM,aAAa,CAAC;AAClC,OAAO,EAGL,kBAAkB,EAClB,iBAAiB,EAElB,MAAM,oBAAoB,CAAC;AAC5B,cAAM,YAAa,SAAQ,OAAO;gBACpB,KAAK,EAAE,iBAAiB;IAIpC,SAAS,IAAI,MAAM,CAAC,WAAW;IAqC/B,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,WAAW,GAAG,YAAY;IAuB1D;;;;OAIG;IACH,SAAS,IAAI,kBAAkB,GAAG,SAAS;IAI3C;;;;OAIG;IACH,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,CAAC,cAAc,GAAG,GAAG;CAY9D;AAED,eAAe,YAAY,CAAC"}

package/dist/models/trigger/block.js

@@ -1,8 +1,6 @@
 import * as avs_pb from "@/grpc_codegen/avs_pb";
 import Trigger from "./interface";
-import { TriggerType } from "@avaprotocol/types";
-import { convertInputToProtobuf, extractInputFromProtobuf } from "../../utils";
-// Required props for constructor: id, name, type and data: { interval }
+import { TriggerType, } from "@avaprotocol/types";
 class BlockTrigger extends Trigger {
     constructor(props) {
         super({ ...props, type: TriggerType.Block, data: props.data });
@@ -16,23 +14,22 @@ class BlockTrigger extends Trigger {
             throw new Error(`Trigger data is missing for block`);
         }
         const blockData = this.data;
-        // Validate interval is present and not null/undefined
+        // Validate interval exists
         if (blockData.interval === null || blockData.interval === undefined) {
             throw new Error("Interval is required for block trigger");
         }
-        // Validate interval is greater than 0
+        // Validate that interval is an integer
+        if (!Number.isInteger(blockData.interval)) {
+            throw new Error(`BlockTrigger interval must be an integer, got: ${blockData.interval}`);
+        }
+        // Validate interval is positive
         if (blockData.interval <= 0) {
-            throw new Error("Interval must be greater than 0");
+            throw new Error(`Interval must be greater than 0`);
         }
         const trigger = new avs_pb.BlockTrigger();
         const config = new avs_pb.BlockTrigger.Config();
         config.setInterval(blockData.interval);
         trigger.setConfig(config);
-        // Use utility function to convert input field to protobuf format
-        const inputValue = convertInputToProtobuf(this.input);
-        if (inputValue) {
-            trigger.setInput(inputValue);
-        }
         request.setBlock(trigger);
         return request;
     }
@@ -40,25 +37,18 @@ class BlockTrigger extends Trigger {
         // Convert the raw object to TriggerProps, which should keep name and id
         const obj = raw.toObject();
         let data = { interval: 0 };
-        let input = undefined;
         if (raw.getBlock() && raw.getBlock().hasConfig()) {
             const config = raw.getBlock().getConfig();
             if (config) {
                 data = {
-                    interval: config.getInterval() || 0
+                    interval: config.getInterval() || 0,
                 };
             }
-            // Use utility function to extract input field from protobuf format
-            const blockTrigger = raw.getBlock();
-            if (blockTrigger.hasInput()) {
-                input = extractInputFromProtobuf(blockTrigger.getInput());
-            }
         }
         return new BlockTrigger({
             ...obj,
             type: TriggerType.Block,
             data: data,
-            input: input,
         });
     }
     /**
@@ -76,7 +66,15 @@ class BlockTrigger extends Trigger {
      */
     static fromOutputData(outputData) {
         const blockOutput = outputData.getBlockTrigger();
-        return blockOutput?.toObject() || null;
+        if (!blockOutput)
+            return null;
+        // Extract data from the new data field
+        const dataValue = blockOutput.getData();
+        if (!dataValue)
+            return null;
+        // Convert the Value to JavaScript object
+        const result = dataValue.toJavaScript();
+        return result;
     }
 }
 export default BlockTrigger;

package/dist/models/trigger/cron.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cron.d.ts","sourceRoot":"","sources":["../../../src/models/trigger/cron.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAC;AAEhD,OAAO,OAAO,MAAM,aAAa,CAAC;AAClC,OAAO,EAAoC,iBAAiB,EAAE,gBAAgB,EAAgB,MAAM,oBAAoB,CAAC;AAEzH,cAAM,WAAY,SAAQ,OAAO;gBACnB,KAAK,EAAE,gBAAgB;IAInC,SAAS,IAAI,MAAM,CAAC,WAAW;IA0C/B,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,WAAW,GAAG,WAAW;IAiCzD;;;;OAIG;IACH,SAAS,IAAI,iBAAiB,GAAG,SAAS;IAI1C;;;;;OAKG;IACH,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,CAAC,cAAc,GAAG,GAAG;CAW9D;AAED,eAAe,WAAW,CAAC"}
+{"version":3,"file":"cron.d.ts","sourceRoot":"","sources":["../../../src/models/trigger/cron.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAC;AAChD,OAAO,OAAO,MAAM,aAAa,CAAC;AAClC,OAAO,EAGL,iBAAiB,EACjB,gBAAgB,EAEjB,MAAM,oBAAoB,CAAC;AAE5B,cAAM,WAAY,SAAQ,OAAO;gBACnB,KAAK,EAAE,gBAAgB;IAInC,SAAS,IAAI,MAAM,CAAC,WAAW;IAgC/B,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,WAAW,GAAG,WAAW;IAuBzD;;;;OAIG;IACH,SAAS,IAAI,iBAAiB,GAAG,SAAS;IAI1C;;;;;OAKG;IACH,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,CAAC,cAAc,GAAG,GAAG;CAY9D;AAED,eAAe,WAAW,CAAC"}