@theotherwillembotha/node-red-whatsapp 0.0.55 → 0.4.0

package/build/whatsapp/service/WhatsappService.js

@@ -1,15 +1,34 @@
 "use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
+var WhatsappService_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WhatsappService = void 0;
 const node_red_plugincore_1 = require("@theotherwillembotha/node-red-plugincore");
 const WhatsappClient_1 = require("./WhatsappClient");
 const fs_1 = __importDefault(require("fs"));
 const qrcode_1 = __importDefault(require("qrcode"));
-class WhatsappService extends node_red_plugincore_1.BaseService {
-    static { this.clients = {}; }
+let WhatsappService = class WhatsappService extends node_red_plugincore_1.BaseService {
+    static { WhatsappService_1 = this; }
+    // clients is stored in global so that Nodes.js and Plugins.js (which are separate esbuild
+    // bundles containing separate copies of this class) share the same runtime map.
+    static { this._CLIENTS_KEY = '__wa_service_clients__'; }
+    static clients() {
+        if (!global[WhatsappService_1._CLIENTS_KEY]) {
+            global[WhatsappService_1._CLIENTS_KEY] = {};
+        }
+        return global[WhatsappService_1._CLIENTS_KEY];
+    }
     constructor() {
         super("WhatsappService");
         this.connections = [];
@@ -20,6 +39,8 @@ class WhatsappService extends node_red_plugincore_1.BaseService {
         console.log("STARTING: WhatsappService");
         // whatsapp client commands.
         let writePermission = red.auth.needsPermission("inject.write");
+        let readPermission = red.auth.needsPermission("nodes.read");
+        red.httpAdmin.get("/whatsapp/accounts", readPermission, (request, response) => this.getAccounts(request, response));
         red.httpAdmin.post("/whatsapp/linkaccount", writePermission, (request, response) => this.linkAccount(request, response));
         red.httpAdmin.post("/whatsapp/unlinkaccount", writePermission, (request, response) => this.unlinkaccount(request, response));
         red.httpAdmin.post("/whatsapp/getgroups", writePermission, (request, response) => this.getGroups(request, response));
@@ -28,9 +49,6 @@ class WhatsappService extends node_red_plugincore_1.BaseService {
         red.httpAdmin.post("/whatsapp/groupupdateuser", writePermission, (request, response) => this.groupUpdateUser(request, response));
         red.httpAdmin.post("/whatsapp/groupremoveuser", writePermission, (request, response) => this.groupRemoveUser(request, response));
         try {
-            // TODO: change the way we determine a suitable sorage location for the whatsapp data.
-            // if the /data folder exists, then this is probably a custom image and we can safely store the information in /data
-            // if it doesnt exist, then just save it to the current working folder.
             if (fs_1.default.existsSync("/data")) {
                 console.log("Using /data as storage location");
                 this.configDir = "/data/whatsapp";
@@ -39,7 +57,6 @@ class WhatsappService extends node_red_plugincore_1.BaseService {
                 this.configDir = "whatsapp";
             }
             this.configFile = this.configDir + "/connections.json";
-            // check if the directory exists.
             if (!fs_1.default.existsSync(this.configDir)) {
                 fs_1.default.mkdirSync(this.configDir);
             }
@@ -56,7 +73,9 @@ class WhatsappService extends node_red_plugincore_1.BaseService {
                     localConnectionId: connection.key,
                     fileStorageRoot: this.configDir
                 });
-                WhatsappService.clients[connection.key] = client;
+                WhatsappService_1.clients()[connection.key] = client;
+                // save account details (name, phone) to connections.json after each reconnect
+                client.onConnectionSuccess(() => this.saveConnectionDetails(connection.key));
                 return client.start();
             }));
         }
@@ -64,11 +83,47 @@ class WhatsappService extends node_red_plugincore_1.BaseService {
             console.log(error);
         }
     }
+    saveConnectionDetails(key) {
+        try {
+            const client = WhatsappService_1.clients()[key];
+            if (!client)
+                return;
+            const details = client.details();
+            if (!details)
+                return;
+            const conn = this.connections.find(c => c.key === key);
+            if (conn) {
+                conn.name = details.name;
+                conn.phoneNumber = details.msisdn;
+                fs_1.default.writeFileSync(this.configFile, JSON.stringify(this.connections, null, 2), { flag: "w+" });
+            }
+        }
+        catch (e) {
+            console.log("saveConnectionDetails failed", e);
+        }
+    }
+    getAccounts(request, response) {
+        // collect localConnectionIds claimed by WhatsappAccountConfigNodes in the current flow
+        const claimedKeys = new Set();
+        this.red.nodes.eachNode((nodeConfig) => {
+            if (nodeConfig.type === 'WhatsappAccountConfigNode' && nodeConfig.localConnectionId) {
+                claimedKeys.add(nodeConfig.localConnectionId);
+            }
+        });
+        const accounts = this.connections.map(connection => ({
+            key: connection.key,
+            name: connection.name,
+            phoneNumber: connection.phoneNumber,
+            connected: !!WhatsappService_1.clients()[connection.key],
+            claimed: claimedKeys.has(connection.key),
+        }));
+        response.send(accounts);
+    }
     deinit(red) {
         console.log("STOPPING: WhatsappService");
     }
     static getClient(localConnectionId) {
-        return this.clients[localConnectionId];
+        return WhatsappService_1.clients()[localConnectionId];
     }
     linkAccount(request, response) {
         let linkRequest = request.body;
@@ -116,15 +171,16 @@ class WhatsappService extends node_red_plugincore_1.BaseService {
             // make sure we havent got this connection already.
             let knownConnection = this.connections.find(connection => connection.key === linkRequest.localConnectionId);
             if (!knownConnection) {
-                this.connections.push({
-                    key: linkRequest.localConnectionId
-                });
+                this.connections.push({ key: linkRequest.localConnectionId });
+                // ensure the new entry exists before saveConnectionDetails tries to update it
                 fs_1.default.writeFileSync(this.configFile, JSON.stringify(this.connections, null, 2), { flag: "w+" });
             }
+            // save account details (name, phone) to disk
+            this.saveConnectionDetails(linkRequest.localConnectionId);
             // stop the timeout timer, and move client from tempclients to clients.
             clearTimeout(timeoutTimer);
             delete this.tempClients[linkRequest.localConnectionId];
-            WhatsappService.clients[linkRequest.localConnectionId] = client;
+            WhatsappService_1.clients()[linkRequest.localConnectionId] = client;
             // send a notification to the frontend.
             red.events.emit("runtime-event", {
                 id: "whatsapp/" + linkRequest.localConnectionId,
@@ -140,10 +196,10 @@ class WhatsappService extends node_red_plugincore_1.BaseService {
     unlinkaccount(request, response) {
         let unlinkAccountRequest = request.body;
         // get an instance of the client and stop it.
-        let client = WhatsappService.clients[unlinkAccountRequest.localConnectionId];
+        let client = WhatsappService_1.clients()[unlinkAccountRequest.localConnectionId];
         let deleteAccountData = () => {
             // after stopping the client, remove it from the clients list, update the connections file, and remove its storage.
-            delete WhatsappService.clients[unlinkAccountRequest.localConnectionId];
+            delete WhatsappService_1.clients()[unlinkAccountRequest.localConnectionId];
             this.connections = this.connections.filter(connection => connection.key !== unlinkAccountRequest.localConnectionId);
             fs_1.default.writeFileSync(this.configFile, JSON.stringify(this.connections, null, 2), { flag: "w+" });
             fs_1.default.rmSync(this.configDir + "/" + unlinkAccountRequest.localConnectionId, { recursive: true });
@@ -158,7 +214,7 @@ class WhatsappService extends node_red_plugincore_1.BaseService {
         }
     }
     async getGroups(request, response) {
-        let client = WhatsappService.clients[request.body.localConnectionId];
+        let client = WhatsappService_1.clients()[request.body.localConnectionId];
         if (client) {
             response.send(await client.groups().getAll());
         }
@@ -167,7 +223,7 @@ class WhatsappService extends node_red_plugincore_1.BaseService {
         }
     }
     async createGroup(request, response) {
-        let client = WhatsappService.clients[request.body.localConnectionId];
+        let client = WhatsappService_1.clients()[request.body.localConnectionId];
         if (client) {
             response.send(await client.groups().createGroup(request.body.groupName));
         }
@@ -176,7 +232,7 @@ class WhatsappService extends node_red_plugincore_1.BaseService {
         }
     }
     async groupAddUser(request, response) {
-        let client = WhatsappService.clients[request.body.localConnectionId];
+        let client = WhatsappService_1.clients()[request.body.localConnectionId];
         if (client) {
             await client.groups().addUserToGroup(request.body.userId, request.body.groupId, request.body.role);
             response.send({ status: "ok" });
@@ -186,7 +242,7 @@ class WhatsappService extends node_red_plugincore_1.BaseService {
         }
     }
     async groupUpdateUser(request, response) {
-        let client = WhatsappService.clients[request.body.localConnectionId];
+        let client = WhatsappService_1.clients()[request.body.localConnectionId];
         if (client) {
             await client.groups().updateUserRole(request.body.userId, request.body.groupId, request.body.role);
             response.send({ status: "ok" });
@@ -196,7 +252,7 @@ class WhatsappService extends node_red_plugincore_1.BaseService {
         }
     }
     async groupRemoveUser(request, response) {
-        let client = WhatsappService.clients[request.body.localConnectionId];
+        let client = WhatsappService_1.clients()[request.body.localConnectionId];
         if (client) {
             await client.groups().removeUserFromGroup(request.body.userId, request.body.groupId);
             response.send({ status: "ok" });
@@ -205,8 +261,14 @@ class WhatsappService extends node_red_plugincore_1.BaseService {
             response.status(500).send({ message: "Client not linked" });
         }
     }
-    static getServiceDescriptor() {
-        return new node_red_plugincore_1.ServiceDescriptor("@theotherwillembotha/whatsappservice", "WhatsappService", "integration-plugin", "./whatsapp/service/WhatsappService", WhatsappService);
-    }
-}
+};
 exports.WhatsappService = WhatsappService;
+exports.WhatsappService = WhatsappService = WhatsappService_1 = __decorate([
+    (0, node_red_plugincore_1.ServiceDescription)({
+        id: "@theotherwillembotha/whatsappservice",
+        name: "WhatsappService",
+        type: "integration-plugin",
+        sourceFile: "./whatsapp/service/WhatsappService",
+    }),
+    __metadata("design:paramtypes", [])
+], WhatsappService);

package/build/whatsapp/service/WhatsappStore.d.ts

@@ -0,0 +1,127 @@
+import { EntityManager } from "typeorm";
+import { ChatType } from "./WhatsappClient";
+export declare class WhatsappStore implements DAOService {
+    static createStore(id: string, location: string): Promise<WhatsappStore>;
+    private _id;
+    private _location;
+    private _datasource;
+    private _contacts;
+    private _chats;
+    private _messages;
+    private constructor();
+    chats(): ChatDAO;
+    contacts(): ContactDAO;
+    messages(): MessageDAO;
+}
+interface DAOService {
+    chats(): ChatDAO;
+    contacts(): ContactDAO;
+    messages(): MessageDAO;
+}
+declare abstract class DAO<EntityType> {
+    private _daos;
+    private _em;
+    constructor(daos: DAOService, em: EntityManager);
+    protected daos(): DAOService;
+    protected em(): EntityManager;
+    abstract get(id: string): Promise<EntityType | null>;
+    abstract all(): Promise<EntityType[]>;
+    abstract create(...params: any): Promise<EntityType>;
+}
+declare enum ContactType {
+    USER = "USER",
+    GROUP = "GROUP"
+}
+declare class Contact {
+    /**
+     * Account ID of the whatsapp user eg: "<phone>@s.whatsapp.net"
+     */
+    id: string;
+    type?: ContactType;
+    phoneNumber?: string;
+    name?: string;
+    lid?: string;
+    participants: Participant[];
+    constructor(id: string);
+    getName(): string | undefined;
+}
+declare class ContactDAO extends DAO<Contact> {
+    constructor(daos: DAOService, em: EntityManager);
+    get(id: string): Promise<Contact>;
+    all(): Promise<Contact[]>;
+    create(id: string): Promise<Contact>;
+    save(contact: Contact): Promise<Contact>;
+    getByLid(lid: string): Promise<Contact | null>;
+}
+export declare enum Role {
+    Admin = "Admin",
+    SuperAdmin = "SuperAdmin",
+    Member = "Member"
+}
+declare class Chat {
+    id: string;
+    type: string;
+    lid: string;
+    owner: string;
+    name: string;
+    description: string;
+    participants: Participant[];
+    messages: Message[];
+    constructor(id: string, lid: string, type: ChatType, owner: string, name: string, description: string);
+    addParticipant(contact: Contact, role: Role): Chat;
+}
+declare class ChatDAO extends DAO<Chat> {
+    constructor(daos: DAOService, em: EntityManager);
+    get(id: string): Promise<Chat | null>;
+    all(): Promise<Chat[]>;
+    create(id: string, lid: string, type: ChatType, owner: string, name: string, description: string): Promise<Chat>;
+    getWithParticipants(id: string): Promise<Chat | null>;
+    getGroups(): Promise<Chat[]>;
+    save(chat: Chat): Promise<Chat>;
+    delete(chatId: string): Promise<void>;
+    removeParticipants(chatId: string, contactIds: string[]): Promise<void>;
+    updateParticipantRole(chatId: string, contactId: string, role: Role): Promise<void>;
+    updateParticipantLabel(chatId: string, contactId: string, label: string): Promise<void>;
+}
+declare class Participant {
+    id: string;
+    chat: Chat;
+    contact: Contact;
+    role: Role;
+    label: string | undefined;
+    constructor(chat: Chat, contact: Contact, role: Role);
+}
+declare class Message {
+    id: string;
+    chat: Chat;
+    timestamp: number;
+    type: MessageType;
+    payload: string;
+    constructor(id: string, chat: Chat, timestamp: number, type: MessageType, payload: string);
+}
+declare class MessageDAO extends DAO<Message> {
+    constructor(daos: DAOService, em: EntityManager);
+    get(id: string): Promise<Message | null>;
+    all(): Promise<Message[]>;
+    create(chat: Chat, id: string, timestamp: number, type: MessageType, payload: string): Promise<Message>;
+}
+export declare enum MessageType {
+    Text = "Text",
+    Unknown = "Unknown",
+    Image = "Image",
+    Video = "Video",
+    Document = "Document",
+    Template = "Template",
+    ExtendedText = "ExtendedText",
+    Album = "Album",
+    Stub = "Stub",
+    Contact = "Contact",
+    Interactive = "Interactive",
+    Location = "Location",
+    LiveLocation = "LiveLocation",
+    Event = "Event",
+    EventResponse = "EventResponse",
+    Sticker = "Sticker"
+}
+export { Contact, Chat, Message };
+//# sourceMappingURL=WhatsappStore.d.ts.map

package/build/whatsapp/service/WhatsappStore.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"WhatsappStore.d.ts","sourceRoot":"","sources":["../../../src/whatsapp/service/WhatsappStore.ts"],"names":[],"mappings":"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"}

package/build/whatsapp/service/WhatsappStore.js

@@ -233,20 +233,20 @@ class ChatDAO extends DAO {
     async getWithParticipants(id) {
         return this.em().findOne(Chat, {
             where: { id },
-            relations: ['participants', 'participants.contact']
+            relations: { participants: { contact: true } }
         });
     }
     async getGroups() {
         return this.em().find(Chat, {
             where: { type: WhatsappClient_1.ChatType.Group },
-            relations: ['participants', 'participants.contact']
+            relations: { participants: { contact: true } }
         });
     }
     async save(chat) {
         return this.em().save(chat);
     }
     async delete(chatId) {
-        const chat = await this.em().findOne(Chat, { where: { id: chatId }, relations: ['participants'] });
+        const chat = await this.em().findOne(Chat, { where: { id: chatId }, relations: { participants: true } });
         if (chat) {
             await this.em().remove(chat);
         }
@@ -254,7 +254,7 @@ class ChatDAO extends DAO {
     async removeParticipants(chatId, contactIds) {
         const chat = await this.em().findOne(Chat, {
             where: { id: chatId },
-            relations: ['participants', 'participants.contact']
+            relations: { participants: { contact: true } }
         });
         if (!chat)
             return;
@@ -264,7 +264,7 @@ class ChatDAO extends DAO {
     async updateParticipantRole(chatId, contactId, role) {
         const chat = await this.em().findOne(Chat, {
             where: { id: chatId },
-            relations: ['participants', 'participants.contact']
+            relations: { participants: { contact: true } }
         });
         if (!chat)
             return;
@@ -277,7 +277,7 @@ class ChatDAO extends DAO {
     async updateParticipantLabel(chatId, contactId, label) {
         const chat = await this.em().findOne(Chat, {
             where: { id: chatId },
-            relations: ['participants', 'participants.contact']
+            relations: { participants: { contact: true } }
         });
         if (!chat)
             return;
@@ -367,7 +367,7 @@ class MessageDAO extends DAO {
     }
     async create(chat, id, timestamp, type, payload) {
         // first check if the client exists.
-        let message = await this.em().findOneBy(Message, { id: id, chat: chat });
+        let message = await this.em().findOneBy(Message, { id: id, chat: { id: chat.id } });
         if (message) {
             let modified = true;
             if (message.timestamp !== timestamp) {
@@ -405,4 +405,7 @@ var MessageType;
     MessageType["Interactive"] = "Interactive";
     MessageType["Location"] = "Location";
     MessageType["LiveLocation"] = "LiveLocation";
+    MessageType["Event"] = "Event";
+    MessageType["EventResponse"] = "EventResponse";
+    MessageType["Sticker"] = "Sticker";
 })(MessageType || (exports.MessageType = MessageType = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@theotherwillembotha/node-red-whatsapp",
-  "version": "0.0.55",
+  "version": "0.4.0",
   "description": "Node-RED nodes for WhatsApp messaging via the Baileys library.",
   "author": "Willem Botha (@theotherwillembotha)",
   "license": "ISC",
@@ -13,12 +13,14 @@
   ],
   "main": "./build/index.js",
   "exports": "./build/index.js",
+  "types": "./build/index.d.ts",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "npm run clean && tsc && npm run generate-nodes && npm run copy-files",
+    "build": "npm run clean && tsc && npm run generate-nodes && npm run bundle && npm run copy-files",
     "clean": "rm -rf ./build",
     "typeorm": "typeorm-ts-node-commonjs",
     "generate-nodes": "node build/GenerateNodes.js",
+    "bundle": "node esbuild.js",
     "copy-files": "cp -r ./icons ./build/"
   },
   "files": [
@@ -43,20 +45,21 @@
     "nodered": ">=4.0.0"
   },
   "dependencies": {
-    "@theotherwillembotha/node-red-plugincore": "^0.0.55",
-    "baileys": "7.0.0-rc11",
-    "handlebars": "^4.7.8",
+    "@theotherwillembotha/node-red-plugincore": "^0.4.2",
+    "baileys": "7.0.0-rc14",
+    "handlebars": "^4.7.9",
     "node-cache": "^5.1.2",
     "qrcode": "^1.5.4",
-    "sql.js": "^1.13.0",
-    "typeorm": "^0.3.28",
-    "uuid": "^13.0.0"
+    "sql.js": "^1.14.1",
+    "typeorm": "^1.0.0",
+    "uuid": "^14.0.1"
   },
   "devDependencies": {
     "@theotherwillembotha/node-red-plugincore": "../nodered_plugincore",
     "@types/node": "^22.15.16",
     "@types/node-red": "~1.3.5",
     "@types/qrcode": "^1.5.6",
+    "esbuild": "^0.25.0",
     "ts-node": "^10.9.2"
   },
   "node-red": {