@ductape/sdk 0.0.4-v42 → 0.0.4-v44

package/dist/processor/services/processor.service.js

@@ -297,15 +297,27 @@ class ProcessorService {
         await this.productBuilderService.initializeProductByTag(product_tag);
         const { version, envs: appEnvs } = await this.productBuilderService.fetchApp(access_tag);
         const app = await this.productBuilderService.fetchThirdPartyAppByAccessTag(access_tag);
-        const { webhooks } = app.versions.find((data) => data.tag === version);
+        const appVersion = app.versions.find((data) => data.tag === version);
+        if (!appVersion) {
+            throw new Error(`Version ${version} not found for app ${access_tag}`);
+        }
+        const { webhooks, actions } = appVersion;
         if (!webhooks) {
             throw new Error(`Webhooks not found for app ${access_tag}`);
         }
+        if (!actions) {
+            throw new Error(`Actions not found for app ${access_tag}`);
+        }
         await validators_1.RegisterWebhookEnvSchema.validateAsync(envs);
         const webhook = webhooks.find((data) => data.tag === webhook_tag);
         if (!webhook) {
             throw new Error(`Webhook tag ${webhook_tag} not found`);
         }
+        // Get the action associated with this webhook
+        const action = actions.find((act) => act.tag === webhook.action);
+        if (!action) {
+            throw new Error(`Action ${webhook.action} not found for webhook ${webhook_tag}`);
+        }
         const productEnvs = await this.productBuilderService.fetchEnvs();
         productEnvs.map((env) => {
             const exists = envs.findIndex((dbEnv) => dbEnv.slug === env.slug);
@@ -314,6 +326,7 @@ class ProcessorService {
             }
         });
         const dataArray = await Promise.all(envs.map(async (env) => {
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             await this.validateActionDataMappingInput(env.auth, types_1.WebhookEventTypes.WEBHOOK_REGISTER);
             const productEnvData = productEnvs.find((data) => data.slug === env.slug);
             if (!productEnvData) {
@@ -324,44 +337,47 @@ class ProcessorService {
                 throw new Error(`Error finding env data for ${env.slug}`);
             }
             const { app_env_slug: appEnv, product_env_slug: productEnv } = envData;
-            const envWebhookData = webhook.envs.find((webhookEnv) => webhookEnv.slug === appEnv);
-            if (!envWebhookData) {
-                throw new Error(`Error finding webhook registration sample ${webhook_tag} for  env ${env.slug}`);
+            // Get the action's environment configuration
+            const actionEnvConfig = (_a = action.envs) === null || _a === void 0 ? void 0 : _a.find((actionEnv) => actionEnv.slug === appEnv);
+            if (!actionEnvConfig) {
+                throw new Error(`Action ${action.tag} is not configured for env ${appEnv}`);
             }
             const uuid = (0, uuid_1.v4)();
             const url = `${urls_1.WEBHOOK_BASE_URL}/webhooks/v1/process/${uuid}`;
             let active = false;
-            if (envWebhookData.sample) {
-                const samples = {
-                    query: envWebhookData.sample_data.filter((data) => data.parent_key === 'query'),
-                    params: envWebhookData.sample_data.filter((data) => data.parent_key === 'params'),
-                    body: envWebhookData.sample_data.filter((data) => data.parent_key === 'body'),
-                    headers: envWebhookData.sample_data.filter((data) => data.parent_key === 'headers'),
-                };
-                let payload = (await this.constructJSONDataPayloads(env.auth, {}, samples, {
-                    app: access_tag,
-                    event: '',
-                    input: env.auth,
-                    type: types_1.FeatureEventTypes.ACTION,
-                    retries: 0,
-                    allow_fail: false,
-                }));
-                const { updatedObj, replacedUrl } = (0, processor_utils_1.updateUrlsInObject)(payload, url);
-                if (replacedUrl && replacedUrl !== env.url && replacedUrl) {
-                    throw new Error(`Ductape expects the url ${replacedUrl} in request body to match inputted url ${env.url}`);
-                }
-                const exists = await this.fetchEnv(env.slug, {});
-                if (!exists) {
-                    throw new Error(`Env ${env.slug} does not exist`);
-                }
-                payload = updatedObj;
-                if (!replacedUrl) {
-                    payload.body.url = url;
-                }
-                const parsedUrl = new URL(envWebhookData.registration_url);
-                await this.sendActionRequest(parsedUrl.origin, parsedUrl.pathname, payload, envWebhookData.method, env.slug);
-                active = true;
-            }
+            // Construct the registration payload using the action's configuration
+            const samples = {
+                query: ((_c = (_b = action.query) === null || _b === void 0 ? void 0 : _b.data) === null || _c === void 0 ? void 0 : _c.filter((data) => data.parent_key === 'query')) || [],
+                params: ((_e = (_d = action.params) === null || _d === void 0 ? void 0 : _d.data) === null || _e === void 0 ? void 0 : _e.filter((data) => data.parent_key === 'params')) || [],
+                body: ((_g = (_f = action.body) === null || _f === void 0 ? void 0 : _f.data) === null || _g === void 0 ? void 0 : _g.filter((data) => data.parent_key === 'body')) || [],
+                headers: ((_j = (_h = action.headers) === null || _h === void 0 ? void 0 : _h.data) === null || _j === void 0 ? void 0 : _j.filter((data) => data.parent_key === 'headers')) || [],
+            };
+            let payload = (await this.constructJSONDataPayloads(env.auth, {}, samples, {
+                app: access_tag,
+                event: '',
+                input: env.auth,
+                type: types_1.FeatureEventTypes.ACTION,
+                retries: 0,
+                allow_fail: false,
+            }));
+            const { updatedObj, replacedUrl } = (0, processor_utils_1.updateUrlsInObject)(payload, url);
+            if (replacedUrl && replacedUrl !== env.url && replacedUrl) {
+                throw new Error(`Ductape expects the url ${replacedUrl} in request body to match inputted url ${env.url}`);
+            }
+            const exists = await this.fetchEnv(env.slug, {});
+            if (!exists) {
+                throw new Error(`Env ${env.slug} does not exist`);
+            }
+            payload = updatedObj;
+            if (!replacedUrl) {
+                payload.body.url = url;
+            }
+            // Use the action's resource and base_url to construct the registration URL
+            const baseUrl = actionEnvConfig.base_url || action.base_url || '';
+            const resource = action.resource || '';
+            const registrationUrl = new URL(resource, baseUrl);
+            await this.sendActionRequest(registrationUrl.origin, registrationUrl.pathname, payload, action.method, env.slug);
+            active = true;
             return {
                 appEnv,
                 productEnv,
@@ -2525,12 +2541,13 @@ class ProcessorService {
             name: `Subscribe to broker topic`,
         };
         try {
-            await this.validateActionDataMappingInput(data.input, types_1.FeatureEventTypes.STORAGE);
+            //await this.validateActionDataMappingInput(data.input, FeatureEventTypes.STORAGE);
+            const input = { callback: data.callback };
             this.start = Date.now();
             this.productTag = data.product;
             const process_id = (0, processor_utils_1.generateObjectId)();
-            this.input = data;
-            this.baseLogs = Object.assign({ product_tag: this.productTag, product_id: this.productId, workspace_id: this.workspace_id, env: data.env, process_id, data: data.input }, additional_logs);
+            this.input = Object.assign(Object.assign({}, data), { input });
+            this.baseLogs = Object.assign({ product_tag: this.productTag, product_id: this.productId, workspace_id: this.workspace_id, env: data.env, process_id, data: input }, additional_logs);
             await this.intializeProduct(additional_logs);
             this.baseLogs.product_id = this.productId;
             this.process_id = process_id;
@@ -2543,7 +2560,7 @@ class ProcessorService {
             const payload = {
                 type: types_1.FeatureEventTypes.SUBSCRIBE,
                 event: data.event,
-                input: data.input,
+                input: input,
                 env: productEnv,
                 retries: 0,
                 allow_fail: false,
@@ -2574,10 +2591,11 @@ class ProcessorService {
             name: 'Publish to broker topic',
         };
         try {
-            await this.validateActionDataMappingInput(data.input, types_1.FeatureEventTypes.PUBLISH);
+            const input = { message: data.message };
+            await this.validateActionDataMappingInput(input, types_1.FeatureEventTypes.PUBLISH);
             this.start = Date.now();
             // clone
-            this.clone = (0, processor_utils_1.structuredClone)(data.input);
+            this.clone = (0, processor_utils_1.structuredClone)(input);
             this.input = data;
             this.productTag = data.product;
             const process_id = (0, processor_utils_1.generateObjectId)();
@@ -2595,7 +2613,7 @@ class ProcessorService {
                 type: types_1.FeatureEventTypes.PUBLISH,
                 event: data.event,
                 cache: data.cache,
-                input: data.input,
+                input: input,
                 env: productEnv,
                 retries: 0,
                 allow_fail: false,
@@ -2678,7 +2696,7 @@ class ProcessorService {
                 event: job.event,
                 cache: job.cache,
                 session: job.session,
-                input: job.input
+                message: job.input
             };
             jobInput = input;
         }