let5see/clawdbot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Unify relay entrypoint and default to web when available

Browse Source
This commit is contained in:
Peter Steinberger
2025-11-24 23:55:49 +01:00
parent 9b4dceecfe
commit 73a3463ec8
3 changed files with 540 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

829
src/index.ts
View File

File diff suppressed because it is too large Load Diff

21
src/provider-web.ts
View File

@@ -6,7 +6,7 @@ import {
fetchLatestBaileysVersion,
makeCacheableSignalKeyStore,
makeWASocket,
useMultiFileAuthState,
useSingleFileAuthState,
} from "baileys";
import type { proto } from "baileys";
import pino from "pino";
@@ -14,11 +14,11 @@ import qrcode from "qrcode-terminal";
import { danger, info, logVerbose, success } from "./globals.js";
import { ensureDir, jidToE164, toWhatsappJid } from "./utils.js";
const WA_WEB_AUTH_DIR = path.join(os.homedir(), ".warelay", "waweb");
const WA_WEB_AUTH_FILE = path.join(os.homedir(), ".warelay", "credentials.json");
export async function createWaSocket(printQr: boolean, verbose: boolean) {
await ensureDir(WA_WEB_AUTH_DIR);
const { state, saveCreds } = await useMultiFileAuthState(WA_WEB_AUTH_DIR);
await ensureDir(path.dirname(WA_WEB_AUTH_FILE));
const { state, saveState } = useSingleFileAuthState(WA_WEB_AUTH_FILE);
const { version } = await fetchLatestBaileysVersion();
const logger = pino({ level: verbose ? "info" : "silent" });
const sock = makeWASocket({
@@ -34,7 +34,7 @@ export async function createWaSocket(printQr: boolean, verbose: boolean) {
markOnlineOnConnect: false,
});
sock.ev.on("creds.update", saveCreds);
sock.ev.on("creds.update", saveState);
sock.ev.on(
"connection.update",
(update: Partial<import("baileys").ConnectionState>) => {
@@ -132,7 +132,7 @@ export async function loginWeb(
return;
}
if (code === DisconnectReason.loggedOut) {
await fs.rm(WA_WEB_AUTH_DIR, { recursive: true, force: true });
await fs.rm(WA_WEB_AUTH_FILE, { force: true });
console.error(
danger(
"WhatsApp reported the session is logged out. Cleared cached web session; please rerun warelay web:login and scan the QR again.",
@@ -158,7 +158,14 @@ export async function loginWeb(
}
}
export { WA_WEB_AUTH_DIR };
export { WA_WEB_AUTH_FILE };
export function webAuthExists() {
return fs
.access(WA_WEB_AUTH_FILE)
.then(() => true)
.catch(() => false);
}
export type WebInboundMessage = {
id?: string;