llmjs2 1.6.1 → 1.7.1

package/core/providers/openrouter.js

@@ -1,44 +1,123 @@
 const https = require('https');
 
+function asNonEmptyString(value) {
+  if (typeof value !== 'string') {
+    return '';
+  }
+  return value.trim();
+}
+
+function firstNonEmptyString(...values) {
+  for (const value of values) {
+    const normalized = asNonEmptyString(value);
+    if (normalized) {
+      return normalized;
+    }
+  }
+  return '';
+}
+
+function isValidHttpUrl(value) {
+  const normalized = asNonEmptyString(value);
+  if (!normalized) {
+    return false;
+  }
+
+  try {
+    const parsed = new URL(normalized);
+    return parsed.protocol === 'https:' || parsed.protocol === 'http:';
+  } catch (_error) {
+    return false;
+  }
+}
+
+function normalizeOpenRouterModel(model) {
+  let normalized = asNonEmptyString(model);
+
+  if (!normalized) {
+    return '';
+  }
+
+  // Only inspect the first provider separator and preserve the rest of the path.
+  const firstSlashIndex = normalized.indexOf('/');
+  if (firstSlashIndex === -1) {
+    return `openrouter/${normalized}`;
+  }
+
+  const provider = normalized.substring(0, firstSlashIndex).trim().toLowerCase();
+  if (provider === 'openrouter') {
+    const remainder = normalized.substring(firstSlashIndex + 1).trim();
+
+    if (!remainder) {
+      return '';
+    }
+
+    // Keep "openrouter/free" and collapse "openrouter/openrouter/free" to "openrouter/free".
+    if (remainder.includes('/')) {
+      normalized = remainder;
+    } else {
+      normalized = `openrouter/${remainder}`;
+    }
+  }
+
+  return normalized;
+}
+
 class OpenRouterProvider {
   constructor(config = {}) {
-    this.baseURL = config.baseURL || process.env.OPEN_ROUTER_BASE_URL || 'https://openrouter.ai/api/v1/chat/completions';
-    this.apiKey = config.apiKey || process.env.OPEN_ROUTER_API_KEY;
-    this.defaultModel = config.defaultModel || process.env.OPEN_ROUTER_DEFAULT_MODEL || 'openrouter/free';
+    const configuredBaseURL = firstNonEmptyString(config.baseURL, process.env.OPEN_ROUTER_BASE_URL);
+    this.baseURL = isValidHttpUrl(configuredBaseURL)
+      ? configuredBaseURL
+      : 'https://openrouter.ai/api/v1/chat/completions';
+
+    this.apiKey = firstNonEmptyString(config.apiKey, process.env.OPEN_ROUTER_API_KEY);
+    const configuredDefaultModel = firstNonEmptyString(config.defaultModel, process.env.OPEN_ROUTER_DEFAULT_MODEL) || 'openrouter/openrouter/free';
+    this.defaultModel = configuredDefaultModel;
     this.timeout = config.timeout || 60000; // 60 seconds
     this.config = config; // Store entire config for additional properties like referer, title
   }
 
   async makeRequest(data, requestOptions = {}) {
-    const apiKey = requestOptions.apiKey || this.apiKey;
-    const baseURL = requestOptions.baseURL || this.baseURL;
+    const apiKey = firstNonEmptyString(requestOptions.apiKey, this.apiKey);
+    const baseURL = firstNonEmptyString(requestOptions.baseURL, this.baseURL);
     const timeout = requestOptions.timeout || this.timeout;
+    const referer = firstNonEmptyString(requestOptions.referer, this.config.referer, process.env.OPEN_ROUTER_REFERER);
+    const title = firstNonEmptyString(requestOptions.title, this.config.title, process.env.OPEN_ROUTER_TITLE);
 
     if (!apiKey) {
       throw new Error('OpenRouter API key is required. Set OPEN_ROUTER_API_KEY environment variable or pass apiKey in config.');
     }
 
+    if (!isValidHttpUrl(baseURL)) {
+      throw new Error('OpenRouter base URL is invalid. Set OPEN_ROUTER_BASE_URL to a valid http(s) URL.');
+    }
+
     const postData = JSON.stringify(data);
 
     const parsedUrl = new URL(baseURL);
 
+    const headers = {
+      'Content-Type': 'application/json',
+      'Authorization': `Bearer ${apiKey}`,
+      'Content-Length': Buffer.byteLength(postData)
+    };
+
+    if (isValidHttpUrl(referer)) {
+      headers['HTTP-Referer'] = referer;
+    }
+
+    if (title) {
+      headers['X-Title'] = title;
+    }
+
     const options = {
       hostname: parsedUrl.hostname,
       port: parsedUrl.port || 443,
       path: parsedUrl.pathname + parsedUrl.search,
       method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-        'Authorization': `Bearer ${apiKey}`,
-        'Content-Length': Buffer.byteLength(postData),
-        'HTTP-Referer': this.config.referer || process.env.OPEN_ROUTER_REFERER || '',
-        'X-Title': this.config.title || process.env.OPEN_ROUTER_TITLE || ''
-      }
+      headers
     };
-
-    // Remove empty headers
-    if (!options.headers['HTTP-Referer']) delete options.headers['HTTP-Referer'];
-    if (!options.headers['X-Title']) delete options.headers['X-Title'];
+    
 
     return new Promise((resolve, reject) => {
       const req = https.request(options, (res) => {
@@ -78,8 +157,14 @@ class OpenRouterProvider {
   }
 
   async createCompletion(messages, options = {}) {
+    const normalizedModel = normalizeOpenRouterModel(options.model || this.defaultModel);
+
+    if (!normalizedModel) {
+      throw new Error('OpenRouter model is invalid. Provide a non-empty model, for example "openrouter/free" or "meta-llama/llama-3.1-8b-instruct:free".');
+    }
+
     const data = {
-      model: options.model || this.defaultModel,
+      model: normalizedModel,
       messages: messages,
       temperature: options.temperature || 0.7,
       max_tokens: options.maxTokens,

package/package.json

@@ -1,12 +1,14 @@
 {
   "name": "llmjs2",
-  "version": "1.6.1",
+  "version": "1.7.1",
   "description": "A unified Node.js library for connecting to multiple Large Language Model (LLM) providers: OpenAI, Ollama, and OpenRouter.",
   "main": "core/index.js",
   "bin": {
     "llmjs2": "core/cli.js"
   },
   "scripts": {
+    "chat:router": "node core/examples/chat-router-sequential-app.js",
+    "chat:router:guardrail": "node core/examples/chat-router-guardrail.js",
     "test": "node core/test.js",
     "test:completion": "node core/test-completion.js",
     "start": "node core/cli.js",
@@ -33,6 +35,7 @@
     "url": ""
   },
   "dependencies": {
+    "@prompy/prompy": "^1.0.2",
     "yaml": "^2.0.0"
   },
   "engines": {