@better-zap/hono 0.0.1 → 0.0.2

package/dist/index.cjs

@@ -75,7 +75,7 @@ async function runPluginStatusHooks(options) {
 async function handleListConversations(c) {
 	try {
 		const conversations = await c.get("store").getConversations();
-		return c.json(conversations);
+		return c.json((0, better_zap.normalizeConversationRecords)(conversations));
 	} catch (error) {
 		c.get("logger").error("conversations.list_error", (0, better_zap.serializeError)(error));
 		return c.json({ error: "Internal error fetching conversations" }, 500);
@@ -89,7 +89,7 @@ async function handleGetConversation(c) {
 		const normalized = (0, better_zap.formatPhone)(decodeURIComponent(phone));
 		const conversation = await store.getConversationByPhone(normalized);
 		if (!conversation) return c.json({ error: "Conversation not found" }, 404);
-		return c.json(conversation);
+		return c.json((0, better_zap.normalizeConversationRecord)(conversation));
 	} catch (error) {
 		c.get("logger").error("conversations.get_error", (0, better_zap.serializeError)(error));
 		return c.json({ error: "Internal error fetching conversation" }, 500);
@@ -115,6 +115,9 @@ async function handleGetMessages(c) {
 }
 //#endregion
 //#region src/handler/send.ts
+function getSendResponseStatus(result) {
+	return result.success ? 200 : result.httpStatus ?? 500;
+}
 async function handleSendText(c) {
 	const { to, body, messageType, userId, metadata } = await c.req.json();
 	if (!to || !body) return c.json({ error: "to and body are required" }, 400);
@@ -125,7 +128,7 @@ async function handleSendText(c) {
 		metadata
 	} : void 0;
 	const result = await whatsapp.sendText(to, body, logging);
-	return c.json(result, result.success ? 200 : 500);
+	return c.json(result, getSendResponseStatus(result));
 }
 function createSendTemplateHandler(templates) {
 	return async function handleSendTemplate(c) {
@@ -155,7 +158,7 @@ function createSendTemplateHandler(templates) {
 			}
 		}
 		const result = await whatsapp.sendTemplate(body.to, body.template, language, components, logging);
-		return c.json(result, result.success ? 200 : 500);
+		return c.json(result, getSendResponseStatus(result));
 	};
 }
 async function handleSendInteractive(c) {
@@ -170,7 +173,7 @@ async function handleSendInteractive(c) {
 	if (type === "list") {
 		if (!buttonLabel || !sections) return c.json({ error: "buttonLabel and sections are required for list type" }, 400);
 		const result = await whatsapp.sendInteractiveList(to, body, buttonLabel, sections, logging);
-		return c.json(result, result.success ? 200 : 500);
+		return c.json(result, getSendResponseStatus(result));
 	}
 	if (type === "carousel") {
 		if (!cards) return c.json({ error: "cards are required for carousel type" }, 400);
@@ -180,11 +183,11 @@ async function handleSendInteractive(c) {
 			body,
 			cards
 		}, logging);
-		return c.json(result, result.success ? 200 : 500);
+		return c.json(result, getSendResponseStatus(result));
 	}
 	if (!buttons) return c.json({ error: "buttons are required for button type" }, 400);
 	const result = await whatsapp.sendInteractiveButtons(to, body, buttons, logging);
-	return c.json(result, result.success ? 200 : 500);
+	return c.json(result, getSendResponseStatus(result));
 }
 async function handleSendLocation(c) {
 	const { to, latitude, longitude, name, address, messageType, userId, metadata } = await c.req.json();
@@ -196,7 +199,7 @@ async function handleSendLocation(c) {
 		metadata
 	} : void 0;
 	const result = await whatsapp.sendLocation(to, latitude, longitude, name, address, logging);
-	return c.json(result, result.success ? 200 : 500);
+	return c.json(result, getSendResponseStatus(result));
 }
 //#endregion
 //#region src/webhook/signature-verification.ts
@@ -379,11 +382,14 @@ async function processIncomingMessage(message, contact, config, log) {
 		return;
 	}
 	const content = getMessageContent(message);
+	const sentAt = /* @__PURE__ */ new Date(parseInt(message.timestamp, 10) * 1e3);
+	const normalizedSentAt = Number.isNaN(sentAt.getTime()) ? (/* @__PURE__ */ new Date()).toISOString() : sentAt.toISOString();
 	const { id, type, text, from, timestamp, ...rawMetadata } = message;
 	await config.logger.logIncoming({
 		phone,
 		waMessageId: message.id,
 		content,
+		sentAt: normalizedSentAt,
 		senderName: contact?.profile?.name,
 		metadata: Object.keys(rawMetadata).length > 0 ? rawMetadata : void 0
 	});
@@ -549,8 +555,11 @@ function betterZap(options) {
 			reaction: (to, messageId, emoji) => whatsapp.sendReaction(to, messageId, emoji)
 		},
 		conversations: {
-			list: () => database.whatsappLog.getConversations(),
-			get: (phone) => database.whatsappLog.getConversationByPhone((0, better_zap.formatPhone)(phone)),
+			list: async () => (0, better_zap.normalizeConversationRecords)(await database.whatsappLog.getConversations()),
+			get: async (phone) => {
+				const conversation = await database.whatsappLog.getConversationByPhone((0, better_zap.formatPhone)(phone));
+				return conversation ? (0, better_zap.normalizeConversationRecord)(conversation) : null;
+			},
 			messages: async (phone, opts) => {
 				const conversation = await database.whatsappLog.getConversationByPhone((0, better_zap.formatPhone)(phone));
 				if (!conversation) return [];

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import { Hono } from "hono";
-import { EMPTY_TEMPLATE_REGISTRY, MessageLoggerService, WhatsAppService, createLogger, formatPhone, hasConfiguredTemplates, serializeError, serializeTemplateFromRegistry } from "better-zap";
+import { EMPTY_TEMPLATE_REGISTRY, MessageLoggerService, WhatsAppService, createLogger, formatPhone, hasConfiguredTemplates, normalizeConversationRecord, normalizeConversationRecords, serializeError, serializeTemplateFromRegistry } from "better-zap";
 //#region src/plugins/runtime.ts
 function initializePlugins(options) {
 	let pluginContext = {};
@@ -74,7 +74,7 @@ async function runPluginStatusHooks(options) {
 async function handleListConversations(c) {
 	try {
 		const conversations = await c.get("store").getConversations();
-		return c.json(conversations);
+		return c.json(normalizeConversationRecords(conversations));
 	} catch (error) {
 		c.get("logger").error("conversations.list_error", serializeError(error));
 		return c.json({ error: "Internal error fetching conversations" }, 500);
@@ -88,7 +88,7 @@ async function handleGetConversation(c) {
 		const normalized = formatPhone(decodeURIComponent(phone));
 		const conversation = await store.getConversationByPhone(normalized);
 		if (!conversation) return c.json({ error: "Conversation not found" }, 404);
-		return c.json(conversation);
+		return c.json(normalizeConversationRecord(conversation));
 	} catch (error) {
 		c.get("logger").error("conversations.get_error", serializeError(error));
 		return c.json({ error: "Internal error fetching conversation" }, 500);
@@ -114,6 +114,9 @@ async function handleGetMessages(c) {
 }
 //#endregion
 //#region src/handler/send.ts
+function getSendResponseStatus(result) {
+	return result.success ? 200 : result.httpStatus ?? 500;
+}
 async function handleSendText(c) {
 	const { to, body, messageType, userId, metadata } = await c.req.json();
 	if (!to || !body) return c.json({ error: "to and body are required" }, 400);
@@ -124,7 +127,7 @@ async function handleSendText(c) {
 		metadata
 	} : void 0;
 	const result = await whatsapp.sendText(to, body, logging);
-	return c.json(result, result.success ? 200 : 500);
+	return c.json(result, getSendResponseStatus(result));
 }
 function createSendTemplateHandler(templates) {
 	return async function handleSendTemplate(c) {
@@ -154,7 +157,7 @@ function createSendTemplateHandler(templates) {
 			}
 		}
 		const result = await whatsapp.sendTemplate(body.to, body.template, language, components, logging);
-		return c.json(result, result.success ? 200 : 500);
+		return c.json(result, getSendResponseStatus(result));
 	};
 }
 async function handleSendInteractive(c) {
@@ -169,7 +172,7 @@ async function handleSendInteractive(c) {
 	if (type === "list") {
 		if (!buttonLabel || !sections) return c.json({ error: "buttonLabel and sections are required for list type" }, 400);
 		const result = await whatsapp.sendInteractiveList(to, body, buttonLabel, sections, logging);
-		return c.json(result, result.success ? 200 : 500);
+		return c.json(result, getSendResponseStatus(result));
 	}
 	if (type === "carousel") {
 		if (!cards) return c.json({ error: "cards are required for carousel type" }, 400);
@@ -179,11 +182,11 @@ async function handleSendInteractive(c) {
 			body,
 			cards
 		}, logging);
-		return c.json(result, result.success ? 200 : 500);
+		return c.json(result, getSendResponseStatus(result));
 	}
 	if (!buttons) return c.json({ error: "buttons are required for button type" }, 400);
 	const result = await whatsapp.sendInteractiveButtons(to, body, buttons, logging);
-	return c.json(result, result.success ? 200 : 500);
+	return c.json(result, getSendResponseStatus(result));
 }
 async function handleSendLocation(c) {
 	const { to, latitude, longitude, name, address, messageType, userId, metadata } = await c.req.json();
@@ -195,7 +198,7 @@ async function handleSendLocation(c) {
 		metadata
 	} : void 0;
 	const result = await whatsapp.sendLocation(to, latitude, longitude, name, address, logging);
-	return c.json(result, result.success ? 200 : 500);
+	return c.json(result, getSendResponseStatus(result));
 }
 //#endregion
 //#region src/webhook/signature-verification.ts
@@ -378,11 +381,14 @@ async function processIncomingMessage(message, contact, config, log) {
 		return;
 	}
 	const content = getMessageContent(message);
+	const sentAt = /* @__PURE__ */ new Date(parseInt(message.timestamp, 10) * 1e3);
+	const normalizedSentAt = Number.isNaN(sentAt.getTime()) ? (/* @__PURE__ */ new Date()).toISOString() : sentAt.toISOString();
 	const { id, type, text, from, timestamp, ...rawMetadata } = message;
 	await config.logger.logIncoming({
 		phone,
 		waMessageId: message.id,
 		content,
+		sentAt: normalizedSentAt,
 		senderName: contact?.profile?.name,
 		metadata: Object.keys(rawMetadata).length > 0 ? rawMetadata : void 0
 	});
@@ -548,8 +554,11 @@ function betterZap(options) {
 			reaction: (to, messageId, emoji) => whatsapp.sendReaction(to, messageId, emoji)
 		},
 		conversations: {
-			list: () => database.whatsappLog.getConversations(),
-			get: (phone) => database.whatsappLog.getConversationByPhone(formatPhone(phone)),
+			list: async () => normalizeConversationRecords(await database.whatsappLog.getConversations()),
+			get: async (phone) => {
+				const conversation = await database.whatsappLog.getConversationByPhone(formatPhone(phone));
+				return conversation ? normalizeConversationRecord(conversation) : null;
+			},
 			messages: async (phone, opts) => {
 				const conversation = await database.whatsappLog.getConversationByPhone(formatPhone(phone));
 				if (!conversation) return [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@better-zap/hono",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "Hono adapter and webhook runtime for Better Zap.",
   "license": "ISC",
   "type": "module",
@@ -28,7 +28,7 @@
   },
   "dependencies": {
     "hono": "4.12.5",
-    "better-zap": "0.0.1"
+    "better-zap": "0.0.2"
   },
   "peerDependencies": {
     "hono": "4.12.5"