@vtex/api 6.45.13-beta.3 → 6.45.13

package/CHANGELOG.md

@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [6.45.13] - 2022-12-12
+### Changed
+- Deterministic cache for getWithBody
+- Remove socket metrics per origin
+
 ## [6.45.12] - 2022-04-14
 
 ### Fixed
@@ -1734,3 +1739,7 @@ instead
 ### Changed
 
 - `HttpClient` now adds `'Accept-Encoding': 'gzip'` header by default.
+
+
+[Unreleased]: https://github.com/vtex/node-vtex-api/compare/v6.45.13...HEAD
+[6.45.13]: https://github.com/vtex/node-vtex-api/compare/v6.45.12...v6.45.13

package/lib/HttpClient/HttpClient.d.ts

@@ -6,6 +6,7 @@ import { InstanceOptions, IOResponse, RequestConfig } from './typings';
 declare type ClientOptions = IOContext & Partial<InstanceOptions>;
 export declare class HttpClient {
     name: string;
+    private logger;
     private runMiddlewares;
     constructor(opts: ClientOptions);
     get: <T = any>(url: string, config?: RequestConfig) => Promise<T>;

package/lib/HttpClient/HttpClient.js

@@ -31,8 +31,18 @@ class HttpClient {
             return this.request(cacheableConfig);
         };
         this.getWithBody = (url, data, config = {}) => {
-            const deterministicReplacer = (_, v) => typeof v !== 'object' || v === null || Array.isArray(v) ? v :
-                Object.fromEntries(Object.entries(v).sort(([ka], [kb]) => ka < kb ? -1 : ka > kb ? 1 : 0));
+            const deterministicReplacer = (_, v) => {
+                try {
+                    return typeof v !== 'object' || v === null || Array.isArray(v) ? v :
+                        Object.fromEntries(Object.entries(v).sort(([ka], [kb]) => ka < kb ? -1 : ka > kb ? 1 : 0));
+                }
+                catch (error) {
+                    // I don't believe this will ever happen, but just in case
+                    // Also, I didn't include error as I am unsure if it would have sensitive information
+                    this.logger.warn({ message: 'Error while sorting object for cache key' });
+                    return v;
+                }
+            };
             const bodyHash = crypto_1.createHash('md5').update(JSON.stringify(data, deterministicReplacer)).digest('hex');
             const cacheableConfig = this.getConfig(url, {
                 ...config,
@@ -93,6 +103,7 @@ class HttpClient {
         });
         const { baseURL, authToken, authType, memoryCache, diskCache, locale, name, metrics, product, serverTiming, recorder, userAgent, timeout = DEFAULT_TIMEOUT_MS, segmentToken, sessionToken, retries, concurrency, headers: defaultHeaders, host, params, operationId, tenant, binding, verbose, cancellation, exponentialTimeoutCoefficient, initialBackoffDelay, exponentialBackoffCoefficient, httpsAgent, tracer, logger, } = opts;
         this.name = name || baseURL || 'unknown';
+        this.logger = logger;
         const limit = concurrency && concurrency > 0 && p_limit_1.default(concurrency) || undefined;
         const headers = {
             ...defaultHeaders,

package/lib/HttpClient/middlewares/request/HttpAgentSingleton.d.ts

@@ -3,12 +3,9 @@ export declare class HttpAgentSingleton {
     static getHttpAgent(): HttpAgent;
     static httpAgentStats(): {
         freeSockets: number;
-        freeSocketsPerOrigin: Record<string, number>;
         pendingRequests: number;
-        pendingRequestsPerOrigin: Record<string, number>;
         sockets: number;
-        socketsPerOrigin: Record<string, number>;
     };
     private static httpAgent;
-    private static countPerOrigin;
+    private static count;
 }

package/lib/HttpClient/middlewares/request/HttpAgentSingleton.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const ramda_1 = require("ramda");
 const agents_1 = require("../../agents");
 class HttpAgentSingleton {
     static getHttpAgent() {
@@ -10,27 +9,21 @@ class HttpAgentSingleton {
         return HttpAgentSingleton.httpAgent;
     }
     static httpAgentStats() {
-        const socketsPerOrigin = HttpAgentSingleton.countPerOrigin(HttpAgentSingleton.httpAgent.sockets);
-        const sockets = ramda_1.sum(ramda_1.values(socketsPerOrigin));
-        const freeSocketsPerOrigin = HttpAgentSingleton.countPerOrigin(HttpAgentSingleton.httpAgent.freeSockets);
-        const freeSockets = ramda_1.sum(ramda_1.values(freeSocketsPerOrigin));
-        const pendingRequestsPerOrigin = HttpAgentSingleton.countPerOrigin(HttpAgentSingleton.httpAgent.requests);
-        const pendingRequests = ramda_1.sum(ramda_1.values(pendingRequestsPerOrigin));
+        const sockets = HttpAgentSingleton.count(HttpAgentSingleton.httpAgent.sockets);
+        const freeSockets = HttpAgentSingleton.count(HttpAgentSingleton.httpAgent.freeSockets);
+        const pendingRequests = HttpAgentSingleton.count(HttpAgentSingleton.httpAgent.requests);
         return {
             freeSockets,
-            freeSocketsPerOrigin,
             pendingRequests,
-            pendingRequestsPerOrigin,
             sockets,
-            socketsPerOrigin,
         };
     }
-    static countPerOrigin(obj) {
+    static count(obj) {
         try {
-            return ramda_1.mapObjIndexed(val => val.length, obj);
+            return Object.values(obj).reduce((acc, val) => acc += val.length, 0);
         }
         catch (_) {
-            return {};
+            return 0;
         }
     }
 }

package/lib/service/worker/runtime/utils/context.d.ts

@@ -1,2 +1,2 @@
 import { IOContext, TracingContext } from '../typings';
-export declare const prepareHandlerCtx: (header: any, tracingContext: TracingContext) => Pick<IOContext, "host" | "logger" | "account" | "workspace" | "requestId" | "operationId" | "production" | "platform" | "authToken" | "adminUserAuthToken" | "storeUserAuthToken" | "locale" | "product" | "recorder" | "region" | "userAgent" | "segmentToken" | "sessionToken" | "janusEnv" | "serverTiming" | "eventInfo" | "tenant" | "binding" | "cancellation" | "settings" | "tracer">;
+export declare const prepareHandlerCtx: (header: any, tracingContext: TracingContext) => Pick<IOContext, "host" | "serverTiming" | "locale" | "account" | "workspace" | "region" | "logger" | "requestId" | "operationId" | "production" | "platform" | "authToken" | "adminUserAuthToken" | "storeUserAuthToken" | "product" | "recorder" | "userAgent" | "segmentToken" | "sessionToken" | "janusEnv" | "eventInfo" | "tenant" | "binding" | "cancellation" | "settings" | "tracer">;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vtex/api",
-  "version": "6.45.13-beta.3",
+  "version": "6.45.13",
   "description": "VTEX I/O API client",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",