@routr/pgdata 2.17.0 → 2.19.0

package/dist/mappers/agent.js

@@ -26,6 +26,7 @@ const credentials_1 = require("./credentials");
 const domain_1 = require("./domain");
 const number_1 = require("./number");
 const manager_1 = require("./manager");
+const utils_1 = require("./utils");
 // Needs testing
 class AgentManager extends manager_1.EntityManager {
     constructor(agent) {
@@ -62,12 +63,12 @@ class AgentManager extends manager_1.EntityManager {
             common_1.CommonConnect.isValidNameOrThrow(this.agent.name);
     }
     mapToPrisma() {
-        var _a;
-        return Object.assign(Object.assign({}, this.agent), { apiVersion: "v2", privacy: (_a = this.agent.privacy) !== null && _a !== void 0 ? _a : client_1.Privacy.NONE, domainRef: this.agent.domainRef || null, credentialsRef: this.agent.credentialsRef || null, expires: this.agent.expires || 0, createdAt: undefined, updatedAt: undefined, extended: this.agent.extended });
+        var _a, _b, _c;
+        return Object.assign(Object.assign({}, (0, utils_1.withoutTrace)(this.agent)), { traceEnabled: (_b = (_a = this.agent.trace) === null || _a === void 0 ? void 0 : _a.enabled) !== null && _b !== void 0 ? _b : false, apiVersion: "v2", privacy: (_c = this.agent.privacy) !== null && _c !== void 0 ? _c : client_1.Privacy.NONE, domainRef: this.agent.domainRef || null, credentialsRef: this.agent.credentialsRef || null, expires: this.agent.expires || 0, createdAt: undefined, updatedAt: undefined, extended: this.agent.extended });
     }
     static mapToDto(agent) {
         return agent
-            ? Object.assign(Object.assign({}, agent), { apiVersion: agent.apiVersion, privacy: agent.privacy, domain: domain_1.DomainManager.mapToDto(agent.domain), credentials: credentials_1.CredentialsManager.mapToDto(agent.credentials), createdAt: agent.createdAt.getTime() / 1000, updatedAt: agent.updatedAt.getTime() / 1000, extended: agent.extended }) : undefined;
+            ? Object.assign(Object.assign({}, (0, utils_1.withoutTraceEnabled)(agent)), { trace: { enabled: agent.traceEnabled }, apiVersion: agent.apiVersion, privacy: agent.privacy, domain: domain_1.DomainManager.mapToDto(agent.domain), credentials: credentials_1.CredentialsManager.mapToDto(agent.credentials), createdAt: agent.createdAt.getTime() / 1000, updatedAt: agent.updatedAt.getTime() / 1000, extended: agent.extended }) : undefined;
     }
 }
 exports.AgentManager = AgentManager;

package/dist/mappers/domain.js

@@ -5,6 +5,7 @@ const common_1 = require("@routr/common");
 const acl_1 = require("./acl");
 const manager_1 = require("./manager");
 const number_1 = require("./number");
+const utils_1 = require("./utils");
 // Needs testing
 class DomainManager extends manager_1.EntityManager {
     constructor(domain) {
@@ -33,9 +34,9 @@ class DomainManager extends manager_1.EntityManager {
             common_1.CommonConnect.isValidNameOrThrow(this.domain.name);
     }
     mapToPrisma() {
-        var _a;
-        return Object.assign(Object.assign({}, this.domain), { apiVersion: "v2", accessControlListRef: this.domain.accessControlListRef || null, extended: this.domain.extended, egressPolicies: {
-                create: (_a = this.domain.egressPolicies) === null || _a === void 0 ? void 0 : _a.map((policy) => ({
+        var _a, _b, _c;
+        return Object.assign(Object.assign({}, (0, utils_1.withoutTrace)(this.domain)), { traceEnabled: (_b = (_a = this.domain.trace) === null || _a === void 0 ? void 0 : _a.enabled) !== null && _b !== void 0 ? _b : false, apiVersion: "v2", accessControlListRef: this.domain.accessControlListRef || null, extended: this.domain.extended, egressPolicies: {
+                create: (_c = this.domain.egressPolicies) === null || _c === void 0 ? void 0 : _c.map((policy) => ({
                     rule: policy.rule,
                     numberRef: policy.numberRef
                 }))
@@ -44,7 +45,7 @@ class DomainManager extends manager_1.EntityManager {
     static mapToDto(domain) {
         var _a, _b;
         return domain
-            ? Object.assign(Object.assign({}, domain), { apiVersion: domain.apiVersion, accessControlListRef: (_a = domain.accessControlList) === null || _a === void 0 ? void 0 : _a.ref, accessControlList: acl_1.ACLManager.mapToDto(domain.accessControlList), egressPolicies: (_b = domain.egressPolicies) === null || _b === void 0 ? void 0 : _b.map((policy) => ({
+            ? Object.assign(Object.assign({}, (0, utils_1.withoutTraceEnabled)(domain)), { trace: { enabled: domain.traceEnabled }, apiVersion: domain.apiVersion, accessControlListRef: (_a = domain.accessControlList) === null || _a === void 0 ? void 0 : _a.ref, accessControlList: acl_1.ACLManager.mapToDto(domain.accessControlList), egressPolicies: (_b = domain.egressPolicies) === null || _b === void 0 ? void 0 : _b.map((policy) => ({
                     rule: policy.rule,
                     numberRef: policy.numberRef,
                     number: number_1.NumberManager.mapToDtoWithoutTrunk(policy.number)

package/dist/mappers/peer.js

@@ -5,6 +5,7 @@ const common_1 = require("@routr/common");
 const acl_1 = require("./acl");
 const credentials_1 = require("./credentials");
 const manager_1 = require("./manager");
+const utils_1 = require("./utils");
 // Needs testing
 class PeerManager extends manager_1.EntityManager {
     constructor(peer) {
@@ -36,14 +37,15 @@ class PeerManager extends manager_1.EntityManager {
         common_1.CommonConnect.isValidContactAddressOrThrow(this.peer.contactAddr);
     }
     mapToPrisma() {
+        var _a, _b;
         const normalizeAlgorithm = (algorithm) => algorithm === common_1.CommonTypes.LoadBalancingAlgorithm.UNSPECIFIED
             ? undefined
             : algorithm;
-        return Object.assign(Object.assign({}, this.peer), { apiVersion: "v2", balancingAlgorithm: normalizeAlgorithm(this.peer.balancingAlgorithm), withSessionAffinity: this.peer.withSessionAffinity, credentialsRef: this.peer.credentialsRef || null, accessControlListRef: this.peer.accessControlListRef || null, expires: this.peer.expires || 0, createdAt: undefined, updatedAt: undefined, extended: this.peer.extended });
+        return Object.assign(Object.assign({}, (0, utils_1.withoutTrace)(this.peer)), { traceEnabled: (_b = (_a = this.peer.trace) === null || _a === void 0 ? void 0 : _a.enabled) !== null && _b !== void 0 ? _b : false, apiVersion: "v2", balancingAlgorithm: normalizeAlgorithm(this.peer.balancingAlgorithm), withSessionAffinity: this.peer.withSessionAffinity, credentialsRef: this.peer.credentialsRef || null, accessControlListRef: this.peer.accessControlListRef || null, expires: this.peer.expires || 0, createdAt: undefined, updatedAt: undefined, extended: this.peer.extended });
     }
     static mapToDto(peer) {
         return peer
-            ? Object.assign(Object.assign({}, peer), { apiVersion: peer.apiVersion, balancingAlgorithm: peer.balancingAlgorithm, credentials: credentials_1.CredentialsManager.mapToDto(peer.credentials), accessControlList: acl_1.ACLManager.mapToDto(peer.accessControlList), createdAt: peer.createdAt.getTime() / 1000, updatedAt: peer.updatedAt.getTime() / 1000, extended: peer.extended }) : undefined;
+            ? Object.assign(Object.assign({}, (0, utils_1.withoutTraceEnabled)(peer)), { trace: { enabled: peer.traceEnabled }, apiVersion: peer.apiVersion, balancingAlgorithm: peer.balancingAlgorithm, credentials: credentials_1.CredentialsManager.mapToDto(peer.credentials), accessControlList: acl_1.ACLManager.mapToDto(peer.accessControlList), createdAt: peer.createdAt.getTime() / 1000, updatedAt: peer.updatedAt.getTime() / 1000, extended: peer.extended }) : undefined;
     }
 }
 exports.PeerManager = PeerManager;

package/dist/mappers/trunk.js

@@ -5,6 +5,7 @@ const common_1 = require("@routr/common");
 const acl_1 = require("./acl");
 const credentials_1 = require("./credentials");
 const manager_1 = require("./manager");
+const utils_1 = require("./utils");
 // Needs testing
 class TrunkManager extends manager_1.EntityManager {
     constructor(trunk) {
@@ -34,14 +35,15 @@ class TrunkManager extends manager_1.EntityManager {
         common_1.CommonConnect.isValidInboundUriOrThrow(this.trunk.inboundUri);
     }
     mapToPrisma() {
-        return Object.assign(Object.assign({}, this.trunk), { apiVersion: "v2", accessControlListRef: this.trunk.accessControlListRef || null, inboundCredentialsRef: this.trunk.inboundCredentialsRef || null, outboundCredentialsRef: this.trunk.outboundCredentialsRef || null, uris: {
+        var _a, _b;
+        return Object.assign(Object.assign({}, (0, utils_1.withoutTrace)(this.trunk)), { traceEnabled: (_b = (_a = this.trunk.trace) === null || _a === void 0 ? void 0 : _a.enabled) !== null && _b !== void 0 ? _b : false, apiVersion: "v2", accessControlListRef: this.trunk.accessControlListRef || null, inboundCredentialsRef: this.trunk.inboundCredentialsRef || null, outboundCredentialsRef: this.trunk.outboundCredentialsRef || null, uris: {
                 create: this.trunk.uris
             }, extended: this.trunk.extended, createdAt: undefined, updatedAt: undefined });
     }
     static mapToDto(trunk) {
         var _a, _b, _c;
         return trunk
-            ? Object.assign(Object.assign({}, trunk), { apiVersion: trunk.apiVersion, accessControlListRef: (_a = trunk.accessControlList) === null || _a === void 0 ? void 0 : _a.ref, inboundCredentialsRef: (_b = trunk.inboundCredentials) === null || _b === void 0 ? void 0 : _b.ref, outboundCredentialsRef: (_c = trunk.outboundCredentials) === null || _c === void 0 ? void 0 : _c.ref, inboundCredentials: credentials_1.CredentialsManager.mapToDto(trunk.inboundCredentials), accessControlList: acl_1.ACLManager.mapToDto(trunk.accessControlList), outboundCredentials: credentials_1.CredentialsManager.mapToDto(trunk.outboundCredentials), uris: trunk.uris.map((uri) => {
+            ? Object.assign(Object.assign({}, (0, utils_1.withoutTraceEnabled)(trunk)), { trace: { enabled: trunk.traceEnabled }, apiVersion: trunk.apiVersion, accessControlListRef: (_a = trunk.accessControlList) === null || _a === void 0 ? void 0 : _a.ref, inboundCredentialsRef: (_b = trunk.inboundCredentials) === null || _b === void 0 ? void 0 : _b.ref, outboundCredentialsRef: (_c = trunk.outboundCredentials) === null || _c === void 0 ? void 0 : _c.ref, inboundCredentials: credentials_1.CredentialsManager.mapToDto(trunk.inboundCredentials), accessControlList: acl_1.ACLManager.mapToDto(trunk.accessControlList), outboundCredentials: credentials_1.CredentialsManager.mapToDto(trunk.outboundCredentials), uris: trunk.uris.map((uri) => {
                     return Object.assign(Object.assign({}, uri), { transport: uri.transport.toUpperCase() });
                 }), createdAt: trunk.createdAt.getTime() / 1000, updatedAt: trunk.updatedAt.getTime() / 1000, extended: trunk.extended }) : undefined;
     }

package/dist/mappers/utils.d.ts

@@ -7,3 +7,23 @@ import { NumberManager } from "./number";
 import { PeerManager } from "./peer";
 import { TrunkManager } from "./trunk";
 export declare function getManager(kind: CC.KindWithoutUnknown): typeof ACLManager | typeof CredentialsManager | typeof TrunkManager | typeof NumberManager | typeof DomainManager | typeof AgentManager | typeof PeerManager;
+/**
+ * Drops the API-level `trace` object before handing a resource to Prisma,
+ * which stores it as the trace_enabled column.
+ *
+ * @param {object} resource - A resource with an optional trace object
+ * @return {object} The same resource without it
+ */
+export declare function withoutTrace<T extends {
+    trace?: unknown;
+}>(resource: T): Omit<T, "trace">;
+/**
+ * Drops Prisma's trace_enabled column from a row before it becomes a DTO,
+ * where the setting is the `trace` object.
+ *
+ * @param {object} row - A Prisma row
+ * @return {object} The row without traceEnabled
+ */
+export declare function withoutTraceEnabled<T extends {
+    traceEnabled?: unknown;
+}>(row: T): Omit<T, "traceEnabled">;

package/dist/mappers/utils.js

@@ -1,6 +1,19 @@
 "use strict";
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getManager = getManager;
+exports.withoutTrace = withoutTrace;
+exports.withoutTraceEnabled = withoutTraceEnabled;
 /*
  * Copyright (C) 2026 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster/routr
@@ -46,3 +59,27 @@ function getManager(kind) {
             return domain_1.DomainManager;
     }
 }
+/**
+ * Drops the API-level `trace` object before handing a resource to Prisma,
+ * which stores it as the trace_enabled column.
+ *
+ * @param {object} resource - A resource with an optional trace object
+ * @return {object} The same resource without it
+ */
+function withoutTrace(resource) {
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    const { trace } = resource, rest = __rest(resource, ["trace"]);
+    return rest;
+}
+/**
+ * Drops Prisma's trace_enabled column from a row before it becomes a DTO,
+ * where the setting is the `trace` object.
+ *
+ * @param {object} row - A Prisma row
+ * @return {object} The row without traceEnabled
+ */
+function withoutTraceEnabled(row) {
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    const { traceEnabled } = row, rest = __rest(row, ["traceEnabled"]);
+    return rest;
+}

package/dist/service.js

@@ -109,6 +109,13 @@ function pgDataService(config) {
     internalServer.bindAsync(config.bindAddr, credentials, () => {
         logger.info("internal server started", { bindAddr: config.bindAddr });
     });
+    // Report SERVING once the external server is up, with or without TLS
+    const onExternalServerStarted = () => {
+        healthImpl.setStatus("", common_1.GRPC_SERVING_STATUS);
+        logger.info("external server started", {
+            externalServerBindAddr: config.externalServerBindAddr
+        });
+    };
     if (envs_1.TLS_ON) {
         const cacert = envs_1.VERIFY_CLIENT_CERT ? fs_1.default.readFileSync(envs_1.CACERT) : null;
         const cert = fs_1.default.readFileSync(envs_1.SERVER_CERT);
@@ -121,19 +128,10 @@ function pgDataService(config) {
                 private_key: key
             }
         ], envs_1.VERIFY_CLIENT_CERT);
-        externalServer.bindAsync(config.externalServerBindAddr, externalCredentials, () => {
-            logger.info("external server started", {
-                externalServerBindAddr: config.externalServerBindAddr
-            });
-        });
+        externalServer.bindAsync(config.externalServerBindAddr, externalCredentials, onExternalServerStarted);
     }
     else {
-        externalServer.bindAsync(config.externalServerBindAddr, credentials, () => {
-            healthImpl.setStatus("", common_1.GRPC_SERVING_STATUS);
-            logger.info("secure connection disabled");
-            logger.info("external server started", {
-                externalServerBindAddr: config.externalServerBindAddr
-            });
-        });
+        logger.info("secure connection disabled");
+        externalServer.bindAsync(config.externalServerBindAddr, credentials, onExternalServerStarted);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@routr/pgdata",
-  "version": "2.17.0",
+  "version": "2.19.0",
   "description": "Postgres API Server for Routr Connect",
   "author": "Pedro Sanders <psanders@fonoster.com>",
   "homepage": "https://github.com/fonoster/routr#readme",
@@ -24,8 +24,8 @@
     "@fonoster/logger": "0.6.0",
     "@grpc/grpc-js": "~1.14.6",
     "@prisma/client": "^6.19.1",
-    "@routr/common": "^2.17.0",
-    "@routr/processor": "^2.17.0",
+    "@routr/common": "^2.19.0",
+    "@routr/processor": "^2.19.0",
     "google-protobuf": "^3.21.4",
     "grpc-health-check": "^2.1.0",
     "pb-util": "^1.0.3",
@@ -51,5 +51,5 @@
     "@types/validator": "^13.15.10",
     "prisma": "^6.19.1"
   },
-  "gitHead": "9bc2d0a407a82e7b3724bb139ba62504c7b3d49e"
+  "gitHead": "357116800e150d8bbfbd0ad2406689c5793675b1"
 }