Use @fastify/fastify-postgres. CheckerNetwork/roadmap#220

db/package.json

@@ -13,12 +13,12 @@
   },
   "dependencies": {
     "@filecoin-station/spark-evaluate": "^1.2.0",
-    "pg": "^8.13.3",
+    "pg": "^8.14.0",
     "postgrator": "^8.0.0"
   },
   "standard": {
     "env": [
       "mocha"
     ]
   }
-}
+}

stats/bin/migrate.js

@@ -1,9 +1,28 @@
 import {
-  getPgPools,
   migrateEvaluateDB,
-  migrateStatsDB
+  migrateStatsDB,
+  getPgPools
 } from '@filecoin-station/spark-stats-db'
 
-const pgPools = await getPgPools()
-await migrateStatsDB(pgPools.stats)
-await migrateEvaluateDB(pgPools.evaluate)
+const {
+  DATABASE_URL,
+  EVALUATE_DB_URL
+} = process.env
+
+try {
+  console.log('Running migrations for stats database...')
+  const pgPools = await getPgPools()
+
+  // @ts-ignore - PgPoolStats actually does have a query method at runtime
+  await migrateStatsDB(pgPools.stats)
+
+  // @ts-ignore - Similarly for evaluate
+  await migrateEvaluateDB(pgPools.evaluate)
+
+  await pgPools.end()
+
+  console.log('All migrations completed successfully')
+} catch (error) {
+  console.error('Migration failed:', error)
+  process.exit(1)
+}

stats/bin/spark-stats.js

@@ -1,23 +1,26 @@
 import '../lib/instrument.js'
 import { createApp } from '../lib/app.js'
-import { getPgPools } from '@filecoin-station/spark-stats-db'
 
 const {
   PORT = '8080',
   HOST = '127.0.0.1',
   SPARK_API_BASE_URL = 'https://api.filspark.com/',
-  REQUEST_LOGGING = 'true'
+  REQUEST_LOGGING = 'true',
+  DATABASE_URL,
+  EVALUATE_DB_URL
 } = process.env
 
-const pgPools = await getPgPools()
 
 const app = await createApp({
   SPARK_API_BASE_URL,
-  pgPools,
+  DATABASE_URL,
+  EVALUATE_DB_URL,
   logger: {
     level: ['1', 'true'].includes(REQUEST_LOGGING) ? 'info' : 'error'
   }
 })
+
 console.log('Starting the http server on host %j port %s', HOST, PORT)
-const baseUrl = app.listen({ port: Number(PORT), host: HOST })
-console.log(baseUrl)
+await app.listen({ port: Number(PORT), host: HOST })
+console.log(`Server listening at ${HOST}:${PORT}`)
+

stats/lib/app.js

@@ -2,6 +2,7 @@ import * as Sentry from '@sentry/node'
 import Fastify from 'fastify'
 import cors from '@fastify/cors'
 import urlData from '@fastify/url-data'
+import fastifyPostgres from '@fastify/postgres'
 
 import { addRoutes } from './routes.js'
 import { addPlatformRoutes } from './platform-routes.js'
@@ -12,18 +13,38 @@ import { addPlatformRoutes } from './platform-routes.js'
 /**
  * @param {object} args
  * @param {string} args.SPARK_API_BASE_URL
- * @param {import('@filecoin-station/spark-stats-db').PgPools} args.pgPools
- * @param {Fastify.FastifyLoggerOptions} args.logger
- * @returns
+ * @param {string} args.DATABASE_URL - Connection string for stats database
+ * @param {string} args.EVALUATE_DB_URL - Connection string for evaluate database
+ * @param {import('fastify').FastifyLoggerOptions} args.logger
+ * @returns {Promise<import('fastify').FastifyInstance>}
  */
-export const createApp = ({
+export const createApp = async ({
   SPARK_API_BASE_URL,
-  pgPools,
+  DATABASE_URL,
+  EVALUATE_DB_URL,
   logger
 }) => {
   const app = Fastify({ logger })
   Sentry.setupFastifyErrorHandler(app)
 
+  await app.register(fastifyPostgres, {
+    connectionString: DATABASE_URL,
+    name: 'stats'
+  })
+
+  await app.register(fastifyPostgres, {
+    connectionString: EVALUATE_DB_URL,
+    name: 'evaluate',
+  })
+
+  const pgPools = {
+    stats: app.pg.stats,
+    evaluate: app.pg.evaluate,
+    async end() {
+      await app.close()
+    }
+  }
+
   app.register(cors, {
     origin: [
       'http://localhost:3000',
@@ -40,4 +61,4 @@ export const createApp = ({
   })
 
   return app
-}
+}

stats/package.json

@@ -16,6 +16,7 @@
   "dependencies": {
     "@fastify/cors": "^11.0.0",
     "@fastify/url-data": "^6.0.3",
+    "@fastify/postgres": "^5.2.0",
     "@filecoin-station/spark-stats-db": "^1.0.0",
     "@sentry/node": "^9.5.0",
     "@sentry/profiling-node": "^9.5.0",