@opengis/fastify-table 1.2.25 → 1.2.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.2.25",
+  "version": "1.2.26",
   "type": "module",
   "description": "core-plugins",
   "keywords": [

package/server/plugins/pg/funcs/getPG.js

@@ -5,13 +5,15 @@ types.setTypeParser(1082, (stringValue) => stringValue);
 types.setTypeParser(1114, (stringValue) => stringValue);
 
 import config from '../../../../config.js';
+import dblist from '../../../../dblist.js';
 import pgClients from '../pgClients.js';
 import init from './init.js';
 
 function getPG(param) {
+  const dbListParams = dblist.find(el => el.database === (param?.db || param?.database || param));
   const {
     user, password, host, port, db, database, name: origin,
-  } = param || {};
+  } = dbListParams || param || {};
   const name = origin || db || database || param || 'client';
   if (pgClients[name]) return pgClients[name];
 

package/server/plugins/pg/funcs/getPGAsync.js

@@ -2,15 +2,18 @@ import pg from 'pg';
 
 const { types } = pg;
 types.setTypeParser(1082, (stringValue) => stringValue);
+types.setTypeParser(1114, (stringValue) => stringValue);
 
 import config from '../../../../config.js';
+import dblist from '../../../../dblist.js';
 import pgClients from '../pgClients.js';
 import init from './init.js';
 
 async function getPGAsync(param) {
+  const dbListParams = dblist.find(el => el.database === (param?.db || param?.database || param));
   const {
     user, password, host, port, db, database, name: origin,
-  } = typeof param === 'string' ? { db: param } : param || {};
+  } = dbListParams ?? (typeof param === 'string' ? { db: param } : param || {});
   const name = origin || db || database || param || 'client';
 
   if (pgClients[name]?.tlist) return pgClients[name];

package/server/plugins/pg/index.js

@@ -1,6 +1,5 @@
 import pgClients from './pgClients.js';
-import init from './funcs/init.js';
-import getPG from './funcs/getPG.js';
+import getPGAsync from './funcs/getPGAsync.js';
 
 function close() {
   Object.keys(pgClients).forEach((el) => {
@@ -8,16 +7,29 @@ function close() {
   });
 }
 
+async function getHeadersPG(req, config) {
+  if (!req.headers?.token || !req.headers?.referer) return null;
+  const refererHost = req.headers?.referer?.match?.(/(https?:\/\/[^\/]+)/g)?.[0];
+  const validToken = (req.ip === '127.0.0.1' || config.debug) && req.headers?.uid && req.headers?.token && refererHost && config.auth?.tokens?.[refererHost] === req.headers?.token;
+
+  if (validToken && req.headers?.db) {
+    const pg = pgClients[req.headers.db]
+      || await getPGAsync(req.headers.db);
+    return pg;
+  }
+}
+
 async function plugin(fastify, config) {
-  const client = getPG({ ...config.pg || {}, name: 'client' });
-  await init(client);
+  const client = await getPGAsync({ ...config.pg || {}, name: 'client' });
+
   fastify.addHook('onRequest', async (req) => {
-    req.pg = req.pg || client;
+    const headersPG = await getHeadersPG(req, config);
+    req.pg = headersPG || req.pg || client;
+    if (headersPG) {
+      req.user = { uid: req.headers?.uid };
+    }
   });
 
-  // fastify.decorate('autoIndex', autoIndex);
-  // fastify.decorate('getMeta', getMeta);
-  // fastify.decorate('getPG', getPG);
   fastify.addHook('onClose', close);
 }