@devbro/pashmak 0.1.18 → 0.1.20

package/dist/bin/index.cjs

@@ -566,36 +566,44 @@ var queue_exports = {};
 __export(queue_exports, {
   DatabaseTransport: () => DatabaseTransport
 });
-var import_neko_sql, DatabaseTransport;
+var DatabaseTransport;
 var init_queue = __esm({
   "src/queue.mts"() {
     "use strict";
     __reExport(queue_exports, require("@devbro/neko-queue"));
-    import_neko_sql = require("@devbro/neko-sql");
+    init_facades();
     DatabaseTransport = class {
-      constructor(db_config) {
-        this.db_config = db_config;
-      }
       static {
         __name(this, "DatabaseTransport");
       }
-      listenInterval = 6e4;
-      // default to 1 minute
-      messageLimit = 100;
-      // default to 100 messages per fetch
       activeIntervals = /* @__PURE__ */ new Set();
+      config = {
+        queue_table: "queue_messages",
+        db_connection: "default",
+        listen_interval: 60,
+        // seconds
+        message_limit: 10
+        // messages per each fetch
+      };
+      constructor(config10) {
+        this.config = { ...this.config, ...config10 };
+      }
       setListenInterval(interval) {
-        this.listenInterval = interval;
+        this.config.listen_interval = interval;
       }
       setMessageLimit(limit) {
-        this.messageLimit = limit;
+        this.config.message_limit = limit;
       }
       async dispatch(channel, message) {
-        const conn = new import_neko_sql.PostgresqlConnection(this.db_config);
+        const conn = db(this.config.db_connection);
         try {
           await conn.connect();
+          let schema = conn.getSchema();
+          if (await schema.tableExists(this.config.queue_table) === false) {
+            return;
+          }
           let q = conn.getQuery();
-          await q.table("queue_messages").insert({
+          await q.table(this.config.queue_table).insert({
             channel,
             message,
             processed: false,
@@ -611,20 +619,20 @@ var init_queue = __esm({
       async listen(channel, callback) {
         return new Promise(async (resolve, reject) => {
           const intervalId = setInterval(async () => {
-            const conn = new import_neko_sql.PostgresqlConnection(this.db_config);
+            const conn = db(this.config.db_connection);
             try {
               await conn.connect();
               let q = conn.getQuery();
-              let messages = await q.table("queue_messages").whereOp("channel", "=", channel).whereOp("processed", "=", false).limit(this.messageLimit).orderBy("last_tried_at", "asc").get();
+              let messages = await q.table(this.config.queue_table).whereOp("channel", "=", channel).whereOp("processed", "=", false).limit(this.config.message_limit).orderBy("last_tried_at", "asc").get();
               for (let msg of messages) {
                 try {
                   await callback(msg.message);
-                  await q.table("queue_messages").whereOp("id", "=", msg.id).update({
+                  await q.table(this.config.queue_table).whereOp("id", "=", msg.id).update({
                     processed: true,
                     updated_at: /* @__PURE__ */ new Date()
                   });
                 } catch (error) {
-                  await q.table("queue_messages").whereOp("id", "=", msg.id).update({
+                  await q.table(this.config.queue_table).whereOp("id", "=", msg.id).update({
                     processed: false,
                     last_tried_at: /* @__PURE__ */ new Date(),
                     process_message: error.message || "Error processing message"
@@ -633,11 +641,11 @@ var init_queue = __esm({
               }
             } catch (error) {
               this.activeIntervals.delete(intervalId);
-              reject(error);
+              logger().error("Error in DatabaseTransport listen interval:", { error });
             } finally {
               await conn.disconnect();
             }
-          }, this.listenInterval);
+          }, this.config.listen_interval * 1e3);
           this.activeIntervals.add(intervalId);
         });
       }
@@ -652,7 +660,7 @@ var init_queue = __esm({
 });
 
 // src/factories.mts
-var import_neko_mailer, import_neko_queue, import_neko_queue2, import_neko_cache, FlexibleFactory, MailerFactory, QueueFactory, CacheProviderFactory;
+var import_neko_mailer, import_neko_queue, import_neko_queue2, import_neko_cache, import_neko_storage, FlexibleFactory, MailerFactory, QueueTransportFactory, CacheProviderFactory;
 var init_factories = __esm({
   "src/factories.mts"() {
     "use strict";
@@ -662,6 +670,7 @@ var init_factories = __esm({
     import_neko_queue2 = require("@devbro/neko-queue");
     init_queue();
     import_neko_cache = require("@devbro/neko-cache");
+    import_neko_storage = require("@devbro/neko-storage");
     FlexibleFactory = class {
       static {
         __name(this, "FlexibleFactory");
@@ -698,32 +707,32 @@ var init_factories = __esm({
         });
       });
     });
-    MailerFactory.register("SES", (opt) => {
+    MailerFactory.register("ses", (opt) => {
       return new import_neko_mailer.SESProvider(opt);
     });
-    MailerFactory.register("SMTP", (opt) => {
+    MailerFactory.register("smtp", (opt) => {
       return new import_neko_mailer.SMTPProvider(opt);
     });
-    MailerFactory.register("MEMORY", (opt) => {
+    MailerFactory.register("memory", (opt) => {
       return new import_neko_mailer.MemoryProvider();
     });
-    QueueFactory = class _QueueFactory {
+    QueueTransportFactory = class _QueueTransportFactory {
       static {
-        __name(this, "QueueFactory");
+        __name(this, "QueueTransportFactory");
       }
       static instance = new FlexibleFactory();
       static register(key, factory) {
-        _QueueFactory.instance.register(key, factory);
+        _QueueTransportFactory.instance.register(key, factory);
       }
       static create(key, ...args) {
-        return _QueueFactory.instance.create(key, ...args);
+        return _QueueTransportFactory.instance.create(key, ...args);
       }
     };
-    QueueFactory.register("database", (opt) => {
+    QueueTransportFactory.register("database", (opt) => {
       let transport = new DatabaseTransport(opt);
       return new import_neko_queue.QueueConnection(transport);
     });
-    QueueFactory.register("memory", (opt) => {
+    QueueTransportFactory.register("memory", (opt) => {
       let transport = new import_neko_queue2.MemoryTransport(opt);
       return new import_neko_queue.QueueConnection(transport);
     });
@@ -751,11 +760,17 @@ var init_factories = __esm({
     CacheProviderFactory.register("disabled", (opt) => {
       return new import_neko_cache.DisabledCacheProvider();
     });
+    import_neko_storage.StorageProviderFactory.register("local", (opt) => {
+      return new import_neko_storage.LocalStorageProvider(opt);
+    });
+    import_neko_storage.StorageProviderFactory.register("s3", (opt) => {
+      return new import_neko_storage.AWSS3StorageProvider(opt);
+    });
   }
 });
 
 // src/facades.mts
-var import_neko_scheduler, import_neko_helper, import_neko_context2, import_neko_storage, import_neko_mailer2, import_neko_config, import_clipanion, yup, import_neko_logger, import_neko_cache2, router, scheduler, db, storage, cli, httpServer, logger, mailer, queue, cache;
+var import_neko_scheduler, import_neko_helper, import_neko_context2, import_neko_storage2, import_neko_mailer2, import_neko_config, import_clipanion, yup, import_neko_logger, import_neko_cache2, import_neko_queue3, router, scheduler, db, storage, cli, httpServer, logger, mailer, queue, cache;
 var init_facades = __esm({
   "src/facades.mts"() {
     "use strict";
@@ -763,7 +778,7 @@ var init_facades = __esm({
     import_neko_scheduler = require("@devbro/neko-scheduler");
     import_neko_helper = require("@devbro/neko-helper");
     import_neko_context2 = require("@devbro/neko-context");
-    import_neko_storage = require("@devbro/neko-storage");
+    import_neko_storage2 = require("@devbro/neko-storage");
     import_neko_mailer2 = require("@devbro/neko-mailer");
     import_neko_config = require("@devbro/neko-config");
     import_clipanion = require("clipanion");
@@ -773,6 +788,7 @@ var init_facades = __esm({
     import_neko_logger = require("@devbro/neko-logger");
     init_factories();
     import_neko_cache2 = require("@devbro/neko-cache");
+    import_neko_queue3 = require("@devbro/neko-queue");
     router = (0, import_neko_helper.createSingleton)(() => new Router());
     scheduler = (0, import_neko_helper.createSingleton)(() => {
       const rc = new import_neko_scheduler.Scheduler();
@@ -786,9 +802,11 @@ var init_facades = __esm({
       return rc;
     });
     db = /* @__PURE__ */ __name((label = "default") => (0, import_neko_context2.ctx)().getOrThrow(["database", label]), "db");
-    storage = (0, import_neko_helper.createSingleton)(
-      (label = "default") => import_neko_storage.StorageFactory.create(import_neko_config.config.get(["storages", label].join(".")))
-    );
+    storage = (0, import_neko_helper.createSingleton)((label = "default") => {
+      let storage_config = import_neko_config.config.get(["storages", label].join("."));
+      const provider = import_neko_storage2.StorageProviderFactory.create(storage_config.provider, storage_config.config);
+      return new import_neko_storage2.Storage(provider);
+    });
     cli = (0, import_neko_helper.createSingleton)(() => {
       const [node, app, ...args] = process.argv;
       return new import_clipanion.Cli({
@@ -843,7 +861,7 @@ var init_facades = __esm({
     });
     mailer = (0, import_neko_helper.createSingleton)((label) => {
       const mailer_config = import_neko_config.config.get(["mailer", label].join("."));
-      let provider = MailerFactory.create(
+      const provider = MailerFactory.create(
         mailer_config.provider,
         mailer_config.config
       );
@@ -855,7 +873,8 @@ var init_facades = __esm({
       if (!queue_config) {
         throw new Error(`Queue configuration for '${label}' not found`);
       }
-      const rc = QueueFactory.create(queue_config.type, queue_config);
+      const provider = QueueTransportFactory.create(queue_config.provider, queue_config.config);
+      const rc = new import_neko_queue3.QueueConnection(provider);
       return rc;
     });
     cache = (0, import_neko_helper.createSingleton)((label) => {
@@ -864,7 +883,7 @@ var init_facades = __esm({
         throw new Error(`Cache configuration for '${label}' not found`);
       }
       const provider = CacheProviderFactory.create(
-        cache_config.type,
+        cache_config.provider,
         cache_config.config
       );
       return new import_neko_cache2.Cache(provider);
@@ -2251,14 +2270,14 @@ var init_migrate = __esm({
 });
 
 // src/app/console/StartCommand.mts
-var import_clipanion5, import_neko_config5, import_neko_sql2, StartCommand;
+var import_clipanion5, import_neko_config5, import_neko_sql, StartCommand;
 var init_StartCommand = __esm({
   "src/app/console/StartCommand.mts"() {
     "use strict";
     import_clipanion5 = require("clipanion");
     import_neko_config5 = require("@devbro/neko-config");
     init_facades();
-    import_neko_sql2 = require("@devbro/neko-sql");
+    import_neko_sql = require("@devbro/neko-sql");
     StartCommand = class extends import_clipanion5.Command {
       static {
         __name(this, "StartCommand");
@@ -2278,7 +2297,7 @@ var init_StartCommand = __esm({
         }
         logger().info(`Starting Server
 `);
-        import_neko_sql2.PostgresqlConnection.defaults.idleTimeoutMillis = 1e4;
+        import_neko_sql.PostgresqlConnection.defaults.idleTimeoutMillis = 1e4;
         if (this.scheduler || this.all) {
           logger().info(`starting scheduler
 `);
@@ -2703,12 +2722,12 @@ var DatabaseServiceProvider_exports = {};
 __export(DatabaseServiceProvider_exports, {
   DatabaseServiceProvider: () => DatabaseServiceProvider
 });
-var import_neko_sql3, import_neko_orm, import_neko_context5, import_neko_config8, DatabaseServiceProvider;
+var import_neko_sql2, import_neko_orm, import_neko_context5, import_neko_config8, DatabaseServiceProvider;
 var init_DatabaseServiceProvider = __esm({
   "src/DatabaseServiceProvider.mts"() {
     "use strict";
     init_dist();
-    import_neko_sql3 = require("@devbro/neko-sql");
+    import_neko_sql2 = require("@devbro/neko-sql");
     import_neko_orm = require("@devbro/neko-orm");
     import_neko_context5 = require("@devbro/neko-context");
     import_neko_config8 = require("@devbro/neko-config");
@@ -2745,7 +2764,7 @@ var init_DatabaseServiceProvider = __esm({
         return _DatabaseServiceProvider.instance;
       }
       async getConnection(db_config) {
-        const conn = new import_neko_sql3.PostgresqlConnection(db_config);
+        const conn = new import_neko_sql2.PostgresqlConnection(db_config);
         if (!await conn.connect()) {
           throw new Error("Failed to connect to the database");
         }

package/dist/bin/middlewares.cjs

@@ -457,7 +457,7 @@ var Router = class {
 var import_neko_scheduler = require("@devbro/neko-scheduler");
 var import_neko_helper = require("@devbro/neko-helper");
 var import_neko_context2 = require("@devbro/neko-context");
-var import_neko_storage = require("@devbro/neko-storage");
+var import_neko_storage2 = require("@devbro/neko-storage");
 var import_neko_mailer2 = require("@devbro/neko-mailer");
 var import_neko_config = require("@devbro/neko-config");
 var import_clipanion = require("clipanion");
@@ -481,31 +481,38 @@ __export(queue_exports, {
   DatabaseTransport: () => DatabaseTransport
 });
 __reExport(queue_exports, require("@devbro/neko-queue"));
-var import_neko_sql = require("@devbro/neko-sql");
 var DatabaseTransport = class {
-  constructor(db_config) {
-    this.db_config = db_config;
-  }
   static {
     __name(this, "DatabaseTransport");
   }
-  listenInterval = 6e4;
-  // default to 1 minute
-  messageLimit = 100;
-  // default to 100 messages per fetch
   activeIntervals = /* @__PURE__ */ new Set();
+  config = {
+    queue_table: "queue_messages",
+    db_connection: "default",
+    listen_interval: 60,
+    // seconds
+    message_limit: 10
+    // messages per each fetch
+  };
+  constructor(config2) {
+    this.config = { ...this.config, ...config2 };
+  }
   setListenInterval(interval) {
-    this.listenInterval = interval;
+    this.config.listen_interval = interval;
   }
   setMessageLimit(limit) {
-    this.messageLimit = limit;
+    this.config.message_limit = limit;
   }
   async dispatch(channel, message) {
-    const conn = new import_neko_sql.PostgresqlConnection(this.db_config);
+    const conn = db(this.config.db_connection);
     try {
       await conn.connect();
+      let schema = conn.getSchema();
+      if (await schema.tableExists(this.config.queue_table) === false) {
+        return;
+      }
       let q = conn.getQuery();
-      await q.table("queue_messages").insert({
+      await q.table(this.config.queue_table).insert({
         channel,
         message,
         processed: false,
@@ -521,20 +528,20 @@ var DatabaseTransport = class {
   async listen(channel, callback) {
     return new Promise(async (resolve, reject) => {
       const intervalId = setInterval(async () => {
-        const conn = new import_neko_sql.PostgresqlConnection(this.db_config);
+        const conn = db(this.config.db_connection);
         try {
           await conn.connect();
           let q = conn.getQuery();
-          let messages = await q.table("queue_messages").whereOp("channel", "=", channel).whereOp("processed", "=", false).limit(this.messageLimit).orderBy("last_tried_at", "asc").get();
+          let messages = await q.table(this.config.queue_table).whereOp("channel", "=", channel).whereOp("processed", "=", false).limit(this.config.message_limit).orderBy("last_tried_at", "asc").get();
           for (let msg of messages) {
             try {
               await callback(msg.message);
-              await q.table("queue_messages").whereOp("id", "=", msg.id).update({
+              await q.table(this.config.queue_table).whereOp("id", "=", msg.id).update({
                 processed: true,
                 updated_at: /* @__PURE__ */ new Date()
               });
             } catch (error) {
-              await q.table("queue_messages").whereOp("id", "=", msg.id).update({
+              await q.table(this.config.queue_table).whereOp("id", "=", msg.id).update({
                 processed: false,
                 last_tried_at: /* @__PURE__ */ new Date(),
                 process_message: error.message || "Error processing message"
@@ -543,11 +550,11 @@ var DatabaseTransport = class {
           }
         } catch (error) {
           this.activeIntervals.delete(intervalId);
-          reject(error);
+          logger().error("Error in DatabaseTransport listen interval:", { error });
         } finally {
           await conn.disconnect();
         }
-      }, this.listenInterval);
+      }, this.config.listen_interval * 1e3);
       this.activeIntervals.add(intervalId);
     });
   }
@@ -561,6 +568,7 @@ var DatabaseTransport = class {
 
 // src/factories.mts
 var import_neko_cache = require("@devbro/neko-cache");
+var import_neko_storage = require("@devbro/neko-storage");
 var FlexibleFactory = class {
   static {
     __name(this, "FlexibleFactory");
@@ -597,32 +605,32 @@ MailerFactory.register("logger", (opt) => {
     });
   });
 });
-MailerFactory.register("SES", (opt) => {
+MailerFactory.register("ses", (opt) => {
   return new import_neko_mailer.SESProvider(opt);
 });
-MailerFactory.register("SMTP", (opt) => {
+MailerFactory.register("smtp", (opt) => {
   return new import_neko_mailer.SMTPProvider(opt);
 });
-MailerFactory.register("MEMORY", (opt) => {
+MailerFactory.register("memory", (opt) => {
   return new import_neko_mailer.MemoryProvider();
 });
-var QueueFactory = class _QueueFactory {
+var QueueTransportFactory = class _QueueTransportFactory {
   static {
-    __name(this, "QueueFactory");
+    __name(this, "QueueTransportFactory");
   }
   static instance = new FlexibleFactory();
   static register(key, factory) {
-    _QueueFactory.instance.register(key, factory);
+    _QueueTransportFactory.instance.register(key, factory);
   }
   static create(key, ...args) {
-    return _QueueFactory.instance.create(key, ...args);
+    return _QueueTransportFactory.instance.create(key, ...args);
   }
 };
-QueueFactory.register("database", (opt) => {
+QueueTransportFactory.register("database", (opt) => {
   let transport = new DatabaseTransport(opt);
   return new import_neko_queue.QueueConnection(transport);
 });
-QueueFactory.register("memory", (opt) => {
+QueueTransportFactory.register("memory", (opt) => {
   let transport = new import_neko_queue2.MemoryTransport(opt);
   return new import_neko_queue.QueueConnection(transport);
 });
@@ -650,9 +658,16 @@ CacheProviderFactory.register("file", (opt) => {
 CacheProviderFactory.register("disabled", (opt) => {
   return new import_neko_cache.DisabledCacheProvider();
 });
+import_neko_storage.StorageProviderFactory.register("local", (opt) => {
+  return new import_neko_storage.LocalStorageProvider(opt);
+});
+import_neko_storage.StorageProviderFactory.register("s3", (opt) => {
+  return new import_neko_storage.AWSS3StorageProvider(opt);
+});
 
 // src/facades.mts
 var import_neko_cache2 = require("@devbro/neko-cache");
+var import_neko_queue3 = require("@devbro/neko-queue");
 var router = (0, import_neko_helper.createSingleton)(() => new Router());
 var scheduler = (0, import_neko_helper.createSingleton)(() => {
   const rc = new import_neko_scheduler.Scheduler();
@@ -666,9 +681,11 @@ var scheduler = (0, import_neko_helper.createSingleton)(() => {
   return rc;
 });
 var db = /* @__PURE__ */ __name((label = "default") => (0, import_neko_context2.ctx)().getOrThrow(["database", label]), "db");
-var storage = (0, import_neko_helper.createSingleton)(
-  (label = "default") => import_neko_storage.StorageFactory.create(import_neko_config.config.get(["storages", label].join(".")))
-);
+var storage = (0, import_neko_helper.createSingleton)((label = "default") => {
+  let storage_config = import_neko_config.config.get(["storages", label].join("."));
+  const provider = import_neko_storage2.StorageProviderFactory.create(storage_config.provider, storage_config.config);
+  return new import_neko_storage2.Storage(provider);
+});
 var cli = (0, import_neko_helper.createSingleton)(() => {
   const [node, app, ...args] = process.argv;
   return new import_clipanion.Cli({
@@ -723,7 +740,7 @@ var logger = (0, import_neko_helper.createSingleton)((label) => {
 });
 var mailer = (0, import_neko_helper.createSingleton)((label) => {
   const mailer_config = import_neko_config.config.get(["mailer", label].join("."));
-  let provider = MailerFactory.create(
+  const provider = MailerFactory.create(
     mailer_config.provider,
     mailer_config.config
   );
@@ -735,7 +752,8 @@ var queue = (0, import_neko_helper.createSingleton)((label) => {
   if (!queue_config) {
     throw new Error(`Queue configuration for '${label}' not found`);
   }
-  const rc = QueueFactory.create(queue_config.type, queue_config);
+  const provider = QueueTransportFactory.create(queue_config.provider, queue_config.config);
+  const rc = new import_neko_queue3.QueueConnection(provider);
   return rc;
 });
 var cache = (0, import_neko_helper.createSingleton)((label) => {
@@ -744,7 +762,7 @@ var cache = (0, import_neko_helper.createSingleton)((label) => {
     throw new Error(`Cache configuration for '${label}' not found`);
   }
   const provider = CacheProviderFactory.create(
-    cache_config.type,
+    cache_config.provider,
     cache_config.config
   );
   return new import_neko_cache2.Cache(provider);