@devbro/pashmak 0.1.34 → 0.1.36

package/dist/DatabaseServiceProvider.d.mts

@@ -1,13 +1,13 @@
 import { Middleware, Request, Response } from '@devbro/neko-router';
-import { PostgresqlConnection } from '@devbro/neko-sql';
 import { PoolConfig } from 'pg';
+import { Connection } from '@devbro/neko-sql';
 
 declare class DatabaseServiceProvider extends Middleware {
     call(req: Request, res: Response, next: () => Promise<void>): Promise<void>;
     private static instance;
     register(): Promise<void>;
     static getInstance(): DatabaseServiceProvider;
-    getConnection(db_config: PoolConfig): Promise<PostgresqlConnection>;
+    getConnection(db_config: PoolConfig): Connection;
 }
 
 export { DatabaseServiceProvider };

package/dist/DatabaseServiceProvider.mjs

@@ -19,7 +19,7 @@ class DatabaseServiceProvider extends Middleware {
         ctx().set(["database", name], conn);
         conns.push(conn);
       }
-      BaseModel.setConnection(async () => {
+      BaseModel.setConnection(() => {
         const key = ["database", "default"];
         let rc;
         if (ctx.isActive()) {
@@ -27,7 +27,7 @@ class DatabaseServiceProvider extends Middleware {
         } else if (Global.has(key)) {
           rc = Global.get(key);
         } else {
-          rc = await this.getConnection(db_configs["default"]);
+          rc = this.getConnection(db_configs["default"]);
           Global.set(key, rc);
         }
         return rc;
@@ -48,10 +48,10 @@ class DatabaseServiceProvider extends Middleware {
     }
     return DatabaseServiceProvider.instance;
   }
-  async getConnection(db_config) {
+  getConnection(db_config) {
     const conn = new PostgresqlConnection(db_config);
-    if (!await conn.connect()) {
-      throw new Error("Failed to connect to the database");
+    if (!conn.isConnected()) {
+      conn.connect();
     }
     return conn;
   }

package/dist/DatabaseServiceProvider.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/DatabaseServiceProvider.mts"],"sourcesContent":["import { Middleware } from \"@devbro/neko-router\";\nimport { Request, Response } from \"@devbro/neko-router\";\nimport { PostgresqlConnection } from \"@devbro/neko-sql\";\nimport { PoolConfig } from \"pg\";\nimport { Connection } from \"@devbro/neko-sql\";\nimport { BaseModel } from \"@devbro/neko-orm\";\nimport { ctx } from \"@devbro/neko-context\";\nimport { config } from \"@devbro/neko-config\";\nimport { Global } from \"./global.mjs\";\n\nexport class DatabaseServiceProvider extends Middleware {\n  async call(\n    req: Request,\n    res: Response,\n    next: () => Promise<void>,\n  ): Promise<void> {\n    const db_configs: Record<string, PoolConfig & { name: string }> =\n      config.get(\"databases\");\n\n    const conns = [];\n    try {\n      for (const [name, db_config] of Object.entries(db_configs)) {\n        const conn = await this.getConnection(db_config);\n        ctx().set([\"database\", name], conn);\n        conns.push(conn);\n      }\n      BaseModel.setConnection(async () => {\n        const key = [\"database\", \"default\"];\n        let rc: Connection | undefined;\n\n        if (ctx.isActive()) {\n          rc = ctx().get<Connection>(key);\n        } else if (Global.has(key)) {\n          rc = Global.get<Connection>(key);\n        } else {\n          rc = await this.getConnection(db_configs[\"default\"]);\n          Global.set(key, rc);\n        }\n\n        return rc!;\n      });\n      await next();\n    } finally {\n      for (const conn of conns) {\n        await conn.disconnect();\n      }\n    }\n  }\n\n  private static instance: DatabaseServiceProvider;\n\n  async register(): Promise<void> {}\n\n  static getInstance(): DatabaseServiceProvider {\n    if (!DatabaseServiceProvider.instance) {\n      DatabaseServiceProvider.instance = new DatabaseServiceProvider();\n    }\n    return DatabaseServiceProvider.instance;\n  }\n\n  async getConnection(db_config: PoolConfig): Promise<PostgresqlConnection> {\n    const conn = new PostgresqlConnection(db_config);\n    if (!(await conn.connect())) {\n      throw new Error(\"Failed to connect to the database\");\n    }\n    return conn;\n  }\n}\n"],"mappings":";;AAAA,SAAS,kBAAkB;AAE3B,SAAS,4BAA4B;AAGrC,SAAS,iBAAiB;AAC1B,SAAS,WAAW;AACpB,SAAS,cAAc;AACvB,SAAS,cAAc;AAEhB,MAAM,gCAAgC,WAAW;AAAA,EAVxD,OAUwD;AAAA;AAAA;AAAA,EACtD,MAAM,KACJ,KACA,KACA,MACe;AACf,UAAM,aACJ,OAAO,IAAI,WAAW;AAExB,UAAM,QAAQ,CAAC;AACf,QAAI;AACF,iBAAW,CAAC,MAAM,SAAS,KAAK,OAAO,QAAQ,UAAU,GAAG;AAC1D,cAAM,OAAO,MAAM,KAAK,cAAc,SAAS;AAC/C,YAAI,EAAE,IAAI,CAAC,YAAY,IAAI,GAAG,IAAI;AAClC,cAAM,KAAK,IAAI;AAAA,MACjB;AACA,gBAAU,cAAc,YAAY;AAClC,cAAM,MAAM,CAAC,YAAY,SAAS;AAClC,YAAI;AAEJ,YAAI,IAAI,SAAS,GAAG;AAClB,eAAK,IAAI,EAAE,IAAgB,GAAG;AAAA,QAChC,WAAW,OAAO,IAAI,GAAG,GAAG;AAC1B,eAAK,OAAO,IAAgB,GAAG;AAAA,QACjC,OAAO;AACL,eAAK,MAAM,KAAK,cAAc,WAAW,SAAS,CAAC;AACnD,iBAAO,IAAI,KAAK,EAAE;AAAA,QACpB;AAEA,eAAO;AAAA,MACT,CAAC;AACD,YAAM,KAAK;AAAA,IACb,UAAE;AACA,iBAAW,QAAQ,OAAO;AACxB,cAAM,KAAK,WAAW;AAAA,MACxB;AAAA,IACF;AAAA,EACF;AAAA,EAEA,OAAe;AAAA,EAEf,MAAM,WAA0B;AAAA,EAAC;AAAA,EAEjC,OAAO,cAAuC;AAC5C,QAAI,CAAC,wBAAwB,UAAU;AACrC,8BAAwB,WAAW,IAAI,wBAAwB;AAAA,IACjE;AACA,WAAO,wBAAwB;AAAA,EACjC;AAAA,EAEA,MAAM,cAAc,WAAsD;AACxE,UAAM,OAAO,IAAI,qBAAqB,SAAS;AAC/C,QAAI,CAAE,MAAM,KAAK,QAAQ,GAAI;AAC3B,YAAM,IAAI,MAAM,mCAAmC;AAAA,IACrD;AACA,WAAO;AAAA,EACT;AACF;","names":[]}
+{"version":3,"sources":["../src/DatabaseServiceProvider.mts"],"sourcesContent":["import { Middleware } from \"@devbro/neko-router\";\nimport { Request, Response } from \"@devbro/neko-router\";\nimport { PostgresqlConnection } from \"@devbro/neko-sql\";\nimport { PoolConfig } from \"pg\";\nimport { Connection } from \"@devbro/neko-sql\";\nimport { BaseModel } from \"@devbro/neko-orm\";\nimport { ctx } from \"@devbro/neko-context\";\nimport { config } from \"@devbro/neko-config\";\nimport { Global } from \"./global.mjs\";\n\nexport class DatabaseServiceProvider extends Middleware {\n  async call(\n    req: Request,\n    res: Response,\n    next: () => Promise<void>,\n  ): Promise<void> {\n    const db_configs: Record<string, PoolConfig & { name: string }> =\n      config.get(\"databases\");\n\n    const conns = [];\n    try {\n      for (const [name, db_config] of Object.entries(db_configs)) {\n        const conn = await this.getConnection(db_config);\n        ctx().set([\"database\", name], conn);\n        conns.push(conn);\n      }\n      BaseModel.setConnection(() => {\n        const key = [\"database\", \"default\"];\n        let rc: Connection | undefined;\n\n        if (ctx.isActive()) {\n          rc = ctx().get<Connection>(key);\n        } else if (Global.has(key)) {\n          rc = Global.get<Connection>(key);\n        } else {\n          rc = this.getConnection(db_configs[\"default\"]);\n          Global.set(key, rc);\n        }\n\n        return rc!;\n      });\n      await next();\n    } finally {\n      for (const conn of conns) {\n        await conn.disconnect();\n      }\n    }\n  }\n\n  private static instance: DatabaseServiceProvider;\n\n  async register(): Promise<void> {}\n\n  static getInstance(): DatabaseServiceProvider {\n    if (!DatabaseServiceProvider.instance) {\n      DatabaseServiceProvider.instance = new DatabaseServiceProvider();\n    }\n    return DatabaseServiceProvider.instance;\n  }\n\n  getConnection(db_config: PoolConfig): Connection {\n    const conn = new PostgresqlConnection(db_config);\n    if (!conn.isConnected()) {\n      conn.connect();\n    }\n    return conn;\n  }\n}\n"],"mappings":";;AAAA,SAAS,kBAAkB;AAE3B,SAAS,4BAA4B;AAGrC,SAAS,iBAAiB;AAC1B,SAAS,WAAW;AACpB,SAAS,cAAc;AACvB,SAAS,cAAc;AAEhB,MAAM,gCAAgC,WAAW;AAAA,EAVxD,OAUwD;AAAA;AAAA;AAAA,EACtD,MAAM,KACJ,KACA,KACA,MACe;AACf,UAAM,aACJ,OAAO,IAAI,WAAW;AAExB,UAAM,QAAQ,CAAC;AACf,QAAI;AACF,iBAAW,CAAC,MAAM,SAAS,KAAK,OAAO,QAAQ,UAAU,GAAG;AAC1D,cAAM,OAAO,MAAM,KAAK,cAAc,SAAS;AAC/C,YAAI,EAAE,IAAI,CAAC,YAAY,IAAI,GAAG,IAAI;AAClC,cAAM,KAAK,IAAI;AAAA,MACjB;AACA,gBAAU,cAAc,MAAM;AAC5B,cAAM,MAAM,CAAC,YAAY,SAAS;AAClC,YAAI;AAEJ,YAAI,IAAI,SAAS,GAAG;AAClB,eAAK,IAAI,EAAE,IAAgB,GAAG;AAAA,QAChC,WAAW,OAAO,IAAI,GAAG,GAAG;AAC1B,eAAK,OAAO,IAAgB,GAAG;AAAA,QACjC,OAAO;AACL,eAAK,KAAK,cAAc,WAAW,SAAS,CAAC;AAC7C,iBAAO,IAAI,KAAK,EAAE;AAAA,QACpB;AAEA,eAAO;AAAA,MACT,CAAC;AACD,YAAM,KAAK;AAAA,IACb,UAAE;AACA,iBAAW,QAAQ,OAAO;AACxB,cAAM,KAAK,WAAW;AAAA,MACxB;AAAA,IACF;AAAA,EACF;AAAA,EAEA,OAAe;AAAA,EAEf,MAAM,WAA0B;AAAA,EAAC;AAAA,EAEjC,OAAO,cAAuC;AAC5C,QAAI,CAAC,wBAAwB,UAAU;AACrC,8BAAwB,WAAW,IAAI,wBAAwB;AAAA,IACjE;AACA,WAAO,wBAAwB;AAAA,EACjC;AAAA,EAEA,cAAc,WAAmC;AAC/C,UAAM,OAAO,IAAI,qBAAqB,SAAS;AAC/C,QAAI,CAAC,KAAK,YAAY,GAAG;AACvB,WAAK,QAAQ;AAAA,IACf;AACA,WAAO;AAAA,EACT;AACF;","names":[]}

package/dist/bin/DatabaseServiceProvider.cjs

@@ -98,7 +98,7 @@ var DatabaseServiceProvider = class _DatabaseServiceProvider extends Middleware
         (0, import_neko_context.ctx)().set(["database", name], conn);
         conns.push(conn);
       }
-      import_neko_orm.BaseModel.setConnection(async () => {
+      import_neko_orm.BaseModel.setConnection(() => {
         const key = ["database", "default"];
         let rc;
         if (import_neko_context.ctx.isActive()) {
@@ -106,7 +106,7 @@ var DatabaseServiceProvider = class _DatabaseServiceProvider extends Middleware
         } else if (Global.has(key)) {
           rc = Global.get(key);
         } else {
-          rc = await this.getConnection(db_configs["default"]);
+          rc = this.getConnection(db_configs["default"]);
           Global.set(key, rc);
         }
         return rc;
@@ -127,10 +127,10 @@ var DatabaseServiceProvider = class _DatabaseServiceProvider extends Middleware
     }
     return _DatabaseServiceProvider.instance;
   }
-  async getConnection(db_config) {
+  getConnection(db_config) {
     const conn = new import_neko_sql.PostgresqlConnection(db_config);
-    if (!await conn.connect()) {
-      throw new Error("Failed to connect to the database");
+    if (!conn.isConnected()) {
+      conn.connect();
     }
     return conn;
   }

package/dist/bin/cache.cjs

@@ -756,19 +756,15 @@ var cache = (0, import_neko_helper2.createSingleton)((label) => {
 });
 
 // src/cache.mts
-var crypto = __toESM(require("crypto"), 1);
 async function cacheQuery(q, options = {}) {
   options.ttl = options.ttl ?? 3600;
   options.cache_label = options.cache_label ?? "default";
   const sql = q.toSql();
-  const key = "sql_cache:" + crypto.createHash("md5").update(`${sql.sql}:${sql.bindings.join(",")}`).digest("hex");
-  const cachedResult = await cache(options.cache_label).get(key);
-  if (cachedResult) {
-    return JSON.parse(cachedResult);
-  }
-  const rc = await q.get();
-  await cache(options.cache_label).put(key, JSON.stringify(rc), options.ttl);
-  return rc;
+  return await cache(options.cache_label).remember(
+    sql,
+    async () => await q.get(),
+    options
+  );
 }
 __name(cacheQuery, "cacheQuery");
 // Annotate the CommonJS export names for ESM import in node:

package/dist/bin/index.cjs

@@ -2904,7 +2904,7 @@ var init_DatabaseServiceProvider = __esm({
             (0, import_neko_context6.ctx)().set(["database", name], conn);
             conns.push(conn);
           }
-          import_neko_orm.BaseModel.setConnection(async () => {
+          import_neko_orm.BaseModel.setConnection(() => {
             const key = ["database", "default"];
             let rc;
             if (import_neko_context6.ctx.isActive()) {
@@ -2912,7 +2912,7 @@ var init_DatabaseServiceProvider = __esm({
             } else if (Global.has(key)) {
               rc = Global.get(key);
             } else {
-              rc = await this.getConnection(db_configs["default"]);
+              rc = this.getConnection(db_configs["default"]);
               Global.set(key, rc);
             }
             return rc;
@@ -2933,10 +2933,10 @@ var init_DatabaseServiceProvider = __esm({
         }
         return _DatabaseServiceProvider.instance;
       }
-      async getConnection(db_config) {
+      getConnection(db_config) {
         const conn = new import_neko_sql2.PostgresqlConnection(db_config);
-        if (!await conn.connect()) {
-          throw new Error("Failed to connect to the database");
+        if (!conn.isConnected()) {
+          conn.connect();
         }
         return conn;
       }

package/dist/cache.mjs

@@ -2,19 +2,15 @@ var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 export * from "@devbro/neko-cache";
 import { cache } from "./facades.mjs";
-import * as crypto from "crypto";
 async function cacheQuery(q, options = {}) {
   options.ttl = options.ttl ?? 3600;
   options.cache_label = options.cache_label ?? "default";
   const sql = q.toSql();
-  const key = "sql_cache:" + crypto.createHash("md5").update(`${sql.sql}:${sql.bindings.join(",")}`).digest("hex");
-  const cachedResult = await cache(options.cache_label).get(key);
-  if (cachedResult) {
-    return JSON.parse(cachedResult);
-  }
-  const rc = await q.get();
-  await cache(options.cache_label).put(key, JSON.stringify(rc), options.ttl);
-  return rc;
+  return await cache(options.cache_label).remember(
+    sql,
+    async () => await q.get(),
+    options
+  );
 }
 __name(cacheQuery, "cacheQuery");
 export {

package/dist/cache.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/cache.mts"],"sourcesContent":["export * from \"@devbro/neko-cache\";\n\nimport { Query } from \"@devbro/neko-sql\";\nimport { cache } from \"./facades.mjs\";\nimport * as crypto from \"crypto\";\n\nexport type CacheQueryOptions = {\n  ttl?: number;\n  tags?: string[];\n  cache_label?: string;\n};\n\nexport async function cacheQuery(\n  q: Query,\n  options: CacheQueryOptions = {},\n): ReturnType<Query[\"get\"]> {\n  options.ttl = options.ttl ?? 3600; // default TTL 1 hour\n  options.cache_label = options.cache_label ?? \"default\";\n  const sql = q.toSql();\n\n  const key =\n    \"sql_cache:\" +\n    crypto\n      .createHash(\"md5\")\n      .update(`${sql.sql}:${sql.bindings.join(\",\")}`)\n      .digest(\"hex\");\n  const cachedResult = (await cache(options.cache_label).get(key)) as\n    | string\n    | undefined;\n  if (cachedResult) {\n    return JSON.parse(cachedResult);\n  }\n\n  const rc = await q.get();\n  await cache(options.cache_label).put(key, JSON.stringify(rc), options.ttl);\n  return rc;\n}\n"],"mappings":";;AAAA,cAAc;AAGd,SAAS,aAAa;AACtB,YAAY,YAAY;AAQxB,eAAsB,WACpB,GACA,UAA6B,CAAC,GACJ;AAC1B,UAAQ,MAAM,QAAQ,OAAO;AAC7B,UAAQ,cAAc,QAAQ,eAAe;AAC7C,QAAM,MAAM,EAAE,MAAM;AAEpB,QAAM,MACJ,eACA,OACG,WAAW,KAAK,EAChB,OAAO,GAAG,IAAI,GAAG,IAAI,IAAI,SAAS,KAAK,GAAG,CAAC,EAAE,EAC7C,OAAO,KAAK;AACjB,QAAM,eAAgB,MAAM,MAAM,QAAQ,WAAW,EAAE,IAAI,GAAG;AAG9D,MAAI,cAAc;AAChB,WAAO,KAAK,MAAM,YAAY;AAAA,EAChC;AAEA,QAAM,KAAK,MAAM,EAAE,IAAI;AACvB,QAAM,MAAM,QAAQ,WAAW,EAAE,IAAI,KAAK,KAAK,UAAU,EAAE,GAAG,QAAQ,GAAG;AACzE,SAAO;AACT;AAxBsB;","names":[]}
+{"version":3,"sources":["../src/cache.mts"],"sourcesContent":["export * from \"@devbro/neko-cache\";\n\nimport { Query } from \"@devbro/neko-sql\";\nimport { cache } from \"./facades.mjs\";\nimport * as crypto from \"crypto\";\nimport { JSONValue } from \"@devbro/neko-helper\";\n\nexport type CacheQueryOptions = {\n  ttl?: number;\n  tags?: string[];\n  cache_label?: string;\n};\n\nexport async function cacheQuery(\n  q: Query,\n  options: CacheQueryOptions = {},\n): ReturnType<Query[\"get\"]> {\n  options.ttl = options.ttl ?? 3600; // default TTL 1 hour\n  options.cache_label = options.cache_label ?? \"default\";\n  const sql = q.toSql();\n\n  return await cache(options.cache_label).remember(\n    sql as JSONValue,\n    async () => await q.get(),\n    options,\n  );\n}\n"],"mappings":";;AAAA,cAAc;AAGd,SAAS,aAAa;AAUtB,eAAsB,WACpB,GACA,UAA6B,CAAC,GACJ;AAC1B,UAAQ,MAAM,QAAQ,OAAO;AAC7B,UAAQ,cAAc,QAAQ,eAAe;AAC7C,QAAM,MAAM,EAAE,MAAM;AAEpB,SAAO,MAAM,MAAM,QAAQ,WAAW,EAAE;AAAA,IACtC;AAAA,IACA,YAAY,MAAM,EAAE,IAAI;AAAA,IACxB;AAAA,EACF;AACF;AAbsB;","names":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devbro/pashmak",
-  "version": "0.1.34",
+  "version": "0.1.36",
   "description": "testing application for the entire repo",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",