Merge pull request #22 from Beyond-Better/staging

Fixes for docs endpoint handler

Author: cngarrison

deno.jsonc

@@ -1,6 +1,6 @@
 {
   "name": "@beyondbetter/bb-mcp-server",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "description": "Comprehensive library for building Deno-based MCP servers",
   "license": "MIT",
   "copyright": "2025 - Beyond Better <charlie@beyondbetter.app>",

src/lib/config/ConfigManager.ts

@@ -86,7 +86,7 @@ export class ConfigManager {
       if (oauthProvider) {
         this.config.oauthProvider = oauthProvider;
       }
-      this._logger?.info('Configuration oauthProvider:', oauthProvider);
+      this._logger?.info('ConfigManager: oauthProvider:', oauthProvider);
 
       const oauthConsumer = this.loadOAuthConsumerConfig();
       if (oauthConsumer) {
@@ -99,6 +99,7 @@ export class ConfigManager {
       }
 
       const docsEndpoint = this.loadDocsEndpointConfig();
+      this._logger?.info('ConfigManager: docsEndpoint:', docsEndpoint);
       if (docsEndpoint) {
         this.config.docsEndpoint = docsEndpoint;
       }
@@ -238,12 +239,16 @@ export class ConfigManager {
    * Load server configuration from environment
    */
   private loadServerConfig(): ServerConfig {
+    const httpHost = this.getEnvOptional('HTTP_HOST', 'localhost');
+    const httpPort = parseInt(this.getEnvOptional('HTTP_PORT', '3000'));
+
     return {
       name: this.getEnvOptional('SERVER_NAME', 'mcp-server'),
       version: this.getEnvOptional('SERVER_VERSION', '1.0.0'),
       transport: this.getEnvOptional('MCP_TRANSPORT', 'stdio') as 'stdio' | 'http',
-      httpPort: parseInt(this.getEnvOptional('HTTP_PORT', '3000')),
-      httpHost: this.getEnvOptional('HTTP_HOST', 'localhost'),
+      httpHost,
+      httpPort,
+      publicUrl: this.getEnvOptional('SERVER_PUBLIC_URL', `http://${httpHost}:${httpPort}`),
       devMode: this.getEnvBoolean('DEV_MODE', false),
     };
   }

src/lib/config/ConfigTypes.ts

@@ -14,6 +14,7 @@ export interface ServerConfig {
   transport: 'stdio' | 'http';
   httpPort?: number;
   httpHost?: string;
+  publicUrl?: string;
   devMode: boolean;
 }
 

src/lib/server/AppServer.ts

@@ -255,6 +255,7 @@ export class AppServer {
         oauthConsumer: this.dependencies.oauthConsumer,
         workflowRegistry: this.dependencies.workflowRegistry,
         httpServerConfig: this.dependencies.httpServerConfig,
+        docsEndpointHandler: this.dependencies.docsEndpointHandler,
       });
 
       // Start HTTP server (handles MCP via /mcp endpoint)

src/lib/server/DependencyHelpers.ts

@@ -380,20 +380,23 @@ export function getTransportPersistenceStore(
  * Consuming apps can provide their own DocsEndpointHandler or use this default
  */
 export function getDocsEndpointHandler(
-  configManager: ConfigManager,
+  docsEndpointConfig: DocsEndpointConfig,
   logger: Logger,
-  docsConfig?: DocsEndpointConfig,
 ): DocsEndpointHandler | undefined {
-  // Use provided config or load from ConfigManager
-  const config = docsConfig || configManager.get<DocsEndpointConfig>('docsEndpoint');
-
-  if (!config || !config.enabled) {
+  // logger.info('DependencyHelper: Documentation endpoint', {
+  //   enabled: docsEndpointConfig.enabled,
+  //   path: docsEndpointConfig.path,
+  //   availableDocs: docsEndpointConfig.contentModule?.list(),
+  //   totalDocs: docsEndpointConfig.contentModule?.stats().total,
+  // });
+
+  if (!docsEndpointConfig || !docsEndpointConfig.enabled) {
     logger.debug('DependencyHelper: Documentation endpoint not enabled');
     return undefined;
   }
 
   // Validate that content source is provided
-  if (!config.contentModule && !config.content) {
+  if (!docsEndpointConfig.contentModule && !docsEndpointConfig.content) {
     logger.warn(
       'DependencyHelper: Documentation endpoint enabled but no content provided',
       {
@@ -404,14 +407,14 @@ export function getDocsEndpointHandler(
   }
 
   logger.info('DependencyHelper: Creating documentation endpoint handler', {
-    path: config.path,
-    hasContentModule: !!config.contentModule,
-    hasContent: !!config.content,
-    allowListing: config.allowListing,
-    cacheEnabled: config.enableCache,
+    path: docsEndpointConfig.path,
+    hasContentModule: !!docsEndpointConfig.contentModule,
+    hasContent: !!docsEndpointConfig.content,
+    allowListing: docsEndpointConfig.allowListing,
+    cacheEnabled: docsEndpointConfig.enableCache,
   });
 
-  return new DocsEndpointHandler(config, logger);
+  return new DocsEndpointHandler(docsEndpointConfig, logger);
 }
 
 /**
@@ -873,8 +876,10 @@ export async function getAllDependencies(
   const httpServerConfig = overrides.httpServerConfig || getHttpServerConfig(configManager);
 
   // Create docs endpoint handler if needed (can be overridden by consumer)
+  const docsEndpointConfig = overrides.docsEndpointConfig ||
+    configManager.get<DocsEndpointConfig>('docsEndpoint');
   const docsEndpointHandler = overrides.docsEndpointHandler ||
-    getDocsEndpointHandler(configManager, logger, overrides.docsEndpointConfig);
+    getDocsEndpointHandler(docsEndpointConfig, logger);
 
   // Create MCP server (either from class or default)
   const serverConfig = overrides.serverConfig || {
@@ -899,6 +904,7 @@ export async function getAllDependencies(
     oauthProvider,
     transportManager,
     httpServerConfig,
+    docsEndpointConfig,
     docsEndpointHandler,
     ...consumerDeps,
   };

src/lib/server/HttpServer.ts

@@ -71,7 +71,7 @@ export interface HttpServerDependencies {
   /** Server configuration */
   httpServerConfig: HttpServerConfig;
   /** Documentation endpoint handler (optional) */
-  docsEndpointHandler?: DocsEndpointHandler;
+  docsEndpointHandler?: DocsEndpointHandler | undefined;
   // TODO: Future - Generic custom endpoints
   // /** Custom endpoint handlers */
   // customEndpoints?: Array<{
@@ -132,6 +132,7 @@ export class HttpServer {
       port: this.httpServerConfig.port,
       name: this.httpServerConfig.name,
       version: this.httpServerConfig.version,
+      usingDocsHandler: !!this.docsHandler,
     });
   }
 

src/lib/types/AppServerTypes.ts

@@ -68,6 +68,7 @@ export interface AppServerDependencies {
   httpServerConfig?: HttpServerConfig;
 
   // Documentation endpoint handler (optional)
+  docsEndpointConfig?: DocsEndpointConfig;
   docsEndpointHandler?: DocsEndpointHandler;
 
   // Consumer-specific dependencies (pre-built instances