@fentz26/envcp 1.0.1 → 1.0.2

package/src/adapters/openai.ts

@@ -1,110 +1,18 @@
 import { BaseAdapter } from './base.js';
-import { EnvCPConfig, OpenAIFunction, OpenAIToolCall, OpenAIMessage, ToolDefinition } from '../types.js';
-import { setCorsHeaders, sendJson, parseBody, validateApiKey } from '../utils/http.js';
+import { EnvCPConfig, OpenAIFunction, OpenAIToolCall, OpenAIMessage } from '../types.js';
+import { setCorsHeaders, sendJson, parseBody, validateApiKey, RateLimiter, rateLimitMiddleware } from '../utils/http.js';
 import * as http from 'http';
-import * as url from 'url';
 
 export class OpenAIAdapter extends BaseAdapter {
   private server: http.Server | null = null;
+  private rateLimiter = new RateLimiter(60, 60000);
 
   constructor(config: EnvCPConfig, projectPath: string, password?: string) {
     super(config, projectPath, password);
   }
 
   protected registerTools(): void {
-    const tools: ToolDefinition[] = [
-      {
-        name: 'envcp_list',
-        description: 'List all available environment variable names. Values are never shown.',
-        parameters: {
-          type: 'object',
-          properties: {
-            tags: {
-              type: 'array',
-              items: { type: 'string' },
-              description: 'Filter by tags',
-            },
-          },
-        },
-        handler: async (params) => this.listVariables(params as { tags?: string[] }),
-      },
-      {
-        name: 'envcp_get',
-        description: 'Get an environment variable. Returns masked value by default.',
-        parameters: {
-          type: 'object',
-          properties: {
-            name: { type: 'string', description: 'Variable name' },
-            show_value: { type: 'boolean', description: 'Show actual value (requires user confirmation)' },
-          },
-          required: ['name'],
-        },
-        handler: async (params) => this.getVariable(params as { name: string; show_value?: boolean }),
-      },
-      {
-        name: 'envcp_set',
-        description: 'Create or update an environment variable.',
-        parameters: {
-          type: 'object',
-          properties: {
-            name: { type: 'string', description: 'Variable name' },
-            value: { type: 'string', description: 'Variable value' },
-            tags: { type: 'array', items: { type: 'string' }, description: 'Tags' },
-            description: { type: 'string', description: 'Description' },
-          },
-          required: ['name', 'value'],
-        },
-        handler: async (params) => this.setVariable(params as any),
-      },
-      {
-        name: 'envcp_delete',
-        description: 'Delete an environment variable.',
-        parameters: {
-          type: 'object',
-          properties: {
-            name: { type: 'string', description: 'Variable name' },
-          },
-          required: ['name'],
-        },
-        handler: async (params) => this.deleteVariable(params as { name: string }),
-      },
-      {
-        name: 'envcp_sync',
-        description: 'Sync variables to .env file.',
-        parameters: {
-          type: 'object',
-          properties: {},
-        },
-        handler: async () => this.syncToEnv(),
-      },
-      {
-        name: 'envcp_run',
-        description: 'Execute a command with environment variables injected.',
-        parameters: {
-          type: 'object',
-          properties: {
-            command: { type: 'string', description: 'Command to execute' },
-            variables: { type: 'array', items: { type: 'string' }, description: 'Variables to inject' },
-          },
-          required: ['command', 'variables'],
-        },
-        handler: async (params) => this.runCommand(params as { command: string; variables: string[] }),
-      },
-      {
-        name: 'envcp_check_access',
-        description: 'Check if a variable exists and can be accessed.',
-        parameters: {
-          type: 'object',
-          properties: {
-            name: { type: 'string', description: 'Variable name' },
-          },
-          required: ['name'],
-        },
-        handler: async (params) => this.checkAccess(params as { name: string }),
-      },
-    ];
-
-    tools.forEach(tool => this.tools.set(tool.name, tool));
+    this.registerDefaultTools();
   }
 
   // Convert tools to OpenAI function format
@@ -114,8 +22,8 @@ export class OpenAIAdapter extends BaseAdapter {
       description: tool.description,
       parameters: {
         type: 'object' as const,
-        properties: (tool.parameters as any).properties || {},
-        required: (tool.parameters as any).required,
+        properties: (tool.parameters as Record<string, unknown>).properties as Record<string, unknown> || {},
+        required: (tool.parameters as Record<string, unknown>).required as string[] | undefined,
       },
     }));
   }
@@ -133,11 +41,12 @@ export class OpenAIAdapter extends BaseAdapter {
           tool_call_id: call.id,
           content: JSON.stringify(result),
         });
-      } catch (error: any) {
+      } catch (error: unknown) {
+        const message = error instanceof Error ? error.message : String(error);
         results.push({
           role: 'tool',
           tool_call_id: call.id,
-          content: JSON.stringify({ error: error.message }),
+          content: JSON.stringify({ error: message }),
         });
       }
     }
@@ -150,7 +59,7 @@ export class OpenAIAdapter extends BaseAdapter {
     await this.init();
 
     this.server = http.createServer(async (req, res) => {
-      setCorsHeaders(res);
+      setCorsHeaders(res, undefined, req.headers.origin);
 
       if (req.method === 'OPTIONS') {
         res.writeHead(204);
@@ -158,6 +67,10 @@ export class OpenAIAdapter extends BaseAdapter {
         return;
       }
 
+      if (!rateLimitMiddleware(this.rateLimiter, req, res)) {
+        return;
+      }
+
       // API key validation
       if (apiKey) {
         const providedKey = req.headers['authorization']?.replace('Bearer ', '');
@@ -167,8 +80,8 @@ export class OpenAIAdapter extends BaseAdapter {
         }
       }
 
-      const parsedUrl = url.parse(req.url || '/', true);
-      const pathname = parsedUrl.pathname || '/';
+      const parsedUrl = new URL(req.url || '/', `http://${req.headers.host || 'localhost'}`);
+      const pathname = parsedUrl.pathname;
 
       try {
         // OpenAI-compatible endpoints
@@ -303,8 +216,9 @@ export class OpenAIAdapter extends BaseAdapter {
         // 404
         sendJson(res, 404, { error: { message: 'Not found', type: 'not_found' } });
 
-      } catch (error: any) {
-        sendJson(res, 500, { error: { message: error.message, type: 'internal_error' } });
+      } catch (error: unknown) {
+        const message = error instanceof Error ? error.message : String(error);
+        sendJson(res, 500, { error: { message, type: 'internal_error' } });
       }
     });
 

package/src/adapters/rest.ts

@@ -1,11 +1,11 @@
 import { BaseAdapter } from './base.js';
 import { EnvCPConfig, RESTResponse, ToolDefinition } from '../types.js';
-import { setCorsHeaders, sendJson, parseBody, validateApiKey } from '../utils/http.js';
+import { setCorsHeaders, sendJson, parseBody, validateApiKey, RateLimiter, rateLimitMiddleware } from '../utils/http.js';
 import * as http from 'http';
-import * as url from 'url';
 
 export class RESTAdapter extends BaseAdapter {
   private server: http.Server | null = null;
+  private rateLimiter = new RateLimiter(60, 60000);
 
   constructor(config: EnvCPConfig, projectPath: string, password?: string) {
     super(config, projectPath, password);
@@ -39,7 +39,7 @@ export class RESTAdapter extends BaseAdapter {
           tags: { type: 'array', items: { type: 'string' }, description: 'Tags' },
           description: { type: 'string', description: 'Description' },
         },
-        handler: async (params) => this.setVariable(params as any),
+        handler: async (params) => this.setVariable(params as { name: string; value: string; tags?: string[]; description?: string }),
       },
       {
         name: 'envcp_delete',
@@ -100,7 +100,7 @@ export class RESTAdapter extends BaseAdapter {
     await this.init();
 
     this.server = http.createServer(async (req, res) => {
-      setCorsHeaders(res);
+      setCorsHeaders(res, undefined, req.headers.origin);
 
       if (req.method === 'OPTIONS') {
         res.writeHead(204);
@@ -108,6 +108,10 @@ export class RESTAdapter extends BaseAdapter {
         return;
       }
 
+      if (!rateLimitMiddleware(this.rateLimiter, req, res)) {
+        return;
+      }
+
       // API key validation
       if (apiKey) {
         const providedKey = (req.headers['x-api-key'] || req.headers['authorization']?.replace('Bearer ', '')) as string | undefined;
@@ -117,8 +121,8 @@ export class RESTAdapter extends BaseAdapter {
         }
       }
 
-      const parsedUrl = url.parse(req.url || '/', true);
-      const pathname = parsedUrl.pathname || '/';
+      const parsedUrl = new URL(req.url || '/', `http://${req.headers.host || 'localhost'}`);
+      const pathname = parsedUrl.pathname;
       const segments = pathname.split('/').filter(Boolean);
 
       try {
@@ -171,9 +175,8 @@ export class RESTAdapter extends BaseAdapter {
             const varName = segments[2];
 
             if (!varName && req.method === 'GET') {
-              const tags = parsedUrl.query.tags
-                ? (Array.isArray(parsedUrl.query.tags) ? parsedUrl.query.tags : [parsedUrl.query.tags])
-                : undefined;
+              const tagsParam = parsedUrl.searchParams.getAll('tags');
+              const tags = tagsParam.length > 0 ? tagsParam : undefined;
               const result = await this.callTool('envcp_list', { tags });
               sendJson(res, 200, this.createResponse(true, result));
               return;
@@ -187,7 +190,7 @@ export class RESTAdapter extends BaseAdapter {
             }
 
             if (varName && req.method === 'GET') {
-              const showValue = parsedUrl.query.show_value === 'true';
+              const showValue = parsedUrl.searchParams.get('show_value') === 'true';
               const result = await this.callTool('envcp_get', { name: varName, show_value: showValue });
               sendJson(res, 200, this.createResponse(true, result));
               return;
@@ -233,11 +236,12 @@ export class RESTAdapter extends BaseAdapter {
         // 404
         sendJson(res, 404, this.createResponse(false, undefined, 'Not found'));
 
-      } catch (error: any) {
-        const status = error.message.includes('locked') ? 401 :
-                       error.message.includes('not found') ? 404 :
-                       error.message.includes('disabled') ? 403 : 500;
-        sendJson(res, status, this.createResponse(false, undefined, error.message));
+      } catch (error: unknown) {
+        const message = error instanceof Error ? error.message : String(error);
+        const status = message.includes('locked') ? 401 :
+                       message.includes('not found') ? 404 :
+                       message.includes('disabled') ? 403 : 500;
+        sendJson(res, status, this.createResponse(false, undefined, message));
       }
     });