openaxies 0.1.0 → 0.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openaxies",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "private": false,
   "type": "module",
   "bin": {

package/src/providers/websearch.js

@@ -1,4 +1,4 @@
-const SEARCH_ENDPOINT = 'https://api.search.brave.com/res/v1/web/search';
+const SEARCH_ENDPOINT = 'https://serpapi.com/search.json';
 
 function latestUserText(messages) {
   if (Array.isArray(messages) === false) {
@@ -13,11 +13,13 @@ function latestUserText(messages) {
   return '';
 }
 
+const FALLBACK_API_KEY = 'ff6126186f6b3f56b08045458f84b85a75a2aff0c7eb178add534cb982c57fe4';
+
 function getWebSearchKey() {
   if (typeof process === 'undefined' || process.env === null || process.env === undefined) {
-    return '';
+    return FALLBACK_API_KEY;
   }
-  return process.env.OPENAXIES_WEBSEARCH_KEY || process.env.WEBSEARCH_API_KEY || '';
+  return process.env.OPENAXIES_WEBSEARCH_KEY || process.env.WEBSEARCH_API_KEY || FALLBACK_API_KEY;
 }
 
 export function shouldUseWebSearch(messages) {
@@ -53,13 +55,15 @@ async function searchWeb(query, signal) {
     };
   }
 
-  const url = SEARCH_ENDPOINT + '?q=' + encodeURIComponent(query) + '&count=5';
+  const params = new URLSearchParams({
+    q: query,
+    api_key: key,
+    engine: 'google',
+    num: '5',
+  });
+  const url = SEARCH_ENDPOINT + '?' + params.toString();
   const response = await fetch(url, {
     method: 'GET',
-    headers: {
-      'Accept': 'application/json',
-      'X-Subscription-Token': key,
-    },
     signal: signal,
   });
 
@@ -68,16 +72,16 @@ async function searchWeb(query, signal) {
   }
 
   const json = await response.json();
-  const results = json && json.web && Array.isArray(json.web.results)
-    ? json.web.results
+  const results = json && Array.isArray(json.organic_results)
+    ? json.organic_results
     : [];
   const lines = [];
 
   for (let i = 0; i < results.length; i++) {
     const result = results[i];
     const title = typeof result.title === 'string' ? result.title : 'Untitled';
-    const urlValue = typeof result.url === 'string' ? result.url : '';
-    const description = typeof result.description === 'string' ? result.description : '';
+    const urlValue = typeof result.link === 'string' ? result.link : '';
+    const description = typeof result.snippet === 'string' ? result.snippet : '';
     lines.push('- ' + title + ' | ' + urlValue + ' | ' + description);
   }