@vtex/api 6.48.1-beta.3 → 6.48.1-beta.4

package/lib/utils/error.js

@@ -6,7 +6,7 @@ const ramda_1 = require("ramda");
 exports.PICKED_AXIOS_PROPS = ['baseURL', 'cacheable', 'data', 'finished', 'headers', 'method', 'timeout', 'status', 'path', 'url', 'metric', 'inflightKey', 'forceMaxAge', 'params', 'responseType'];
 exports.SENSITIVE_EXCEPTION_FIELDS = ['config', 'request', 'stack'];
 const MAX_ERROR_STRING_LENGTH = process.env.MAX_ERROR_STRING_LENGTH ? parseInt(process.env.MAX_ERROR_STRING_LENGTH, 10) : 8 * 1024;
-const findCaseInsensitive = (target, set) => ramda_1.find(t => t.toLocaleLowerCase() === target, set);
+const findCaseInsensitive = (target, set) => (0, ramda_1.find)(t => t.toLocaleLowerCase() === target, set);
 const destroyCircular = (from, seen) => {
     const to = Array.isArray(from) ? [] : {};
     seen.push(from);
@@ -53,10 +53,10 @@ const destroyCircular = (from, seen) => {
     ];
     for (const property of axiosProperties) {
         if (to[property] != null && typeof to[property] === 'object') {
-            to[property] = ramda_1.pick(exports.PICKED_AXIOS_PROPS, to[property]);
+            to[property] = (0, ramda_1.pick)(exports.PICKED_AXIOS_PROPS, to[property]);
             const headers = to[property] && to[property].headers;
             if (headers) {
-                const headerNames = ramda_1.keys(headers);
+                const headerNames = (0, ramda_1.keys)(headers);
                 const authorization = findCaseInsensitive('authorization', headerNames);
                 if (!!authorization) {
                     delete headers[authorization];
@@ -82,7 +82,7 @@ const destroyCircular = (from, seen) => {
  *
  * @param value an Error instance
  */
-exports.cleanError = (value) => {
+const cleanError = (value) => {
     if (typeof value === 'object') {
         return destroyCircular(value, []);
     }
@@ -93,3 +93,4 @@ exports.cleanError = (value) => {
     }
     return value;
 };
+exports.cleanError = cleanError;

package/lib/utils/index.js

@@ -1,13 +1,17 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
 }));
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./app"), exports);

package/lib/utils/log.js

@@ -16,6 +16,7 @@ const SENSITIVE_FIELDS = [
     'x-vtex-credential',
     'x-vtex-session',
 ];
-exports.cleanLog = (log) => {
-    return json_1.cleanJson(log, SENSITIVE_FIELDS);
+const cleanLog = (log) => {
+    return (0, json_1.cleanJson)(log, SENSITIVE_FIELDS);
 };
+exports.cleanLog = cleanLog;

package/lib/utils/message.js

@@ -2,11 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.removeProviderFromId = exports.parseIOMessageId = exports.providerFromMessage = exports.PROVIDER_SPACER = void 0;
 exports.PROVIDER_SPACER = '::';
-exports.providerFromMessage = (message) => {
-    const { provider } = exports.parseIOMessageId(message);
+const providerFromMessage = (message) => {
+    const { provider } = (0, exports.parseIOMessageId)(message);
     return provider || 'unknown';
 };
-exports.parseIOMessageId = ({ id }) => {
+exports.providerFromMessage = providerFromMessage;
+const parseIOMessageId = ({ id }) => {
     const splitted = id.split(exports.PROVIDER_SPACER);
     if (splitted.length === 2) {
         return {
@@ -18,7 +19,9 @@ exports.parseIOMessageId = ({ id }) => {
         locator: splitted[0],
     };
 };
-exports.removeProviderFromId = (message) => ({
+exports.parseIOMessageId = parseIOMessageId;
+const removeProviderFromId = (message) => ({
     ...message,
-    id: exports.parseIOMessageId(message).locator,
+    id: (0, exports.parseIOMessageId)(message).locator,
 });
+exports.removeProviderFromId = removeProviderFromId;

package/lib/utils/renameBy.js

@@ -2,4 +2,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.renameBy = void 0;
 const ramda_1 = require("ramda");
-exports.renameBy = (fn, obj) => ramda_1.compose(ramda_1.fromPairs, ramda_1.map(([key, val]) => [fn(key), val]), ramda_1.toPairs)(obj);
+const renameBy = (fn, obj) => (0, ramda_1.compose)(ramda_1.fromPairs, (0, ramda_1.map)(([key, val]) => [fn(key), val]), ramda_1.toPairs)(obj);
+exports.renameBy = renameBy;

package/lib/utils/retry.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isAbortedOrNetworkErrorOrRouterTimeout = exports.isNetworkErrorOrRouterTimeout = exports.TIMEOUT_CODE = void 0;
+exports.exponentialDelay = exports.isNetworkOrIdempotentRequestError = exports.isAbortedOrNetworkErrorOrRouterTimeout = exports.isNetworkErrorOrRouterTimeout = exports.TIMEOUT_CODE = void 0;
 const axios_retry_1 = require("axios-retry");
 exports.TIMEOUT_CODE = 'ProxyTimeout';
 const printLabel = (e, message) => {
@@ -9,25 +9,27 @@ const printLabel = (e, message) => {
     }
     console.warn(e.config.label, message);
 };
-exports.isNetworkErrorOrRouterTimeout = (e) => {
-    if (axios_retry_1.isNetworkOrIdempotentRequestError(e)) {
+const isNetworkErrorOrRouterTimeout = (e) => {
+    if ((0, axios_retry_1.isNetworkOrIdempotentRequestError)(e)) {
         printLabel(e, 'Retry from network error');
         return true;
     }
-    if (e && axios_retry_1.isSafeRequestError(e) && e.response && e.response.data && e.response.data.code === exports.TIMEOUT_CODE) {
+    if (e && (0, axios_retry_1.isSafeRequestError)(e) && e.response && e.response.data && e.response.data.code === exports.TIMEOUT_CODE) {
         printLabel(e, 'Retry from timeout');
         return true;
     }
     return false;
 };
+exports.isNetworkErrorOrRouterTimeout = isNetworkErrorOrRouterTimeout;
 // Retry on timeout from our end
-exports.isAbortedOrNetworkErrorOrRouterTimeout = (e) => {
+const isAbortedOrNetworkErrorOrRouterTimeout = (e) => {
     if (e && e.code === 'ECONNABORTED') {
         printLabel(e, 'Retry from abort');
         return true;
     }
-    return exports.isNetworkErrorOrRouterTimeout(e);
+    return (0, exports.isNetworkErrorOrRouterTimeout)(e);
 };
+exports.isAbortedOrNetworkErrorOrRouterTimeout = isAbortedOrNetworkErrorOrRouterTimeout;
 var axios_retry_2 = require("axios-retry");
 Object.defineProperty(exports, "isNetworkOrIdempotentRequestError", { enumerable: true, get: function () { return axios_retry_2.isNetworkOrIdempotentRequestError; } });
 Object.defineProperty(exports, "exponentialDelay", { enumerable: true, get: function () { return axios_retry_2.exponentialDelay; } });

package/lib/utils/status.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.statusLabel = void 0;
-exports.statusLabel = (status) => {
+const statusLabel = (status) => {
     if (status >= 500) {
         return 'error';
     }
@@ -10,3 +10,4 @@ exports.statusLabel = (status) => {
     }
     return `${Math.floor(status / 100)}xx`;
 };
+exports.statusLabel = statusLabel;

package/lib/utils/tenant.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseTenantHeaderValue = exports.formatTenantHeaderValue = void 0;
-exports.formatTenantHeaderValue = (tenant) => tenant.locale;
-exports.parseTenantHeaderValue = (value) => ({
+const formatTenantHeaderValue = (tenant) => tenant.locale;
+exports.formatTenantHeaderValue = formatTenantHeaderValue;
+const parseTenantHeaderValue = (value) => ({
     locale: value,
 });
+exports.parseTenantHeaderValue = parseTenantHeaderValue;

package/lib/utils/time.d.ts

@@ -8,7 +8,7 @@ export declare const hrToNano: ([seconds, nanoseconds]: [number, number]) => num
 export declare const formatNano: (nanoseconds: number) => string;
 export declare const reduceHrToNano: (values: import("ramda").List<[number, number]>) => number;
 export declare const shrinkTimings: (name: string) => string;
-declare type TimingFormat = ReturnType<typeof parseTimingName>;
+type TimingFormat = ReturnType<typeof parseTimingName>;
 export declare const formatTimingName: ({ hopNumber, target, source }: TimingFormat) => string;
 export declare const parseTimingName: (timing: string | undefined) => {
     hopNumber: number | null;

package/lib/utils/time.js

@@ -3,19 +3,26 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.timerForEvents = exports.timer = exports.reduceTimings = exports.parseTimingName = exports.formatTimingName = exports.shrinkTimings = exports.reduceHrToNano = exports.formatNano = exports.hrToNano = exports.nanosecondsToSeconds = exports.hrToMillisFloat = exports.hrToMillis = void 0;
 const ramda_1 = require("ramda");
 const logger_1 = require("../service/logger");
-exports.hrToMillis = ([seconds, nanoseconds]) => Math.round((seconds * 1e3) + (nanoseconds / 1e6));
-exports.hrToMillisFloat = ([seconds, nanoseconds]) => {
+const hrToMillis = ([seconds, nanoseconds]) => Math.round((seconds * 1e3) + (nanoseconds / 1e6));
+exports.hrToMillis = hrToMillis;
+const hrToMillisFloat = ([seconds, nanoseconds]) => {
     return (seconds * 1e3) + (nanoseconds / 1e6);
 };
-exports.nanosecondsToSeconds = (nanoseconds) => {
+exports.hrToMillisFloat = hrToMillisFloat;
+const nanosecondsToSeconds = (nanoseconds) => {
     return nanoseconds / 1e9;
 };
-exports.hrToNano = ([seconds, nanoseconds]) => seconds * 1e9 + nanoseconds;
-exports.formatNano = (nanoseconds) => `${(nanoseconds / 1e9).toFixed(0)}s ${((nanoseconds / 1e6) % 1e3).toFixed(0)}ms`;
-exports.reduceHrToNano = ramda_1.reduce((acc, hr) => acc + exports.hrToNano(hr), 0);
-exports.shrinkTimings = (name) => name.replace(/graphql/g, 'gql').replace(/server/g, 'srv');
-exports.formatTimingName = ({ hopNumber, target, source }) => `${Number.isNaN(hopNumber) ? '' : hopNumber}.${source || ''}#${target || ''}`;
-exports.parseTimingName = (timing) => {
+exports.nanosecondsToSeconds = nanosecondsToSeconds;
+const hrToNano = ([seconds, nanoseconds]) => seconds * 1e9 + nanoseconds;
+exports.hrToNano = hrToNano;
+const formatNano = (nanoseconds) => `${(nanoseconds / 1e9).toFixed(0)}s ${((nanoseconds / 1e6) % 1e3).toFixed(0)}ms`;
+exports.formatNano = formatNano;
+exports.reduceHrToNano = (0, ramda_1.reduce)((acc, hr) => acc + (0, exports.hrToNano)(hr), 0);
+const shrinkTimings = (name) => name.replace(/graphql/g, 'gql').replace(/server/g, 'srv');
+exports.shrinkTimings = shrinkTimings;
+const formatTimingName = ({ hopNumber, target, source }) => `${Number.isNaN(hopNumber) ? '' : hopNumber}.${source || ''}#${target || ''}`;
+exports.formatTimingName = formatTimingName;
+const parseTimingName = (timing) => {
     const [hopNumber, sourceAndTarget] = timing ? timing.split('.') : [null, null];
     const [source, target] = sourceAndTarget ? sourceAndTarget.split('#') : [null, null];
     return {
@@ -24,7 +31,9 @@ exports.parseTimingName = (timing) => {
         target,
     };
 };
-exports.reduceTimings = (timingsObj) => ramda_1.compose(ramda_1.reduce((acc, [key, dur]) => `${key};dur=${dur}, ${acc}`, ''), ramda_1.toPairs)(timingsObj);
+exports.parseTimingName = parseTimingName;
+const reduceTimings = (timingsObj) => (0, ramda_1.compose)((0, ramda_1.reduce)((acc, [key, dur]) => `${key};dur=${dur}, ${acc}`, ''), ramda_1.toPairs)(timingsObj);
+exports.reduceTimings = reduceTimings;
 function recordTimings(start, name, timings, middlewareMetrics, success) {
     // Capture the total amount of time spent in this middleware, which includes following middlewares
     const end = process.hrtime(start);
@@ -44,9 +53,9 @@ function recordTimings(start, name, timings, middlewareMetrics, success) {
     metrics.batch(label, success ? elapsed : undefined, { success: success ? 1 : 0 });
     // This middleware has added it's own metrics
     // Just add them to `timings` scoped by the middleware's name and batch them
-    const middlewareMetricsKeys = ramda_1.keys(middlewareMetrics);
+    const middlewareMetricsKeys = (0, ramda_1.keys)(middlewareMetrics);
     if (success && middlewareMetricsKeys.length > 0) {
-        ramda_1.forEach((k) => {
+        (0, ramda_1.forEach)((k) => {
             const metricEnd = middlewareMetrics[k];
             // Delete own metrics so next middleware can have empty state but still accumulate metrics batched after `await`
             delete middlewareMetrics[k];
@@ -61,7 +70,7 @@ function timer(middleware) {
         return middleware;
     }
     if (!middleware.name) {
-        logger_1.logOnceToDevConsole(`Please use a named function as handler for better metrics. ${middleware.toString()}`, logger_1.LogLevel.Warn);
+        (0, logger_1.logOnceToDevConsole)(`Please use a named function as handler for better metrics. ${middleware.toString()}`, logger_1.LogLevel.Warn);
     }
     return async (ctx, next) => {
         if (!ctx.serverTiming) {
@@ -93,7 +102,7 @@ function timerForEvents(middleware) {
         return middleware;
     }
     if (!middleware.name) {
-        logger_1.logOnceToDevConsole(`Please use a named function as handler for better metrics. ${middleware.toString()}`, logger_1.LogLevel.Warn);
+        (0, logger_1.logOnceToDevConsole)(`Please use a named function as handler for better metrics. ${middleware.toString()}`, logger_1.LogLevel.Warn);
     }
     return async (ctx, next) => {
         if (!ctx.timings) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vtex/api",
-  "version": "6.48.1-beta.3",
+  "version": "6.48.1-beta.4",
   "description": "VTEX I/O API client",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -12,7 +12,7 @@
     "clean": "rimraf lib/",
     "watch": "yarn clean && tsc --watch",
     "build": "yarn clean && tsc",
-    "gen": "typescript-json-schema tsconfig.json PublicAppManifest > gen/manifest.schema",
+    "gen": "typescript-json-schema src/responses.ts PublicAppManifest > gen/manifest.schema",
     "test": "jest",
     "lint": "tslint -c tslint.json './src/**/*.ts'",
     "format": "prettier --config ./.prettierrc --write \"src/**/*.ts\" \"src/**/*.js\"",
@@ -49,6 +49,7 @@
   "dependencies": {
     "@types/koa": "^2.11.0",
     "@types/koa-compose": "^3.2.3",
+    "@vtex/diagnostics-nodejs": "0.1.0-beta.8",
     "@vtex/node-error-report": "^0.0.3",
     "@wry/equality": "^0.1.9",
     "agentkeepalive": "^4.0.2",
@@ -121,7 +122,28 @@
     "tslint-config-vtex": "^2.1.0",
     "tslint-eslint-rules": "^5.4.0",
     "typemoq": "^2.1.0",
-    "typescript": "3.9.7",
-    "typescript-json-schema": "^0.65.1"
+    "typescript": "^4.4.4",
+    "typescript-json-schema": "^0.52.0"
+  },
+  "resolutions": {
+    "@opentelemetry/core": "1.30.1",
+    "@opentelemetry/exporter-metrics-otlp-grpc": "0.57.2",
+    "@opentelemetry/exporter-metrics-otlp-http": "0.57.2",
+    "@opentelemetry/exporter-logs-otlp-grpc": "0.57.2",
+    "@opentelemetry/exporter-logs-otlp-http": "0.57.2",
+    "@opentelemetry/exporter-trace-otlp-grpc": "0.57.2",
+    "@opentelemetry/exporter-trace-otlp-http": "0.57.2",
+    "@opentelemetry/instrumentation": "0.57.2",
+    "@opentelemetry/instrumentation-http": "0.57.2",
+    "@opentelemetry/instrumentation-grpc": "0.57.2",
+    "@opentelemetry/instrumentation-net": "0.43.1",
+    "@opentelemetry/propagator-b3": "1.30.1",
+    "@opentelemetry/resource-detector-aws": "1.12.0",
+    "@opentelemetry/resources": "1.30.1",
+    "@opentelemetry/sdk-node": "0.57.2",
+    "@opentelemetry/sdk-logs": "0.57.2",
+    "@opentelemetry/sdk-metrics": "1.30.1",
+    "@opentelemetry/sdk-trace-base": "1.30.1",
+    "@opentelemetry/sdk-trace-node": "1.30.1"
   }
 }