Merge pull request #49 from thefirehacker/3.6.0_Voice_DeepResearchPlayground_Integration

thefirehacker · web-flow · commit 2e0b557fc37b · 2025-07-03T14:15:18.000+05:30
3.6.0 voice deep research playground integration
diff --git a/Canvas.html b/Canvas.html
@@ -3,6 +3,8 @@
 <head>
   <meta charset="UTF-8" />
   <!-- Load Common Meta Configuration -->
+  <!-- Load Custom Ollama Configuration -->
+  <script src="ollama-custom.js"></script>
   <script src="lib/common-meta.js"></script>
   <script>
     document.write(`
diff --git a/DeepResearch.html b/DeepResearch.html
@@ -2,6 +2,8 @@
 <html lang="en">
 <head>
   <meta charset="UTF-8" />
+  <!-- Load Custom Ollama Configuration -->
+  <script src="ollama-custom.js"></script>
   <!-- Load Common Meta Configuration -->
   <script src="lib/common-meta.js?v=2025010302"></script>
   <script>
diff --git a/Playground.html b/Playground.html
@@ -2,6 +2,8 @@
 <html lang="en">
 <head>
   <meta charset="UTF-8" />
+  <!-- Load Custom Ollama Configuration -->
+  <script src="ollama-custom.js"></script>
   <!-- Load Common Meta Configuration -->
   <script src="lib/common-meta.js?v=2025010302"></script>
   <script>
diff --git a/README.md b/README.md
@@ -555,13 +555,19 @@ curl http://localhost:11434/api/tags
 
 > **⚠️ Note**: Custom URLs only work in local builds, not hosted version.
 
-**Setup:**
-1. **Add URL to CSP**: Edit `/lib/common-meta.js` → add your URL to `connectSrc` array
+**Easy Setup with ollama-custom.js:**
+1. **Edit Configuration File**: Open `ollama-custom.js` in the root directory
+2. **Add Your IPs**: Replace the example IPs with your actual Ollama servers
    ```javascript
-   'http://192.168.1.100:11434',  // Example: your Ollama server
+   customIPs: [
+     "http://10.0.1.69:11434",      // Your first Ollama server
+     "http://192.168.1.200:11434",  // Your second Ollama server  
+     "http://172.16.0.50:9434"      // Your third Ollama server
+   ]
    ```
+3. **Save and Refresh**: Save the file and hard refresh your browser (Ctrl+Shift+R)
 
-2. **Use in App**: Click "Connect Ollama" → accept  agreement  → Enter custom URL in popup
+**Use in App**: Click "Connect Ollama" → accept agreement → Enter custom URL in popup
    - **DeepResearch**: Click "🦙 Connect Ollama" 
    - **Playground**: Click "Connect AI" → Select Ollama
 
diff --git a/lib/common-meta.js b/lib/common-meta.js
@@ -6,7 +6,70 @@
 
 const COMMON_META = {
   // Content Security Policy
-  csp: "script-src 'self' 'unsafe-eval' 'unsafe-inline' https://cdn.jsdelivr.net https://cdnjs.cloudflare.com https://unpkg.com https://www.googletagmanager.com https://www.google-analytics.com data: blob:; style-src 'self' 'unsafe-inline' https://cdnjs.cloudflare.com data:; connect-src 'self' https://cdn.jsdelivr.net https://cdnjs.cloudflare.com https://unpkg.com https://huggingface.co https://*.hf.co https://www.google-analytics.com https://analytics.google.com wss://api.openai.com wss://api.anthropic.com http://localhost:1234 http://localhost:11434 http://127.0.0.1:9434 https://beluga.bubblspace.com https://api.openai.com https://api.anthropic.com https://openrouter.ai; img-src 'self' data: blob:; font-src 'self' data:; worker-src 'self' blob: data:; object-src 'none';",
+  // Content Security Policy - Note: CSP doesn't support IP wildcards, so we include common private IP ranges
+  // Users can add their specific IPs to ollama-custom.js file for easier management
+  
+  // Base connect-src URLs (always included)
+  baseConnectSrc: [
+    "'self'",
+    "https://cdn.jsdelivr.net",
+    "https://cdnjs.cloudflare.com", 
+    "https://unpkg.com",
+    "https://huggingface.co",
+    "https://*.hf.co",
+    "https://www.google-analytics.com",
+    "https://analytics.google.com",
+    "wss://api.openai.com",
+    "wss://api.anthropic.com",
+     "http://localhost:1234",
+     "http://localhost:11434",
+     "http://localhost:8080",
+     "http://localhost:9434", 
+     "http://localhost:3000",
+     "http://127.0.0.1:11434",
+     "http://127.0.0.1:9434",
+     "http://127.0.0.1:8080",
+     "http://127.0.0.1:3000",
+         // Common private network IPs for Ollama - add your specific IP here
+     // 10.0.x.x range (common in corporate/cloud networks)
+     "http://10.0.0.1:11434", "http://10.0.0.10:11434", "http://10.0.0.100:11434",
+     "http://10.0.1.1:11434", "http://10.0.1.10:11434", "http://10.0.1.69:11434", "http://10.0.1.100:11434",
+     "http://10.0.2.1:11434", "http://10.0.2.10:11434", "http://10.0.2.100:11434",
+     "http://10.0.10.1:11434", "http://10.0.10.10:11434", "http://10.0.10.100:11434",
+     "http://10.0.50.1:11434", "http://10.0.50.10:11434", "http://10.0.50.100:11434",
+     "http://10.0.100.1:11434", "http://10.0.100.10:11434", "http://10.0.100.100:11434",
+          // 192.168.x.x range (home networks)
+     "http://192.168.1.1:11434", "http://192.168.1.10:11434", "http://192.168.1.100:11434",
+     "http://192.168.0.1:11434", "http://192.168.0.10:11434", "http://192.168.0.100:11434", 
+     "http://192.168.2.1:11434", "http://192.168.10.1:11434", "http://192.168.50.1:11434",
+     // 172.16-31.x.x range (Docker/container networks)
+     "http://172.16.0.1:11434", "http://172.17.0.1:11434", "http://172.18.0.1:11434",
+     // Common alternative ports for all ranges
+     "http://10.0.1.69:9434", "http://192.168.1.100:9434", "http://172.17.0.1:9434",
+    // Add more IPs as needed - just append to this array
+    "https://beluga.bubblspace.com",
+    "https://api.openai.com",
+    "https://api.anthropic.com", 
+    "https://openrouter.ai"
+  ],
+  
+  // Get all connect-src URLs (base + custom from ollama-custom.js)
+  get connectSrc() {
+    let allURLs = [...this.baseConnectSrc];
+    
+    // Add custom Ollama IPs from ollama-custom.js if available
+    if (typeof window !== 'undefined' && window.OLLAMA_CUSTOM_CONFIG) {
+      const customURLs = window.OLLAMA_CUSTOM_CONFIG.getAllCustomURLs();
+      allURLs = allURLs.concat(customURLs);
+      console.log('🔧 Added custom Ollama URLs to CSP:', customURLs);
+    }
+    
+    return allURLs;
+  },
+  
+  get csp() {
+    return `script-src 'self' 'unsafe-eval' 'unsafe-inline' https://cdn.jsdelivr.net https://cdnjs.cloudflare.com https://unpkg.com https://www.googletagmanager.com https://www.google-analytics.com data: blob:; style-src 'self' 'unsafe-inline' https://cdnjs.cloudflare.com data:; connect-src ${this.connectSrc.join(' ')}; img-src 'self' data: blob:; font-src 'self' data:; worker-src 'self' blob: data:; object-src 'none';`;
+  },
   
   // Common favicon
   favicon: "lib/Media/TimeCapsule_04.png",
diff --git a/ollama-custom.js b/ollama-custom.js
@@ -0,0 +1,46 @@
+/**
+ * Custom Ollama Server Configuration
+ * 
+ * Add your custom Ollama server IPs here for easy access.
+ * These will be automatically included in the Content Security Policy.
+ * 
+ * Instructions:
+ * 1. Replace the example IPs with your actual Ollama server addresses
+ * 2. Use the format: "http://IP:PORT" (include quotes)
+ * 3. Save the file and refresh your browser (Ctrl+Shift+R)
+ * 
+ * Examples:
+ * - "http://192.168.1.100:11434"  (Home network)
+ * - "http://10.0.1.50:11434"      (Corporate network)
+ * - "http://172.16.0.10:9434"     (Docker container with custom port)
+ */
+
+const OLLAMA_CUSTOM_CONFIG = {
+  // Add your 3 custom Ollama server IPs here
+  customIPs: [
+    "http://10.0.1.69:11434",      // Replace with your first Ollama server
+    "http://192.168.1.200:11434",  // Replace with your second Ollama server  
+    "http://172.16.0.50:9434"      // Replace with your third Ollama server
+  ],
+  
+  // Optional: Add custom ports for localhost/127.0.0.1
+  customPorts: [
+    "http://localhost:8080",
+    "http://127.0.0.1:7777"
+  ],
+  
+  // Get all custom URLs for CSP integration
+  getAllCustomURLs() {
+    return [...this.customIPs, ...this.customPorts];
+  }
+};
+
+// Export for use in common-meta.js
+if (typeof window !== 'undefined') {
+  window.OLLAMA_CUSTOM_CONFIG = OLLAMA_CUSTOM_CONFIG;
+}
+
+// For Node.js environments
+if (typeof module !== 'undefined' && module.exports) {
+  module.exports = OLLAMA_CUSTOM_CONFIG;
+}
