@nxtedition/lib 26.8.2 → 26.8.4

package/app.d.ts

@@ -1,4 +1,4 @@
-import type { DeepstreamClient } from '@nxtedition/deepstream.io-client-js'
+import type { DeepstreamClient, RpcMethodDef } from '@nxtedition/deepstream.io-client-js'
 import type { NxtDeepstreamClient } from './deepstream.js'
 import type { Logger } from './logger.js'
 import type { CouchClient } from './couch.js'
@@ -6,7 +6,11 @@ import type { Server } from 'http'
 import type { BehaviorSubject } from 'rxjs'
 import type { Subscription } from 'rxjs'
 
-export function makeApp<Records, RpcMethods, Config = Record<string, unknown>>(
+export function makeApp<
+  Records,
+  RpcMethods extends Record<string, RpcMethodDef> = Record<string, RpcMethodDef>,
+  Config = Record<string, unknown>,
+>(
   appConfig: AppConfig<Config>,
   onTerminate?: (logger: Logger) => Promise<void>,
 ): App<Records, RpcMethods, Config>
@@ -26,7 +30,11 @@ export interface AppConfig<Config = Record<string, unknown>> {
   [key: string]: unknown
 }
 
-export interface App<Records, RpcMethods, Config = Record<string, unknown>> {
+export interface App<
+  Records,
+  RpcMethods extends Record<string, RpcMethodDef>,
+  Config = Record<string, unknown>,
+> {
   ds: DeepstreamClientWithNxt<Records, RpcMethods>
   nxt: NxtDeepstreamClient<Records, RpcMethods>
   couch: CouchClient
@@ -53,7 +61,7 @@ export interface App<Records, RpcMethods, Config = Record<string, unknown>> {
   signal: AbortSignal
 }
 
-export interface DeepstreamClientWithNxt<Records, RpcMethods>
+export interface DeepstreamClientWithNxt<Records, RpcMethods extends Record<string, RpcMethodDef>>
   extends DeepstreamClient<Records, RpcMethods> {
   nxt: NxtDeepstreamClient<Records, RpcMethods>
 }

package/app.js

@@ -35,7 +35,6 @@ import { monitorEventLoopDelay } from 'node:perf_hooks'
 import xuid from 'xuid'
 import { isTimeBetween } from './time.js'
 import makeUnderPressure from './under-pressure.js'
-import undici from '@nxtedition/undici'
 import { isPrimary } from 'node:cluster'
 import { nice } from '@nxtedition/sched'
 import { setAffinity } from './numa.js'
@@ -550,65 +549,6 @@ export function makeApp(appConfig, onTerminate) {
     compiler = makeTemplateCompiler({ ds, logger, ...appConfig.compiler })
   }
 
-  const undiciDefaults = Object.freeze({
-    connected: 0,
-    disconnected: 0,
-    connections: 0,
-  })
-
-  const undici$ = new rxjs.BehaviorSubject({ ...undiciDefaults })
-  {
-    function onConnect(origin, targets) {
-      const stats = { ...undici$.value }
-      stats.connected++
-      stats.connections = stats.connected - stats.disconnected
-      undici$.next(stats)
-      logger.debug({ url: origin, count: stats.connected }, 'upstream connect')
-    }
-
-    function onDisconnect(origin, targets, err) {
-      const stats = { ...undici$.value }
-      stats.connected--
-      stats.connections = stats.connected - stats.disconnected
-      undici$.next(stats)
-      logger.debug({ url: origin, count: stats.connected }, 'upstream disconnect')
-    }
-
-    let currentDispatcher
-    function maybeRegisterUndiciStats() {
-      const nextDispatcher = undici.getGlobalDispatcher()
-
-      if (nextDispatcher === currentDispatcher) {
-        return
-      }
-
-      if (currentDispatcher) {
-        currentDispatcher.off('connect', onConnect).off('disconnect', onDisconnect)
-        currentDispatcher = null
-      }
-
-      undici$.next({ ...undiciDefaults })
-
-      nextDispatcher.on('connect', onConnect).on('disconnect', onDisconnect)
-
-      currentDispatcher = nextDispatcher
-    }
-
-    let undiciInterval = setInterval(() => maybeRegisterUndiciStats(), 10e3).unref()
-
-    destroyers.push(() => {
-      if (undiciInterval) {
-        clearInterval(undiciInterval)
-        undiciInterval = null
-      }
-
-      if (currentDispatcher) {
-        currentDispatcher.off('connect', onConnect).off('disconnect', onDisconnect)
-        currentDispatcher = null
-      }
-    })
-  }
-
   const monitorProviders = {}
 
   let stats$
@@ -695,17 +635,15 @@ export function makeApp(appConfig, onTerminate) {
                 userAgent,
                 pending: globalThis._nxt_lib_http_pending?.size,
               },
+              undici: {
+                sockets: globalThis.__undici_sockets?.size ?? 0,
+              },
             }
           }),
         ),
-        undici$,
       ),
-      rx.map(([serviceStats, appStats, undiciStats]) => ({
+      rx.map(([serviceStats, appStats]) => ({
         ...appStats,
-        undici: {
-          sockets: globalThis.__undici_sockets?.size,
-          ...undiciStats,
-        },
         [serviceName]: serviceStats,
       })),
       rx.retryWhen((err$) =>
@@ -771,20 +709,17 @@ export function makeApp(appConfig, onTerminate) {
             rx.distinctUntilChanged(fp.isEqual),
             rx.repeatWhen((complete$) => complete$.pipe(rx.delay(10e3))),
           ),
-          undici$.pipe(
-            rx.map((stats) => {
-              return [
-                {
-                  id: 'app:undici_upstream_sockets',
-                  level: stats.sockets > 8192 ? 50 : stats.sockets > 4096 ? 40 : 30,
-                  msg: `Undici: ${stats.sockets} upstream connected`,
-                },
-                {
-                  id: 'app:undici_upstream_connections',
-                  level: stats.connections > 8192 ? 50 : stats.connections > 4096 ? 40 : 30,
-                  msg: `Undici: ${stats.connections} upstream connected`,
-                },
-              ]
+          stats$.pipe(
+            rx.map(({ undici: stats }) => {
+              return stats
+                ? [
+                    {
+                      id: 'app:undici_upstream_sockets',
+                      level: stats.sockets > 8192 ? 50 : stats.sockets > 4096 ? 40 : 30,
+                      msg: `Undici: ${stats.sockets} upstream connected`,
+                    },
+                  ]
+                : []
             }),
           ),
           toobusy?.appLag$.pipe(

package/couch.d.ts

@@ -1,6 +1,7 @@
 import type { Logger } from './logger.js'
-import { HttpError } from 'http-errors'
+import type { HttpError } from 'http-errors'
 import type { Readable } from 'node:stream'
+import type { Dispatcher } from 'undici'
 
 export interface CouchOptions {
   url?: string
@@ -18,7 +19,7 @@ export interface CouchRequestOptions<Stream extends boolean = false> {
   body?: unknown
   headersTimeout?: number
   bodyTimeout?: number
-  dispatcher?: undici.Dispatcher
+  dispatcher?: Dispatcher
   query?: {
     startkey?: string
     endkey?: string
@@ -39,7 +40,7 @@ export interface CouchResponse<T> {
 
 export function request<T, Stream extends boolean = false>(
   url: string | URL | { origin: string; path?: string; pathname?: string },
-  opts?: CouchRequestOptione<Stream> | null,
+  opts?: CouchRequestOptions<Stream> | null,
 ): Stream extends true ? Readable : Promise<CouchResponse<T>>
 
 interface ChangesOptions {

package/deepstream.d.ts

@@ -1,19 +1,27 @@
-import { DeepstreamClient, RecordHandler } from '@nxtedition/deepstream.io-client-js'
+import type {
+  DeepstreamClient,
+  RecordHandler,
+  RpcMethodDef,
+} 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>
+export function makeDeepstream<
+  Records,
+  RpcMethods extends Record<string, RpcMethodDef> = Record<string, RpcMethodDef>,
+>(client: DeepstreamClient<Records, RpcMethods>): NxtDeepstreamClient<Records, RpcMethods>
 
-export interface NxtDeepstreamClient<Records, RpcMethods> {
+export interface NxtDeepstreamClient<
+  Records,
+  RpcMethods extends Record<string, RpcMethodDef> = Record<string, RpcMethodDef>,
+> {
   ds: DeepstreamClient<Records, RpcMethods> & { nxt: NxtDeepstreamClient<Records, RpcMethods> }
   record: {
     provide: RecordHandler<Records>['provide']
     observe: RecordHandler<Records>['observe'] // TODO type with query
     observe2: RecordHandler<Records>['observe2'] // TODO type with query
-    query: RecordHandler<Records>['query']
+    query: (designId: string, params?: Query, state?: number) => Promise<string[]>
     set: RecordHandler<Records>['set']
     get: {
       // without query and path:

package/errors.d.ts

@@ -22,7 +22,7 @@ type SerializableError = null | undefined | Error | string | NxtError | Serializ
 
 export function serializeError(err: SerializableError): NxtError[] | null
 
-export type Message = {
+export interface Message {
   msg: string
   title?: string
   id: string
@@ -33,7 +33,7 @@ export type Message = {
   index?: object | null
 }
 
-export type MessageOptions = {
+export interface MessageOptions {
   id?: string
   level?: number
   code?: string
@@ -46,4 +46,6 @@ export function makeMessages(
   options?: MessageOptions,
 ): Message[]
 
+export type MessageError = unknown
+
 export function makeErrorString(err: unknown): string

package/index.d.ts

@@ -0,0 +1 @@
+// dummy file required for tsd to work

package/logger.d.ts

@@ -1,18 +1,10 @@
-import { pino } from 'pino'
+import type { Logger as PinoLogger, LoggerOptions as PinoLoggerOptions } from 'pino'
 
-export type Logger = pino.Logger
+export type Logger = PinoLogger
 
-interface LoggerOptions extends pino.LoggerOptions {
+interface LoggerOptions extends PinoLoggerOptions {
   flushInterval?: number
-  stream?: ReturnType<(typeof pino)['destination']> | (typeof process)['stdout'] | null
+  stream?: NodeJS.WriteStream | null
 }
 
-export function createLogger(
-  {
-    level = isProduction ? 'debug' : 'trace',
-    flushInterval = 1e3,
-    stream = null,
-    ...options
-  }?: LoggerOptions,
-  onTerminate?: unknown,
-): Logger
+export function createLogger(options?: LoggerOptions, onTerminate?: unknown): Logger

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@nxtedition/lib",
-  "version": "26.8.2",
+  "version": "26.8.4",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",
   "files": [
+    "index.d.ts",
     "hash.js",
     "ass.js",
     "rxjs/*",
@@ -51,6 +52,7 @@
   ],
   "scripts": {
     "test": "node --test-timeout 60000 --test",
+    "test:types": "tsd",
     "prepare": "husky"
   },
   "lint-staged": {
@@ -65,12 +67,12 @@
     "singleQuote": true
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "3.901.0",
+    "@aws-sdk/client-s3": "3.918.0",
     "@elastic/elasticsearch": "^8.17.1",
     "@elastic/transport": "^8.9.3",
-    "@nxtedition/nxt-undici": "^6.4.0",
+    "@nxtedition/nxt-undici": "^6.4.17",
     "@nxtedition/sched": "^1.0.2",
-    "@smithy/node-http-handler": "^4.3.0",
+    "@smithy/node-http-handler": "^4.4.3",
     "acorn": "^8.15.0",
     "astring": "^1.9.0",
     "date-fns": "^4.1.0",
@@ -87,7 +89,7 @@
     "nconf": "^0.13.0",
     "object-hash": "^3.0.0",
     "p-queue": "^9.0.0",
-    "pino": "^10.0.0",
+    "pino": "^10.1.0",
     "qs": "^6.14.0",
     "request-target": "^1.0.2",
     "smpte-timecode": "^1.3.6",
@@ -97,11 +99,11 @@
     "yocto-queue": "^1.2.1"
   },
   "devDependencies": {
-    "@nxtedition/deepstream.io-client-js": ">=31.0.18",
+    "@nxtedition/deepstream.io-client-js": ">=31.2.1",
     "@types/lodash": "^4.17.20",
-    "@types/node": "^24.7.0",
+    "@types/node": "^24.9.1",
     "canvas": "^3.1.0",
-    "eslint": "^9.37.0",
+    "eslint": "^9.38.0",
     "eslint-config-prettier": "^10.1.8",
     "eslint-config-standard": "^17.0.0",
     "eslint-plugin-import": "^2.32.0",
@@ -109,11 +111,12 @@
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^7.2.1",
     "husky": "^9.1.7",
-    "lint-staged": "^16.2.3",
+    "lint-staged": "^16.2.6",
     "prettier": "^3.6.2",
     "rxjs": "^7.8.2",
+    "tsd": "^0.33.0",
     "typescript": "^5.9.3",
-    "typescript-eslint": "^8.46.0"
+    "typescript-eslint": "^8.46.2"
   },
   "peerDependencies": {
     "@elastic/elasticsearch": "^8.6.0",

package/util/template/index-common.d.ts

@@ -1,31 +1,32 @@
 import type { FirstValueFromConfig } from 'rxjs/internal/firstValueFrom'
 import type * as rx from 'rxjs'
-import { DeepstreamClient } from '@nxtedition/deepstream.io-client-js'
+import type { DeepstreamClient } from '@nxtedition/deepstream.io-client-js'
+import type { Logger } from '../../logger.js'
 
 export interface MakeTemplateCompilerParams {
-  ds?: DeepstreamClient
+  ds?: DeepstreamClient<unknown>
   proxify?: unknown
-  logger?: unknown
+  logger?: Logger
   platform?: unknown
 }
 
-export function makeTemplateCompiler(params: MakeTemplateCompilerParams): TemplateCompiler
+export declare function makeTemplateCompiler(params: MakeTemplateCompilerParams): TemplateCompiler
 
 export interface TemplateCompiler {
   current: null
 
-  resolveTemplate: <ReturnValue, Context>(
+  resolveTemplate: <ReturnValue, Context extends Record<string, unknown>>(
     template: Nxtpression<ReturnValue, Context> | string,
     args$?: Context | rx.Observable<Context>,
-    options?: FirstValueFromConfig,
+    options?: FirstValueFromConfig<ReturnValue>,
   ) => Promise<unknown>
 
-  onResolveTemplate: <ReturnValue, Context>(
+  onResolveTemplate: <ReturnValue, Context extends Record<string, unknown>>(
     template: Nxtpression<ReturnValue, Context> | string,
     args$?: Context | rx.Observable<Context>,
   ) => rx.Observable<unknown>
 
-  compileTemplate: <ReturnValue, Context>(
+  compileTemplate: <ReturnValue, Context extends Record<string, unknown>>(
     template: Nxtpression<ReturnValue, Context> | string,
   ) => null | ((args$?: Context | rx.Observable<Context>) => rx.Observable<unknown>)
 

package/util/template/index-web.d.ts

@@ -1 +1 @@
-export * from './index-common.d.ts'
+export * from './index-common.js'

package/util/template/index.d.ts

@@ -1 +1 @@
-export * from './index-common.d.ts'
+export * from './index-common.js'