@devbro/pashmak 0.1.18 → 0.1.19

package/dist/bin/app/console/StartCommand.cjs

@@ -458,7 +458,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");
@@ -482,31 +482,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(config3) {
+    this.config = { ...this.config, ...config3 };
+  }
   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,
@@ -522,20 +529,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"
@@ -544,11 +551,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);
     });
   }
@@ -562,6 +569,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");
@@ -598,32 +606,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);
 });
@@ -651,9 +659,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,12 @@ var scheduler = (0, import_neko_helper.createSingleton)(() => {
   });
   return rc;
 });
-var storage = (0, import_neko_helper.createSingleton)(
-  (label = "default") => import_neko_storage.StorageFactory.create(import_neko_config.config.get(["storages", label].join(".")))
-);
+var db = /* @__PURE__ */ __name((label = "default") => (0, import_neko_context2.ctx)().getOrThrow(["database", label]), "db");
+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 +741,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 +753,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,14 +763,14 @@ 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);
 });
 
 // src/app/console/StartCommand.mts
-var import_neko_sql2 = require("@devbro/neko-sql");
+var import_neko_sql = require("@devbro/neko-sql");
 var StartCommand = class extends import_clipanion2.Command {
   static {
     __name(this, "StartCommand");
@@ -771,7 +790,7 @@ var StartCommand = class extends import_clipanion2.Command {
     }
     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
 `);

package/dist/bin/app/console/generate/GenerateControllerCommand.cjs

@@ -456,7 +456,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");
@@ -480,31 +480,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(config3) {
+    this.config = { ...this.config, ...config3 };
+  }
   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,
@@ -520,20 +527,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"
@@ -542,11 +549,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);
     });
   }
@@ -560,6 +567,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");
@@ -596,32 +604,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);
 });
@@ -649,9 +657,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();
@@ -664,9 +679,12 @@ var scheduler = (0, import_neko_helper.createSingleton)(() => {
   });
   return rc;
 });
-var storage = (0, import_neko_helper.createSingleton)(
-  (label = "default") => import_neko_storage.StorageFactory.create(import_neko_config.config.get(["storages", label].join(".")))
-);
+var db = /* @__PURE__ */ __name((label = "default") => (0, import_neko_context2.ctx)().getOrThrow(["database", label]), "db");
+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({
@@ -721,7 +739,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
   );
@@ -733,7 +751,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) => {
@@ -742,7 +761,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);

package/dist/bin/app/console/generate/index.cjs

@@ -456,7 +456,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");
@@ -480,31 +480,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(config3) {
+    this.config = { ...this.config, ...config3 };
+  }
   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,
@@ -520,20 +527,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"
@@ -542,11 +549,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);
     });
   }
@@ -560,6 +567,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");
@@ -596,32 +604,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);
 });
@@ -649,9 +657,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();
@@ -664,9 +679,12 @@ var scheduler = (0, import_neko_helper.createSingleton)(() => {
   });
   return rc;
 });
-var storage = (0, import_neko_helper.createSingleton)(
-  (label = "default") => import_neko_storage.StorageFactory.create(import_neko_config.config.get(["storages", label].join(".")))
-);
+var db = /* @__PURE__ */ __name((label = "default") => (0, import_neko_context2.ctx)().getOrThrow(["database", label]), "db");
+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({
@@ -721,7 +739,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
   );
@@ -733,7 +751,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) => {
@@ -742,7 +761,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);