@opengis/fastify-table 1.2.84 → 1.2.86

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.2.84",
+  "version": "1.2.86",
   "type": "module",
   "description": "core-plugins",
   "keywords": [
@@ -31,7 +31,7 @@
     "@fastify/http-proxy": "9.5.0",
     "@fastify/sensible": "^5.0.0",
     "@fastify/url-data": "5.4.0",
-    "@opengis/fastify-hb": "1.4.8",
+    "@opengis/fastify-hb": "1.7.0",
     "fastify": "^4.26.1",
     "fastify-plugin": "^4.0.0",
     "ioredis": "5.3.2",

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

@@ -11,7 +11,8 @@ import init from './init.js';
 import getDBParams from './getDBParams.js';
 
 function getPG(param) {
-  const dbListParams = dblist.find(el => el.database === (param?.db || param?.database || param));
+  const dbListParams = dblist.find(el => el.key === param?.key)
+    || dblist.find(el => el.database === (param?.db || param?.database || param));
   const {
     user, password, host, port, db, database, name: origin,
   } = dbListParams ?? (typeof param === 'string' ? getDBParams(param) : param || {});

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

@@ -11,7 +11,8 @@ import init from './init.js';
 import getDBParams from './getDBParams.js';
 
 async function getPGAsync(param) {
-  const dbListParams = dblist.find(el => el.database === (param?.db || param?.database || param));
+  const dbListParams = dblist.find(el => el.key === param?.key)
+    || dblist.find(el => el.database === (param?.db || param?.database || param));
   const {
     user, password, host, port, db, database, name: origin,
   } = dbListParams ?? (typeof param === 'string' ? getDBParams(param) : param || {});

package/server/plugins/table/funcs/getFilterSQL/index.js

@@ -1,4 +1,5 @@
 import getTemplate from '../getTemplate.js';
+import getSelect from '../getSelect.js';
 import pgClients from '../../../pg/pgClients.js';
 import config from '../../../../../config.js';
 
@@ -96,7 +97,8 @@ export default async function getFilterSQL({
         Object.assign(el, { extra: { table: extraDataTable, input: extraColumns.find(item => item?.name === el?.name)?.type } });
       }
       if (!el?.data) return el;
-      const cls = await getTemplate(['cls', 'select'], el.data);
+      // const cls = await getTemplate(['cls', 'select'], el.data); // only git cls
+      const cls = await getSelect(el.data, pg); // git + db cls
 
       if (Array.isArray(cls) && cls?.length) {
         Object.assign(el, { cls: el.data, options: cls, select: `select code, name from admin.cls where parent='${el.data}'` });

package/server/plugins/table/funcs/getFilterSQL/util/formatValue.js

@@ -23,7 +23,7 @@ export default function formatValue({
   const matchNull = { null: 'is null', notnull: 'is not null' }[value];
   // null = true is null, not false
   const matchBoolean = fieldType === 'boolean' ? { true: 'is true', false: 'is false' }[value] : null;
-  const matchMulti = fieldType.includes('[]') ? `::text[] && '{${value}}'::text[]` : null;
+  const matchMulti = fieldType?.includes('[]') ? `::text[] && '{${value}}'::text[]` : null;
   const match = matchNull || matchBoolean || matchMulti || `::text=any('{${value}}'::text[])`;
 
   // geometry

package/server/plugins/table/funcs/getSelectMeta.js

@@ -8,21 +8,9 @@ import getSelect from './getSelect.js';
 const limit = 50;
 const selectMeta = {};
 
-export default async function getSelectMeta({ name, pg = pgClients.client, nocache, table, column, key, val }) {
+export default async function getSelectMeta({ name, pg = pgClients.client, nocache }) {
   if (selectMeta[name] && !nocache) return selectMeta[name];
 
-  if (table && column) {
-    const original = {
-      false: `with c(id,text) as (select ${column || 'row_number() over()'}, ${column}, count(*) from ${table} group by ${column} limit ${limit}) select * from c`,
-      true: `with c(id,text) as (select ${column || 'row_number() over()'}, ${column} from ${table}) select * from c`,
-    }[!!(key || val)];
-    return {
-      original,
-      searchQuery: '(lower("text") ~ $1 )',
-      pk: 'id',
-    };
-  }
-
   const cls = await getSelect(name, pg);
   const db = typeof cls?.db === 'string' ? { database: cls.db } : cls?.db;
   const pg1 = cls?.db ? getPG(db) : pg;

package/server/routes/dblist/controllers/readItems.js

@@ -0,0 +1,21 @@
+import { dblist, getRedis } from '../../../../utils.js';
+
+import formatData from '../utils/formatData.js';
+
+const rclient = getRedis();
+
+export default async function readItemList(req) {
+  const rows = formatData(dblist);
+
+  const uid = req.session?.passport?.user?.uid // login db
+    || req.session?.passport?.user?.username // login passwd
+    || '2';
+
+  const key = `current-db:${uid}`;
+  const ttl = await rclient.ttl(key);
+  const currentId = await rclient.get(key);
+  rclient.setex(key, 60 * 60 * 10000, currentId);
+
+  const { originalMaxAge, expires } = req.session?.cookie || {};
+  return { ttl, current: currentId || rows[0]?.id, rows, user: { ...req.user, originalMaxAge, expires, uid }, };
+}

package/server/routes/dblist/controllers/setItem.js

@@ -0,0 +1,25 @@
+import { dblist, getRedis } from '../../../../utils.js';
+
+const rclient = getRedis();
+
+export default async function setItem(req) {
+  const { params = {} } = req;
+  const { id } = params;
+
+  if (!id) {
+    return { error: 'not enough params', status: 400 };
+  }
+
+  const current = dblist.find((el) => [el.id, el.key].includes(id));
+  if (!current?.database) {
+    return { error: 'invalid param id', status: 400 };
+  }
+
+  const uid = req.session?.passport?.user?.uid // login db
+    || req.session?.passport?.user?.username // login passwd
+    || '2';
+
+  await rclient.setex(`current-db:${uid}`, 60 * 60 * 10000, id);
+
+  return { current: id };
+}

package/server/routes/dblist/index.mjs

@@ -0,0 +1,18 @@
+import readItemList from './controllers/readItems.js';
+import setItem from './controllers/setItem.js';
+
+export default async function plugin(fastify) {
+
+  fastify.route({
+    method: 'GET',
+    url: '/db-list',
+    config: { policy: ['site'] },
+    handler: readItemList,
+  });
+  fastify.route({
+    method: 'GET',
+    url: '/db-list/:id',
+    config: { policy: ['site'] },
+    handler: setItem,
+  });
+}

package/server/routes/dblist/utils/formatData.js

@@ -0,0 +1,7 @@
+const showKeys = ['id', 'key', 'title'];
+
+export default function formatData(data = []) {
+  return data?.length
+    ? data.map((el) => Object.keys(el).filter((key) => showKeys.includes(key)).reduce((acc, curr) => Object.assign(acc, { [curr]: el[curr] }), {}))
+    : [];
+}

package/server/routes/table/controllers/suggest.js

@@ -9,6 +9,18 @@ const headers = {
   'Cache-Control': 'no-cache',
 };
 
+function getTableColumnMeta(table, column, filtered) {
+  const original = {
+    true: `with c(id,text) as (select ${column}, ${column} from ${table} group by ${column}) select id, text from c`,
+    false: `with c(id,text) as (select ${column}, ${column}, count(*) from ${table} group by ${column} limit ${limit}) select * from c`,
+  }[!!filtered];
+  return {
+    original,
+    searchQuery: '(lower("text") ~ $1 )',
+    pk: 'id',
+  };
+}
+
 export default async function suggest(req) {
   const {
     params, query, pg: pg1, user,
@@ -42,7 +54,9 @@ export default async function suggest(req) {
     return { status: 400, message: 'param limit is invalid' };
   }
 
-  const meta = await getSelectMeta({ pg: pg1, name: selectName, nocache: query?.nocache, table, column, key: query?.key, val: query?.val });
+  const meta = table && column
+    ? getTableColumnMeta(table, column, query?.key || query?.val)
+    : await getSelectMeta({ pg: pg1, name: selectName, nocache: query?.nocache });
 
   if (meta?.minLength && query.key && query.key.length < meta?.minLength) {
     return { message: `min length: ${meta.minLength}` };