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

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 CHANGED
@@ -17469,12 +17469,14 @@ var ManualTrigger2 = class _ManualTrigger extends Trigger {
17469
17469
  const manualTrigger = new avs_pb6.ManualTrigger();
17470
17470
  const config = new avs_pb6.ManualTrigger.Config();
17471
17471
  const dataToSend = this.data ?? this.input;
17472
- if (dataToSend !== null && dataToSend !== void 0) {
17473
- const inputValue = convertInputToProtobuf(dataToSend);
17474
- if (inputValue) {
17475
- config.setData(inputValue);
17476
- }
17472
+ if (dataToSend === null || dataToSend === void 0) {
17473
+ throw new Error("ManualTrigger data is required");
17474
+ }
17475
+ const inputValue = convertInputToProtobuf(dataToSend);
17476
+ if (!inputValue) {
17477
+ throw new Error("Failed to convert ManualTrigger data to protobuf format");
17477
17478
  }
17479
+ config.setData(inputValue);
17478
17480
  if (this.headers && Object.keys(this.headers).length > 0) {
17479
17481
  const headersMap = config.getHeadersMap();
17480
17482
  Object.entries(this.headers).forEach(([key, value]) => {
@@ -17535,45 +17537,26 @@ var ManualTrigger2 = class _ManualTrigger extends Trigger {
17535
17537
  /**
17536
17538
  * Extract output data from RunTriggerResp for manual triggers
17537
17539
  * @param outputData - The RunTriggerResp containing manual trigger output
17538
- * @returns Plain JavaScript object with manual trigger data in standard structure
17540
+ * @returns The parsed JSON data directly (similar to CustomCode output)
17539
17541
  */
17540
17542
  static fromOutputData(outputData) {
17541
17543
  const manualOutput = outputData.getManualTrigger();
17542
17544
  if (!manualOutput) {
17543
17545
  return null;
17544
17546
  }
17545
- const result = {};
17546
17547
  const dataValue = manualOutput.getData();
17547
17548
  if (dataValue) {
17548
17549
  try {
17549
- result.data = convertProtobufValueToJs(dataValue);
17550
+ return convertProtobufValueToJs(dataValue);
17550
17551
  } catch (error) {
17551
17552
  console.warn(
17552
17553
  "Failed to convert manual trigger data from protobuf Value:",
17553
17554
  error
17554
17555
  );
17555
- result.data = dataValue;
17556
+ return null;
17556
17557
  }
17557
- } else {
17558
- result.data = null;
17559
17558
  }
17560
- const headersMapProto = manualOutput.getHeadersMap();
17561
- if (headersMapProto && headersMapProto.getLength() > 0) {
17562
- const headersObject = {};
17563
- headersMapProto.forEach((value, key) => {
17564
- headersObject[key] = value;
17565
- });
17566
- result.headers = headersObject;
17567
- }
17568
- const pathParamsMapProto = manualOutput.getPathparamsMap();
17569
- if (pathParamsMapProto && pathParamsMapProto.getLength() > 0) {
17570
- const pathParamsObject = {};
17571
- pathParamsMapProto.forEach((value, key) => {
17572
- pathParamsObject[key] = value;
17573
- });
17574
- result.pathParams = pathParamsObject;
17575
- }
17576
- return result;
17559
+ return null;
17577
17560
  }
17578
17561
  };
17579
17562
  var manual_default = ManualTrigger2;
@@ -18805,167 +18788,21 @@ var Step = class _Step {
18805
18788
  case avs_pb20.Execution.Step.OutputDataCase.MANUAL_TRIGGER: {
18806
18789
  const manualTrigger = typeof step.getManualTrigger === "function" ? step.getManualTrigger() : step.manualTrigger;
18807
18790
  if (manualTrigger) {
18808
- const result = {};
18809
18791
  if (typeof manualTrigger.hasData === "function" && manualTrigger.hasData()) {
18810
18792
  try {
18811
- const userData = convertProtobufValueToJs(
18812
- manualTrigger.getData()
18813
- );
18814
- if (userData && typeof userData === "object" && userData.data !== void 0 && (userData.headers !== void 0 || userData.pathParams !== void 0)) {
18815
- result.data = userData.data;
18816
- if (userData.headers) {
18817
- if (Array.isArray(userData.headers)) {
18818
- if (userData.headers.length > 0 && Array.isArray(userData.headers[0])) {
18819
- const headersObject = {};
18820
- for (const [key, value] of userData.headers) {
18821
- headersObject[key] = value;
18822
- }
18823
- result.headers = headersObject;
18824
- } else {
18825
- const headersObject = {};
18826
- for (const header of userData.headers) {
18827
- for (const [key, value] of Object.entries(header)) {
18828
- headersObject[key] = value;
18829
- }
18830
- }
18831
- result.headers = headersObject;
18832
- }
18833
- } else {
18834
- result.headers = userData.headers;
18835
- }
18836
- }
18837
- if (userData.pathParams) {
18838
- if (Array.isArray(userData.pathParams)) {
18839
- if (userData.pathParams.length > 0 && Array.isArray(userData.pathParams[0])) {
18840
- const pathParamsObject = {};
18841
- for (const [key, value] of userData.pathParams) {
18842
- pathParamsObject[key] = value;
18843
- }
18844
- result.pathParams = pathParamsObject;
18845
- } else {
18846
- const pathParamsObject = {};
18847
- for (const pathParam of userData.pathParams) {
18848
- for (const [key, value] of Object.entries(pathParam)) {
18849
- pathParamsObject[key] = value;
18850
- }
18851
- }
18852
- result.pathParams = pathParamsObject;
18853
- }
18854
- } else {
18855
- result.pathParams = userData.pathParams;
18856
- }
18857
- }
18858
- } else {
18859
- result.data = userData;
18860
- }
18793
+ return convertProtobufValueToJs(manualTrigger.getData());
18861
18794
  } catch (error) {
18862
18795
  console.warn(
18863
18796
  "Failed to convert manual trigger data from protobuf Value:",
18864
18797
  error
18865
18798
  );
18866
- result.data = manualTrigger.getData();
18799
+ return manualTrigger.getData();
18867
18800
  }
18868
18801
  } else if (manualTrigger.data) {
18869
- const userData = typeof manualTrigger.data.getKindCase === "function" ? convertProtobufValueToJs(manualTrigger.data) : manualTrigger.data;
18870
- if (userData && typeof userData === "object" && userData.data !== void 0 && (userData.headers !== void 0 || userData.pathParams !== void 0)) {
18871
- result.data = userData.data;
18872
- if (userData.headers) {
18873
- if (Array.isArray(userData.headers)) {
18874
- if (userData.headers.length > 0 && Array.isArray(userData.headers[0])) {
18875
- const headersObject = {};
18876
- for (const [key, value] of userData.headers) {
18877
- headersObject[key] = value;
18878
- }
18879
- result.headers = headersObject;
18880
- } else {
18881
- const headersObject = {};
18882
- for (const header of userData.headers) {
18883
- for (const [key, value] of Object.entries(header)) {
18884
- headersObject[key] = value;
18885
- }
18886
- }
18887
- result.headers = headersObject;
18888
- }
18889
- } else {
18890
- result.headers = userData.headers;
18891
- }
18892
- }
18893
- if (userData.pathParams) {
18894
- if (Array.isArray(userData.pathParams)) {
18895
- if (userData.pathParams.length > 0 && Array.isArray(userData.pathParams[0])) {
18896
- const pathParamsObject = {};
18897
- for (const [key, value] of userData.pathParams) {
18898
- pathParamsObject[key] = value;
18899
- }
18900
- result.pathParams = pathParamsObject;
18901
- } else {
18902
- const pathParamsObject = {};
18903
- for (const pathParam of userData.pathParams) {
18904
- for (const [key, value] of Object.entries(pathParam)) {
18905
- pathParamsObject[key] = value;
18906
- }
18907
- }
18908
- result.pathParams = pathParamsObject;
18909
- }
18910
- } else {
18911
- result.pathParams = userData.pathParams;
18912
- }
18913
- }
18914
- } else {
18915
- result.data = userData;
18916
- }
18917
- }
18918
- if (typeof manualTrigger.getHeadersMap === "function") {
18919
- const headersMap = manualTrigger.getHeadersMap();
18920
- if (headersMap && headersMap.getLength() > 0) {
18921
- const headersObject = {};
18922
- headersMap.forEach((value, key) => {
18923
- headersObject[key] = value;
18924
- });
18925
- result.headers = headersObject;
18926
- }
18927
- } else if (manualTrigger.headers) {
18928
- if (Array.isArray(manualTrigger.headers)) {
18929
- const headersObject = {};
18930
- for (const [key, value] of Object.entries(manualTrigger.headers)) {
18931
- headersObject[key] = value;
18932
- }
18933
- result.headers = headersObject;
18934
- } else {
18935
- result.headers = manualTrigger.headers;
18936
- }
18937
- }
18938
- if (typeof manualTrigger.getPathparamsMap === "function") {
18939
- const pathParamsMap = manualTrigger.getPathparamsMap();
18940
- if (pathParamsMap && pathParamsMap.getLength() > 0) {
18941
- const pathParamsObject = {};
18942
- pathParamsMap.forEach((value, key) => {
18943
- pathParamsObject[key] = value;
18944
- });
18945
- result.pathParams = pathParamsObject;
18946
- }
18947
- } else if (manualTrigger.pathparams) {
18948
- if (Array.isArray(manualTrigger.pathparams)) {
18949
- const pathParamsObject = {};
18950
- for (const [key, value] of Object.entries(manualTrigger.pathparams)) {
18951
- pathParamsObject[key] = value;
18952
- }
18953
- result.pathParams = pathParamsObject;
18954
- } else {
18955
- result.pathParams = manualTrigger.pathparams;
18956
- }
18802
+ return typeof manualTrigger.data.getKindCase === "function" ? convertProtobufValueToJs(manualTrigger.data) : manualTrigger.data;
18957
18803
  }
18958
- if (Object.keys(result).length === 0) {
18959
- const objData = manualTrigger.toObject?.() || manualTrigger;
18960
- if (objData && objData.data === void 0) {
18961
- result.data = null;
18962
- } else {
18963
- return { data: objData };
18964
- }
18965
- }
18966
- return result;
18967
18804
  }
18968
- return { data: null };
18805
+ return null;
18969
18806
  }
18970
18807
  // Node outputs - RESTORE MISSING CASES
18971
18808
  case avs_pb20.Execution.Step.OutputDataCase.ETH_TRANSFER:
package/dist/index.mjs CHANGED
@@ -17447,12 +17447,14 @@ var ManualTrigger2 = class _ManualTrigger extends Trigger {
17447
17447
  const manualTrigger = new avs_pb6.ManualTrigger();
17448
17448
  const config = new avs_pb6.ManualTrigger.Config();
17449
17449
  const dataToSend = this.data ?? this.input;
17450
- if (dataToSend !== null && dataToSend !== void 0) {
17451
- const inputValue = convertInputToProtobuf(dataToSend);
17452
- if (inputValue) {
17453
- config.setData(inputValue);
17454
- }
17450
+ if (dataToSend === null || dataToSend === void 0) {
17451
+ throw new Error("ManualTrigger data is required");
17452
+ }
17453
+ const inputValue = convertInputToProtobuf(dataToSend);
17454
+ if (!inputValue) {
17455
+ throw new Error("Failed to convert ManualTrigger data to protobuf format");
17455
17456
  }
17457
+ config.setData(inputValue);
17456
17458
  if (this.headers && Object.keys(this.headers).length > 0) {
17457
17459
  const headersMap = config.getHeadersMap();
17458
17460
  Object.entries(this.headers).forEach(([key, value]) => {
@@ -17513,45 +17515,26 @@ var ManualTrigger2 = class _ManualTrigger extends Trigger {
17513
17515
  /**
17514
17516
  * Extract output data from RunTriggerResp for manual triggers
17515
17517
  * @param outputData - The RunTriggerResp containing manual trigger output
17516
- * @returns Plain JavaScript object with manual trigger data in standard structure
17518
+ * @returns The parsed JSON data directly (similar to CustomCode output)
17517
17519
  */
17518
17520
  static fromOutputData(outputData) {
17519
17521
  const manualOutput = outputData.getManualTrigger();
17520
17522
  if (!manualOutput) {
17521
17523
  return null;
17522
17524
  }
17523
- const result = {};
17524
17525
  const dataValue = manualOutput.getData();
17525
17526
  if (dataValue) {
17526
17527
  try {
17527
- result.data = convertProtobufValueToJs(dataValue);
17528
+ return convertProtobufValueToJs(dataValue);
17528
17529
  } catch (error) {
17529
17530
  console.warn(
17530
17531
  "Failed to convert manual trigger data from protobuf Value:",
17531
17532
  error
17532
17533
  );
17533
- result.data = dataValue;
17534
+ return null;
17534
17535
  }
17535
- } else {
17536
- result.data = null;
17537
17536
  }
17538
- const headersMapProto = manualOutput.getHeadersMap();
17539
- if (headersMapProto && headersMapProto.getLength() > 0) {
17540
- const headersObject = {};
17541
- headersMapProto.forEach((value, key) => {
17542
- headersObject[key] = value;
17543
- });
17544
- result.headers = headersObject;
17545
- }
17546
- const pathParamsMapProto = manualOutput.getPathparamsMap();
17547
- if (pathParamsMapProto && pathParamsMapProto.getLength() > 0) {
17548
- const pathParamsObject = {};
17549
- pathParamsMapProto.forEach((value, key) => {
17550
- pathParamsObject[key] = value;
17551
- });
17552
- result.pathParams = pathParamsObject;
17553
- }
17554
- return result;
17537
+ return null;
17555
17538
  }
17556
17539
  };
17557
17540
  var manual_default = ManualTrigger2;
@@ -18800,167 +18783,21 @@ var Step = class _Step {
18800
18783
  case avs_pb20.Execution.Step.OutputDataCase.MANUAL_TRIGGER: {
18801
18784
  const manualTrigger = typeof step.getManualTrigger === "function" ? step.getManualTrigger() : step.manualTrigger;
18802
18785
  if (manualTrigger) {
18803
- const result = {};
18804
18786
  if (typeof manualTrigger.hasData === "function" && manualTrigger.hasData()) {
18805
18787
  try {
18806
- const userData = convertProtobufValueToJs(
18807
- manualTrigger.getData()
18808
- );
18809
- if (userData && typeof userData === "object" && userData.data !== void 0 && (userData.headers !== void 0 || userData.pathParams !== void 0)) {
18810
- result.data = userData.data;
18811
- if (userData.headers) {
18812
- if (Array.isArray(userData.headers)) {
18813
- if (userData.headers.length > 0 && Array.isArray(userData.headers[0])) {
18814
- const headersObject = {};
18815
- for (const [key, value] of userData.headers) {
18816
- headersObject[key] = value;
18817
- }
18818
- result.headers = headersObject;
18819
- } else {
18820
- const headersObject = {};
18821
- for (const header of userData.headers) {
18822
- for (const [key, value] of Object.entries(header)) {
18823
- headersObject[key] = value;
18824
- }
18825
- }
18826
- result.headers = headersObject;
18827
- }
18828
- } else {
18829
- result.headers = userData.headers;
18830
- }
18831
- }
18832
- if (userData.pathParams) {
18833
- if (Array.isArray(userData.pathParams)) {
18834
- if (userData.pathParams.length > 0 && Array.isArray(userData.pathParams[0])) {
18835
- const pathParamsObject = {};
18836
- for (const [key, value] of userData.pathParams) {
18837
- pathParamsObject[key] = value;
18838
- }
18839
- result.pathParams = pathParamsObject;
18840
- } else {
18841
- const pathParamsObject = {};
18842
- for (const pathParam of userData.pathParams) {
18843
- for (const [key, value] of Object.entries(pathParam)) {
18844
- pathParamsObject[key] = value;
18845
- }
18846
- }
18847
- result.pathParams = pathParamsObject;
18848
- }
18849
- } else {
18850
- result.pathParams = userData.pathParams;
18851
- }
18852
- }
18853
- } else {
18854
- result.data = userData;
18855
- }
18788
+ return convertProtobufValueToJs(manualTrigger.getData());
18856
18789
  } catch (error) {
18857
18790
  console.warn(
18858
18791
  "Failed to convert manual trigger data from protobuf Value:",
18859
18792
  error
18860
18793
  );
18861
- result.data = manualTrigger.getData();
18794
+ return manualTrigger.getData();
18862
18795
  }
18863
18796
  } else if (manualTrigger.data) {
18864
- const userData = typeof manualTrigger.data.getKindCase === "function" ? convertProtobufValueToJs(manualTrigger.data) : manualTrigger.data;
18865
- if (userData && typeof userData === "object" && userData.data !== void 0 && (userData.headers !== void 0 || userData.pathParams !== void 0)) {
18866
- result.data = userData.data;
18867
- if (userData.headers) {
18868
- if (Array.isArray(userData.headers)) {
18869
- if (userData.headers.length > 0 && Array.isArray(userData.headers[0])) {
18870
- const headersObject = {};
18871
- for (const [key, value] of userData.headers) {
18872
- headersObject[key] = value;
18873
- }
18874
- result.headers = headersObject;
18875
- } else {
18876
- const headersObject = {};
18877
- for (const header of userData.headers) {
18878
- for (const [key, value] of Object.entries(header)) {
18879
- headersObject[key] = value;
18880
- }
18881
- }
18882
- result.headers = headersObject;
18883
- }
18884
- } else {
18885
- result.headers = userData.headers;
18886
- }
18887
- }
18888
- if (userData.pathParams) {
18889
- if (Array.isArray(userData.pathParams)) {
18890
- if (userData.pathParams.length > 0 && Array.isArray(userData.pathParams[0])) {
18891
- const pathParamsObject = {};
18892
- for (const [key, value] of userData.pathParams) {
18893
- pathParamsObject[key] = value;
18894
- }
18895
- result.pathParams = pathParamsObject;
18896
- } else {
18897
- const pathParamsObject = {};
18898
- for (const pathParam of userData.pathParams) {
18899
- for (const [key, value] of Object.entries(pathParam)) {
18900
- pathParamsObject[key] = value;
18901
- }
18902
- }
18903
- result.pathParams = pathParamsObject;
18904
- }
18905
- } else {
18906
- result.pathParams = userData.pathParams;
18907
- }
18908
- }
18909
- } else {
18910
- result.data = userData;
18911
- }
18912
- }
18913
- if (typeof manualTrigger.getHeadersMap === "function") {
18914
- const headersMap = manualTrigger.getHeadersMap();
18915
- if (headersMap && headersMap.getLength() > 0) {
18916
- const headersObject = {};
18917
- headersMap.forEach((value, key) => {
18918
- headersObject[key] = value;
18919
- });
18920
- result.headers = headersObject;
18921
- }
18922
- } else if (manualTrigger.headers) {
18923
- if (Array.isArray(manualTrigger.headers)) {
18924
- const headersObject = {};
18925
- for (const [key, value] of Object.entries(manualTrigger.headers)) {
18926
- headersObject[key] = value;
18927
- }
18928
- result.headers = headersObject;
18929
- } else {
18930
- result.headers = manualTrigger.headers;
18931
- }
18932
- }
18933
- if (typeof manualTrigger.getPathparamsMap === "function") {
18934
- const pathParamsMap = manualTrigger.getPathparamsMap();
18935
- if (pathParamsMap && pathParamsMap.getLength() > 0) {
18936
- const pathParamsObject = {};
18937
- pathParamsMap.forEach((value, key) => {
18938
- pathParamsObject[key] = value;
18939
- });
18940
- result.pathParams = pathParamsObject;
18941
- }
18942
- } else if (manualTrigger.pathparams) {
18943
- if (Array.isArray(manualTrigger.pathparams)) {
18944
- const pathParamsObject = {};
18945
- for (const [key, value] of Object.entries(manualTrigger.pathparams)) {
18946
- pathParamsObject[key] = value;
18947
- }
18948
- result.pathParams = pathParamsObject;
18949
- } else {
18950
- result.pathParams = manualTrigger.pathparams;
18951
- }
18797
+ return typeof manualTrigger.data.getKindCase === "function" ? convertProtobufValueToJs(manualTrigger.data) : manualTrigger.data;
18952
18798
  }
18953
- if (Object.keys(result).length === 0) {
18954
- const objData = manualTrigger.toObject?.() || manualTrigger;
18955
- if (objData && objData.data === void 0) {
18956
- result.data = null;
18957
- } else {
18958
- return { data: objData };
18959
- }
18960
- }
18961
- return result;
18962
18799
  }
18963
- return { data: null };
18800
+ return null;
18964
18801
  }
18965
18802
  // Node outputs - RESTORE MISSING CASES
18966
18803
  case avs_pb20.Execution.Step.OutputDataCase.ETH_TRANSFER:
@@ -1 +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;IAkmB9D,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI,GAAG,IAAI;CAqFvD;AAED,eAAe,IAAI,CAAC"}
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;IA8Z9D,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI,GAAG,IAAI;CAqFvD;AAED,eAAe,IAAI,CAAC"}
@@ -136,224 +136,26 @@ class Step {
136
136
  ? step.getManualTrigger()
137
137
  : step.manualTrigger;
138
138
  if (manualTrigger) {
139
- const result = {};
140
- // Check for the new data field structure
139
+ // For manual triggers, return the data content directly (similar to CustomCode)
140
+ // Headers and pathParams are config-only fields, not output fields
141
141
  if (typeof manualTrigger.hasData === "function" &&
142
142
  manualTrigger.hasData()) {
143
143
  try {
144
- const userData = convertProtobufValueToJs(manualTrigger.getData());
145
- // Check if the userData is the new format with nested structure
146
- if (userData && typeof userData === 'object' &&
147
- userData.data !== undefined &&
148
- (userData.headers !== undefined || userData.pathParams !== undefined)) {
149
- // This is the new format where the entire structure is in the data field
150
- // Flatten it by extracting the nested data
151
- result.data = userData.data;
152
- if (userData.headers) {
153
- // Keep headers as object format for consistency
154
- if (Array.isArray(userData.headers)) {
155
- // Check if it's already in Array<[string, string]> format
156
- if (userData.headers.length > 0 && Array.isArray(userData.headers[0])) {
157
- // Convert from Array<[string, string]> to object format
158
- const headersObject = {};
159
- for (const [key, value] of userData.headers) {
160
- headersObject[key] = value;
161
- }
162
- result.headers = headersObject;
163
- }
164
- else {
165
- // Convert from Array<{key: value}> to object format
166
- const headersObject = {};
167
- for (const header of userData.headers) {
168
- for (const [key, value] of Object.entries(header)) {
169
- headersObject[key] = value;
170
- }
171
- }
172
- result.headers = headersObject;
173
- }
174
- }
175
- else {
176
- // Already in object format
177
- result.headers = userData.headers;
178
- }
179
- }
180
- if (userData.pathParams) {
181
- // Keep pathParams as object format for consistency
182
- if (Array.isArray(userData.pathParams)) {
183
- // Check if it's already in Array<[string, string]> format
184
- if (userData.pathParams.length > 0 && Array.isArray(userData.pathParams[0])) {
185
- // Convert from Array<[string, string]> to object format
186
- const pathParamsObject = {};
187
- for (const [key, value] of userData.pathParams) {
188
- pathParamsObject[key] = value;
189
- }
190
- result.pathParams = pathParamsObject;
191
- }
192
- else {
193
- // Convert from Array<{key: value}> to object format
194
- const pathParamsObject = {};
195
- for (const pathParam of userData.pathParams) {
196
- for (const [key, value] of Object.entries(pathParam)) {
197
- pathParamsObject[key] = value;
198
- }
199
- }
200
- result.pathParams = pathParamsObject;
201
- }
202
- }
203
- else {
204
- // Already in object format
205
- result.pathParams = userData.pathParams;
206
- }
207
- }
208
- }
209
- else {
210
- // This is the old format with just user data
211
- result.data = userData;
212
- }
144
+ return convertProtobufValueToJs(manualTrigger.getData());
213
145
  }
214
146
  catch (error) {
215
147
  console.warn("Failed to convert manual trigger data from protobuf Value:", error);
216
- result.data = manualTrigger.getData();
148
+ return manualTrigger.getData();
217
149
  }
218
150
  }
219
151
  else if (manualTrigger.data) {
220
152
  // For plain objects, try to convert or use directly
221
- const userData = typeof manualTrigger.data.getKindCase === "function"
153
+ return typeof manualTrigger.data.getKindCase === "function"
222
154
  ? convertProtobufValueToJs(manualTrigger.data)
223
155
  : manualTrigger.data;
224
- // Check if the userData is the new format with nested structure
225
- if (userData && typeof userData === 'object' &&
226
- userData.data !== undefined &&
227
- (userData.headers !== undefined || userData.pathParams !== undefined)) {
228
- // This is the new format where the entire structure is in the data field
229
- // Flatten it by extracting the nested data
230
- result.data = userData.data;
231
- if (userData.headers) {
232
- // Keep headers as object format for consistency
233
- if (Array.isArray(userData.headers)) {
234
- // Check if it's already in Array<[string, string]> format
235
- if (userData.headers.length > 0 && Array.isArray(userData.headers[0])) {
236
- // Convert from Array<[string, string]> to object format
237
- const headersObject = {};
238
- for (const [key, value] of userData.headers) {
239
- headersObject[key] = value;
240
- }
241
- result.headers = headersObject;
242
- }
243
- else {
244
- // Convert from Array<{key: value}> to object format
245
- const headersObject = {};
246
- for (const header of userData.headers) {
247
- for (const [key, value] of Object.entries(header)) {
248
- headersObject[key] = value;
249
- }
250
- }
251
- result.headers = headersObject;
252
- }
253
- }
254
- else {
255
- // Already in object format
256
- result.headers = userData.headers;
257
- }
258
- }
259
- if (userData.pathParams) {
260
- // Keep pathParams as object format for consistency
261
- if (Array.isArray(userData.pathParams)) {
262
- // Check if it's already in Array<[string, string]> format
263
- if (userData.pathParams.length > 0 && Array.isArray(userData.pathParams[0])) {
264
- // Convert from Array<[string, string]> to object format
265
- const pathParamsObject = {};
266
- for (const [key, value] of userData.pathParams) {
267
- pathParamsObject[key] = value;
268
- }
269
- result.pathParams = pathParamsObject;
270
- }
271
- else {
272
- // Convert from Array<{key: value}> to object format
273
- const pathParamsObject = {};
274
- for (const pathParam of userData.pathParams) {
275
- for (const [key, value] of Object.entries(pathParam)) {
276
- pathParamsObject[key] = value;
277
- }
278
- }
279
- result.pathParams = pathParamsObject;
280
- }
281
- }
282
- else {
283
- // Already in object format
284
- result.pathParams = userData.pathParams;
285
- }
286
- }
287
- }
288
- else {
289
- // This is the old format with just user data
290
- result.data = userData;
291
- }
292
- }
293
- // Include headers for webhook testing - use object format for consistency
294
- if (typeof manualTrigger.getHeadersMap === "function") {
295
- const headersMap = manualTrigger.getHeadersMap();
296
- if (headersMap && headersMap.getLength() > 0) {
297
- const headersObject = {};
298
- headersMap.forEach((value, key) => {
299
- headersObject[key] = value;
300
- });
301
- result.headers = headersObject;
302
- }
303
- }
304
- else if (manualTrigger.headers) {
305
- // For plain objects, convert to object format
306
- if (Array.isArray(manualTrigger.headers)) {
307
- const headersObject = {};
308
- for (const [key, value] of Object.entries(manualTrigger.headers)) {
309
- headersObject[key] = value;
310
- }
311
- result.headers = headersObject;
312
- }
313
- else {
314
- result.headers = manualTrigger.headers;
315
- }
316
- }
317
- // Include pathParams for webhook testing - use object format for consistency
318
- if (typeof manualTrigger.getPathparamsMap === "function") {
319
- const pathParamsMap = manualTrigger.getPathparamsMap();
320
- if (pathParamsMap && pathParamsMap.getLength() > 0) {
321
- const pathParamsObject = {};
322
- pathParamsMap.forEach((value, key) => {
323
- pathParamsObject[key] = value;
324
- });
325
- result.pathParams = pathParamsObject;
326
- }
327
- }
328
- else if (manualTrigger.pathparams) {
329
- // For plain objects, convert to object format
330
- if (Array.isArray(manualTrigger.pathparams)) {
331
- const pathParamsObject = {};
332
- for (const [key, value] of Object.entries(manualTrigger.pathparams)) {
333
- pathParamsObject[key] = value;
334
- }
335
- result.pathParams = pathParamsObject;
336
- }
337
- else {
338
- result.pathParams = manualTrigger.pathparams;
339
- }
340
- }
341
- // Check if this is the new format with no data field or null data
342
- if (Object.keys(result).length === 0) {
343
- const objData = manualTrigger.toObject?.() || manualTrigger;
344
- if (objData && objData.data === undefined) {
345
- // No data was provided, return null
346
- result.data = null;
347
- }
348
- else {
349
- // Fallback to old structure for backward compatibility
350
- return { data: objData };
351
- }
352
156
  }
353
- // For manual triggers, return the flat structure
354
- return result;
355
157
  }
356
- return { data: null };
158
+ return null;
357
159
  }
358
160
  // Node outputs - RESTORE MISSING CASES
359
161
  case avs_pb.Execution.Step.OutputDataCase.ETH_TRANSFER:
@@ -11,9 +11,9 @@ declare class ManualTrigger extends Trigger {
11
11
  /**
12
12
  * Extract output data from RunTriggerResp for manual triggers
13
13
  * @param outputData - The RunTriggerResp containing manual trigger output
14
- * @returns Plain JavaScript object with manual trigger data in standard structure
14
+ * @returns The parsed JSON data directly (similar to CustomCode output)
15
15
  */
16
- static fromOutputData(outputData: avs_pb.RunTriggerResp): Record<string, unknown> | null;
16
+ static fromOutputData(outputData: avs_pb.RunTriggerResp): unknown;
17
17
  }
18
18
  export default ManualTrigger;
19
19
  //# sourceMappingURL=manual.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"manual.d.ts","sourceRoot":"","sources":["../../../src/models/trigger/manual.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAC;AAChD,OAAO,OAAO,MAAM,aAAa,CAAC;AAMlC,OAAO,EAEL,kBAAkB,EAEnB,MAAM,oBAAoB,CAAC;AAE5B,cAAM,aAAc,SAAQ,OAAO;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;gBAE/B,KAAK,EAAE,kBAAkB;IAWrC,SAAS,IAAI,MAAM,CAAC,WAAW;IAyC/B,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,WAAW,GAAG,aAAa;IA+C3D,iBAAiB,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAKnD;;;;OAIG;IACH,MAAM,CAAC,cAAc,CACnB,UAAU,EAAE,MAAM,CAAC,cAAc,GAChC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;CA6ClC;AAED,eAAe,aAAa,CAAC"}
1
+ {"version":3,"file":"manual.d.ts","sourceRoot":"","sources":["../../../src/models/trigger/manual.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAC;AAChD,OAAO,OAAO,MAAM,aAAa,CAAC;AAMlC,OAAO,EAEL,kBAAkB,EAEnB,MAAM,oBAAoB,CAAC;AAE5B,cAAM,aAAc,SAAQ,OAAO;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;gBAE/B,KAAK,EAAE,kBAAkB;IAWrC,SAAS,IAAI,MAAM,CAAC,WAAW;IA4C/B,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,WAAW,GAAG,aAAa;IA+C3D,iBAAiB,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAKnD;;;;OAIG;IACH,MAAM,CAAC,cAAc,CACnB,UAAU,EAAE,MAAM,CAAC,cAAc,GAChC,OAAO;CAuBX;AAED,eAAe,aAAa,CAAC"}
@@ -21,14 +21,16 @@ class ManualTrigger extends Trigger {
21
21
  // Create ManualTrigger with proper config structure
22
22
  const manualTrigger = new avs_pb.ManualTrigger();
23
23
  const config = new avs_pb.ManualTrigger.Config();
24
- // Set the data
24
+ // Set the data - required for ManualTrigger
25
25
  const dataToSend = this.data ?? this.input;
26
- if (dataToSend !== null && dataToSend !== undefined) {
27
- const inputValue = convertInputToProtobuf(dataToSend);
28
- if (inputValue) {
29
- config.setData(inputValue);
30
- }
26
+ if (dataToSend === null || dataToSend === undefined) {
27
+ throw new Error("ManualTrigger data is required");
28
+ }
29
+ const inputValue = convertInputToProtobuf(dataToSend);
30
+ if (!inputValue) {
31
+ throw new Error("Failed to convert ManualTrigger data to protobuf format");
31
32
  }
33
+ config.setData(inputValue);
32
34
  // Set headers if provided - direct object to protobuf map mapping
33
35
  if (this.headers && Object.keys(this.headers).length > 0) {
34
36
  const headersMap = config.getHeadersMap();
@@ -95,47 +97,26 @@ class ManualTrigger extends Trigger {
95
97
  /**
96
98
  * Extract output data from RunTriggerResp for manual triggers
97
99
  * @param outputData - The RunTriggerResp containing manual trigger output
98
- * @returns Plain JavaScript object with manual trigger data in standard structure
100
+ * @returns The parsed JSON data directly (similar to CustomCode output)
99
101
  */
100
102
  static fromOutputData(outputData) {
101
103
  const manualOutput = outputData.getManualTrigger();
102
104
  if (!manualOutput) {
103
105
  return null;
104
106
  }
105
- const result = {};
106
- // Extract data
107
+ // Extract only the data - headers and pathParams are config-only fields
107
108
  const dataValue = manualOutput.getData();
108
109
  if (dataValue) {
109
110
  try {
110
- result.data = convertProtobufValueToJs(dataValue);
111
+ // ManualTrigger data can be any valid JSON (objects, arrays, primitives)
112
+ return convertProtobufValueToJs(dataValue);
111
113
  }
112
114
  catch (error) {
113
115
  console.warn("Failed to convert manual trigger data from protobuf Value:", error);
114
- result.data = dataValue;
116
+ return null;
115
117
  }
116
118
  }
117
- else {
118
- result.data = null;
119
- }
120
- // Extract headers - always as object
121
- const headersMapProto = manualOutput.getHeadersMap();
122
- if (headersMapProto && headersMapProto.getLength() > 0) {
123
- const headersObject = {};
124
- headersMapProto.forEach((value, key) => {
125
- headersObject[key] = value;
126
- });
127
- result.headers = headersObject;
128
- }
129
- // Extract pathParams - always as object
130
- const pathParamsMapProto = manualOutput.getPathparamsMap();
131
- if (pathParamsMapProto && pathParamsMapProto.getLength() > 0) {
132
- const pathParamsObject = {};
133
- pathParamsMapProto.forEach((value, key) => {
134
- pathParamsObject[key] = value;
135
- });
136
- result.pathParams = pathParamsObject;
137
- }
138
- return result;
119
+ return null;
139
120
  }
140
121
  }
141
122
  export default ManualTrigger;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@avaprotocol/sdk-js",
3
- "version": "2.5.1",
3
+ "version": "2.5.2-dev.1",
4
4
  "description": "A JavaScript/TypeScript SDK designed to simplify integration with Ava Protocol's AVS",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",