@routr/pgdata 2.15.4 → 2.17.0

package/README.md

@@ -1,3 +1,3 @@
-<a href="https://gitpod.io/#https://github.com/fonoster/routr"> <img src="https://img.shields.io/badge/Contribute%20with-Gitpod-908a85?logo=gitpod" alt="Contribute with Gitpod" />
+<a href="https://docs.routr.io/guides/develop-with-dev-containers"> <img src="https://img.shields.io/badge/Contribute%20with-Dev%20Containers-908a85?logo=docker" alt="Contribute with Dev Containers" />
 
 This module is part of the [Routr](https://routr.io) project. By itself, it does not do much. It is intended to be used as a dependency for other modules. For more information about the project, please visit [https://github.com/fonoster/routr](https://github.com/fonoster/routr).

package/dist/api/partial.d.ts

@@ -0,0 +1,5 @@
+type Fields = Record<string, unknown>;
+export declare function stripPresenceMarkers<T extends Fields>(request: T): T;
+export declare function isPresent(value: unknown): boolean;
+export declare function pickPresentFields<T extends Fields>(request: Fields, data: T): Partial<T>;
+export {};

package/dist/api/partial.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.stripPresenceMarkers = stripPresenceMarkers;
+exports.isPresent = isPresent;
+exports.pickPresentFields = pickPresentFields;
+// The proto loader adds a synthetic oneof marker (e.g. `_name: "name"`) for
+// every proto3 optional field that is set
+function stripPresenceMarkers(request) {
+    return Object.fromEntries(Object.entries(request).filter(([key, value]) => !(key.startsWith("_") && value === key.slice(1))));
+}
+// Update requests are partial. Optional fields are absent unless sent, while
+// repeated fields and messages always decode ([] and null), so an empty list
+// or a null message means "keep what is stored"
+function isPresent(value) {
+    if (value === undefined || value === null)
+        return false;
+    return Array.isArray(value) ? value.length > 0 : true;
+}
+// Keeps only the entries of the mapped data whose field the request carried
+function pickPresentFields(request, data) {
+    return Object.fromEntries(Object.entries(data).filter(([key]) => isPresent(request[key])));
+}

package/dist/api/update.js

@@ -33,24 +33,26 @@ const pb_util_1 = require("pb-util");
 const common_1 = require("@routr/common");
 const utils_1 = require("../mappers/utils");
 const db_1 = require("../db");
+const partial_1 = require("./partial");
 function update(operation, kind) {
     return (call, callback) => __awaiter(this, void 0, void 0, function* () {
         try {
-            const { request } = call;
+            const request = (0, partial_1.stripPresenceMarkers)(call.request);
             if (request.extended) {
                 request.extended = pb_util_1.struct.decode(request.extended);
             }
             const Manager = (0, utils_1.getManager)(kind);
             const manager = new Manager(request);
             manager.validOrThrowUpdate();
-            if (kind === common_1.CommonConnect.Kind.DOMAIN && request.egressPolicy) {
+            // A non-empty list replaces the stored one; an empty list keeps it
+            if (kind === common_1.CommonConnect.Kind.DOMAIN && (0, partial_1.isPresent)(request.egressPolicies)) {
                 yield db_1.prisma.egressPolicy.deleteMany({
                     where: {
                         domainRef: request.ref
                     }
                 });
             }
-            if (kind === common_1.CommonConnect.Kind.TRUNK && request.uris) {
+            if (kind === common_1.CommonConnect.Kind.TRUNK && (0, partial_1.isPresent)(request.uris)) {
                 yield db_1.prisma.trunkURI.deleteMany({
                     where: {
                         trunkRef: request.ref
@@ -61,7 +63,7 @@ function update(operation, kind) {
                 where: {
                     ref: request.ref
                 },
-                data: manager.mapToPrisma(),
+                data: (0, partial_1.pickPresentFields)(request, manager.mapToPrisma()),
                 include: Manager.includeFields()
             }));
             if (objectFromDB.extended) {

package/dist/mappers/acl.js

@@ -19,7 +19,9 @@ class ACLManager extends manager_1.EntityManager {
     }
     validOrThrowUpdate() {
         common_1.CommonConnect.hasReferenceOrThrow(this.acl.ref);
-        common_1.CommonConnect.isValidNameOrThrow(this.acl.name);
+        // Updates are partial, so only validate the name when it is sent
+        if (this.acl.name !== undefined)
+            common_1.CommonConnect.isValidNameOrThrow(this.acl.name);
         common_1.CommonConnect.hasValidACLRulesOrThrow(this.acl);
     }
     mapToPrisma() {

package/dist/mappers/agent.js

@@ -57,7 +57,9 @@ class AgentManager extends manager_1.EntityManager {
     }
     validOrThrowUpdate() {
         common_1.CommonConnect.hasReferenceOrThrow(this.agent.ref);
-        common_1.CommonConnect.isValidNameOrThrow(this.agent.name);
+        // Updates are partial, so only validate the name when it is sent
+        if (this.agent.name !== undefined)
+            common_1.CommonConnect.isValidNameOrThrow(this.agent.name);
     }
     mapToPrisma() {
         var _a;

package/dist/mappers/credentials.js

@@ -21,7 +21,9 @@ class CredentialsManager extends manager_1.EntityManager {
     }
     validOrThrowUpdate() {
         common_1.CommonConnect.hasReferenceOrThrow(this.credentials.ref);
-        common_1.CommonConnect.isValidNameOrThrow(this.credentials.name);
+        // Updates are partial, so only validate the name when it is sent
+        if (this.credentials.name !== undefined)
+            common_1.CommonConnect.isValidNameOrThrow(this.credentials.name);
         common_1.CommonConnect.isValidUsernameOrThrow(this.credentials.username);
     }
     mapToPrisma() {

package/dist/mappers/domain.js

@@ -28,7 +28,9 @@ class DomainManager extends manager_1.EntityManager {
     }
     validOrThrowUpdate() {
         common_1.CommonConnect.hasReferenceOrThrow(this.domain.ref);
-        common_1.CommonConnect.isValidNameOrThrow(this.domain.name);
+        // Updates are partial, so only validate the name when it is sent
+        if (this.domain.name !== undefined)
+            common_1.CommonConnect.isValidNameOrThrow(this.domain.name);
     }
     mapToPrisma() {
         var _a;

package/dist/mappers/number.js

@@ -39,13 +39,15 @@ class NumberManager extends manager_1.EntityManager {
     }
     validOrThrowUpdate() {
         common_1.CommonConnect.hasReferenceOrThrow(this.number.ref);
-        common_1.CommonConnect.isValidNameOrThrow(this.number.name);
+        // Updates are partial, so only validate the name when it is sent
+        if (this.number.name !== undefined)
+            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 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 });
+        return Object.assign(Object.assign({}, this.number), { apiVersion: "v2", trunkRef: this.number.trunkRef || null, sessionAffinityHeader: this.number.sessionAffinityHeader, extraHeaders: this.number.extraHeaders, createdAt: undefined, updatedAt: undefined, extended: this.number.extended });
     }
     static mapToDto(number) {
         return number

package/dist/mappers/peer.js

@@ -28,7 +28,9 @@ class PeerManager extends manager_1.EntityManager {
     }
     validOrThrowUpdate() {
         common_1.CommonConnect.hasReferenceOrThrow(this.peer.ref);
-        common_1.CommonConnect.isValidNameOrThrow(this.peer.name);
+        // Updates are partial, so only validate the name when it is sent
+        if (this.peer.name !== undefined)
+            common_1.CommonConnect.isValidNameOrThrow(this.peer.name);
         common_1.CommonConnect.isValidUsernameOrThrow(this.peer.username);
         common_1.CommonConnect.isValidAOROrThrow(this.peer.aor);
         common_1.CommonConnect.isValidContactAddressOrThrow(this.peer.contactAddr);

package/dist/mappers/trunk.js

@@ -28,7 +28,9 @@ class TrunkManager extends manager_1.EntityManager {
     }
     validOrThrowUpdate() {
         common_1.CommonConnect.hasReferenceOrThrow(this.trunk.ref);
-        common_1.CommonConnect.isValidNameOrThrow(this.trunk.name);
+        // Updates are partial, so only validate the name when it is sent
+        if (this.trunk.name !== undefined)
+            common_1.CommonConnect.isValidNameOrThrow(this.trunk.name);
         common_1.CommonConnect.isValidInboundUriOrThrow(this.trunk.inboundUri);
     }
     mapToPrisma() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@routr/pgdata",
-  "version": "2.15.4",
+  "version": "2.17.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.15.4",
-    "@routr/processor": "^2.15.4",
+    "@routr/common": "^2.17.0",
+    "@routr/processor": "^2.17.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": "3d4a72191d5ac315429570e562d20fb5807cc942"
+  "gitHead": "9bc2d0a407a82e7b3724bb139ba62504c7b3d49e"
 }