rixleys 1.0.0

package/lib/Socket/groups.js

@@ -0,0 +1,418 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.extractGroupMetadata = exports.makeGroupsSocket = void 0;
+const WAProto_1 = require("../../WAProto");
+const Types_1 = require("../Types");
+const Utils_1 = require("../Utils");
+const WABinary_1 = require("../WABinary");
+const chats_1 = require("./chats");
+const makeGroupsSocket = (config) => {
+    const sock = (0, chats_1.makeChatsSocket)(config);
+    const { authState, ev, query, upsertMessage } = sock;
+    const groupQuery = async (jid, type, content) => (query({
+        tag: 'iq',
+        attrs: {
+            type,
+            xmlns: 'w:g2',
+            to: jid,
+        },
+        content
+    }));
+    const groupMetadata = async (jid) => {
+        const result = await groupQuery(jid, 'get', [{ tag: 'query', attrs: { request: 'interactive' } }]);
+        return (0, exports.extractGroupMetadata)(result);
+    };
+    const groupFetchAllParticipating = async () => {
+        const result = await query({
+            tag: 'iq',
+            attrs: {
+                to: '@g.us',
+                xmlns: 'w:g2',
+                type: 'get',
+            },
+            content: [
+                {
+                    tag: 'participating',
+                    attrs: {},
+                    content: [
+                        { tag: 'participants', attrs: {} },
+                        { tag: 'description', attrs: {} }
+                    ]
+                }
+            ]
+        });
+        const data = {};
+        const groupsChild = (0, WABinary_1.getBinaryNodeChild)(result, 'groups');
+        if (groupsChild) {
+            const groups = (0, WABinary_1.getBinaryNodeChildren)(groupsChild, 'group');
+            for (const groupNode of groups) {
+                const meta = (0, exports.extractGroupMetadata)({
+                    tag: 'result',
+                    attrs: {},
+                    content: [groupNode]
+                });
+                data[meta.id] = meta;
+            }
+        }
+        sock.ev.emit('groups.update', Object.values(data));
+        return data;
+    };
+    sock.ws.on('CB:ib,,dirty', async (node) => {
+        const { attrs } = (0, WABinary_1.getBinaryNodeChild)(node, 'dirty');
+        if (attrs.type !== 'groups') {
+            return;
+        }
+        await groupFetchAllParticipating();
+        await sock.cleanDirtyBits('groups');
+    });
+    return {
+        ...sock,
+        groupQuery,
+        groupMetadata,
+        groupCreate: async (subject, participants) => {
+            const key = (0, Utils_1.generateMessageIDV2)();
+            const result = await groupQuery('@g.us', 'set', [
+                {
+                    tag: 'create',
+                    attrs: {
+                        subject,
+                        key
+                    },
+                    content: participants.map(jid => ({
+                        tag: 'participant',
+                        attrs: { jid }
+                    }))
+                }
+            ]);
+            return (0, exports.extractGroupMetadata)(result);
+        },
+        groupLeave: async (id) => {
+            await groupQuery('@g.us', 'set', [
+                {
+                    tag: 'leave',
+                    attrs: {},
+                    content: [
+                        { tag: 'group', attrs: { id } }
+                    ]
+                }
+            ]);
+        },
+        groupUpdateSubject: async (jid, subject) => {
+            await groupQuery(jid, 'set', [
+                {
+                    tag: 'subject',
+                    attrs: {},
+                    content: Buffer.from(subject, 'utf-8')
+                }
+            ]);
+        },
+        groupRequestParticipantsList: async (jid) => {
+            const result = await groupQuery(jid, 'get', [
+                {
+                    tag: 'membership_approval_requests',
+                    attrs: {}
+                }
+            ]);
+            const node = (0, WABinary_1.getBinaryNodeChild)(result, 'membership_approval_requests');
+            const participants = (0, WABinary_1.getBinaryNodeChildren)(node, 'membership_approval_request');
+            return participants.map(v => v.attrs);
+        },
+        groupRequestParticipantsUpdate: async (jid, participants, action) => {
+            const result = await groupQuery(jid, 'set', [{
+                    tag: 'membership_requests_action',
+                    attrs: {},
+                    content: [
+                        {
+                            tag: action,
+                            attrs: {},
+                            content: participants.map(jid => ({
+                                tag: 'participant',
+                                attrs: { jid }
+                            }))
+                        }
+                    ]
+                }]);
+            const node = (0, WABinary_1.getBinaryNodeChild)(result, 'membership_requests_action');
+            const nodeAction = (0, WABinary_1.getBinaryNodeChild)(node, action);
+            const participantsAffected = (0, WABinary_1.getBinaryNodeChildren)(nodeAction, 'participant');
+            return participantsAffected.map(p => {
+                return { status: p.attrs.error || '200', jid: p.attrs.jid };
+            });
+        },
+        groupParticipantsUpdate: async (jid, participants, action) => {
+            const result = await groupQuery(jid, 'set', [
+                {
+                    tag: action,
+                    attrs: {},
+                    content: participants.map(jid => ({
+                        tag: 'participant',
+                        attrs: { jid }
+                    }))
+                }
+            ]);
+            const node = (0, WABinary_1.getBinaryNodeChild)(result, action);
+            const participantsAffected = (0, WABinary_1.getBinaryNodeChildren)(node, 'participant');
+            return participantsAffected.map(p => {
+                return { status: p.attrs.error || '200', jid: p.attrs.jid, content: p };
+            });
+        },
+        groupUpdateDescription: async (jid, description) => {
+            var _a;
+            const metadata = await groupMetadata(jid);
+            const prev = (_a = metadata.descId) !== null && _a !== void 0 ? _a : null;
+            await groupQuery(jid, 'set', [
+                {
+                    tag: 'description',
+                    attrs: {
+                        ...(description ? { id: (0, Utils_1.generateMessageIDV2)() } : { delete: 'true' }),
+                        ...(prev ? { prev } : {})
+                    },
+                    content: description ? [
+                        { tag: 'body', attrs: {}, content: Buffer.from(description, 'utf-8') }
+                    ] : undefined
+                }
+            ]);
+        },
+        groupInviteCode: async (jid) => {
+            const result = await groupQuery(jid, 'get', [{ tag: 'invite', attrs: {} }]);
+            const inviteNode = (0, WABinary_1.getBinaryNodeChild)(result, 'invite');
+            return inviteNode === null || inviteNode === void 0 ? void 0 : inviteNode.attrs.code;
+        },
+        groupRevokeInvite: async (jid) => {
+            const result = await groupQuery(jid, 'set', [{ tag: 'invite', attrs: {} }]);
+            const inviteNode = (0, WABinary_1.getBinaryNodeChild)(result, 'invite');
+            return inviteNode === null || inviteNode === void 0 ? void 0 : inviteNode.attrs.code;
+        },
+        groupAcceptInvite: async (code) => {
+            const results = await groupQuery('@g.us', 'set', [{ tag: 'invite', attrs: { code } }]);
+            const result = (0, WABinary_1.getBinaryNodeChild)(results, 'group');
+            return result === null || result === void 0 ? void 0 : result.attrs.jid;
+        },
+        /**
+         * revoke a v4 invite for someone
+         * @param groupJid group jid
+         * @param invitedJid jid of person you invited
+         * @returns true if successful
+         */
+        groupRevokeInviteV4: async (groupJid, invitedJid) => {
+            const result = await groupQuery(groupJid, 'set', [{ tag: 'revoke', attrs: {}, content: [{ tag: 'participant', attrs: { jid: invitedJid } }] }]);
+            return !!result;
+        },
+        /**
+         * accept a GroupInviteMessage
+         * @param key the key of the invite message, or optionally only provide the jid of the person who sent the invite
+         * @param inviteMessage the message to accept
+         */
+        groupAcceptInviteV4: ev.createBufferedFunction(async (key, inviteMessage) => {
+            var _a;
+            key = typeof key === 'string' ? { remoteJid: key } : key;
+            const results = await groupQuery(inviteMessage.groupJid, 'set', [{
+                    tag: 'accept',
+                    attrs: {
+                        code: inviteMessage.inviteCode,
+                        expiration: inviteMessage.inviteExpiration.toString(),
+                        admin: key.remoteJid
+                    }
+                }]);
+            // if we have the full message key
+            // update the invite message to be expired
+            if (key.id) {
+                // create new invite message that is expired
+                inviteMessage = WAProto_1.proto.Message.GroupInviteMessage.fromObject(inviteMessage);
+                inviteMessage.inviteExpiration = 0;
+                inviteMessage.inviteCode = '';
+                ev.emit('messages.update', [
+                    {
+                        key,
+                        update: {
+                            message: {
+                                groupInviteMessage: inviteMessage
+                            }
+                        }
+                    }
+                ]);
+            }
+            // generate the group add message
+            await upsertMessage({
+                key: {
+                    remoteJid: inviteMessage.groupJid,
+                    id: (0, Utils_1.generateMessageIDV2)((_a = sock.user) === null || _a === void 0 ? void 0 : _a.id),
+                    fromMe: false,
+                    participant: key.remoteJid,
+                },
+                messageStubType: Types_1.WAMessageStubType.GROUP_PARTICIPANT_ADD,
+                messageStubParameters: [
+                    authState.creds.me.id
+                ],
+                participant: key.remoteJid,
+                messageTimestamp: (0, Utils_1.unixTimestampSeconds)()
+            }, 'notify');
+            return results.attrs.from;
+        }),
+        groupGetInviteInfo: async (code) => {
+            const results = await groupQuery('@g.us', 'get', [{ tag: 'invite', attrs: { code } }]);
+            return (0, exports.extractGroupMetadata)(results);
+        },
+        groupToggleEphemeral: async (jid, ephemeralExpiration) => {
+            const content = ephemeralExpiration ?
+                { tag: 'ephemeral', attrs: { expiration: ephemeralExpiration.toString() } } :
+                { tag: 'not_ephemeral', attrs: {} };
+            await groupQuery(jid, 'set', [content]);
+        },
+        groupSettingUpdate: async (jid, setting) => {
+            await groupQuery(jid, 'set', [{ tag: setting, attrs: {} }]);
+        },
+        groupMemberAddMode: async (jid, mode) => {
+            await groupQuery(jid, 'set', [{ tag: 'member_add_mode', attrs: {}, content: mode }]);
+        },
+        groupJoinApprovalMode: async (jid, mode) => {
+            await groupQuery(jid, 'set', [{ tag: 'membership_approval_mode', attrs: {}, content: [{ tag: 'group_join', attrs: { state: mode } }] }]);
+        },
+        groupFetchAllParticipating,
+
+        // ==========================================
+        // EASY GROUP MEMBER & SETTING HELPERS (PROMPT)
+        // ==========================================
+        kickMember: async (chatId, targetJid) => {
+            const list = Array.isArray(targetJid) ? targetJid : [targetJid];
+            return sock.groupParticipantsUpdate(chatId, list, 'remove');
+        },
+        addMember: async (chatId, targetJid) => {
+            const list = Array.isArray(targetJid) ? targetJid : [targetJid];
+            return sock.groupParticipantsUpdate(chatId, list, 'add');
+        },
+        promoteMember: async (chatId, targetJid) => {
+            const list = Array.isArray(targetJid) ? targetJid : [targetJid];
+            return sock.groupParticipantsUpdate(chatId, list, 'promote');
+        },
+        demoteMember: async (chatId, targetJid) => {
+            const list = Array.isArray(targetJid) ? targetJid : [targetJid];
+            return sock.groupParticipantsUpdate(chatId, list, 'demote');
+        },
+        openGroup: async (chatId) => {
+            return sock.groupSettingUpdate(chatId, 'not_announcement');
+        },
+        closeGroup: async (chatId) => {
+            return sock.groupSettingUpdate(chatId, 'announcement');
+        },
+        lockGroup: async (chatId) => {
+            return sock.groupSettingUpdate(chatId, 'locked');
+        },
+        unlockGroup: async (chatId) => {
+            return sock.groupSettingUpdate(chatId, 'unlocked');
+        },
+        updateGroupSubject: async (chatId, subject) => {
+            return sock.groupUpdateSubject(chatId, subject);
+        },
+        updateGroupDescription: async (chatId, description) => {
+            return sock.groupUpdateDescription(chatId, description);
+        },
+
+        // ==========================================
+        // SEND GROUP STATUS / STORY HELPER (SWGC)
+        // ==========================================
+        sendStatusGc: async (chatId, content, options = {}) => {
+            const crypto = require('crypto');
+            const messages = require('../Utils/messages');
+
+            let contentToSend = { ...content };
+            let extraOptions = {
+                upload: sock.waUploadToServer,
+                ...options
+            };
+
+            // If text status without background color, generate random color if not specified
+            if (contentToSend.text && !contentToSend.image && !contentToSend.video && !contentToSend.audio) {
+                if (!extraOptions.backgroundColor) {
+                    extraOptions.backgroundColor = '#' + Math.floor(Math.random() * 16777215).toString(16).padStart(6, '0');
+                }
+            }
+
+            const inside = await messages.generateWAMessageContent(contentToSend, extraOptions);
+            const messageSecret = crypto.randomBytes(32);
+
+            const msgToSend = messages.generateWAMessageFromContent(
+                chatId,
+                {
+                    groupStatusMessageV2: {
+                        message: {
+                            ...inside,
+                            messageContextInfo: {
+                                messageSecret
+                            }
+                        }
+                    }
+                },
+                options
+            );
+
+            await sock.relayMessage(chatId, msgToSend.message, {
+                messageId: msgToSend.key.id
+            });
+
+            return msgToSend;
+        },
+        sendGroupStatus: async (chatId, content, options = {}) => {
+            return sock.sendStatusGc(chatId, content, options);
+        }
+    };
+};
+exports.makeGroupsSocket = makeGroupsSocket;
+const extractGroupMetadata = (result) => {
+    var _a, _b;
+    const group = (0, WABinary_1.getBinaryNodeChild)(result, 'group');
+    const descChild = (0, WABinary_1.getBinaryNodeChild)(group, 'description');
+    let desc;
+    let descId;
+    let descOwner;
+    let descOwnerLid;
+    let descTime;
+    if (descChild) {
+        desc = (0, WABinary_1.getBinaryNodeChildString)(descChild, 'body');
+        descOwner = (0, WABinary_1.jidNormalizedUser)(descChild.attrs.participant_pn || descChild.attrs.participant);
+        if (group.attrs.addressing_mode === 'lid') {
+            descOwnerLid = (0, WABinary_1.jidNormalizedUser)(descChild.attrs.participant);
+        }
+        descId = descChild.attrs.id;
+        descTime = descChild.attrs.t ? +descChild.attrs.t : undefined;
+    }
+    const groupSize = group.attrs.size ? Number(group.attrs.size) : undefined;
+    const groupId = group.attrs.id.includes('@') ? group.attrs.id : (0, WABinary_1.jidEncode)(group.attrs.id, 'g.us');
+    const eph = (_a = (0, WABinary_1.getBinaryNodeChild)(group, 'ephemeral')) === null || _a === void 0 ? void 0 : _a.attrs.expiration;
+    const memberAddMode = (0, WABinary_1.getBinaryNodeChildString)(group, 'member_add_mode') === 'all_member_add';
+    const metadata = {
+        id: groupId,
+        addressingMode: group.attrs.addressing_mode,
+        subject: group.attrs.subject,
+        subjectOwner: (0, WABinary_1.jidNormalizedUser)(group.attrs.s_o_pn || group.attrs.s_o),
+        ...(group.attrs.addressing_mode === 'lid' ? { subjectOwnerLid: (0, WABinary_1.jidNormalizedUser)(group.attrs.s_o) } : {}),
+        subjectTime: group.attrs.s_t ? +group.attrs.s_t : undefined,
+        size: groupSize || (0, WABinary_1.getBinaryNodeChildren)(group, 'participant').length,
+        creation: group.attrs.creation ? +group.attrs.creation : undefined,
+        owner: (0, WABinary_1.jidNormalizedUser)(group.attrs.creator_pn || group.attrs.creator),
+        ...(group.attrs.addressing_mode === 'lid' ? { ownerLid: (0, WABinary_1.jidNormalizedUser)(group.attrs.creator) } : {}),
+        desc,
+        descId,
+        descOwner,
+        descOwnerLid,
+        descTime,
+        linkedParent: ((_b = (0, WABinary_1.getBinaryNodeChild)(group, 'linked_parent')) === null || _b === void 0 ? void 0 : _b.attrs.jid) || undefined,
+        restrict: !!(0, WABinary_1.getBinaryNodeChild)(group, 'locked'),
+        announce: !!(0, WABinary_1.getBinaryNodeChild)(group, 'announcement'),
+        isCommunity: !!(0, WABinary_1.getBinaryNodeChild)(group, 'parent'),
+        isCommunityAnnounce: !!(0, WABinary_1.getBinaryNodeChild)(group, 'default_sub_group'),
+        joinApprovalMode: !!(0, WABinary_1.getBinaryNodeChild)(group, 'membership_approval_mode'),
+        memberAddMode,
+        participants: (0, WABinary_1.getBinaryNodeChildren)(group, 'participant').map(({ attrs }) => {
+            return {
+                id: attrs.jid,
+                jid: attrs.phone_number || attrs.jid,
+                lid: attrs.lid || attrs.jid,
+                admin: (attrs.type || null),
+            };
+        }),
+        ephemeralDuration: eph ? +eph : undefined
+    };
+    return metadata;
+};
+exports.extractGroupMetadata = extractGroupMetadata;

package/lib/Socket/index.js

@@ -0,0 +1,238 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeWASocket = exports.Client = exports.makeWASocketAdvanced = void 0;
+
+const fs = require("fs");
+const path = require("path");
+const events = require("events");
+const pino = require("pino");
+const boom_1 = require("@hapi/boom");
+const qrcode_terminal = require("qrcode-terminal");
+const chalk = require("chalk");
+
+const business_1 = require("./business");
+const Defaults_1 = require("../Defaults");
+const Types_1 = require("../Types");
+const use_multi_file_auth_state_1 = require("../Utils/use-multi-file-auth-state");
+const serializer_1 = require("../Utils/serializer");
+
+/**
+ * Low-level standard socket creator
+ */
+const rawMakeWASocket = (config) =>
+    (0, business_1.makeBusinessSocket)({
+        ...Defaults_1.DEFAULT_CONNECTION_CONFIG,
+        ...config
+    });
+
+/**
+ * Advanced Client Wrapper Class
+ */
+class Client extends events.EventEmitter {
+    constructor(options = {}) {
+        super();
+        this.options = {
+            sessionName: "auth-session",
+            usePairingCode: false,
+            phoneNumber: "",
+            customPair: null,
+            autoReconnect: true,
+            maxReconnectAttempts: 10,
+            autoCleanSessionOnLogout: true,
+            printQRInTerminal: true,
+            logger: pino({ level: "silent" }),
+            browser: Defaults_1.DEFAULT_CONNECTION_CONFIG.browser,
+            ...options
+        };
+
+        this.sock = null;
+        this.reconnectAttempts = 0;
+        this.isClosed = false;
+        this.ev = new events.EventEmitter();
+
+        // Forward public events from this.ev to instance
+        const originalEmit = this.ev.emit.bind(this.ev);
+        this.ev.emit = (event, ...args) => {
+            originalEmit(event, ...args);
+            this.emit(event, ...args);
+        };
+
+        // Proxy socket methods directly to Client instance
+        return new Proxy(this, {
+            get: (target, prop) => {
+                if (prop in target) return target[prop];
+                if (target.sock && typeof target.sock[prop] === "function") {
+                    return target.sock[prop].bind(target.sock);
+                }
+                return target.sock?.[prop];
+            }
+        });
+    }
+
+    /**
+     * Start connecting to WhatsApp
+     */
+    async connect() {
+        const sessionPath = path.resolve(this.options.sessionName);
+        const { state, saveCreds } = await (0, use_multi_file_auth_state_1.useMultiFileAuthState)(sessionPath);
+
+        this.sock = rawMakeWASocket({
+            ...this.options,
+            auth: state,
+            printQRInTerminal: false // Handled internally
+        });
+
+        // Event: creds.update
+        this.sock.ev.on("creds.update", saveCreds);
+
+        // Auto Pairing Code Handler
+        if (this.options.usePairingCode && !this.sock.authState.creds.registered) {
+            setTimeout(async () => {
+                try {
+                    const phone = String(this.options.phoneNumber || "").replace(/[^0-9]/g, "");
+                    if (!phone) {
+                        console.log(chalk.red("❌ [Rixleys] Error: phoneNumber wajib diisi jika usePairingCode = true!"));
+                        return;
+                    }
+
+                    if (this.options.customPair && this.options.customPair.length === 8) {
+                        const code = await this.sock.requestPairingCode(phone, this.options.customPair);
+                        console.log(chalk.cyan(`🔑 [Rixleys] Kode Pairing Kustom: ${chalk.bold.yellow(code)}`));
+                    } else {
+                        const code = await this.sock.requestPairingCode(phone);
+                        console.log(chalk.cyan(`🔑 [Rixleys] Kode Pairing: ${chalk.bold.yellow(code)}`));
+                    }
+                } catch (err) {
+                    console.error("❌ [Rixleys] Gagal request pairing code:", err);
+                }
+            }, 2000);
+        }
+
+        // Connection update handler
+        this.sock.ev.on("connection.update", async (update) => {
+            const { connection, lastDisconnect, qr } = update;
+
+            // QR Code display
+            if (qr && !this.options.usePairingCode && this.options.printQRInTerminal) {
+                console.log(chalk.cyan("📱 [Rixleys] Pindai QR Code ini untuk login:"));
+                qrcode_terminal.generate(qr, { small: true });
+            }
+
+            if (connection === "open") {
+                this.reconnectAttempts = 0;
+                console.log(chalk.green("✅ [Rixleys] Berhasil terhubung ke WhatsApp!"));
+            }
+
+            if (connection === "close") {
+                const statusCode = (0, boom_1.isBoom)(lastDisconnect?.error)
+                    ? lastDisconnect?.error?.output?.statusCode
+                    : lastDisconnect?.error?.statusCode;
+
+                const isLoggedOut =
+                    statusCode === Types_1.DisconnectReason.loggedOut ||
+                    statusCode === Types_1.DisconnectReason.badSession;
+
+                if (isLoggedOut) {
+                    console.log(chalk.red(`🚪 [Rixleys] Sesi terputus / Logout (status: ${statusCode})`));
+                    if (this.options.autoCleanSessionOnLogout) {
+                        try {
+                            if (fs.existsSync(sessionPath)) {
+                                fs.rmSync(sessionPath, { recursive: true, force: true });
+                                console.log(chalk.yellow(`🗑️ [Rixleys] Folder sesi '${this.options.sessionName}' berhasil dibersihkan.`));
+                            }
+                        } catch (e) {
+                            console.error("❌ [Rixleys] Gagal menghapus folder sesi:", e);
+                        }
+                    }
+                    return;
+                }
+
+                if (this.options.autoReconnect && !this.isClosed) {
+                    if (this.reconnectAttempts < this.options.maxReconnectAttempts) {
+                        this.reconnectAttempts++;
+                        const delayMs = Math.min(this.reconnectAttempts * 2000, 10000);
+                        console.log(chalk.yellow(`🔌 [Rixleys] Koneksi putus (${statusCode}). Mencoba reconnect (${this.reconnectAttempts}/${this.options.maxReconnectAttempts}) dalam ${delayMs / 1000}s...`));
+                        setTimeout(() => this.connect(), delayMs);
+                    } else {
+                        console.log(chalk.red(`❌ [Rixleys] Mencapai batas maksimal reconnect (${this.options.maxReconnectAttempts}). Berhenti.`));
+                    }
+                }
+            }
+
+            // Forward event
+            this.ev.emit("connection.update", update);
+        });
+
+        // Forward messages.upsert with auto-serialization
+        this.sock.ev.on("messages.upsert", (upsert) => {
+            if (Array.isArray(upsert?.messages)) {
+                for (let i = 0; i < upsert.messages.length; i++) {
+                    (0, serializer_1.serialize)(this.sock, upsert.messages[i]);
+                }
+            }
+            this.ev.emit("messages.upsert", upsert);
+        });
+
+        // Forward other events from sock.ev to this.ev
+        const eventsList = [
+            "contacts.upsert",
+            "contacts.update",
+            "chats.upsert",
+            "chats.update",
+            "chats.delete",
+            "presence.update",
+            "message-receipt.update",
+            "messages.reaction",
+            "messages.update",
+            "messages.delete",
+            "group-participants.update",
+            "groups.update",
+            "blocklist.set",
+            "blocklist.update",
+            "call",
+            "labels.edit",
+            "labels.association"
+        ];
+
+        for (const evt of eventsList) {
+            this.sock.ev.on(evt, (...args) => this.ev.emit(evt, ...args));
+        }
+
+        return this;
+    }
+
+    /**
+     * Terminate connection
+     */
+    end(error) {
+        this.isClosed = true;
+        return this.sock?.end(error);
+    }
+}
+
+/**
+ * Universal makeWASocket:
+ * - If called with 'new makeWASocket(opts)' or opts contain 'sessionName', returns managed Client
+ * - If called as standard function makeWASocket(config), returns normal WASocket
+ */
+function makeWASocketUniversal(config = {}) {
+    // If called with new or user passed high-level wrapper options
+    if (
+        new.target ||
+        config.sessionName ||
+        typeof config.usePairingCode !== "undefined" ||
+        config.autoReconnect
+    ) {
+        const client = new Client(config);
+        client.connect();
+        return client;
+    }
+
+    return rawMakeWASocket(config);
+}
+
+exports.Client = Client;
+exports.makeWASocketAdvanced = makeWASocketUniversal;
+exports.makeWASocket = makeWASocketUniversal;
+exports.default = makeWASocketUniversal;