whatsapp-pi 1.0.29 → 1.0.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "whatsapp-pi",
-  "version": "1.0.29",
+  "version": "1.0.32",
   "type": "module",
   "description": "WhatsApp integration extension for Pi",
   "main": "whatsapp-pi.ts",

package/src/models/whatsapp.types.ts

@@ -78,62 +78,3 @@ export interface RecentsStore {
     messagesBySender: Record<string, RecentConversationMessage[]>;
     updatedAt: number;
 }
-
-// QR Code Display Types
-export interface QRCodeSession {
-    id: string;
-    qrData: string;
-    expiresAt: Date;
-    isActive: boolean;
-    createdAt: Date;
-    refreshCount: number;
-}
-
-export interface QRDisplayState {
-    isDisplaying: boolean;
-    currentSession?: QRCodeSession;
-    lastInstruction: string;
-    warningMessage?: string;
-}
-
-export enum PairingStatus {
-    IDLE = 'idle',
-    GENERATING_QR = 'generating',
-    DISPLAYING_QR = 'displaying',
-    SCANNING = 'scanning',
-    CONNECTED = 'connected',
-    FAILED = 'failed'
-}
-
-export type ExtendedSessionStatus = SessionStatus | 'pairing' | 'qr-expired';
-
-export interface QRCodeDisplayOptions {
-    terminalWidth?: number;
-    refreshInterval: number;
-    showInstructions: boolean;
-    showExpirationWarning: boolean;
-}
-
-export class QRError extends Error {
-    constructor(
-        public code: string,
-        message: string,
-        public technical?: string,
-        public recoverable: boolean = true
-    ) {
-        super(message);
-        this.name = 'QRError';
-        this.timestamp = new Date();
-    }
-
-    public timestamp: Date;
-}
-
-export enum QRErrorCode {
-    TERMINAL_UNSUPPORTED = 'TERMINAL_UNSUPPORTED',
-    QR_GENERATION_FAILED = 'QR_GENERATION_FAILED',
-    DISPLAY_ERROR = 'DISPLAY_ERROR',
-    CONNECTION_TIMEOUT = 'CONNECTION_TIMEOUT',
-    NETWORK_ERROR = 'NETWORK_ERROR',
-    INVALID_CREDENTIALS = 'INVALID_CREDENTIALS'
-}

package/src/services/session.manager.ts

@@ -285,72 +285,4 @@ export class SessionManager {
     getAuthStateDir(): string {
         return this.authStateDir;
     }
-
-    // QR Code Detection Methods
-
-    /**
-     * Checks if QR code flow is needed (no valid credentials exist)
-     */
-    public async needsQRCode(): Promise<boolean> {
-        try {
-            // Check if we have valid authentication state
-            const hasValidCredentials = await this.hasValidCredentials();
-            return !hasValidCredentials;
-        } catch (error) {
-            // If we can't determine, assume QR is needed
-            return true;
-        }
-    }
-
-    /**
-     * Checks if valid credentials exist
-     */
-    public async hasValidCredentials(): Promise<boolean> {
-        try {
-            // Check if credentials file exists and is readable
-            const credsPath = join(this.authStateDir, 'creds.json');
-            await readFile(credsPath, 'utf-8');
-            
-            // Also check if we have the hasAuthState flag set
-            return this.hasAuthState;
-        } catch {
-            return false;
-        }
-    }
-
-    /**
-     * Marks QR code pairing as completed
-     */
-    public async markQRCompleted(): Promise<void> {
-        await this.markAuthStateAvailable();
-        this.status = 'connected';
-        await this.saveConfig();
-    }
-
-    /**
-     * Invalidates current QR session (used for logout/re-pairing)
-     */
-    public async invalidateQRSession(): Promise<void> {
-        // Clear auth state to trigger QR flow on next connection
-        this.hasAuthState = false;
-        this.status = 'logged-out';
-        await this.saveConfig();
-    }
-
-    /**
-     * Waits for credentials to become available (with timeout)
-     */
-    public async waitForCredentials(timeout: number = 120000): Promise<boolean> {
-        const startTime = Date.now();
-        const checkInterval = 1000; // Check every second
-
-        while (Date.now() - startTime < timeout) {
-            if (await this.hasValidCredentials()) {
-                return true;
-            }
-            await new Promise(resolve => setTimeout(resolve, checkInterval));
-        }
-
-        return false; // Timeout reached
-    }
 }

package/src/services/whatsapp.service.ts

@@ -7,7 +7,6 @@ import {
 } from '@whiskeysockets/baileys';
 import P from 'pino';
 import { Boom } from '@hapi/boom';
-import qr from 'qrcode-terminal';
 import { SessionManager } from './session.manager.js';
 import { IncomingMessage, WhatsAppSession, SessionStatus } from '../models/whatsapp.types.js';
 import { MessageSender } from './message.sender.js';
@@ -120,7 +119,6 @@ export class WhatsAppService {
             
             if (qr) {
                 this.sessionManager.setStatus('pairing');
-                this.displayQRCode(qr);
                 this.onQRCode?.(qr);
                 this.onStatusUpdate?.('| WhatsApp: Pairing...');
             }
@@ -258,28 +256,6 @@ export class WhatsAppService {
         this.onStatusUpdate = callback;
     }
 
-    private displayQRCode(qrData: string): void {
-        // Clear screen and show QR code with instructions
-        console.clear();
-        
-        console.log('');
-        console.log('WhatsApp: Pairing...');
-        console.log('Scan this QR code with your WhatsApp mobile app:');
-        console.log('');
-        
-        // Display QR code
-        qr.generate(qrData, { small: true });
-        
-        console.log('');
-        console.log('1. Open WhatsApp on your phone');
-        console.log('2. Go to Settings > Linked Devices');
-        console.log('3. Tap "Link a device"');
-        console.log('4. Point your camera at this QR code');
-        console.log('');
-        console.log('QR code will refresh automatically if it expires.');
-        console.log('');
-    }
-
     public getLastRemoteJid(): string | null {
         return this.lastRemoteJid;
     }

package/src/services/qr-config.service.ts

@@ -1,160 +0,0 @@
-import { QRCodeDisplayOptions } from '../models/whatsapp.types.js';
-
-export interface QRDisplayConfig {
-    terminalWidth?: number;
-    refreshInterval: number;
-    maxRefreshAttempts: number;
-    showInstructions: boolean;
-    showExpirationWarning: boolean;
-    expirationWarningTime: number;
-    retryOnError: boolean;
-    maxRetries: number;
-    retryDelay: number;
-}
-
-export class QRConfigService {
-    private static instance: QRConfigService;
-    private config: QRDisplayConfig;
-
-    private constructor() {
-        this.config = this.getDefaultConfig();
-        this.loadFromEnvironment();
-    }
-
-    /**
-     * Gets singleton instance
-     */
-    static getInstance(): QRConfigService {
-        if (!QRConfigService.instance) {
-            QRConfigService.instance = new QRConfigService();
-        }
-        return QRConfigService.instance;
-    }
-
-    /**
-     * Gets current configuration
-     */
-    getConfig(): QRDisplayConfig {
-        return { ...this.config };
-    }
-
-    /**
-     * Updates configuration
-     */
-    updateConfig(config: Partial<QRDisplayConfig>): void {
-        this.config = { ...this.config, ...config };
-    }
-
-    /**
-     * Resets configuration to defaults
-     */
-    resetConfig(): void {
-        this.config = this.getDefaultConfig();
-    }
-
-    /**
-     * Gets QR display options for renderer
-     */
-    getDisplayOptions(): QRCodeDisplayOptions {
-        return {
-            terminalWidth: this.config.terminalWidth,
-            refreshInterval: this.config.refreshInterval,
-            showInstructions: this.config.showInstructions,
-            showExpirationWarning: this.config.showExpirationWarning
-        };
-    }
-
-    /**
-     * Gets retry configuration
-     */
-    getRetryConfig() {
-        return {
-            retryOnError: this.config.retryOnError,
-            maxRetries: this.config.maxRetries,
-            retryDelay: this.config.retryDelay
-        };
-    }
-
-    /**
-     * Gets refresh configuration
-     */
-    getRefreshConfig() {
-        return {
-            refreshInterval: this.config.refreshInterval,
-            maxRefreshAttempts: this.config.maxRefreshAttempts,
-            expirationWarningTime: this.config.expirationWarningTime,
-            showExpirationWarning: this.config.showExpirationWarning
-        };
-    }
-
-    /**
-     * Loads configuration from environment variables
-     */
-    private loadFromEnvironment(): void {
-        // QR refresh interval in milliseconds
-        if (process.env.QR_REFRESH_INTERVAL) {
-            const interval = parseInt(process.env.QR_REFRESH_INTERVAL, 10);
-            if (!isNaN(interval) && interval > 0) {
-                this.config.refreshInterval = interval;
-            }
-        }
-
-        // Show expiration warning
-        if (process.env.QR_SHOW_WARNING !== undefined) {
-            this.config.showExpirationWarning = process.env.QR_SHOW_WARNING === 'true';
-        }
-
-        // Warning time in seconds
-        if (process.env.QR_WARNING_TIME) {
-            const warningTime = parseInt(process.env.QR_WARNING_TIME, 10);
-            if (!isNaN(warningTime) && warningTime > 0) {
-                this.config.expirationWarningTime = warningTime;
-            }
-        }
-
-        // Max refresh attempts
-        if (process.env.QR_MAX_REFRESH_ATTEMPTS) {
-            const maxAttempts = parseInt(process.env.QR_MAX_REFRESH_ATTEMPTS, 10);
-            if (!isNaN(maxAttempts) && maxAttempts > 0) {
-                this.config.maxRefreshAttempts = maxAttempts;
-            }
-        }
-
-        // Retry on error
-        if (process.env.QR_RETRY_ON_ERROR !== undefined) {
-            this.config.retryOnError = process.env.QR_RETRY_ON_ERROR === 'true';
-        }
-
-        // Max retries
-        if (process.env.QR_MAX_RETRIES) {
-            const maxRetries = parseInt(process.env.QR_MAX_RETRIES, 10);
-            if (!isNaN(maxRetries) && maxRetries >= 0) {
-                this.config.maxRetries = maxRetries;
-            }
-        }
-
-        // Retry delay
-        if (process.env.QR_RETRY_DELAY) {
-            const retryDelay = parseInt(process.env.QR_RETRY_DELAY, 10);
-            if (!isNaN(retryDelay) && retryDelay > 0) {
-                this.config.retryDelay = retryDelay;
-            }
-        }
-    }
-
-    /**
-     * Gets default configuration
-     */
-    private getDefaultConfig(): QRDisplayConfig {
-        return {
-            refreshInterval: 60000, // 60 seconds
-            maxRefreshAttempts: 10, // Unlimited for practical purposes
-            showInstructions: true,
-            showExpirationWarning: true,
-            expirationWarningTime: 15, // 15 seconds before expiration
-            retryOnError: true,
-            maxRetries: 3,
-            retryDelay: 2000 // 2 seconds
-        };
-    }
-}

package/src/services/qr-error.handler.ts

@@ -1,151 +0,0 @@
-import { QRError, QRErrorCode } from '../models/whatsapp.types.js';
-
-export class QRErrorHandler {
-    private errorHistory: QRError[] = [];
-    private maxHistorySize = 10;
-
-    /**
-     * Handles a QR-related error
-     */
-    async handleError(error: QRError): Promise<void> {
-        // Add to error history
-        this.addToHistory(error);
-
-        // Log the error
-        this.logError(error);
-
-        // Show user-friendly message
-        this.displayError(error);
-    }
-
-    /**
-     * Determines if an error is recoverable
-     */
-    canRecover(error: QRError): boolean {
-        return error.recoverable;
-    }
-
-    /**
-     * Gets recovery action for an error
-     */
-    getRecoveryAction(error: QRError): string | null {
-        switch (error.code) {
-            case QRErrorCode.TERMINAL_UNSUPPORTED:
-                return 'Try using a modern terminal (Windows Terminal, iTerm2, or VS Code terminal) that supports UTF-8 characters.';
-            
-            case QRErrorCode.QR_GENERATION_FAILED:
-                return 'Check your internet connection and try running the command again.';
-            
-            case QRErrorCode.DISPLAY_ERROR:
-                return 'Try making your terminal window larger and run the command again.';
-            
-            case QRErrorCode.CONNECTION_TIMEOUT:
-                return 'The QR code expired. A new one will be generated automatically.';
-            
-            case QRErrorCode.NETWORK_ERROR:
-                return 'Check your internet connection and try again.';
-            
-            case QRErrorCode.INVALID_CREDENTIALS:
-                return 'Run /whatsapp-logout to clear credentials and try again.';
-            
-            default:
-                return 'Try restarting the application.';
-        }
-    }
-
-    /**
-     * Creates a standardized QR error
-     */
-    createError(code: QRErrorCode, message: string, technical?: string): QRError {
-        return new QRError(
-            code,
-            message,
-            technical,
-            this.isRecoverableByDefault(code)
-        );
-    }
-
-    /**
-     * Gets recent error history
-     */
-    getErrorHistory(): QRError[] {
-        return [...this.errorHistory];
-    }
-
-    /**
-     * Clears error history
-     */
-    clearHistory(): void {
-        this.errorHistory = [];
-    }
-
-    /**
-     * Checks if specific error type has occurred recently
-     */
-    hasRecentError(code: QRErrorCode, withinMs: number = 60000): boolean {
-        const now = new Date();
-        return this.errorHistory.some(error => 
-            error.code === code && 
-            (now.getTime() - error.timestamp.getTime()) < withinMs
-        );
-    }
-
-    /**
-     * Private method to add error to history
-     */
-    private addToHistory(error: QRError): void {
-        this.errorHistory.push(error);
-        
-        // Keep only recent errors
-        if (this.errorHistory.length > this.maxHistorySize) {
-            this.errorHistory = this.errorHistory.slice(-this.maxHistorySize);
-        }
-    }
-
-    /**
-     * Private method to log error
-     */
-    private logError(error: QRError): void {
-        const logMessage = `[QR Error] ${error.code}: ${error.message}`;
-        
-        if (error.technical) {
-            console.error(`${logMessage} (${error.technical})`);
-        } else {
-            console.error(logMessage);
-        }
-    }
-
-    /**
-     * Private method to display error to user
-     */
-    private displayError(error: QRError): void {
-        console.error(`❌ ${error.message}`);
-        
-        const recoveryAction = this.getRecoveryAction(error);
-        if (recoveryAction) {
-            console.log(`💡 ${recoveryAction}`);
-        }
-    }
-
-    /**
-     * Private method to determine if error is recoverable by default
-     */
-    private isRecoverableByDefault(code: QRErrorCode): boolean {
-        switch (code) {
-            case QRErrorCode.TERMINAL_UNSUPPORTED:
-                return false; // Requires terminal change
-            
-            case QRErrorCode.INVALID_CREDENTIALS:
-                return true; // Can be fixed with logout
-            
-            case QRErrorCode.QR_GENERATION_FAILED:
-            case QRErrorCode.DISPLAY_ERROR:
-            case QRErrorCode.CONNECTION_TIMEOUT:
-            case QRErrorCode.NETWORK_ERROR:
-                return true; // Generally recoverable
-            
-            default:
-                return true; // Assume recoverable by default
-        }
-    }
-}

package/src/services/qr-events.service.ts

@@ -1,179 +0,0 @@
-import { EventEmitter } from 'events';
-import { QRCodeSession, QRError, PairingStatus } from '../models/whatsapp.types.js';
-
-export interface QREventMap {
-    'qr:generated': { qrData: string; expiresAt: Date };
-    'qr:expired': { sessionId: string };
-    'qr:refreshed': { qrData: string; refreshCount: number };
-    'pairing:started': { sessionId: string };
-    'pairing:scanning': { sessionId: string };
-    'pairing:completed': { sessionId: string };
-    'pairing:failed': { sessionId: string; error: QRError };
-    'status:changed': { status: PairingStatus };
-}
-
-export class QREventsService extends EventEmitter {
-    private static instance: QREventsService;
-
-    private constructor() {
-        super();
-        this.setMaxListeners(50); // Allow more listeners for QR events
-    }
-
-    /**
-     * Gets singleton instance
-     */
-    static getInstance(): QREventsService {
-        if (!QREventsService.instance) {
-            QREventsService.instance = new QREventsService();
-        }
-        return QREventsService.instance;
-    }
-
-    /**
-     * Emit QR code generated event
-     */
-    emitQRGenerated(qrData: string, expiresAt: Date): void {
-        this.emit('qr:generated', { qrData, expiresAt });
-    }
-
-    /**
-     * Emit QR code expired event
-     */
-    emitQRExpired(sessionId: string): void {
-        this.emit('qr:expired', { sessionId });
-    }
-
-    /**
-     * Emit QR code refreshed event
-     */
-    emitQRRefreshed(qrData: string, refreshCount: number): void {
-        this.emit('qr:refreshed', { qrData, refreshCount });
-    }
-
-    /**
-     * Emit pairing started event
-     */
-    emitPairingStarted(sessionId: string): void {
-        this.emit('pairing:started', { sessionId });
-    }
-
-    /**
-     * Emit pairing scanning event
-     */
-    emitPairingScanning(sessionId: string): void {
-        this.emit('pairing:scanning', { sessionId });
-    }
-
-    /**
-     * Emit pairing completed event
-     */
-    emitPairingCompleted(sessionId: string): void {
-        this.emit('pairing:completed', { sessionId });
-    }
-
-    /**
-     * Emit pairing failed event
-     */
-    emitPairingFailed(sessionId: string, error: QRError): void {
-        this.emit('pairing:failed', { sessionId, error });
-    }
-
-    /**
-     * Emit status changed event
-     */
-    emitStatusChanged(status: PairingStatus): void {
-        this.emit('status:changed', { status });
-    }
-
-    /**
-     * Type-safe event listener registration
-     */
-    onQRGenerated(callback: (data: QREventMap['qr:generated']) => void): void {
-        this.on('qr:generated', callback);
-    }
-
-    onQRExpired(callback: (data: QREventMap['qr:expired']) => void): void {
-        this.on('qr:expired', callback);
-    }
-
-    onQRRefreshed(callback: (data: QREventMap['qr:refreshed']) => void): void {
-        this.on('qr:refreshed', callback);
-    }
-
-    onPairingStarted(callback: (data: QREventMap['pairing:started']) => void): void {
-        this.on('pairing:started', callback);
-    }
-
-    onPairingScanning(callback: (data: QREventMap['pairing:scanning']) => void): void {
-        this.on('pairing:scanning', callback);
-    }
-
-    onPairingCompleted(callback: (data: QREventMap['pairing:completed']) => void): void {
-        this.on('pairing:completed', callback);
-    }
-
-    onPairingFailed(callback: (data: QREventMap['pairing:failed']) => void): void {
-        this.on('pairing:failed', callback);
-    }
-
-    onStatusChanged(callback: (data: QREventMap['status:changed']) => void): void {
-        this.on('status:changed', callback);
-    }
-
-    /**
-     * Type-safe event listener removal
-     */
-    offQRGenerated(callback: (data: QREventMap['qr:generated']) => void): void {
-        this.off('qr:generated', callback);
-    }
-
-    offQRExpired(callback: (data: QREventMap['qr:expired']) => void): void {
-        this.off('qr:expired', callback);
-    }
-
-    offQRRefreshed(callback: (data: QREventMap['qr:refreshed']) => void): void {
-        this.off('qr:refreshed', callback);
-    }
-
-    offPairingStarted(callback: (data: QREventMap['pairing:started']) => void): void {
-        this.off('pairing:started', callback);
-    }
-
-    offPairingScanning(callback: (data: QREventMap['pairing:scanning']) => void): void {
-        this.off('pairing:scanning', callback);
-    }
-
-    offPairingCompleted(callback: (data: QREventMap['pairing:completed']) => void): void {
-        this.off('pairing:completed', callback);
-    }
-
-    offPairingFailed(callback: (data: QREventMap['pairing:failed']) => void): void {
-        this.off('pairing:failed', callback);
-    }
-
-    offStatusChanged(callback: (data: QREventMap['status:changed']) => void): void {
-        this.off('status:changed', callback);
-    }
-
-    /**
-     * Clear all event listeners
-     */
-    clearAllListeners(): void {
-        this.removeAllListeners();
-    }
-
-    /**
-     * Get event listener count for debugging
-     */
-    getListenerCount(eventName: keyof QREventMap): number {
-        return this.listenerCount(eventName);
-    }
-
-    /**
-     * Get all event names with listeners
-     */
-    getActiveEvents(): (keyof QREventMap)[] {
-        return Object.keys(this.eventNames()) as (keyof QREventMap)[];
-    }
-}

package/src/services/qr-renderer.service.ts

@@ -1,154 +0,0 @@
-import qr from 'qrcode-terminal';
-import { QRCodeDisplayOptions, QRError, QRErrorCode } from '../models/whatsapp.types.js';
-
-export class QRRendererService {
-    private terminalWidth: number;
-    private supportsUTF8: boolean;
-
-    constructor() {
-        this.terminalWidth = this.detectTerminalWidth();
-        this.supportsUTF8 = this.detectUTF8Support();
-    }
-
-    /**
-     * Renders a QR code in the terminal
-     */
-    async renderQR(qrData: string, options?: QRCodeDisplayOptions): Promise<void> {
-        try {
-            if (!this.supportsUTF8) {
-                throw new QRError(
-                    QRErrorCode.TERMINAL_UNSUPPORTED,
-                    'Terminal does not support UTF-8 characters required for QR code display',
-                    'UTF-8 support detection failed',
-                    false
-                );
-            }
-
-            const displayOptions = {
-                small: true,
-                ...options
-            };
-
-            // Clear any existing QR display
-            await this.clearQR();
-
-            // Render the QR code
-            qr.generate(qrData, displayOptions);
-
-        } catch (error) {
-            if (error instanceof QRError) {
-                throw error;
-            }
-            throw new QRError(
-                QRErrorCode.DISPLAY_ERROR,
-                'Failed to render QR code in terminal',
-                error instanceof Error ? error.message : 'Unknown error',
-                true
-            );
-        }
-    }
-
-    /**
-     * Clears the terminal display
-     */
-    async clearQR(): Promise<void> {
-        try {
-            // Clear screen and move cursor to top
-            process.stdout.write('\x1b[2J\x1b[H');
-        } catch (error) {
-            // Non-critical error, continue
-        }
-    }
-
-    /**
-     * Shows pairing instructions to the user
-     */
-    showInstructions(): void {
-        const instructions = [
-            '',
-            'WhatsApp: Pairing...',
-            'Scan this QR code with your WhatsApp mobile app:',
-            '',
-            '1. Open WhatsApp on your phone',
-            '2. Go to Settings > Linked Devices',
-            '3. Tap "Link a device"',
-            '4. Point your camera at this QR code',
-            ''
-        ];
-
-        instructions.forEach(line => {
-            console.log(line);
-        });
-    }
-
-    /**
-     * Shows a warning message
-     */
-    showWarning(message: string): void {
-        console.log(`⚠️  ${message}`);
-    }
-
-    /**
-     * Shows an error message
-     */
-    showError(error: QRError): void {
-        console.error(`❌ ${error.message}`);
-        if (error.technical && process.env.NODE_ENV === 'development') {
-            console.error(`Technical details: ${error.technical}`);
-        }
-        if (error.recoverable) {
-            console.log('💡 You can try again.');
-        }
-    }
-
-    /**
-     * Detects terminal width
-     */
-    getTerminalWidth(): number {
-        return this.terminalWidth;
-    }
-
-    /**
-     * Checks if terminal supports UTF-8
-     */
-    supportsUTF8Display(): boolean {
-        return this.supportsUTF8;
-    }
-
-    /**
-     * Internal method to detect terminal width
-     */
-    private detectTerminalWidth(): number {
-        try {
-            if (process.stdout.columns) {
-                return process.stdout.columns;
-            }
-            // Fallback to common terminal width
-            return 80;
-        } catch {
-            return 80;
-        }
-    }
-
-    /**
-     * Internal method to detect UTF-8 support
-     */
-    private detectUTF8Support(): boolean {
-        try {
-            // Check for common UTF-8 environment variables
-            const lang = process.env.LANG || '';
-            const lcAll = process.env.LC_ALL || '';
-            const termProgram = process.env.TERM_PROGRAM || '';
-            
-            return lang.includes('UTF-8') || 
-                   lang.includes('utf8') || 
-                   lcAll.includes('UTF-8') || 
-                   lcAll.includes('utf8') ||
-                   process.platform === 'darwin' || // macOS usually supports UTF-8
-                   termProgram.includes('vscode') || // VS Code terminal
-                   termProgram.includes('hyper'); // Hyper terminal
-        } catch {
-            return false;
-        }
-    }
-}