@optimizely-opal/opal-tool-ocp-sdk 0.0.0-beta.1 → 0.0.0-beta.11

package/src/service/Service.ts

@@ -2,6 +2,7 @@
 import { AuthRequirement, Parameter } from '../types/Models';
 import * as App from '@zaiusinc/app-sdk';
 import { logger } from '@zaiusinc/app-sdk';
+import { ToolFunction } from '../function/ToolFunction';
 
 
 
@@ -22,7 +23,7 @@ export class Interaction<TAuthData> {
   public constructor(
     public name: string,
     public endpoint: string,
-    public handler: (data: unknown, authData?: TAuthData) => Promise<InteractionResult>
+    public handler: (functionContext: ToolFunction, data: unknown, authData?: TAuthData) => Promise<InteractionResult>
   ) {}
 }
 
@@ -49,7 +50,7 @@ export class Tool<TAuthData> {
     public description: string,
     public parameters: Parameter[],
     public endpoint: string,
-    public handler: (params: unknown, authData?: TAuthData) => Promise<unknown>,
+    public handler: (functionContext: ToolFunction, params: unknown, authData?: TAuthData) => Promise<unknown>,
     public authRequirements?: AuthRequirement[]
   ) {}
 
@@ -104,7 +105,7 @@ export class ToolsService {
   public registerTool<TAuthData>(
     name: string,
     description: string,
-    handler: (params: unknown, authData?: TAuthData) => Promise<unknown>,
+    handler: (functionContext: ToolFunction, params: unknown, authData?: TAuthData) => Promise<unknown>,
     parameters: Parameter[],
     endpoint: string,
     authRequirements?: AuthRequirement[]
@@ -121,14 +122,15 @@ export class ToolsService {
    */
   public registerInteraction<TAuthData>(
     name: string,
-    handler: (data: unknown, authData?: TAuthData) => Promise<InteractionResult>,
+    handler: (functionContext: ToolFunction, data: unknown, authData?: TAuthData) => Promise<InteractionResult>,
     endpoint: string
   ): void {
     const func = new Interaction<TAuthData>(name, endpoint, handler);
     this.interactions.set(endpoint, func);
   }
 
-  public async processRequest(req: App.Request): Promise<App.Response> {
+  public async processRequest(req: App.Request,
+                              functionContext: ToolFunction): Promise<App.Response> {
     if (req.path === '/discovery') {
       return new App.Response(200, { functions: Array.from(this.functions.values()).map((f) => f.toJSON()) });
     } else {
@@ -145,7 +147,7 @@ export class ToolsService {
           // Extract auth data from body JSON
           const authData = req.bodyJSON ? req.bodyJSON.auth : undefined;
 
-          const result = await func.handler(params, authData);
+          const result = await func.handler(functionContext, params, authData);
           return new App.Response(200, result);
         } catch (error: any) {
           logger.error(`Error in function ${func.name}:`, error);
@@ -166,7 +168,7 @@ export class ToolsService {
           // Extract auth data from body JSON
           const authData = req.bodyJSON ? req.bodyJSON.auth : undefined;
 
-          const result = await interaction.handler(params, authData);
+          const result = await interaction.handler(functionContext, params, authData);
           return new App.Response(200, result);
         } catch (error: any) {
           logger.error(`Error in function ${interaction.name}:`, error);