@access-mcp/events 0.3.0 → 0.3.1

package/README.md

@@ -1,266 +1,74 @@
 # ACCESS-CI Events MCP Server
 
-A Model Context Protocol server providing access to ACCESS-CI events data including workshops, webinars, and training sessions with comprehensive filtering capabilities.
-
-## Features
-
-### 🔧 Tools
-
-- **`search_events`** - Comprehensive event search and filtering with native full-text search, date filters, topic/tag filtering, and more
-
-### 📊 Resources
-
-- **`accessci://events`** - All events data
-- **`accessci://events/upcoming`** - Upcoming events only
-- **`accessci://events/workshops`** - Workshop events only
-- **`accessci://events/webinars`** - Webinar events only
-
-## Installation
-
-```bash
-npm install -g @access-mcp/events
-```
-
-## Usage
-
-### Claude Desktop Configuration
-
-Add to your Claude Desktop configuration:
-
-```json
-{
-  "mcpServers": {
-    "access-events": {
-      "command": "npx",
-      "args": ["@access-mcp/events"]
-    }
-  }
-}
-```
+MCP server for ACCESS-CI events including workshops, webinars, and training sessions.
 
 ## Usage Examples
 
-### **Search & Discovery**
-
+### Search & Discovery
 ```
-"Upcoming events next week"
+"Upcoming ACCESS events"
 "Python workshops"
-"Machine learning events"
+"Machine learning training"
 "Office hours this week"
 ```
 
-### **Filtering**
-
+### Filtering
 ```
-"Beginner-level events this month"
-"GPU computing events"
-"Webinars in December"
+"Beginner events this month"
+"GPU computing workshops"
 "Advanced training sessions"
 ```
 
-## Key Improvements
-
-### 🚀 Enhanced Search (v2.1)
-
-**Native API Full-Text Search:**
-- Searches across titles, descriptions, speakers, tags, location, and event type
-- Supports multi-word queries (e.g., "machine learning", "office hours")
-- Much more comprehensive results than previous tag-only filtering
-- Server-side indexing for better performance
-
-**Search Examples:**
-- `"python"` - Find Python programming events
-- `"machine learning"` - Find ML-related content in any field
-- `"gpu computing"` - Find GPU-related events
-- `"office hours"` - Find all office hours sessions
-
-### 🌍 Timezone Support (v2.1)
-
-**Smart Timezone Handling:**
-- All timestamps returned in UTC (ISO 8601 format with Z suffix)
-- Timezone parameter controls relative date calculations
-- Common timezone examples: `America/New_York`, `Europe/London`, `Asia/Tokyo`
-- Default: UTC calculations
-
-## Filtering Capabilities
-
-### Date Filtering
-
-**Relative Dates (Dynamic):**
-
-- `today` - Current date
-- `+1week`, `+2week` - Future weeks
-- `+1month`, `+2month` - Future months
-- `+1year` - Future year
-- `-1week`, `-1month` - Past periods
-
-**Absolute Dates (Fixed):**
-
-- `YYYY-MM-DD` format (e.g., "2024-08-30")
-- `YYYY-MM-DD HH:MM:SS` format with time
-
-**Mixed Filtering:**
-You can combine relative and absolute dates in the same query.
-
-### Faceted Search Filters
+## Tools
 
-- **Event Type:** workshop, webinar, etc.
-- **Event Affiliation:** Community, ACCESS, etc.
-- **Skill Level:** beginner, intermediate, advanced
-- **Event Tags:** python, big-data, machine-learning, gpu, etc.
+### `search_events`
 
-## API Details
-
-### Event Object Structure
-
-Each event contains:
-
-- `id` - Unique identifier
-- `title` - Event title
-- `description` - Event description
-- `date` - Start date/time (ISO 8601)
-- `date_1` - End date/time (ISO 8601)
-- `location` - Event location
-- `event_type` - Type of event
-- `event_affiliation` - Organizational affiliation
-- `custom_event_tags` - Comma-separated tags
-- `skill_level` - Required skill level
-- `speakers` - Event speakers
-- `contact` - Contact information
-- `registration` - Registration URL/info
-- `created` - Creation timestamp
-- `changed` - Last modified timestamp
-
-### Enhanced Fields
-
-The server adds these computed fields:
-
-- `start_date` - Parsed start date object
-- `end_date` - Parsed end date object
-- `tags` - Tags split into array
-- `duration_hours` - Calculated event duration
-- `starts_in_hours` - Hours until event starts
-
-## Tool Reference
-
-### search_events
-
-Comprehensive event search and filtering with native full-text search, date filters, and topic/tag filtering.
+Search and filter ACCESS-CI events.
 
 **Parameters:**
-- `query` (string, optional): Search titles, descriptions, speakers, and tags
-- `type` (string, optional): Filter by event type (workshop, webinar, training)
-- `tags` (string, optional): Filter by tags (python, gpu, hpc, ml)
-- `date` (string, optional): Filter by time period. Valid values: `today`, `upcoming`, `past`, `this_week`, `this_month`
-- `skill` (string, optional): Filter by skill level. Valid values: `beginner`, `intermediate`, `advanced`
-- `limit` (number, optional): Maximum results (default: 50, automatically rounded to API page sizes: 25, 50, 75, or 100)
-
-## Usage Examples
-
-### Full-Text Search
-
+| Parameter | Type | Description |
+|-----------|------|-------------|
+| `query` | string | Search titles, descriptions, speakers, tags |
+| `type` | string | Filter: `workshop`, `webinar`, `training` |
+| `tags` | string | Filter: `python`, `gpu`, `hpc`, `ml` |
+| `date` | enum | Time period: `today`, `upcoming`, `past`, `this_week`, `this_month` |
+| `skill` | enum | Skill level: `beginner`, `intermediate`, `advanced` |
+| `limit` | number | Max results (default: 50) |
+
+**Examples:**
 ```javascript
 // Upcoming Python events
-search_events({
-  query: "python",
-  date: "upcoming",
-  limit: 10
-})
+search_events({ query: "python", date: "upcoming", limit: 10 })
 
 // Machine learning workshops this month
-search_events({
-  query: "machine learning",
-  date: "this_month",
-  type: "workshop",
-  limit: 25
-})
-
-// Past office hours
-search_events({
-  query: "office hours",
-  date: "past",
-  limit: 30
-})
-```
+search_events({ query: "machine learning", date: "this_month", type: "workshop" })
 
-### Filter by Tags and Type
-
-```javascript
-// All upcoming GPU events
-search_events({
-  tags: "gpu",
-  date: "upcoming",
-  limit: 20
-})
-
-// Beginner training sessions
-search_events({
-  type: "training",
-  skill: "beginner",
-  date: "upcoming",
-  limit: 15
-})
-
-// Python workshops for beginners
-search_events({
-  date: "this_month",
-  type: "workshop",
-  skill: "beginner",
-  tags: "python",
-  limit: 25
-})
+// Beginner GPU training
+search_events({ tags: "gpu", skill: "beginner", date: "upcoming" })
 ```
 
-### Timezone-Aware Searches
-
-```javascript
-// Get events in New York timezone
-search_events({
-  beginning_date_relative: "today",
-  end_date_relative: "+1week",
-  timezone: "America/New_York",
-  limit: 30
-})
-
-// Get events in Europe/London timezone
-search_events({
-  query: "workshop",
-  beginning_date_relative: "today",
-  timezone: "Europe/London",
-  limit: 25
-})
-```
-
-## Development
+## Installation
 
 ```bash
-# Build the server
-npm run build
-
-# Run in development
-npm run dev
-
-# Test the server
-npm test
+npm install -g @access-mcp/events
 ```
 
-## Base URL
+## Configuration
 
-The server connects to: `https://support.access-ci.org/api/2.2/events`
-
-## Technical Notes
+```json
+{
+  "mcpServers": {
+    "access-events": {
+      "command": "npx",
+      "args": ["@access-mcp/events"]
+    }
+  }
+}
+```
 
-### API Version 2.2 Features
-- **UTC timestamps**: All dates returned in UTC with Z suffix (e.g., `2024-08-30T13:00:00Z`)
-- **Native search**: Uses `search_api_fulltext` parameter for comprehensive searching
-- **Timezone support**: Relative dates calculated using specified timezone
-- **Pagination**: API accepts specific page sizes (25, 50, 75, or 100). Requested limits are automatically rounded to nearest valid size.
-- **Enhanced metadata**: Responses include API version and timezone info
+## Resources
 
-### General
-- All date comparisons use the event's start date (`date` field)
-- Results include both upcoming and past events unless date filtered
-- Faceted search filters use AND logic when combined
-- Response times are typically under 5 seconds
-- No pagination - all matching events are returned
-- URL encoding is handled automatically for special characters
+- `accessci://events` - All events data
+- `accessci://events/upcoming` - Upcoming events
+- `accessci://events/workshops` - Workshop events
+- `accessci://events/webinars` - Webinar events

package/dist/server.d.ts

@@ -1,65 +1,31 @@
-import { BaseAccessServer } from "@access-mcp/shared";
+import { BaseAccessServer, Tool, Resource, CallToolResult } from "@access-mcp/shared";
+import { CallToolRequest, ReadResourceRequest, ReadResourceResult } from "@modelcontextprotocol/sdk/types.js";
 import { AxiosInstance } from "axios";
 export declare class EventsServer extends BaseAccessServer {
     private _eventsHttpClient?;
+    private drupalAuth?;
     constructor();
+    /**
+     * Get or create the Drupal auth provider for authenticated operations.
+     * Requires DRUPAL_API_URL, DRUPAL_USERNAME, and DRUPAL_PASSWORD env vars.
+     */
+    private getDrupalAuth;
+    /**
+     * Get the acting user's ACCESS ID for filtering.
+     */
+    private getActingUserAccessId;
     protected get httpClient(): AxiosInstance;
-    protected getTools(): {
-        name: string;
-        description: string;
-        inputSchema: {
-            type: string;
-            properties: {
-                query: {
-                    type: string;
-                    description: string;
-                };
-                type: {
-                    type: string;
-                    description: string;
-                };
-                tags: {
-                    type: string;
-                    description: string;
-                };
-                date: {
-                    type: string;
-                    description: string;
-                    enum: string[];
-                };
-                skill: {
-                    type: string;
-                    description: string;
-                    enum: string[];
-                };
-                limit: {
-                    type: string;
-                    description: string;
-                    default: number;
-                };
-            };
-        };
-    }[];
-    protected getResources(): {
-        uri: string;
-        name: string;
-        description: string;
-        mimeType: string;
-    }[];
-    handleToolCall(request: any): Promise<{
-        content: {
-            type: string;
-            text: string;
-        }[];
-    }>;
-    handleResourceRead(request: any): Promise<{
-        contents: {
-            uri: string;
-            mimeType: string;
-            text: string;
-        }[];
-    }>;
+    protected getTools(): Tool[];
+    protected getResources(): Resource[];
+    protected handleToolCall(request: CallToolRequest): Promise<CallToolResult>;
+    protected handleResourceRead(request: ReadResourceRequest): Promise<ReadResourceResult>;
     private buildEventsUrl;
     private getEvents;
     private searchEvents;
+    /**
+     * Get events for the authenticated user via the unified Drupal view.
+     * Uses the /jsonapi/views/event_instance_mine/my_events_page endpoint
+     * which filters by X-Acting-User header.
+     */
+    private getMyEvents;
 }

package/dist/server.js

@@ -1,9 +1,53 @@
-import { BaseAccessServer, handleApiError } from "@access-mcp/shared";
+import { BaseAccessServer, handleApiError, DrupalAuthProvider, getRequestContext, } from "@access-mcp/shared";
 import axios from "axios";
+import { createRequire } from "module";
+const require = createRequire(import.meta.url);
+const { version } = require("../package.json");
 export class EventsServer extends BaseAccessServer {
     _eventsHttpClient;
+    drupalAuth;
     constructor() {
-        super("access-mcp-events", "0.3.0", "https://support.access-ci.org");
+        super("access-mcp-events", version, "https://support.access-ci.org", {
+            requireApiKey: true,
+        });
+    }
+    /**
+     * Get or create the Drupal auth provider for authenticated operations.
+     * Requires DRUPAL_API_URL, DRUPAL_USERNAME, and DRUPAL_PASSWORD env vars.
+     */
+    getDrupalAuth() {
+        if (!this.drupalAuth) {
+            const baseUrl = process.env.DRUPAL_API_URL;
+            const username = process.env.DRUPAL_USERNAME;
+            const password = process.env.DRUPAL_PASSWORD;
+            if (!baseUrl || !username || !password) {
+                throw new Error("Authenticated operations require DRUPAL_API_URL, DRUPAL_USERNAME, and DRUPAL_PASSWORD environment variables");
+            }
+            this.drupalAuth = new DrupalAuthProvider(baseUrl, username, password);
+        }
+        // Update acting user from request context or env var
+        const context = getRequestContext();
+        const actingUser = context?.actingUser || process.env.ACTING_USER;
+        if (actingUser) {
+            this.drupalAuth.setActingUser(actingUser);
+        }
+        return this.drupalAuth;
+    }
+    /**
+     * Get the acting user's ACCESS ID for filtering.
+     */
+    getActingUserAccessId() {
+        const context = getRequestContext();
+        if (context?.actingUser) {
+            return context.actingUser;
+        }
+        const envUser = process.env.ACTING_USER;
+        if (envUser) {
+            return envUser;
+        }
+        throw new Error("Cannot get user events: No acting user specified.\n\n" +
+            "Either set the X-Acting-User header or the ACTING_USER environment variable " +
+            "to the ACCESS ID (e.g., username@access-ci.org).");
     }
     get httpClient() {
         if (!this._eventsHttpClient) {
@@ -34,34 +78,53 @@ export class EventsServer extends BaseAccessServer {
                     properties: {
                         query: {
                             type: "string",
-                            description: "Search titles, descriptions, speakers, tags"
+                            description: "Search titles, descriptions, speakers, tags",
                         },
                         type: {
                             type: "string",
-                            description: "Filter: workshop, webinar, training"
+                            description: "Filter: workshop, webinar, training",
                         },
                         tags: {
                             type: "string",
-                            description: "Filter: python, gpu, hpc, ml"
+                            description: "Filter: python, gpu, hpc, ml",
                         },
                         date: {
                             type: "string",
                             description: "Filter by time period",
-                            enum: ["today", "upcoming", "past", "this_week", "this_month"]
+                            enum: ["today", "upcoming", "past", "this_week", "this_month"],
                         },
                         skill: {
                             type: "string",
                             description: "Skill level filter",
-                            enum: ["beginner", "intermediate", "advanced"]
+                            enum: ["beginner", "intermediate", "advanced"],
                         },
                         limit: {
                             type: "number",
                             description: "Max results (default: 50)",
-                            default: 50
-                        }
-                    }
-                }
-            }
+                            default: 50,
+                        },
+                    },
+                },
+            },
+            {
+                name: "get_my_events",
+                description: `Get events created by or associated with the authenticated user.
+
+Returns events the user has created or is associated with, including unpublished/draft events.
+Requires authentication via X-Acting-User header or ACTING_USER environment variable.
+
+Returns: {total, items: [{title, start_date, end_date, status, ...}]}`,
+                inputSchema: {
+                    type: "object",
+                    properties: {
+                        limit: {
+                            type: "number",
+                            description: "Max results (default: 50)",
+                            default: 50,
+                        },
+                    },
+                },
+            },
         ];
     }
     getResources() {
@@ -98,6 +161,8 @@ export class EventsServer extends BaseAccessServer {
             switch (name) {
                 case "search_events":
                     return await this.searchEvents(args);
+                case "get_my_events":
+                    return await this.getMyEvents(args);
                 default:
                     return this.errorResponse(`Unknown tool: ${name}`);
             }
@@ -109,18 +174,30 @@ export class EventsServer extends BaseAccessServer {
     async handleResourceRead(request) {
         const { uri } = request.params;
         switch (uri) {
-            case "accessci://events":
+            case "accessci://events": {
                 const allEvents = await this.searchEvents({});
-                return this.createJsonResource(uri, JSON.parse(allEvents.content[0].text));
-            case "accessci://events/upcoming":
+                const content = allEvents.content[0];
+                const text = content.type === "text" ? content.text : "";
+                return this.createJsonResource(uri, JSON.parse(text));
+            }
+            case "accessci://events/upcoming": {
                 const upcomingEvents = await this.searchEvents({ date: "upcoming" });
-                return this.createJsonResource(uri, JSON.parse(upcomingEvents.content[0].text));
-            case "accessci://events/workshops":
+                const content = upcomingEvents.content[0];
+                const text = content.type === "text" ? content.text : "";
+                return this.createJsonResource(uri, JSON.parse(text));
+            }
+            case "accessci://events/workshops": {
                 const workshops = await this.searchEvents({ type: "workshop" });
-                return this.createJsonResource(uri, JSON.parse(workshops.content[0].text));
-            case "accessci://events/webinars":
+                const content = workshops.content[0];
+                const text = content.type === "text" ? content.text : "";
+                return this.createJsonResource(uri, JSON.parse(text));
+            }
+            case "accessci://events/webinars": {
                 const webinars = await this.searchEvents({ type: "webinar" });
-                return this.createJsonResource(uri, JSON.parse(webinars.content[0].text));
+                const content = webinars.content[0];
+                const text = content.type === "text" ? content.text : "";
+                return this.createJsonResource(uri, JSON.parse(text));
+            }
             default:
                 throw new Error(`Unknown resource: ${uri}`);
         }
@@ -149,7 +226,7 @@ export class EventsServer extends BaseAccessServer {
             upcoming: { start: "today" },
             past: { start: "-1year", end: "today" },
             this_week: { start: "today", end: "+1week" },
-            this_month: { start: "today", end: "+1month" }
+            this_month: { start: "today", end: "+1month" },
         };
         if (params.date && dateMap[params.date]) {
             const dateMapping = dateMap[params.date];
@@ -158,20 +235,9 @@ export class EventsServer extends BaseAccessServer {
                 url.searchParams.set("end_date_relative", dateMapping.end);
             }
         }
-        // Faceted filters
-        let filterIndex = 0;
-        if (params.type) {
-            url.searchParams.set(`f[${filterIndex}]`, `custom_event_type:${params.type}`);
-            filterIndex++;
-        }
-        if (params.tags) {
-            url.searchParams.set(`f[${filterIndex}]`, `custom_event_tags:${params.tags}`);
-            filterIndex++;
-        }
-        if (params.skill) {
-            url.searchParams.set(`f[${filterIndex}]`, `skill_level:${params.skill}`);
-            filterIndex++;
-        }
+        // Note: faceted filters (f[0]=field:value) are not supported on the
+        // data_export API display — they're bound to the page display in Drupal.
+        // Type, tags, and skill filters are applied client-side in getEvents().
         return url.toString();
     }
     async getEvents(params) {
@@ -180,7 +246,24 @@ export class EventsServer extends BaseAccessServer {
         if (response.status !== 200) {
             throw new Error(`API error ${response.status}`);
         }
-        let events = response.data || [];
+        // Ensure response is an array (non-array means unexpected response like 403 HTML)
+        let events = Array.isArray(response.data) ? response.data : [];
+        // Client-side filters (faceted search not available on data_export display)
+        if (params.type) {
+            const typeFilter = params.type.toLowerCase();
+            events = events.filter((e) => (e.event_type || "").toLowerCase() === typeFilter);
+        }
+        if (params.tags) {
+            const tagFilter = params.tags.toLowerCase();
+            events = events.filter((e) => {
+                const tags = typeof e.tags === "string" ? e.tags : Array.isArray(e.tags) ? e.tags.join(",") : "";
+                return tags.toLowerCase().includes(tagFilter);
+            });
+        }
+        if (params.skill) {
+            const skillFilter = params.skill.toLowerCase();
+            events = events.filter((e) => (e.skill_level || "").toLowerCase() === skillFilter);
+        }
         if (params.limit && events.length > params.limit) {
             events = events.slice(0, params.limit);
         }
@@ -188,18 +271,21 @@ export class EventsServer extends BaseAccessServer {
             ...event,
             tags: Array.isArray(event.tags) ? event.tags : [],
             duration_hours: event.end_date
-                ? Math.round((new Date(event.end_date).getTime() - new Date(event.start_date).getTime()) / 3600000)
+                ? Math.round((new Date(event.end_date).getTime() - new Date(event.start_date || "").getTime()) /
+                    3600000)
                 : null,
-            starts_in_hours: Math.max(0, Math.round((new Date(event.start_date).getTime() - Date.now()) / 3600000))
+            starts_in_hours: Math.max(0, Math.round((new Date(event.start_date || "").getTime() - Date.now()) / 3600000)),
         }));
         return {
-            content: [{
+            content: [
+                {
                     type: "text",
                     text: JSON.stringify({
                         total: enhancedEvents.length,
-                        items: enhancedEvents
-                    })
-                }]
+                        items: enhancedEvents,
+                    }),
+                },
+            ],
         };
     }
     async searchEvents(params) {
@@ -214,4 +300,39 @@ export class EventsServer extends BaseAccessServer {
         }
         return await this.getEvents(params);
     }
+    /**
+     * Get events for the authenticated user via the unified Drupal view.
+     * Uses the /jsonapi/views/event_instance_mine/my_events_page endpoint
+     * which filters by X-Acting-User header.
+     */
+    async getMyEvents(params) {
+        const auth = this.getDrupalAuth();
+        // Ensure we have an acting user
+        this.getActingUserAccessId();
+        const limit = params.limit || 50;
+        // Use the unified view endpoint - it respects X-Acting-User header
+        const result = await auth.get(`/jsonapi/views/event_instance_mine/my_events_page?page[limit]=${limit}`);
+        // JSON:API views return data in a different format
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any -- JSON:API response shape is dynamic
+        const events = (result.data || []).map((item) => ({
+            id: item.id,
+            type: item.type,
+            title: item.attributes?.title,
+            start_date: item.attributes?.field_start_date || item.attributes?.start_date,
+            end_date: item.attributes?.field_end_date || item.attributes?.end_date,
+            status: item.attributes?.status ? "published" : "draft",
+            ...item.attributes,
+        }));
+        return {
+            content: [
+                {
+                    type: "text",
+                    text: JSON.stringify({
+                        total: events.length,
+                        items: events,
+                    }),
+                },
+            ],
+        };
+    }
 }