@agentuity/server 1.0.17 → 1.0.18

package/src/api/queue/messages.ts

@@ -1,5 +1,5 @@
 import { z } from 'zod';
-import { type APIClient, APIResponseSchema, APIResponseSchemaNoData } from '../api';
+import { type APIClient, APIResponseSchema, APIResponseSchemaNoData } from '../api.ts';
 import {
 	type BatchPublishMessagesRequest,
 	BatchPublishMessagesRequestSchema,
@@ -10,15 +10,14 @@ import {
 	type PublishMessageRequest,
 	PublishMessageRequestSchema,
 	type QueueApiOptions,
-} from './types';
+} from './types.ts';
 import {
 	buildQueueHeaders,
-	MessageNotFoundError,
 	QueueError,
-	QueueNotFoundError,
 	queueApiPath,
 	queueApiPathWithQuery,
-} from './util';
+	withQueueErrorHandling,
+} from './util.ts';
 import {
 	validateBatchSize,
 	validateIdempotencyKey,
@@ -29,7 +28,7 @@ import {
 	validatePayload,
 	validateQueueName,
 	validateTTL,
-} from './validation';
+} from './validation.ts';
 
 export const MessageResponseSchema = APIResponseSchema(z.object({ message: MessageSchema }));
 export const MessagesListResponseSchema = APIResponseSchema(
@@ -99,26 +98,23 @@ export async function publishMessage(
 	const url = options?.sync
 		? queueApiPathWithQuery('messages/publish', 'sync=true', queueName)
 		: queueApiPath('messages/publish', queueName);
-	const resp = await client.post(
-		url,
-		params,
-		MessageResponseSchema,
-		PublishMessageRequestSchema,
-		undefined,
-		buildQueueHeaders(options?.orgId)
+	const resp = await withQueueErrorHandling(
+		() =>
+			client.post(
+				url,
+				params,
+				MessageResponseSchema,
+				PublishMessageRequestSchema,
+				undefined,
+				buildQueueHeaders(options?.orgId)
+			),
+		{ queueName }
 	);
 
 	if (resp.success) {
 		return resp.data.message;
 	}
 
-	if (resp.message?.includes('not found')) {
-		throw new QueueNotFoundError({
-			queueName,
-			message: resp.message,
-		});
-	}
-
 	throw new QueueError({
 		queueName,
 		message: resp.message || 'Failed to publish message',
@@ -172,26 +168,23 @@ export async function batchPublishMessages(
 	}
 
 	const url = queueApiPath('messages/batch', queueName);
-	const resp = await client.post(
-		url,
-		{ messages },
-		BatchPublishResponseSchema,
-		BatchPublishMessagesRequestSchema,
-		undefined,
-		buildQueueHeaders(options?.orgId)
+	const resp = await withQueueErrorHandling(
+		() =>
+			client.post(
+				url,
+				{ messages },
+				BatchPublishResponseSchema,
+				BatchPublishMessagesRequestSchema,
+				undefined,
+				buildQueueHeaders(options?.orgId)
+			),
+		{ queueName }
 	);
 
 	if (resp.success) {
 		return { messages: resp.data.messages, failed: resp.data.failed };
 	}
 
-	if (resp.message?.includes('not found')) {
-		throw new QueueNotFoundError({
-			queueName,
-			message: resp.message,
-		});
-	}
-
 	throw new QueueError({
 		queueName,
 		message: resp.message || 'Failed to batch publish messages',
@@ -228,32 +221,15 @@ export async function getMessage(
 	validateMessageId(messageId);
 
 	const url = queueApiPath('messages/get', queueName, messageId);
-	const resp = await client.get(
-		url,
-		MessageResponseSchema,
-		undefined,
-		buildQueueHeaders(options?.orgId)
+	const resp = await withQueueErrorHandling(
+		() => client.get(url, MessageResponseSchema, undefined, buildQueueHeaders(options?.orgId)),
+		{ queueName, messageId }
 	);
 
 	if (resp.success) {
 		return resp.data.message;
 	}
 
-	if (resp.message?.includes('message') && resp.message?.includes('not found')) {
-		throw new MessageNotFoundError({
-			queueName,
-			messageId,
-			message: resp.message,
-		});
-	}
-
-	if (resp.message?.includes('queue') && resp.message?.includes('not found')) {
-		throw new QueueNotFoundError({
-			queueName,
-			message: resp.message,
-		});
-	}
-
 	throw new QueueError({
 		queueName,
 		message: resp.message || 'Failed to get message',
@@ -290,25 +266,15 @@ export async function getMessageByOffset(
 	validateOffset(offset);
 
 	const url = queueApiPath('messages/offset', queueName, String(offset));
-	const resp = await client.get(
-		url,
-		MessageResponseSchema,
-		undefined,
-		buildQueueHeaders(options?.orgId)
+	const resp = await withQueueErrorHandling(
+		() => client.get(url, MessageResponseSchema, undefined, buildQueueHeaders(options?.orgId)),
+		{ queueName, messageId: `offset:${offset}` }
 	);
 
 	if (resp.success) {
 		return resp.data.message;
 	}
 
-	if (resp.message?.includes('not found')) {
-		throw new MessageNotFoundError({
-			queueName,
-			messageId: `offset:${offset}`,
-			message: resp.message,
-		});
-	}
-
 	throw new QueueError({
 		queueName,
 		message: resp.message || 'Failed to get message by offset',
@@ -369,24 +335,16 @@ export async function listMessages(
 
 	const queryString = searchParams.toString();
 	const url = queueApiPathWithQuery('messages/list', queryString || undefined, queueName);
-	const resp = await client.get(
-		url,
-		MessagesListResponseSchema,
-		undefined,
-		buildQueueHeaders(options?.orgId)
+	const resp = await withQueueErrorHandling(
+		() =>
+			client.get(url, MessagesListResponseSchema, undefined, buildQueueHeaders(options?.orgId)),
+		{ queueName }
 	);
 
 	if (resp.success) {
 		return { messages: resp.data.messages, total: resp.data.total };
 	}
 
-	if (resp.message?.includes('not found')) {
-		throw new QueueNotFoundError({
-			queueName,
-			message: resp.message,
-		});
-	}
-
 	throw new QueueError({
 		queueName,
 		message: resp.message || 'Failed to list messages',
@@ -422,25 +380,21 @@ export async function deleteMessage(
 	validateMessageId(messageId);
 
 	const url = queueApiPath('messages/delete', queueName, messageId);
-	const resp = await client.delete(
-		url,
-		DeleteMessageResponseSchema,
-		undefined,
-		buildQueueHeaders(options?.orgId)
+	const resp = await withQueueErrorHandling(
+		() =>
+			client.delete(
+				url,
+				DeleteMessageResponseSchema,
+				undefined,
+				buildQueueHeaders(options?.orgId)
+			),
+		{ queueName, messageId }
 	);
 
 	if (resp.success) {
 		return;
 	}
 
-	if (resp.message?.includes('message') && resp.message?.includes('not found')) {
-		throw new MessageNotFoundError({
-			queueName,
-			messageId,
-			message: resp.message,
-		});
-	}
-
 	throw new QueueError({
 		queueName,
 		message: resp.message || 'Failed to delete message',
@@ -478,27 +432,23 @@ export async function replayMessage(
 	validateMessageId(messageId);
 
 	const url = queueApiPath('messages/replay', queueName, messageId);
-	const resp = await client.post(
-		url,
-		undefined,
-		MessageResponseSchema,
-		undefined,
-		undefined,
-		buildQueueHeaders(options?.orgId)
+	const resp = await withQueueErrorHandling(
+		() =>
+			client.post(
+				url,
+				undefined,
+				MessageResponseSchema,
+				undefined,
+				undefined,
+				buildQueueHeaders(options?.orgId)
+			),
+		{ queueName, messageId }
 	);
 
 	if (resp.success) {
 		return resp.data.message;
 	}
 
-	if (resp.message?.includes('message') && resp.message?.includes('not found')) {
-		throw new MessageNotFoundError({
-			queueName,
-			messageId,
-			message: resp.message,
-		});
-	}
-
 	throw new QueueError({
 		queueName,
 		message: resp.message || 'Failed to replay message',
@@ -554,24 +504,16 @@ export async function consumeMessages(
 	}
 
 	const url = queueApiPathWithQuery('consume', searchParams.toString(), queueName);
-	const resp = await client.get(
-		url,
-		MessagesListResponseSchema,
-		undefined,
-		buildQueueHeaders(options?.orgId)
+	const resp = await withQueueErrorHandling(
+		() =>
+			client.get(url, MessagesListResponseSchema, undefined, buildQueueHeaders(options?.orgId)),
+		{ queueName }
 	);
 
 	if (resp.success) {
 		return { messages: resp.data.messages };
 	}
 
-	if (resp.message?.includes('not found')) {
-		throw new QueueNotFoundError({
-			queueName,
-			message: resp.message,
-		});
-	}
-
 	throw new QueueError({
 		queueName,
 		message: resp.message || 'Failed to consume messages',
@@ -604,24 +546,15 @@ export async function getQueueHead(
 ): Promise<number> {
 	validateQueueName(queueName);
 	const url = queueApiPath('head', queueName);
-	const resp = await client.get(
-		url,
-		OffsetResponseSchema,
-		undefined,
-		buildQueueHeaders(options?.orgId)
+	const resp = await withQueueErrorHandling(
+		() => client.get(url, OffsetResponseSchema, undefined, buildQueueHeaders(options?.orgId)),
+		{ queueName }
 	);
 
 	if (resp.success) {
 		return resp.data.offset;
 	}
 
-	if (resp.message?.includes('not found')) {
-		throw new QueueNotFoundError({
-			queueName,
-			message: resp.message,
-		});
-	}
-
 	throw new QueueError({
 		queueName,
 		message: resp.message || 'Failed to get queue head',
@@ -654,24 +587,15 @@ export async function getQueueTail(
 ): Promise<number> {
 	validateQueueName(queueName);
 	const url = queueApiPath('tail', queueName);
-	const resp = await client.get(
-		url,
-		OffsetResponseSchema,
-		undefined,
-		buildQueueHeaders(options?.orgId)
+	const resp = await withQueueErrorHandling(
+		() => client.get(url, OffsetResponseSchema, undefined, buildQueueHeaders(options?.orgId)),
+		{ queueName }
 	);
 
 	if (resp.success) {
 		return resp.data.offset;
 	}
 
-	if (resp.message?.includes('not found')) {
-		throw new QueueNotFoundError({
-			queueName,
-			message: resp.message,
-		});
-	}
-
 	throw new QueueError({
 		queueName,
 		message: resp.message || 'Failed to get queue tail',
@@ -720,24 +644,15 @@ export async function receiveMessage(
 
 	const queryString = searchParams.toString();
 	const url = queueApiPathWithQuery('receive', queryString || undefined, queueName);
-	const resp = await client.get(
-		url,
-		ReceiveResponseSchema,
-		undefined,
-		buildQueueHeaders(options?.orgId)
+	const resp = await withQueueErrorHandling(
+		() => client.get(url, ReceiveResponseSchema, undefined, buildQueueHeaders(options?.orgId)),
+		{ queueName }
 	);
 
 	if (resp.success) {
 		return resp.data.message;
 	}
 
-	if (resp.message?.includes('not found')) {
-		throw new QueueNotFoundError({
-			queueName,
-			message: resp.message,
-		});
-	}
-
 	throw new QueueError({
 		queueName,
 		message: resp.message || 'Failed to receive message',
@@ -782,27 +697,23 @@ export async function ackMessage(
 	validateMessageId(messageId);
 
 	const url = queueApiPath('ack', queueName, messageId);
-	const resp = await client.post(
-		url,
-		undefined,
-		AckNackResponseSchema,
-		undefined,
-		undefined,
-		buildQueueHeaders(options?.orgId)
+	const resp = await withQueueErrorHandling(
+		() =>
+			client.post(
+				url,
+				undefined,
+				AckNackResponseSchema,
+				undefined,
+				undefined,
+				buildQueueHeaders(options?.orgId)
+			),
+		{ queueName, messageId }
 	);
 
 	if (resp.success) {
 		return;
 	}
 
-	if (resp.message?.includes('message') && resp.message?.includes('not found')) {
-		throw new MessageNotFoundError({
-			queueName,
-			messageId,
-			message: resp.message,
-		});
-	}
-
 	throw new QueueError({
 		queueName,
 		message: resp.message || 'Failed to acknowledge message',
@@ -849,27 +760,23 @@ export async function nackMessage(
 	validateMessageId(messageId);
 
 	const url = queueApiPath('nack', queueName, messageId);
-	const resp = await client.post(
-		url,
-		undefined,
-		AckNackResponseSchema,
-		undefined,
-		undefined,
-		buildQueueHeaders(options?.orgId)
+	const resp = await withQueueErrorHandling(
+		() =>
+			client.post(
+				url,
+				undefined,
+				AckNackResponseSchema,
+				undefined,
+				undefined,
+				buildQueueHeaders(options?.orgId)
+			),
+		{ queueName, messageId }
 	);
 
 	if (resp.success) {
 		return;
 	}
 
-	if (resp.message?.includes('message') && resp.message?.includes('not found')) {
-		throw new MessageNotFoundError({
-			queueName,
-			messageId,
-			message: resp.message,
-		});
-	}
-
 	throw new QueueError({
 		queueName,
 		message: resp.message || 'Failed to negative acknowledge message',

package/src/api/queue/queues.ts

@@ -1,5 +1,5 @@
 import { z } from 'zod';
-import { type APIClient, APIResponseSchema, APIResponseSchemaNoData } from '../api';
+import { type APIClient, APIResponseSchema, APIResponseSchemaNoData } from '../api.ts';
 import {
 	type CreateQueueRequest,
 	CreateQueueRequestSchema,
@@ -9,14 +9,14 @@ import {
 	QueueSchema,
 	type UpdateQueueRequest,
 	UpdateQueueRequestSchema,
-} from './types';
+} from './types.ts';
 import {
 	buildQueueHeaders,
 	QueueError,
-	QueueNotFoundError,
 	queueApiPath,
 	queueApiPathWithQuery,
-} from './util';
+	withQueueErrorHandling,
+} from './util.ts';
 import {
 	validateDescription,
 	validateLimit,
@@ -27,7 +27,7 @@ import {
 	validateQueueType,
 	validateTTL,
 	validateVisibilityTimeout,
-} from './validation';
+} from './validation.ts';
 
 export const QueueResponseSchema = APIResponseSchema(z.object({ queue: QueueSchema }));
 export const QueuesListResponseSchema = APIResponseSchema(
@@ -138,24 +138,15 @@ export async function getQueue(
 ): Promise<Queue> {
 	validateQueueName(name);
 	const url = queueApiPath('get', name);
-	const resp = await client.get(
-		url,
-		QueueResponseSchema,
-		undefined,
-		buildQueueHeaders(options?.orgId)
+	const resp = await withQueueErrorHandling(
+		() => client.get(url, QueueResponseSchema, undefined, buildQueueHeaders(options?.orgId)),
+		{ queueName: name }
 	);
 
 	if (resp.success) {
 		return resp.data.queue;
 	}
 
-	if (resp.message?.includes('not found')) {
-		throw new QueueNotFoundError({
-			queueName: name,
-			message: resp.message,
-		});
-	}
-
 	throw new QueueError({
 		queueName: name,
 		message: resp.message || 'Failed to get queue',
@@ -302,26 +293,23 @@ export async function updateQueue(
 	}
 
 	const url = queueApiPath('update', name);
-	const resp = await client.patch(
-		url,
-		params,
-		QueueResponseSchema,
-		UpdateQueueRequestSchema,
-		undefined,
-		buildQueueHeaders(options?.orgId)
+	const resp = await withQueueErrorHandling(
+		() =>
+			client.patch(
+				url,
+				params,
+				QueueResponseSchema,
+				UpdateQueueRequestSchema,
+				undefined,
+				buildQueueHeaders(options?.orgId)
+			),
+		{ queueName: name }
 	);
 
 	if (resp.success) {
 		return resp.data.queue;
 	}
 
-	if (resp.message?.includes('not found')) {
-		throw new QueueNotFoundError({
-			queueName: name,
-			message: resp.message,
-		});
-	}
-
 	throw new QueueError({
 		queueName: name,
 		message: resp.message || 'Failed to update queue',
@@ -352,24 +340,16 @@ export async function deleteQueue(
 ): Promise<void> {
 	validateQueueName(name);
 	const url = queueApiPath('delete', name);
-	const resp = await client.delete(
-		url,
-		DeleteQueueResponseSchema,
-		undefined,
-		buildQueueHeaders(options?.orgId)
+	const resp = await withQueueErrorHandling(
+		() =>
+			client.delete(url, DeleteQueueResponseSchema, undefined, buildQueueHeaders(options?.orgId)),
+		{ queueName: name }
 	);
 
 	if (resp.success) {
 		return;
 	}
 
-	if (resp.message?.includes('not found')) {
-		throw new QueueNotFoundError({
-			queueName: name,
-			message: resp.message,
-		});
-	}
-
 	throw new QueueError({
 		queueName: name,
 		message: resp.message || 'Failed to delete queue',
@@ -402,26 +382,23 @@ export async function pauseQueue(
 ): Promise<Queue> {
 	validateQueueName(name);
 	const url = queueApiPath('pause', name);
-	const resp = await client.post(
-		url,
-		{},
-		QueueResponseSchema,
-		z.object({}),
-		undefined,
-		buildQueueHeaders(options?.orgId)
+	const resp = await withQueueErrorHandling(
+		() =>
+			client.post(
+				url,
+				{},
+				QueueResponseSchema,
+				z.object({}),
+				undefined,
+				buildQueueHeaders(options?.orgId)
+			),
+		{ queueName: name }
 	);
 
 	if (resp.success) {
 		return resp.data.queue;
 	}
 
-	if (resp.message?.includes('not found')) {
-		throw new QueueNotFoundError({
-			queueName: name,
-			message: resp.message,
-		});
-	}
-
 	throw new QueueError({
 		queueName: name,
 		message: resp.message || 'Failed to pause queue',
@@ -454,26 +431,23 @@ export async function resumeQueue(
 ): Promise<Queue> {
 	validateQueueName(name);
 	const url = queueApiPath('resume', name);
-	const resp = await client.post(
-		url,
-		{},
-		QueueResponseSchema,
-		z.object({}),
-		undefined,
-		buildQueueHeaders(options?.orgId)
+	const resp = await withQueueErrorHandling(
+		() =>
+			client.post(
+				url,
+				{},
+				QueueResponseSchema,
+				z.object({}),
+				undefined,
+				buildQueueHeaders(options?.orgId)
+			),
+		{ queueName: name }
 	);
 
 	if (resp.success) {
 		return resp.data.queue;
 	}
 
-	if (resp.message?.includes('not found')) {
-		throw new QueueNotFoundError({
-			queueName: name,
-			message: resp.message,
-		});
-	}
-
 	throw new QueueError({
 		queueName: name,
 		message: resp.message || 'Failed to resume queue',