@heyhru/app-dms-server 0.1.9 → 0.3.0

package/dist/index.js

@@ -18,6 +18,10 @@ var config = {
   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"
 };
 
@@ -83,119 +87,14 @@ async function authHook(req, reply) {
 
 // src/auth/auth.service.ts
 import { signToken } from "@heyhru/server-plugin-jwt";
-import { hashPassword as hashPassword2, verifyPassword } from "@heyhru/server-util-crypto";
-
-// src/users/users.service.ts
-import { hashPassword } from "@heyhru/server-util-crypto";
-
-// src/users/users.model.ts
-import { getPgDb } from "@heyhru/server-plugin-pg";
-
-// src/users/users.sql.ts
-var LIST = `
-SELECT id, username, email, role, created_at
-FROM users
-ORDER BY created_at DESC`;
-var FIND_BY_ID = `
-SELECT id, username, email, role, created_at
-FROM users
-WHERE id = ?`;
-var FIND_BY_USERNAME = `
-SELECT *
-FROM users
-WHERE username = ?`;
-var CREATE = `
-INSERT INTO users (username, email, password_hash, role)
-VALUES (?, ?, ?, ?)
-RETURNING id, username, email, role, created_at`;
-var UPDATE_PASSWORD = () => `
-UPDATE users
-SET password_hash = ?, updated_at = NOW()
-WHERE id = ?`;
-var DELETE = `
-DELETE FROM users
-WHERE id = ?`;
-
-// src/users/users.model.ts
-function listUsers() {
-  return getPgDb().query(LIST);
-}
-function getUserById(id) {
-  return getPgDb().queryOne(FIND_BY_ID, [id]);
-}
-function getUserByUsername(username) {
-  return getPgDb().queryOne(FIND_BY_USERNAME, [username]);
-}
-function createUserRow(username, email, hash, role) {
-  return getPgDb().queryOne(CREATE, [username, email, hash, role]);
-}
-async function updateUserRow(id, data) {
-  const fields = [];
-  const values = [];
-  if (data.email) {
-    fields.push("email = ?");
-    values.push(data.email);
-  }
-  if (data.role) {
-    fields.push("role = ?");
-    values.push(data.role);
-  }
-  if (!fields.length) return getUserById(id);
-  fields.push("updated_at = NOW()");
-  values.push(id);
-  return getPgDb().queryOne(
-    `UPDATE users SET ${fields.join(", ")} WHERE id = ? RETURNING id, username, email, role, created_at`,
-    values
-  );
-}
-function deleteUser(id) {
-  return getPgDb().run(DELETE, [id]);
-}
-function updatePasswordHash(id, hash) {
-  return getPgDb().run(UPDATE_PASSWORD(), [hash, id]);
-}
-
-// src/users/users.service.ts
-function getUserByUsername2(username) {
-  return getUserByUsername(username);
-}
-function updateUserPassword(id, hash) {
-  return updatePasswordHash(id, hash);
-}
-async function userList(_req, reply) {
-  return reply.send(await listUsers());
-}
-async function userGet(req, reply) {
-  const { id } = req.body ?? {};
-  const user = await getUserById(id);
-  if (!user) return reply.code(404).send({ error: "\u672A\u627E\u5230" });
-  return reply.send(user);
-}
-async function userCreate(req, reply) {
-  const body = req.body ?? {};
-  const hash = await hashPassword(body.password);
-  const user = await createUserRow(body.username, body.email, hash, body.role);
-  return reply.code(201).send(user);
-}
-async function userUpdate(req, reply) {
-  const { id, ...rest } = req.body ?? {};
-  const user = await updateUserRow(id, rest);
-  if (!user) return reply.code(404).send({ error: "\u672A\u627E\u5230" });
-  return reply.send(user);
-}
-async function userDelete(req, reply) {
-  const { id } = req.body ?? {};
-  await deleteUser(id);
-  return reply.code(204).send();
-}
-
-// src/auth/auth.service.ts
+import { hashPassword, verifyPassword } from "@heyhru/server-util-crypto";
+import { getUserByUsername, updateUserPassword } from "@heyhru/business-dms-user";
 async function authLogin(req, reply) {
   const { username, password } = req.body ?? {};
   if (!username || !password) {
     return reply.code(400).send({ error: "\u7528\u6237\u540D\u548C\u5BC6\u7801\u4E0D\u80FD\u4E3A\u7A7A" });
   }
-  const user = await getUserByUsername2(username);
+  const user = await getUserByUsername(username);
   if (!user || !await verifyPassword(password, user.password_hash)) {
     req.log.warn("Login failed for user: %s", username);
     return reply.code(401).send({ error: "\u7528\u6237\u540D\u6216\u5BC6\u7801\u9519\u8BEF" });
@@ -217,11 +116,11 @@ async function authChangePassword(req, reply) {
   if (!currentPassword || !newPassword) {
     return reply.code(400).send({ error: "\u5F53\u524D\u5BC6\u7801\u548C\u65B0\u5BC6\u7801\u4E0D\u80FD\u4E3A\u7A7A" });
   }
-  const user = await getUserByUsername2(req.user.username);
+  const user = await getUserByUsername(req.user.username);
   if (!user || !await verifyPassword(currentPassword, user.password_hash)) {
     return reply.code(400).send({ error: "\u5F53\u524D\u5BC6\u7801\u4E0D\u6B63\u786E" });
   }
-  const hash = await hashPassword2(newPassword);
+  const hash = await hashPassword(newPassword);
   await updateUserPassword(user.id, hash);
   req.log.info("Password changed for user: %s", req.user.username);
   return reply.send({ ok: true });
@@ -236,6 +135,7 @@ function authController(app) {
 }
 
 // src/users/users.controller.ts
+import { userList, userGet, userCreate, userUpdate, userDelete } from "@heyhru/business-dms-user";
 function userController(app) {
   app.post("/users/list", userList);
   app.post("/users/get", userGet);
@@ -250,14 +150,14 @@ import { createPool as createMysqlPool } from "@heyhru/server-plugin-mysql";
 import { createPool as createPgPool } from "@heyhru/server-plugin-pg";
 
 // src/datasources/datasources.model.ts
-import { getPgDb as getPgDb2 } from "@heyhru/server-plugin-pg";
+import { getPgDb } from "@heyhru/server-plugin-pg";
 
 // src/datasources/datasources.sql.ts
-var LIST2 = `
+var LIST = `
 SELECT id, name, type, host, port, database, username, ssl, pool_min, pool_max, created_by, created_at
 FROM data_sources
 ORDER BY created_at DESC`;
-var FIND_BY_ID2 = `
+var FIND_BY_ID = `
 SELECT id, name, type, host, port, database, username, ssl, pool_min, pool_max, created_by, created_at
 FROM data_sources
 WHERE id = ?`;
@@ -265,27 +165,27 @@ var FIND_WITH_PASSWORD = `
 SELECT *
 FROM data_sources
 WHERE id = ?`;
-var CREATE2 = `
+var CREATE = `
 INSERT INTO data_sources (name, type, host, port, database, username, password_encrypted, ssl, pool_min, pool_max, created_by)
 VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
 RETURNING id, name, type, host, port, database, username, ssl, pool_min, pool_max, created_by, created_at`;
 var UPDATE_FIELDS = ["name", "type", "host", "port", "database", "username", "ssl", "pool_min", "pool_max"];
-var DELETE2 = `
+var DELETE = `
 DELETE FROM data_sources
 WHERE id = ?`;
 
 // src/datasources/datasources.model.ts
 function listDataSources() {
-  return getPgDb2().query(LIST2);
+  return getPgDb().query(LIST);
 }
 function getDataSourceById(id) {
-  return getPgDb2().queryOne(FIND_BY_ID2, [id]);
+  return getPgDb().queryOne(FIND_BY_ID, [id]);
 }
 function getDataSourceRow(id) {
-  return getPgDb2().queryOne(FIND_WITH_PASSWORD, [id]);
+  return getPgDb().queryOne(FIND_WITH_PASSWORD, [id]);
 }
 function insertDataSource(data, encryptedPassword, createdBy) {
-  return getPgDb2().queryOne(CREATE2, [
+  return getPgDb().queryOne(CREATE, [
     data.name,
     data.type,
     data.host,
@@ -314,13 +214,13 @@ async function updateDataSource(id, data, encryptedPassword) {
   }
   if (!fields.length) return getDataSourceById(id);
   values.push(id);
-  return getPgDb2().queryOne(
+  return getPgDb().queryOne(
     `UPDATE data_sources SET ${fields.join(", ")} WHERE id = ? RETURNING id, name, type, host, port, database, username, ssl, pool_min, pool_max, created_by, created_at`,
     values
   );
 }
 function removeDataSource(id) {
-  return getPgDb2().run(DELETE2, [id]);
+  return getPgDb().run(DELETE, [id]);
 }
 
 // src/datasources/datasources.service.ts
@@ -430,13 +330,13 @@ function datasourceController(app) {
 import NodeSqlParser from "node-sql-parser";
 
 // src/audit/audit.model.ts
-import { getPgDb as getPgDb3 } from "@heyhru/server-plugin-pg";
+import { getPgDb as getPgDb2 } from "@heyhru/server-plugin-pg";
 
 // src/audit/audit.sql.ts
 var INSERT = `
 INSERT INTO audit_logs (user_id, data_source_id, action, sql_text, result_summary, ip_address)
 VALUES (?, ?, ?, ?, ?, ?)`;
-var LIST3 = `
+var LIST2 = `
 SELECT al.*, u.username
 FROM audit_logs al
 LEFT JOIN users u ON al.user_id = u.id
@@ -444,7 +344,7 @@ WHERE 1=1`;
 
 // src/audit/audit.model.ts
 function insertAuditLog(entry) {
-  return getPgDb3().run(INSERT, [
+  return getPgDb2().run(INSERT, [
     entry.userId,
     entry.dataSourceId ?? null,
     entry.action,
@@ -454,7 +354,7 @@ function insertAuditLog(entry) {
   ]);
 }
 async function queryAuditLogs(filters) {
-  let query = LIST3;
+  let query = LIST2;
   const params = [];
   if (filters?.userId) {
     query += " AND al.user_id = ?";
@@ -466,7 +366,7 @@ async function queryAuditLogs(filters) {
   }
   query += " ORDER BY al.created_at DESC LIMIT ? OFFSET ?";
   params.push(filters?.limit ?? 50, filters?.offset ?? 0);
-  return getPgDb3().query(query, params);
+  return getPgDb2().query(query, params);
 }
 
 // src/audit/audit.service.ts
@@ -590,14 +490,14 @@ function sqlController(app) {
 }
 
 // src/approvals/approvals.model.ts
-import { getPgDb as getPgDb4 } from "@heyhru/server-plugin-pg";
+import { getPgDb as getPgDb3 } from "@heyhru/server-plugin-pg";
 
 // src/approvals/approvals.sql.ts
-var FIND_BY_ID3 = `
+var FIND_BY_ID2 = `
 SELECT *
 FROM approvals
 WHERE id = ?`;
-var CREATE3 = `
+var CREATE2 = `
 INSERT INTO approvals (data_source_id, sql_text, submitted_by)
 VALUES (?, ?, ?)
 RETURNING *`;
@@ -628,22 +528,22 @@ async function listApprovals(filters) {
     params.push(filters.submittedBy);
   }
   query += " ORDER BY created_at DESC";
-  return getPgDb4().query(query, params);
+  return getPgDb3().query(query, params);
 }
 function getApprovalById(id) {
-  return getPgDb4().queryOne(FIND_BY_ID3, [id]);
+  return getPgDb3().queryOne(FIND_BY_ID2, [id]);
 }
 function insertApproval(dataSourceId, sqlText, submittedBy) {
-  return getPgDb4().queryOne(CREATE3, [dataSourceId, sqlText, submittedBy]);
+  return getPgDb3().queryOne(CREATE2, [dataSourceId, sqlText, submittedBy]);
 }
 function updateReview(id, status, reviewedBy, rejectReason) {
-  return getPgDb4().queryOne(UPDATE_REVIEW(), [status, reviewedBy, rejectReason, id]);
+  return getPgDb3().queryOne(UPDATE_REVIEW(), [status, reviewedBy, rejectReason, id]);
 }
 function setExecuting(id) {
-  return getPgDb4().run(UPDATE_EXECUTING(), [id]);
+  return getPgDb3().run(UPDATE_EXECUTING(), [id]);
 }
 function setExecuteResult(id, status, result) {
-  return getPgDb4().run(UPDATE_RESULT(), [status, result, id]);
+  return getPgDb3().run(UPDATE_RESULT(), [status, result, id]);
 }
 
 // src/approvals/approvals.service.ts
@@ -781,7 +681,7 @@ async function buildApp() {
 }
 
 // src/migrate/runner.ts
-import { getPgDb as getPgDb5 } from "@heyhru/server-plugin-pg";
+import { getPgDb as getPgDb4 } from "@heyhru/server-plugin-pg";
 
 // src/migrate/migrations.ts
 var migrations = [
@@ -873,7 +773,7 @@ CREATE INDEX IF NOT EXISTS idx_approvals_submitted_by ON approvals(submitted_by)
 
 // src/migrate/runner.ts
 async function runMigrations() {
-  const db = getPgDb5();
+  const db = getPgDb4();
   await db.exec(`CREATE TABLE IF NOT EXISTS _migrations (
     name TEXT PRIMARY KEY,
     applied_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
@@ -890,7 +790,12 @@ async function runMigrations() {
 
 // src/index.ts
 async function main() {
-  await createPgDb(config.dbUrl);
+  await createPgDb(config.dbUrl, {
+    ssl: config.dbSsl,
+    poolMin: config.dbPoolMin,
+    poolMax: config.dbPoolMax,
+    idleTimeoutMs: config.dbIdleTimeoutMs
+  });
   await runMigrations();
   const app = await buildApp();
   await app.listen({ port: config.port, host: "0.0.0.0" });

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.1.9",
+  "version": "0.3.0",
   "description": "DMS backend API server built on Fastify",
   "type": "module",
   "main": "./dist/index.mjs",
@@ -11,7 +11,7 @@
     "dist"
   ],
   "scripts": {
-    "dev": "tsx watch src/index.ts",
+    "dev": "tsx watch --env-file=.env src/index.ts",
     "build": "tsup",
     "lint": "eslint src",
     "test": "vitest run --passWithNoTests",
@@ -20,11 +20,12 @@
   "dependencies": {
     "@fastify/cookie": "^11.0.2",
     "@fastify/cors": "^11.0.0",
-    "@heyhru/common-util-logger": "0.1.2",
-    "@heyhru/server-plugin-jwt": "0.1.9",
-    "@heyhru/server-plugin-mysql": "0.1.9",
-    "@heyhru/server-plugin-pg": "0.1.9",
-    "@heyhru/server-util-crypto": "0.1.2",
+    "@heyhru/business-dms-user": "0.3.0",
+    "@heyhru/common-util-logger": "0.3.0",
+    "@heyhru/server-plugin-jwt": "0.3.0",
+    "@heyhru/server-plugin-mysql": "0.3.0",
+    "@heyhru/server-plugin-pg": "0.3.0",
+    "@heyhru/server-util-crypto": "0.3.0",
     "fastify": "^5.8.4",
     "node-sql-parser": "^5.4.0"
   },
@@ -36,5 +37,5 @@
     "typescript": "^6.0.2",
     "vitest": "^4.1.2"
   },
-  "gitHead": "f25e81a1f0e845f5d6c63f5c8df1fbe069f11239"
+  "gitHead": "577a6d89e51ac836bf14d9e6d12eeb61d1b17939"
 }