@florajs/datasource-solr 6.0.0 → 8.0.0

package/index.js

@@ -1,8 +1,5 @@
 'use strict';
 
-const http = require('http');
-const querystring = require('querystring');
-
 const { ImplementationError } = require('@florajs/errors');
 
 const SUPPORTED_FILTERS = ['equal', 'notEqual', 'less', 'lessOrEqual', 'greater', 'greaterOrEqual', 'range'];
@@ -23,15 +20,15 @@ const NO_LIMIT = 1000000;
  * @private
  */
 function createRangeFilter(attributeFilters) {
-    // make sure greaterOrEqual filter comes first
-    attributeFilters.sort((filter) => (['greater', 'greaterOrEqual'].includes(filter.operator) ? -1 : 1));
+    const lowerBoundFilter = attributeFilters.find(({ operator }) => ['greater', 'greaterOrEqual'].includes(operator));
+    const upperBoundFilter = attributeFilters.find(({ operator }) => ['less', 'lessOrEqual'].includes(operator));
 
     return {
-        attribute: attributeFilters[0].attribute,
+        attribute: lowerBoundFilter.attribute,
         operator: 'range',
-        lowerSolrRangeOperator: RANGE_OPERATOR_FILTER_MAPPING[attributeFilters[0].operator],
-        upperSolrRangeOperator: RANGE_OPERATOR_FILTER_MAPPING[attributeFilters[1].operator],
-        value: [attributeFilters[0].value, attributeFilters[1].value]
+        lowerSolrRangeOperator: RANGE_OPERATOR_FILTER_MAPPING[lowerBoundFilter.operator],
+        upperSolrRangeOperator: RANGE_OPERATOR_FILTER_MAPPING[upperBoundFilter.operator],
+        value: [lowerBoundFilter.value, upperBoundFilter.value]
     };
 }
 
@@ -52,11 +49,7 @@ function rangify(filters) {
         return filters;
     }
 
-    const groupedAttrs = filters.reduce((acc, filter) => {
-        acc[filter.attribute] = acc[filter.attribute] || [];
-        acc[filter.attribute].push(filter);
-        return acc;
-    }, {});
+    const groupedAttrs = Object.groupBy(filters, (filter) => filter.attribute);
     const rangeQueries = Object.values(groupedAttrs).filter((filters) => {
         if (filters.length !== 2) return false;
 
@@ -185,14 +178,6 @@ function buildSolrOrderString(floraOrders) {
     return floraOrders.map((order) => order.attribute + ' ' + order.direction).join(',');
 }
 
-function parseData(str) {
-    try {
-        return JSON.parse(str);
-    } catch (e) {
-        return new Error('Could not parse response: ' + str);
-    }
-}
-
 function prepareQueryAddition(queryAdditions) {
     return queryAdditions
         .replace(/[\r\n]+/g, ' ')
@@ -224,50 +209,24 @@ function getUrlGenerators(servers) {
  *
  * @param {string} requestUrl
  * @param {Object} params
- * @param {Object} requestOptions
- * @param {Agent} agent
+ * @param {number} timeout
  * @returns {Promise}
  * @private
  */
-function querySolr(requestUrl, params, requestOptions, agent) {
-    return new Promise((resolve, reject) => {
-        const options = {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-            timeout: requestOptions.connectTimeout,
-            agent
-        };
-
-        const req = http.request(requestUrl, options, (res) => {
-            const chunks = [];
-
-            res.on('data', (chunk) => chunks.push(chunk));
-
-            res.on('end', () => {
-                const data = parseData(Buffer.concat(chunks).toString('utf8'));
-
-                if (res.statusCode >= 400 || data instanceof Error) {
-                    const error = new Error(`Solr error: ${res.statusCode} ${http.STATUS_CODES[res.statusCode]}`);
-                    return reject(error);
-                }
-
-                return resolve({ totalCount: data.response.numFound, data: data.response.docs });
-            });
-        });
-
-        req.write(querystring.stringify(params)); // add params to POST body
+async function querySolr(requestUrl, params, timeout) {
+    const response = await fetch(requestUrl, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+        body: new URLSearchParams(params).toString(),
+        signal: AbortSignal.timeout(timeout)
+    });
 
-        req.on('error', (err) => {
-            err.message = `Solr error: ${err.message} (${options.host})`;
-            reject(err);
-        });
-        req.on('timeout', () => {
-            req.destroy();
-            reject(new Error('Request timed out'));
-        });
+    if (!response.ok) {
+        throw new Error(`Solr error: ${response.status} - ${response.statusText}`);
+    }
 
-        req.end();
-    });
+    const { numFound, docs } = (await response.json()).response;
+    return { totalCount: numFound, data: docs };
 }
 
 function prepareSearchTerm(request) {
@@ -301,12 +260,6 @@ class DataSource {
         this._urls = getUrlGenerators(config.servers);
         this._status = config._status;
         delete config._status;
-
-        this._agent = new http.Agent({
-            maxSockets: 5,
-            keepAlive: true,
-            keepAliveMsecs: 10000
-        });
     }
 
     /**
@@ -360,12 +313,8 @@ class DataSource {
         if (request._explain) Object.assign(request._explain, { url: requestUrl, params });
         if (this._status) this._status.increment('dataSourceQueries');
 
-        const requestOpts = {
-            connectTimeout: serverOpts[server].connectTimeout || 2000,
-            requestTimeout: serverOpts[server].requestTimeout || 5000
-        };
-
-        return querySolr(requestUrl, params, requestOpts, this._agent);
+        const timeout = serverOpts[server].timeout || 5000;
+        return querySolr(requestUrl, params, timeout);
     }
 
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@florajs/datasource-solr",
-  "version": "6.0.0",
+  "version": "8.0.0",
   "description": "Solr connection for Flora",
   "main": "index.js",
   "scripts": {
@@ -37,17 +37,18 @@
     }
   ],
   "engines": {
-    "node": ">=18"
+    "node": ">=20"
   },
   "dependencies": {
     "@florajs/errors": "^4.0.0"
   },
   "devDependencies": {
-    "eslint": "^9.16.0",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-prettier": "^5.2.1",
-    "globals": "^15.13.0",
-    "nock": "^13.5.6",
-    "prettier": "^3.0.1"
+    "@eslint/js": "^10.0.1",
+    "eslint": "^10.4.1",
+    "eslint-config-prettier": "^10.1.8",
+    "eslint-plugin-prettier": "^5.5.6",
+    "globals": "^17.6.0",
+    "nock": "^14.0.15",
+    "prettier": "^3.8.3"
   }
 }