@optimizely-opal/opal-tool-ocp-sdk 0.0.0-OCP-1487.8 → 0.0.0-OCP-1487.10

package/src/service/Service.ts

@@ -52,7 +52,6 @@ export class Tool<TAuthData> {
    * @param endpoint API endpoint
    * @param handler Function implementing the tool
    * @param authRequirements Authentication requirements (mandatory - OptiID enforced)
-   * @param isGlobal Whether the tool is global (accessible irrespective of app installation context)
    */
   public constructor(
     public name: string,
@@ -64,8 +63,7 @@ export class Tool<TAuthData> {
       params: unknown,
       authData?: TAuthData
     ) => Promise<unknown>,
-    public authRequirements: AuthRequirement[] = [DEFAULT_OPTIID_AUTH],
-    public isGlobal: boolean = false
+    public authRequirements: AuthRequirement[] = [DEFAULT_OPTIID_AUTH]
   ) {}
 
   /**
@@ -89,21 +87,6 @@ export class ToolsService {
   private functions: Map<string, Tool<any>> = new Map();
   private interactions: Map<string, Interaction<any>> = new Map();
 
-  /**
-   * Set the import context for tools that will be imported
-   * @param context The context type ('global' | 'regular')
-   */
-  public setImportContext(context: 'global' | 'regular'): void {
-    globalThis.__IMPORT_CONTEXT = context;
-  }
-
-  /**
-   * Clear the import context after import is complete
-   */
-  public clearImportContext(): void {
-    globalThis.__IMPORT_CONTEXT = undefined;
-  }
-
   /**
    * Enforce OptiID authentication for tools by ensuring OptiID auth requirement is present
    * @param authRequirements Original authentication requirements
@@ -128,7 +111,6 @@ export class ToolsService {
    * @param parameters List of parameters for the tool
    * @param endpoint API endpoint for the tool
    * @param authRequirements Authentication requirements (optional)
-   * @param isGlobal Whether the tool is global
    */
   public registerTool<TAuthData>(
     name: string,
@@ -140,8 +122,7 @@ export class ToolsService {
     ) => Promise<unknown>,
     parameters: Parameter[],
     endpoint: string,
-    authRequirements?: AuthRequirement[],
-    isGlobal = false
+    authRequirements?: AuthRequirement[]
   ): void {
     // Enforce OptiID authentication for all tools
     const enforcedAuthRequirements = this.enforceOptiIdAuth(authRequirements);
@@ -151,8 +132,7 @@ export class ToolsService {
       parameters,
       endpoint,
       handler,
-      enforcedAuthRequirements,
-      isGlobal
+      enforcedAuthRequirements
     );
     this.functions.set(endpoint, func);
   }
@@ -181,7 +161,7 @@ export class ToolsService {
     functionContext: ToolFunction | GlobalToolFunction
   ): Promise<App.Response> {
     if (req.path === '/discovery') {
-      return this.handleDiscovery(functionContext);
+      return new App.Response(200, { functions: Array.from(this.functions.values()).map((f) => f.toJSON()) });
     } else {
       const func = this.functions.get(req.path);
       if (func) {
@@ -228,28 +208,6 @@ export class ToolsService {
       return new App.Response(404, 'Function not found');
     }
   }
-
-
-  /**
-   * Handle discovery endpoint requests with context-aware filtering
-   * @param functionContext The function context making the request
-   * @returns Response with filtered functions based on where tools are defined/imported
-   */
-  private handleDiscovery(functionContext: ToolFunction | GlobalToolFunction): App.Response {
-    const isGlobalContext = functionContext instanceof GlobalToolFunction;
-
-    const availableFunctions = Array.from(this.functions.values()).filter((tool) => {
-      if (isGlobalContext) {
-        // Global context can only see global tools (defined in or imported into GlobalToolFunction)
-        return tool.isGlobal;
-      } else {
-        // Regular context can only see regular tools (defined in or imported into ToolFunction)
-        return !tool.isGlobal;
-      }
-    });
-
-    return new App.Response(200, { functions: availableFunctions.map((f) => f.toJSON()) });
-  }
 }
 
 export const toolsService = new ToolsService();

package/dist/utils/ImportUtils.d.ts

@@ -1,15 +0,0 @@
-/**
- * Import a module as global tools
- * @param modulePath The path to the module to import
- * @param baseUrl The base URL for resolving relative imports (optional)
- * @returns The imported module
- */
-export declare function importAsGlobal<T = any>(modulePath: string, baseUrl?: string): Promise<T>;
-/**
- * Import a module as regular tools
- * @param modulePath The path to the module to import
- * @param baseUrl The base URL for resolving relative imports (optional)
- * @returns The imported module
- */
-export declare function importAsRegular<T = any>(modulePath: string, baseUrl?: string): Promise<T>;
-//# sourceMappingURL=ImportUtils.d.ts.map

package/dist/utils/ImportUtils.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ImportUtils.d.ts","sourceRoot":"","sources":["../../src/utils/ImportUtils.ts"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH,wBAAsB,cAAc,CAAC,CAAC,GAAG,GAAG,EAC1C,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,CAAC,CAAC,CAWZ;AAED;;;;;GAKG;AACH,wBAAsB,eAAe,CAAC,CAAC,GAAG,GAAG,EAC3C,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,CAAC,CAAC,CAWZ"}

package/dist/utils/ImportUtils.js

@@ -1,77 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.importAsGlobal = importAsGlobal;
-exports.importAsRegular = importAsRegular;
-const Service_1 = require("../service/Service");
-/**
- * Import a module as global tools
- * @param modulePath The path to the module to import
- * @param baseUrl The base URL for resolving relative imports (optional)
- * @returns The imported module
- */
-async function importAsGlobal(modulePath, baseUrl) {
-    try {
-        Service_1.toolsService.setImportContext('global');
-        // If baseUrl is provided, resolve the module path relative to it
-        // Otherwise, use the modulePath as-is
-        const resolvedPath = baseUrl ? new URL(modulePath, baseUrl).href : modulePath;
-        const module = await Promise.resolve(`${resolvedPath}`).then(s => __importStar(require(s)));
-        return module;
-    }
-    finally {
-        Service_1.toolsService.clearImportContext();
-    }
-}
-/**
- * Import a module as regular tools
- * @param modulePath The path to the module to import
- * @param baseUrl The base URL for resolving relative imports (optional)
- * @returns The imported module
- */
-async function importAsRegular(modulePath, baseUrl) {
-    try {
-        Service_1.toolsService.setImportContext('regular');
-        // If baseUrl is provided, resolve the module path relative to it
-        // Otherwise, use the modulePath as-is
-        const resolvedPath = baseUrl ? new URL(modulePath, baseUrl).href : modulePath;
-        const module = await Promise.resolve(`${resolvedPath}`).then(s => __importStar(require(s)));
-        return module;
-    }
-    finally {
-        Service_1.toolsService.clearImportContext();
-    }
-}
-//# sourceMappingURL=ImportUtils.js.map

package/dist/utils/ImportUtils.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ImportUtils.js","sourceRoot":"","sources":["../../src/utils/ImportUtils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAQA,wCAcC;AAQD,0CAcC;AA5CD,gDAAkD;AAElD;;;;;GAKG;AACI,KAAK,UAAU,cAAc,CAClC,UAAkB,EAClB,OAAgB;IAEhB,IAAI,CAAC;QACH,sBAAY,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QACxC,iEAAiE;QACjE,sCAAsC;QACtC,MAAM,YAAY,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC;QAC9E,MAAM,MAAM,GAAG,yBAAa,YAAY,uCAAC,CAAC;QAC1C,OAAO,MAAM,CAAC;IAChB,CAAC;YAAS,CAAC;QACT,sBAAY,CAAC,kBAAkB,EAAE,CAAC;IACpC,CAAC;AACH,CAAC;AAED;;;;;GAKG;AACI,KAAK,UAAU,eAAe,CACnC,UAAkB,EAClB,OAAgB;IAEhB,IAAI,CAAC;QACH,sBAAY,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;QACzC,iEAAiE;QACjE,sCAAsC;QACtC,MAAM,YAAY,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC;QAC9E,MAAM,MAAM,GAAG,yBAAa,YAAY,uCAAC,CAAC;QAC1C,OAAO,MAAM,CAAC;IAChB,CAAC;YAAS,CAAC;QACT,sBAAY,CAAC,kBAAkB,EAAE,CAAC;IACpC,CAAC;AACH,CAAC"}

package/src/utils/ImportUtils.ts

@@ -1,45 +0,0 @@
-import { toolsService } from '../service/Service';
-
-/**
- * Import a module as global tools
- * @param modulePath The path to the module to import
- * @param baseUrl The base URL for resolving relative imports (optional)
- * @returns The imported module
- */
-export async function importAsGlobal<T = any>(
-  modulePath: string,
-  baseUrl?: string
-): Promise<T> {
-  try {
-    toolsService.setImportContext('global');
-    // If baseUrl is provided, resolve the module path relative to it
-    // Otherwise, use the modulePath as-is
-    const resolvedPath = baseUrl ? new URL(modulePath, baseUrl).href : modulePath;
-    const module = await import(resolvedPath);
-    return module;
-  } finally {
-    toolsService.clearImportContext();
-  }
-}
-
-/**
- * Import a module as regular tools
- * @param modulePath The path to the module to import
- * @param baseUrl The base URL for resolving relative imports (optional)
- * @returns The imported module
- */
-export async function importAsRegular<T = any>(
-  modulePath: string,
-  baseUrl?: string
-): Promise<T> {
-  try {
-    toolsService.setImportContext('regular');
-    // If baseUrl is provided, resolve the module path relative to it
-    // Otherwise, use the modulePath as-is
-    const resolvedPath = baseUrl ? new URL(modulePath, baseUrl).href : modulePath;
-    const module = await import(resolvedPath);
-    return module;
-  } finally {
-    toolsService.clearImportContext();
-  }
-}