@routr/connect 2.18.0 → 2.19.0

package/dist/handlers/register.js

@@ -97,7 +97,7 @@ const handleRegister = (apiClient, location) => {
                     route: location_1.Helper.createRoute(request, envs_1.REGISTER_DEFAULT_EXPIRES),
                     maxContacts: peerOrAgent.maxContacts
                 });
-                res.sendRegisterOk(request);
+                res.sendRegisterOk(request, undefined, (0, utils_1.recordingMetadata)(peerOrAgent, (0, utils_1.domainOf)(peerOrAgent)));
             }
             catch (e) {
                 if (e.code === grpc.status.INVALID_ARGUMENT) {

package/dist/router.js

@@ -121,7 +121,11 @@ function router(location, apiClient) {
         const result = (direction, route, extended) => route
             ? {
                 direction,
-                route: Object.assign(Object.assign({}, route), { metadata: extended })
+                route: Object.assign(Object.assign({}, route), { 
+                    // Resource metadata links the call to an account; the recording
+                    // flag comes from any resource the call touches that asks for
+                    // it; trace.* keys annotate the hop in the recording
+                    metadata: Object.assign(Object.assign(Object.assign(Object.assign({}, extended), (0, utils_1.recordingMetadata)(caller, (0, utils_1.domainOf)(caller), callee, (0, utils_1.domainOf)(callee))), common_1.Trace.traceAnnotations({ direction })), route.metadata) })
             }
             : {
                 direction,
@@ -174,7 +178,7 @@ function agentToAgent(location, req) {
  */
 function fromPSTN(apiClient, location, callee, req) {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a;
+        var _a, _b;
         const sessionAffinityRef = processor_1.Extensions.getHeaderValue(req, callee.sessionAffinityHeader);
         let backend;
         const peer = (yield apiClient.peers.findBy({
@@ -198,7 +202,8 @@ function fromPSTN(apiClient, location, callee, req) {
         }
         if (!route.headers)
             route.headers = [];
-        (_a = callee.extraHeaders) === null || _a === void 0 ? void 0 : _a.forEach((prop) => {
+        route.metadata = Object.assign(Object.assign(Object.assign({}, route.metadata), (0, utils_1.recordingMetadata)(callee.trunk)), common_1.Trace.traceAnnotations({ trunk: (_a = callee.trunk) === null || _a === void 0 ? void 0 : _a.ref }));
+        (_b = callee.extraHeaders) === null || _b === void 0 ? void 0 : _b.forEach((prop) => {
             const p = {
                 name: prop.name,
                 value: prop.value,
@@ -242,6 +247,7 @@ function agentToPSTN(req, agent, calleeNumber) {
             edgePortRef: req.edgePortRef,
             listeningPoints: req.listeningPoints,
             localnets: req.localnets,
+            metadata: Object.assign(Object.assign({}, (0, utils_1.recordingMetadata)(trunk)), common_1.Trace.traceAnnotations({ trunk: trunk.ref })),
             externalAddrs: req.externalAddrs,
             headers: [
                 // TODO: Find a more deterministic way to re-add the Privacy header
@@ -280,7 +286,7 @@ function agentToPeer(location, callee, req) {
 // eslint-disable-next-line require-jsdoc
 function peerToPSTN(apiClient, req) {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a;
+        var _a, _b;
         const numberTel = processor_1.Extensions.getHeaderValue(req, common_1.CommonTypes.ExtraHeader.DOD_NUMBER);
         const privacy = processor_1.Extensions.getHeaderValue(req, common_1.CommonTypes.ExtraHeader.DOD_PRIVACY);
         if (!numberTel) {
@@ -316,6 +322,7 @@ function peerToPSTN(apiClient, req) {
             edgePortRef: req.edgePortRef,
             listeningPoints: req.listeningPoints,
             localnets: req.localnets,
+            metadata: Object.assign(Object.assign({}, (0, utils_1.recordingMetadata)(number.trunk)), common_1.Trace.traceAnnotations({ trunk: (_b = number.trunk) === null || _b === void 0 ? void 0 : _b.ref })),
             externalAddrs: req.externalAddrs,
             headers: [
                 // TODO: Find a more deterministic way to re-add the Privacy header

package/dist/utils.d.ts

@@ -74,3 +74,22 @@ export declare const getSourceAddress: (request: MessageRequest) => string | und
  * @return {boolean} true if the request comes from a trusted peer EdgePort
  */
 export declare const isFromTrustedEdgePort: (request: MessageRequest, trust: EdgePortTrust) => boolean;
+type Traceable = Pick<CC.Agent, "ref" | "trace"> | undefined | null;
+/**
+ * Metadata that asks the dispatcher to record the call when any of the
+ * resources it touches (Trunk, Agent, Peer, Domain) has `trace.enabled`.
+ * The value is the ref of the first one that asked. The dispatcher removes
+ * the key before the message leaves.
+ *
+ * @param {Traceable[]} resources - Resources the call touches, in order of precedence
+ * @return {Record<string, string>} The metadata to merge into the route
+ */
+export declare const recordingMetadata: (...resources: Traceable[]) => Record<string, string>;
+/**
+ * The domain a resource belongs to, when it carries one (Agents do).
+ *
+ * @param {object} resource - A caller or callee resource
+ * @return {CC.Domain | undefined} Its domain
+ */
+export declare const domainOf: (resource: unknown) => CC.Domain | undefined;
+export {};

package/dist/utils.js

@@ -45,7 +45,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isFromTrustedEdgePort = exports.getSourceAddress = exports.getUntrustedHeadersToStrip = exports.getVerifierImpl = exports.hasXConnectObjectHeader = exports.isInDialog = exports.getSipUri = exports.getTrunkURI = exports.createTrunkAuthentication = exports.createRemotePartyId = exports.createPAssertedIdentity = exports.getRoutingDirection = exports.findResource = exports.findNumberByTelUrl = exports.findDomain = exports.isKind = void 0;
+exports.domainOf = exports.recordingMetadata = exports.isFromTrustedEdgePort = exports.getSourceAddress = exports.getUntrustedHeadersToStrip = exports.getVerifierImpl = exports.hasXConnectObjectHeader = exports.isInDialog = exports.getSipUri = exports.getTrunkURI = exports.createTrunkAuthentication = exports.createRemotePartyId = exports.createPAssertedIdentity = exports.getRoutingDirection = exports.findResource = exports.findNumberByTelUrl = exports.findDomain = exports.isKind = void 0;
 /*
  * Copyright (C) 2026 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster/routr
@@ -306,3 +306,25 @@ const isFromTrustedEdgePort = (request, trust) => {
     });
 };
 exports.isFromTrustedEdgePort = isFromTrustedEdgePort;
+/**
+ * Metadata that asks the dispatcher to record the call when any of the
+ * resources it touches (Trunk, Agent, Peer, Domain) has `trace.enabled`.
+ * The value is the ref of the first one that asked. The dispatcher removes
+ * the key before the message leaves.
+ *
+ * @param {Traceable[]} resources - Resources the call touches, in order of precedence
+ * @return {Record<string, string>} The metadata to merge into the route
+ */
+const recordingMetadata = (...resources) => {
+    const asked = resources.find((r) => { var _a; return ((_a = r === null || r === void 0 ? void 0 : r.trace) === null || _a === void 0 ? void 0 : _a.enabled) === true; });
+    return asked ? { [common_1.Trace.TRACE_FLAG_METADATA_KEY]: asked.ref } : {};
+};
+exports.recordingMetadata = recordingMetadata;
+/**
+ * The domain a resource belongs to, when it carries one (Agents do).
+ *
+ * @param {object} resource - A caller or callee resource
+ * @return {CC.Domain | undefined} Its domain
+ */
+const domainOf = (resource) => resource === null || resource === void 0 ? void 0 : resource.domain;
+exports.domainOf = domainOf;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@routr/connect",
-  "version": "2.18.0",
+  "version": "2.19.0",
   "description": "Default processor",
   "author": "Pedro Sanders <psanders@fonoster.com>",
   "homepage": "https://github.com/fonoster/routr#readme",
@@ -20,9 +20,9 @@
   },
   "dependencies": {
     "@fonoster/logger": "0.6.0",
-    "@routr/common": "^2.17.0",
-    "@routr/location": "^2.18.0",
-    "@routr/processor": "^2.18.0",
+    "@routr/common": "^2.19.0",
+    "@routr/location": "^2.19.0",
+    "@routr/processor": "^2.19.0",
     "jsonwebtoken": "^9.0.3"
   },
   "devDependencies": {
@@ -41,5 +41,5 @@
   "bugs": {
     "url": "https://github.com/fonoster/routr/issues"
   },
-  "gitHead": "53d48803760e0d8d6af1efa63db2414594d79454"
+  "gitHead": "357116800e150d8bbfbd0ad2406689c5793675b1"
 }