diff --git a/.eslintrc.js b/.eslintrc.js index 97cbcb3..eb1596d 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -7,13 +7,21 @@ module.exports = { 'fp', 'unicorn', ], + ignorePatterns: [ + 'coverage/', + ], overrides: [ { - files: ['**/src/**'], + files: [ + '**/**', + ], extends: [ 'node-moar-stricter', ], rules: { + 'fp/no-throw': 'off', + 'fp/no-this': 'off', + 'fp/no-mutation': 'off', 'unicorn/prefer-top-level-await': 'off', // 'unicorn/no-array-reduce': 'off', 'security/detect-non-literal-fs-filename': 'off', diff --git a/axios/default-http-json-client.js b/axios/default-http-json-client.js index 5fc493c..498b075 100644 --- a/axios/default-http-json-client.js +++ b/axios/default-http-json-client.js @@ -1,7 +1,7 @@ const httpJsonClient = require('./http-json-client') const safeHttpClient = require('./safe-http-client') -module.exports = (baseURL, params = {}) => safeHttpClient(httpJsonClient, { - ...params, +module.exports = (baseURL, parameters = {}) => safeHttpClient(httpJsonClient, { + ...parameters, baseURL, }) diff --git a/axios/safe-http-client.js b/axios/safe-http-client.js index 4db7702..f402bc3 100644 --- a/axios/safe-http-client.js +++ b/axios/safe-http-client.js @@ -2,9 +2,9 @@ const curry = require('just-curry-it') const {parseAxiosError} = require('../errors') -const safeHttpClient = (client, params) => { +const safeHttpClient = (client, parameters) => { // console.log({params}) - const instance = client(params) + const instance = client(parameters) instance.interceptors.response.use( response => response, error => { diff --git a/core/buffer-utils.js b/core/buffer-utils.js index 2af3f78..f833ef7 100644 --- a/core/buffer-utils.js +++ b/core/buffer-utils.js @@ -2,7 +2,7 @@ const isValidUTF8 = string => { try { Buffer.from(string, 'utf8') return true - } catch (error) { + } catch { return false } } @@ -11,13 +11,13 @@ const isValidBase64 = string => { try { const decoded = Buffer.from(string, 'base64').toString('base64') return string === decoded - } catch (error) { + } catch { return false } } const isValidHex = string => { - const hexPattern = /^[0-9a-fA-F]+$/ + const hexPattern = /^[\dA-Fa-f]+$/ return hexPattern.test(string) } diff --git a/fusto/websocket-stream-source.js b/fusto/websocket-stream-source.js index 1ed42a2..f7bf25a 100644 --- a/fusto/websocket-stream-source.js +++ b/fusto/websocket-stream-source.js @@ -16,6 +16,7 @@ module.exports = socket => (push, next) => { socket.on('close', () => { // console.info('socket close event') + // eslint-disable-next-line unicorn/no-null push(null, nil) }) } diff --git a/http/http-test-base-express.js b/http/http-test-base-express.js index 0a1c67a..f6fefe2 100644 --- a/http/http-test-base-express.js +++ b/http/http-test-base-express.js @@ -10,11 +10,11 @@ module.exports = app => { }, stop: () => server.close(), // client: () => axios.create({baseURL: `http://localhost:${server.address().port}`}), - client: params => { + client: parameters => { const {address, port} = app.server.address() return safeHttpClient(httpJsonClient, { baseURL: `http://${address}:${port}`, - ...params, + ...parameters, }) }, } diff --git a/http/http-test-base-fastify.js b/http/http-test-base-fastify.js index d5f62b0..cfc3dc4 100644 --- a/http/http-test-base-fastify.js +++ b/http/http-test-base-fastify.js @@ -6,11 +6,11 @@ module.exports = app => ({ host: '0.0.0.0', }), stop: () => app.close(), - client: params => { + client: parameters => { const {address, port} = app.server.address() return safeHttpClient(httpJsonClient, { baseURL: `http://${address}:${port}`, - ...params, + ...parameters, }) }, address: () => app.server.address(), diff --git a/http/tracer-fastify-logger.js b/http/tracer-fastify-logger.js index 1f44f0e..00d8fce 100644 --- a/http/tracer-fastify-logger.js +++ b/http/tracer-fastify-logger.js @@ -3,10 +3,7 @@ const {local} = require('../tracer') module.exports = ({app, logLevel}) => { const log = local({level: logLevel}) app.log = log - app.addHook('onRequest', (request, reply, done) => { - // eslint-disable-next-line fp/no-mutation - request.log = log - done() - }) + app.decorateRequest('log', log) + // app.decorate('log', log) return log } diff --git a/lnd/index.js b/lnd/index.js index 66513eb..c159981 100644 --- a/lnd/index.js +++ b/lnd/index.js @@ -4,5 +4,5 @@ module.exports = { lndClients: require('./lnd-clients'), lndStreams: deprecate(require('./lnd-streams'), 'Please use /fusto/streams instead'), lndPolarConfig: require('./lnd-polar-config'), - lndEnvConfig: require('./lnd-env-config'), + lndEnvConfig: require('./lnd-environment-config'), } diff --git a/lnd/lnd-clients.js b/lnd/lnd-clients.js index cd28a43..52e3713 100644 --- a/lnd/lnd-clients.js +++ b/lnd/lnd-clients.js @@ -24,5 +24,5 @@ const create = ({baseUrl, cert, macaroon}) => httpJsonClient({ module.exports = { createWs, - createHttp: params => safeHttpClient(create, params), + createHttp: parameters => safeHttpClient(create, parameters), } diff --git a/lnd/lnd-env-config.js b/lnd/lnd-environment-config.js similarity index 100% rename from lnd/lnd-env-config.js rename to lnd/lnd-environment-config.js diff --git a/package.json b/package.json index 489e71c..0d41661 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "moar-js", - "version": "1.1.3", + "version": "1.2.0", "description": "Simple JavaScript files I use across projects", "author": { "name": "Daniele Dellafiore" @@ -42,12 +42,12 @@ }, "devDependencies": { "@fastify/sensible": "5.3.0", - "axios": "1.5.0", + "axios": "1.5.1", "eslint": "8.50.0", "exstream.js": "0.23.0", "fastify": "4.23.2", "jest": "29.7.0", - "moar-js-dev": "2", + "moar-js-dev": "2.3.1", "tracer": "1.2.0", "ws": "8.14.2" }, diff --git a/tests/lnd/lnd-clients.test.js b/tests/lnd/lnd-clients.test.js index eef00e0..4d3a623 100644 --- a/tests/lnd/lnd-clients.test.js +++ b/tests/lnd/lnd-clients.test.js @@ -4,7 +4,7 @@ test('just checking...', () => { expect(lndClients).toBeDefined() }) -test.skip('http lnd client', () => { - const {lndHttp} = lndClients() - expect(lndHttp).toBeDefined() -}) +// t('http lnd client', () => { +// const {lndHttp} = lndClients() +// expect(lndHttp).toBeDefined() +// }) diff --git a/tests/lnd/lnd-env-config.test.js b/tests/lnd/lnd-environment-config.test.js similarity index 100% rename from tests/lnd/lnd-env-config.test.js rename to tests/lnd/lnd-environment-config.test.js diff --git a/yarn.lock b/yarn.lock index 3210ef9..dfeb72e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1488,14 +1488,14 @@ __metadata: languageName: node linkType: hard -"axios@npm:1.5.0": - version: 1.5.0 - resolution: "axios@npm:1.5.0" +"axios@npm:1.5.1": + version: 1.5.1 + resolution: "axios@npm:1.5.1" dependencies: follow-redirects: "npm:^1.15.0" form-data: "npm:^4.0.0" proxy-from-env: "npm:^1.1.0" - checksum: 128433020b1fe9a460121735016f377adc6109a1f62b61795b1a80704de0a70affb0d580c8abd057e28af5f343cb4fb9a17a0b2512ea7f314578bbe492851a23 + checksum: 67633db5867c789a6edb6e5229884501bef89584a6718220c243fd5a64de4ea7dcdfdf4f8368a672d582db78aaa9f8d7b619d39403b669f451e1242bbd4c7ee2 languageName: node linkType: hard @@ -4374,9 +4374,9 @@ __metadata: languageName: node linkType: hard -"moar-js-dev@npm:2": - version: 2.2.0 - resolution: "moar-js-dev@npm:2.2.0" +"moar-js-dev@npm:2.3.1": + version: 2.3.1 + resolution: "moar-js-dev@npm:2.3.1" dependencies: depcheck: "npm:1.4.6" eslint: "npm:8.50.0" @@ -4392,7 +4392,7 @@ __metadata: eslint-plugin-unicorn: "npm:48.0.1" jest: "npm:29.7.0" node-notifier: "npm:10.0.1" - checksum: d36235ca857a94b04466f9820dc5db19251739ff274d507192a9f69f5add6ea7a8c050e0ce0b51e42feb122a197b354eab687c5a98c32c66f499476cf38045f2 + checksum: 968e8a75b5dc11fad7ebb03035887b7b9c83e10cbe2128763d9df836c33a54ce82e25950b4c0c13b46871c8a786ead252bb5c658f5fb8b065a6d52797c5c5a46 languageName: node linkType: hard @@ -4401,14 +4401,14 @@ __metadata: resolution: "moar-js@workspace:." dependencies: "@fastify/sensible": "npm:5.3.0" - axios: "npm:1.5.0" + axios: "npm:1.5.1" eslint: "npm:8.50.0" exstream.js: "npm:0.23.0" fastify: "npm:4.23.2" jest: "npm:29.7.0" just-curry-it: "npm:5.3.0" just-pick: "npm:4.2.0" - moar-js-dev: "npm:2" + moar-js-dev: "npm:2.3.1" tracer: "npm:1.2.0" ws: "npm:8.14.2" peerDependencies: