@vtex/api 6.48.0 → 6.48.1-beta.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/gen/manifest.schema +2 -3
- package/lib/HttpClient/GraphQLClient.d.ts +1 -1
- package/lib/HttpClient/GraphQLClient.js +1 -0
- package/lib/HttpClient/HttpClient.d.ts +4 -3
- package/lib/HttpClient/HttpClient.js +15 -14
- package/lib/HttpClient/agents.d.ts +5 -2
- package/lib/HttpClient/agents.js +23 -4
- package/lib/HttpClient/index.js +22 -10
- package/lib/HttpClient/middlewares/cache.d.ts +1 -1
- package/lib/HttpClient/middlewares/cache.js +48 -42
- package/lib/HttpClient/middlewares/cancellationToken.d.ts +1 -1
- package/lib/HttpClient/middlewares/cancellationToken.js +3 -1
- package/lib/HttpClient/middlewares/inflight.d.ts +1 -1
- package/lib/HttpClient/middlewares/inflight.js +7 -3
- package/lib/HttpClient/middlewares/memoization.d.ts +1 -1
- package/lib/HttpClient/middlewares/memoization.js +10 -8
- package/lib/HttpClient/middlewares/metrics.js +13 -7
- package/lib/HttpClient/middlewares/notFound.d.ts +1 -1
- package/lib/HttpClient/middlewares/notFound.js +5 -2
- package/lib/HttpClient/middlewares/recorder.js +7 -1
- package/lib/HttpClient/middlewares/request/HttpAgentSingleton.js +2 -1
- package/lib/HttpClient/middlewares/request/index.d.ts +1 -1
- package/lib/HttpClient/middlewares/request/index.js +13 -9
- package/lib/HttpClient/middlewares/request/setupAxios/index.js +6 -4
- package/lib/HttpClient/middlewares/request/setupAxios/interceptors/exponentialBackoff.js +7 -5
- package/lib/HttpClient/middlewares/request/setupAxios/interceptors/index.js +4 -3
- package/lib/HttpClient/middlewares/request/setupAxios/interceptors/tracing/index.js +9 -6
- package/lib/HttpClient/middlewares/request/setupAxios/interceptors/tracing/spanSetup.js +10 -7
- package/lib/HttpClient/middlewares/tracing.js +16 -10
- package/lib/HttpClient/typings.d.ts +3 -3
- package/lib/HttpClient/typings.js +1 -0
- package/lib/caches/DiskCache.d.ts +1 -1
- package/lib/caches/DiskCache.js +3 -2
- package/lib/caches/LRUCache.d.ts +3 -3
- package/lib/caches/LRUCache.js +1 -0
- package/lib/caches/LRUDiskCache.d.ts +2 -2
- package/lib/caches/LRUDiskCache.js +3 -2
- package/lib/caches/MultilayeredCache.d.ts +2 -2
- package/lib/caches/MultilayeredCache.js +8 -7
- package/lib/caches/index.js +20 -7
- package/lib/caches/typings.d.ts +5 -5
- package/lib/clients/IOClient.d.ts +1 -1
- package/lib/clients/IOClient.js +1 -0
- package/lib/clients/IOClients.d.ts +1 -1
- package/lib/clients/IOClients.js +1 -0
- package/lib/clients/IOGraphQLClient.js +1 -0
- package/lib/clients/apps/AppClient.js +2 -1
- package/lib/clients/apps/AppGraphQLClient.js +2 -1
- package/lib/clients/apps/Billing.d.ts +1 -1
- package/lib/clients/apps/Billing.js +1 -0
- package/lib/clients/apps/Builder.d.ts +7 -7
- package/lib/clients/apps/Builder.js +2 -1
- package/lib/clients/apps/MessagesGraphQL.d.ts +1 -1
- package/lib/clients/apps/MessagesGraphQL.js +4 -3
- package/lib/clients/apps/Settings.js +4 -3
- package/lib/clients/apps/catalogGraphQL/brand.js +1 -0
- package/lib/clients/apps/catalogGraphQL/category.js +1 -0
- package/lib/clients/apps/catalogGraphQL/index.d.ts +4 -4
- package/lib/clients/apps/catalogGraphQL/index.js +5 -4
- package/lib/clients/apps/catalogGraphQL/product.js +1 -0
- package/lib/clients/apps/catalogGraphQL/sku.js +1 -0
- package/lib/clients/apps/index.js +21 -10
- package/lib/clients/external/ExternalClient.js +1 -0
- package/lib/clients/external/ID.d.ts +4 -4
- package/lib/clients/external/ID.js +1 -0
- package/lib/clients/external/Masterdata.js +1 -0
- package/lib/clients/external/PaymentProvider.d.ts +2 -2
- package/lib/clients/external/PaymentProvider.js +1 -0
- package/lib/clients/external/index.js +18 -7
- package/lib/clients/index.js +22 -10
- package/lib/clients/infra/Apps.d.ts +32 -27
- package/lib/clients/infra/Apps.js +19 -16
- package/lib/clients/infra/Assets.d.ts +6 -5
- package/lib/clients/infra/Assets.js +12 -11
- package/lib/clients/infra/BillingMetrics.d.ts +1 -1
- package/lib/clients/infra/BillingMetrics.js +1 -0
- package/lib/clients/infra/Events.d.ts +1 -1
- package/lib/clients/infra/Events.js +2 -1
- package/lib/clients/infra/Housekeeper.d.ts +3 -3
- package/lib/clients/infra/Housekeeper.js +1 -0
- package/lib/clients/infra/InfraClient.js +1 -0
- package/lib/clients/infra/Registry.d.ts +23 -17
- package/lib/clients/infra/Registry.js +5 -3
- package/lib/clients/infra/Router.d.ts +8 -8
- package/lib/clients/infra/Router.js +1 -0
- package/lib/clients/infra/Sphinx.d.ts +2 -2
- package/lib/clients/infra/Sphinx.js +1 -0
- package/lib/clients/infra/VBase.d.ts +15 -14
- package/lib/clients/infra/VBase.js +4 -3
- package/lib/clients/infra/Workspaces.d.ts +7 -7
- package/lib/clients/infra/Workspaces.js +1 -0
- package/lib/clients/infra/index.js +25 -14
- package/lib/clients/janus/JanusClient.d.ts +1 -1
- package/lib/clients/janus/JanusClient.js +1 -0
- package/lib/clients/janus/LicenseManager.js +2 -1
- package/lib/clients/janus/Segment.d.ts +3 -3
- package/lib/clients/janus/Segment.js +3 -2
- package/lib/clients/janus/Session.d.ts +2 -2
- package/lib/clients/janus/Session.js +1 -0
- package/lib/clients/janus/Tenant.d.ts +1 -1
- package/lib/clients/janus/Tenant.js +1 -0
- package/lib/clients/janus/index.js +19 -8
- package/lib/constants.d.ts +1 -1
- package/lib/constants.js +2 -1
- package/lib/errors/AuthenticationError.js +1 -0
- package/lib/errors/ForbiddenError.js +1 -0
- package/lib/errors/NotFoundError.js +1 -0
- package/lib/errors/RequestCancelledError.js +1 -0
- package/lib/errors/ResolverError.js +2 -1
- package/lib/errors/ResolverWarning.js +1 -0
- package/lib/errors/TooManyRequestsError.js +1 -0
- package/lib/errors/UserInputError.js +1 -0
- package/lib/errors/index.js +22 -11
- package/lib/index.js +31 -18
- package/lib/metrics/MetricsAccumulator.d.ts +2 -2
- package/lib/metrics/MetricsAccumulator.js +10 -9
- package/lib/responses.d.ts +4 -4
- package/lib/service/index.js +11 -6
- package/lib/service/loaders.js +9 -6
- package/lib/service/logger/console.js +8 -4
- package/lib/service/logger/index.js +16 -5
- package/lib/service/logger/logger.js +3 -2
- package/lib/service/logger/metricsLogger.js +11 -10
- package/lib/service/master.js +8 -6
- package/lib/service/metrics/requestMetricsMiddleware.d.ts +1 -1
- package/lib/service/metrics/requestMetricsMiddleware.js +15 -13
- package/lib/service/tracing/TracerSingleton.js +10 -9
- package/lib/service/tracing/metrics/MetricNames.js +13 -12
- package/lib/service/tracing/metrics/instruments.js +15 -7
- package/lib/service/tracing/metrics/measurers/EventLoopLagMeasurer.js +6 -5
- package/lib/service/tracing/tracingMiddlewares.d.ts +3 -3
- package/lib/service/tracing/tracingMiddlewares.js +25 -15
- package/lib/service/worker/index.js +25 -23
- package/lib/service/worker/listeners.js +3 -1
- package/lib/service/worker/runtime/Service.js +2 -1
- package/lib/service/worker/runtime/builtIn/handlers.d.ts +3 -3
- package/lib/service/worker/runtime/builtIn/handlers.js +7 -3
- package/lib/service/worker/runtime/builtIn/middlewares.d.ts +2 -2
- package/lib/service/worker/runtime/builtIn/middlewares.js +6 -3
- package/lib/service/worker/runtime/events/index.d.ts +2 -2
- package/lib/service/worker/runtime/events/index.js +12 -10
- package/lib/service/worker/runtime/events/middlewares/body.js +6 -2
- package/lib/service/worker/runtime/events/middlewares/context.js +2 -1
- package/lib/service/worker/runtime/events/router.d.ts +2 -2
- package/lib/service/worker/runtime/events/router.js +4 -2
- package/lib/service/worker/runtime/graphql/index.js +9 -7
- package/lib/service/worker/runtime/graphql/middlewares/context.js +1 -0
- package/lib/service/worker/runtime/graphql/middlewares/error.js +9 -5
- package/lib/service/worker/runtime/graphql/middlewares/query.d.ts +2 -1
- package/lib/service/worker/runtime/graphql/middlewares/query.js +8 -6
- package/lib/service/worker/runtime/graphql/middlewares/response.js +2 -1
- package/lib/service/worker/runtime/graphql/middlewares/run.d.ts +2 -2
- package/lib/service/worker/runtime/graphql/middlewares/run.js +4 -2
- package/lib/service/worker/runtime/graphql/middlewares/updateSchema.d.ts +2 -1
- package/lib/service/worker/runtime/graphql/middlewares/updateSchema.js +5 -3
- package/lib/service/worker/runtime/graphql/middlewares/upload.js +2 -1
- package/lib/service/worker/runtime/graphql/schema/index.d.ts +1 -1
- package/lib/service/worker/runtime/graphql/schema/index.js +9 -7
- package/lib/service/worker/runtime/graphql/schema/messagesLoaderV2.d.ts +2 -2
- package/lib/service/worker/runtime/graphql/schema/messagesLoaderV2.js +5 -3
- package/lib/service/worker/runtime/graphql/schema/schemaDirectives/Auth.js +2 -1
- package/lib/service/worker/runtime/graphql/schema/schemaDirectives/CacheControl.js +1 -0
- package/lib/service/worker/runtime/graphql/schema/schemaDirectives/Deprecated.js +2 -1
- package/lib/service/worker/runtime/graphql/schema/schemaDirectives/Metric.js +1 -0
- package/lib/service/worker/runtime/graphql/schema/schemaDirectives/Sanitize.js +1 -0
- package/lib/service/worker/runtime/graphql/schema/schemaDirectives/Settings.js +2 -1
- package/lib/service/worker/runtime/graphql/schema/schemaDirectives/SmartCacheDirective.js +1 -0
- package/lib/service/worker/runtime/graphql/schema/schemaDirectives/TranslatableV2.js +3 -2
- package/lib/service/worker/runtime/graphql/schema/schemaDirectives/TranslateTo.js +3 -2
- package/lib/service/worker/runtime/graphql/schema/schemaDirectives/index.js +3 -2
- package/lib/service/worker/runtime/graphql/schema/typeDefs/index.d.ts +2 -1
- package/lib/service/worker/runtime/graphql/schema/typeDefs/index.js +3 -1
- package/lib/service/worker/runtime/graphql/schema/typeDefs/ioUpload.js +1 -0
- package/lib/service/worker/runtime/graphql/schema/typeDefs/sanitizedString.js +3 -2
- package/lib/service/worker/runtime/graphql/typings.d.ts +3 -3
- package/lib/service/worker/runtime/graphql/utils/cacheControl.d.ts +2 -1
- package/lib/service/worker/runtime/graphql/utils/cacheControl.js +3 -1
- package/lib/service/worker/runtime/graphql/utils/error.d.ts +2 -1
- package/lib/service/worker/runtime/graphql/utils/error.js +11 -9
- package/lib/service/worker/runtime/graphql/utils/pathname.js +4 -2
- package/lib/service/worker/runtime/graphql/utils/translations.d.ts +1 -1
- package/lib/service/worker/runtime/graphql/utils/translations.js +8 -4
- package/lib/service/worker/runtime/http/index.d.ts +3 -3
- package/lib/service/worker/runtime/http/index.js +23 -20
- package/lib/service/worker/runtime/http/middlewares/authTokens.js +1 -0
- package/lib/service/worker/runtime/http/middlewares/cancellationToken.js +1 -0
- package/lib/service/worker/runtime/http/middlewares/clients.js +1 -0
- package/lib/service/worker/runtime/http/middlewares/context.js +8 -5
- package/lib/service/worker/runtime/http/middlewares/error.js +10 -6
- package/lib/service/worker/runtime/http/middlewares/rateLimit.js +2 -1
- package/lib/service/worker/runtime/http/middlewares/requestStats.js +1 -0
- package/lib/service/worker/runtime/http/middlewares/setCookie.js +6 -5
- package/lib/service/worker/runtime/http/middlewares/settings.d.ts +1 -1
- package/lib/service/worker/runtime/http/middlewares/settings.js +14 -9
- package/lib/service/worker/runtime/http/middlewares/timings.js +4 -3
- package/lib/service/worker/runtime/http/middlewares/vary.js +1 -0
- package/lib/service/worker/runtime/http/router.d.ts +1 -1
- package/lib/service/worker/runtime/http/router.js +4 -2
- package/lib/service/worker/runtime/http/routes.js +9 -5
- package/lib/service/worker/runtime/method.d.ts +2 -2
- package/lib/service/worker/runtime/method.js +2 -1
- package/lib/service/worker/runtime/statusTrack.d.ts +2 -2
- package/lib/service/worker/runtime/statusTrack.js +11 -5
- package/lib/service/worker/runtime/typings.d.ts +10 -10
- package/lib/service/worker/runtime/utils/compose.d.ts +3 -3
- package/lib/service/worker/runtime/utils/compose.js +5 -2
- package/lib/service/worker/runtime/utils/context.d.ts +4 -1
- package/lib/service/worker/runtime/utils/context.js +6 -4
- package/lib/service/worker/runtime/utils/diff.js +1 -0
- package/lib/service/worker/runtime/utils/recorder.js +2 -1
- package/lib/service/worker/runtime/utils/toArray.js +3 -1
- package/lib/service/worker/runtime/utils/tokenBucket.js +1 -0
- package/lib/tracing/Tags.js +2 -1
- package/lib/tracing/UserLandTracer.js +4 -2
- package/lib/tracing/errorReporting/ErrorReport.js +14 -13
- package/lib/tracing/index.js +10 -9
- package/lib/tracing/spanReference/SpanReferenceTypes.js +1 -0
- package/lib/tracing/spanReference/createSpanReference.js +1 -0
- package/lib/tracing/utils.js +6 -4
- package/lib/utils/MineWinsConflictsResolver.d.ts +4 -4
- package/lib/utils/MineWinsConflictsResolver.js +11 -10
- package/lib/utils/app.js +40 -23
- package/lib/utils/appsStaleIfError.d.ts +1 -0
- package/lib/utils/appsStaleIfError.js +33 -12
- package/lib/utils/billingOptions.js +3 -1
- package/lib/utils/binding.js +5 -2
- package/lib/utils/cancel.js +1 -0
- package/lib/utils/conflicts.mock.js +1 -0
- package/lib/utils/domain.js +2 -1
- package/lib/utils/error.js +6 -4
- package/lib/utils/index.js +23 -12
- package/lib/utils/json.js +1 -0
- package/lib/utils/log.js +4 -2
- package/lib/utils/message.js +9 -5
- package/lib/utils/renameBy.js +3 -1
- package/lib/utils/retry.js +10 -7
- package/lib/utils/status.js +3 -1
- package/lib/utils/tenant.js +5 -2
- package/lib/utils/throwOnGraphQLErrors.js +1 -0
- package/lib/utils/time.d.ts +3 -5
- package/lib/utils/time.js +24 -14
- package/package.json +4 -4
- package/CHANGELOG.md +0 -1858
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.ErrorReport = void 0;
|
|
3
4
|
const node_error_report_1 = require("@vtex/node-error-report");
|
|
4
5
|
const __1 = require("..");
|
|
5
6
|
const utils_1 = require("../utils");
|
|
@@ -26,7 +27,7 @@ class ErrorReport extends node_error_report_1.ErrorReportBase {
|
|
|
26
27
|
if (args.originalError instanceof ErrorReport) {
|
|
27
28
|
return args.originalError;
|
|
28
29
|
}
|
|
29
|
-
return new ErrorReport(node_error_report_1.createErrorReportBaseArgs(args));
|
|
30
|
+
return new ErrorReport((0, node_error_report_1.createErrorReportBaseArgs)(args));
|
|
30
31
|
}
|
|
31
32
|
/**
|
|
32
33
|
* Inject information about the error wrapped by this ErrorReport
|
|
@@ -37,24 +38,24 @@ class ErrorReport extends node_error_report_1.ErrorReportBase {
|
|
|
37
38
|
var _a, _b, _c, _d;
|
|
38
39
|
span === null || span === void 0 ? void 0 : span.setTag(__1.TracingTags.ERROR, 'true');
|
|
39
40
|
const indexedLogs = {
|
|
40
|
-
["error.kind" /* ERROR_KIND */]: this.kind,
|
|
41
|
-
["error.id" /* ERROR_ID */]: this.metadata.errorId,
|
|
41
|
+
["error.kind" /* ErrorReportLogFields.ERROR_KIND */]: this.kind,
|
|
42
|
+
["error.id" /* ErrorReportLogFields.ERROR_ID */]: this.metadata.errorId,
|
|
42
43
|
};
|
|
43
|
-
if (node_error_report_1.isRequestInfo(this.parsedInfo) &&
|
|
44
|
+
if ((0, node_error_report_1.isRequestInfo)(this.parsedInfo) &&
|
|
44
45
|
this.parsedInfo.response &&
|
|
45
|
-
node_error_report_1.isInfraErrorData((_a = this.parsedInfo.response) === null || _a === void 0 ? void 0 : _a.data)) {
|
|
46
|
-
indexedLogs["error.server.code" /* ERROR_SERVER_CODE */] = this.parsedInfo.response.data.code;
|
|
47
|
-
indexedLogs["error.server.request_id" /* ERROR_SERVER_REQUEST_ID */] = this.parsedInfo.response.data.requestId;
|
|
46
|
+
(0, node_error_report_1.isInfraErrorData)((_a = this.parsedInfo.response) === null || _a === void 0 ? void 0 : _a.data)) {
|
|
47
|
+
indexedLogs["error.server.code" /* ErrorReportLogFields.ERROR_SERVER_CODE */] = this.parsedInfo.response.data.code;
|
|
48
|
+
indexedLogs["error.server.request_id" /* ErrorReportLogFields.ERROR_SERVER_REQUEST_ID */] = this.parsedInfo.response.data.requestId;
|
|
48
49
|
}
|
|
49
50
|
const serializableError = this.toObject();
|
|
50
51
|
span === null || span === void 0 ? void 0 : span.log({
|
|
51
52
|
event: 'error',
|
|
52
53
|
...indexedLogs,
|
|
53
|
-
["error.message" /* ERROR_MESSAGE */]: serializableError.message,
|
|
54
|
-
["error.metadata.metrics.InstantiationTime" /* ERROR_METADATA_METRICS_INSTANTIATION_TIME */]: (_b = serializableError.metadata) === null || _b === void 0 ? void 0 : _b.reportCount,
|
|
55
|
-
["error.metadata.reportCount" /* ERROR_METADATA_REPORT_COUNT */]: (_d = (_c = serializableError.metadata) === null || _c === void 0 ? void 0 : _c.metrics) === null || _d === void 0 ? void 0 : _d.instantiationTime,
|
|
56
|
-
["error.stack" /* ERROR_STACK */]: serializableError.stack,
|
|
57
|
-
["error.code" /* ERROR_CODE */]: serializableError.code,
|
|
54
|
+
["error.message" /* ErrorReportLogFields.ERROR_MESSAGE */]: serializableError.message,
|
|
55
|
+
["error.metadata.metrics.InstantiationTime" /* ErrorReportLogFields.ERROR_METADATA_METRICS_INSTANTIATION_TIME */]: (_b = serializableError.metadata) === null || _b === void 0 ? void 0 : _b.reportCount,
|
|
56
|
+
["error.metadata.reportCount" /* ErrorReportLogFields.ERROR_METADATA_REPORT_COUNT */]: (_d = (_c = serializableError.metadata) === null || _c === void 0 ? void 0 : _c.metrics) === null || _d === void 0 ? void 0 : _d.instantiationTime,
|
|
57
|
+
["error.stack" /* ErrorReportLogFields.ERROR_STACK */]: serializableError.stack,
|
|
58
|
+
["error.code" /* ErrorReportLogFields.ERROR_CODE */]: serializableError.code,
|
|
58
59
|
});
|
|
59
60
|
if (logger && this.shouldLogToSplunk(span)) {
|
|
60
61
|
logger.error(serializableError);
|
|
@@ -64,7 +65,7 @@ class ErrorReport extends node_error_report_1.ErrorReportBase {
|
|
|
64
65
|
}
|
|
65
66
|
shouldLogToSplunk(span) {
|
|
66
67
|
var _a;
|
|
67
|
-
return !this.isErrorReported() && ((_a = utils_1.getTraceInfo(span)) === null || _a === void 0 ? void 0 : _a.isSampled);
|
|
68
|
+
return !this.isErrorReported() && ((_a = (0, utils_1.getTraceInfo)(span)) === null || _a === void 0 ? void 0 : _a.isSampled);
|
|
68
69
|
}
|
|
69
70
|
}
|
|
70
71
|
exports.ErrorReport = ErrorReport;
|
package/lib/tracing/index.js
CHANGED
|
@@ -1,19 +1,20 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.FORMAT_HTTP_HEADERS = exports.Span = exports.getTraceInfo = exports.createTracingContextFromCarrier = exports.TracingTags = exports.SpanReferenceTypes = exports.createSpanReference = exports.ErrorReport = exports.ErrorKinds = void 0;
|
|
3
4
|
const opentracing_1 = require("opentracing");
|
|
4
|
-
exports
|
|
5
|
-
exports
|
|
5
|
+
Object.defineProperty(exports, "FORMAT_HTTP_HEADERS", { enumerable: true, get: function () { return opentracing_1.FORMAT_HTTP_HEADERS; } });
|
|
6
|
+
Object.defineProperty(exports, "Span", { enumerable: true, get: function () { return opentracing_1.Span; } });
|
|
6
7
|
var node_error_report_1 = require("@vtex/node-error-report");
|
|
7
|
-
exports
|
|
8
|
+
Object.defineProperty(exports, "ErrorKinds", { enumerable: true, get: function () { return node_error_report_1.ErrorKindsBase; } });
|
|
8
9
|
var ErrorReport_1 = require("./errorReporting/ErrorReport");
|
|
9
|
-
exports
|
|
10
|
+
Object.defineProperty(exports, "ErrorReport", { enumerable: true, get: function () { return ErrorReport_1.ErrorReport; } });
|
|
10
11
|
var createSpanReference_1 = require("./spanReference/createSpanReference");
|
|
11
|
-
exports
|
|
12
|
+
Object.defineProperty(exports, "createSpanReference", { enumerable: true, get: function () { return createSpanReference_1.createSpanReference; } });
|
|
12
13
|
var SpanReferenceTypes_1 = require("./spanReference/SpanReferenceTypes");
|
|
13
|
-
exports
|
|
14
|
+
Object.defineProperty(exports, "SpanReferenceTypes", { enumerable: true, get: function () { return SpanReferenceTypes_1.SpanReferenceTypes; } });
|
|
14
15
|
var Tags_1 = require("./Tags");
|
|
15
|
-
exports
|
|
16
|
+
Object.defineProperty(exports, "TracingTags", { enumerable: true, get: function () { return Tags_1.UserlandTags; } });
|
|
16
17
|
var UserLandTracer_1 = require("./UserLandTracer");
|
|
17
|
-
exports
|
|
18
|
+
Object.defineProperty(exports, "createTracingContextFromCarrier", { enumerable: true, get: function () { return UserLandTracer_1.createTracingContextFromCarrier; } });
|
|
18
19
|
var utils_1 = require("./utils");
|
|
19
|
-
exports
|
|
20
|
+
Object.defineProperty(exports, "getTraceInfo", { enumerable: true, get: function () { return utils_1.getTraceInfo; } });
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.createSpanReference = void 0;
|
|
3
4
|
const opentracing_1 = require("opentracing");
|
|
4
5
|
const SpanReferenceTypes_1 = require("./SpanReferenceTypes");
|
|
5
6
|
function createSpanReference(span, type) {
|
package/lib/tracing/utils.js
CHANGED
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.cloneAndSanitizeHeaders = exports.getTraceInfo = void 0;
|
|
3
4
|
const node_error_report_1 = require("@vtex/node-error-report");
|
|
4
5
|
function getTraceInfo(span) {
|
|
5
|
-
var _a, _b
|
|
6
|
+
var _a, _b;
|
|
6
7
|
const spanContext = span === null || span === void 0 ? void 0 : span.context();
|
|
7
8
|
return {
|
|
8
|
-
isSampled: (
|
|
9
|
+
isSampled: (_b = (_a = spanContext === null || spanContext === void 0 ? void 0 : spanContext.isSampled) === null || _a === void 0 ? void 0 : _a.call(spanContext)) !== null && _b !== void 0 ? _b : false,
|
|
9
10
|
traceId: spanContext === null || spanContext === void 0 ? void 0 : spanContext.toTraceId(),
|
|
10
11
|
};
|
|
11
12
|
}
|
|
@@ -16,7 +17,7 @@ exports.getTraceInfo = getTraceInfo;
|
|
|
16
17
|
* @param headersObj The headers object
|
|
17
18
|
* @param resultFieldsPrefix The prefix that will be added to each field on the result object
|
|
18
19
|
*/
|
|
19
|
-
|
|
20
|
+
const cloneAndSanitizeHeaders = (headersObj, resultFieldsPrefix = '') => {
|
|
20
21
|
const ret = {};
|
|
21
22
|
const entries = Object.entries(headersObj);
|
|
22
23
|
for (const [key, val] of entries) {
|
|
@@ -34,7 +35,8 @@ exports.cloneAndSanitizeHeaders = (headersObj, resultFieldsPrefix = '') => {
|
|
|
34
35
|
// },
|
|
35
36
|
// ```
|
|
36
37
|
// In those corner cases we probably won't have a sensitive string as key, so we don't treat them here
|
|
37
|
-
ret[`${resultFieldsPrefix}${key}`] = node_error_report_1.authFields.includes(key) ? node_error_report_1.sanitizeAuth(val) : val;
|
|
38
|
+
ret[`${resultFieldsPrefix}${key}`] = node_error_report_1.authFields.includes(key) ? (0, node_error_report_1.sanitizeAuth)(val) : val;
|
|
38
39
|
}
|
|
39
40
|
return ret;
|
|
40
41
|
};
|
|
42
|
+
exports.cloneAndSanitizeHeaders = cloneAndSanitizeHeaders;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Logger } from './../service/logger/logger';
|
|
2
2
|
import { ConflictsResolver, VBase } from '../clients/infra/VBase';
|
|
3
|
-
|
|
4
|
-
|
|
3
|
+
type Configuration = Record<string, ConfigurationData | ConfigurationData[] | object> | ConfigurationData[];
|
|
4
|
+
type ConfigurationData = Record<string, object>;
|
|
5
5
|
export declare class MineWinsConflictsResolver<T> implements ConflictsResolver<T> {
|
|
6
6
|
/***
|
|
7
7
|
* Take mine and merge with master keys that have no conflict
|
|
@@ -13,8 +13,8 @@ export declare class MineWinsConflictsResolver<T> implements ConflictsResolver<T
|
|
|
13
13
|
private comparableKeys;
|
|
14
14
|
constructor(client: VBase, bucket: string, filePath: string, comparableKeys?: string[]);
|
|
15
15
|
resolve(logger?: Logger): Promise<any>;
|
|
16
|
-
resolveAll(): Promise<
|
|
17
|
-
protected mergeMineWins(base: Configuration, master: Configuration, mine: Configuration):
|
|
16
|
+
resolveAll(): Promise<Configuration[]>;
|
|
17
|
+
protected mergeMineWins(base: Configuration, master: Configuration, mine: Configuration): Configuration;
|
|
18
18
|
private parseConflict;
|
|
19
19
|
private serializeContentByMimetype;
|
|
20
20
|
private parseContentByMimetype;
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.MineWinsConflictsResolver = void 0;
|
|
3
4
|
const js_base64_1 = require("js-base64");
|
|
4
5
|
const ramda_1 = require("ramda");
|
|
5
6
|
const util_1 = require("util");
|
|
@@ -39,10 +40,10 @@ class MineWinsConflictsResolver {
|
|
|
39
40
|
return resolvedConflicts;
|
|
40
41
|
}
|
|
41
42
|
mergeMineWins(base, master, mine) {
|
|
42
|
-
if (util_1.isArray(master)) {
|
|
43
|
+
if ((0, util_1.isArray)(master)) {
|
|
43
44
|
return this.mergeMineWinsArray((base || []), master, (mine || []));
|
|
44
45
|
}
|
|
45
|
-
else if (util_1.isObject(master)) {
|
|
46
|
+
else if ((0, util_1.isObject)(master)) {
|
|
46
47
|
return this.mergeMineWinsObject((base || {}), master, (mine || {}));
|
|
47
48
|
}
|
|
48
49
|
return mine ? mine : master;
|
|
@@ -84,16 +85,16 @@ class MineWinsConflictsResolver {
|
|
|
84
85
|
mergeMineWinsObject(base, master, mine) {
|
|
85
86
|
const merged = { ...master, ...mine };
|
|
86
87
|
Object.entries(merged).forEach(([key, value]) => {
|
|
87
|
-
if (master[key] == null && base && base[key] != null && ramda_1.equals(value, base[key])) {
|
|
88
|
+
if (master[key] == null && base && base[key] != null && (0, ramda_1.equals)(value, base[key])) {
|
|
88
89
|
delete merged[key]; // value deleted from master with no conflict
|
|
89
90
|
}
|
|
90
91
|
else if (base[key] && master[key] && !mine[key]) {
|
|
91
92
|
delete merged[key]; // value deleted from mine
|
|
92
93
|
}
|
|
93
|
-
else if (util_1.isArray(value)) {
|
|
94
|
+
else if ((0, util_1.isArray)(value)) {
|
|
94
95
|
merged[key] = this.mergeMineWinsArray((base[key] || []), (master[key] || []), value);
|
|
95
96
|
}
|
|
96
|
-
else if (util_1.isObject(value)) {
|
|
97
|
+
else if ((0, util_1.isObject)(value)) {
|
|
97
98
|
merged[key] = this.mergeMineWins((base[key] || {}), (master[key] || {}), (value || {}));
|
|
98
99
|
}
|
|
99
100
|
});
|
|
@@ -108,7 +109,7 @@ class MineWinsConflictsResolver {
|
|
|
108
109
|
base.forEach((baseItem) => {
|
|
109
110
|
const foundInMaster = this.isObjectInArray(baseItem, master);
|
|
110
111
|
if (!foundInMaster) {
|
|
111
|
-
const foundInMine = mine.findIndex((mineItem) => ramda_1.equals(mineItem, baseItem));
|
|
112
|
+
const foundInMine = mine.findIndex((mineItem) => (0, ramda_1.equals)(mineItem, baseItem));
|
|
112
113
|
if (foundInMine > -1) {
|
|
113
114
|
mine.splice(foundInMine, 1);
|
|
114
115
|
}
|
|
@@ -116,7 +117,7 @@ class MineWinsConflictsResolver {
|
|
|
116
117
|
});
|
|
117
118
|
}
|
|
118
119
|
isObjectInArray(obj, array) {
|
|
119
|
-
return array.find((item) => ramda_1.equals(item, obj));
|
|
120
|
+
return array.find((item) => (0, ramda_1.equals)(item, obj));
|
|
120
121
|
}
|
|
121
122
|
appendMasterAddedElements(base, master, mine) {
|
|
122
123
|
master.forEach((item) => {
|
|
@@ -127,10 +128,10 @@ class MineWinsConflictsResolver {
|
|
|
127
128
|
}
|
|
128
129
|
shouldAddToMine(item, base, mine) {
|
|
129
130
|
if (this.comparableKeys && Object.keys(item).some((key) => this.comparableKeys.includes(key))) {
|
|
130
|
-
return (!mine.some((mineItem) => this.comparableKeys.some((key) => ramda_1.eqProps(key, item, mineItem))) &&
|
|
131
|
-
!base.some((baseItem) => ramda_1.equals(baseItem, item)));
|
|
131
|
+
return (!mine.some((mineItem) => this.comparableKeys.some((key) => (0, ramda_1.eqProps)(key, item, mineItem))) &&
|
|
132
|
+
!base.some((baseItem) => (0, ramda_1.equals)(baseItem, item)));
|
|
132
133
|
}
|
|
133
|
-
return !mine.some((mineItem) => ramda_1.equals(mineItem, item)) && !base.some((baseItem) => ramda_1.equals(baseItem, item));
|
|
134
|
+
return !mine.some((mineItem) => (0, ramda_1.equals)(mineItem, item)) && !base.some((baseItem) => (0, ramda_1.equals)(baseItem, item));
|
|
134
135
|
}
|
|
135
136
|
}
|
|
136
137
|
exports.MineWinsConflictsResolver = MineWinsConflictsResolver;
|
package/lib/utils/app.js
CHANGED
|
@@ -3,46 +3,63 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.majorEqualAndGreaterThan = exports.sameMajor = exports.isValidAppIdOrLocator = exports.appIdToAppAtMajor = exports.formatMajorLocator = exports.versionToMajorRange = exports.versionToMajor = exports.satisfies = exports.formatAppId = exports.parseAppId = exports.isLinkedApp = exports.formatLocator = exports.transformToLinkedLocator = exports.extractVersionFromAppId = exports.removeVersionFromAppId = exports.removeBuild = void 0;
|
|
6
7
|
const semver_1 = __importDefault(require("semver"));
|
|
7
8
|
// Note: The name that composes the part of the appId that precedes the
|
|
8
9
|
// character '@' includes the name given to the app and the vendor name.
|
|
9
|
-
|
|
10
|
-
exports.
|
|
11
|
-
|
|
12
|
-
exports.
|
|
13
|
-
|
|
14
|
-
exports.
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
10
|
+
const removeBuild = (id) => id.split('+')[0];
|
|
11
|
+
exports.removeBuild = removeBuild;
|
|
12
|
+
const removeVersionFromAppId = (appId) => appId.split('@')[0];
|
|
13
|
+
exports.removeVersionFromAppId = removeVersionFromAppId;
|
|
14
|
+
const extractVersionFromAppId = (appId) => appId.split('@').slice(-1)[0];
|
|
15
|
+
exports.extractVersionFromAppId = extractVersionFromAppId;
|
|
16
|
+
const transformToLinkedLocator = (appId) => appId.replace(/\+build.*$/, '+linked');
|
|
17
|
+
exports.transformToLinkedLocator = transformToLinkedLocator;
|
|
18
|
+
const formatLocator = (name, versionAndBuild) => `${name}@${(0, exports.removeBuild)(versionAndBuild)}`;
|
|
19
|
+
exports.formatLocator = formatLocator;
|
|
20
|
+
const isLinkedApp = (app) => app.id.includes('+build');
|
|
21
|
+
exports.isLinkedApp = isLinkedApp;
|
|
22
|
+
const parseAppId = (appId) => {
|
|
23
|
+
const name = (0, exports.removeVersionFromAppId)(appId);
|
|
24
|
+
const version = (0, exports.extractVersionFromAppId)(appId);
|
|
18
25
|
const splittedVersion = version.split('+');
|
|
19
26
|
return {
|
|
20
27
|
build: splittedVersion[1],
|
|
21
|
-
locator: exports.formatLocator(name, version),
|
|
28
|
+
locator: (0, exports.formatLocator)(name, version),
|
|
22
29
|
name,
|
|
23
30
|
version: splittedVersion[0],
|
|
24
31
|
};
|
|
25
32
|
};
|
|
26
|
-
exports.
|
|
27
|
-
|
|
28
|
-
|
|
33
|
+
exports.parseAppId = parseAppId;
|
|
34
|
+
const formatAppId = ({ locator, build }) => (build ? `${locator}+${build}` : locator);
|
|
35
|
+
exports.formatAppId = formatAppId;
|
|
36
|
+
const satisfies = (appId, version) => {
|
|
37
|
+
const { version: appVer } = (0, exports.parseAppId)(appId);
|
|
29
38
|
return semver_1.default.satisfies(appVer, version);
|
|
30
39
|
};
|
|
31
|
-
exports.
|
|
32
|
-
|
|
33
|
-
exports.
|
|
34
|
-
|
|
40
|
+
exports.satisfies = satisfies;
|
|
41
|
+
const versionToMajor = (version) => version.split('.')[0];
|
|
42
|
+
exports.versionToMajor = versionToMajor;
|
|
43
|
+
const versionToMajorRange = (version) => `${(0, exports.versionToMajor)(version)}.x`;
|
|
44
|
+
exports.versionToMajorRange = versionToMajorRange;
|
|
45
|
+
const formatMajorLocator = (name, version) => {
|
|
46
|
+
const majorRange = (0, exports.versionToMajorRange)(version);
|
|
35
47
|
return `${name}@${majorRange}`;
|
|
36
48
|
};
|
|
37
|
-
exports.
|
|
38
|
-
|
|
39
|
-
const
|
|
49
|
+
exports.formatMajorLocator = formatMajorLocator;
|
|
50
|
+
const appIdToAppAtMajor = (appId) => {
|
|
51
|
+
const { name, version } = (0, exports.parseAppId)(appId);
|
|
52
|
+
const majorRange = (0, exports.versionToMajorRange)(version);
|
|
40
53
|
return `${name}@${majorRange}`;
|
|
41
54
|
};
|
|
55
|
+
exports.appIdToAppAtMajor = appIdToAppAtMajor;
|
|
42
56
|
// SemVer regex from https://github.com/sindresorhus/semver-regex
|
|
43
57
|
const APP_ID_REGEX = /^[\w\-]+\.[\w\-]+@(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)(?:-[\da-z\-]+(?:\.[\da-z\-]+)*)?(?:\+[\da-z\-]+(?:\.[\da-z\-]+)*)?$/;
|
|
44
|
-
|
|
58
|
+
const isValidAppIdOrLocator = (appId) => {
|
|
45
59
|
return APP_ID_REGEX.test(appId);
|
|
46
60
|
};
|
|
47
|
-
exports.
|
|
48
|
-
|
|
61
|
+
exports.isValidAppIdOrLocator = isValidAppIdOrLocator;
|
|
62
|
+
const sameMajor = (v1, v2) => (0, exports.versionToMajor)(v1) === (0, exports.versionToMajor)(v2);
|
|
63
|
+
exports.sameMajor = sameMajor;
|
|
64
|
+
const majorEqualAndGreaterThan = (v1, v2) => (0, exports.sameMajor)(v1, v2) && semver_1.default.gt(v1, v2);
|
|
65
|
+
exports.majorEqualAndGreaterThan = majorEqualAndGreaterThan;
|
|
@@ -1,28 +1,46 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var
|
|
3
|
-
|
|
4
|
-
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
5
18
|
var __importStar = (this && this.__importStar) || function (mod) {
|
|
6
19
|
if (mod && mod.__esModule) return mod;
|
|
7
20
|
var result = {};
|
|
8
|
-
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result
|
|
9
|
-
result
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
10
23
|
return result;
|
|
11
24
|
};
|
|
25
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
|
+
};
|
|
12
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
+
exports.getFallbackFile = exports.saveVersion = exports.updateMetaInfoCache = exports.getMetaInfoKey = void 0;
|
|
13
30
|
const crypto_1 = __importDefault(require("crypto"));
|
|
14
31
|
const ramda_1 = require("ramda");
|
|
15
32
|
const semver = __importStar(require("semver"));
|
|
16
|
-
|
|
33
|
+
const getMetaInfoKey = (account, workspace) => `${account}-${workspace}-meta-infos`;
|
|
34
|
+
exports.getMetaInfoKey = getMetaInfoKey;
|
|
17
35
|
const hashMD5 = (text) => crypto_1.default
|
|
18
36
|
.createHash('md5')
|
|
19
37
|
.update(text)
|
|
20
38
|
.digest('hex');
|
|
21
|
-
|
|
39
|
+
const updateMetaInfoCache = async (cacheStorage, account, workspace, dependencies, logger) => {
|
|
22
40
|
if (workspace !== 'master') {
|
|
23
41
|
return;
|
|
24
42
|
}
|
|
25
|
-
const key = exports.getMetaInfoKey(account, workspace);
|
|
43
|
+
const key = (0, exports.getMetaInfoKey)(account, workspace);
|
|
26
44
|
const hash = hashMD5(dependencies.toString());
|
|
27
45
|
try {
|
|
28
46
|
const storedDependencies = await cacheStorage.get(key) || '';
|
|
@@ -35,10 +53,11 @@ exports.updateMetaInfoCache = async (cacheStorage, account, workspace, dependenc
|
|
|
35
53
|
}
|
|
36
54
|
return;
|
|
37
55
|
};
|
|
56
|
+
exports.updateMetaInfoCache = updateMetaInfoCache;
|
|
38
57
|
const getFallbackKey = (appName, major) => `${appName}@${major}`;
|
|
39
|
-
|
|
58
|
+
const saveVersion = async (app, cacheStorage) => {
|
|
40
59
|
const [appName, version] = app.split('@');
|
|
41
|
-
const major = ramda_1.head(version.split('.')) || '';
|
|
60
|
+
const major = (0, ramda_1.head)(version.split('.')) || '';
|
|
42
61
|
const fallbackKey = getFallbackKey(appName, major);
|
|
43
62
|
if (cacheStorage.has(fallbackKey)) {
|
|
44
63
|
const savedVersion = await cacheStorage.get(fallbackKey);
|
|
@@ -50,9 +69,10 @@ exports.saveVersion = async (app, cacheStorage) => {
|
|
|
50
69
|
await cacheStorage.set(fallbackKey, version);
|
|
51
70
|
}
|
|
52
71
|
};
|
|
53
|
-
exports.
|
|
72
|
+
exports.saveVersion = saveVersion;
|
|
73
|
+
const getFallbackFile = async (app, path, cacheStorage, apps) => {
|
|
54
74
|
const [appName, version] = app.split('@');
|
|
55
|
-
const major = ramda_1.head(version.split('.')) || '';
|
|
75
|
+
const major = (0, ramda_1.head)(version.split('.')) || '';
|
|
56
76
|
const fallbackKey = getFallbackKey(appName, major);
|
|
57
77
|
const fallbackVersion = await cacheStorage.get(fallbackKey);
|
|
58
78
|
if (fallbackVersion) {
|
|
@@ -61,3 +81,4 @@ exports.getFallbackFile = async (app, path, cacheStorage, apps) => {
|
|
|
61
81
|
}
|
|
62
82
|
throw Error('Fallback version was not found');
|
|
63
83
|
};
|
|
84
|
+
exports.getFallbackFile = getFallbackFile;
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.BILLING_TYPE = exports.isFreeBillingOptions = void 0;
|
|
4
|
+
const isFreeBillingOptions = (billingOptions) => billingOptions.type === BILLING_TYPE.FREE;
|
|
5
|
+
exports.isFreeBillingOptions = isFreeBillingOptions;
|
|
4
6
|
var BILLING_TYPE;
|
|
5
7
|
(function (BILLING_TYPE) {
|
|
6
8
|
BILLING_TYPE["FREE"] = "free";
|
package/lib/utils/binding.js
CHANGED
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.parseBindingHeaderValue = exports.formatBindingHeaderValue = void 0;
|
|
3
4
|
var BindingHeaderFormat;
|
|
4
5
|
(function (BindingHeaderFormat) {
|
|
5
6
|
BindingHeaderFormat["webframework0"] = "v0+webframework";
|
|
6
7
|
BindingHeaderFormat["kuberouter0"] = "v0+kuberouter";
|
|
7
8
|
})(BindingHeaderFormat || (BindingHeaderFormat = {}));
|
|
8
|
-
|
|
9
|
+
const formatBindingHeaderValue = (binding, format = BindingHeaderFormat.webframework0) => {
|
|
9
10
|
if (format === BindingHeaderFormat.webframework0) {
|
|
10
11
|
const jsonString = JSON.stringify(binding);
|
|
11
12
|
return Buffer.from(jsonString, 'utf8').toString('base64');
|
|
@@ -21,7 +22,8 @@ exports.formatBindingHeaderValue = (binding, format = BindingHeaderFormat.webfra
|
|
|
21
22
|
}
|
|
22
23
|
throw new Error(`Unkown binding format: ${format}`);
|
|
23
24
|
};
|
|
24
|
-
exports.
|
|
25
|
+
exports.formatBindingHeaderValue = formatBindingHeaderValue;
|
|
26
|
+
const parseBindingHeaderValue = (value) => {
|
|
25
27
|
if (value[0] === '0' && value[1] === ',') {
|
|
26
28
|
// v0+kuberouter
|
|
27
29
|
const [, id, rootPath, locale, currency] = value.split(',');
|
|
@@ -36,3 +38,4 @@ exports.parseBindingHeaderValue = (value) => {
|
|
|
36
38
|
const jsonString = Buffer.from(value, 'base64').toString('utf8');
|
|
37
39
|
return JSON.parse(jsonString);
|
|
38
40
|
};
|
|
41
|
+
exports.parseBindingHeaderValue = parseBindingHeaderValue;
|
package/lib/utils/cancel.js
CHANGED
package/lib/utils/domain.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.PUBLIC_DOMAINS = void 0;
|
|
3
4
|
const ramda_1 = require("ramda");
|
|
4
5
|
const VTEX_PUBLIC_ENDPOINT = process.env.VTEX_PUBLIC_ENDPOINT || 'myvtex.com';
|
|
5
|
-
exports.PUBLIC_DOMAINS = ramda_1.uniq([VTEX_PUBLIC_ENDPOINT, 'myvtex.com', 'mygocommerce.com', 'vtexsmb.com']);
|
|
6
|
+
exports.PUBLIC_DOMAINS = (0, ramda_1.uniq)([VTEX_PUBLIC_ENDPOINT, 'myvtex.com', 'mygocommerce.com', 'vtexsmb.com']);
|
package/lib/utils/error.js
CHANGED
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.cleanError = exports.SENSITIVE_EXCEPTION_FIELDS = exports.PICKED_AXIOS_PROPS = void 0;
|
|
3
4
|
// Inspired by https://github.com/sindresorhus/serialize-error
|
|
4
5
|
const ramda_1 = require("ramda");
|
|
5
6
|
exports.PICKED_AXIOS_PROPS = ['baseURL', 'cacheable', 'data', 'finished', 'headers', 'method', 'timeout', 'status', 'path', 'url', 'metric', 'inflightKey', 'forceMaxAge', 'params', 'responseType'];
|
|
6
7
|
exports.SENSITIVE_EXCEPTION_FIELDS = ['config', 'request', 'stack'];
|
|
7
8
|
const MAX_ERROR_STRING_LENGTH = process.env.MAX_ERROR_STRING_LENGTH ? parseInt(process.env.MAX_ERROR_STRING_LENGTH, 10) : 8 * 1024;
|
|
8
|
-
const findCaseInsensitive = (target, set) => ramda_1.find(t => t.toLocaleLowerCase() === target, set);
|
|
9
|
+
const findCaseInsensitive = (target, set) => (0, ramda_1.find)(t => t.toLocaleLowerCase() === target, set);
|
|
9
10
|
const destroyCircular = (from, seen) => {
|
|
10
11
|
const to = Array.isArray(from) ? [] : {};
|
|
11
12
|
seen.push(from);
|
|
@@ -52,10 +53,10 @@ const destroyCircular = (from, seen) => {
|
|
|
52
53
|
];
|
|
53
54
|
for (const property of axiosProperties) {
|
|
54
55
|
if (to[property] != null && typeof to[property] === 'object') {
|
|
55
|
-
to[property] = ramda_1.pick(exports.PICKED_AXIOS_PROPS, to[property]);
|
|
56
|
+
to[property] = (0, ramda_1.pick)(exports.PICKED_AXIOS_PROPS, to[property]);
|
|
56
57
|
const headers = to[property] && to[property].headers;
|
|
57
58
|
if (headers) {
|
|
58
|
-
const headerNames = ramda_1.keys(headers);
|
|
59
|
+
const headerNames = (0, ramda_1.keys)(headers);
|
|
59
60
|
const authorization = findCaseInsensitive('authorization', headerNames);
|
|
60
61
|
if (!!authorization) {
|
|
61
62
|
delete headers[authorization];
|
|
@@ -81,7 +82,7 @@ const destroyCircular = (from, seen) => {
|
|
|
81
82
|
*
|
|
82
83
|
* @param value an Error instance
|
|
83
84
|
*/
|
|
84
|
-
|
|
85
|
+
const cleanError = (value) => {
|
|
85
86
|
if (typeof value === 'object') {
|
|
86
87
|
return destroyCircular(value, []);
|
|
87
88
|
}
|
|
@@ -92,3 +93,4 @@ exports.cleanError = (value) => {
|
|
|
92
93
|
}
|
|
93
94
|
return value;
|
|
94
95
|
};
|
|
96
|
+
exports.cleanError = cleanError;
|
package/lib/utils/index.js
CHANGED
|
@@ -1,14 +1,25 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
function
|
|
3
|
-
|
|
4
|
-
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
|
+
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
|
+
};
|
|
5
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
17
|
+
__exportStar(require("./app"), exports);
|
|
18
|
+
__exportStar(require("./error"), exports);
|
|
19
|
+
__exportStar(require("./retry"), exports);
|
|
20
|
+
__exportStar(require("./time"), exports);
|
|
21
|
+
__exportStar(require("./billingOptions"), exports);
|
|
22
|
+
__exportStar(require("./domain"), exports);
|
|
23
|
+
__exportStar(require("./tenant"), exports);
|
|
24
|
+
__exportStar(require("./binding"), exports);
|
|
25
|
+
__exportStar(require("./MineWinsConflictsResolver"), exports);
|
package/lib/utils/json.js
CHANGED
package/lib/utils/log.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.cleanLog = void 0;
|
|
3
4
|
const json_1 = require("./json");
|
|
4
5
|
const SENSITIVE_FIELDS = [
|
|
5
6
|
'auth',
|
|
@@ -15,6 +16,7 @@ const SENSITIVE_FIELDS = [
|
|
|
15
16
|
'x-vtex-credential',
|
|
16
17
|
'x-vtex-session',
|
|
17
18
|
];
|
|
18
|
-
|
|
19
|
-
return json_1.cleanJson(log, SENSITIVE_FIELDS);
|
|
19
|
+
const cleanLog = (log) => {
|
|
20
|
+
return (0, json_1.cleanJson)(log, SENSITIVE_FIELDS);
|
|
20
21
|
};
|
|
22
|
+
exports.cleanLog = cleanLog;
|
package/lib/utils/message.js
CHANGED
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.removeProviderFromId = exports.parseIOMessageId = exports.providerFromMessage = exports.PROVIDER_SPACER = void 0;
|
|
3
4
|
exports.PROVIDER_SPACER = '::';
|
|
4
|
-
|
|
5
|
-
const { provider } = exports.parseIOMessageId(message);
|
|
5
|
+
const providerFromMessage = (message) => {
|
|
6
|
+
const { provider } = (0, exports.parseIOMessageId)(message);
|
|
6
7
|
return provider || 'unknown';
|
|
7
8
|
};
|
|
8
|
-
exports.
|
|
9
|
+
exports.providerFromMessage = providerFromMessage;
|
|
10
|
+
const parseIOMessageId = ({ id }) => {
|
|
9
11
|
const splitted = id.split(exports.PROVIDER_SPACER);
|
|
10
12
|
if (splitted.length === 2) {
|
|
11
13
|
return {
|
|
@@ -17,7 +19,9 @@ exports.parseIOMessageId = ({ id }) => {
|
|
|
17
19
|
locator: splitted[0],
|
|
18
20
|
};
|
|
19
21
|
};
|
|
20
|
-
exports.
|
|
22
|
+
exports.parseIOMessageId = parseIOMessageId;
|
|
23
|
+
const removeProviderFromId = (message) => ({
|
|
21
24
|
...message,
|
|
22
|
-
id: exports.parseIOMessageId(message).locator,
|
|
25
|
+
id: (0, exports.parseIOMessageId)(message).locator,
|
|
23
26
|
});
|
|
27
|
+
exports.removeProviderFromId = removeProviderFromId;
|
package/lib/utils/renameBy.js
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.renameBy = void 0;
|
|
3
4
|
const ramda_1 = require("ramda");
|
|
4
|
-
|
|
5
|
+
const renameBy = (fn, obj) => (0, ramda_1.compose)(ramda_1.fromPairs, (0, ramda_1.map)(([key, val]) => [fn(key), val]), ramda_1.toPairs)(obj);
|
|
6
|
+
exports.renameBy = renameBy;
|