@nxtedition/lib 28.0.29 → 28.0.31

package/app.js

@@ -63,11 +63,12 @@ export function makeApp(appConfig, onTerminateOrMeta, metaOrNull) {
 
   if (typeof onTerminateOrMeta === 'function') {
     meta = metaOrNull
+    onTerminate = onTerminateOrMeta
   } else {
     meta = onTerminateOrMeta ?? metaOrNull
   }
 
-  if (onTerminate != null && typeof onTerminateOrMeta !== 'function') {
+  if (onTerminate != null && typeof onTerminate !== 'function') {
     throw new Error('onTerminate must be a function or null')
   }
 
@@ -187,7 +188,7 @@ export function makeApp(appConfig, onTerminateOrMeta, metaOrNull) {
   }
 
   globalThis.__nxt_undici_global_headers = {
-    ...(globalThis.__nxt_undici_global_headers ?? {}),
+    ...globalThis.__nxt_undici_global_headers,
     'nxt-module': serviceModule,
     'nxt-instance-id': serviceInstanceId,
     'nxt-worker-id': String(serviceWorkerId),

package/errors.d.ts

@@ -42,6 +42,7 @@ export interface MessageOptions {
 }
 
 export function makeMessages(
+  // oxlint-disable-next-line typescript/no-redundant-type-constituents
   error: MessageError | MessageError[],
   options?: MessageOptions,
 ): Message[]

package/fixed-queue.js

@@ -75,7 +75,9 @@ class FixedCircularBuffer {
 
   shift() {
     const nextItem = this.list[this.bottom]
-    if (nextItem === undefined) return null
+    if (nextItem === undefined) {
+      return null
+    }
     this.list[this.bottom] = undefined
     this.bottom = (this.bottom + 1) & kMask
     return nextItem

package/http.js

@@ -48,7 +48,8 @@ export class Context {
   #ac
   #logger
   #query
-  #target;
+  #target
+  #priority;
 
   [kPendingIndex] = -1
 
@@ -60,6 +61,23 @@ export class Context {
     this.#req = req
     this.#res = res
     this.#logger = logger.child({ rid: this.#id })
+
+    const p = req.headers['nxt-priority']
+    if (!p) {
+      this.#priority = 1
+    } else if (p === '0' || p === 'low') {
+      this.#priority = 0
+    } else if (p === '1' || p === 'normal') {
+      this.#priority = 1
+    } else if (p === '2' || p === 'high') {
+      this.#priority = 2
+    } else {
+      throw new Error('Invalid nxt-priority header')
+    }
+  }
+
+  get priority() {
+    return this.#priority
   }
 
   get id() {
@@ -1225,7 +1243,9 @@ export const compose = (...middleware) => {
   const funcs = middleware.flat()
 
   for (const fn of funcs) {
-    if (typeof fn !== 'function') throw new TypeError('Middleware must be composed of functions!')
+    if (typeof fn !== 'function') {
+      throw new TypeError('Middleware must be composed of functions!')
+    }
   }
 
   if (process.env.NODE_ENV === 'production') {
@@ -1235,12 +1255,16 @@ export const compose = (...middleware) => {
   return async (ctx, next) => {
     const dispatch = async (i) => {
       const fn = i === funcs.length ? next : funcs[i]
-      if (!fn) return
+      if (!fn) {
+        return
+      }
 
       let nextCalled = false
       let nextResolved = false
       const nextProxy = async () => {
-        if (nextCalled) throw Error('next() called multiple times')
+        if (nextCalled) {
+          throw Error('next() called multiple times')
+        }
         nextCalled = true
         try {
           return await dispatch(i + 1)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "28.0.29",
+  "version": "28.0.31",
   "license": "UNLICENSED",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",
@@ -45,16 +45,17 @@
   ],
   "scripts": {
     "test": "node --test-timeout 60000 --test",
-    "test:types": "tsd"
+    "test:types": "tsd",
+    "test:ci": "node --test && tsd"
   },
   "dependencies": {
     "@elastic/elasticsearch": "^8.17.1",
     "@elastic/transport": "^8.9.3",
     "@nxtedition/nxt-undici": "^7.1.9",
     "@nxtedition/sched": "^1.0.2",
-    "@nxtedition/template": "^1.0.11",
-    "@nxtedition/weak-cache": "^1.0.2",
-    "@nxtedition/yield": "^1.0.2",
+    "@nxtedition/template": "^1.0.12",
+    "@nxtedition/weak-cache": "^1.0.3",
+    "@nxtedition/yield": "^1.0.3",
     "diff": "5.2.0",
     "fast-querystring": "^1.1.2",
     "flamegraph-middleware": "^1.0.0",
@@ -92,5 +93,5 @@
     "canvas": "^3.1.0",
     "rxjs": "^7.0.0"
   },
-  "gitHead": "9a796e26b5fd7bf119919c756967597722decd67"
+  "gitHead": "b764a06e9dc3fcdce6d4e136086dc378e0acc772"
 }

package/time.js

@@ -15,8 +15,14 @@ export function isTimeBetween(date, startTime, endTime) {
   const currentMinutes = date.getMinutes()
 
   // Validate and parse start and end times
-  if (!startTime) startTime = '00:00' // Default start at midnight
-  if (!endTime) endTime = '23:59' // Default end at 23:59
+  if (!startTime) {
+    // Default start at midnight
+    startTime = '00:00'
+  }
+  if (!endTime) {
+    // Default end at 23:59
+    endTime = '23:59'
+  }
 
   const [startHours, startMinutes] = startTime.split(':').map(Number)
   const [endHours, endMinutes] = endTime.split(':').map(Number)