@vtex/api 7.4.1-beta.1 → 7.4.1

package/lib/service/master.js

@@ -23,10 +23,9 @@ const onMessage = (worker, message) => {
     else if ((0, clusterMetricsAggregator_1.isAggMetricsRequest)(message)) {
         (0, clusterMetricsAggregator_1.handleWorkerMetricsRequest)(worker, message);
     }
-    else if ((0, clusterMetricsAggregator_1.isPromClientMessage)(message)) {
-        // Handled by prom-client's own cluster listener; ignore here.
-    }
-    else {
+    else if (!(0, clusterMetricsAggregator_1.isPromClientMessage)(message)) {
+        // prom-client's own cluster messages are handled by its cluster listener;
+        // anything else that reaches here is genuinely unexpected.
         listeners_1.logger.warn({
             content: message,
             message: 'Worker sent message',

package/lib/service/metrics/clusterMetricsAggregator.js

@@ -64,14 +64,30 @@ exports.initMasterAggregatorRegistry = initMasterAggregatorRegistry;
  * merged sources and is never double-counted.
  */
 const handleWorkerMetricsRequest = async (worker, message) => {
-    var _a;
+    var _a, _b;
     const aggregator = (0, exports.initMasterAggregatorRegistry)();
+    let response;
     try {
         const body = await aggregator.clusterMetrics();
-        worker.send({ type: exports.AGG_METRICS_RES, id: message.id, body });
+        response = { type: exports.AGG_METRICS_RES, id: message.id, body };
     }
     catch (err) {
-        worker.send({ type: exports.AGG_METRICS_RES, id: message.id, error: (_a = err === null || err === void 0 ? void 0 : err.message) !== null && _a !== void 0 ? _a : String(err) });
+        response = { type: exports.AGG_METRICS_RES, id: message.id, error: (_a = err === null || err === void 0 ? void 0 : err.message) !== null && _a !== void 0 ? _a : String(err) };
+    }
+    // `worker.send` can throw (e.g. the worker disconnected between the request
+    // and the reply). This handler is invoked without `await` from the master's
+    // message listener, so a thrown send would surface as an unhandled rejection
+    // in the master process. Swallow and log it instead.
+    try {
+        worker.send(response);
+    }
+    catch (err) {
+        listeners_1.logger.warn({
+            content: (_b = err === null || err === void 0 ? void 0 : err.message) !== null && _b !== void 0 ? _b : String(err),
+            message: 'Failed to send aggregated cluster metrics to worker',
+            pid: process.pid,
+            workerId: worker.id,
+        });
     }
 };
 exports.handleWorkerMetricsRequest = handleWorkerMetricsRequest;

package/lib/service/worker/index.js

@@ -59,10 +59,9 @@ const onMessage = (service) => (message) => {
     else if ((0, clusterMetricsAggregator_1.isAggMetricsResponse)(message)) {
         (0, clusterMetricsAggregator_1.handleMasterMetricsResponse)(message);
     }
-    else if ((0, clusterMetricsAggregator_1.isPromClientMessage)(message)) {
-        // Handled by prom-client's own worker listener; ignore here.
-    }
-    else {
+    else if (!(0, clusterMetricsAggregator_1.isPromClientMessage)(message)) {
+        // prom-client's own cluster messages are handled by its worker listener;
+        // anything else that reaches here is genuinely unexpected.
         listeners_1.logger.warn({
             content: message,
             message: 'Master sent message',
@@ -195,8 +194,7 @@ const startWorker = (serviceJSON) => {
         appGraphQLHandlers,
         runtimeHttpHandlers,
     ]
-        .filter(x => x != null)
-        // TODO: Fix ramda typings. Apparently there was an update that broke things
+        .filter((x) => x != null)
         .reduce((acc, handler) => (0, ramda_1.mergeDeepRight)(acc, handler), {});
     if (httpHandlers === null || httpHandlers === void 0 ? void 0 : httpHandlers.pub) {
         const publicHandlersRouter = (0, router_2.routerFromPublicHttpHandlers)(httpHandlers.pub);

package/package.json

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