@nxtedition/lib 19.9.4 → 19.10.0

package/app.js

@@ -142,8 +142,8 @@ export function makeApp(appConfig, onTerminate) {
       },
     })
 
-    appDestroyers.push(
-      () =>
+    appDestroyers.unshift(
+      (logger) =>
         new Promise((resolve, reject) => {
           try {
             logger.flush((err) => (err ? reject(err) : resolve(null)))
@@ -174,8 +174,26 @@ export function makeApp(appConfig, onTerminate) {
       }
     }
 
+    const destroy = (value) => {
+      if (value == null) {
+        return null
+      } else if (typeof value === 'function') {
+        return value(logger)
+      } else if (typeof value[Symbol.dispose] === 'function') {
+        return value[Symbol.dispose]()
+      } else if (typeof value[Symbol.asyncDispose] === 'function') {
+        return value[Symbol.asyncDispose]()
+      } else if (typeof value.unsubscribe === 'function') {
+        value.unsubscribe()
+        return null
+      } else {
+        logger.error('invalid destroyer')
+        return null
+      }
+    }
+
     for (const { reason: err } of await Promise.allSettled(
-      destroyers.filter(Boolean).map((fn) => fn(logger)),
+      destroyers.filter(Boolean).map((fn) => destroy(fn)),
     )) {
       if (err) {
         logger.error({ err }, 'shutdown error')
@@ -183,7 +201,7 @@ export function makeApp(appConfig, onTerminate) {
     }
 
     for (const { reason: err } of await Promise.allSettled(
-      appDestroyers.filter(Boolean).map((fn) => fn(logger)),
+      appDestroyers.filter(Boolean).map((fn) => destroy(fn)),
     )) {
       if (err) {
         logger.error({ err }, 'shutdown error')
@@ -297,7 +315,7 @@ export function makeApp(appConfig, onTerminate) {
 
     if (couchConfig.url) {
       couch = makeCouch(couchConfig)
-      appDestroyers.push(() => couch.close())
+      appDestroyers.unshift(() => couch.close())
     } else {
       throw new Error('invalid couch config')
     }
@@ -388,7 +406,7 @@ export function makeApp(appConfig, onTerminate) {
 
     globalThis.ds = ds
 
-    appDestroyers.push(() => ds.close())
+    appDestroyers.unshift(() => ds.close())
   }
 
   if (appConfig.compiler) {
@@ -454,9 +472,7 @@ export function makeApp(appConfig, onTerminate) {
       }
     })
 
-    appDestroyers.push(() => {
-      subscription.unsubscribe()
-    })
+    appDestroyers.unshift(subscription)
   }
 
   let status$
@@ -687,9 +703,7 @@ export function makeApp(appConfig, onTerminate) {
 
     monitorProviders.status$ = status$
 
-    appDestroyers.push(() => {
-      loggerSubscription.unsubscribe()
-    })
+    appDestroyers.unshift(loggerSubscription)
   }
 
   if (ds && Object.keys(monitorProviders).length && appConfig.monitor !== false) {
@@ -706,12 +720,7 @@ export function makeApp(appConfig, onTerminate) {
           return monitorProviders[prop + '$']
         }
       })
-
-      appDestroyers.unshift(() => {
-        if (unprovide) {
-          unprovide()
-        }
-      })
+      appDestroyers.unshift(unprovide)
     }
   }
 
@@ -738,7 +747,7 @@ export function makeApp(appConfig, onTerminate) {
     }
 
     inspectBC.postMessage({ type: 'inspect:register', id: serviceWorkerId })
-    destroyers.push(() => {
+    destroyers.unshift(() => {
       inspector.close()
       inspectBC.postMessage({ type: 'inspect:unregister', id: serviceWorkerId })
     })
@@ -754,7 +763,7 @@ export function makeApp(appConfig, onTerminate) {
     }
   }
 
-  destroyers.push(() => inspectBC.close())
+  destroyers.unshift(() => inspectBC.close())
 
   if (appConfig.http) {
     const httpConfig = { ...appConfig.http, ...config.http }
@@ -830,7 +839,7 @@ export function makeApp(appConfig, onTerminate) {
 
       server.listen(port)
 
-      appDestroyers.push(() => new Promise((resolve) => server.close(resolve)))
+      appDestroyers.unshift(() => new Promise((resolve) => server.close(resolve)))
     }
   }
 

package/couch.js

@@ -120,12 +120,7 @@ export function makeCouch(opts) {
     })
   }
 
-  async function* changes({
-    client = defaultClient,
-    signal = null,
-    highWaterMark = 128 * 1024,
-    ...options
-  } = {}) {
+  async function* changes({ client = defaultClient, signal = null, ...options } = {}) {
     const params = {}
 
     let body

package/http.js

@@ -68,7 +68,7 @@ export async function request(ctx, next) {
             this.destroy((reqTimeoutError ??= new createError.RequestTimeout()))
           })
           .on('error', function (err) {
-            this.log.error({ err }, 'request error')
+            reqLogger.error({ err }, 'request error')
           })
         res
           .on('timeout', function () {
@@ -80,7 +80,7 @@ export async function request(ctx, next) {
           // TODO (fix): Use 'end' once we can trust that
           // 'end' or 'error' will always be emitted.
           .on('close', function () {
-            this.log.debug('request closed')
+            reqLogger.debug('request closed')
             resolve(null)
             ac.abort()
           })

package/package.json

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

package/util/compare-rev.js

@@ -2,7 +2,7 @@ const ordI = 'I'.charCodeAt(0)
 const ordZero = '0'.charCodeAt(0)
 const ordDash = '-'.charCodeAt(0)
 
-const compareRevStringString = (a, b) => {
+export function compareRevStringString(a, b) {
   // Handle INF-XXXXXXXX
   {
     const isInfA = a[0] === 'I'
@@ -64,7 +64,7 @@ const compareRevStringString = (a, b) => {
   return lenA - lenB
 }
 
-const compareRevBufferBuffer = (a, b) => {
+export function compareRevBufferBuffer(a, b) {
   if (a === b) {
     return 0
   }
@@ -133,7 +133,7 @@ const compareRevBufferBuffer = (a, b) => {
   return lenA - lenB
 }
 
-const compareRevBufferString = (a, b) => {
+export function compareRevBufferString(a, b) {
   // Handle INF-XXXXXXXX
   {
     const isInfA = a[0] === ordI
@@ -197,6 +197,77 @@ const compareRevBufferString = (a, b) => {
   return lenA - lenB
 }
 
+export function compareRevSliceSlice(a, b) {
+  if (a === b) {
+    return 0
+  }
+
+  let indexA = a.byteOffset
+  const endA = a.byteOffset + a.byteLength
+  let lenA = endA
+  a = a.buffer
+
+  let indexB = b.byteOffset
+  const endB = b.byteOffset + b.byteLength
+  let lenB = endB
+  b = b.buffer
+
+  // Handle INF-XXXXXXXX
+  {
+    const isInfA = a[indexA] === ordI
+    const isInfB = b[indexB] === ordI
+    if (isInfA !== isInfB) {
+      return isInfB ? -1 : 1
+    }
+  }
+
+  // Skip leading zeroes
+  while (a[indexA] === ordZero) {
+    ++indexA
+    --lenA
+  }
+  while (b[indexB] === ordZero) {
+    ++indexB
+    --lenB
+  }
+
+  // Compare the revision number
+  let result = 0
+  while (indexA < endA && indexB < endB) {
+    const ac = a[indexA++]
+    const bc = b[indexB++]
+
+    const isDashA = ac === ordDash
+    const isDashB = bc === ordDash
+    if (isDashA) {
+      if (isDashB) {
+        break
+      }
+      return -1
+    } else if (isDashB) {
+      return 1
+    }
+
+    result ||= ac - bc
+  }
+
+  if (result) {
+    return result
+  }
+
+  // Compare the rest
+  while (indexA < endA && indexB < endB) {
+    const ac = a[indexA++]
+    const bc = b[indexB++]
+    result = ac - bc
+    if (result) {
+      return result
+    }
+  }
+
+  return lenA - lenB
+}
+
 export default function compareRev(a, b) {
   // Handle null and undefined
   if (!a || !a.length) {