@kohost/api-client 3.9.12 → 4.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kohost/api-client",
-  "version": "3.9.12",
+  "version": "4.0.5",
   "description": "API client, models, schemas, commands, and events for Kohost applications",
   "author": "Ian Rogers",
   "readme": "README.md",
@@ -8,20 +8,72 @@
     "type": "git",
     "url": "git+https://github.com/kohost/api-client.git"
   },
-  "main": "dist/cjs/index.js",
-  "module": "dist/esm/index.js",
-  "types": "dist/types/index.d.ts",
+  "type": "module",
+  "exports": {
+    ".": {
+      "import": "./dist/index.js",
+      "node": {
+        "types": "./dist/index.d.cts",
+        "require": "./dist/index.cjs"
+      }
+    },
+    "./models": {
+      "types": "./dist/models.d.ts",
+      "import": "./dist/models.js",
+      "require": "./dist/models.cjs"
+    },
+    "./useCases": {
+      "types": "./dist/useCases.d.ts",
+      "import": "./dist/useCases.js",
+      "require": "./dist/useCases.cjs"
+    },
+    "./errors": {
+      "types": "./dist/errors.d.ts",
+      "import": "./dist/errors.js",
+      "require": "./dist/errors.cjs"
+    },
+    "./commands": {
+      "types": "./dist/commands.d.ts",
+      "import": "./dist/commands.js",
+      "require": "./dist/commands.cjs"
+    },
+    "./events": {
+      "types": "./dist/events.d.ts",
+      "import": "./dist/events.js",
+      "require": "./dist/events.cjs"
+    },
+    "./client": {
+      "types": "./dist/client.d.ts",
+      "import": "./dist/client.js",
+      "require": "./dist/client.cjs"
+    },
+    "./socketIoClient": {
+      "types": "./dist/socketIoClient.d.ts",
+      "import": "./dist/socketIoClient.js",
+      "require": "./dist/socketIoClient.cjs"
+    }
+  },
+  "typesVersions": {
+    "*": {
+      "*": [
+        "./dist/*"
+      ]
+    }
+  },
   "scripts": {
     "test": "jest",
     "test:watch": "jest --watchAll",
     "lint": "eslint",
     "lint:fix": "eslint --fix ./",
     "prepare": "husky",
-    "build": "node scripts/build.js",
-    "build:watch": "node scripts/build.js --watch",
+    "prebuild": "npm run generate-models && npm run generate-barrels",
+    "build": "tsup",
+    "generate-models": "node scripts/generate-source-models",
+    "generate-barrels": "node scripts/generate-barrels",
     "start": "node scripts/build.js --watch",
     "clean": "rm -rf ./dist",
-    "tsc": "tsc"
+    "tsc": "tsc",
+    "tsup": "tsup"
   },
   "files": [
     "dist",
@@ -29,28 +81,26 @@
   ],
   "devDependencies": {
     "@eslint/js": "^9.7.0",
-    "dts-gen": "^0.10.2",
-    "esbuild": "^0.23.0",
+    "@types/debug": "^4.1.12",
+    "@types/events": "^3.0.3",
+    "@types/node": "^22.10.5",
+    "ajv": "^8.11.0",
+    "ajv-formats": "^3.0.1",
     "eslint": "^9.7.0",
     "eslint-config-prettier": "^9.1.0",
     "husky": "^9.0.11",
-    "json-schema-to-typescript": "^14.0.4",
     "lint-staged": "^15.0.2",
     "prettier": "^3.0.3",
+    "tsup": "^8.3.5",
     "typescript": "^5.1.6"
   },
   "dependencies": {
-    "ajv": "^8.11.0",
-    "ajv-formats": "^3.0.1",
     "amqplib": "^0.10.3",
-    "axios": "^1.6.7",
     "debug": "^4.3.4",
-    "events": "^3.3.0",
-    "nanoid": "^3.3.4",
     "socket.io-client": "^4.6.1"
   },
-  "browser": {
-    "events": "events"
+  "optionalDependencies": {
+    "@rollup/rollup-linux-x64-gnu": "4.9.5"
   },
   "lint-staged": {
     "*.js": "eslint --cache --fix",

package/dist/cjs/AMQPClient/index.js

@@ -1,239 +0,0 @@
-const Errors = require("../Errors");
-const amqp = require("amqplib");
-const crypto = require("crypto");
-const exchanges = require("../defs/amqpExchanges");
-const isFatalError = require("amqplib/lib/connection").isFatalError;
-const debug = require("debug")("kohost:amqp-client");
-
-const HEADER_KEY_ORGANIZATION_ID = "X-Organization-Id";
-const HEADER_KEY_PROPERTY_ID = "X-Property-Id";
-const HEADER_KEY_DRIVER = "X-Driver";
-const HEADER_KEY_COMMAND_NAME = "X-Command-Name";
-const HEADER_KEY_EVENT_NAME = "X-Event-Name";
-
-class KohostAMQPClient {
-  static get Message() {
-    return Message;
-  }
-
-  static get exchanges() {
-    return exchanges;
-  }
-  static generateCorrelationId() {
-    return crypto.randomUUID();
-  }
-
-  static validateMessage(message) {
-    if (!message) throw new Error("Message is required");
-  }
-
-  static parseError(err) {
-    let type;
-    let message;
-    let options = {};
-    if (err.message && err.type) {
-      const { message: errMessage, type: errType, ...rest } = err;
-      type = errType;
-      message = errMessage;
-      options = rest;
-    } else {
-      message = err.message || "Unknown Error";
-    }
-
-    debug("parseError", type, message, options);
-
-    if (type && Errors[type]) {
-      return new Errors[type](message, options);
-    }
-
-    return new Error(message, options);
-  }
-
-  static parseMessage(message) {
-    let error = null;
-    let data = {};
-    let query = {};
-    let context = {};
-    let headers = {};
-
-    const isCommand = message?.properties?.type === "Command";
-    const isEvent = message?.properties?.type === "Event";
-
-    const messageHeaders = message?.properties?.headers || {};
-
-    const commandName = messageHeaders[HEADER_KEY_COMMAND_NAME] || null;
-    const eventName = messageHeaders[HEADER_KEY_EVENT_NAME] || null;
-
-    if (message.content) {
-      try {
-        const payload =
-          message.properties?.contentType === "application/json"
-            ? JSON.parse(message.content.toString())
-            : message.content.toString();
-        data = payload?.data || {};
-        error = payload?.error;
-        query = payload?.query || {};
-        context = payload?.context || {};
-      } catch (error) {
-        debug("error parsing content", error);
-        data = message.content.toString();
-      }
-    }
-
-    if (message?.properties?.headers) {
-      const orgHeader = message.properties.headers[HEADER_KEY_ORGANIZATION_ID];
-      const propertyHeader = message.properties.headers[HEADER_KEY_PROPERTY_ID];
-      const driverHeader = message.properties.headers[HEADER_KEY_DRIVER];
-
-      if (orgHeader) {
-        context.organizationId = orgHeader;
-        headers[HEADER_KEY_ORGANIZATION_ID] = orgHeader;
-      }
-
-      if (propertyHeader) {
-        context.propertyId = propertyHeader;
-        headers[HEADER_KEY_PROPERTY_ID] = propertyHeader;
-      }
-
-      if (driverHeader) {
-        context.driver = driverHeader;
-        headers[HEADER_KEY_DRIVER] = driverHeader;
-      }
-    }
-
-    const parsed = {};
-
-    if (error) parsed.error = this.parseError(error);
-
-    parsed.data = data;
-    parsed.query = query;
-    parsed.context = context;
-    parsed.headers = headers;
-
-    if (isEvent && eventName) parsed.event = eventName;
-    else if (isCommand && commandName) parsed.command = commandName;
-
-    debug("amqp parsed %o", parsed);
-
-    return parsed;
-  }
-
-  static getMessage(message) {
-    if (!message?.content) return null;
-    const payload = JSON.parse(message.content.toString());
-    const data = payload?.data;
-    return data;
-  }
-
-  static isFatalError(err) {
-    return isFatalError(err);
-  }
-
-  async createConnection(connection, options = {}) {
-    return await amqp.connect(connection, options);
-  }
-
-  static createMessage(content) {
-    return new Message(content);
-  }
-
-  async createChannel(connection) {
-    const channel = await connection.createChannel();
-    return channel;
-  }
-
-  async assertExchange(channel, { exchange, type, options }) {
-    return await channel.assertExchange(exchange, type, options);
-  }
-
-  async assertQueue(channel, { queue, options }) {
-    return await channel.assertQueue(queue, options);
-  }
-
-  async bindQueue(channel, { queue, exchange, routingKey, args }) {
-    return await channel.bindQueue(queue, exchange, routingKey, args);
-  }
-
-  async bindExchange(channel, { source, destination, routingKey, args }) {
-    return await channel.bindExchange(destination, source, routingKey, args);
-  }
-
-  async subscribeToQueue(channel, { queue, cb, options }) {
-    return await channel.consume(queue, cb, options);
-  }
-
-  publishToExchange(channel, { exchange, routingKey, content, options }) {
-    return channel.publish(exchange, routingKey, content, options);
-  }
-}
-
-class Message {
-  constructor(content) {
-    this.toExchange = null;
-    this.content = content;
-    this.options = {
-      contentType: "application/json",
-      timestamp: Date.now(),
-    };
-    this.routingKey = "";
-  }
-
-  get correlationId() {
-    return this.options.correlationId || null;
-  }
-
-  to({ exchange }) {
-    if (typeof exchange === "undefined")
-      throw new Error("Exchange is required");
-    this.toExchange = exchange;
-    return this;
-  }
-
-  withType(type) {
-    this.options.type = type;
-    return this;
-  }
-
-  withRoutingKey(routingKey) {
-    this.routingKey = routingKey;
-    return this;
-  }
-
-  withHeaders(headers) {
-    if (!this.options.headers) this.options.headers = {};
-    this.options.headers = { ...this.options.headers, ...headers };
-    return this;
-  }
-
-  withContext(context) {
-    for (let key in context) {
-      this.withHeaders({ [key]: context[key] });
-    }
-    return this;
-  }
-
-  withCorrelationId(correlationId) {
-    this.options.correlationId = correlationId;
-    return this;
-  }
-
-  withReplyTo(queue) {
-    this.options.replyTo = queue;
-    return this;
-  }
-
-  build() {
-    let content = this.content;
-    if (content.build && typeof content.build === "function")
-      content = content.build();
-
-    return {
-      exchange: this.toExchange,
-      content: Buffer.from(JSON.stringify(content)),
-      options: this.options,
-      routingKey: this.routingKey,
-    };
-  }
-}
-
-module.exports = KohostAMQPClient;