hmpo-model 4.1.0 → 4.3.0

package/.github/workflows/ci.yaml

@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [12.x, 14.x, 15.x]
+        node-version: [12.x, 14.x, 16.x, 18.x]
 
     steps:
       - uses: actions/checkout@v2

package/lib/remote-model.js

@@ -9,6 +9,8 @@ const ModelError = require('./model-error');
 
 const DEFAULT_TIMEOUT = 60000;
 
+const consoleLogger = { outbound: console.log, trimHtml: html => html };
+
 class RemoteModel extends LocalModel {
     constructor(attributes, options) {
         super(attributes, options);
@@ -19,14 +21,17 @@ class RemoteModel extends LocalModel {
 
     setLogger() {
         try {
-            const hmpoLogger = require('hmpo-logger');
-            this.logger = hmpoLogger.get(':' + this.options.label);
+            this.logger = require('hmpo-logger');
         } catch (e) {
-            console.error('Error setting logger, using console instead!', e);
-            this.logger = { outbound: console.log, trimHtml: html => html };
+            /* istanbul ignore next */
+            console.warn('Warning: ' + this.options.label + ': Unable to find hmpo-logger for logging, using console instead!');
         }
     }
 
+    getLogger() {
+        return this.logger ? this.logger.get(':' + this.options.label) : consoleLogger;
+    }
+
     fetch(args, callback) {
         if (typeof args === 'function') {
             callback = args;
@@ -264,7 +269,7 @@ class RemoteModel extends LocalModel {
         if (outError) data.outError = outError;
 
         if (tokenData.err) {
-            data.outErrorBody = this.logger.trimHtml(tokenData.err.body);
+            data.outErrorBody = this.getLogger().trimHtml(tokenData.err.body);
         }
 
         Object.assign(data, this.options.logging);
@@ -274,15 +279,15 @@ class RemoteModel extends LocalModel {
 
 
     logSync() {
-        this.logger.outbound('Model request sent :outVerb :outRequest', this.logMeta.apply(this, arguments));
+        this.getLogger().outbound('Model request sent :outVerb :outRequest', this.logMeta.apply(this, arguments));
     }
 
     logSuccess() {
-        this.logger.outbound('Model request success :outVerb :outRequest :outResponseCode', this.logMeta.apply(this, arguments));
+        this.getLogger().outbound('Model request success :outVerb :outRequest :outResponseCode', this.logMeta.apply(this, arguments));
     }
 
     logError() {
-        this.logger.outbound('Model request failed :outVerb :outRequest :outResponseCode :outError', this.logMeta.apply(this, arguments));
+        this.getLogger().outbound('Model request failed :outVerb :outRequest :outResponseCode :outError', this.logMeta.apply(this, arguments));
     }
 
     hookSync() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hmpo-model",
-  "version": "4.1.0",
+  "version": "4.3.0",
   "description": "Simple model for interacting with http/rest apis.",
   "main": "index.js",
   "scripts": {
@@ -25,20 +25,20 @@
   },
   "homepage": "https://github.com/UKHomeOffice/passports-model",
   "dependencies": {
-    "debug": "^4.3.3",
-    "got": "^11.8.3",
+    "debug": "^4.3.4",
+    "got": "<12",
     "http-proxy-agent": "^5.0.0",
-    "https-proxy-agent": "^5.0.0",
+    "https-proxy-agent": "^5.0.1",
     "lodash.kebabcase": "^4.1.1"
   },
   "devDependencies": {
     "chai": "^4.3.6",
-    "eslint": "^8.10.0",
-    "hmpo-logger": "^4.1.5",
-    "mocha": "^9.2.1",
+    "eslint": "^8.18.0",
+    "hmpo-logger": "^6.1.0",
+    "mocha": "^10.0.0",
     "nyc": "^15.1.0",
     "proxyquire": "^2.0.0",
-    "sinon": "^13.0.1",
+    "sinon": "^14.0.0",
     "sinon-chai": "^3.7.0"
   },
   "nyc": {

package/test/lib/spec.remote-model.js

@@ -67,19 +67,18 @@ describe('Remote Model', () => {
         it('should set up a new hmpo-logger', () => {
             model = new Model();
 
+            model.getLogger().should.equal('logger');
             logger.get.should.have.been.calledWithExactly(':remote-model');
-            model.logger.should.equal('logger');
         });
 
         it('should use console log and a trimHtml pass-through if hmpo-logger is not available', () => {
-            logger.get.throws({ message: 'test error' });
-
             model = new Model();
+            model.logger = null;
 
-            model.logger.outbound.should.eql(console.log);
-            model.logger.trimHtml.should.be.a('function');
+            model.getLogger().outbound.should.eql(console.log);
+            model.getLogger().trimHtml.should.be.a('function');
             const html = {};
-            model.logger.trimHtml(html).should.equal(html);
+            model.getLogger().trimHtml(html).should.equal(html);
         });
     });