check db connection before startup

Author: mpfeil

packages/api/app.js

@@ -10,7 +10,7 @@
 
 'use strict';
 
-const { db } = require('@sensebox/opensensemap-api-models'),
+const { isReady } = require('@sensebox/opensensemap-api-models'),
   restify = require('restify'),
   {
     fullResponse,
@@ -55,9 +55,10 @@ if (config.get('logLevel') === 'debug') {
 
 const run = async function () {
   try {
-    // TODO: Get a client from the Pool and test connection
-    await db.connect();
+    // Check if the database is ready
+    await isReady();
 
+    // Load routes
     routes(server);
 
     // start the server

packages/models/index.js

@@ -13,7 +13,8 @@ config.util.setModuleDefaults('openSenseMap-API-models', {
     user: 'postgres',
     userpass: 'postgres',
     db: 'opensensemap',
-    database_url: ''
+    database_url: '',
+    ssl: false
   },
   integrations: {
     ca_cert: '',
@@ -56,7 +57,8 @@ const { model: Box } = require('./src/box/box'),
   { model: Claim } = require('./src/box/claim'),
   utils = require('./src/utils'),
   decoding = require('./src/measurement/decoding'),
-  db = require('./src/db');
+  db = require('./src/db'),
+  isReady = require('./src/drizzle').isReady;
 
 module.exports = {
   Box,
@@ -66,5 +68,6 @@ module.exports = {
   User,
   utils,
   decoding,
-  db
+  db,
+  isReady
 };

packages/models/src/drizzle.js

@@ -29,6 +29,7 @@ const {
   logEntryRelations,
   tokenBlacklistTable
 } = require('../schema/schema');
+const { sql } = require('drizzle-orm');
 
 const getDBUri = function getDBUri (uri) {
   // if available, use user specified db connection uri
@@ -48,11 +49,24 @@ const getDBUri = function getDBUri (uri) {
   return `postgresql://${user}:${userpass}@${host}:${port}/${db}`;
 };
 
+const isReady = async function isReady () {
+  try {
+    await db.execute(sql`select 1`);
+  } catch (error) {
+    throw new Error(error);
+  }
+};
+
 const pool = new Pool({
   connectionString: getDBUri(),
-  ssl: false
+  ssl: config.get('ssl') === 'true' ? true : false
 });
 
+// TODO: attach event listener
+// pool.on('connect', () => {
+//   console.log('connected to the db');
+// });
+
 const schema = {
   accessTokenTable,
   refreshTokenTable,
@@ -83,4 +97,9 @@ const db = drizzle(pool, {
   schema
 });
 
-module.exports.db = db;
+module.exports = {
+  db,
+  isReady
+};
+// module.exports.db = db;
+// module.exports.isReady = isReady;