skedyul 0.2.69 → 0.2.71

package/dist/.build-stamp

@@ -1 +1 @@
-1769572224136
+1769638280655

package/dist/config.d.ts

@@ -602,9 +602,12 @@ export interface PageDefinition {
 export type WebhookHttpMethod = 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH';
 export interface WebhookRequest {
     method: string;
-    headers: Record<string, string>;
-    body: unknown;
+    url: string;
+    path: string;
+    headers: Record<string, string | string[] | undefined>;
     query: Record<string, string>;
+    body: unknown;
+    rawBody?: Buffer;
 }
 export interface WebhookHandlerContext {
     appInstallationId: string | null;

package/dist/server.js

@@ -679,38 +679,69 @@ function createDedicatedServerInstance(config, tools, callTool, state, mcpServer
                 else {
                     parsedBody = rawBody;
                 }
-                // Build WebhookRequest
-                const webhookRequest = {
-                    method: req.method ?? 'POST',
-                    url: url.toString(),
-                    path: pathname,
-                    headers: req.headers,
-                    query: Object.fromEntries(url.searchParams.entries()),
-                    body: parsedBody,
-                    rawBody: rawBody ? Buffer.from(rawBody, 'utf-8') : undefined,
-                };
-                // Build WebhookContext - check for platform-injected headers
-                const appInstallationId = req.headers['x-skedyul-app-installation-id'];
-                const workplaceId = req.headers['x-skedyul-workplace-id'];
-                const registrationContextHeader = req.headers['x-skedyul-registration-context'];
-                // Parse registration context from base64-encoded header
-                let registrationContext = {};
-                if (registrationContextHeader) {
-                    try {
-                        const decoded = Buffer.from(registrationContextHeader, 'base64').toString('utf-8');
-                        registrationContext = JSON.parse(decoded);
-                    }
-                    catch {
-                        console.warn('Failed to parse X-Skedyul-Registration-Context header');
+                // Check if this is an envelope format from the platform
+                // Envelope format: { env: {...}, request: {...}, context: {...} }
+                const isEnvelope = (typeof parsedBody === 'object' &&
+                    parsedBody !== null &&
+                    'env' in parsedBody &&
+                    'request' in parsedBody &&
+                    'context' in parsedBody);
+                let webhookRequest;
+                let webhookContext;
+                let requestEnv = {};
+                if (isEnvelope) {
+                    // Platform envelope format - extract env, request, and context
+                    const envelope = parsedBody;
+                    requestEnv = envelope.env ?? {};
+                    // Parse the original request body
+                    let originalParsedBody = envelope.request.body;
+                    const originalContentType = envelope.request.headers['content-type'] ?? '';
+                    if (originalContentType.includes('application/json')) {
+                        try {
+                            originalParsedBody = envelope.request.body ? JSON.parse(envelope.request.body) : {};
+                        }
+                        catch {
+                            // Keep as string if JSON parsing fails
+                        }
                     }
+                    webhookRequest = {
+                        method: envelope.request.method,
+                        url: envelope.request.url,
+                        path: envelope.request.path,
+                        headers: envelope.request.headers,
+                        query: envelope.request.query,
+                        body: originalParsedBody,
+                        rawBody: envelope.request.body ? Buffer.from(envelope.request.body, 'utf-8') : undefined,
+                    };
+                    webhookContext = {
+                        env: { ...process.env, ...requestEnv },
+                        appInstallationId: envelope.context.appInstallationId,
+                        workplace: envelope.context.workplace,
+                        registration: envelope.context.registration ?? {},
+                    };
                 }
-                const webhookContext = {
-                    env: process.env,
-                    // Platform-injected context for registration-based webhooks
-                    appInstallationId: appInstallationId ?? null,
-                    workplace: workplaceId ? { id: workplaceId, subdomain: null } : null,
-                    registration: registrationContext,
-                };
+                else {
+                    // Direct request format (legacy or direct calls)
+                    webhookRequest = {
+                        method: req.method ?? 'POST',
+                        url: url.toString(),
+                        path: pathname,
+                        headers: req.headers,
+                        query: Object.fromEntries(url.searchParams.entries()),
+                        body: parsedBody,
+                        rawBody: rawBody ? Buffer.from(rawBody, 'utf-8') : undefined,
+                    };
+                    webhookContext = {
+                        env: process.env,
+                        appInstallationId: null,
+                        workplace: null,
+                        registration: {},
+                    };
+                }
+                // Temporarily inject env into process.env for skedyul client to use
+                // (same pattern as tool handler)
+                const originalEnv = { ...process.env };
+                Object.assign(process.env, requestEnv);
                 // Invoke the handler
                 let webhookResponse;
                 try {
@@ -721,6 +752,10 @@ function createDedicatedServerInstance(config, tools, callTool, state, mcpServer
                     sendJSON(res, 500, { error: 'Webhook handler error' });
                     return;
                 }
+                finally {
+                    // Restore original env
+                    process.env = originalEnv;
+                }
                 // Send response
                 const status = webhookResponse.status ?? 200;
                 const responseHeaders = {
@@ -826,8 +861,8 @@ function createDedicatedServerInstance(config, tools, callTool, state, mcpServer
                     key,
                     typeof value === 'string' ? value : value?.[0] ?? '',
                 ]));
-                const webhookRequest = {
-                    method: req.method,
+                const coreWebhookRequest = {
+                    method: req.method ?? 'POST',
                     headers: normalizedHeaders,
                     body: webhookBody,
                     query: Object.fromEntries(url.searchParams.entries()),
@@ -837,7 +872,7 @@ function createDedicatedServerInstance(config, tools, callTool, state, mcpServer
                         ? Buffer.from(rawWebhookBody, 'utf-8')
                         : undefined,
                 };
-                const webhookResponse = await service_1.coreApiService.dispatchWebhook(webhookRequest);
+                const webhookResponse = await service_1.coreApiService.dispatchWebhook(coreWebhookRequest);
                 res.writeHead(webhookResponse.status, {
                     'Content-Type': 'application/json',
                 });
@@ -965,50 +1000,77 @@ function createServerlessInstance(config, tools, callTool, state, mcpServer, reg
                     else {
                         parsedBody = rawBody;
                     }
-                    // Build URL
-                    const forwardedProto = event.headers?.['x-forwarded-proto'] ??
-                        event.headers?.['X-Forwarded-Proto'];
-                    const protocol = forwardedProto ?? 'https';
-                    const host = event.headers?.host ?? event.headers?.Host ?? 'localhost';
-                    const queryString = event.queryStringParameters
-                        ? '?' + new URLSearchParams(event.queryStringParameters).toString()
-                        : '';
-                    const webhookUrl = `${protocol}://${host}${path}${queryString}`;
-                    // Build WebhookRequest
-                    const webhookRequest = {
-                        method,
-                        url: webhookUrl,
-                        path,
-                        headers: event.headers,
-                        query: event.queryStringParameters ?? {},
-                        body: parsedBody,
-                        rawBody: rawBody ? Buffer.from(rawBody, 'utf-8') : undefined,
-                    };
-                    // Build WebhookContext - check for platform-injected headers
-                    const appInstallationId = event.headers?.['x-skedyul-app-installation-id'] ??
-                        event.headers?.['X-Skedyul-App-Installation-Id'];
-                    const workplaceId = event.headers?.['x-skedyul-workplace-id'] ??
-                        event.headers?.['X-Skedyul-Workplace-Id'];
-                    const registrationContextHeader = event.headers?.['x-skedyul-registration-context'] ??
-                        event.headers?.['X-Skedyul-Registration-Context'];
-                    // Parse registration context from base64-encoded header
-                    let registrationContext = {};
-                    if (registrationContextHeader) {
-                        try {
-                            const decoded = Buffer.from(registrationContextHeader, 'base64').toString('utf-8');
-                            registrationContext = JSON.parse(decoded);
-                        }
-                        catch {
-                            console.warn('Failed to parse X-Skedyul-Registration-Context header');
+                    // Check if this is an envelope format from the platform
+                    // Envelope format: { env: {...}, request: {...}, context: {...} }
+                    const isEnvelope = (typeof parsedBody === 'object' &&
+                        parsedBody !== null &&
+                        'env' in parsedBody &&
+                        'request' in parsedBody &&
+                        'context' in parsedBody);
+                    let webhookRequest;
+                    let webhookContext;
+                    let requestEnv = {};
+                    if (isEnvelope) {
+                        // Platform envelope format - extract env, request, and context
+                        const envelope = parsedBody;
+                        requestEnv = envelope.env ?? {};
+                        // Parse the original request body
+                        let originalParsedBody = envelope.request.body;
+                        const originalContentType = envelope.request.headers['content-type'] ?? '';
+                        if (originalContentType.includes('application/json')) {
+                            try {
+                                originalParsedBody = envelope.request.body ? JSON.parse(envelope.request.body) : {};
+                            }
+                            catch {
+                                // Keep as string if JSON parsing fails
+                            }
                         }
+                        webhookRequest = {
+                            method: envelope.request.method,
+                            url: envelope.request.url,
+                            path: envelope.request.path,
+                            headers: envelope.request.headers,
+                            query: envelope.request.query,
+                            body: originalParsedBody,
+                            rawBody: envelope.request.body ? Buffer.from(envelope.request.body, 'utf-8') : undefined,
+                        };
+                        webhookContext = {
+                            env: { ...process.env, ...requestEnv },
+                            appInstallationId: envelope.context.appInstallationId,
+                            workplace: envelope.context.workplace,
+                            registration: envelope.context.registration ?? {},
+                        };
                     }
-                    const webhookContext = {
-                        env: process.env,
-                        // Platform-injected context for registration-based webhooks
-                        appInstallationId: appInstallationId ?? null,
-                        workplace: workplaceId ? { id: workplaceId, subdomain: null } : null,
-                        registration: registrationContext,
-                    };
+                    else {
+                        // Direct request format (legacy or direct calls)
+                        const forwardedProto = event.headers?.['x-forwarded-proto'] ??
+                            event.headers?.['X-Forwarded-Proto'];
+                        const protocol = forwardedProto ?? 'https';
+                        const host = event.headers?.host ?? event.headers?.Host ?? 'localhost';
+                        const queryString = event.queryStringParameters
+                            ? '?' + new URLSearchParams(event.queryStringParameters).toString()
+                            : '';
+                        const webhookUrl = `${protocol}://${host}${path}${queryString}`;
+                        webhookRequest = {
+                            method,
+                            url: webhookUrl,
+                            path,
+                            headers: event.headers,
+                            query: event.queryStringParameters ?? {},
+                            body: parsedBody,
+                            rawBody: rawBody ? Buffer.from(rawBody, 'utf-8') : undefined,
+                        };
+                        webhookContext = {
+                            env: process.env,
+                            appInstallationId: null,
+                            workplace: null,
+                            registration: {},
+                        };
+                    }
+                    // Temporarily inject env into process.env for skedyul client to use
+                    // (same pattern as tool handler)
+                    const originalEnv = { ...process.env };
+                    Object.assign(process.env, requestEnv);
                     // Invoke the handler
                     let webhookResponse;
                     try {
@@ -1018,6 +1080,10 @@ function createServerlessInstance(config, tools, callTool, state, mcpServer, reg
                         console.error(`Webhook handler '${handle}' error:`, err);
                         return createResponse(500, { error: 'Webhook handler error' }, headers);
                     }
+                    finally {
+                        // Restore original env
+                        process.env = originalEnv;
+                    }
                     // Build response headers
                     const responseHeaders = {
                         ...headers,
@@ -1072,9 +1138,9 @@ function createServerlessInstance(config, tools, callTool, state, mcpServer, reg
                     const protocol = forwardedProto ?? 'https';
                     const host = event.headers?.host ?? event.headers?.Host ?? 'localhost';
                     const webhookUrl = `${protocol}://${host}${event.path}`;
-                    const webhookRequest = {
+                    const coreWebhookRequest = {
                         method,
-                        headers: event.headers ?? {},
+                        headers: (event.headers ?? {}),
                         body: webhookBody,
                         query: event.queryStringParameters ?? {},
                         url: webhookUrl,
@@ -1083,7 +1149,7 @@ function createServerlessInstance(config, tools, callTool, state, mcpServer, reg
                             ? Buffer.from(rawWebhookBody, 'utf-8')
                             : undefined,
                     };
-                    const webhookResponse = await service_1.coreApiService.dispatchWebhook(webhookRequest);
+                    const webhookResponse = await service_1.coreApiService.dispatchWebhook(coreWebhookRequest);
                     return createResponse(webhookResponse.status, webhookResponse.body ?? {}, headers);
                 }
                 if (path === '/estimate' && method === 'POST') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skedyul",
-  "version": "0.2.69",
+  "version": "0.2.71",
   "description": "The Skedyul SDK for Node.js",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",