@devbro/pashmak 0.1.10 → 0.1.12

package/dist/bin/middlewares.cjs

@@ -41,6 +41,9 @@ module.exports = __toCommonJS(middlewares_exports);
 var import_neko_context = require("@devbro/neko-context");
 var import_errors = require("@devbro/neko-http/errors");
 
+// ../neko-router/dist/CompiledRoute.mjs
+var import_stream = require("stream");
+
 // ../neko-router/dist/Middleware.mjs
 var Middleware = class {
   static {
@@ -118,6 +121,9 @@ var CompiledRoute = class {
       if (typeof value.toJson === "function") {
         return traverse(value.toJson());
       }
+      if (typeof value.toJSON === "function") {
+        return traverse(value.toJSON());
+      }
       if (Array.isArray(value)) {
         return value.map(traverse);
       }
@@ -142,7 +148,7 @@ var CompiledRoute = class {
     }
     return String(obj);
   }
-  processResponseBody(res, controller_rc) {
+  async processResponseBody(res, controller_rc) {
     if (controller_rc && res.writableEnded) {
       throw new Error("cannot write to response, response has already ended");
     }
@@ -151,18 +157,36 @@ var CompiledRoute = class {
     }
     if (controller_rc) {
       const header_content_type = res.getHeader("Content-Type");
-      if (!header_content_type && typeof controller_rc === "object") {
+      if (controller_rc instanceof import_stream.Stream || Buffer.isBuffer(controller_rc)) {
+        await this.writeAsync(res, controller_rc);
+        res.end();
+      } else if (!header_content_type && typeof controller_rc === "object") {
         res.setHeader("Content-Type", "application/json");
+        res.end(this.convertToString(controller_rc));
       } else if (!header_content_type) {
         res.setHeader("Content-Type", "text/plain");
+        res.end(this.convertToString(controller_rc));
+      } else {
+        res.end(this.convertToString(controller_rc));
       }
-      res.end(this.convertToString(controller_rc));
       return;
     } else {
       res.statusCode = [200].includes(res.statusCode) ? 204 : res.statusCode;
       res.end();
     }
   }
+  async writeAsync(res, chunk) {
+    return new Promise((resolve, reject) => {
+      const ok = res.write(chunk, (err) => {
+        if (err) reject(err);
+      });
+      if (ok) {
+        resolve(0);
+      } else {
+        res.once("drain", resolve);
+      }
+    });
+  }
   async runMiddlewares(middlewares, req, res) {
     let index = 0;
     const me = this;
@@ -220,7 +244,7 @@ var Route = class {
         i = start;
       } else if (char === "*") {
         let start = i + 1;
-        while (start < path2.length && /[a-zA-Z0-9_]/.test(path2[start])) {
+        while (start < path2.length && /[a-zA-Z0-9_\.]/.test(path2[start])) {
           start++;
         }
         tokens.push({ type: "WILDCARD", value: path2.slice(i + 1, start) });
@@ -290,6 +314,10 @@ var Route = class {
       params: r.groups || {}
     };
   }
+  prependMiddleware(middlewares) {
+    this.middlewares = [].concat(middlewares, this.middlewares);
+    return this;
+  }
   addMiddleware(middlewares) {
     this.middlewares = this.middlewares.concat(middlewares);
     return this;
@@ -304,6 +332,62 @@ var Route = class {
 
 // ../neko-router/dist/Router.mjs
 var import_path = __toESM(require("path"), 1);
+
+// ../node_modules/url-join/lib/url-join.js
+function normalize(strArray) {
+  var resultArray = [];
+  if (strArray.length === 0) {
+    return "";
+  }
+  if (typeof strArray[0] !== "string") {
+    throw new TypeError("Url must be a string. Received " + strArray[0]);
+  }
+  if (strArray[0].match(/^[^/:]+:\/*$/) && strArray.length > 1) {
+    var first = strArray.shift();
+    strArray[0] = first + strArray[0];
+  }
+  if (strArray[0].match(/^file:\/\/\//)) {
+    strArray[0] = strArray[0].replace(/^([^/:]+):\/*/, "$1:///");
+  } else {
+    strArray[0] = strArray[0].replace(/^([^/:]+):\/*/, "$1://");
+  }
+  for (var i = 0; i < strArray.length; i++) {
+    var component = strArray[i];
+    if (typeof component !== "string") {
+      throw new TypeError("Url must be a string. Received " + component);
+    }
+    if (component === "") {
+      continue;
+    }
+    if (i > 0) {
+      component = component.replace(/^[\/]+/, "");
+    }
+    if (i < strArray.length - 1) {
+      component = component.replace(/[\/]+$/, "");
+    } else {
+      component = component.replace(/[\/]+$/, "/");
+    }
+    resultArray.push(component);
+  }
+  var str = resultArray.join("/");
+  str = str.replace(/\/(\?|&|#[^!])/g, "$1");
+  var parts = str.split("?");
+  str = parts.shift() + (parts.length > 0 ? "?" : "") + parts.join("&");
+  return str;
+}
+__name(normalize, "normalize");
+function urlJoin() {
+  var input;
+  if (typeof arguments[0] === "object") {
+    input = arguments[0];
+  } else {
+    input = [].slice.call(arguments);
+  }
+  return normalize(input);
+}
+__name(urlJoin, "urlJoin");
+
+// ../neko-router/dist/Router.mjs
 var Router = class {
   static {
     __name(this, "Router");
@@ -328,6 +412,12 @@ var Router = class {
       }).addMiddleware([...controller.baseMiddlewares, ...route.middlewares]);
     }
   }
+  addRouter(path2, router2) {
+    for (const route of router2.routes) {
+      let path22 = urlJoin("/", path2, route.path);
+      this.addRoute(route.methods, path22, route.handler).addMiddleware(router2.getMiddlewares()).addMiddleware(route.getMiddlewares());
+    }
+  }
   addGlobalMiddleware(middlewares) {
     this.middlewares = this.middlewares.concat(middlewares);
   }
@@ -368,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");
 
@@ -379,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();
@@ -449,27 +686,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}`
-    );
-  }
-  const rc = new import_neko_mailer.Mailer(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 = await QueueFactory.create(queue_config.type, queue_config);
   return rc;
 });
 

package/dist/bin/queue.cjs

@@ -0,0 +1,99 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/queue.mts
+var queue_exports = {};
+__export(queue_exports, {
+  DatabaseTransport: () => DatabaseTransport
+});
+module.exports = __toCommonJS(queue_exports);
+__reExport(queue_exports, require("@devbro/neko-queue"), module.exports);
+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);
+    });
+  }
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  DatabaseTransport,
+  ...require("@devbro/neko-queue")
+});

package/dist/bin/router.cjs

@@ -54,6 +54,9 @@ module.exports = __toCommonJS(router_exports);
 var import_neko_context = require("@devbro/neko-context");
 var import_errors = require("@devbro/neko-http/errors");
 
+// ../neko-router/dist/CompiledRoute.mjs
+var import_stream = require("stream");
+
 // ../neko-router/dist/Middleware.mjs
 var Middleware = class {
   static {
@@ -131,6 +134,9 @@ var CompiledRoute = class {
       if (typeof value.toJson === "function") {
         return traverse(value.toJson());
       }
+      if (typeof value.toJSON === "function") {
+        return traverse(value.toJSON());
+      }
       if (Array.isArray(value)) {
         return value.map(traverse);
       }
@@ -155,7 +161,7 @@ var CompiledRoute = class {
     }
     return String(obj);
   }
-  processResponseBody(res, controller_rc) {
+  async processResponseBody(res, controller_rc) {
     if (controller_rc && res.writableEnded) {
       throw new Error("cannot write to response, response has already ended");
     }
@@ -164,18 +170,36 @@ var CompiledRoute = class {
     }
     if (controller_rc) {
       const header_content_type = res.getHeader("Content-Type");
-      if (!header_content_type && typeof controller_rc === "object") {
+      if (controller_rc instanceof import_stream.Stream || Buffer.isBuffer(controller_rc)) {
+        await this.writeAsync(res, controller_rc);
+        res.end();
+      } else if (!header_content_type && typeof controller_rc === "object") {
         res.setHeader("Content-Type", "application/json");
+        res.end(this.convertToString(controller_rc));
       } else if (!header_content_type) {
         res.setHeader("Content-Type", "text/plain");
+        res.end(this.convertToString(controller_rc));
+      } else {
+        res.end(this.convertToString(controller_rc));
       }
-      res.end(this.convertToString(controller_rc));
       return;
     } else {
       res.statusCode = [200].includes(res.statusCode) ? 204 : res.statusCode;
       res.end();
     }
   }
+  async writeAsync(res, chunk) {
+    return new Promise((resolve, reject) => {
+      const ok = res.write(chunk, (err) => {
+        if (err) reject(err);
+      });
+      if (ok) {
+        resolve(0);
+      } else {
+        res.once("drain", resolve);
+      }
+    });
+  }
   async runMiddlewares(middlewares, req, res) {
     let index = 0;
     const me = this;
@@ -336,7 +360,7 @@ var Route = class {
         i = start;
       } else if (char === "*") {
         let start = i + 1;
-        while (start < path2.length && /[a-zA-Z0-9_]/.test(path2[start])) {
+        while (start < path2.length && /[a-zA-Z0-9_\.]/.test(path2[start])) {
           start++;
         }
         tokens.push({ type: "WILDCARD", value: path2.slice(i + 1, start) });
@@ -406,6 +430,10 @@ var Route = class {
       params: r.groups || {}
     };
   }
+  prependMiddleware(middlewares) {
+    this.middlewares = [].concat(middlewares, this.middlewares);
+    return this;
+  }
   addMiddleware(middlewares) {
     this.middlewares = this.middlewares.concat(middlewares);
     return this;
@@ -420,6 +448,62 @@ var Route = class {
 
 // ../neko-router/dist/Router.mjs
 var import_path = __toESM(require("path"), 1);
+
+// ../node_modules/url-join/lib/url-join.js
+function normalize(strArray) {
+  var resultArray = [];
+  if (strArray.length === 0) {
+    return "";
+  }
+  if (typeof strArray[0] !== "string") {
+    throw new TypeError("Url must be a string. Received " + strArray[0]);
+  }
+  if (strArray[0].match(/^[^/:]+:\/*$/) && strArray.length > 1) {
+    var first = strArray.shift();
+    strArray[0] = first + strArray[0];
+  }
+  if (strArray[0].match(/^file:\/\/\//)) {
+    strArray[0] = strArray[0].replace(/^([^/:]+):\/*/, "$1:///");
+  } else {
+    strArray[0] = strArray[0].replace(/^([^/:]+):\/*/, "$1://");
+  }
+  for (var i = 0; i < strArray.length; i++) {
+    var component = strArray[i];
+    if (typeof component !== "string") {
+      throw new TypeError("Url must be a string. Received " + component);
+    }
+    if (component === "") {
+      continue;
+    }
+    if (i > 0) {
+      component = component.replace(/^[\/]+/, "");
+    }
+    if (i < strArray.length - 1) {
+      component = component.replace(/[\/]+$/, "");
+    } else {
+      component = component.replace(/[\/]+$/, "/");
+    }
+    resultArray.push(component);
+  }
+  var str = resultArray.join("/");
+  str = str.replace(/\/(\?|&|#[^!])/g, "$1");
+  var parts = str.split("?");
+  str = parts.shift() + (parts.length > 0 ? "?" : "") + parts.join("&");
+  return str;
+}
+__name(normalize, "normalize");
+function urlJoin() {
+  var input;
+  if (typeof arguments[0] === "object") {
+    input = arguments[0];
+  } else {
+    input = [].slice.call(arguments);
+  }
+  return normalize(input);
+}
+__name(urlJoin, "urlJoin");
+
+// ../neko-router/dist/Router.mjs
 var Router = class {
   static {
     __name(this, "Router");
@@ -444,6 +528,12 @@ var Router = class {
       }).addMiddleware([...controller.baseMiddlewares, ...route.middlewares]);
     }
   }
+  addRouter(path2, router) {
+    for (const route of router.routes) {
+      let path22 = urlJoin("/", path2, route.path);
+      this.addRoute(route.methods, path22, route.handler).addMiddleware(router.getMiddlewares()).addMiddleware(route.getMiddlewares());
+    }
+  }
   addGlobalMiddleware(middlewares) {
     this.middlewares = this.middlewares.concat(middlewares);
   }
@@ -505,7 +595,7 @@ function Model(model, paramName) {
   return createParamDecorator(async () => {
     let rc = await model.find((0, import_neko_context.ctx)().get("request").params[paramName]);
     if (!rc) {
-      throw new import_errors.HttpNotFoundError("Object not found");
+      throw new import_errors.HttpNotFoundError("Object not found", "OBJECT_NOT_FOUND");
     }
     return rc;
   });

package/dist/facades.d.mts

@@ -7,6 +7,7 @@ import { Storage } from '@devbro/neko-storage';
 import { Mailer } from '@devbro/neko-mailer';
 import { HttpServer } from '@devbro/neko-http';
 import { Logger } from '@devbro/neko-logger';
+import { QueueConnection } from '@devbro/neko-queue';
 
 declare const router: (label?: string, ...args: any[]) => Router;
 declare const scheduler: (label?: string, ...args: any[]) => Scheduler;
@@ -16,5 +17,6 @@ declare const cli: (label?: string, ...args: any[]) => Cli<clipanion.BaseContext
 declare const httpServer: (label?: string, ...args: any[]) => HttpServer;
 declare const logger: (label?: string, ...args: any[]) => Logger;
 declare const mailer: (label?: string, ...args: any[]) => Mailer;
+declare const queue: (label?: string, ...args: any[]) => Promise<QueueConnection<any>>;
 
-export { cli, db, httpServer, logger, mailer, router, scheduler, storage };
+export { cli, db, httpServer, logger, mailer, queue, router, scheduler, storage };