@heyhru/app-dms-server 0.6.0 → 0.8.0

package/dist/index.js

@@ -4,6 +4,42 @@ import { createPgDb } from "@heyhru/server-plugin-pg";
 // src/app.ts
 import Fastify from "fastify";
 import cors from "@fastify/cors";
+import { metricsPlugin } from "@heyhru/server-plugin-metrics";
+
+// src/metrics.ts
+import { Histogram, Counter, Gauge, register } from "@heyhru/server-plugin-metrics";
+import { getPoolStats } from "@heyhru/business-dms-datasource";
+var sqlDuration = new Histogram({
+  name: "dms_sql_duration_seconds",
+  help: "SQL execution duration in seconds",
+  labelNames: ["data_source_id", "sql_type", "status"],
+  buckets: [0.1, 0.5, 1, 2, 5, 10, 30],
+  registers: [register]
+});
+var authLoginTotal = new Counter({
+  name: "dms_auth_login_total",
+  help: "Total login attempts",
+  labelNames: ["status"],
+  registers: [register]
+});
+var dbPoolActive = new Gauge({
+  name: "dms_db_pool_active",
+  help: "Active connections per data source pool",
+  labelNames: ["data_source_id"],
+  registers: [register]
+});
+var dbPoolWaiting = new Gauge({
+  name: "dms_db_pool_waiting",
+  help: "Waiting requests per data source pool",
+  labelNames: ["data_source_id"],
+  registers: [register]
+});
+function refreshPoolMetrics() {
+  for (const { dataSourceId, active, waiting } of getPoolStats()) {
+    if (active !== null) dbPoolActive.set({ data_source_id: dataSourceId }, active);
+    if (waiting !== null) dbPoolWaiting.set({ data_source_id: dataSourceId }, waiting);
+  }
+}
 
 // src/auth/auth.middleware.ts
 import { verifyToken as jwtVerify } from "@heyhru/server-plugin-jwt";
@@ -122,10 +158,12 @@ async function authLogin(req, reply) {
   const user = await getUserByUsername(username);
   if (!user || !await verifyPassword(password, user.password_hash)) {
     req.log.warn("Login failed for user: %s", username);
+    authLoginTotal.inc({ status: "fail" });
     return reply.code(401).send({ error: "\u7528\u6237\u540D\u6216\u5BC6\u7801\u9519\u8BEF" });
   }
   const payload = { id: user.id, username: user.username, role: user.role };
   const token = signToken(payload, config.jwtSecret, config.jwtExpiresIn);
+  authLoginTotal.inc({ status: "success" });
   req.log.info("User logged in: %s", username);
   return reply.send({ ...payload, token });
 }
@@ -214,20 +252,28 @@ function postSqlParse(req, reply) {
   return reply.send({ category: sqlParse(sql) });
 }
 async function postSqlExecute(req, reply) {
-  const { dataSourceId, database, sql } = req.body ?? {};
+  const body = req.body ?? {};
+  const { dataSourceId, database, sql } = body;
   if (!dataSourceId || !sql) {
     return reply.code(400).send({ error: "\u6570\u636E\u6E90 ID \u548C SQL \u4E0D\u80FD\u4E3A\u7A7A" });
   }
+  const page = typeof body.page === "number" ? body.page : 1;
+  const pageSize = typeof body.pageSize === "number" ? body.pageSize : 50;
   const ip = req.headers["x-forwarded-for"] ?? req.headers["x-real-ip"] ?? "unknown";
   try {
-    const rows = await sqlExecute({ dataSourceId, database, sql, userId: req.user.id, ip });
-    return reply.send({ rows });
+    const result = await sqlExecute({ dataSourceId, database, sql, userId: req.user.id, ip, page, pageSize });
+    return reply.send(result);
   } catch (err) {
     req.log.error(err, "SQL execute failed (user=%s, ds=%s)", req.user.id, dataSourceId);
     return reply.code(400).send({ error: err instanceof Error ? err.message : String(err) });
   }
 }
-async function sqlExecute({ dataSourceId, database, sql, userId, ip }) {
+async function fetchCountQuery(pool, sql) {
+  const countSql = `SELECT COUNT(*) AS total FROM (${sql}) AS _count_t`;
+  const rows = await pool.execute(countSql);
+  return Number(rows[0]?.total ?? 0);
+}
+async function sqlExecute({ dataSourceId, database, sql, userId, ip, page, pageSize }) {
   const category = sqlParse(sql);
   if (category !== "select") {
     throw new Error("\u4EC5\u5141\u8BB8\u76F4\u63A5\u6267\u884C SELECT \u8BED\u53E5");
@@ -237,16 +283,34 @@ async function sqlExecute({ dataSourceId, database, sql, userId, ip }) {
     return ds ? getPool(ds) : null;
   })();
   if (!pool) throw new Error("\u6570\u636E\u6E90\u672A\u627E\u5230");
-  const rows = await pool.execute(sql);
+  const hasLimit = /\bLIMIT\b/i.test(sql);
+  const dataSql = hasLimit ? sql : `${sql} LIMIT ${pageSize} OFFSET ${(page - 1) * pageSize}`;
+  const end = sqlDuration.startTimer({ data_source_id: dataSourceId, sql_type: category });
+  let rows;
+  let total;
+  try {
+    if (hasLimit) {
+      rows = await pool.execute(dataSql);
+      total = rows.length;
+    } else {
+      const [rawRows, count] = await Promise.all([pool.execute(dataSql), fetchCountQuery(pool, sql)]);
+      rows = rawRows;
+      total = count;
+    }
+    end({ status: "success" });
+  } catch (err) {
+    end({ status: "failed" });
+    throw err;
+  }
   await writeAuditLog({
     userId,
     dataSourceId,
     action: "SELECT",
     sqlText: sql,
-    resultSummary: `${rows.length} rows`,
+    resultSummary: `${total} total rows`,
     ipAddress: ip
   });
-  return rows;
+  return { rows, total, page, pageSize };
 }
 async function postSqlDatabases(req, reply) {
   const { dataSourceId } = req.body ?? {};
@@ -345,6 +409,10 @@ function savedSqlController(app) {
 async function buildApp() {
   const app = Fastify({ loggerInstance: logger });
   await app.register(cors, { origin: true, credentials: true });
+  await app.register(metricsPlugin);
+  app.addHook("onResponse", () => {
+    refreshPoolMetrics();
+  });
   app.decorateRequest("user", null);
   app.addHook("preHandler", authHook);
   app.addHook("onError", (req, _reply, error, done) => {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.6.0",
+  "version": "0.8.0",
   "description": "DMS backend API server built on Fastify",
   "type": "module",
   "main": "./dist/index.mjs",
@@ -19,15 +19,16 @@
   },
   "dependencies": {
     "@fastify/cors": "^11.2.0",
-    "@heyhru/business-dms-approval": "0.6.0",
-    "@heyhru/business-dms-audit": "0.6.0",
-    "@heyhru/business-dms-datasource": "0.6.0",
-    "@heyhru/business-dms-saved-sql": "0.6.0",
-    "@heyhru/business-dms-user": "0.6.0",
+    "@heyhru/business-dms-approval": "0.6.2",
+    "@heyhru/business-dms-audit": "0.6.1",
+    "@heyhru/business-dms-datasource": "0.7.1",
+    "@heyhru/business-dms-saved-sql": "0.6.1",
+    "@heyhru/business-dms-user": "0.6.1",
     "@heyhru/common-util-logger": "0.6.0",
     "@heyhru/server-plugin-jwt": "0.6.0",
-    "@heyhru/server-plugin-mysql": "0.6.0",
-    "@heyhru/server-plugin-pg": "0.6.0",
+    "@heyhru/server-plugin-metrics": "0.7.0",
+    "@heyhru/server-plugin-mysql": "0.7.0",
+    "@heyhru/server-plugin-pg": "0.7.0",
     "@heyhru/server-util-crypto": "0.6.0",
     "fastify": "^5.8.4",
     "node-sql-parser": "^5.4.0",
@@ -41,5 +42,5 @@
     "typescript": "^6.0.2",
     "vitest": "^4.1.4"
   },
-  "gitHead": "c25e6fe17f0b15e07ba534e712cc723be02051b3"
+  "gitHead": "b20e6c3e571bd4939fd32ece8f5bc6d8302a4c83"
 }