apexbot 1.1.1 → 1.1.2

package/dist/cli/index.js

@@ -581,6 +581,107 @@ async function startGatewayServer(config, options = {}) {
     });
 }
 // ─────────────────────────────────────────────────────────────────
+// GOOGLE-AUTH Command - OAuth2 authorization for Google Calendar
+// ─────────────────────────────────────────────────────────────────
+program
+    .command('google-auth')
+    .description('Authorize ApexBot to access your Google Calendar')
+    .action(async () => {
+    showBanner();
+    console.log(chalk.cyan('\n📅 Google Calendar Authorization\n'));
+    console.log(chalk.gray('This will allow ApexBot to create events in your Google Calendar.\n'));
+    // Check for credentials
+    const clientId = process.env.GOOGLE_CLIENT_ID;
+    const clientSecret = process.env.GOOGLE_CLIENT_SECRET;
+    if (!clientId || !clientSecret) {
+        console.log(chalk.yellow('⚠️  Google OAuth2 credentials not found.\n'));
+        console.log('To set up Google Calendar integration:\n');
+        console.log('1. Go to https://console.cloud.google.com/apis/credentials');
+        console.log('2. Create OAuth 2.0 Client ID (type: Desktop app)');
+        console.log('3. Enable Google Calendar API');
+        console.log('4. Set environment variables:\n');
+        console.log(chalk.cyan('   GOOGLE_CLIENT_ID=your-client-id'));
+        console.log(chalk.cyan('   GOOGLE_CLIENT_SECRET=your-client-secret\n'));
+        console.log('5. Run this command again\n');
+        process.exit(1);
+    }
+    // Build OAuth URL
+    const redirectUri = 'urn:ietf:wg:oauth:2.0:oob'; // Manual copy/paste flow
+    const scope = 'https://www.googleapis.com/auth/calendar';
+    const authUrl = `https://accounts.google.com/o/oauth2/v2/auth?` +
+        `client_id=${encodeURIComponent(clientId)}` +
+        `&redirect_uri=${encodeURIComponent(redirectUri)}` +
+        `&response_type=code` +
+        `&scope=${encodeURIComponent(scope)}` +
+        `&access_type=offline` +
+        `&prompt=consent`;
+    console.log(chalk.green('✓ Credentials found!\n'));
+    console.log('Open this URL in your browser to authorize:\n');
+    console.log(chalk.cyan(authUrl) + '\n');
+    // Try to open browser automatically using native OS command
+    const { exec } = require('child_process');
+    const platform = process.platform;
+    const openCmd = platform === 'win32' ? 'start ""' :
+        platform === 'darwin' ? 'open' : 'xdg-open';
+    exec(`${openCmd} "${authUrl}"`, (err) => {
+        if (!err) {
+            console.log(chalk.gray('(Browser should open automatically)\n'));
+        }
+    });
+    // Get authorization code from user
+    const { code } = await inquirer.prompt([
+        {
+            type: 'input',
+            name: 'code',
+            message: 'Paste the authorization code here:',
+            validate: (input) => input.length > 10 || 'Please enter the full authorization code',
+        },
+    ]);
+    console.log(chalk.gray('\nExchanging code for tokens...'));
+    // Exchange code for tokens
+    try {
+        const response = await fetch('https://oauth2.googleapis.com/token', {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+            body: new URLSearchParams({
+                client_id: clientId,
+                client_secret: clientSecret,
+                code: code.trim(),
+                grant_type: 'authorization_code',
+                redirect_uri: redirectUri,
+            }),
+        });
+        if (!response.ok) {
+            const error = await response.json();
+            throw new Error(error.error_description || error.error || 'Token exchange failed');
+        }
+        const tokens = await response.json();
+        // Save tokens
+        const tokenPath = path.join(CONFIG_DIR, 'google_tokens.json');
+        fs.writeFileSync(tokenPath, JSON.stringify({
+            access_token: tokens.access_token,
+            refresh_token: tokens.refresh_token,
+            expiry: Date.now() + (tokens.expires_in * 1000),
+        }, null, 2));
+        console.log(chalk.green('\n✅ Google Calendar authorized successfully!\n'));
+        console.log('ApexBot can now create events in your Google Calendar.');
+        console.log(`Tokens saved to: ${chalk.gray(tokenPath)}\n`);
+        // Test the connection
+        console.log(chalk.gray('Testing connection...'));
+        const testResponse = await fetch('https://www.googleapis.com/calendar/v3/calendars/primary', {
+            headers: { 'Authorization': `Bearer ${tokens.access_token}` },
+        });
+        if (testResponse.ok) {
+            const calendar = await testResponse.json();
+            console.log(chalk.green(`✓ Connected to: ${calendar.summary || 'Primary Calendar'}\n`));
+        }
+    }
+    catch (error) {
+        console.log(chalk.red(`\n❌ Authorization failed: ${error.message}\n`));
+        process.exit(1);
+    }
+});
+// ─────────────────────────────────────────────────────────────────
 // GATEWAY Command
 // ─────────────────────────────────────────────────────────────────
 program

package/dist/skills/calendar.js

@@ -3,7 +3,7 @@
  * Calendar Skill
  *
  * Integration with Google Calendar and local calendar storage.
- * Similar to Clawdbot's calendar skill.
+ * Supports OAuth2 for full read/write access to Google Calendar.
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -94,6 +94,82 @@ let dataPath = '';
 let events = [];
 let googleApiKey = '';
 let googleCalendarId = 'primary';
+// Google OAuth2 credentials
+let googleClientId = '';
+let googleClientSecret = '';
+let googleRefreshToken = '';
+let googleAccessToken = '';
+let googleTokenExpiry = 0;
+let configDir = '';
+// ─────────────────────────────────────────────────────────────────
+// Google OAuth2 Token Management
+// ─────────────────────────────────────────────────────────────────
+async function loadGoogleTokens() {
+    try {
+        const tokenPath = path.join(configDir, 'google_tokens.json');
+        const data = await fs.readFile(tokenPath, 'utf-8');
+        const tokens = JSON.parse(data);
+        googleAccessToken = tokens.access_token || '';
+        googleRefreshToken = tokens.refresh_token || '';
+        googleTokenExpiry = tokens.expiry || 0;
+    }
+    catch {
+        // No tokens saved yet
+    }
+}
+async function saveGoogleTokens() {
+    const tokenPath = path.join(configDir, 'google_tokens.json');
+    await fs.writeFile(tokenPath, JSON.stringify({
+        access_token: googleAccessToken,
+        refresh_token: googleRefreshToken,
+        expiry: googleTokenExpiry,
+    }, null, 2));
+}
+async function refreshGoogleToken() {
+    if (!googleClientId || !googleClientSecret || !googleRefreshToken) {
+        return false;
+    }
+    try {
+        const response = await fetch('https://oauth2.googleapis.com/token', {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+            body: new URLSearchParams({
+                client_id: googleClientId,
+                client_secret: googleClientSecret,
+                refresh_token: googleRefreshToken,
+                grant_type: 'refresh_token',
+            }),
+        });
+        if (!response.ok) {
+            console.error('[Calendar] Failed to refresh Google token');
+            return false;
+        }
+        const data = await response.json();
+        googleAccessToken = data.access_token;
+        googleTokenExpiry = Date.now() + (data.expires_in * 1000) - 60000; // 1 min buffer
+        await saveGoogleTokens();
+        console.log('[Calendar] Google token refreshed');
+        return true;
+    }
+    catch (error) {
+        console.error('[Calendar] Token refresh error:', error.message);
+        return false;
+    }
+}
+async function getValidGoogleToken() {
+    // Check if we have a valid token
+    if (googleAccessToken && Date.now() < googleTokenExpiry) {
+        return googleAccessToken;
+    }
+    // Try to refresh
+    if (await refreshGoogleToken()) {
+        return googleAccessToken;
+    }
+    return null;
+}
+function isGoogleCalendarConfigured() {
+    return !!(googleClientId && googleClientSecret && googleRefreshToken);
+}
 // ─────────────────────────────────────────────────────────────────
 // Local Calendar Storage
 // ─────────────────────────────────────────────────────────────────
@@ -168,6 +244,19 @@ function parseDate(input) {
     return null;
 }
 function parseDuration(input) {
+    // If already a number (minutes), return it
+    if (typeof input === 'number') {
+        return input;
+    }
+    // If not a string, default to 60 minutes
+    if (typeof input !== 'string') {
+        return 60;
+    }
+    // Check if it's just a number string
+    const numOnly = parseInt(input);
+    if (!isNaN(numOnly) && input.trim() === String(numOnly)) {
+        return numOnly; // Assume minutes
+    }
     // Duration in minutes
     const match = input.match(/^(\d+)\s*(minute|min|hour|hr|h|m)s?$/i);
     if (match) {
@@ -183,11 +272,31 @@ function parseDuration(input) {
 // ─────────────────────────────────────────────────────────────────
 // Google Calendar Integration
 // ─────────────────────────────────────────────────────────────────
+// Google Calendar API (supports both API key read-only and OAuth2 read/write)
 async function googleCalendarFetch(endpoint, options = {}) {
+    const baseUrl = 'https://www.googleapis.com/calendar/v3';
+    // Try OAuth2 first for write operations
+    const token = await getValidGoogleToken();
+    if (token) {
+        const url = `${baseUrl}${endpoint}`;
+        const response = await fetch(url, {
+            ...options,
+            headers: {
+                'Content-Type': 'application/json',
+                'Authorization': `Bearer ${token}`,
+                ...options.headers,
+            },
+        });
+        if (!response.ok) {
+            const error = await response.json().catch(() => ({}));
+            throw new Error(error.error?.message || `Google Calendar API error: ${response.status}`);
+        }
+        return response.json();
+    }
+    // Fallback to API key (read-only)
     if (!googleApiKey) {
-        throw new Error('Google Calendar API not configured');
+        throw new Error('Google Calendar nie skonfigurowany. Ustaw GOOGLE_CLIENT_ID, GOOGLE_CLIENT_SECRET i uruchom "apexbot google-auth"');
     }
-    const baseUrl = 'https://www.googleapis.com/calendar/v3';
     const url = `${baseUrl}${endpoint}${endpoint.includes('?') ? '&' : '?'}key=${googleApiKey}`;
     const response = await fetch(url, {
         ...options,
@@ -202,6 +311,34 @@ async function googleCalendarFetch(endpoint, options = {}) {
     }
     return response.json();
 }
+// Create event in Google Calendar
+async function createGoogleCalendarEvent(event) {
+    if (!isGoogleCalendarConfigured()) {
+        throw new Error('Google Calendar OAuth nie skonfigurowany. Uruchom "apexbot google-auth" aby połączyć konto.');
+    }
+    const calendarId = googleCalendarId || 'primary';
+    const googleEvent = {
+        summary: event.title,
+        description: event.description,
+        location: event.location,
+        start: {
+            dateTime: event.start,
+            timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone,
+        },
+        end: {
+            dateTime: event.end,
+            timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone,
+        },
+        reminders: event.reminders ? {
+            useDefault: false,
+            overrides: event.reminders.map(mins => ({ method: 'popup', minutes: mins })),
+        } : { useDefault: true },
+    };
+    return googleCalendarFetch(`/calendars/${encodeURIComponent(calendarId)}/events`, {
+        method: 'POST',
+        body: JSON.stringify(googleEvent),
+    });
+}
 // ─────────────────────────────────────────────────────────────────
 // Calendar Tools
 // ─────────────────────────────────────────────────────────────────
@@ -267,6 +404,59 @@ const createEventTool = {
         }
         const durationMinutes = allDay ? 24 * 60 : parseDuration(duration);
         const endDate = new Date(startDate.getTime() + durationMinutes * 60000);
+        // Format date for display
+        const dateStr = startDate.toLocaleDateString('pl-PL', {
+            weekday: 'long',
+            year: 'numeric',
+            month: 'long',
+            day: 'numeric',
+            hour: '2-digit',
+            minute: '2-digit'
+        });
+        // Try Google Calendar first if configured
+        if (isGoogleCalendarConfigured()) {
+            try {
+                const googleEvent = await createGoogleCalendarEvent({
+                    title,
+                    description,
+                    location,
+                    start: startDate.toISOString(),
+                    end: endDate.toISOString(),
+                    reminders: [15], // 15 min before
+                });
+                // Also save locally for notifications
+                const event = {
+                    id: googleEvent.id || generateId(),
+                    title,
+                    description,
+                    start: startDate.toISOString(),
+                    end: endDate.toISOString(),
+                    location,
+                    allDay,
+                    calendar: 'google',
+                };
+                events.push(event);
+                await saveEvents();
+                return {
+                    success: true,
+                    data: {
+                        id: googleEvent.id,
+                        title,
+                        start: startDate.toISOString(),
+                        end: endDate.toISOString(),
+                        location,
+                        calendar: 'Google Calendar',
+                        htmlLink: googleEvent.htmlLink,
+                        message: `✅ Wydarzenie "${title}" utworzone w Google Calendar na ${dateStr}. Link: ${googleEvent.htmlLink}`,
+                    },
+                };
+            }
+            catch (error) {
+                console.error('[Calendar] Google Calendar error:', error.message);
+                // Fall through to local storage
+            }
+        }
+        // Local storage fallback
         const event = {
             id: generateId(),
             title,
@@ -279,15 +469,10 @@ const createEventTool = {
         };
         events.push(event);
         await saveEvents();
-        // Format nicely for Polish users
-        const dateStr = startDate.toLocaleDateString('pl-PL', {
-            weekday: 'long',
-            year: 'numeric',
-            month: 'long',
-            day: 'numeric',
-            hour: '2-digit',
-            minute: '2-digit'
-        });
+        // Check if Google Calendar is configured but failed
+        const googleNote = isGoogleCalendarConfigured()
+            ? '⚠️ Nie udało się zapisać w Google Calendar, zapisano lokalnie.'
+            : 'ℹ️ Aby zapisywać wydarzenia w Google Calendar, uruchom "apexbot google-auth".';
         return {
             success: true,
             data: {
@@ -297,8 +482,7 @@ const createEventTool = {
                 end: event.end,
                 location: event.location,
                 calendar: 'ApexBot (lokalny)',
-                message: `📅 Wydarzenie "${title}" zapisane w lokalnym kalendarzu ApexBot na ${dateStr}. Dostaniesz powiadomienie 15 minut przed wydarzeniem.`,
-                note: 'Aby zsynchronizować z Google Calendar, skonfiguruj GOOGLE_CALENDAR_API_KEY.',
+                message: `📅 Wydarzenie "${title}" zapisane w kalendarzu ApexBot na ${dateStr}. Dostaniesz powiadomienie 15 minut przed. ${googleNote}`,
             },
         };
     },
@@ -616,11 +800,25 @@ const calendarSkill = {
     manifest,
     tools: [createEventTool, listEventsTool, deleteEventTool, checkAvailabilityTool, findTimeTool],
     async initialize(config) {
-        dataPath = config.dataPath || path.join(process.env.HOME || process.env.USERPROFILE || '', '.apexbot', 'calendar.json');
+        configDir = config.configDir || path.join(process.env.HOME || process.env.USERPROFILE || '', '.apexbot');
+        dataPath = config.dataPath || path.join(configDir, 'calendar.json');
+        // Google Calendar OAuth2 credentials
+        googleClientId = config.googleClientId || process.env.GOOGLE_CLIENT_ID || '';
+        googleClientSecret = config.googleClientSecret || process.env.GOOGLE_CLIENT_SECRET || '';
         googleApiKey = config.googleApiKey || process.env.GOOGLE_CALENDAR_API_KEY || '';
-        googleCalendarId = config.defaultCalendar || 'primary';
+        googleCalendarId = config.defaultCalendar || process.env.GOOGLE_CALENDAR_ID || 'primary';
         await loadEvents();
-        console.log(`[Calendar] Initialized with ${events.length} events`);
+        await loadGoogleTokens();
+        if (isGoogleCalendarConfigured()) {
+            console.log(`[Calendar] Initialized with Google Calendar integration`);
+        }
+        else if (googleApiKey) {
+            console.log(`[Calendar] Initialized with Google Calendar (read-only)`);
+        }
+        else {
+            console.log(`[Calendar] Initialized with local storage only`);
+        }
+        console.log(`[Calendar] ${events.length} events loaded`);
     },
     async shutdown() {
         await saveEvents();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apexbot",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "ApexBot - Your free, private AI assistant. 100% free with Ollama (local AI). Multi-channel: Telegram, Discord, WebChat. Tools & Skills system with Spotify, Obsidian, and more!",
   "main": "dist/index.js",
   "bin": {
@@ -84,4 +84,4 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.2.2"
   }
-}
+}