@routr/pgdata 2.0.8-alpha.29 → 2.0.8-alpha.31

package/dist/api/create.js

@@ -34,7 +34,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.create = void 0;
 /*
- * Copyright (C) 2022 by Fonoster Inc (https://fonoster.com)
+ * Copyright (C) 2023 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster/routr
  *
  * This file is part of Routr

package/dist/api/delete.js

@@ -34,7 +34,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.del = void 0;
 /*
- * Copyright (C) 2022 by Fonoster Inc (https://fonoster.com)
+ * Copyright (C) 2023 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster/routr
  *
  * This file is part of Routr

package/dist/api/find.js

@@ -34,7 +34,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findBy = void 0;
 /*
- * Copyright (C) 2022 by Fonoster Inc (https://fonoster.com)
+ * Copyright (C) 2023 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster/routr
  *
  * This file is part of Routr

package/dist/api/get.js

@@ -34,7 +34,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.get = void 0;
 /*
- * Copyright (C) 2022 by Fonoster Inc (https://fonoster.com)
+ * Copyright (C) 2023 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster/routr
  *
  * This file is part of Routr
@@ -83,7 +83,12 @@ function get(operation, kind) {
                     code: grpc.status.UNAVAILABLE,
                     message: "database is not available"
                 }, null);
+                return;
             }
+            callback({
+                code: grpc.status.UNKNOWN,
+                message: "unknown database error"
+            }, null);
         }
     });
 }

package/dist/api/list.js

@@ -34,7 +34,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.list = void 0;
 /*
- * Copyright (C) 2022 by Fonoster Inc (https://fonoster.com)
+ * Copyright (C) 2023 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster/routr
  *
  * This file is part of Routr

package/dist/api/update.js

@@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.update = void 0;
 /*
- * Copyright (C) 2022 by Fonoster Inc (https://fonoster.com)
+ * Copyright (C) 2023 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster/routr
  *
  * This file is part of Routr
@@ -32,7 +32,6 @@ exports.update = void 0;
 const pb_util_1 = require("pb-util");
 const common_1 = require("@routr/common");
 const utils_1 = require("../mappers/utils");
-const connect_1 = require("@routr/common/src/connect");
 const client_1 = require("@prisma/client");
 // TODO: The entire function should be wrapped in a transaction
 // TODO: We should reuse the prisma client
@@ -47,14 +46,14 @@ function update(operation, kind) {
             const Manager = (0, utils_1.getManager)(kind);
             const manager = new Manager(request);
             manager.validOrThrowUpdate();
-            if (kind === connect_1.Kind.DOMAIN) {
+            if (kind === common_1.CommonConnect.Kind.DOMAIN) {
                 yield prisma.egressPolicy.deleteMany({
                     where: {
                         domainRef: request.ref
                     }
                 });
             }
-            if (kind === connect_1.Kind.TRUNK) {
+            if (kind === common_1.CommonConnect.Kind.TRUNK) {
                 yield prisma.trunkURI.deleteMany({
                     where: {
                         trunkRef: request.ref

package/dist/envs.d.ts

@@ -0,0 +1 @@
+export declare const BIND_ADDR: string;

package/dist/envs.js

@@ -0,0 +1,23 @@
+"use strict";
+var _a;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BIND_ADDR = void 0;
+/*
+ * Copyright (C) 2023 by Fonoster Inc (https://fonoster.com)
+ * http://github.com/fonoster
+ *
+ * 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.
+ */
+exports.BIND_ADDR = (_a = process.env.BIND_ADDR) !== null && _a !== void 0 ? _a : "0.0.0.0:51907";

package/dist/healthcheck.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/healthcheck.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+/*
+ * Copyright (C) 2023 by Fonoster Inc (https://fonoster.com)
+ * http://github.com/fonoster
+ *
+ * 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 common_1 = require("@routr/common");
+const envs_1 = require("./envs");
+common_1.HealthCheck.check(envs_1.BIND_ADDR);

package/dist/runner.js

@@ -3,10 +3,9 @@
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 /*
- * Copyright (C) 2022 by Fonoster Inc (https://fonoster.com)
+ * Copyright (C) 2023 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster/routr
  *
  * This file is part of Routr
@@ -27,11 +26,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 require("./tracer").init("simpleauth");
 const service_1 = __importDefault(require("./service"));
 const logger_1 = require("@fonoster/logger");
+const envs_1 = require("./envs");
 const logger = (0, logger_1.getLogger)({ service: "pgdata", filePath: __filename });
 try {
-    (0, service_1.default)({
-        bindAddr: (_a = process.env.BIND_ADDR) !== null && _a !== void 0 ? _a : "0.0.0.0:51907"
-    });
+    (0, service_1.default)({ bindAddr: envs_1.BIND_ADDR });
 }
 catch (e) {
     logger.error(e);

package/dist/service.js

@@ -24,7 +24,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 /*
- * Copyright (C) 2022 by Fonoster Inc (https://fonoster.com)
+ * Copyright (C) 2023 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster/routr
  *
  * This file is part of Routr
@@ -51,6 +51,9 @@ 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");
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const interceptor = require("grpc-interceptors");
 const prisma = new client_1.PrismaClient();
 const logger = (0, logger_1.getLogger)({ service: "pgdata", filePath: __filename });
 /**
@@ -83,8 +86,10 @@ function pgDataService(config) {
             list: (0, list_1.list)(delegate.findMany, k)
         });
     });
-    server.bindAsync(config.bindAddr, grpc.ServerCredentials.createInsecure(), () => {
-        server.start();
+    const credentials = grpc.ServerCredentials.createInsecure();
+    const withHealthChecks = interceptor.serverProxy((0, grpc_health_check_1.useHealth)(server));
+    withHealthChecks.bindAsync(config.bindAddr, credentials, () => {
+        withHealthChecks.start();
     });
 }
 exports.default = pgDataService;

package/dist/tracer.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.init = void 0;
 /*
- * Copyright (C) 2022 by Fonoster Inc (https://fonoster.com)
+ * Copyright (C) 2023 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster/routr
  *
  * This file is part of Routr

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@routr/pgdata",
-  "version": "2.0.8-alpha.29",
+  "version": "2.0.8-alpha.31",
   "description": "Postgres API Server for Routr Connect",
   "author": "Pedro Sanders <psanders@fonoster.com>",
   "homepage": "https://github.com/fonoster/routr#readme",
@@ -16,10 +16,12 @@
     "build": "tsc -b tsconfig.json"
   },
   "bin": {
-    "run_pgdata": "dist/runner.js"
+    "run_pgdata": "dist/runner.js",
+    "healthcheck_pgdata": "dist/healthcheck.js"
   },
   "dependencies": {
-    "@fonoster/logger": "0.3.18",
+    "@fonoster/grpc-health-check": "^3.1.2",
+    "@fonoster/logger": "0.3.20",
     "@grpc/grpc-js": "^1.8.4",
     "@opentelemetry/api": "^1.0.4",
     "@opentelemetry/exporter-jaeger": "^1.0.4",
@@ -30,9 +32,10 @@
     "@opentelemetry/sdk-trace-node": "^1.0.4",
     "@opentelemetry/semantic-conventions": "^1.0.4",
     "@prisma/client": "^4.8.0",
-    "@routr/common": "^2.0.8-alpha.29",
-    "@routr/processor": "^2.0.8-alpha.29",
+    "@routr/common": "^2.0.8-alpha.31",
+    "@routr/processor": "^2.0.8-alpha.31",
     "google-protobuf": "^3.9.2",
+    "grpc-interceptors": "github:fonoster/node-grpc-interceptors",
     "pb-util": "^1.0.3",
     "phone": "^3.1.32",
     "validator": "^13.7.0"
@@ -55,5 +58,5 @@
     "@types/validator": "^13.7.10",
     "prisma": "^4.8.0"
   },
-  "gitHead": "f273cfb052bd734a906ab97011e1338ceac53111"
+  "gitHead": "6bca271d5a0b7163353a16af6b5195d264b3530f"
 }