@friggframework/core 2.0.0--canary.654.0c31bb1.0 → 2.0.0--canary.654.70623e2.0

package/handlers/backend-utils.js

@@ -1,4 +1,5 @@
 const { Router } = require('express');
+const { runInContext, LOGGER_SCOPE_KEY } = require('../logs/context');
 const { Worker } = require('@friggframework/core');
 const {
     IntegrationEventDispatcher,
@@ -19,6 +20,7 @@ const {
 const {
     getModulesDefinitionFromIntegrationClasses,
 } = require('../integrations/utils/map-integration-dto');
+const { processNotFound } = require('../integrations/use-cases/process-errors');
 
 const loadRouterFromObject = (IntegrationClass, routerObject) => {
     const router = Router();
@@ -37,12 +39,11 @@ const loadRouterFromObject = (IntegrationClass, routerObject) => {
             const dispatcher = new IntegrationEventDispatcher(
                 integrationInstance
             );
-            const result = await dispatcher.dispatchHttp({
-                event,
-                req,
-                res,
-                next,
-            });
+            // Logs only: a route :integrationId is unauthenticated input.
+            const result = await runInContext(
+                { [LOGGER_SCOPE_KEY]: { integrationId: req.params?.integrationId } },
+                () => dispatcher.dispatchHttp({ event, req, res, next })
+            );
             res.json(result);
         } catch (error) {
             next(error);
@@ -149,7 +150,7 @@ const loadIntegrationForProcess = async (processId, integrationClass) => {
     const process = await processRepository.findById(processId);
 
     if (!process) {
-        throw new Error(`Process not found: ${processId}`);
+        throw processNotFound(`Process not found: ${processId}`);
     }
 
     const instance = await getIntegrationInstance.execute(

package/handlers/routers/integration-webhook-routers.js

@@ -1,6 +1,7 @@
 const { createAppHandler } = require('./../app-handler-helpers');
 const { loadAppDefinition } = require('../app-definition-loader');
 const { Router } = require('express');
+const { runInContext, LOGGER_SCOPE_KEY } = require('../../logs/context');
 const {
     IntegrationEventDispatcher,
 } = require('../integration-event-dispatcher');
@@ -55,12 +56,18 @@ for (const IntegrationClass of integrationClasses) {
             const dispatcher = new IntegrationEventDispatcher(
                 integrationInstance
             );
-            await dispatcher.dispatchHttp({
-                event: 'WEBHOOK_RECEIVED',
-                req,
-                res,
-                next,
-            });
+            // Logs only: the id comes from an unauthenticated URL, so it must
+            // not reach the telemetry context that drives usage attribution.
+            await runInContext(
+                { [LOGGER_SCOPE_KEY]: { integrationId: req.params.integrationId } },
+                () =>
+                    dispatcher.dispatchHttp({
+                        event: 'WEBHOOK_RECEIVED',
+                        req,
+                        res,
+                        next,
+                    })
+            );
         } catch (error) {
             next(error);
         }

package/logs/context.js

@@ -77,8 +77,15 @@ function getLoggerScope() {
         for (const key of INTEGRATION_KEYS) {
             if (store[key] !== undefined) scope[key] = store[key];
         }
-        if (isPlainObject(store[LOGGER_SCOPE_KEY])) {
-            Object.assign(scope, store[LOGGER_SCOPE_KEY]);
+        // A set (hydrated) id beats a logger-only one, e.g. from a URL or a
+        // message body; a null id leaves the logger-only value in place.
+        const loggerKeys = store[LOGGER_SCOPE_KEY];
+        if (isPlainObject(loggerKeys)) {
+            for (const [key, value] of Object.entries(loggerKeys)) {
+                if (scope[key] === undefined || scope[key] === null) {
+                    scope[key] = value;
+                }
+            }
         }
         scope = Object.freeze(scope);
         scopeByStore.set(store, scope);

package/logs/summarize-event.js

@@ -1,14 +1,15 @@
 const { redactUrl } = require('./redact');
 
 // Best-effort extraction of the logical event/processId/integrationId from a
-// JSON message body. Used only for log correlation. Never throws.
+// JSON message body: `data.*` first, then the top level. Used only for log
+// correlation. Never throws.
 function summarizeMessageBody(bodyStr) {
     try {
         const parsed = JSON.parse(bodyStr);
         return {
             event: parsed?.event,
-            processId: parsed?.data?.processId,
-            integrationId: parsed?.data?.integrationId,
+            processId: parsed?.data?.processId ?? parsed?.processId,
+            integrationId: parsed?.data?.integrationId ?? parsed?.integrationId,
         };
     } catch {
         return {};

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@friggframework/core",
     "prettier": "@friggframework/prettier-config",
-    "version": "2.0.0--canary.654.0c31bb1.0",
+    "version": "2.0.0--canary.654.70623e2.0",
     "dependencies": {
         "@aws-sdk/client-apigatewaymanagementapi": "^3.588.0",
         "@aws-sdk/client-kms": "^3.588.0",
@@ -47,9 +47,9 @@
         }
     },
     "devDependencies": {
-        "@friggframework/eslint-config": "2.0.0--canary.654.0c31bb1.0",
-        "@friggframework/prettier-config": "2.0.0--canary.654.0c31bb1.0",
-        "@friggframework/test": "2.0.0--canary.654.0c31bb1.0",
+        "@friggframework/eslint-config": "2.0.0--canary.654.70623e2.0",
+        "@friggframework/prettier-config": "2.0.0--canary.654.70623e2.0",
+        "@friggframework/test": "2.0.0--canary.654.70623e2.0",
         "@prisma/client": "^6.19.3",
         "@types/lodash": "4.17.15",
         "@typescript-eslint/eslint-plugin": "^8.0.0",
@@ -89,5 +89,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "0c31bb15ef0497cc321c4d2103a752de6449d234"
+    "gitHead": "70623e2fbe9d93afb370528085ea543c784775c4"
 }