v1.29.4

Author: pregnantboy

package-lock.json

@@ -105,5 +105,5 @@
     "tsconfig-paths": "^4.2.0",
     "type-fest": "4.10.3"
   },
-  "version": "1.29.3"
+  "version": "1.29.4"
 }

packages/backend/package.json

@@ -10,13 +10,19 @@ type AppConfig = {
   appEnv: string
   isProd: boolean
   isDev: boolean
+  version: string
   postgresDatabase: string
   postgresPort: number
   postgresHost: string
   postgresUsername: string
-  postgresPassword?: string
-  version: string
+  postgresPassword: string
   postgresEnableSsl: boolean
+  tilesDatabase: string
+  tilesPort: number
+  tilesHost: string
+  tilesUsername: string
+  tilesPassword: string
+  tilesEnableSsl: boolean
   baseUrl: string
   encryptionKey: string
   sessionSecretKey: string
@@ -72,6 +78,12 @@ const appConfig: AppConfig = {
   postgresUsername: process.env.POSTGRES_USERNAME,
   postgresPassword: process.env.POSTGRES_PASSWORD,
   postgresEnableSsl: process.env.POSTGRES_ENABLE_SSL === 'true',
+  tilesDatabase: process.env.TILES_DATABASE || 'plumber_tiles_dev',
+  tilesPort: parseInt(process.env.TILES_PORT || '5432'),
+  tilesHost: process.env.TILES_HOST || 'localhost',
+  tilesUsername: process.env.TILES_USERNAME,
+  tilesPassword: process.env.TILES_PASSWORD,
+  tilesEnableSsl: process.env.TILES_ENABLE_SSL === 'true',
   encryptionKey: process.env.ENCRYPTION_KEY || '',
   sessionSecretKey: process.env.SESSION_SECRET_KEY || '',
   adminJwtSecretKey: process.env.ADMIN_JWT_SECRET_KEY || '',

packages/backend/src/config/app.ts

@@ -0,0 +1,43 @@
+import pg from 'pg'
+import process from 'process'
+
+// The following two lines are required to get count values as number.
+// More info: https://github.com/knex/knex/issues/387#issuecomment-51554522
+pg.types.setTypeParser(20, 'text', parseInt)
+import type { Knex } from 'knex'
+import knex from 'knex'
+
+import logger from '../helpers/logger'
+
+import appConfig from './app'
+
+export const tilesDbConfig = {
+  client: 'pg',
+  connection: {
+    host: appConfig.tilesHost,
+    port: appConfig.tilesPort,
+    user: appConfig.tilesUsername,
+    password: appConfig.tilesPassword,
+    database: appConfig.tilesDatabase,
+    ssl: appConfig.tilesEnableSsl
+      ? {
+          rejectUnauthorized: false,
+        }
+      : false,
+  } as pg.ClientConfig,
+  pool: { min: 0, max: 20 },
+}
+
+export const tilesClient: Knex = knex(tilesDbConfig)
+
+const CONNECTION_REFUSED = 'ECONNREFUSED'
+
+tilesClient.raw('SELECT 1').catch((err) => {
+  if (err.code === CONNECTION_REFUSED) {
+    logger.error(
+      'Make sure you have installed PostgreSQL and it is running.',
+      err,
+    )
+    process.exit()
+  }
+})

packages/backend/src/config/tiles-db.ts

@@ -1,6 +1,6 @@
 {
   "name": "frontend",
-  "version": "1.29.3",
+  "version": "1.29.4",
   "scripts": {
     "dev": "wait-on tcp:3000 && vite --host --force",
     "build": "tsc && vite build --mode=${VITE_MODE:-prod}",

packages/frontend/package.json

@@ -2,5 +2,5 @@
   "name": "@plumber/types",
   "description": "Shared types for plumber",
   "types": "./index.d.ts",
-  "version": "1.29.3"
+  "version": "1.29.4"
 }