@fedify/amqp 1.8.1-pr.347.1259 → 1.8.1-pr.348.1271

package/deno.json

@@ -1,10 +1,10 @@
 {
   "name": "@fedify/amqp",
-  "version": "1.8.1-pr.347.1259+fed6c010",
+  "version": "1.8.1-pr.348.1271+7aea35ed",
   "license": "MIT",
   "exports": {
-    ".": "./mod.ts",
-    "./mq": "./mq.ts"
+    ".": "./src/mod.ts",
+    "./mq": "./src/mq.ts"
   },
   "imports": {
     "@alinea/suite": "jsr:@alinea/suite@^0.6.3"

package/dist/mod.d.ts

@@ -1,72 +1,2 @@
-import { MessageQueue, MessageQueueEnqueueOptions, MessageQueueListenOptions } from "@fedify/fedify";
-import { ChannelModel } from "amqplib";
-
-//#region mq.d.ts
-
-/**
- * Options for {@link AmqpMessageQueue}.
- */
-interface AmqpMessageQueueOptions {
-  /**
-   * The name of the queue to use.  Defaults to `"fedify_queue"`.
-   * @default `"fedify_queue"`
-   */
-  queue?: string;
-  /**
-   * The prefix to use for the delayed queue.  Defaults to `"fedify_delayed_"`.
-   * Defaults to `"fedify_delayed_"`.
-   * @default `"fedify_delayed_"`
-   */
-  delayedQueuePrefix?: string;
-  /**
-   * Whether the queue will survive a broker restart.  Defaults to `true`.
-   * @default `true`
-   */
-  durable?: boolean;
-  /**
-   * Whether to use native retrial mechanism. If set to `true`, the queue will
-   * not acknowledge messages that are not processed successfully, allowing
-   * them to be retried later. If set to `false`, messages will be acknowledged
-   * whether they are processed successfully or not.
-   *
-   * Both approaches have their own advantages and disadvantages.  With native
-   * retrials, much less chance of losing messages, but timing of retrials is
-   * less predictable.  With non-native retrials, retrials are handled by Fedify
-   * itself, which allows for more control over the timing and behavior of
-   * retrials, but may result in lost messages if the process crashes before
-   * acknowledging the message.
-   * @default `false`
-   * @since 0.3.0
-   */
-  nativeRetrial?: boolean;
-}
-/**
- * A message queue that uses AMQP.
- *
- * @example
- * ``` typescript
- * import { createFederation } from "@fedify/fedify";
- * import { AmqpMessageQueue } from "@fedify/amqp";
- * import { connect } from "amqplib";
- *
- * const federation = createFederation({
- *   queue: new AmqpMessageQueue(await connect("amqp://localhost")),
- *   // ... other configurations
- * });
- * ```
- */
-declare class AmqpMessageQueue implements MessageQueue {
-  #private;
-  readonly nativeRetrial: boolean;
-  /**
-   * Creates a new `AmqpMessageQueue`.
-   * @param connection A connection to the AMQP server.
-   * @param options Options for the message queue.
-   */
-  constructor(connection: ChannelModel, options?: AmqpMessageQueueOptions);
-  enqueue(message: any, options?: MessageQueueEnqueueOptions): Promise<void>;
-  enqueueMany(messages: any[], options?: MessageQueueEnqueueOptions): Promise<void>;
-  listen(handler: (message: any) => void | Promise<void>, options?: MessageQueueListenOptions): Promise<void>;
-}
-//#endregion
+import { AmqpMessageQueue, AmqpMessageQueueOptions } from "./mq.js";
 export { AmqpMessageQueue, AmqpMessageQueueOptions };

package/dist/mod.js

@@ -1,120 +1,3 @@
-import { Buffer } from "node:buffer";
+import { AmqpMessageQueue } from "./mq.js";
 
-//#region mq.ts
-/**
-* A message queue that uses AMQP.
-*
-* @example
-* ``` typescript
-* import { createFederation } from "@fedify/fedify";
-* import { AmqpMessageQueue } from "@fedify/amqp";
-* import { connect } from "amqplib";
-*
-* const federation = createFederation({
-*   queue: new AmqpMessageQueue(await connect("amqp://localhost")),
-*   // ... other configurations
-* });
-* ```
-*/
-var AmqpMessageQueue = class {
-	#connection;
-	#queue;
-	#delayedQueuePrefix;
-	#durable;
-	#senderChannel;
-	nativeRetrial;
-	/**
-	* Creates a new `AmqpMessageQueue`.
-	* @param connection A connection to the AMQP server.
-	* @param options Options for the message queue.
-	*/
-	constructor(connection, options = {}) {
-		this.#connection = connection;
-		this.#queue = options.queue ?? "fedify_queue";
-		this.#delayedQueuePrefix = options.delayedQueuePrefix ?? "fedify_delayed_";
-		this.#durable = options.durable ?? true;
-		this.nativeRetrial = options.nativeRetrial ?? false;
-	}
-	async #prepareQueue(channel) {
-		await channel.assertQueue(this.#queue, { durable: this.#durable });
-	}
-	async #getSenderChannel() {
-		if (this.#senderChannel != null) return this.#senderChannel;
-		const channel = await this.#connection.createChannel();
-		this.#senderChannel = channel;
-		this.#prepareQueue(channel);
-		return channel;
-	}
-	async enqueue(message, options) {
-		const channel = await this.#getSenderChannel();
-		const delay = options?.delay?.total("millisecond");
-		let queue;
-		if (delay == null || delay <= 0) queue = this.#queue;
-		else {
-			const delayStr = delay.toLocaleString("en", { useGrouping: false });
-			queue = this.#delayedQueuePrefix + delayStr;
-			await channel.assertQueue(queue, {
-				autoDelete: true,
-				durable: this.#durable,
-				deadLetterExchange: "",
-				deadLetterRoutingKey: this.#queue,
-				messageTtl: delay
-			});
-		}
-		channel.sendToQueue(queue, Buffer.from(JSON.stringify(message), "utf-8"), {
-			persistent: this.#durable,
-			contentType: "application/json"
-		});
-	}
-	async enqueueMany(messages, options) {
-		const channel = await this.#getSenderChannel();
-		const delay = options?.delay?.total("millisecond");
-		let queue;
-		if (delay == null || delay <= 0) queue = this.#queue;
-		else {
-			const delayStr = delay.toLocaleString("en", { useGrouping: false });
-			queue = this.#delayedQueuePrefix + delayStr;
-			await channel.assertQueue(queue, {
-				autoDelete: true,
-				durable: this.#durable,
-				deadLetterExchange: "",
-				deadLetterRoutingKey: this.#queue,
-				messageTtl: delay
-			});
-		}
-		for (const message of messages) channel.sendToQueue(queue, Buffer.from(JSON.stringify(message), "utf-8"), {
-			persistent: this.#durable,
-			contentType: "application/json"
-		});
-	}
-	async listen(handler, options = {}) {
-		const channel = await this.#connection.createChannel();
-		await this.#prepareQueue(channel);
-		await channel.prefetch(1);
-		const reply = await channel.consume(this.#queue, (msg) => {
-			if (msg == null) return;
-			const message = JSON.parse(msg.content.toString("utf-8"));
-			try {
-				const result = handler(message);
-				if (result instanceof Promise) if (this.nativeRetrial) result.then(() => channel.ack(msg)).catch(() => channel.nack(msg, void 0, true));
-				else result.finally(() => channel.ack(msg));
-				else if (this.nativeRetrial) channel.ack(msg);
-			} catch {
-				if (this.nativeRetrial) channel.nack(msg, void 0, true);
-			} finally {
-				if (!this.nativeRetrial) channel.ack(msg);
-			}
-		}, { noAck: false });
-		return await new Promise((resolve) => {
-			if (options.signal?.aborted) resolve();
-			options.signal?.addEventListener("abort", () => {
-				channel.cancel(reply.consumerTag).then(() => {
-					channel.close().then(() => resolve());
-				});
-			});
-		});
-	}
-};
-
-//#endregion
 export { AmqpMessageQueue };

package/dist/mq.d.ts

@@ -0,0 +1,72 @@
+import { MessageQueue, MessageQueueEnqueueOptions, MessageQueueListenOptions } from "@fedify/fedify";
+import { ChannelModel } from "amqplib";
+
+//#region src/mq.d.ts
+
+/**
+ * Options for {@link AmqpMessageQueue}.
+ */
+interface AmqpMessageQueueOptions {
+  /**
+   * The name of the queue to use.  Defaults to `"fedify_queue"`.
+   * @default `"fedify_queue"`
+   */
+  queue?: string;
+  /**
+   * The prefix to use for the delayed queue.  Defaults to `"fedify_delayed_"`.
+   * Defaults to `"fedify_delayed_"`.
+   * @default `"fedify_delayed_"`
+   */
+  delayedQueuePrefix?: string;
+  /**
+   * Whether the queue will survive a broker restart.  Defaults to `true`.
+   * @default `true`
+   */
+  durable?: boolean;
+  /**
+   * Whether to use native retrial mechanism. If set to `true`, the queue will
+   * not acknowledge messages that are not processed successfully, allowing
+   * them to be retried later. If set to `false`, messages will be acknowledged
+   * whether they are processed successfully or not.
+   *
+   * Both approaches have their own advantages and disadvantages.  With native
+   * retrials, much less chance of losing messages, but timing of retrials is
+   * less predictable.  With non-native retrials, retrials are handled by Fedify
+   * itself, which allows for more control over the timing and behavior of
+   * retrials, but may result in lost messages if the process crashes before
+   * acknowledging the message.
+   * @default `false`
+   * @since 0.3.0
+   */
+  nativeRetrial?: boolean;
+}
+/**
+ * A message queue that uses AMQP.
+ *
+ * @example
+ * ``` typescript
+ * import { createFederation } from "@fedify/fedify";
+ * import { AmqpMessageQueue } from "@fedify/amqp";
+ * import { connect } from "amqplib";
+ *
+ * const federation = createFederation({
+ *   queue: new AmqpMessageQueue(await connect("amqp://localhost")),
+ *   // ... other configurations
+ * });
+ * ```
+ */
+declare class AmqpMessageQueue implements MessageQueue {
+  #private;
+  readonly nativeRetrial: boolean;
+  /**
+   * Creates a new `AmqpMessageQueue`.
+   * @param connection A connection to the AMQP server.
+   * @param options Options for the message queue.
+   */
+  constructor(connection: ChannelModel, options?: AmqpMessageQueueOptions);
+  enqueue(message: any, options?: MessageQueueEnqueueOptions): Promise<void>;
+  enqueueMany(messages: any[], options?: MessageQueueEnqueueOptions): Promise<void>;
+  listen(handler: (message: any) => void | Promise<void>, options?: MessageQueueListenOptions): Promise<void>;
+}
+//#endregion
+export { AmqpMessageQueue, AmqpMessageQueueOptions };

package/dist/mq.js

@@ -0,0 +1,120 @@
+import { Buffer } from "node:buffer";
+
+//#region src/mq.ts
+/**
+* A message queue that uses AMQP.
+*
+* @example
+* ``` typescript
+* import { createFederation } from "@fedify/fedify";
+* import { AmqpMessageQueue } from "@fedify/amqp";
+* import { connect } from "amqplib";
+*
+* const federation = createFederation({
+*   queue: new AmqpMessageQueue(await connect("amqp://localhost")),
+*   // ... other configurations
+* });
+* ```
+*/
+var AmqpMessageQueue = class {
+	#connection;
+	#queue;
+	#delayedQueuePrefix;
+	#durable;
+	#senderChannel;
+	nativeRetrial;
+	/**
+	* Creates a new `AmqpMessageQueue`.
+	* @param connection A connection to the AMQP server.
+	* @param options Options for the message queue.
+	*/
+	constructor(connection, options = {}) {
+		this.#connection = connection;
+		this.#queue = options.queue ?? "fedify_queue";
+		this.#delayedQueuePrefix = options.delayedQueuePrefix ?? "fedify_delayed_";
+		this.#durable = options.durable ?? true;
+		this.nativeRetrial = options.nativeRetrial ?? false;
+	}
+	async #prepareQueue(channel) {
+		await channel.assertQueue(this.#queue, { durable: this.#durable });
+	}
+	async #getSenderChannel() {
+		if (this.#senderChannel != null) return this.#senderChannel;
+		const channel = await this.#connection.createChannel();
+		this.#senderChannel = channel;
+		this.#prepareQueue(channel);
+		return channel;
+	}
+	async enqueue(message, options) {
+		const channel = await this.#getSenderChannel();
+		const delay = options?.delay?.total("millisecond");
+		let queue;
+		if (delay == null || delay <= 0) queue = this.#queue;
+		else {
+			const delayStr = delay.toLocaleString("en", { useGrouping: false });
+			queue = this.#delayedQueuePrefix + delayStr;
+			await channel.assertQueue(queue, {
+				autoDelete: true,
+				durable: this.#durable,
+				deadLetterExchange: "",
+				deadLetterRoutingKey: this.#queue,
+				messageTtl: delay
+			});
+		}
+		channel.sendToQueue(queue, Buffer.from(JSON.stringify(message), "utf-8"), {
+			persistent: this.#durable,
+			contentType: "application/json"
+		});
+	}
+	async enqueueMany(messages, options) {
+		const channel = await this.#getSenderChannel();
+		const delay = options?.delay?.total("millisecond");
+		let queue;
+		if (delay == null || delay <= 0) queue = this.#queue;
+		else {
+			const delayStr = delay.toLocaleString("en", { useGrouping: false });
+			queue = this.#delayedQueuePrefix + delayStr;
+			await channel.assertQueue(queue, {
+				autoDelete: true,
+				durable: this.#durable,
+				deadLetterExchange: "",
+				deadLetterRoutingKey: this.#queue,
+				messageTtl: delay
+			});
+		}
+		for (const message of messages) channel.sendToQueue(queue, Buffer.from(JSON.stringify(message), "utf-8"), {
+			persistent: this.#durable,
+			contentType: "application/json"
+		});
+	}
+	async listen(handler, options = {}) {
+		const channel = await this.#connection.createChannel();
+		await this.#prepareQueue(channel);
+		await channel.prefetch(1);
+		const reply = await channel.consume(this.#queue, (msg) => {
+			if (msg == null) return;
+			const message = JSON.parse(msg.content.toString("utf-8"));
+			try {
+				const result = handler(message);
+				if (result instanceof Promise) if (this.nativeRetrial) result.then(() => channel.ack(msg)).catch(() => channel.nack(msg, void 0, true));
+				else result.finally(() => channel.ack(msg));
+				else if (this.nativeRetrial) channel.ack(msg);
+			} catch {
+				if (this.nativeRetrial) channel.nack(msg, void 0, true);
+			} finally {
+				if (!this.nativeRetrial) channel.ack(msg);
+			}
+		}, { noAck: false });
+		return await new Promise((resolve) => {
+			if (options.signal?.aborted) resolve();
+			options.signal?.addEventListener("abort", () => {
+				channel.cancel(reply.consumerTag).then(() => {
+					channel.close().then(() => resolve());
+				});
+			});
+		});
+	}
+};
+
+//#endregion
+export { AmqpMessageQueue };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/amqp",
-  "version": "1.8.1-pr.347.1259+fed6c010",
+  "version": "1.8.1-pr.348.1271+7aea35ed",
   "description": "AMQP/RabbitMQ driver for Fedify",
   "keywords": [
     "fedify",
@@ -17,7 +17,7 @@
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fedify-dev/fedify.git",
-    "directory": "amqp"
+    "directory": "packages/amqp"
   },
   "bugs": {
     "url": "https://github.com/fedify-dev/fedify/issues"
@@ -36,11 +36,16 @@
       "import": "./dist/mod.js",
       "default": "./dist/mod.js"
     },
+    "./mq": {
+      "types": "./dist/mq.d.ts",
+      "import": "./dist/mq.js",
+      "default": "./dist/mq.js"
+    },
     "./package.json": "./package.json"
   },
   "peerDependencies": {
     "amqplib": "^0.10.8",
-    "@fedify/fedify": "1.8.1-pr.347.1259+fed6c010"
+    "@fedify/fedify": "1.8.1-pr.348.1271+7aea35ed"
   },
   "devDependencies": {
     "@alinea/suite": "^0.6.3",

package/{mq.test.ts → src/mq.test.ts}

@@ -1,11 +1,11 @@
 import { suite } from "@alinea/suite";
+import { AmqpMessageQueue } from "@fedify/amqp/mq";
 import * as temporal from "@js-temporal/polyfill";
 import { assert, assertEquals, assertFalse, assertGreater } from "@std/assert";
 import { delay } from "@std/async/delay";
 // @deno-types="npm:@types/amqplib"
 import { type ChannelModel, connect } from "amqplib";
 import process from "node:process";
-import { AmqpMessageQueue } from "./mq.ts";
 
 let Temporal: typeof temporal.Temporal;
 if ("Temporal" in globalThis) {

package/tsdown.config.ts

@@ -1,7 +1,8 @@
 import { defineConfig } from "tsdown";
 
 export default defineConfig({
-  entry: "mod.ts",
+  entry: ["src/mod.ts", "src/mq.ts"],
   dts: true,
+  unbundle: true,
   platform: "node",
 });