flora-solr - npm Package Compare versions

Comparing version 0.7.0 to 0.7.1

index.js

@@ -176,13 +176,14 @@ 'use strict';
  *
- * @param {Object} options
+ * @param {Object} requestUrl
  * @param {Object} params
+ * @param {Object} requestOptions
  * @param {Function} callback
  * @private
  */
-function querySolr(requestUrl, params, callback) {
-    const options = url.parse(requestUrl);
-    options.method = 'POST';
-    options.headers = {
-        'Content-Type': 'application/x-www-form-urlencoded'
-    };
+function querySolr(requestUrl, params, requestOptions, callback) {
+    const options = Object.assign(url.parse(requestUrl), {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+        timeout: requestOptions.connectTimeout
+    });
 
@@ -212,2 +213,4 @@ const req = http.request(options, (res) => {
 
+    req.setTimeout(requestOptions.requestTimeout, () => req.abort());
+
     req.write(querystring.stringify(params)); // add params to POST body
@@ -241,5 +244,6 @@
         const queryParts = [];
-        let params = { wt: 'json' };
+        const params = { wt: 'json' };
+        const serverOpts = this.options.servers;
 
-        if (!this.options.servers[server]) return callback(new Error(`Server "${server}" not defined`));
+        if (!serverOpts[server]) return callback(new Error(`Server "${server}" not defined`));
 
@@ -268,3 +272,3 @@ const requestUrl = this.options.servers[server].url + request.collection + '/select';
         else {
-            params = _.assign(params, {
+            Object.assign(params, {
                 group: 'true',
@@ -286,3 +290,8 @@ 'group.format': 'simple',
 
-        return querySolr(requestUrl, params, callback);
+        const requestOpts = {
+            connectTimeout: serverOpts[server].connectTimeout || 2000,
+            requestTimeout: serverOpts[server].requestTimeout || 10000
+        };
+
+        return querySolr(requestUrl, params, requestOpts, callback);
     }
@@ -299,3 +308,3 @@
     /**
-     * @param {string} value
+     * @param {...string} args
      */
@@ -302,0 +311,0 @@ escape(...args) {

package.json

 {
   "name": "flora-solr",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "description": "Solr connection for Flora",
@@ -53,4 +53,7 @@ "main": "index.js",
     "mocha-bamboo-reporter": "^1.1.0",
-    "nock": "9.0.x"
+    "nock": "^9.0.14",
+    "sinon": "^2.2.0",
+    "sinon-chai": "^2.10.0",
+    "sinon-test": "^1.0.2"
   }
 }

Fixed alerts

Major refactor

Supply chain risk

Package has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

13836

increased by3.74%

Lines of code

301

increased by2.38%

Number of medium supply chain risk alerts

1

decreased by-50%

Worsened metrics

Dev dependency count

18

increased by20%

No dependency changes