diff --git a/packages/backend/src/apps/twitter/common/get-user-tweets.ts b/packages/backend/src/apps/twitter/common/get-user-tweets.ts index 29ed790d..415a6a13 100644 --- a/packages/backend/src/apps/twitter/common/get-user-tweets.ts +++ b/packages/backend/src/apps/twitter/common/get-user-tweets.ts @@ -30,7 +30,7 @@ const fetchTweets = async ($: IGlobalVariable, username: string) => { if (response.data.meta.result_count > 0) { response.data.data.forEach((tweet: IJSONObject) => { - $.output.data.push({ + $.triggerOutput.data.push({ raw: tweet, meta: { internalId: tweet.id as string, @@ -40,7 +40,7 @@ const fetchTweets = async ($: IGlobalVariable, username: string) => { } } while (response.data.meta.next_token && !$.execution.testRun); - return $.output; + return $.triggerOutput; }; const getUserTweets = async ( diff --git a/packages/backend/src/apps/twitter/triggers/my-tweets/index.ts b/packages/backend/src/apps/twitter/triggers/my-tweets/index.ts index f82ccd65..8f9f4475 100644 --- a/packages/backend/src/apps/twitter/triggers/my-tweets/index.ts +++ b/packages/backend/src/apps/twitter/triggers/my-tweets/index.ts @@ -22,7 +22,7 @@ export default defineTrigger({ }, sort($) { - $.output.data.sort((tweet, nextTweet) => { + $.triggerOutput.data.sort((tweet, nextTweet) => { return Number(nextTweet.meta.internalId) - Number(tweet.meta.internalId); }); }, diff --git a/packages/backend/src/apps/twitter/triggers/search-tweets/index.ts b/packages/backend/src/apps/twitter/triggers/search-tweets/index.ts index 27709bef..3e69afd2 100644 --- a/packages/backend/src/apps/twitter/triggers/search-tweets/index.ts +++ b/packages/backend/src/apps/twitter/triggers/search-tweets/index.ts @@ -35,7 +35,7 @@ export default defineTrigger({ }, sort($) { - $.output.data.sort((tweet, nextTweet) => { + $.triggerOutput.data.sort((tweet, nextTweet) => { return Number(nextTweet.meta.internalId) - Number(tweet.meta.internalId); }); }, diff --git a/packages/backend/src/apps/twitter/triggers/search-tweets/search-tweets.ts b/packages/backend/src/apps/twitter/triggers/search-tweets/search-tweets.ts index eac3eb38..b25ef36b 100644 --- a/packages/backend/src/apps/twitter/triggers/search-tweets/search-tweets.ts +++ b/packages/backend/src/apps/twitter/triggers/search-tweets/search-tweets.ts @@ -35,7 +35,7 @@ const searchTweets = async ($: IGlobalVariable) => { }, }; - $.output.data.push(dataItem); + $.triggerOutput.data.push(dataItem); }); } } while (response.data.meta.next_token && !$.execution.testRun); diff --git a/packages/backend/src/apps/twitter/triggers/user-tweets/index.ts b/packages/backend/src/apps/twitter/triggers/user-tweets/index.ts index e2fb64a2..783fe028 100644 --- a/packages/backend/src/apps/twitter/triggers/user-tweets/index.ts +++ b/packages/backend/src/apps/twitter/triggers/user-tweets/index.ts @@ -34,7 +34,7 @@ export default defineTrigger({ }, sort($) { - $.output.data.sort((tweet, nextTweet) => { + $.triggerOutput.data.sort((tweet, nextTweet) => { return Number(nextTweet.meta.internalId) - Number(tweet.meta.internalId); }); }, diff --git a/packages/backend/src/helpers/global-variable.ts b/packages/backend/src/helpers/global-variable.ts index 34ddd074..26291fa9 100644 --- a/packages/backend/src/helpers/global-variable.ts +++ b/packages/backend/src/helpers/global-variable.ts @@ -59,10 +59,14 @@ const globalVariable = async ( id: execution?.id, testRun, }, - output: { + triggerOutput: { data: [], error: null, }, + actionOutput: { + data: null, + error: null, + }, }; $.http = createHttpClient({ diff --git a/packages/backend/src/services/flow.ts b/packages/backend/src/services/flow.ts index 7ef3886f..1a333872 100644 --- a/packages/backend/src/services/flow.ts +++ b/packages/backend/src/services/flow.ts @@ -24,12 +24,12 @@ export const processFlow = async (options: ProcessFlowOptions) => { await triggerCommand.run($); } catch (error) { if (error?.response?.httpError) { - $.output.error = error.response.httpError; + $.triggerOutput.error = error.response.httpError; } else { try { - $.output.error = JSON.parse(error.message); + $.triggerOutput.error = JSON.parse(error.message); } catch { - $.output.error = { error: error.message }; + $.triggerOutput.error = { error: error.message }; } } } @@ -38,5 +38,5 @@ export const processFlow = async (options: ProcessFlowOptions) => { triggerCommand.sort($); } - return $.output; + return $.triggerOutput; }; diff --git a/packages/types/index.d.ts b/packages/types/index.d.ts index 41e17b90..35808c4e 100644 --- a/packages/types/index.d.ts +++ b/packages/types/index.d.ts @@ -171,7 +171,7 @@ export interface IApp { export type TBeforeRequest = { ($: IGlobalVariable, requestConfig: AxiosRequestConfig): AxiosRequestConfig; -} +}; export interface IData { [index: string]: any; @@ -233,7 +233,7 @@ export interface IAction { key: string; description: string; substeps: ISubstep[]; - run($: IGlobalVariable): Promise; + run($: IGlobalVariable): Promise; } export interface IAuthentication { @@ -280,10 +280,8 @@ export type IGlobalVariable = { id: string; testRun: boolean; }; - output: { - data: ITriggerDataItem[]; - error?: IJSONObject; - } + triggerOutput?: ITriggerOutput; + actionOutput?: IActionOutput; process?: (triggerDataItem: ITriggerDataItem) => Promise; };