@heyhru/business-dms-datasource 0.6.0 → 0.7.1

package/dist/datasources.service.d.ts

@@ -6,6 +6,13 @@ interface AuthenticatedRequest extends FastifyRequest {
 }
 import type { DbPool } from "@heyhru/server-plugin-mysql";
 export type { DbPool };
+export interface PoolStatEntry {
+    dataSourceId: string;
+    database: string | null;
+    active: number | null;
+    waiting: number | null;
+}
+export declare function getPoolStats(): PoolStatEntry[];
 export declare function getPool(ds: {
     id: string;
     type: "mysql" | "postgres";

package/dist/datasources.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"datasources.service.d.ts","sourceRoot":"","sources":["../src/datasources.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAE,KAAK,YAAY,EAAE,MAAM,SAAS,CAAC;AAEjE,UAAU,oBAAqB,SAAQ,cAAc;IACnD,IAAI,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC;CACtB;AAID,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAW1D,YAAY,EAAE,MAAM,EAAE,CAAC;AAUvB,wBAAgB,OAAO,CAAC,EAAE,EAAE;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,OAAO,GAAG,UAAU,CAAC;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,OAAO,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB,GAAG,MAAM,CA4BT;AAED,wBAAsB,yBAAyB,CAC7C,EAAE,EAAE,MAAM,EACV,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,sBAAsB,GAAG,IAAI,CAAC,CAexC;AAED,wBAAsB,kBAAkB,CACtC,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAIxB;AAaD,MAAM,WAAW,sBAAsB;IACrC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,OAAO,GAAG,UAAU,CAAC;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,OAAO,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,wBAAsB,cAAc,CAAC,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,YAAY,kBAE7E;AAED,wBAAsB,aAAa,CAAC,GAAG,EAAE,cAAc,EAAE,KAAK,EAAE,YAAY,kBAK3E;AAED,wBAAgB,gBAAgB,CAAC,aAAa,EAAE,MAAM,IACtC,KAAK,oBAAoB,EAAE,OAAO,YAAY,oBAoB7D;AAED,wBAAgB,gBAAgB,CAAC,aAAa,EAAE,MAAM,IACtC,KAAK,cAAc,EAAE,OAAO,YAAY,oBAavD;AAED,wBAAsB,gBAAgB,CAAC,GAAG,EAAE,cAAc,EAAE,KAAK,EAAE,YAAY,kBAK9E"}
+{"version":3,"file":"datasources.service.d.ts","sourceRoot":"","sources":["../src/datasources.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAE,KAAK,YAAY,EAAE,MAAM,SAAS,CAAC;AAEjE,UAAU,oBAAqB,SAAQ,cAAc;IACnD,IAAI,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC;CACtB;AAID,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAW1D,YAAY,EAAE,MAAM,EAAE,CAAC;AAMvB,MAAM,WAAW,aAAa;IAC5B,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CACxB;AAED,wBAAgB,YAAY,IAAI,aAAa,EAAE,CAQ9C;AAMD,wBAAgB,OAAO,CAAC,EAAE,EAAE;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,OAAO,GAAG,UAAU,CAAC;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,OAAO,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB,GAAG,MAAM,CA4BT;AAED,wBAAsB,yBAAyB,CAC7C,EAAE,EAAE,MAAM,EACV,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,sBAAsB,GAAG,IAAI,CAAC,CAexC;AAED,wBAAsB,kBAAkB,CACtC,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAIxB;AAaD,MAAM,WAAW,sBAAsB;IACrC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,OAAO,GAAG,UAAU,CAAC;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,OAAO,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,wBAAsB,cAAc,CAAC,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,YAAY,kBAE7E;AAED,wBAAsB,aAAa,CAAC,GAAG,EAAE,cAAc,EAAE,KAAK,EAAE,YAAY,kBAK3E;AAED,wBAAgB,gBAAgB,CAAC,aAAa,EAAE,MAAM,IACtC,KAAK,oBAAoB,EAAE,OAAO,YAAY,oBAoB7D;AAED,wBAAgB,gBAAgB,CAAC,aAAa,EAAE,MAAM,IACtC,KAAK,cAAc,EAAE,OAAO,YAAY,oBAavD;AAED,wBAAsB,gBAAgB,CAAC,GAAG,EAAE,cAAc,EAAE,KAAK,EAAE,YAAY,kBAK9E"}

package/dist/index.d.ts

@@ -1,3 +1,3 @@
-export { getPool, getDataSourceWithPassword, getPoolForDatabase, datasourceList, datasourceGet, datasourceCreate, datasourceUpdate, datasourceDelete, } from "./datasources.service.js";
+export { getPool, getDataSourceWithPassword, getPoolForDatabase, getPoolStats, datasourceList, datasourceGet, datasourceCreate, datasourceUpdate, datasourceDelete, } from "./datasources.service.js";
 export type { DbPool, DataSourceWithPassword } from "./datasources.service.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EACP,yBAAyB,EACzB,kBAAkB,EAClB,cAAc,EACd,aAAa,EACb,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,GACjB,MAAM,0BAA0B,CAAC;AAElC,YAAY,EAAE,MAAM,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EACP,yBAAyB,EACzB,kBAAkB,EAClB,YAAY,EACZ,cAAc,EACd,aAAa,EACb,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,GACjB,MAAM,0BAA0B,CAAC;AAElC,YAAY,EAAE,MAAM,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC"}

package/dist/index.js

@@ -27,7 +27,8 @@ __export(index_exports, {
   datasourceUpdate: () => datasourceUpdate,
   getDataSourceWithPassword: () => getDataSourceWithPassword,
   getPool: () => getPool,
-  getPoolForDatabase: () => getPoolForDatabase
+  getPoolForDatabase: () => getPoolForDatabase,
+  getPoolStats: () => getPoolStats
 });
 module.exports = __toCommonJS(index_exports);
 
@@ -114,6 +115,15 @@ function removeDataSource(id) {
 // src/datasources.service.ts
 var logger = (0, import_common_util_logger.createLogger)({ name: "@heyhru/business-dms-datasource" });
 var pools = /* @__PURE__ */ new Map();
+function getPoolStats() {
+  return Array.from(pools.entries()).map(([key, pool]) => {
+    const colonIdx = key.indexOf(":");
+    const dataSourceId = colonIdx >= 0 ? key.slice(0, colonIdx) : key;
+    const database = colonIdx >= 0 ? key.slice(colonIdx + 1) : null;
+    const s = pool.stats();
+    return { dataSourceId, database, active: s?.active ?? null, waiting: s?.waiting ?? null };
+  });
+}
 function poolKey(id, database) {
   return database ? `${id}:${database}` : id;
 }
@@ -218,5 +228,6 @@ async function datasourceDelete(req, reply) {
   datasourceUpdate,
   getDataSourceWithPassword,
   getPool,
-  getPoolForDatabase
+  getPoolForDatabase,
+  getPoolStats
 });

package/dist/index.mjs

@@ -81,6 +81,15 @@ function removeDataSource(id) {
 // src/datasources.service.ts
 var logger = createLogger({ name: "@heyhru/business-dms-datasource" });
 var pools = /* @__PURE__ */ new Map();
+function getPoolStats() {
+  return Array.from(pools.entries()).map(([key, pool]) => {
+    const colonIdx = key.indexOf(":");
+    const dataSourceId = colonIdx >= 0 ? key.slice(0, colonIdx) : key;
+    const database = colonIdx >= 0 ? key.slice(colonIdx + 1) : null;
+    const s = pool.stats();
+    return { dataSourceId, database, active: s?.active ?? null, waiting: s?.waiting ?? null };
+  });
+}
 function poolKey(id, database) {
   return database ? `${id}:${database}` : id;
 }
@@ -184,5 +193,6 @@ export {
   datasourceUpdate,
   getDataSourceWithPassword,
   getPool,
-  getPoolForDatabase
+  getPoolForDatabase,
+  getPoolStats
 };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.6.0",
+  "version": "0.7.1",
   "description": "DMS data source domain logic: service, model, sql, pool management",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -27,8 +27,8 @@
   },
   "dependencies": {
     "@heyhru/common-util-logger": "0.6.0",
-    "@heyhru/server-plugin-mysql": "0.6.0",
-    "@heyhru/server-plugin-pg": "0.6.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"
   },
@@ -37,5 +37,5 @@
     "typescript": "^6.0.2",
     "vitest": "^4.1.4"
   },
-  "gitHead": "c25e6fe17f0b15e07ba534e712cc723be02051b3"
+  "gitHead": "b20e6c3e571bd4939fd32ece8f5bc6d8302a4c83"
 }