@routr/pgdata 2.12.1 → 2.13.1

package/dist/api/update.js

@@ -43,14 +43,14 @@ function update(operation, kind) {
             const Manager = (0, utils_1.getManager)(kind);
             const manager = new Manager(request);
             manager.validOrThrowUpdate();
-            if (kind === common_1.CommonConnect.Kind.DOMAIN) {
+            if (kind === common_1.CommonConnect.Kind.DOMAIN && request.egressPolicy) {
                 yield db_1.prisma.egressPolicy.deleteMany({
                     where: {
                         domainRef: request.ref
                     }
                 });
             }
-            if (kind === common_1.CommonConnect.Kind.TRUNK) {
+            if (kind === common_1.CommonConnect.Kind.TRUNK && request.uris) {
                 yield db_1.prisma.trunkURI.deleteMany({
                     where: {
                         trunkRef: request.ref

package/dist/mappers/acl.d.ts

@@ -1,11 +1,10 @@
 import { AccessControlList as ACLPrismaModel } from "@prisma/client";
 import { CommonConnect as CC } from "@routr/common";
-import { JsonObject } from "pb-util/build";
 import { EntityManager } from "./manager";
 export declare class ACLManager extends EntityManager {
     private acl;
     constructor(acl: CC.AccessControlList);
-    static includeFields(): JsonObject;
+    static includeFields(): Record<string, unknown>;
     validOrThrowCreate(): void;
     validOrThrowUpdate(): void;
     mapToPrisma(): ACLPrismaModel;

package/dist/mappers/acl.js

@@ -18,30 +18,16 @@ class ACLManager extends manager_1.EntityManager {
         common_1.CommonConnect.hasValidACLRulesOrThrow(this.acl);
     }
     validOrThrowUpdate() {
-        common_1.CommonConnect.hasRefenceOrThrow(this.acl.ref);
+        common_1.CommonConnect.hasReferenceOrThrow(this.acl.ref);
         common_1.CommonConnect.isValidNameOrThrow(this.acl.name);
         common_1.CommonConnect.hasValidACLRulesOrThrow(this.acl);
     }
     mapToPrisma() {
-        return {
-            // TODO: Create a default value for apiVersion
-            apiVersion: "v2",
-            ref: this.acl.ref,
-            name: this.acl.name,
-            allow: this.acl.allow,
-            deny: this.acl.deny,
-            createdAt: this.acl.createdAt
-                ? new Date(this.acl.createdAt * 1000)
-                : undefined,
-            updatedAt: this.acl.updatedAt
-                ? new Date(this.acl.updatedAt * 1000)
-                : undefined,
-            extended: this.acl.extended || {}
-        };
+        return Object.assign(Object.assign({}, this.acl), { apiVersion: "v2", createdAt: undefined, updatedAt: undefined, extended: this.acl.extended });
     }
     static mapToDto(acl) {
         return acl
-            ? Object.assign(Object.assign({}, acl), { createdAt: acl.createdAt.getTime() / 1000, updatedAt: acl.updatedAt.getTime() / 1000, extended: acl.extended }) : undefined;
+            ? Object.assign(Object.assign({}, acl), { apiVersion: acl.apiVersion, createdAt: acl.createdAt.getTime() / 1000, updatedAt: acl.updatedAt.getTime() / 1000, extended: acl.extended }) : undefined;
     }
 }
 exports.ACLManager = ACLManager;

package/dist/mappers/agent.d.ts

@@ -1,6 +1,5 @@
 import { Agent as AgentPrismaModel, Prisma } from "@prisma/client";
 import { CommonConnect as CC } from "@routr/common";
-import { JsonObject } from "pb-util/build";
 import { EntityManager } from "./manager";
 type AgentWithDomainAndCredentials = Prisma.AgentGetPayload<{
     include: {
@@ -20,7 +19,7 @@ type AgentWithDomainAndCredentials = Prisma.AgentGetPayload<{
 export declare class AgentManager extends EntityManager {
     private agent;
     constructor(agent: CC.Agent);
-    static includeFields(): JsonObject;
+    static includeFields(): Record<string, unknown>;
     validOrThrowCreate(): void;
     validOrThrowUpdate(): void;
     mapToPrisma(): AgentPrismaModel;

package/dist/mappers/agent.js

@@ -48,52 +48,16 @@ class AgentManager extends manager_1.EntityManager {
         common_1.CommonConnect.isValidUsernameOrThrow(this.agent.username);
     }
     validOrThrowUpdate() {
-        common_1.CommonConnect.hasRefenceOrThrow(this.agent.ref);
+        common_1.CommonConnect.hasReferenceOrThrow(this.agent.ref);
         common_1.CommonConnect.isValidNameOrThrow(this.agent.name);
     }
     mapToPrisma() {
         var _a;
-        return {
-            // TODO: Set a default value for apiVersion
-            apiVersion: "v2",
-            ref: this.agent.ref,
-            name: this.agent.name,
-            username: this.agent.username,
-            privacy: (_a = this.agent.privacy) !== null && _a !== void 0 ? _a : client_1.Privacy.NONE,
-            enabled: this.agent.enabled,
-            domainRef: this.agent.domainRef || null,
-            credentialsRef: this.agent.credentialsRef || null,
-            createdAt: this.agent.createdAt
-                ? new Date(this.agent.createdAt * 1000)
-                : undefined,
-            updatedAt: this.agent.updatedAt
-                ? new Date(this.agent.updatedAt * 1000)
-                : undefined,
-            maxContacts: this.agent.maxContacts,
-            expires: this.agent.expires,
-            extended: this.agent.extended || {}
-        };
+        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 });
     }
     static mapToDto(agent) {
         return agent
-            ? {
-                apiVersion: agent.apiVersion,
-                ref: agent.ref,
-                name: agent.name,
-                username: agent.username,
-                privacy: agent.privacy,
-                enabled: agent.enabled,
-                domainRef: agent.domainRef,
-                credentialsRef: agent.credentialsRef,
-                domain: domain_1.DomainManager.mapToDto(agent.domain),
-                credentials: credentials_1.CredentialsManager.mapToDto(agent.credentials),
-                maxContacts: agent.maxContacts,
-                expires: agent.expires,
-                extended: (agent.extended || {}),
-                createdAt: agent.createdAt.getTime() / 1000,
-                updatedAt: agent.updatedAt.getTime() / 1000
-            }
-            : undefined;
+            ? 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;
     }
 }
 exports.AgentManager = AgentManager;

package/dist/mappers/credentials.d.ts

@@ -1,11 +1,10 @@
 import { Credentials as CredentialsPrismaModel } from "@prisma/client";
 import { CommonConnect as CC } from "@routr/common";
-import { JsonObject } from "pb-util/build";
 import { EntityManager } from "./manager";
 export declare class CredentialsManager extends EntityManager {
     private credentials;
     constructor(credentials: CC.Credentials);
-    static includeFields(): JsonObject;
+    static includeFields(): Record<string, unknown>;
     validOrThrowCreate(): void;
     validOrThrowUpdate(): void;
     mapToPrisma(): CredentialsPrismaModel;

package/dist/mappers/credentials.js

@@ -20,40 +20,16 @@ class CredentialsManager extends manager_1.EntityManager {
         common_1.CommonConnect.hasPasswordOrThrow(this.credentials.password);
     }
     validOrThrowUpdate() {
-        common_1.CommonConnect.hasRefenceOrThrow(this.credentials.ref);
+        common_1.CommonConnect.hasReferenceOrThrow(this.credentials.ref);
         common_1.CommonConnect.isValidNameOrThrow(this.credentials.name);
         common_1.CommonConnect.isValidUsernameOrThrow(this.credentials.username);
     }
     mapToPrisma() {
-        return {
-            // TODO: Set a default value for apiVersion
-            apiVersion: "v2",
-            ref: this.credentials.ref,
-            name: this.credentials.name,
-            username: this.credentials.username,
-            password: this.credentials.password || undefined,
-            createdAt: this.credentials.createdAt
-                ? new Date(this.credentials.createdAt * 1000)
-                : undefined,
-            updatedAt: this.credentials.updatedAt
-                ? new Date(this.credentials.updatedAt * 1000)
-                : undefined,
-            extended: this.credentials.extended || {}
-        };
+        return Object.assign(Object.assign({}, this.credentials), { apiVersion: "v2", createdAt: undefined, updatedAt: undefined, extended: this.credentials.extended });
     }
     static mapToDto(credentials) {
         return credentials
-            ? {
-                apiVersion: credentials.apiVersion,
-                ref: credentials.ref,
-                name: credentials.name,
-                username: credentials.username,
-                password: credentials.password,
-                createdAt: credentials.createdAt.getTime() / 1000,
-                updatedAt: credentials.updatedAt.getTime() / 1000,
-                extended: credentials.extended
-            }
-            : undefined;
+            ? Object.assign(Object.assign({}, credentials), { apiVersion: credentials.apiVersion, createdAt: credentials.createdAt.getTime() / 1000, updatedAt: credentials.updatedAt.getTime() / 1000, extended: credentials.extended }) : undefined;
     }
 }
 exports.CredentialsManager = CredentialsManager;

package/dist/mappers/domain.d.ts

@@ -1,6 +1,5 @@
 import { Domain as DomainPrismaModel, Prisma, EgressPolicy } from "@prisma/client";
 import { CommonConnect as CC } from "@routr/common";
-import { JsonObject } from "pb-util/build";
 import { EntityManager } from "./manager";
 type DomainWithACL = Prisma.DomainGetPayload<{
     include: {
@@ -15,7 +14,7 @@ type DomainWithACL = Prisma.DomainGetPayload<{
 export declare class DomainManager extends EntityManager {
     private domain;
     constructor(domain: CC.Domain);
-    static includeFields(): JsonObject;
+    static includeFields(): Record<string, unknown>;
     validOrThrowCreate(): void;
     validOrThrowUpdate(): void;
     mapToPrisma(): DomainPrismaModel & {

package/dist/mappers/domain.js

@@ -27,41 +27,26 @@ class DomainManager extends manager_1.EntityManager {
         common_1.CommonConnect.isValidDomainUriOrThrow(this.domain.domainUri);
     }
     validOrThrowUpdate() {
-        common_1.CommonConnect.hasRefenceOrThrow(this.domain.ref);
+        common_1.CommonConnect.hasReferenceOrThrow(this.domain.ref);
         common_1.CommonConnect.isValidNameOrThrow(this.domain.name);
     }
     mapToPrisma() {
         var _a;
-        return {
-            // TODO: Set a default value for apiVersion
-            apiVersion: "v2",
-            ref: this.domain.ref,
-            name: this.domain.name,
-            accessControlListRef: this.domain.accessControlListRef || null,
-            domainUri: this.domain.domainUri,
-            extended: this.domain.extended || {},
-            createdAt: this.domain.createdAt
-                ? new Date(this.domain.createdAt * 1000)
-                : undefined,
-            updatedAt: this.domain.updatedAt
-                ? new Date(this.domain.updatedAt * 1000)
-                : undefined,
-            egressPolicies: {
+        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) => ({
                     rule: policy.rule,
                     numberRef: policy.numberRef
                 }))
-            }
-        };
+            }, createdAt: undefined, updatedAt: undefined });
     }
     static mapToDto(domain) {
         var _a, _b;
         return domain
-            ? Object.assign(Object.assign({}, domain), { 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({}, 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) => ({
                     rule: policy.rule,
                     numberRef: policy.numberRef,
                     number: number_1.NumberManager.mapToDtoWithoutTrunk(policy.number)
-                })), extended: domain.extended, createdAt: domain.createdAt.getTime() / 1000, updatedAt: domain.updatedAt.getTime() / 1000 }) : undefined;
+                })), createdAt: domain.createdAt.getTime() / 1000, updatedAt: domain.updatedAt.getTime() / 1000, extended: domain.extended }) : undefined;
     }
 }
 exports.DomainManager = DomainManager;

package/dist/mappers/manager.d.ts

@@ -1,6 +1,5 @@
-import { JsonObject } from "pb-util/build";
 export declare abstract class EntityManager {
-    static readonly includeFields: () => JsonObject;
+    static readonly includeFields: () => Record<string, unknown>;
     abstract validOrThrowCreate(): void;
     abstract validOrThrowUpdate(): void;
 }

package/dist/mappers/manager.js

@@ -1,6 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EntityManager = void 0;
+/*
+ * Copyright (C) 2024 by Fonoster Inc (https://fonoster.com)
+ * http://github.com/fonoster/routr
+ *
+ * This file is part of Routr.
+ *
+ * Licensed under the MIT License (the "License");
+ * you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ *    https://opensource.org/licenses/MIT
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/* eslint-disable require-jsdoc */
 class EntityManager {
 }
 exports.EntityManager = EntityManager;

package/dist/mappers/number.d.ts

@@ -1,6 +1,5 @@
 import { Number as NumberPrismaModel, Prisma } from "@prisma/client";
 import { CommonConnect as CC } from "@routr/common";
-import { JsonObject } from "pb-util/build";
 import { EntityManager } from "./manager";
 type NumberWithTrunk = Prisma.NumberGetPayload<{
     include: {
@@ -17,7 +16,7 @@ type NumberWithTrunk = Prisma.NumberGetPayload<{
 export declare class NumberManager extends EntityManager {
     private number;
     constructor(number: CC.INumber);
-    static includeFields(): JsonObject;
+    static includeFields(): Record<string, unknown>;
     validOrThrowCreate(): void;
     validOrThrowUpdate(): void;
     mapToPrisma(): NumberPrismaModel;

package/dist/mappers/number.js

@@ -4,7 +4,6 @@ exports.NumberManager = void 0;
 const common_1 = require("@routr/common");
 const manager_1 = require("./manager");
 const trunk_1 = require("./trunk");
-const common_2 = require("@routr/common");
 // Needs testing
 class NumberManager extends manager_1.EntityManager {
     constructor(number) {
@@ -26,8 +25,8 @@ class NumberManager extends manager_1.EntityManager {
     validOrThrowCreate() {
         common_1.CommonConnect.hasTelUrlOrThrow(this.number.telUrl);
         common_1.CommonConnect.isValidTelUrlOrThrow(this.number.telUrl);
-        if (common_2.Environment.ENFORCE_E164) {
-            common_1.CommonConnect.isValidE164OrThrow(this.number.telUrl.split("tel:")[1], this.number.countryIsoCode, common_2.Environment.ENFORCE_E164_WITH_MOBILE_PREFIX);
+        if (common_1.Environment.ENFORCE_E164) {
+            common_1.CommonConnect.isValidE164OrThrow(this.number.telUrl.split("tel:")[1], this.number.countryIsoCode, common_1.Environment.ENFORCE_E164_WITH_MOBILE_PREFIX);
         }
         common_1.CommonConnect.hasNameOrThrow(this.number.name);
         common_1.CommonConnect.isValidNameOrThrow(this.number.name);
@@ -39,75 +38,22 @@ class NumberManager extends manager_1.EntityManager {
         common_1.CommonConnect.isValidSessionAffinityHeaderOrThrow(this.number.sessionAffinityHeader);
     }
     validOrThrowUpdate() {
-        common_1.CommonConnect.hasRefenceOrThrow(this.number.ref);
+        common_1.CommonConnect.hasReferenceOrThrow(this.number.ref);
         common_1.CommonConnect.isValidNameOrThrow(this.number.name);
         common_1.CommonConnect.isValidAORLinkOrThrow(this.number.aorLink);
         common_1.CommonConnect.hasValidHeadersOrThrow(this.number.extraHeaders);
         common_1.CommonConnect.isValidSessionAffinityHeaderOrThrow(this.number.sessionAffinityHeader);
     }
     mapToPrisma() {
-        return {
-            // TODO: Set a default value for apiVersion
-            apiVersion: "v2",
-            ref: this.number.ref,
-            name: this.number.name,
-            trunkRef: this.number.trunkRef || null,
-            telUrl: this.number.telUrl,
-            aorLink: this.number.aorLink || null,
-            city: this.number.city || undefined,
-            country: this.number.country,
-            countryIsoCode: this.number.countryIsoCode,
-            sessionAffinityHeader: this.number.sessionAffinityHeader || null,
-            extraHeaders: this.number.extraHeaders || null,
-            createdAt: this.number.createdAt
-                ? new Date(this.number.createdAt * 1000)
-                : undefined,
-            updatedAt: this.number.updatedAt
-                ? new Date(this.number.updatedAt * 1000)
-                : undefined,
-            extended: this.number.extended || {}
-        };
+        return Object.assign(Object.assign({}, this.number), { apiVersion: "v2", trunkRef: this.number.trunkRef, sessionAffinityHeader: this.number.sessionAffinityHeader, extraHeaders: this.number.extraHeaders, createdAt: undefined, updatedAt: undefined, extended: this.number.extended });
     }
     static mapToDto(number) {
         return number
-            ? {
-                apiVersion: number.apiVersion,
-                ref: number.ref,
-                name: number.name,
-                trunkRef: number.trunkRef,
-                trunk: trunk_1.TrunkManager.mapToDto(number.trunk),
-                telUrl: number.telUrl,
-                aorLink: number.aorLink,
-                city: number.city,
-                country: number.country,
-                countryIsoCode: number.countryIsoCode,
-                sessionAffinityHeader: number.sessionAffinityHeader,
-                extraHeaders: number.extraHeaders,
-                extended: number.extended,
-                createdAt: number.createdAt.getTime() / 1000,
-                updatedAt: number.updatedAt.getTime() / 1000
-            }
-            : undefined;
+            ? Object.assign(Object.assign({}, number), { apiVersion: number.apiVersion, trunk: trunk_1.TrunkManager.mapToDto(number.trunk), extraHeaders: number.extraHeaders, createdAt: number.createdAt.getTime() / 1000, updatedAt: number.updatedAt.getTime() / 1000, extended: number.extended }) : undefined;
     }
     static mapToDtoWithoutTrunk(number) {
         return number
-            ? {
-                apiVersion: number.apiVersion,
-                ref: number.ref,
-                name: number.name,
-                trunkRef: number.trunkRef,
-                telUrl: number.telUrl,
-                aorLink: number.aorLink,
-                city: number.city,
-                country: number.country,
-                countryIsoCode: number.countryIsoCode,
-                sessionAffinityHeader: number.sessionAffinityHeader,
-                extraHeaders: number.extraHeaders,
-                extended: number.extended,
-                createdAt: number.createdAt.getTime() / 1000,
-                updatedAt: number.updatedAt.getTime() / 1000
-            }
-            : undefined;
+            ? Object.assign(Object.assign({}, number), { apiVersion: number.apiVersion, extraHeaders: number.extraHeaders, createdAt: number.createdAt.getTime() / 1000, updatedAt: number.updatedAt.getTime() / 1000, extended: number.extended }) : undefined;
     }
 }
 exports.NumberManager = NumberManager;

package/dist/mappers/peer.d.ts

@@ -1,6 +1,5 @@
 import { Peer as PeerPrismaModel, Prisma } from "@prisma/client";
 import { CommonConnect as CC } from "@routr/common";
-import { JsonObject } from "pb-util/build";
 import { EntityManager } from "./manager";
 type PeerWithDomainAndCredentials = Prisma.PeerGetPayload<{
     include: {
@@ -11,7 +10,7 @@ type PeerWithDomainAndCredentials = Prisma.PeerGetPayload<{
 export declare class PeerManager extends EntityManager {
     private peer;
     constructor(peer: CC.Peer);
-    static includeFields(): JsonObject;
+    static includeFields(): Record<string, unknown>;
     validOrThrowCreate(): void;
     validOrThrowUpdate(): void;
     mapToPrisma(): PeerPrismaModel;

package/dist/mappers/peer.js

@@ -27,7 +27,7 @@ class PeerManager extends manager_1.EntityManager {
         common_1.CommonConnect.isValidContactAddressOrThrow(this.peer.contactAddr);
     }
     validOrThrowUpdate() {
-        common_1.CommonConnect.hasRefenceOrThrow(this.peer.ref);
+        common_1.CommonConnect.hasReferenceOrThrow(this.peer.ref);
         common_1.CommonConnect.isValidNameOrThrow(this.peer.name);
         common_1.CommonConnect.isValidUsernameOrThrow(this.peer.username);
         common_1.CommonConnect.isValidAOROrThrow(this.peer.aor);
@@ -37,53 +37,11 @@ class PeerManager extends manager_1.EntityManager {
         const normalizeAlgorithm = (algorithm) => algorithm === common_1.CommonTypes.LoadBalancingAlgorithm.UNSPECIFIED
             ? undefined
             : algorithm;
-        return {
-            // TODO: Set a default value for apiVersion
-            apiVersion: "v2",
-            ref: this.peer.ref,
-            name: this.peer.name,
-            username: this.peer.username,
-            aor: this.peer.aor,
-            contactAddr: this.peer.contactAddr,
-            balancingAlgorithm: normalizeAlgorithm(this.peer.balancingAlgorithm),
-            withSessionAffinity: this.peer.withSessionAffinity,
-            enabled: this.peer.enabled,
-            credentialsRef: this.peer.credentialsRef || null,
-            accessControlListRef: this.peer.accessControlListRef || null,
-            createdAt: this.peer.createdAt
-                ? new Date(this.peer.createdAt * 1000)
-                : undefined,
-            updatedAt: this.peer.updatedAt
-                ? new Date(this.peer.updatedAt * 1000)
-                : undefined,
-            maxContacts: this.peer.maxContacts,
-            expires: this.peer.expires,
-            extended: this.peer.extended || {}
-        };
+        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 });
     }
     static mapToDto(peer) {
         return peer
-            ? {
-                apiVersion: peer.apiVersion,
-                ref: peer.ref,
-                name: peer.name,
-                username: peer.username,
-                aor: peer.aor,
-                contactAddr: peer.contactAddr,
-                balancingAlgorithm: peer.balancingAlgorithm,
-                withSessionAffinity: peer.withSessionAffinity,
-                enabled: peer.enabled,
-                credentialsRef: peer.credentialsRef,
-                credentials: credentials_1.CredentialsManager.mapToDto(peer.credentials),
-                accessControlListRef: peer.accessControlListRef,
-                accessControlList: acl_1.ACLManager.mapToDto(peer.accessControlList),
-                createdAt: peer.createdAt.getTime() / 1000,
-                updatedAt: peer.updatedAt.getTime() / 1000,
-                maxContacts: peer.maxContacts,
-                expires: peer.expires,
-                extended: peer.extended
-            }
-            : undefined;
+            ? 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;
     }
 }
 exports.PeerManager = PeerManager;

package/dist/mappers/trunk.d.ts

@@ -1,6 +1,5 @@
 import { Trunk as TrunkPrismaModel, Prisma, TrunkURI } from "@prisma/client";
 import { CommonConnect as CC } from "@routr/common";
-import { JsonObject } from "pb-util/build";
 import { EntityManager } from "./manager";
 type TrunkWithEagerLoading = Prisma.TrunkGetPayload<{
     include: {
@@ -13,7 +12,7 @@ type TrunkWithEagerLoading = Prisma.TrunkGetPayload<{
 export declare class TrunkManager extends EntityManager {
     private trunk;
     constructor(trunk: CC.Trunk);
-    static includeFields(): JsonObject;
+    static includeFields(): Record<string, unknown>;
     validOrThrowCreate(): void;
     validOrThrowUpdate(): void;
     mapToPrisma(): TrunkPrismaModel & {

package/dist/mappers/trunk.js

@@ -27,77 +27,21 @@ class TrunkManager extends manager_1.EntityManager {
         common_1.CommonConnect.hasValidOutboundUrisOrThrow(this.trunk.uris);
     }
     validOrThrowUpdate() {
-        common_1.CommonConnect.hasRefenceOrThrow(this.trunk.ref);
+        common_1.CommonConnect.hasReferenceOrThrow(this.trunk.ref);
         common_1.CommonConnect.isValidNameOrThrow(this.trunk.name);
         common_1.CommonConnect.isValidInboundUriOrThrow(this.trunk.inboundUri);
     }
     mapToPrisma() {
-        var _a;
-        return {
-            // TODO: Set a default value for apiVersion
-            apiVersion: "v2",
-            ref: this.trunk.ref,
-            name: this.trunk.name,
-            accessControlListRef: this.trunk.accessControlListRef || null,
-            inboundUri: this.trunk.inboundUri,
-            inboundCredentialsRef: this.trunk.inboundCredentialsRef || null,
-            outboundCredentialsRef: this.trunk.outboundCredentialsRef || null,
-            sendRegister: this.trunk.sendRegister,
-            createdAt: this.trunk.createdAt
-                ? new Date(this.trunk.createdAt * 1000)
-                : undefined,
-            updatedAt: this.trunk.updatedAt
-                ? new Date(this.trunk.updatedAt * 1000)
-                : undefined,
-            extended: this.trunk.extended || {},
-            uris: {
-                create: (_a = this.trunk.uris) === null || _a === void 0 ? void 0 : _a.map((uri) => {
-                    return {
-                        host: uri.host,
-                        port: uri.port,
-                        transport: uri.transport,
-                        user: uri.user,
-                        weight: uri.weight,
-                        priority: uri.priority,
-                        enabled: uri.enabled
-                    };
-                })
-            }
-        };
+        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: {
+                create: this.trunk.uris
+            }, extended: this.trunk.extended, createdAt: undefined, updatedAt: undefined });
     }
     static mapToDto(trunk) {
         var _a, _b, _c;
         return trunk
-            ? {
-                apiVersion: trunk.apiVersion,
-                ref: trunk.ref,
-                name: trunk.name,
-                inboundUri: trunk.inboundUri,
-                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),
-                extended: trunk.extended,
-                sendRegister: trunk.sendRegister,
-                uris: trunk.uris.map((uri) => {
-                    return {
-                        ref: uri.ref,
-                        trunkRef: uri.trunkRef,
-                        host: uri.host,
-                        port: uri.port,
-                        transport: uri.transport.toUpperCase(),
-                        user: uri.user,
-                        weight: uri.weight,
-                        priority: uri.priority,
-                        enabled: uri.enabled
-                    };
-                }),
-                createdAt: trunk.createdAt.getTime() / 1000,
-                updatedAt: trunk.updatedAt.getTime() / 1000
-            }
-            : undefined;
+            ? 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) => {
+                    return Object.assign(Object.assign({}, uri), { transport: uri.transport.toUpperCase() });
+                }), createdAt: trunk.createdAt.getTime() / 1000, updatedAt: trunk.updatedAt.getTime() / 1000, extended: trunk.extended }) : undefined;
     }
 }
 exports.TrunkManager = TrunkManager;

package/dist/runner.js

@@ -23,7 +23,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * limitations under the License.
  */
 // eslint-disable-next-line @typescript-eslint/no-var-requires
-require("./tracer").init("simpleauth");
+require("./tracer").init("pgdata");
 const logger_1 = require("@fonoster/logger");
 const envs_1 = require("./envs");
 const service_1 = __importDefault(require("./service"));

package/dist/service.d.ts

@@ -1,6 +1,6 @@
 import { PostgresDataConfig } from "./types";
 /**
- * Starts a new posgres data service.
+ * Starts a new postgres data service.
  *
  * @param {PostgresDataConfig} config - the configuration of the service
  */

package/dist/service.js

@@ -60,7 +60,7 @@ const common_2 = require("@fonoster/common");
 const db_1 = require("./db");
 const logger = (0, logger_1.getLogger)({ service: "pgdata", filePath: __filename });
 /**
- * Starts a new posgres data service.
+ * Starts a new postgres data service.
  *
  * @param {PostgresDataConfig} config - the configuration of the service
  */

package/dist/types.d.ts

@@ -1,5 +1,4 @@
 import { CommonConnect as CC } from "@routr/common";
-import { JsonObject } from "pb-util/build";
 export interface PostgresDataConfig {
     bindAddr: string;
     externalServerBindAddr: string;
@@ -9,13 +8,13 @@ export type PrismaOperation = (request: {
     where: {
         ref: string;
     };
-    include?: JsonObject;
+    include?: Record<string, unknown>;
 }) => unknown;
 export type PrismaFindByOperation = (request: {
     where: {
         [key: string]: boolean | string | number;
     };
-    include?: JsonObject;
+    include?: Record<string, unknown>;
 }) => unknown;
 export type PrismaListOperation = (request: {
     take: number;
@@ -23,17 +22,17 @@ export type PrismaListOperation = (request: {
     cursor: {
         ref: string;
     };
-    orderBy: JsonObject;
-    include?: JsonObject;
+    orderBy: Record<string, unknown>;
+    include?: Record<string, unknown>;
 }) => unknown;
 export type PrismaCreateOperation = (request: {
     data: any;
-    include?: JsonObject;
+    include?: Record<string, unknown>;
 }) => unknown;
 export type PrismaUpdateOperation = (request: {
     where: {
         ref: string;
     };
     data: unknown;
-    include?: JsonObject;
+    include?: Record<string, unknown>;
 }) => unknown;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@routr/pgdata",
-  "version": "2.12.1",
+  "version": "2.13.1",
   "description": "Postgres API Server for Routr Connect",
   "author": "Pedro Sanders <psanders@fonoster.com>",
   "homepage": "https://github.com/fonoster/routr#readme",
@@ -31,8 +31,8 @@
     "@opentelemetry/sdk-trace-node": "^1.0.4",
     "@opentelemetry/semantic-conventions": "^1.0.4",
     "@prisma/client": "^5.9.1",
-    "@routr/common": "^2.12.1",
-    "@routr/processor": "^2.12.1",
+    "@routr/common": "^2.13.1",
+    "@routr/processor": "^2.13.1",
     "google-protobuf": "^3.9.2",
     "grpc-health-check": "^2.0.2",
     "pb-util": "^1.0.3",
@@ -58,5 +58,5 @@
     "@types/validator": "^13.7.10",
     "prisma": "^5.9.1"
   },
-  "gitHead": "cf4c8276173ec4be0a8013e70935b6cffb29cda4"
+  "gitHead": "47b285ad57015b0df452eede4e76cbfc9c67cbbb"
 }