@heyhru/app-dms-server 0.7.0 → 0.9.0

package/dist/index.js

@@ -1,3 +1,33 @@
+// src/otel.ts
+import { initOtel } from "@heyhru/server-plugin-otel";
+
+// src/config.ts
+if (!process.env.DATABASE_URL) {
+  throw new Error("DATABASE_URL environment variable is required");
+}
+var config = {
+  port: Number(process.env.PORT) || 3001,
+  jwtSecret: process.env.JWT_SECRET || "dev-secret-change-in-production",
+  jwtExpiresIn: "24h",
+  encryptionKey: process.env.ENCRYPTION_KEY || "dev-encryption-key-32-bytes-long!",
+  dbUrl: process.env.DATABASE_URL,
+  dbSsl: process.env.DATABASE_SSL === "true",
+  dbPoolMin: Number(process.env.DATABASE_POOL_MIN) || 2,
+  dbPoolMax: Number(process.env.DATABASE_POOL_MAX) || 10,
+  dbIdleTimeoutMs: Number(process.env.DATABASE_IDLE_TIMEOUT) || 1e4,
+  nodeEnv: process.env.NODE_ENV || "development",
+  logDir: process.env.LOG_DIR || "",
+  otelEndpoint: process.env.OTEL_EXPORTER_OTLP_ENDPOINT || "http://localhost:4317",
+  otelEnabled: process.env.OTEL_ENABLED === "true"
+};
+
+// src/otel.ts
+initOtel({
+  serviceName: "app-dms-server",
+  endpoint: config.otelEndpoint,
+  enabled: config.otelEnabled
+});
+
 // src/index.ts
 import { createPgDb } from "@heyhru/server-plugin-pg";
 
@@ -43,26 +73,6 @@ function refreshPoolMetrics() {
 
 // src/auth/auth.middleware.ts
 import { verifyToken as jwtVerify } from "@heyhru/server-plugin-jwt";
-
-// src/config.ts
-if (!process.env.DATABASE_URL) {
-  throw new Error("DATABASE_URL environment variable is required");
-}
-var config = {
-  port: Number(process.env.PORT) || 3001,
-  jwtSecret: process.env.JWT_SECRET || "dev-secret-change-in-production",
-  jwtExpiresIn: "24h",
-  encryptionKey: process.env.ENCRYPTION_KEY || "dev-encryption-key-32-bytes-long!",
-  dbUrl: process.env.DATABASE_URL,
-  dbSsl: process.env.DATABASE_SSL === "true",
-  dbPoolMin: Number(process.env.DATABASE_POOL_MIN) || 2,
-  dbPoolMax: Number(process.env.DATABASE_POOL_MAX) || 10,
-  dbIdleTimeoutMs: Number(process.env.DATABASE_IDLE_TIMEOUT) || 1e4,
-  nodeEnv: process.env.NODE_ENV || "development",
-  logDir: process.env.LOG_DIR || ""
-};
-
-// src/auth/auth.middleware.ts
 function verifyToken(token) {
   return jwtVerify(token, config.jwtSecret);
 }
@@ -252,20 +262,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");
@@ -275,10 +293,20 @@ 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 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 {
-    rows = await pool.execute(sql);
+    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" });
@@ -289,10 +317,10 @@ async function sqlExecute({ dataSourceId, database, sql, userId, ip }) {
     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 ?? {};

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.7.0",
+  "version": "0.9.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.1",
+    "@heyhru/business-dms-approval": "0.6.3",
     "@heyhru/business-dms-audit": "0.6.1",
-    "@heyhru/business-dms-datasource": "0.7.0",
+    "@heyhru/business-dms-datasource": "0.7.2",
     "@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-metrics": "0.7.0",
-    "@heyhru/server-plugin-mysql": "0.7.0",
+    "@heyhru/server-plugin-metrics": "0.7.1",
+    "@heyhru/server-plugin-mysql": "0.7.1",
+    "@heyhru/server-plugin-otel": "0.7.0",
     "@heyhru/server-plugin-pg": "0.7.0",
     "@heyhru/server-util-crypto": "0.6.0",
     "fastify": "^5.8.4",
@@ -42,5 +43,5 @@
     "typescript": "^6.0.2",
     "vitest": "^4.1.4"
   },
-  "gitHead": "b9097b9ad29ac4c0c3610a39cb0db83f74a11fb8"
+  "gitHead": "c38ab5dee711b502d5811978ddb1329289bd9d25"
 }