@verii/fastify-plugins 1.1.0-pre.1757918680 → 1.1.0-pre.1758002630

package/index.js

@@ -25,5 +25,5 @@ module.exports = {
   ...require('./src/cors-plugin'),
   ...require('./src/csv-response-hook'),
   ...require('./src/cache-plugin'),
-  ...require('./src/request-plugin'),
+  ...require('./src/http-client-plugin'),
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@verii/fastify-plugins",
-  "version": "1.1.0-pre.1757918680",
+  "version": "1.1.0-pre.1758002630",
   "description": "Plugin for handling errors",
   "repository": "https://github.com/LFDT-Verii/core",
   "main": "index.js",
@@ -18,9 +18,9 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@fastify/cors": "11.1.0",
-    "@verii/crypto": "1.1.0-pre.1757918680",
-    "@verii/error-aggregation": "1.1.0-pre.1757918680",
-    "@verii/request": "1.1.0-pre.1757918680",
+    "@verii/crypto": "1.1.0-pre.1758002630",
+    "@verii/error-aggregation": "1.1.0-pre.1758002630",
+    "@verii/http-client": "1.1.0-pre.1758002630",
     "fastify-plugin": "~5.0.0",
     "http-errors": "^2.0.0",
     "lodash": "^4.17.21",
@@ -29,7 +29,6 @@
     "toidentifier": "~1.0.1"
   },
   "devDependencies": {
-    "@verii/request": "~0.5.0-build",
     "eslint": "8.57.1",
     "eslint-config-airbnb-base": "14.2.1",
     "eslint-config-prettier": "8.10.2",
@@ -49,5 +48,5 @@
       "lib"
     ]
   },
-  "gitHead": "f0bb52fc63b22fadfe65a820a5a4425580a3c8a7"
+  "gitHead": "b961d761dc0f0710df506d90222145afe3c35cf6"
 }

package/src/cache-plugin.js

@@ -15,16 +15,13 @@
  */
 
 const fp = require('fastify-plugin');
-const QuickLru = require('quick-lru');
+const { initCache } = require('@verii/http-client');
 
-const cache = new QuickLru({ maxSize: 1000, maxAge: 2 * 60 * 60 * 1000 }); // 1000 items cached for a mac of 2 hours
+const store = initCache();
 
 const cachePlugin = (fastify, options, done) => {
-  fastify.decorate('cache', cache);
-  fastify.addHook('onRequest', (request, reply, next) => {
-    request.cache = fastify.cache;
-    next();
-  });
+  fastify.decorate('cache', store);
+
   done();
 };
 

package/src/errors-plugin.js

@@ -15,9 +15,9 @@
  */
 
 const url = require('url');
-const newError = require('http-errors');
 const fp = require('fastify-plugin');
-const { includes, get, isEmpty, flow } = require('lodash/fp');
+const newError = require('http-errors');
+const { get, isEmpty, flow } = require('lodash/fp');
 const { ERROR_CODES } = require('./constants');
 
 const extractEndpoint = (endpointUrl) => {
@@ -33,101 +33,6 @@ const getDocsUrl = (endpointUrl, { endpointDocsMap } = {}) => {
   return get(endpoint, endpointDocsMap);
 };
 
-const handleDnsError = (error, docsUrl) => {
-  if (includes('getaddrinfo', error.message)) {
-    throw newError(
-      502,
-      'DNS Error - Please verify that that the server has access to an internal DNS server, and that the vendor gateway api has an entry',
-      {
-        endpointDocumentation: docsUrl,
-        errorCode: 'upstream_network_dns_error',
-      }
-    );
-  }
-};
-
-const handleConnectivityError = (error, docsUrl) => {
-  if (
-    includes('ETIMEDOUT', error.message) ||
-    includes('EPIPE', error.message) ||
-    includes('ECONNRESET', error.message) ||
-    includes('ECONNREFUSED', error.message)
-  ) {
-    throw newError(
-      502,
-      'Connectivity Error - Unable to connect to the vendor gateway. Please check routing tables and firewall settings',
-      {
-        endpointDocumentation: docsUrl,
-        errorCode: 'upstream_network_error',
-      }
-    );
-  }
-};
-
-const handleBadRequestError = (error, docsUrl) => {
-  if (error.response?.statusCode === 400) {
-    throw newError(
-      502,
-      'Bad request sent from credential agent to vendor gateway (this should be raised with velocity support).',
-      {
-        endpointDocumentation: docsUrl,
-        errorCode: 'upstream_response_invalid',
-      }
-    );
-  }
-};
-
-const handleUnauthorizedForbiddenError = (error, docsUrl) => {
-  if (
-    error.response?.statusCode === 401 ||
-    error.response?.statusCode === 403
-  ) {
-    throw newError(
-      502,
-      'Bad authentication of the server. Please review the supported authentication methods for the agent.',
-      {
-        authenticationDocumentation:
-          'https://docs.velocitycareerlabs.io/#/./Authentication',
-        endpointDocumentation: docsUrl,
-        errorCode: 'upstream_unauthorized',
-      }
-    );
-  }
-};
-
-const handleNotFoundError = (error, endpointPath, docsUrl) => {
-  if (error.response?.statusCode === 404) {
-    throw newError(
-      502,
-      `Missing implementation of the endpoint '${endpointPath}'.`,
-      {
-        endpointDocumentation: docsUrl,
-        errorCode: 'upstream_webhook_not_implemented',
-      }
-    );
-  }
-};
-
-const handleUnexpectedError = (docsUrl) => {
-  throw newError(
-    502,
-    'Unexpected error received connecting to vendor gateway.',
-    {
-      endpointDocumentation: docsUrl,
-      errorCode: 'upstream_unexpected_error',
-    }
-  );
-};
-
-const handleVendorError = (error, endpointPath, docsUrl) => {
-  handleDnsError(error, docsUrl);
-  handleConnectivityError(error, docsUrl);
-  handleBadRequestError(error, docsUrl);
-  handleUnauthorizedForbiddenError(error, docsUrl);
-  handleNotFoundError(error, endpointPath, docsUrl);
-  handleUnexpectedError(docsUrl);
-};
-
 const extractRequestPath = (requestUrl) => {
   return url.parse(requestUrl).pathname;
 };
@@ -160,28 +65,26 @@ const addValidationErrorCode = (err) => {
   err.errorCode = 'request_validation_failed';
   return err;
 };
+
+const transformToInternalServerError = (error, fastify) => {
+  if (error.url && error.statusCode && error.statusCode < 500) {
+    fastify.log.info('Transforming error to Internal Server Error', { error });
+
+    return newError(500, 'Internal Server Error');
+  }
+
+  return error;
+};
+
 const errorsPlugin = (fastify, options, next) => {
   fastify.setErrorHandler((_error, request, reply) => {
-    const { sendError = () => {} } = fastify;
     const error = flow(
       addValidationErrorCode,
       (err) => ensureErrorCode(err, fastify),
-      (err) => addRequestId(err, request)
-    )(_error);
+      (err) => addRequestId(err, request),
+      (err) => transformToInternalServerError(err, fastify)
+    )(_error.processedError || _error);
 
-    if (error.gatewayResponse) {
-      try {
-        handleVendorError(
-          error,
-          extractRequestPath(error.gatewayResponse.url),
-          getDocsUrl(error.gatewayResponse.url.toLowerCase(), options)
-        );
-      } catch (modifiedError) {
-        sendError(error);
-        return reply.send(modifiedError);
-      }
-    }
-    sendError(error);
     return reply.send(error);
   });
   next();
@@ -189,7 +92,6 @@ const errorsPlugin = (fastify, options, next) => {
 
 module.exports = {
   addValidationErrorCode,
-  handleVendorError,
   ensureErrorCode,
   addRequestId,
   extractRequestPath,

package/src/{request-plugin.js → http-client-plugin.js}

@@ -15,19 +15,25 @@
  *
  */
 
-const initRequest = require('@verii/request');
-const { capitalize } = require('lodash/fp');
+const { initHttpClient } = require('@verii/http-client');
 const fp = require('fastify-plugin');
 
-const requestPlugin = async (fastify, { name, options }) => {
-  const fastifyDecoration = `base${capitalize(name)}`;
+const httpClientPlugin = async (fastify, { name, options }) => {
+  const fastifyDecoration = `base${name[0].toUpperCase()}${name.slice(1)}`;
   const requestDecoration = name;
+  const { prefixUrl } = options;
   fastify
-    .decorate(fastifyDecoration, initRequest(options))
+    .decorate(
+      fastifyDecoration,
+      () => initHttpClient({ ...options, cache: fastify.cache }),
+      ['cache']
+    )
     .decorateRequest(requestDecoration, null)
     .addHook('preValidation', async (req) => {
-      req[requestDecoration] = fastify[fastifyDecoration](req);
+      req[requestDecoration] = prefixUrl
+        ? fastify[fastifyDecoration]()(prefixUrl, req)
+        : fastify[fastifyDecoration]()(req);
     });
 };
 
-module.exports = { requestPlugin: fp(requestPlugin) };
+module.exports = { httpClientPlugin: fp(httpClientPlugin) };