@nxtedition/lib 19.5.6 → 19.6.0

package/app.js

@@ -5,7 +5,7 @@ import stream from 'node:stream'
 import { Buffer } from 'node:buffer'
 import { getDockerSecretsSync } from './docker-secrets.js'
 import fp from 'lodash/fp.js'
-import { isMainThread, parentPort } from 'node:worker_threads'
+import { isMainThread, parentPort, threadId } from 'node:worker_threads'
 import toobusy from 'toobusy-js'
 import deepstream from '@nxtedition/deepstream.io-client-js'
 import { createLogger } from './logger.js'
@@ -108,6 +108,7 @@ export function makeApp(appConfig, onTerminate) {
   const serviceName = appConfig.name
   const serviceModule = appConfig.module ?? 'main'
   const serviceVersion = appConfig.version
+  const serviceWorkerId = appConfig.workerId ?? threadId
   const serviceInstanceId =
     // process.env.name is the pm2 name of the process
     appConfig.instanceId ?? appConfig.containerId ?? process.env.name ?? os.hostname()
@@ -117,7 +118,7 @@ export function makeApp(appConfig, onTerminate) {
     (serviceName &&
       `${serviceName}/${
         serviceVersion || '*'
-      } (module:${serviceModule}; instance:${serviceInstanceId}) Node/${process.version}`) ??
+      } (module:${serviceModule}; instance:${serviceInstanceId}) worker:${serviceWorkerId} Node/${process.version}`) ??
     null)
 
   {
@@ -741,6 +742,7 @@ export function makeApp(appConfig, onTerminate) {
     serviceModule,
     serviceVersion,
     serviceInstanceId,
+    serviceWorkerId,
     signal: ac.signal,
   }
 }

package/couch.js

@@ -179,7 +179,7 @@ export function makeCouch(opts) {
     if (options.heartbeat != null) {
       params.heartbeat = Number(options.heartbeat)
     } else {
-      params.heartbeat = 10e3
+      params.heartbeat = 60e3
     }
 
     if (options.timeout != null) {
@@ -252,7 +252,7 @@ export function makeCouch(opts) {
               'request-id': genReqId(),
               ...(body ? { 'content-type': 'application/json' } : {}),
             },
-            bodyTimeout: live ? 2 * (params.heartbeat || 60e3) : 2 * 60e3,
+            bodyTimeout: 2 * (params.heartbeat || 60e3),
           }
 
           const ures = await client.request(ureq)

package/http.js

@@ -81,6 +81,7 @@ export async function request(ctx, next) {
           // 'end' or 'error' will always be emitted.
           .on('close', function () {
             resolve(null)
+            ac.abort()
           })
       }),
     ])
@@ -159,8 +160,6 @@ export async function request(ctx, next) {
         res.destroy()
       }
     }
-
-    ac.abort(err)
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "19.5.6",
+  "version": "19.6.0",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",