@routr/pgdata 2.11.3 → 2.12.0

package/README.md

@@ -0,0 +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" />
+
+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/update.js

@@ -32,10 +32,7 @@ exports.update = void 0;
 const pb_util_1 = require("pb-util");
 const common_1 = require("@routr/common");
 const utils_1 = require("../mappers/utils");
-const client_1 = require("@prisma/client");
-// TODO: The entire function should be wrapped in a transaction
-// TODO: We should reuse the prisma client
-const prisma = new client_1.PrismaClient();
+const db_1 = require("../db");
 function update(operation, kind) {
     return (call, callback) => __awaiter(this, void 0, void 0, function* () {
         try {
@@ -47,14 +44,14 @@ function update(operation, kind) {
             const manager = new Manager(request);
             manager.validOrThrowUpdate();
             if (kind === common_1.CommonConnect.Kind.DOMAIN) {
-                yield prisma.egressPolicy.deleteMany({
+                yield db_1.prisma.egressPolicy.deleteMany({
                     where: {
                         domainRef: request.ref
                     }
                 });
             }
             if (kind === common_1.CommonConnect.Kind.TRUNK) {
-                yield prisma.trunkURI.deleteMany({
+                yield db_1.prisma.trunkURI.deleteMany({
                     where: {
                         trunkRef: request.ref
                     }

package/dist/db.d.ts

@@ -0,0 +1,28 @@
+import { PrismaClient } from "@prisma/client";
+declare const prisma: PrismaClient<import(".prisma/client").Prisma.PrismaClientOptions, never, import("@prisma/client/runtime/library").DefaultArgs> | import("@prisma/client/runtime/library").DynamicClientExtensionThis<import(".prisma/client").Prisma.TypeMap<import("@prisma/client/runtime/library").InternalArgs<{
+    [x: string]: {
+        [x: string]: unknown;
+    };
+}, {
+    [x: string]: {
+        [x: string]: unknown;
+    };
+}, {
+    [x: string]: {
+        [x: string]: unknown;
+    };
+}, {
+    [x: string]: unknown;
+}> & {
+    result: {};
+    model: {};
+    query: {};
+    client: {};
+}>, import(".prisma/client").Prisma.TypeMapCb, {
+    result: {};
+    model: {};
+    query: {};
+    client: {};
+}>;
+type Prisma = typeof prisma;
+export { prisma, Prisma };

package/dist/db.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.prisma = 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.
+ */
+const client_1 = require("@prisma/client");
+const prisma_field_encryption_1 = require("prisma-field-encryption");
+const envs_1 = require("./envs");
+// Conditional Prisma Client initialization based on the presence of the encryption key
+const prisma = envs_1.CLOAK_ENCRYPTION_KEY
+    ? new client_1.PrismaClient().$extends((0, prisma_field_encryption_1.fieldEncryptionExtension)({
+        encryptionKey: envs_1.CLOAK_ENCRYPTION_KEY
+    }))
+    : new client_1.PrismaClient();
+exports.prisma = prisma;

package/dist/envs.d.ts

@@ -5,3 +5,4 @@ export declare const SERVER_CERT: string;
 export declare const SERVER_KEY: string;
 export declare const BIND_ADDR: string;
 export declare const EXTERNAL_SERVER_BIND_ADDR: string;
+export declare const CLOAK_ENCRYPTION_KEY: string;

package/dist/envs.js

@@ -1,7 +1,7 @@
 "use strict";
 var _a, _b, _c, _d, _e;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EXTERNAL_SERVER_BIND_ADDR = exports.BIND_ADDR = exports.SERVER_KEY = exports.SERVER_CERT = exports.CACERT = exports.VERIFY_CLIENT_CERT = exports.TLS_ON = void 0;
+exports.CLOAK_ENCRYPTION_KEY = exports.EXTERNAL_SERVER_BIND_ADDR = exports.BIND_ADDR = exports.SERVER_KEY = exports.SERVER_CERT = exports.CACERT = exports.VERIFY_CLIENT_CERT = exports.TLS_ON = void 0;
 /*
  * Copyright (C) 2024 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster/routr
@@ -29,6 +29,7 @@ exports.SERVER_CERT = (_b = process.env.SERVER_CERT) !== null && _b !== void 0 ?
 exports.SERVER_KEY = (_c = process.env.SERVER_KEY) !== null && _c !== void 0 ? _c : "/etc/routr/certs/server.key";
 exports.BIND_ADDR = (_d = process.env.BIND_ADDR) !== null && _d !== void 0 ? _d : "0.0.0.0:51907";
 exports.EXTERNAL_SERVER_BIND_ADDR = (_e = process.env.EXTERNAL_SERVER_BIND_ADDR) !== null && _e !== void 0 ? _e : "0.0.0.0:51908";
+exports.CLOAK_ENCRYPTION_KEY = process.env.CLOAK_ENCRYPTION_KEY;
 if (exports.TLS_ON) {
     if (exports.VERIFY_CLIENT_CERT) {
         common_1.Assertions.assertFileExist(exports.CACERT);

package/dist/mappers/number.js

@@ -34,7 +34,7 @@ class NumberManager extends manager_1.EntityManager {
         common_1.CommonConnect.isValidAORLinkOrThrow(this.number.aorLink);
         common_1.CommonConnect.hasCityOrThrow(this.number.city);
         common_1.CommonConnect.hasCountryOrThrow(this.number.country);
-        common_1.CommonConnect.hasCountryISOCodeOrThrow(this.number.countryIsoCode);
+        common_1.CommonConnect.hasCountryIsoCodeOrThrow(this.number.countryIsoCode);
         common_1.CommonConnect.hasValidHeadersOrThrow(this.number.extraHeaders);
         common_1.CommonConnect.isValidSessionAffinityHeaderOrThrow(this.number.sessionAffinityHeader);
     }
@@ -56,7 +56,7 @@ class NumberManager extends manager_1.EntityManager {
             aorLink: this.number.aorLink || null,
             city: this.number.city || undefined,
             country: this.number.country,
-            countryISOCode: this.number.countryIsoCode,
+            countryIsoCode: this.number.countryIsoCode,
             sessionAffinityHeader: this.number.sessionAffinityHeader || null,
             extraHeaders: this.number.extraHeaders || null,
             createdAt: this.number.createdAt
@@ -80,7 +80,7 @@ class NumberManager extends manager_1.EntityManager {
                 aorLink: number.aorLink,
                 city: number.city,
                 country: number.country,
-                countryIsoCode: number.countryISOCode,
+                countryIsoCode: number.countryIsoCode,
                 sessionAffinityHeader: number.sessionAffinityHeader,
                 extraHeaders: number.extraHeaders,
                 extended: number.extended,
@@ -100,7 +100,7 @@ class NumberManager extends manager_1.EntityManager {
                 aorLink: number.aorLink,
                 city: number.city,
                 country: number.country,
-                countryIsoCode: number.countryISOCode,
+                countryIsoCode: number.countryIsoCode,
                 sessionAffinityHeader: number.sessionAffinityHeader,
                 extraHeaders: number.extraHeaders,
                 extended: number.extended,

package/dist/service.js

@@ -47,19 +47,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const grpc = __importStar(require("@grpc/grpc-js"));
 const common_1 = require("@routr/common");
 const logger_1 = require("@fonoster/logger");
-const client_1 = require("@prisma/client");
 const create_1 = require("./api/create");
 const update_1 = require("./api/update");
 const get_1 = require("./api/get");
 const delete_1 = require("./api/delete");
 const find_1 = require("./api/find");
 const list_1 = require("./api/list");
-const grpc_health_check_1 = require("@fonoster/grpc-health-check");
 const envs_1 = require("./envs");
 const fs_1 = __importDefault(require("fs"));
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const interceptor = require("@fonoster/grpc-interceptors");
-const prisma = new client_1.PrismaClient();
+const grpc_health_check_1 = require("grpc-health-check");
+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.
@@ -68,6 +66,7 @@ const logger = (0, logger_1.getLogger)({ service: "pgdata", filePath: __filename
  */
 function pgDataService(config) {
     const { bindAddr } = config;
+    const healthImpl = new grpc_health_check_1.HealthImplementation(common_2.statusMap);
     const internalServer = new grpc.Server();
     const externalServer = new grpc.Server();
     logger.info("starting routr service", { bindAddr, name: "pgdata" });
@@ -82,7 +81,7 @@ function pgDataService(config) {
     ];
     kinds.forEach((kind) => {
         const k = kind.toLowerCase();
-        const delegate = prisma[kind];
+        const delegate = db_1.prisma[kind];
         const funcs = {
             create: (0, create_1.create)(delegate.create, k),
             get: (0, get_1.get)(delegate.findUnique, k),
@@ -95,8 +94,9 @@ function pgDataService(config) {
         externalServer.addService(common_1.CommonConnect.createConnectService(k), funcs);
     });
     const credentials = grpc.ServerCredentials.createInsecure();
-    const withHealthChecks = interceptor.serverProxy((0, grpc_health_check_1.useHealth)(internalServer));
-    withHealthChecks.bindAsync(config.bindAddr, credentials, () => {
+    // Add the health check service to the server
+    healthImpl.addToServer(internalServer);
+    internalServer.bindAsync(config.bindAddr, credentials, () => {
         logger.info("internal server started", { bindAddr: config.bindAddr });
     });
     if (envs_1.TLS_ON) {
@@ -119,6 +119,7 @@ function pgDataService(config) {
     }
     else {
         externalServer.bindAsync(config.externalServerBindAddr, credentials, () => {
+            healthImpl.setStatus("", common_2.GRPC_SERVING_STATUS);
             logger.info("secure connection disabled");
             logger.info("external server started", {
                 externalServerBindAddr: config.externalServerBindAddr

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@routr/pgdata",
-  "version": "2.11.3",
+  "version": "2.12.0",
   "description": "Postgres API Server for Routr Connect",
   "author": "Pedro Sanders <psanders@fonoster.com>",
   "homepage": "https://github.com/fonoster/routr#readme",
@@ -19,9 +19,8 @@
     "run_pgdata": "dist/runner.js"
   },
   "dependencies": {
-    "@fonoster/grpc-health-check": "^3.1.3",
-    "@fonoster/grpc-interceptors": "^0.2.5",
-    "@fonoster/logger": "0.3.20",
+    "@fonoster/common": "^0.6.0",
+    "@fonoster/logger": "0.6.0",
     "@grpc/grpc-js": "~1.10.1",
     "@opentelemetry/api": "^1.0.4",
     "@opentelemetry/exporter-jaeger": "^1.0.4",
@@ -32,11 +31,13 @@
     "@opentelemetry/sdk-trace-node": "^1.0.4",
     "@opentelemetry/semantic-conventions": "^1.0.4",
     "@prisma/client": "^5.9.1",
-    "@routr/common": "^2.11.3",
-    "@routr/processor": "^2.11.3",
+    "@routr/common": "^2.12.0",
+    "@routr/processor": "^2.12.0",
     "google-protobuf": "^3.9.2",
+    "grpc-health-check": "^2.0.2",
     "pb-util": "^1.0.3",
     "phone": "^3.1.32",
+    "prisma-field-encryption": "^1.5.2",
     "validator": "^13.7.0"
   },
   "files": [
@@ -57,5 +58,5 @@
     "@types/validator": "^13.7.10",
     "prisma": "^5.9.1"
   },
-  "gitHead": "806523c0ab3833c26a6343716ba34af4512aca4f"
+  "gitHead": "83c134c9ad3f414bdd8c30222ac5be7cdfd13420"
 }