@nxtedition/lib 23.0.4 → 23.0.6

package/app.d.ts

@@ -3,34 +3,58 @@ import type { NxtDeepstreamClient } from './deepstream.js'
 import type { Logger } from './logger.js'
 import type { CouchClient } from './couch.js'
 import type { Server } from 'http'
+import type { BehaviorSubject } from 'rxjs'
 
-export function makeApp<AC extends AppConfig, Records, RpcMethods>(
-  appConfig: AC,
+export function makeApp<Records, RpcMethods, Config = Record<string, unknown>>(
+  appConfig: AppConfig<Config>,
   onTerminate?: (logger: Logger) => Promise<void>,
 ): App<AC, Records, RpcMethods>
 
-export interface AppConfig {
+export interface AppConfig<Config = Record<string, unknown>> {
   name: string
   module?: string
   version?: string
-  config: {
-    [key: string]: unknown
-  }
+  config: Config
   [key: string]: unknown
 }
 
-export interface App<AC extends AppConfig, Records, RpcMethods> {
+export interface App<Records, RpcMethods, Config = Record<string, unknown>> {
   ds: DeepstreamClientWithNxt<Records, RpcMethods>
   nxt: NxtDeepstreamClient<Records, RpcMethods>
   couch: CouchClient
   server: Server
   compiler: unkonwn
-  config: AC
+  config: Config
   logger: Logger
   trace: unknown
+  trace: unknown
+  toobusy: TooBusy
+  destroyers: Array<
+    | rxjs.Subscription
+    | ((logger: Logger) => void)
+    | ((logger: Logger) => Promise<void>)
+    | Disposable
+    | AsyncDisposable
+  >
+  userAgent: string | null
+  serviceName: string
+  serviceModule: string
+  serviceVersion?: string
+  serviceInstanceId: string
+  serviceWorkerId: number
+  signal: AbortSignal
 }
 
 export interface DeepstreamClientWithNxt<Records, RpcMethods>
   extends DeepstreamClient<Records, RpcMethods> {
   nxt: NxtDeepstreamClient<Records, RpcMethods>
 }
+
+export interface TooBusy {
+  (): boolean
+  lag: () => number
+  lag$: BehaviorSubject<number>
+  appLag: () => number
+  appLag$: BehaviorSubject<number>
+  maxLag: number
+}

package/app.js

@@ -33,7 +33,6 @@ import { json } from 'node:stream/consumers'
 import { monitorEventLoopDelay } from 'node:perf_hooks'
 import { LRUCache } from 'lru-cache'
 import xuid from 'xuid'
-import undici from 'undici'
 import { isTimeBetween } from './time.js'
 
 export function makeApp(appConfig, onTerminate) {
@@ -53,10 +52,6 @@ export function makeApp(appConfig, onTerminate) {
     net.setDefaultAutoSelectFamily(false)
   }
 
-  if (undici.setGlobalDispatcher) {
-    undici.setGlobalDispatcher(new undici.Agent({ connectTimeout: 2e3 }))
-  }
-
   // Optimize some Node global defaults.
 
   Buffer.poolSize = 128 * 1024

package/couch.js

@@ -6,13 +6,7 @@ import { makeWeakCache } from './weakCache.js'
 import { defaultDelay as delay } from './http.js'
 import urljoin from 'url-join'
 import { AbortError } from './errors.js'
-import {
-  dispatch,
-  Agent,
-  Pool,
-  parseHeaders,
-  request as undiciRequest,
-} from '@nxtedition/nxt-undici'
+import { dispatch, Agent, Pool, request as undiciRequest } from '@nxtedition/nxt-undici'
 
 export function makeCouch(opts) {
   let config
@@ -484,7 +478,7 @@ export function makeCouch(opts) {
         },
         onHeaders(statusCode, headers) {
           this.status = statusCode
-          this.headers = parseHeaders(headers)
+          this.headers = headers
         },
         onData(chunk) {
           this.data += chunk
@@ -934,7 +928,7 @@ class StreamOutput extends stream.Readable {
     }
   }
 
-  onHeaders(statusCode, rawHeaders, resume, statusText, headers = parseHeaders(rawHeaders)) {
+  onHeaders(statusCode, headers, resume) {
     if (statusCode >= 300 || statusCode < 200) {
       throw new Error('invalid status code: ' + statusCode)
     }
@@ -1069,11 +1063,26 @@ export function request(url, opts) {
 
   if (opts == null && typeof url === 'object' && url != null) {
     opts = url
-    url = null
+  }
+
+  url = opts.url
+
+  let origin = url.origin
+  if (!origin) {
+    const protocol = url.protocol ?? 'http:'
+    const host = url.host ?? `${url.hostname}:${url.port ?? (protocol === 'https:' ? 443 : 80)}`
+    origin = `${protocol}//${host}`
+  }
+
+  let path = url.path
+  if (!path) {
+    path = url.search ? `${url.pathname}${url.search}` : url.pathname
   }
 
   const ureq = {
     ...opts,
+    origin,
+    path,
     method: opts.method ?? (opts.body ? 'POST' : 'GET'),
     blocking: opts.blocking ?? Boolean(opts.stream),
     headers: {

package/deepstream.d.ts

@@ -1,5 +1,8 @@
 import { DeepstreamClient, RecordHandler } from '@nxtedition/deepstream.io-client-js'
 
+type Paths<T> = keyof T & string
+type Get<Data, Path extends string> = Path extends keyof Data ? Data[Path] : unknown
+
 export function makeDeepstream<Records, RpcMethods>(
   client: DeepstreamClient<Records, RpcMethods>,
 ): NxtDeepstreamClient<Records, RpcMethods>
@@ -8,12 +11,42 @@ export interface NxtDeepstreamClient<Records, RpcMethods> {
   ds: DeepstreamClient<Records, RpcMethods> & { nxt: NxtDeepstreamClient<Records, RpcMethods> }
   record: {
     provide: RecordHandler<Records>['provide']
-    observe: RecordHandler<Records>['observe']
-    observe2: RecordHandler<Records>['observe2']
+    observe: RecordHandler<Records>['observe'] // TODO type with query
+    observe2: RecordHandler<Records>['observe2'] // TODO type with query
     query: RecordHandler<Records>['query']
     set: RecordHandler<Records>['set']
-    get: RecordHandler<Records>['get']
-    getRecord: RecordHandler<Records>['getRecord']
+    get: {
+      // without query and path:
+      <Name extends keyof Records, Data extends Records[Name]>(
+        name: Name,
+        state?: number,
+      ): Promise<Data>
+
+      // with path:
+      <Name extends keyof Records, Data extends Records[Name], Path extends Paths<Data> & string>(
+        name: Name,
+        path?: Path,
+        state?: number,
+      ): Promise<Get<Data, Path>>
+
+      // with query:
+      <Name extends keyof Records, Data extends Records[Name]>(
+        name: Name,
+        query: Query,
+        state?: number,
+      ): Promise<Data>
+
+      // with query and path:
+      <Name extends keyof Records, Data extends Records[Name], Path extends Paths<Data> & string>(
+        name: Name,
+        query: Query,
+        path?: Path,
+        state?: number,
+      ): Promise<Get<Data, Path>>
+    }
+    getRecord: RecordHandler<Records>['getRecord'] // TODO type with query
     update: RecordHandler<Records>['update']
   }
 }
+
+type Query = Record<string, unknown>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "23.0.4",
+  "version": "23.0.6",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",
@@ -60,10 +60,10 @@
     "singleQuote": true
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.723.0",
+    "@aws-sdk/client-s3": "^3.731.1",
     "@elastic/elasticsearch": "^8.16.1",
-    "@elastic/transport": "^8.9.1",
-    "@nxtedition/nxt-undici": "^5.1.8",
+    "@elastic/transport": "^8.9.3",
+    "@nxtedition/nxt-undici": "^6.0.0",
     "@swc/wasm-web": "^1.10.1",
     "content-type": "^1.0.5",
     "date-fns": "^3.6.0",
@@ -75,28 +75,28 @@
     "lodash": "^4.17.21",
     "lru-cache": "^11.0.2",
     "mime": "^4.0.6",
-    "mitata": "^1.0.26",
+    "mitata": "^1.0.31",
     "moment-timezone": "^0.5.46",
     "nconf": "^0.12.1",
     "nested-error-stacks": "^2.1.1",
     "object-hash": "^3.0.0",
     "p-queue": "^8.0.1",
     "pino": "^9.6.0",
-    "qs": "^6.13.1",
+    "qs": "^6.14.0",
     "request-target": "^1.0.2",
     "smpte-timecode": "^1.3.6",
     "split-string": "^6.0.0",
-    "undici": "^7.2.0",
+    "undici": "^7.2.3",
     "url-join": "^5.0.0",
-    "xuid": "^4.1.3",
+    "xuid": "^4.1.5",
     "yocto-queue": "^1.1.1"
   },
   "devDependencies": {
-    "@nxtedition/deepstream.io-client-js": ">=25.6.3",
+    "@nxtedition/deepstream.io-client-js": ">=28.1.5",
     "@types/lodash": "^4.17.14",
-    "@types/node": "^22.10.5",
+    "@types/node": "^22.10.7",
     "eslint": "^9.15.0",
-    "eslint-config-prettier": "^9.1.0",
+    "eslint-config-prettier": "^10.0.1",
     "eslint-config-standard": "^17.0.0",
     "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-n": "^17.15.1",
@@ -107,9 +107,9 @@
     "pinst": "^3.0.0",
     "prettier": "^3.4.2",
     "rxjs": "^7.5.6",
-    "send": "^0.18.0",
+    "send": "^1.1.0",
     "tap": "^21.0.1",
-    "typescript-eslint": "^8.19.1"
+    "typescript-eslint": "^8.20.0"
   },
   "peerDependencies": {
     "@elastic/elasticsearch": "^8.6.0",

package/util/template/javascript.js

@@ -4,8 +4,7 @@ import * as rxjs from 'rxjs'
 import objectHash from 'object-hash'
 import * as datefns from 'date-fns'
 import JSON5 from 'json5'
-import { request } from '@nxtedition/nxt-undici'
-import undici from 'undici'
+import { request, Agent } from '@nxtedition/nxt-undici'
 import fp from 'lodash/fp.js'
 import moment from 'moment-timezone'
 import Timecode from 'smpte-timecode'
@@ -31,7 +30,7 @@ class TimerEntry {
   }
 }
 
-const fetchClient = new undici.Agent({
+const fetchClient = new Agent({
   connections: 128,
 })