Pin to @whiskeysockets/baileys 7.0.0-rc.9 and remove auth fallback
This commit is contained in:
@@ -31,7 +31,7 @@
|
|||||||
},
|
},
|
||||||
"packageManager": "pnpm@10.23.0",
|
"packageManager": "pnpm@10.23.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"baileys": "^7.0.0-rc.9",
|
"@whiskeysockets/baileys": "7.0.0-rc.9",
|
||||||
"body-parser": "^2.2.0",
|
"body-parser": "^2.2.0",
|
||||||
"chalk": "^5.6.2",
|
"chalk": "^5.6.2",
|
||||||
"commander": "^14.0.2",
|
"commander": "^14.0.2",
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
|||||||
import type { MockBaileysSocket } from "../test/mocks/baileys.js";
|
import type { MockBaileysSocket } from "../test/mocks/baileys.js";
|
||||||
import { createMockBaileys } from "../test/mocks/baileys.js";
|
import { createMockBaileys } from "../test/mocks/baileys.js";
|
||||||
|
|
||||||
vi.mock("baileys", () => {
|
vi.mock("@whiskeysockets/baileys", () => {
|
||||||
const created = createMockBaileys();
|
const created = createMockBaileys();
|
||||||
(globalThis as Record<PropertyKey, unknown>)[
|
(globalThis as Record<PropertyKey, unknown>)[
|
||||||
Symbol.for("warelay:lastSocket")
|
Symbol.for("warelay:lastSocket")
|
||||||
@@ -35,8 +35,8 @@ import {
|
|||||||
} from "./provider-web.js";
|
} from "./provider-web.js";
|
||||||
|
|
||||||
const baileys = (await import(
|
const baileys = (await import(
|
||||||
"baileys"
|
"@whiskeysockets/baileys"
|
||||||
)) as unknown as typeof import("baileys") & {
|
)) as unknown as typeof import("@whiskeysockets/baileys") & {
|
||||||
makeWASocket: ReturnType<typeof vi.fn>;
|
makeWASocket: ReturnType<typeof vi.fn>;
|
||||||
useSingleFileAuthState: ReturnType<typeof vi.fn>;
|
useSingleFileAuthState: ReturnType<typeof vi.fn>;
|
||||||
fetchLatestBaileysVersion: ReturnType<typeof vi.fn>;
|
fetchLatestBaileysVersion: ReturnType<typeof vi.fn>;
|
||||||
|
|||||||
@@ -1,8 +1,14 @@
|
|||||||
import fs from "node:fs/promises";
|
import fs from "node:fs/promises";
|
||||||
import os from "node:os";
|
import os from "node:os";
|
||||||
import path from "node:path";
|
import path from "node:path";
|
||||||
import * as Baileys from "baileys";
|
import {
|
||||||
import type { proto } from "baileys";
|
DisconnectReason,
|
||||||
|
fetchLatestBaileysVersion,
|
||||||
|
makeCacheableSignalKeyStore,
|
||||||
|
makeWASocket,
|
||||||
|
useSingleFileAuthState,
|
||||||
|
} from "@whiskeysockets/baileys";
|
||||||
|
import type { proto } from "@whiskeysockets/baileys";
|
||||||
import pino from "pino";
|
import pino from "pino";
|
||||||
import qrcode from "qrcode-terminal";
|
import qrcode from "qrcode-terminal";
|
||||||
import { danger, info, logVerbose, success } from "./globals.js";
|
import { danger, info, logVerbose, success } from "./globals.js";
|
||||||
@@ -16,13 +22,13 @@ const WA_WEB_AUTH_FILE = path.join(
|
|||||||
|
|
||||||
export async function createWaSocket(printQr: boolean, verbose: boolean) {
|
export async function createWaSocket(printQr: boolean, verbose: boolean) {
|
||||||
await ensureDir(path.dirname(WA_WEB_AUTH_FILE));
|
await ensureDir(path.dirname(WA_WEB_AUTH_FILE));
|
||||||
const { state, saveState } = await resolveAuthState(WA_WEB_AUTH_FILE);
|
const { state, saveState } = await useSingleFileAuthState(WA_WEB_AUTH_FILE);
|
||||||
const { version } = await Baileys.fetchLatestBaileysVersion();
|
const { version } = await fetchLatestBaileysVersion();
|
||||||
const logger = pino({ level: verbose ? "info" : "silent" });
|
const logger = pino({ level: verbose ? "info" : "silent" });
|
||||||
const sock = Baileys.makeWASocket({
|
const sock = makeWASocket({
|
||||||
auth: {
|
auth: {
|
||||||
creds: state.creds,
|
creds: state.creds,
|
||||||
keys: Baileys.makeCacheableSignalKeyStore(state.keys, logger),
|
keys: makeCacheableSignalKeyStore(state.keys, logger),
|
||||||
},
|
},
|
||||||
version,
|
version,
|
||||||
logger,
|
logger,
|
||||||
@@ -35,7 +41,7 @@ export async function createWaSocket(printQr: boolean, verbose: boolean) {
|
|||||||
sock.ev.on("creds.update", saveState);
|
sock.ev.on("creds.update", saveState);
|
||||||
sock.ev.on(
|
sock.ev.on(
|
||||||
"connection.update",
|
"connection.update",
|
||||||
(update: Partial<import("baileys").ConnectionState>) => {
|
(update: Partial<import("@whiskeysockets/baileys").ConnectionState>) => {
|
||||||
const { connection, lastDisconnect, qr } = update;
|
const { connection, lastDisconnect, qr } = update;
|
||||||
if (qr && printQr) {
|
if (qr && printQr) {
|
||||||
console.log("Scan this QR in WhatsApp (Linked Devices):");
|
console.log("Scan this QR in WhatsApp (Linked Devices):");
|
||||||
|
|||||||
Reference in New Issue
Block a user