@opengis/fastify-table 1.4.48 → 1.4.49

package/index.js

@@ -1,8 +1,9 @@
 import path from 'node:path';
 import { existsSync, readdirSync, readFileSync } from 'node:fs';
-import fp from 'fastify-plugin';
 import { fileURLToPath } from 'node:url';
 
+import fp from 'fastify-plugin';
+
 import config from './config.js';
 
 const { maxFileSize = 512 } = config;
@@ -15,6 +16,7 @@ import cronPlugin from './server/plugins/cron/index.js';
 import crudPlugin from './server/plugins/crud/index.js';
 
 import pgPlugin from './server/plugins/pg/index.js';
+import sqlitePlugin from './server/plugins/sqlite/index.js';
 import policyPlugin from './server/plugins/policy/index.js';
 import metricPlugin from './server/plugins/metric/index.js';
 import redisPlugin from './server/plugins/redis/index.js';
@@ -95,12 +97,20 @@ async function plugin(fastify, opt) {
   redisPlugin(fastify);
   // helperPlugin(fastify);
   await pgPlugin(fastify, opt);
+  await sqlitePlugin(fastify, opt);
   tablePlugin(fastify, opt);
   crudPlugin(fastify, opt);
   utilPlugin(fastify, opt);
   cronPlugin(fastify, opt);
   loggerPlugin(fastify, opt);
 
+  await fastify.register(import('@fastify/rate-limit'), {
+    max: 100,
+    timeWindow: '1 minute',
+    global: true,
+    keyGenerator: (req) => `${req.ip}-${req.raw.url.split('?')[0]}`,
+  });
+
   if (config.dblist) {
     dblistRoutes(fastify, opt);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.4.48",
+  "version": "1.4.49",
   "type": "module",
   "description": "core-plugins",
   "keywords": [
@@ -34,8 +34,10 @@
     "@aws-sdk/client-s3": "3.554.0",
     "@fastify/http-proxy": "11.1.2",
     "@fastify/multipart": "9.0.3",
+    "@fastify/rate-limit": "10.3.0",
     "@grpc/grpc-js": "1.10.6",
     "@grpc/proto-loader": "0.7.12",
+    "better-sqlite3": "12.2.0",
     "dotenv": "16.5.0",
     "fastify": "5.3.3",
     "fastify-plugin": "5.0.1",

package/server/plugins/logger/index.js

@@ -3,6 +3,12 @@ import logger from './getLogger.js';
 import pgClients from '../pg/pgClients.js';
 
 async function plugin(fastify) {
+  fastify.addHook('onResponse', async (req, reply) => {
+    if (reply?.statusCode && reply.statusCode >= 400) {
+      logger.metrics(`error-count:${reply.statusCode}`);
+    }
+  });
+
   fastify.setErrorHandler(async (error, request, reply) => {
     // validation not error
     if (error.validation) {
@@ -19,6 +25,7 @@ async function plugin(fastify) {
 
     return reply.status(error.statusCode || 500).send(msg);
   });
+
   fastify.addHook('onListen', async () => {
     logger.file('init', { db: pgClients.client?.options?.database });
   });

package/server/plugins/sqlite/funcs/getSqlite.js

@@ -0,0 +1,32 @@
+import Database from 'better-sqlite3';
+
+import config from '../../../../config.js';
+import sqliteClients from '../sqliteClients.js';
+import init from './init.js';
+
+function getSqliteAsync({
+  name,
+  readonly = false,
+  fileMustExist = false,
+  statement_timeout: timeout = 10000,
+} = {}) {
+  if (!config.sqlite) return null;
+
+  if (sqliteClients.client?.tlist) {
+    return sqliteClients.client;
+  }
+
+  const dbConfig = {
+    readonly,
+    fileMustExist,
+    timeout,
+    verbose: config.trace ? console.log : undefined,
+  };
+
+  sqliteClients.client = new Database(name || ':memory:', dbConfig);
+  init(sqliteClients.client);
+
+  return sqliteClients.client;
+}
+
+export default getSqliteAsync;

package/server/plugins/sqlite/funcs/init.js

@@ -0,0 +1,51 @@
+function init(client) {
+  if (!client) { return; }
+
+  const rows = client.prepare(`WITH tables AS (
+    SELECT name AS table_name
+    FROM sqlite_master
+    WHERE type = 'table' AND name NOT LIKE 'sqlite_%'
+  ),
+  pk_columns AS (
+    SELECT
+      m.name AS table_name,
+      ti.name AS column_name,
+      ti.pk
+    FROM sqlite_master m
+    JOIN pragma_table_info(m.name) AS ti
+    WHERE ti.pk = 1
+  )
+  SELECT table_name, column_name
+  FROM pk_columns
+  WHERE table_name IN (
+    SELECT table_name
+    FROM pk_columns
+    GROUP BY table_name
+    HAVING COUNT(*) = 1
+  )
+  ORDER BY table_name;`).all();
+
+  const pk = Object.fromEntries(
+    rows.map(row => [row.table_name, row.column_name]),
+  );
+
+  const tlist = client.prepare('SELECT name FROM sqlite_master WHERE type=\'table\' AND name NOT LIKE \'sqlite_%\';').all().reduce((acc, curr) => {
+    acc.push(curr.name);
+    return acc;
+  }, []);
+
+  async function query(q, args = []) {
+    const data = client.prepare(q.replace(/\$\d+/g, '?')).all(...args);
+    return Promise.resolve({ rows: data, rowCount: data.length });
+  }
+
+  Object.assign(client, {
+    query,
+    pk,
+    tlist,
+  });
+
+  console.log('db connected', client.name || ':memory:');
+}
+
+export default init;

package/server/plugins/sqlite/index.js

@@ -0,0 +1,11 @@
+import fp from 'fastify-plugin';
+
+import sqliteClients from './sqliteClients.js';
+
+async function dbPlugin(app, opts) {
+  app.addHook('onClose', async () => {
+    Object.keys(sqliteClients).forEach(key => sqliteClients[key].close());
+  });
+}
+
+export default fp(dbPlugin);

package/server/plugins/sqlite/sqliteClients.js

@@ -0,0 +1,19 @@
+import Database from 'better-sqlite3';
+
+import config from '../../../config.js';
+import init from './funcs/init.js';
+
+const sqliteClients = {};
+
+if (config.sqlite) {
+  const client = new Database(config.sqlite?.name || ':memory:', {
+    readonly: config.sqlite?.readonly || false,
+    fileMustExist: config.sqlite?.fileMustExist || false,
+    timeout: config.sqlite?.statement_timeout || 10000,
+    verbose: config.trace ? console.log : undefined,
+  });
+  client.init = () => init(client);
+  client.init();
+  sqliteClients.client = client;
+}
+export default sqliteClients;

package/server/plugins/util/funcs/unflattenObject.js

@@ -14,8 +14,11 @@ export default function unflattenObject(flatObj) {
                         nestedObj[part] = flatObj[key]; // fallback to original value if parsing fails
                     }
                 }
+                else if (['true', 'false'].includes(flatObj[key]) || !isNaN(flatObj[key])) {
+                    nestedObj[part] = JSON.parse(flatObj[key]);
+                }
                 else {
-                    nestedObj[part] = ['true', 'false'].includes(flatObj[key]) ? JSON.parse(flatObj[key]) : flatObj[key];
+                    nestedObj[part] = flatObj[key];
                 }
             }
             else {

package/server/routes/logger/index.js

@@ -16,7 +16,7 @@ const loggerSchema = {
 };
 
 async function plugin(app) {
-  app.get('/logger-file/*', { config: { policy: ['public'] }, schema: loggerSchema }, loggerFile);
+  app.get('/logger-file/*', { config: { policy: ['public'], rateLimit: false }, schema: loggerSchema }, loggerFile);
 }
 
 export default plugin;

package/server/routes/table/index.js

@@ -27,7 +27,16 @@ async function plugin(app, config = {}) {
   app.get(`${prefix}/table-filter/:table`, { config: { policy }, schema: filterSchema }, filter);
 
   app.get(`${prefix}/table-info/:table/:id?`, { config: { policy }, schema: tableDataSchema }, tableInfo);
-  app.get(`${prefix}/suggest/:data`, { config: { policy }, schema: suggestSchema }, suggest);
+  app.get(`${prefix}/suggest/:data`, {
+    config: {
+      policy,
+      rateLimit: {
+        max: 10000,
+        timeWindow: '1 minute',
+      },
+    },
+    schema: suggestSchema,
+  }, suggest);
   app.get(`${prefix}/data/:table/:id?`, { config: { policy: ['public', 'no-sql'] }, schema: tableSchema }, data);
   app.get(`${prefix}/table-data/:table`, { config: { policy: ['user', 'no-sql'] }, schema: tableDataSchema }, data);
   app.get(`${prefix}/table-data/:table/:id`, { config: { policy }, schema: tableDataIdSchema }, cardData);

package/utils.js

@@ -7,6 +7,9 @@ import { handlebars, handlebarsSync } from './server/helpers/index.js';
 // pg
 import getPG from './server/plugins/pg/funcs/getPG.js';
 import getPGAsync from './server/plugins/pg/funcs/getPGAsync.js';
+import getSqlite from './server/plugins/sqlite/funcs/getSqlite.js';
+import initSqlite from './server/plugins/sqlite/funcs/init.js';
+import sqliteClients from './server/plugins/sqlite/sqliteClients.js';
 import getDBParams from './server/plugins/pg/funcs/getDBParams.js';
 import initPG from './server/plugins/pg/funcs/init.js';
 import pgClients from './server/plugins/pg/pgClients.js';
@@ -170,6 +173,11 @@ export {
   pgClients,
   getDBParams,
 
+  // sqlite
+  getSqlite,
+  initSqlite,
+  sqliteClients,
+
   // select
   getSelectVal,
   getSelectMeta,