@nxtedition/lib 19.0.8 → 19.0.10

package/app.js

@@ -127,8 +127,7 @@ export function makeApp(appConfig, onTerminate) {
     logger = createLogger({
       ...loggerConfig,
       name: serviceName,
-      module: serviceModule,
-      base: loggerConfig?.base ? { ...loggerConfig.base } : {},
+      base: loggerConfig?.base ? { module: serviceModule, ...loggerConfig.base } : {},
     })
 
     appDestroyers.push(

package/deepstream.js

@@ -1,9 +1,5 @@
 import qs from 'qs'
 import cached from './util/cached.js'
-import undici from 'undici'
-import stream from 'node:stream'
-import split2 from 'split2'
-import { defaultDelay as delay } from './http.js'
 
 function provide(ds, domain, callback, options) {
   if (domain instanceof RegExp) {
@@ -131,132 +127,18 @@ export function makeDeepstream(ds) {
       set: (...args) => ds.record.set(...args),
       get: (...args) => get(ds, ...args),
       update: (...args) => ds.record.update(...args),
-      changes: (...args) => changes(ds, ...args),
     },
   }
   ds.nxt = nxt
   return nxt
 }
 
-async function* changes(
-  ds,
-  {
-    origin,
-    since = 'now',
-    live = true,
-    batched = false,
-    includeDocs = false,
-    highWaterMark = 256 * 1024,
-    heartbeat = 60e3,
-    signal,
-    retry,
-  },
-) {
-  const url = new URL('/_record/changes', origin)
-
-  url.searchParams.set('since', since || '0')
-  url.searchParams.set('live', String(live))
-  url.searchParams.set('include_docs', String(includeDocs))
-
-  let ac
-
-  const abort = () => {
-    ac?.abort(signal.reason)
-  }
-
-  signal?.addEventListener('abort', abort)
-
-  try {
-    for (let retryCount = 0; true; retryCount++) {
-      ac = new AbortController()
-      try {
-        // TODO (fix): Use nxt-undici
-        const res = await undici.request(url, {
-          idempotent: false,
-          blocking: true,
-          method: 'GET',
-          signal: ac.signal,
-          throwOnError: true,
-          highWaterMark,
-          bodyTimeout: 2 * heartbeat,
-        })
-
-        const src = stream.pipeline(res.body, split2(), () => {})
-
-        let error
-        let ended = false
-        let resume = () => {}
-
-        src
-          .on('error', (err) => {
-            error = err
-            resume()
-          })
-          .on('readable', () => {
-            resume()
-          })
-          .on('end', () => {
-            ended = true
-            resume()
-          })
-
-        const batch = batched ? [] : null
-        while (true) {
-          const line = src.read()
-
-          if (line === '') {
-            continue
-          } else if (line !== null) {
-            const change = JSON.parse(line)
-
-            retryCount = 0
-
-            if (change.seq) {
-              since = change.seq
-            }
-            if (batch) {
-              batch.push(change)
-            } else {
-              yield change
-            }
-          } else if (batch?.length) {
-            yield batch.splice(0)
-          } else if (error) {
-            throw error
-          } else if (ended) {
-            return
-          } else {
-            await new Promise((resolve) => {
-              resume = resolve
-            })
-          }
-        }
-      } catch (err) {
-        if (typeof retry === 'function') {
-          const retryState = { since }
-          await retry(err, retryCount, retryState, { signal: ac.signal })
-          url.searchParams.set('since', since || '0')
-        } else {
-          await delay(err, retryCount, { signal: ac.signal })
-        }
-      } finally {
-        ac.abort()
-        ac = null
-      }
-    }
-  } finally {
-    signal?.removeEventListener('abort', abort)
-  }
-}
-
 Object.assign(makeDeepstream, {
-  changes,
   provide,
   observe,
   observe2,
   get,
   record: {
-    changes,
     provide,
     observe,
     observe2,

package/package.json

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