utilitas 1998.2.30 → 1998.2.32

package/lib/manifest.mjs

@@ -1,7 +1,7 @@
 const manifest = {
     "name": "utilitas",
     "description": "Just another common utility for JavaScript.",
-    "version": "1998.2.30",
+    "version": "1998.2.32",
     "private": false,
     "homepage": "https://github.com/Leask/utilitas",
     "main": "index.mjs",
@@ -33,7 +33,7 @@ const manifest = {
         "@google-cloud/text-to-speech": "^5.8.0",
         "@google-cloud/vision": "^4.3.2",
         "@google/generative-ai": "^0.21.0",
-        "@mozilla/readability": "^0.5.0",
+        "@mozilla/readability": "github:mozilla/readability",
         "@ngrok/ngrok": "^1.4.1",
         "@sentry/node": "^8.52.0",
         "@sentry/profiling-node": "^8.52.0",

package/lib/shot.mjs

@@ -19,6 +19,8 @@ const [_JSON, _PARSED] = ['JSON', 'PARSED'];
 const getJson = async (u, o) => await get(u, { encode: _JSON, ...o || {} });
 const getParsedHtml = async (u, o) => await get(u, { encode: _PARSED, ...o || {} });
 
+let searchProvider, googleApiKey, googleCx;
+
 const defFetchOpt = {
     redirect: 'follow', follow: 3, timeout: 1000 * 10, headers: {
         'user-agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) '
@@ -148,19 +150,35 @@ const get = async (url, options) => {
     };
 };
 
+const initSearch = (options) => {
+    assert(
+        options?.provider && options?.apiKey && options?.cx,
+        'Invalid search options.'
+    );
+    return [searchProvider, googleApiKey, googleCx]
+        = [options.provider, options.apiKey, options.cx];
+};
+
 const search = async (query, options) => {
     assert(query, 'Query is required.');
     const [GOOGLE, DUCKDUCKGO] = ['GOOGLE', 'DUCKDUCKGO'];
-    const provider = ensureString(options?.provider, { case: 'UP' }) || DUCKDUCKGO;
-    let url, parser;
+    const provider = ensureString(
+        options?.provider || searchProvider || DUCKDUCKGO, { case: 'UP' }
+    );
+    let apiKey = options?.apiKey || googleApiKey, cx = options?.cx || googleCx,
+        url, parser;
     switch (provider) {
         case GOOGLE:
-            assert(options?.apiKey, 'API key is required.');
-            assert(options?.cx, 'CX is required.');
-            url = `https://www.googleapis.com/customsearch/v1?key=${options.apiKey}&cx=${options.cx}&q=${encodeURIComponent(query)}`;
+            assert(apiKey, 'API key is required.');
+            assert(cx, 'CX is required.');
+            url = 'https://www.googleapis.com/customsearch/v1'
+                + `?key=${encodeURIComponent(apiKey)}`
+                + `&cx=${encodeURIComponent(cx)}`
+                + `&q=${encodeURIComponent(query)}`;
             break;
         case DUCKDUCKGO:
-            url = `https://api.duckduckgo.com/?q=${encodeURIComponent(query)}&format=json&skip_disambig=1`;
+            url = 'https://api.duckduckgo.com/'
+                + `?q=${encodeURIComponent(query)}&format=json&skip_disambig=1`;
             parser = x => x.FirstURL ? {
                 title: x.FirstURL.replace(/^.*\/([^\/]*)$/, '$1').replace(/_/g, ' '),
                 link: x.FirstURL, snippet: x.Text,
@@ -212,6 +230,5 @@ export {
     getCurrentPosition,
     getJson,
     getParsedHtml,
-    getVersionOnNpm,
-    search
+    getVersionOnNpm, initSearch, search
 };

package/lib/web.mjs

@@ -1,6 +1,6 @@
-import { assembleUrl, ignoreErrFunc, need, throwError } from './utilitas.mjs';
 import { getJson, getParsedHtml } from './shot.mjs';
 import { convert } from './storage.mjs';
+import { assembleUrl, ignoreErrFunc, need, throwError } from './utilitas.mjs';
 
 const _NEED = [
     'jsdom', 'youtube-transcript', '@mozilla/readability', '@ngrok/ngrok'
@@ -123,5 +123,5 @@ export {
     forward,
     getYoutubeMetadata,
     getYoutubeTranscript,
-    isYoutubeUrl,
+    isYoutubeUrl
 };

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "utilitas",
     "description": "Just another common utility for JavaScript.",
-    "version": "1998.2.30",
+    "version": "1998.2.32",
     "private": false,
     "homepage": "https://github.com/Leask/utilitas",
     "main": "index.mjs",
@@ -44,7 +44,7 @@
         "@google-cloud/text-to-speech": "^5.8.0",
         "@google-cloud/vision": "^4.3.2",
         "@google/generative-ai": "^0.21.0",
-        "@mozilla/readability": "^0.5.0",
+        "@mozilla/readability": "github:mozilla/readability",
         "@ngrok/ngrok": "^1.4.1",
         "@sentry/node": "^8.52.0",
         "@sentry/profiling-node": "^8.52.0",