@green-api/greenapi-integration 0.6.2 → 0.7.0

package/README.md

@@ -1020,7 +1020,6 @@ async function main() {
 	await visitorClient.sendMessage({
 		chatId: formatPhoneNumber(process.env.AGENT_PHONE_NUMBER!),
 		message: "Hello! This is a test message from a visitor.",
-		type: "text",
 	});
 
 	console.log("Initial message sent! Check the agent WhatsApp app to see the response.");

package/dist/core/guard.js

@@ -56,18 +56,22 @@ class BaseGreenApiAuthGuard {
     async validateRequest(request) {
         const token = request.headers["authorization"];
         if (!token) {
+            this.gaLogger.warn("Authentication header is missing", { body: request.body, headers: request.headers });
             throw new errors_1.AuthenticationError("Authentication header is missing");
         }
         this.gaLogger.info("Request from GREEN-API", { body: request.body });
         const idInstance = request.body?.instanceData?.idInstance;
         if (!idInstance) {
+            this.gaLogger.warn("Invalid webhook format", { body: request.body, headers: request.headers });
             throw new errors_1.AuthenticationError("Invalid webhook format");
         }
         const instance = await this.storage.getInstance(idInstance);
         if (!instance) {
+            this.gaLogger.warn(`No instance with such ID ${idInstance}`, { body: request.body, headers: request.headers });
             throw new errors_1.AuthenticationError(`No instance with such ID ${idInstance}`);
         }
         if (instance.settings?.webhookUrlToken !== token.split(" ")[1]) {
+            this.gaLogger.warn("Invalid token", { body: request.body, headers: request.headers });
             throw new errors_1.AuthenticationError("Invalid token");
         }
         return true;

package/dist/types/types.d.ts

@@ -16,40 +16,43 @@ export interface Instance extends BaseInstance {
     [key: string]: any;
 }
 /**
- * Union type representing all possible message formats that can be sent through GREEN-API.
- * Each message type has its own specific structure and required fields.
+ * Common properties shared by all message types.
  */
-export type Message = ({
-    type: "text";
+export interface BaseMessage {
+    chatId: string;
+    quotedMessageId?: string;
+}
+export interface ForwardMessagesResponse {
+    messages: string[];
+}
+export interface PollOption {
+    optionName: string;
+}
+export interface SendMessage extends BaseMessage {
     message: string;
     linkPreview?: boolean;
-} & BaseMessage) | ({
-    type: "upload-file";
+}
+export interface SendFileByUpload extends BaseMessage {
     caption?: string;
     file: {
         data: Blob | File;
         fileName: string;
     };
-} & BaseMessage) | ({
-    type: "url-file";
+}
+export interface SendFileByUrl extends BaseMessage {
     caption?: string;
     file: {
         url: string;
         fileName: string;
     };
-} & BaseMessage) | ({
-    type: "poll";
-    message: string;
-    options: PollOption[];
-    multipleAnswers?: boolean;
-} & BaseMessage) | ({
-    type: "location";
+}
+export interface SendLocation extends BaseMessage {
     nameLocation?: string;
     address?: string;
     latitude: number;
     longitude: number;
-} & BaseMessage) | ({
-    type: "contact";
+}
+export interface SendContact extends BaseMessage {
     contact: {
         phoneContact: number;
         firstName?: string;
@@ -57,47 +60,32 @@ export type Message = ({
         lastName?: string;
         company?: string;
     };
-} & BaseMessage) | {
-    type: "forward";
+}
+export interface SendPoll extends BaseMessage {
+    message: string;
+    options: PollOption[];
+    multipleAnswers?: boolean;
+}
+export interface ForwardMessages {
     chatId: string;
     chatIdFrom: string;
     messages: string[];
-};
-/**
- * Common properties shared by all message types.
- */
-export interface BaseMessage {
-    chatId: string;
-    quotedMessageId?: string;
-}
-export type SendMessageType = "text" | "upload-file" | "url-file" | "poll" | "location" | "contact" | "forward";
-export interface ForwardMessagesResponse {
-    messages: string[];
 }
-export interface PollOption {
-    optionName: string;
-}
-export type SendMessage = Extract<Message, {
+export type Message = (SendMessage & {
     type: "text";
-}>;
-export type SendFileByUpload = Extract<Message, {
+}) | (SendFileByUpload & {
     type: "upload-file";
-}>;
-export type SendFileByUrl = Extract<Message, {
+}) | (SendFileByUrl & {
     type: "url-file";
-}>;
-export type SendLocation = Extract<Message, {
+}) | (SendPoll & {
+    type: "poll";
+}) | (SendLocation & {
     type: "location";
-}>;
-export type SendContact = Extract<Message, {
+}) | (SendContact & {
     type: "contact";
-}>;
-export type SendPoll = Extract<Message, {
-    type: "poll";
-}>;
-export type ForwardMessages = Extract<Message, {
+}) | (ForwardMessages & {
     type: "forward";
-}>;
+});
 export type QueueMessageType = "sendMessage" | "sendPoll" | "sendFileByUrl" | "sendLocation" | "sendContact" | "ForwardMessages";
 export type QueueMessageBody = SendMessage | SendPoll | SendFileByUrl | SendLocation | SendContact | ForwardMessages;
 export interface QueueMessage {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@green-api/greenapi-integration",
-  "version": "0.6.2",
+  "version": "0.7.0",
   "description": "GREEN-API Integration library",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",