@nxtedition/lib 19.6.3 → 19.7.1

package/app.js

@@ -1,3 +1,4 @@
+import * as inspector from 'node:inspector'
 import os from 'node:os'
 import net from 'node:net'
 import assert from 'node:assert'
@@ -21,6 +22,7 @@ import hashString from './hash.js'
 import { makeTrace } from './trace.js'
 import compose from 'koa-compose'
 import { createServer } from './http.js'
+import { json } from 'node:stream/consumers'
 
 export function makeApp(appConfig, onTerminate) {
   let ds
@@ -276,7 +278,7 @@ export function makeApp(appConfig, onTerminate) {
       dsConfig.credentials.username ||
       dsConfig.credentials.userName ||
       dsConfig.credentials.user ||
-      serviceName
+      `_${serviceName}`
 
     dsConfig = {
       maxReconnectAttempts: Infinity,
@@ -678,6 +680,40 @@ export function makeApp(appConfig, onTerminate) {
     }
   }
 
+  const inspectBC = new BroadcastChannel('nxt:inspect')
+  const inspectSet = new Set()
+
+  if (serviceWorkerId) {
+    inspectBC.onmessage = ({ data }) => {
+      const { type } = data
+
+      if (type === 'inspect:open') {
+        // TODO (fix): What happens if you call inspect:open multiple times?
+        inspector.open(data.port, data.hostname)
+      } else if (type === 'inspect:close') {
+        inspector.close()
+      }
+    }
+
+    inspectBC.postMessage({ type: 'inspect:register', id: serviceWorkerId })
+    destroyers.push(() => {
+      inspector.close()
+      inspectBC.postMessage({ type: 'inspect:unregister', id: serviceWorkerId })
+    })
+  } else {
+    inspectBC.onmessage = ({ data }) => {
+      const { type } = data
+
+      if (type === 'inspect:register') {
+        inspectSet.add(data.id)
+      } else if (type === 'inspect:unregister') {
+        inspectSet.delete(data.id)
+      }
+    }
+  }
+
+  destroyers.push(() => inspectBC.close())
+
   if (appConfig.http) {
     const httpConfig = { ...appConfig.http, ...config.http }
 
@@ -700,6 +736,36 @@ export function makeApp(appConfig, onTerminate) {
               return next()
             }
           },
+          async ({ req, res }, next) => {
+            if (req.url.startsWith('/inspect')) {
+              if (req.method === 'GET') {
+                res.end(JSON.stringify({ workers: Array.from(inspectSet).map((id) => ({ id })) }))
+              } else if (req.method === 'POST') {
+                const m = req.url.match(/^\/inspect\/([^/]+)/)
+                if (!m) {
+                  res.statusCode = 404
+                  res.end()
+                } else {
+                  const { port, hostname } = await json(req)
+
+                  // TODO (fix): What about return value & errors?
+                  inspectBC.postMessage({
+                    type: port || hostname ? 'inspect:open' : 'inspect:close',
+                    id: m[1],
+                    port,
+                    hostname,
+                  })
+
+                  res.end()
+                }
+              } else {
+                res.statusCode = 405
+                res.end()
+              }
+            } else {
+              return next()
+            }
+          },
           appConfig.http.request
             ? appConfig.http.request
             : typeof appConfig.http === 'function'

package/couch.js

@@ -1151,6 +1151,8 @@ export function request(
     stream,
   },
 ) {
+  signal?.throwIfAborted()
+
   url = new URL(url)
   if (url.search) {
     throw new Error('invalid url: ' + url.href)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "19.6.3",
+  "version": "19.7.1",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",
@@ -17,6 +17,7 @@
     "merge-ranges.js",
     "http.js",
     "s3.js",
+    "time.js",
     "deepstream.js",
     "sequence.js",
     "logger.js",

package/time.js

@@ -0,0 +1,32 @@
+export function isTimeBetween(date, startTime, endTime) {
+  const currentHours = date.getHours()
+  const currentMinutes = date.getMinutes()
+
+  let [startHours, startMinutes] = startTime?.split(':').map(Number) ?? [null, 0]
+  let [endHours, endMinutes] = endTime?.split(':').map(Number) ?? [null, 0]
+
+  if (startHours == null) {
+    startHours = -Number.MAX_SAFE_INTEGER
+  }
+
+  if (endHours == null) {
+    endHours = Number.MAX_SAFE_INTEGER
+  }
+
+  if (startHours < endHours || (startHours === endHours && startMinutes <= endMinutes)) {
+    // The time range is within the same day
+    return (currentHours > startHours ||
+      (currentHours === startHours && currentMinutes >= startMinutes)) &&
+      (currentHours < endHours || (currentHours === endHours && currentMinutes <= endMinutes))
+      ? { currentHours, currentMinutes, startHours, startMinutes, endHours, endMinutes }
+      : null
+  } else {
+    // The time range spans across two days
+    return currentHours > startHours ||
+      (currentHours === startHours && currentMinutes >= startMinutes) ||
+      currentHours < endHours ||
+      (currentHours === endHours && currentMinutes <= endMinutes)
+      ? { currentHours, currentMinutes, startHours, startMinutes, endHours, endMinutes }
+      : null
+  }
+}

package/trace.js

@@ -68,14 +68,18 @@ export function makeTrace({
   const prefix = `{ "create": { "_index": "trace-${index}" } }\n{ "serviceName": "${serviceName}", "op": "`
 
   function trace(obj, op) {
-    if (obj.serviceName) {
-      throw new Error('invalid property `serviceName`')
-    }
-    if (obj.op) {
-      throw new Error('invalid property `op`')
-    }
-    if (obj['@timestamp']) {
-      throw new Error('invalid property `@timestamp`')
+    if (typeof obj === 'string') {
+      // Do nothing...
+    } else {
+      if (obj.serviceName) {
+        throw new Error('invalid property `serviceName`')
+      }
+      if (obj.op) {
+        throw new Error('invalid property `op`')
+      }
+      if (obj['@timestamp']) {
+        throw new Error('invalid property `@timestamp`')
+      }
     }
 
     if (pending > limit) {