@dashevo/dapi-client 3.1.0-dev.5 → 3.1.0-dev.6

package/lib/dapiAddressProvider/ListDAPIAddressProvider.js

@@ -1,4 +1,4 @@
-const sample = require('lodash/sample');
+const sample = (arr) => arr[Math.floor(Math.random() * arr.length)];
 const networks = require('@dashevo/dashcore-lib/lib/networks');
 
 class ListDAPIAddressProvider {

package/lib/index.js

@@ -1,5 +1,3 @@
-require('../polyfills/fetch-polyfill');
-
 const DAPIClient = require('./DAPIClient');
 
 const NotFoundError = require('./transport/GrpcTransport/errors/NotFoundError');

package/lib/logger/index.js

@@ -1,80 +1,42 @@
-const util = require('util');
-const winston = require('winston');
+const LOG_LEVEL = (typeof process !== 'undefined' && process.env && process.env.LOG_LEVEL) || 'silent';
 
-// TODO: Refactor to use params instead on envs
-
-const LOG_LEVEL = process.env.LOG_LEVEL || 'silent';
-const LOG_TO_FILE = process.env.LOG_WALLET_TO_FILE || 'false';
-
-// Log levels:
-//   error    0
-//   warn     1
-//   info     2  (default)
-//   verbose  3
-//   debug    4
-//   silly    5
-
-const loggers = {};
-
-const createLogger = (formats = [], id = '') => {
-  const format = winston.format.combine(
-    {
-      transform: (info) => {
-        const args = info[Symbol.for('splat')];
-        const result = { ...info };
-        if (args) {
-          result.message = util.format(info.message, ...args);
-        }
-        return result;
-      },
-    },
-    ...formats,
-    winston.format.colorize(),
-    winston.format.printf(({
-      level, message,
-    }) => `${level}: ${message}`),
-  );
-
-  const transports = [
-    new winston.transports.Console({
-      format,
-      silent: LOG_LEVEL === 'silent',
-    }),
-  ];
-
-  if (LOG_TO_FILE === 'true' && typeof window === 'undefined') {
-    transports.push(
-      new winston.transports.File({
-        filename: `wallet${id !== '' ? `_${id}` : ''}`,
-        format,
-        silent: LOG_LEVEL === 'silent',
-      }),
-    );
-  }
-
-  return winston.createLogger({
-    level: LOG_LEVEL,
-    transports,
-  });
+const LEVELS = {
+  silent: -1, error: 0, warn: 1, info: 2, verbose: 3, debug: 4, silly: 5,
 };
 
-const logger = createLogger();
-
-logger.getForId = (id) => {
-  if (!loggers[id]) {
-    const format = {
-      transform: (info) => {
-        const message = `[DAPIClient: ${id}] ${info.message}`;
-        return { ...info, message };
-      },
-    };
-
-    loggers[id] = createLogger([format], id);
-  }
-
-  return loggers[id];
-};
-
-logger.verbose(`Logger uses "${LOG_LEVEL}" level`, { level: LOG_LEVEL });
+const cache = {};
+
+function build(level = LOG_LEVEL, prefix = '') {
+  const threshold = LEVELS[level] != null ? LEVELS[level] : LEVELS.silent;
+  const noop = () => {};
+  // Preserve printf-style interpolation (%s/%d/%o/...): when there is a
+  // prefix and the first argument is the format string, merge the prefix
+  // into it. Otherwise hand the prefix to console.* as a leading argument.
+  const fmt = prefix
+    ? (...a) => {
+      if (a.length === 0) return [prefix];
+      const [first, ...rest] = a;
+      return typeof first === 'string' ? [`${prefix} ${first}`, ...rest] : [prefix, first, ...rest];
+    }
+    : (...a) => a;
+
+  const logger = {
+    error: threshold >= 0 ? (...a) => console.error(...fmt(...a)) : noop,
+    warn: threshold >= 1 ? (...a) => console.warn(...fmt(...a)) : noop,
+    info: threshold >= 2 ? (...a) => console.info(...fmt(...a)) : noop,
+    verbose: threshold >= 3 ? (...a) => console.debug(...fmt(...a)) : noop,
+    debug: threshold >= 4 ? (...a) => console.debug(...fmt(...a)) : noop,
+    silly: threshold >= 5 ? (...a) => console.debug(...fmt(...a)) : noop,
+    getForId(id, overrideLevel) {
+      const effective = overrideLevel || level;
+      const key = `${id}\0${effective}`;
+      if (!cache[key]) {
+        cache[key] = build(effective, `[DAPIClient: ${id}]`);
+      }
+      return cache[key];
+    },
+  };
+  return logger;
+}
 
-module.exports = logger;
+module.exports = build();

package/lib/test/bootstrap.js

@@ -1,6 +1,3 @@
-require('../../polyfills/fetch-polyfill');
-require('setimmediate');
-
 const { expect, use } = require('chai');
 const sinon = require('sinon');
 const sinonChai = require('sinon-chai');

package/lib/test/karma/bootstrap.js

@@ -1,6 +1,3 @@
-require('../../../polyfills/fetch-polyfill');
-require('setimmediate');
-
 const { expect, use } = require('chai');
 const sinon = require('sinon');
 const sinonChai = require('sinon-chai');

package/lib/transport/JsonRpcTransport/requestJsonRpc.js

@@ -1,6 +1,10 @@
-const https = require('https');
 const JsonRpcError = require('./errors/JsonRpcError');
 const WrongHttpCodeError = require('./errors/WrongHttpCodeError');
+
+// Lazily-created undici Agent that disables TLS verification, shared across
+// all self-signed requests. A per-request Agent would leak its socket pool
+// since nothing destroys it after the fetch completes.
+let sharedSelfSignedAgent;
 /**
  * @typedef {requestJsonRpc}
  * @param {string} protocol
@@ -47,17 +51,24 @@ async function requestJsonRpc(protocol, host, port, selfSigned, method, params,
     Object.assign(requestOptions, { signal: controller.signal });
   }
 
-  // For NodeJS Client
+  // Self-signed HTTPS: Node 18+ built-in fetch is backed by undici, which
+  // accepts a `dispatcher` for per-request TLS settings. Browsers can't
+  // bypass TLS verification, so the flag is a no-op there. eval('require')
+  // hides undici from bundler static analysis so it isn't pulled into
+  // browser bundles.
   if (typeof process !== 'undefined'
     && process.versions != null
     && process.versions.node != null
     && protocol === 'https'
     && selfSigned) {
-    requestOptions.agent = new https.Agent({
-      rejectUnauthorized: false,
-    });
+    if (!sharedSelfSignedAgent) {
+      // eslint-disable-next-line no-eval, global-require
+      const { Agent } = eval('require')('undici');
+      sharedSelfSignedAgent = new Agent({ connect: { rejectUnauthorized: false } });
+    }
+    requestOptions.dispatcher = sharedSelfSignedAgent;
   }
-  // eslint-disable-next-line
+
   const response = await fetch(url, requestOptions);
 
   if (typeof requestTimeoutId !== 'undefined') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dashevo/dapi-client",
-  "version": "3.1.0-dev.5",
+  "version": "3.1.0-dev.6",
   "description": "Client library used to access Dash DAPI endpoints",
   "main": "lib/index.js",
   "contributors": [
@@ -26,19 +26,15 @@
     }
   ],
   "dependencies": {
-    "@dashevo/dapi-grpc": "3.1.0-dev.5",
-    "@dashevo/dash-spv": "4.1.0-dev.5",
+    "@dashevo/dapi-grpc": "3.1.0-dev.6",
+    "@dashevo/dash-spv": "4.1.0-dev.6",
     "@dashevo/dashcore-lib": "~0.22.0",
-    "@dashevo/grpc-common": "3.1.0-dev.5",
-    "@dashevo/wasm-dpp": "3.1.0-dev.5",
-    "bs58": "^4.0.1",
+    "@dashevo/grpc-common": "3.1.0-dev.6",
+    "@dashevo/wasm-dpp": "3.1.0-dev.6",
     "cbor": "^8.0.0",
     "google-protobuf": "^3.12.2",
-    "lodash": "^4.17.23",
-    "node-fetch": "^2.6.7",
-    "node-inspect-extracted": "^1.0.8",
-    "wasm-x11-hash": "~0.0.2",
-    "winston": "^3.2.1"
+    "undici": "^6.0.0",
+    "wasm-x11-hash": "~0.0.2"
   },
   "devDependencies": {
     "@babel/core": "^7.26.10",
@@ -66,7 +62,6 @@
     "os-browserify": "^0.3.0",
     "path-browserify": "^1.0.1",
     "process": "^0.11.10",
-    "setimmediate": "^1.0.5",
     "sinon": "^18.0.1",
     "sinon-chai": "^3.7.0",
     "stream-browserify": "^3.0.0",
@@ -76,10 +71,12 @@
     "webpack": "^5.104.0",
     "webpack-cli": "^4.9.1"
   },
+  "engines": {
+    "node": ">=18.18"
+  },
   "files": [
     "docs",
     "lib",
-    "polyfills",
     "dist"
   ],
   "scripts": {

package/polyfills/fetch-polyfill.js

@@ -1,10 +0,0 @@
-/* eslint-disable */
-
-const { default: fetch, Headers, Request, Response } = require('node-fetch');
-
-if (typeof window === 'undefined') {
-  globalThis.fetch = fetch;
-  globalThis.Headers = Headers;
-  globalThis.Request = Request;
-  globalThis.Response = Response;
-}