@devbro/pashmak 0.1.11 → 0.1.12

package/dist/app/console/migrate/make_migration.tpl

@@ -3,13 +3,13 @@ import { Schema, Blueprint } from "@devbro/pashmak/sql";
 
 export default class {{className}} extends Migration {
   async up(schema: Schema) {
-    // await schema.createTable("{{tableName}}", (table: Blueprint) => {
-    //   table.id();
-    //   table.timestamps();
-    // });
+    await schema.createTable("{{tableName}}", (table: Blueprint) => {
+      table.id();
+      table.timestamps();
+    });
   }
 
   async down(schema: Schema) {
-    // await schema.dropTable("{{tableName}}");
+    await schema.dropTableIfExists("{{tableName}}");
   }
 }

package/dist/app/console/queue/GenerateMigrateCommand.d.mts

@@ -0,0 +1,9 @@
+import { Command } from 'clipanion';
+
+declare class GenerateMigrateCommand extends Command {
+    static paths: string[][];
+    name: string;
+    execute(): Promise<void>;
+}
+
+export { GenerateMigrateCommand };

package/dist/app/console/queue/GenerateMigrateCommand.mjs

@@ -0,0 +1,51 @@
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+import { cli } from "../../../facades.mjs";
+import { Command, Option } from "clipanion";
+import { Case } from "change-case-all";
+import path from "path";
+import * as fs from "fs/promises";
+import { config } from "@devbro/neko-config";
+import handlebars from "handlebars";
+import { fileURLToPath } from "url";
+class GenerateMigrateCommand extends Command {
+  static {
+    __name(this, "GenerateMigrateCommand");
+  }
+  static paths = [[`generate`, `queue`, "migration"]];
+  name = Option.String({ required: true });
+  async execute() {
+    const date = /* @__PURE__ */ new Date();
+    const year = date.getFullYear();
+    const month = String(date.getMonth() + 1).padStart(2, "0");
+    const day = String(date.getDate()).padStart(2, "0");
+    const secondsOfDay = String(
+      date.getHours() * 3600 + date.getMinutes() * 60 + date.getSeconds()
+    ).padStart(5, "0");
+    const fixed_name = "queue_messages";
+    const filename = `${year}_${month}_${day}_${secondsOfDay}_${fixed_name}.ts`;
+    this.context.stdout.write(`creating migration file ${filename}
+`);
+    await fs.mkdir(config.get("migration.path"), { recursive: true });
+    let dirname = typeof __dirname === "string" ? __dirname : void 0;
+    if (!dirname) {
+      dirname = path.dirname(fileURLToPath(import.meta.url));
+    }
+    const compiledTemplate = handlebars.compile(
+      (await fs.readFile(path.join(dirname, "./queue_migration.tpl"))).toString()
+    );
+    const template = await compiledTemplate({
+      className: Case.pascal(this.name) + "Migration",
+      tableName: Case.snake(this.name)
+    });
+    await fs.writeFile(
+      path.join(config.get("migration.path"), filename),
+      template
+    );
+  }
+}
+cli().register(GenerateMigrateCommand);
+export {
+  GenerateMigrateCommand
+};
+//# sourceMappingURL=GenerateMigrateCommand.mjs.map

package/dist/app/console/queue/GenerateMigrateCommand.mjs.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../src/app/console/queue/GenerateMigrateCommand.mts"],"sourcesContent":["import { cli } from \"../../../facades.mjs\";\nimport { Command, Option } from \"clipanion\";\nimport { Case } from \"change-case-all\";\nimport path from \"path\";\nimport * as fs from \"fs/promises\";\nimport { config } from \"@devbro/neko-config\";\nimport handlebars from \"handlebars\";\nimport { fileURLToPath } from \"url\";\nimport { table } from \"console\";\n\nexport class GenerateMigrateCommand extends Command {\n  static paths = [[`generate`, `queue`, \"migration\"]];\n\n  name = Option.String({ required: true });\n\n  async execute() {\n    const date = new Date();\n    const year = date.getFullYear();\n    const month = String(date.getMonth() + 1).padStart(2, \"0\");\n    const day = String(date.getDate()).padStart(2, \"0\");\n    const secondsOfDay = String(\n      date.getHours() * 3600 + date.getMinutes() * 60 + date.getSeconds(),\n    ).padStart(5, \"0\");\n\n    const fixed_name = \"queue_messages\";\n    const filename = `${year}_${month}_${day}_${secondsOfDay}_${fixed_name}.ts`;\n    this.context.stdout.write(`creating migration file ${filename}\\n`);\n\n    await fs.mkdir(config.get(\"migration.path\"), { recursive: true });\n\n    let dirname = typeof __dirname === \"string\" ? __dirname : undefined;\n    if (!dirname) {\n      dirname = path.dirname(fileURLToPath(import.meta.url));\n    }\n\n    const compiledTemplate = handlebars.compile(\n      (\n        await fs.readFile(path.join(dirname, \"./queue_migration.tpl\"))\n      ).toString(),\n    );\n    const template = await compiledTemplate({\n      className: Case.pascal(this.name) + \"Migration\",\n      tableName: Case.snake(this.name),\n    });\n\n    await fs.writeFile(\n      path.join(config.get(\"migration.path\"), filename),\n      template,\n    );\n  }\n}\n\ncli().register(GenerateMigrateCommand);\n"],"mappings":";;AAAA,SAAS,WAAW;AACpB,SAAS,SAAS,cAAc;AAChC,SAAS,YAAY;AACrB,OAAO,UAAU;AACjB,YAAY,QAAQ;AACpB,SAAS,cAAc;AACvB,OAAO,gBAAgB;AACvB,SAAS,qBAAqB;AAGvB,MAAM,+BAA+B,QAAQ;AAAA,EAVpD,OAUoD;AAAA;AAAA;AAAA,EAClD,OAAO,QAAQ,CAAC,CAAC,YAAY,SAAS,WAAW,CAAC;AAAA,EAElD,OAAO,OAAO,OAAO,EAAE,UAAU,KAAK,CAAC;AAAA,EAEvC,MAAM,UAAU;AACd,UAAM,OAAO,oBAAI,KAAK;AACtB,UAAM,OAAO,KAAK,YAAY;AAC9B,UAAM,QAAQ,OAAO,KAAK,SAAS,IAAI,CAAC,EAAE,SAAS,GAAG,GAAG;AACzD,UAAM,MAAM,OAAO,KAAK,QAAQ,CAAC,EAAE,SAAS,GAAG,GAAG;AAClD,UAAM,eAAe;AAAA,MACnB,KAAK,SAAS,IAAI,OAAO,KAAK,WAAW,IAAI,KAAK,KAAK,WAAW;AAAA,IACpE,EAAE,SAAS,GAAG,GAAG;AAEjB,UAAM,aAAa;AACnB,UAAM,WAAW,GAAG,IAAI,IAAI,KAAK,IAAI,GAAG,IAAI,YAAY,IAAI,UAAU;AACtE,SAAK,QAAQ,OAAO,MAAM,2BAA2B,QAAQ;AAAA,CAAI;AAEjE,UAAM,GAAG,MAAM,OAAO,IAAI,gBAAgB,GAAG,EAAE,WAAW,KAAK,CAAC;AAEhE,QAAI,UAAU,OAAO,cAAc,WAAW,YAAY;AAC1D,QAAI,CAAC,SAAS;AACZ,gBAAU,KAAK,QAAQ,cAAc,YAAY,GAAG,CAAC;AAAA,IACvD;AAEA,UAAM,mBAAmB,WAAW;AAAA,OAEhC,MAAM,GAAG,SAAS,KAAK,KAAK,SAAS,uBAAuB,CAAC,GAC7D,SAAS;AAAA,IACb;AACA,UAAM,WAAW,MAAM,iBAAiB;AAAA,MACtC,WAAW,KAAK,OAAO,KAAK,IAAI,IAAI;AAAA,MACpC,WAAW,KAAK,MAAM,KAAK,IAAI;AAAA,IACjC,CAAC;AAED,UAAM,GAAG;AAAA,MACP,KAAK,KAAK,OAAO,IAAI,gBAAgB,GAAG,QAAQ;AAAA,MAChD;AAAA,IACF;AAAA,EACF;AACF;AAEA,IAAI,EAAE,SAAS,sBAAsB;","names":[]}

package/dist/app/console/queue/queue_migration.tpl

@@ -0,0 +1,19 @@
+import { Migration } from '@devbro/pashmak/sql';
+import { Schema, Blueprint } from "@devbro/pashmak/sql";
+
+export default class {{className}} extends Migration {
+  async up(schema: Schema) {
+    await schema.createTable("{{tableName}}", (table: Blueprint) => {
+      table.id();
+      table.timestamps();
+      table.string('channel');
+      table.text('message');
+      table.datetimeTz('last_tried_at').nullable(true);
+      table.text('process_message').default('');
+    });
+  }
+
+  async down(schema: Schema) {
+    await schema.dropTableIfExists("{{tableName}}");
+  }
+}

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

@@ -458,7 +458,7 @@ 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_mailer = require("@devbro/neko-mailer");
+var import_neko_mailer2 = require("@devbro/neko-mailer");
 var import_neko_config = require("@devbro/neko-config");
 var import_clipanion = require("clipanion");
 
@@ -469,6 +469,153 @@ __reExport(http_exports, require("@devbro/neko-http"));
 // src/facades.mts
 var yup = __toESM(require("yup"), 1);
 var import_neko_logger = require("@devbro/neko-logger");
+
+// src/factories.mts
+var import_neko_mailer = require("@devbro/neko-mailer");
+var import_neko_queue = require("@devbro/neko-queue");
+var import_neko_queue2 = require("@devbro/neko-queue");
+
+// src/queue.mts
+var queue_exports = {};
+__export(queue_exports, {
+  DatabaseTransport: () => DatabaseTransport
+});
+__reExport(queue_exports, require("@devbro/neko-queue"));
+var import_neko_sql = require("@devbro/neko-sql");
+var DatabaseTransport = class {
+  // default to 100 messages per fetch
+  constructor(db_config) {
+    this.db_config = db_config;
+  }
+  static {
+    __name(this, "DatabaseTransport");
+  }
+  listenInterval = 6e4;
+  // default to 1 minute
+  messageLimit = 100;
+  setListenInterval(interval) {
+    this.listenInterval = interval;
+  }
+  setMessageLimit(limit) {
+    this.messageLimit = limit;
+  }
+  async dispatch(channel, message) {
+    const conn = new import_neko_sql.PostgresqlConnection(this.db_config);
+    try {
+      await conn.connect();
+      let q = conn.getQuery();
+      await q.table("queue_messages").insert({
+        channel,
+        message,
+        processed: false,
+        created_at: /* @__PURE__ */ new Date(),
+        updated_at: /* @__PURE__ */ new Date(),
+        last_tried_at: null,
+        process_message: ""
+      });
+    } finally {
+      await conn.disconnect();
+    }
+  }
+  async listen(channel, callback) {
+    return new Promise(async (resolve, reject) => {
+      setInterval(async () => {
+        const conn = new import_neko_sql.PostgresqlConnection(this.db_config);
+        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();
+          for (let msg of messages) {
+            try {
+              await callback(msg.message);
+              await q.table("queue_messages").whereOp("id", "=", msg.id).update({
+                processed: true,
+                updated_at: /* @__PURE__ */ new Date()
+              });
+            } catch (error) {
+              await q.table("queue_messages").whereOp("id", "=", msg.id).update({
+                processed: false,
+                last_tried_at: /* @__PURE__ */ new Date(),
+                process_message: error.message || "Error processing message"
+              });
+            }
+          }
+        } finally {
+          await conn.disconnect();
+        }
+      }, this.listenInterval);
+    });
+  }
+};
+
+// src/factories.mts
+var FlexibleFactory = class {
+  static {
+    __name(this, "FlexibleFactory");
+  }
+  registry = /* @__PURE__ */ new Map();
+  register(key, ctor) {
+    this.registry.set(key, ctor);
+  }
+  create(key, ...args) {
+    const ctor = this.registry.get(key);
+    if (!ctor) {
+      throw new Error(`No factory registered for key: ${key}`);
+    }
+    return new ctor(...args);
+  }
+};
+var MailerFactory = class _MailerFactory {
+  static {
+    __name(this, "MailerFactory");
+  }
+  static instance = new FlexibleFactory();
+  static register(key, factory) {
+    _MailerFactory.instance.register(key, factory);
+  }
+  static create(key, ...args) {
+    return _MailerFactory.instance.create(key, ...args);
+  }
+};
+MailerFactory.register("logger", (opt) => {
+  return new import_neko_mailer.FunctionProvider((mail) => {
+    logger().info({
+      msg: "Sending email",
+      mail
+    });
+  });
+});
+MailerFactory.register("SES", (opt) => {
+  return new import_neko_mailer.SESProvider(opt);
+});
+MailerFactory.register("SMTP", (opt) => {
+  return new import_neko_mailer.SMTPProvider(opt);
+});
+MailerFactory.register("MEMORY", (opt) => {
+  return new import_neko_mailer.MemoryProvider();
+});
+var QueueFactory = class _QueueFactory {
+  static {
+    __name(this, "QueueFactory");
+  }
+  static instance = new FlexibleFactory();
+  static register(key, factory) {
+    _QueueFactory.instance.register(key, factory);
+  }
+  static create(key, ...args) {
+    return _QueueFactory.instance.create(key, ...args);
+  }
+};
+QueueFactory.register("database", (opt) => {
+  let transport = new DatabaseTransport(opt);
+  return new import_neko_queue.QueueConnection(transport);
+});
+QueueFactory.register("memory", (opt) => {
+  let transport = new import_neko_queue2.MemoryTransport(opt);
+  return new import_neko_queue.QueueConnection(transport);
+});
+
+// src/facades.mts
 var router = (0, import_neko_helper.createSingleton)(() => new Router());
 var scheduler = (0, import_neko_helper.createSingleton)(() => {
   const rc = new import_neko_scheduler.Scheduler();
@@ -538,27 +685,19 @@ 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;
-  if (mailer_config.provider === "logger") {
-    provider = new import_neko_mailer.FunctionProvider((mail) => {
-      logger().info({
-        msg: "Sending email",
-        mail
-      });
-    });
-  } else if (mailer_config.provider === "SES") {
-    provider = new import_neko_mailer.SESProvider(mailer_config.config);
-  } else if (mailer_config.provider === "SMTP") {
-    provider = new import_neko_mailer.SMTPProvider(mailer_config.config);
-  } else if (mailer_config.provider === "MEMORY") {
-    provider = new import_neko_mailer.MemoryProvider();
-  }
-  if (!provider) {
-    throw new Error(
-      `cannot initiate mailer provider: ${mailer_config?.provider}`
-    );
+  let provider = MailerFactory.create(
+    mailer_config.provider,
+    mailer_config.config
+  );
+  const rc = new import_neko_mailer2.Mailer(provider);
+  return rc;
+});
+var queue = (0, import_neko_helper.createSingleton)(async (label) => {
+  const queue_config = import_neko_config.config.get(["queues", label].join("."));
+  if (!queue_config) {
+    throw new Error(`Queue configuration for '${label}' not found`);
   }
-  const rc = new import_neko_mailer.Mailer(provider);
+  const rc = await QueueFactory.create(queue_config.type, queue_config);
   return rc;
 });
 

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

@@ -461,7 +461,7 @@ 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_mailer = require("@devbro/neko-mailer");
+var import_neko_mailer2 = require("@devbro/neko-mailer");
 var import_neko_config = require("@devbro/neko-config");
 var import_clipanion = require("clipanion");
 
@@ -472,6 +472,153 @@ __reExport(http_exports, require("@devbro/neko-http"));
 // src/facades.mts
 var yup = __toESM(require("yup"), 1);
 var import_neko_logger = require("@devbro/neko-logger");
+
+// src/factories.mts
+var import_neko_mailer = require("@devbro/neko-mailer");
+var import_neko_queue = require("@devbro/neko-queue");
+var import_neko_queue2 = require("@devbro/neko-queue");
+
+// src/queue.mts
+var queue_exports = {};
+__export(queue_exports, {
+  DatabaseTransport: () => DatabaseTransport
+});
+__reExport(queue_exports, require("@devbro/neko-queue"));
+var import_neko_sql = require("@devbro/neko-sql");
+var DatabaseTransport = class {
+  // default to 100 messages per fetch
+  constructor(db_config) {
+    this.db_config = db_config;
+  }
+  static {
+    __name(this, "DatabaseTransport");
+  }
+  listenInterval = 6e4;
+  // default to 1 minute
+  messageLimit = 100;
+  setListenInterval(interval) {
+    this.listenInterval = interval;
+  }
+  setMessageLimit(limit) {
+    this.messageLimit = limit;
+  }
+  async dispatch(channel, message) {
+    const conn = new import_neko_sql.PostgresqlConnection(this.db_config);
+    try {
+      await conn.connect();
+      let q = conn.getQuery();
+      await q.table("queue_messages").insert({
+        channel,
+        message,
+        processed: false,
+        created_at: /* @__PURE__ */ new Date(),
+        updated_at: /* @__PURE__ */ new Date(),
+        last_tried_at: null,
+        process_message: ""
+      });
+    } finally {
+      await conn.disconnect();
+    }
+  }
+  async listen(channel, callback) {
+    return new Promise(async (resolve, reject) => {
+      setInterval(async () => {
+        const conn = new import_neko_sql.PostgresqlConnection(this.db_config);
+        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();
+          for (let msg of messages) {
+            try {
+              await callback(msg.message);
+              await q.table("queue_messages").whereOp("id", "=", msg.id).update({
+                processed: true,
+                updated_at: /* @__PURE__ */ new Date()
+              });
+            } catch (error) {
+              await q.table("queue_messages").whereOp("id", "=", msg.id).update({
+                processed: false,
+                last_tried_at: /* @__PURE__ */ new Date(),
+                process_message: error.message || "Error processing message"
+              });
+            }
+          }
+        } finally {
+          await conn.disconnect();
+        }
+      }, this.listenInterval);
+    });
+  }
+};
+
+// src/factories.mts
+var FlexibleFactory = class {
+  static {
+    __name(this, "FlexibleFactory");
+  }
+  registry = /* @__PURE__ */ new Map();
+  register(key, ctor) {
+    this.registry.set(key, ctor);
+  }
+  create(key, ...args) {
+    const ctor = this.registry.get(key);
+    if (!ctor) {
+      throw new Error(`No factory registered for key: ${key}`);
+    }
+    return new ctor(...args);
+  }
+};
+var MailerFactory = class _MailerFactory {
+  static {
+    __name(this, "MailerFactory");
+  }
+  static instance = new FlexibleFactory();
+  static register(key, factory) {
+    _MailerFactory.instance.register(key, factory);
+  }
+  static create(key, ...args) {
+    return _MailerFactory.instance.create(key, ...args);
+  }
+};
+MailerFactory.register("logger", (opt) => {
+  return new import_neko_mailer.FunctionProvider((mail) => {
+    logger().info({
+      msg: "Sending email",
+      mail
+    });
+  });
+});
+MailerFactory.register("SES", (opt) => {
+  return new import_neko_mailer.SESProvider(opt);
+});
+MailerFactory.register("SMTP", (opt) => {
+  return new import_neko_mailer.SMTPProvider(opt);
+});
+MailerFactory.register("MEMORY", (opt) => {
+  return new import_neko_mailer.MemoryProvider();
+});
+var QueueFactory = class _QueueFactory {
+  static {
+    __name(this, "QueueFactory");
+  }
+  static instance = new FlexibleFactory();
+  static register(key, factory) {
+    _QueueFactory.instance.register(key, factory);
+  }
+  static create(key, ...args) {
+    return _QueueFactory.instance.create(key, ...args);
+  }
+};
+QueueFactory.register("database", (opt) => {
+  let transport = new DatabaseTransport(opt);
+  return new import_neko_queue.QueueConnection(transport);
+});
+QueueFactory.register("memory", (opt) => {
+  let transport = new import_neko_queue2.MemoryTransport(opt);
+  return new import_neko_queue.QueueConnection(transport);
+});
+
+// src/facades.mts
 var router = (0, import_neko_helper.createSingleton)(() => new Router());
 var scheduler = (0, import_neko_helper.createSingleton)(() => {
   const rc = new import_neko_scheduler.Scheduler();
@@ -541,27 +688,19 @@ 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;
-  if (mailer_config.provider === "logger") {
-    provider = new import_neko_mailer.FunctionProvider((mail) => {
-      logger().info({
-        msg: "Sending email",
-        mail
-      });
-    });
-  } else if (mailer_config.provider === "SES") {
-    provider = new import_neko_mailer.SESProvider(mailer_config.config);
-  } else if (mailer_config.provider === "SMTP") {
-    provider = new import_neko_mailer.SMTPProvider(mailer_config.config);
-  } else if (mailer_config.provider === "MEMORY") {
-    provider = new import_neko_mailer.MemoryProvider();
-  }
-  if (!provider) {
-    throw new Error(
-      `cannot initiate mailer provider: ${mailer_config?.provider}`
-    );
+  let provider = MailerFactory.create(
+    mailer_config.provider,
+    mailer_config.config
+  );
+  const rc = new import_neko_mailer2.Mailer(provider);
+  return rc;
+});
+var queue = (0, import_neko_helper.createSingleton)(async (label) => {
+  const queue_config = import_neko_config.config.get(["queues", label].join("."));
+  if (!queue_config) {
+    throw new Error(`Queue configuration for '${label}' not found`);
   }
-  const rc = new import_neko_mailer.Mailer(provider);
+  const rc = await QueueFactory.create(queue_config.type, queue_config);
   return rc;
 });