@nxtedition/lib 15.1.7 → 16.0.1

package/app.js

@@ -1,15 +1,30 @@
-const os = require('node:os')
-const net = require('node:net')
-const stream = require('node:stream')
-const { Buffer } = require('node:buffer')
-const { getDockerSecretsSync } = require('./docker-secrets')
-const { getGlobalDispatcher } = require('undici')
-const fp = require('lodash/fp.js')
-
-module.exports = function (appConfig, onTerminate) {
+import os from 'node:os'
+import net from 'node:net'
+import stream from 'node:stream'
+import { Buffer } from 'node:buffer'
+import { getDockerSecretsSync } from './docker-secrets.js'
+import { getGlobalDispatcher } from 'undici'
+import fp from 'lodash/fp.js'
+import { isMainThread, parentPort } from 'node:worker_threads'
+import toobusy from 'toobusy-js'
+import deepstream from '@nxtedition/deepstream.io-client-js'
+import { createLogger } from './logger.js'
+import nconf from 'nconf'
+import { makeCouch } from './couch.js'
+import { makeTemplateCompiler } from './util/template/index.js'
+import { makeDeepstream } from './deepstream.js'
+import v8 from 'v8'
+import rxjs from 'rxjs'
+import rx from 'rxjs/operators'
+import { performance } from 'perf_hooks'
+import hashString from './hash.js'
+import { makeTrace } from './trace.js'
+import compose from 'koa-compose'
+import { createServer } from './http.js'
+
+export function makeApp(appConfig, onTerminate) {
   let ds
   let nxt
-  let toobusy
   let couch
   let server
   let compiler
@@ -26,7 +41,7 @@ module.exports = function (appConfig, onTerminate) {
   Buffer.poolSize = 128 * 1024
 
   if (stream.setDefaultHighWaterMark) {
-    stream.setDefaultHighWaterMark(false, 64 * 1024)
+    stream.setDefaultHighWaterMark(false, 128 * 1024)
   }
 
   const isProduction = process.env.NODE_ENV === 'production'
@@ -41,8 +56,6 @@ module.exports = function (appConfig, onTerminate) {
     logger?.warn({ err }, 'warning')
   })
 
-  const { createLogger } = require('./logger')
-
   const cleanAppConfig = ({
     status,
     stats,
@@ -59,8 +72,6 @@ module.exports = function (appConfig, onTerminate) {
   }) => values
 
   if (appConfig.config) {
-    const nconf = require('nconf')
-
     config = nconf
       .argv()
       .env({
@@ -152,56 +163,15 @@ module.exports = function (appConfig, onTerminate) {
 
   logger.debug({ data: JSON.stringify(config, null, 2) }, 'config')
 
-  {
-    const { isMainThread, parentPort } = require('node:worker_threads')
-    if (!isMainThread && parentPort) {
-      parentPort.on('message', ({ type }) => {
-        if (type === 'nxt:worker:terminate') {
-          terminate(null, true)
-        }
-      })
-    }
-  }
-
-  if (appConfig.niceIncrement) {
-    try {
-      if (appConfig.niceIncrement !== 0 && process.platform === 'linux') {
-        const nice = require('nice-napi')
-        nice(appConfig.niceIncrement)
+  if (!isMainThread && parentPort) {
+    parentPort.on('message', ({ type }) => {
+      if (type === 'nxt:worker:terminate') {
+        terminate(null)
       }
-    } catch {}
-  }
-
-  if (appConfig.perf && process.platform === 'linux') {
-    const perfName = typeof appConfig.perf === 'string' ? appConfig.perf : serviceInstanceId
-
-    try {
-      const linuxPerf = require('linux-perf')
-
-      let started = false
-      ds.rpc.provide(`${perfName}:perf.start`, () => {
-        if (started) {
-          return false
-        }
-        linuxPerf.start()
-        started = true
-        return true
-      })
-      ds.rpc.provide(`${perfName}:perf.stop`, () => {
-        if (!started) {
-          return false
-        }
-        linuxPerf.stop()
-        started = false
-        return true
-      })
-    } catch (err) {
-      logger.error('could not initialize linux perf')
-    }
+    })
   }
 
   if (appConfig.toobusy) {
-    toobusy = require('toobusy-js')
     toobusy.onLag((currentLag) => {
       if (currentLag > 1e3) {
         logger.error({ currentLag }, 'lag')
@@ -231,7 +201,6 @@ module.exports = function (appConfig, onTerminate) {
     )
 
     if (couchConfig.url) {
-      const makeCouch = require('./couch')
       couch = makeCouch(couchConfig)
       destroyers.push(() => couch.close())
     } else {
@@ -240,8 +209,6 @@ module.exports = function (appConfig, onTerminate) {
   }
 
   if (appConfig.deepstream) {
-    const deepstream = require('@nxtedition/deepstream.io-client-js')
-
     let dsConfig = fp.mergeAll(
       [
         { userAgent, url: isProduction ? null : 'ws://127.0.0.1:6020/deepstream' },
@@ -322,7 +289,7 @@ module.exports = function (appConfig, onTerminate) {
         }
       })
 
-    nxt = require('./deepstream')(ds)
+    nxt = makeDeepstream(ds)
 
     globalThis.ds = ds
 
@@ -330,19 +297,13 @@ module.exports = function (appConfig, onTerminate) {
   }
 
   if (appConfig.compiler) {
-    const createTemplateCompiler = require('./util/template')
-    compiler = createTemplateCompiler({ ds, ...appConfig.compiler })
+    compiler = makeTemplateCompiler({ ds, ...appConfig.compiler })
   }
 
   const monitorProviders = {}
 
   let stats$
   if (appConfig.stats) {
-    const v8 = require('v8')
-    const rxjs = require('rxjs')
-    const rx = require('rxjs/operators')
-    const { eventLoopUtilization } = require('perf_hooks').performance
-
     if (typeof appConfig.stats.subscribe === 'function') {
       stats$ = appConfig.stats
     } else if (typeof appConfig.stats === 'function') {
@@ -378,17 +339,17 @@ module.exports = function (appConfig, onTerminate) {
 
     monitorProviders.stats$ = stats$
 
-    let elu1 = eventLoopUtilization?.()
+    let elu1 = performance.eventLoopUtilization?.()
     const subscription = stats$.pipe(rx.auditTime(10e3)).subscribe((stats) => {
       if (process.env.NODE_ENV === 'production') {
-        const elu2 = eventLoopUtilization?.()
+        const elu2 = performance.eventLoopUtilization?.()
         logger.debug(
           {
             ds: ds?.stats,
             couch: couch?.stats,
             lag: toobusy?.lag(),
             memory: process.memoryUsage(),
-            utilization: eventLoopUtilization?.(elu2, elu1),
+            utilization: performance.eventLoopUtilization?.(elu2, elu1),
             heap: v8.getHeapStatistics(),
             ...stats,
           },
@@ -405,11 +366,6 @@ module.exports = function (appConfig, onTerminate) {
 
   let status$
   if (appConfig.status) {
-    const rxjs = require('rxjs')
-    const rx = require('rxjs/operators')
-    const fp = require('lodash/fp')
-    const hashString = require('./hash')
-
     if (appConfig.status.subscribe) {
       status$ = appConfig.status
     } else if (typeof appConfig.status === 'function') {
@@ -639,8 +595,6 @@ module.exports = function (appConfig, onTerminate) {
   }
 
   if (ds && Object.keys(monitorProviders).length && appConfig.monitor !== false) {
-    const { isMainThread } = require('node:worker_threads')
-
     if (isMainThread) {
       const unprovide = ds.record.provide(`^([^:]+):monitor\\.([^?]+)[?]?`, (key) => {
         const [, id, prop] = key.match(/^([^:]+):monitor\.([^?]+)[?]?/)
@@ -666,54 +620,26 @@ module.exports = function (appConfig, onTerminate) {
   if (appConfig.trace) {
     const traceConfig = { ...appConfig.trace, ...config.trace }
     if (traceConfig.url) {
-      const makeTrace = require('./trace')
       trace = makeTrace({ ...traceConfig, destroyers, logger, serviceName })
     }
   }
 
   if (appConfig.http) {
-    // const undici = require('undici')
-    const compose = require('koa-compose')
-    const { createServer } = require('./http')
-
     const httpConfig = { ...appConfig.http, ...config.http }
 
     const port = httpConfig.port
       ? httpConfig.port
       : typeof httpConfig === 'number'
-      ? httpConfig
-      : process.env.NODE_ENV === 'production'
-      ? 8000
-      : null
+        ? httpConfig
+        : process.env.NODE_ENV === 'production'
+          ? 8000
+          : null
 
     if (port != null) {
       const middleware = compose(
         [
           async ({ req, res }, next) => {
             if (req.url.startsWith('/healthcheck')) {
-              // if (ds._url || ds.url) {
-              //   try {
-              //     const { host } = new URL(ds._url || ds.url)
-              //     await undici.request(`http://${host}/healthcheck`)
-              //   } catch (err) {
-              //     logger.warn({ err }, 'deepstream healthcheck failed')
-              //     if (err.code === 'ENOTFOUND' || err.code === 'EHOSTUNREACH') {
-              //       throw err
-              //     }
-              //   }
-              // }
-
-              // if (couch) {
-              //   try {
-              //     await couch.info()
-              //   } catch (err) {
-              //     logger.warn({ err }, 'couch healthcheck failed')
-              //     if (err.code === 'ENOTFOUND' || err.code === 'EHOSTUNREACH') {
-              //       throw err
-              //     }
-              //   }
-              // }
-
               res.statusCode = 200
               res.end()
             } else {
@@ -723,8 +649,8 @@ module.exports = function (appConfig, onTerminate) {
           appConfig.http.request
             ? appConfig.http.request
             : typeof appConfig.http === 'function'
-            ? appConfig.http
-            : null,
+              ? appConfig.http
+              : null,
           ({ res }) => {
             res.statusCode = 404
             res.end()

package/ass.js

@@ -1,8 +1,6 @@
-const fp = require('lodash/fp')
+import fp from 'lodash/fp.js'
 
-module.exports = { encodeASS }
-
-function encodeASS(events, { styles = {}, width = 1920, height = 1080 } = {}) {
+export function encodeASS(events, { styles = {}, width = 1920, height = 1080 } = {}) {
   return [encASSHeader({ width, height }), encASSStyles(styles), encASSEvents(events)].join('\n')
 }
 
@@ -79,7 +77,7 @@ const formatStyles = fp.pipe(
       style.encoding +
       '\n'
     )
-  }, '')
+  }, ''),
 )
 
 function encASSStyles(styles) {

package/couch.js

@@ -1,7 +1,10 @@
-const createError = require('http-errors')
-const makeWeak = require('./weakCache')
-const tp = require('timers/promises')
-const { delay } = require('./http')
+import createError from 'http-errors'
+import { makeWeakCache } from './weakCache.js'
+import tp from 'timers/promises'
+import { defaultDelay as delay } from './http.js'
+import querystring from 'querystring'
+import urljoin from 'url-join'
+import undici from 'undici'
 
 // https://github.com/fastify/fastify/blob/main/lib/reqIdGenFactory.js
 // 2,147,483,647 (2^31 − 1) stands for max SMI value (an internal optimization of V8).
@@ -33,11 +36,7 @@ function parseHeaders(headers, obj = {}) {
   return obj
 }
 
-module.exports = function (opts) {
-  const querystring = require('querystring')
-  const urljoin = require('url-join')
-  const undici = require('undici')
-
+export function makeCouch(opts) {
   let config
   if (typeof opts === 'string') {
     config = opts
@@ -77,7 +76,7 @@ module.exports = function (opts) {
 
   const getClient =
     config.getClient ??
-    makeWeak(
+    makeWeakCache(
       () =>
         new undici.Pool(dbOrigin, {
           ...defaultClientOpts,

package/deepstream.js

@@ -1,9 +1,9 @@
-const qs = require('qs')
-const cached = require('./util/cached')
-const undici = require('undici')
-const stream = require('node:stream')
-const split2 = require('split2')
-const { delay } = require('./http')
+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) {
@@ -121,7 +121,7 @@ function get(ds, name, ...args) {
   )
 }
 
-function init(ds) {
+export function makeDeepstream(ds) {
   const nxt = {
     ds,
     record: {
@@ -249,7 +249,7 @@ async function* changes(
   }
 }
 
-module.exports = Object.assign(init, {
+Object.assign(makeDeepstream, {
   changes,
   provide,
   observe,

package/docker-secrets.js

@@ -1,8 +1,8 @@
-const fs = require('fs')
-const fsp = require('fs/promises')
-const path = require('path')
+import fs from 'fs'
+import fsp from 'fs/promises'
+import path from 'path'
 
-function getDockerSecretsSync({ dir = '/run/secrets' } = {}) {
+export function getDockerSecretsSync({ dir = '/run/secrets' } = {}) {
   let files
   try {
     files = fs.readdirSync(dir)
@@ -22,7 +22,7 @@ function getDockerSecretsSync({ dir = '/run/secrets' } = {}) {
   return secrets
 }
 
-function getDockerSecretSync(file, { dir = '/run/secrets', signal } = {}) {
+export function getDockerSecretSync(file, { dir = '/run/secrets', signal } = {}) {
   try {
     const [, ext] = file.split('.')
     const content = fs.readFileSync(path.join(dir, file), { encoding: 'utf8', signal })
@@ -35,7 +35,7 @@ function getDockerSecretSync(file, { dir = '/run/secrets', signal } = {}) {
   }
 }
 
-async function getDockerSecret(file, { dir = '/run/secrets', signal } = {}) {
+export async function getDockerSecret(file, { dir = '/run/secrets', signal } = {}) {
   try {
     const [, ext] = file.split('.')
     const content = await fsp.readFile(path.join(dir, file), { encoding: 'utf8', signal })
@@ -47,9 +47,3 @@ async function getDockerSecret(file, { dir = '/run/secrets', signal } = {}) {
     throw err
   }
 }
-
-module.exports = {
-  getDockerSecretsSync,
-  getDockerSecretSync,
-  getDockerSecret,
-}

package/elasticsearch.js

@@ -1,5 +1,5 @@
-const Elasticsearch = require('@elastic/elasticsearch')
-const { UndiciConnection } = require('@elastic/transport')
+import Elasticsearch from '@elastic/elasticsearch'
+import { UndiciConnection } from '@elastic/transport'
 
 // https://github.com/elastic/elasticsearch-js/issues/1716#issuecomment-1167173492
 class Connection extends UndiciConnection {
@@ -19,7 +19,7 @@ class Connection extends UndiciConnection {
 // See, https://github.com/elastic/kibana/pull/134628
 const ConnectionPool = Elasticsearch.ClusterConnectionPool
 
-module.exports = function makeElasticsearchClient(config) {
+export default function makeElasticsearchClient(config) {
   config = config?.elasticsearch ?? config
   if (typeof config === 'string') {
     config = { url: config }

package/errors.js

@@ -1,9 +1,10 @@
-const objectHash = require('object-hash')
-const fp = require('lodash/fp.js')
+import objectHash from 'object-hash'
+import fp from 'lodash/fp.js'
+import { SIGNALS } from './platform.js'
+
 const { toString } = Object.prototype
-const { SIGNALS } = require('./platform.js')
 
-module.exports.AbortError = class AbortError extends Error {
+export class AbortError extends Error {
   constructor(message) {
     super(message ?? 'The operation was aborted')
     this.code = 'ABORT_ERR'
@@ -11,7 +12,7 @@ module.exports.AbortError = class AbortError extends Error {
   }
 }
 
-module.exports.parseError = function parseError(error) {
+export function parseError(error) {
   if (!error) {
     return null
   }
@@ -41,7 +42,7 @@ module.exports.parseError = function parseError(error) {
 
 const kSeen = Symbol('kSeen')
 
-module.exports.serializeError = function serializeError(error) {
+export function serializeError(error) {
   if (!error) {
     return null
   }
@@ -117,7 +118,7 @@ module.exports.serializeError = function serializeError(error) {
 }
 
 // TODO (fix): Recursion guard?
-module.exports.makeMessages = function makeMessages(error, options) {
+export function makeMessages(error, options) {
   if (!error) {
     return []
   }
@@ -163,12 +164,12 @@ module.exports.makeMessages = function makeMessages(error, options) {
           error.index === null || error.index === false
             ? null
             : typeof error.index === 'object'
-            ? error.index
-            : error.index === undefined || error.index === true
-            ? options?.index === true
-              ? { message: msg }
-              : null
-            : null,
+              ? error.index
+              : error.index === undefined || error.index === true
+                ? options?.index === true
+                  ? { message: msg }
+                  : null
+                : null,
       }
     } else {
       err = {
@@ -196,7 +197,7 @@ module.exports.makeMessages = function makeMessages(error, options) {
   }
 }
 
-module.exports.makeErrorString = function makeErrorString(err) {
+export function makeErrorString(err) {
   err = module.exports.parseError(err)
 
   let msg = err?.message || 'error'

package/hash.js

@@ -1,5 +1,5 @@
 // https://stackoverflow.com/questions/7616461/generate-a-hash-from-string-in-javascript
-module.exports = function hash(str, seed = 0) {
+export default function hash(str, seed = 0) {
   if (typeof str !== 'string') {
     throw new Error(`invalid argument "str" (${str}). Expected string but received ${typeof str}`)
   }

package/http.js

@@ -1,11 +1,11 @@
-const createError = require('http-errors')
-const { performance } = require('perf_hooks')
-const requestTarget = require('request-target')
-const querystring = require('fast-querystring')
-const compose = require('koa-compose')
-const http = require('http')
-const fp = require('lodash/fp')
-const tp = require('timers/promises')
+import createError from 'http-errors'
+import { performance } from 'perf_hooks'
+import requestTarget from 'request-target'
+import querystring from 'fast-querystring'
+import compose from 'koa-compose'
+import http from 'http'
+import fp from 'lodash/fp.js'
+import tp from 'timers/promises'
 
 const ERR_HEADER_EXPR =
   /^(content-length|content-type|te|host|upgrade|trailers|connection|keep-alive|http2-settings|transfer-encoding|proxy-connection|proxy-authenticate|proxy-authorization)$/i
@@ -23,7 +23,7 @@ function genReqId() {
   return `req-${nextReqId.toString(36)}`
 }
 
-module.exports.request = async function request(ctx, next) {
+export async function request(ctx, next) {
   const { req, res, logger } = ctx
   const startTime = performance.now()
 
@@ -36,7 +36,7 @@ module.exports.request = async function request(ctx, next) {
       throw new createError.BadRequest('invalid url')
     }
 
-    ctx.id = req.id = req.headers['request-id'] || genReqId()
+    ctx.id = req.id = res.id = req.headers['request-id'] || genReqId()
     ctx.logger = req.log = res.log = logger.child({ req: { id: req.id, url: req.url } })
     ctx.signal = ac.signal
     ctx.method = req.method
@@ -172,7 +172,7 @@ module.exports.request = async function request(ctx, next) {
   }
 }
 
-class ServerResponse extends http.ServerResponse {
+export class ServerResponse extends http.ServerResponse {
   constructor(req) {
     super(req)
     this.startTime = performance.now()
@@ -210,9 +210,7 @@ class ServerResponse extends http.ServerResponse {
   }
 }
 
-module.exports.ServerResponse = ServerResponse
-
-module.exports.createServer = function (options, ctx, middleware) {
+export function createServer(options, ctx, middleware) {
   middleware = Array.isArray(middleware) ? middleware : [middleware]
   middleware = fp.values(middleware)
   middleware = middleware.flat().filter(Boolean)
@@ -242,7 +240,7 @@ module.exports.createServer = function (options, ctx, middleware) {
   return server
 }
 
-module.exports.upgrade = async function upgrade(ctx, next) {
+export async function upgrade(ctx, next) {
   const { req, res, socket = res, logger } = ctx
 
   const ac = new AbortController()
@@ -316,7 +314,7 @@ module.exports.upgrade = async function upgrade(ctx, next) {
   }
 }
 
-function isConnectionError(err) {
+export function isConnectionError(err) {
   // AWS compat.
   const statusCode = err?.statusCode ?? err?.$metadata?.httpStatusCode
   return err
@@ -337,7 +335,7 @@ function isConnectionError(err) {
     : false
 }
 
-function defaultDelay(err, retryCount, options) {
+export function defaultDelay(err, retryCount, options) {
   const { signal, logger = null } = options ?? {}
   if (isConnectionError(err)) {
     const delay =
@@ -349,10 +347,7 @@ function defaultDelay(err, retryCount, options) {
   }
 }
 
-module.exports.delay = defaultDelay
-module.exports.isConnectionError = isConnectionError
-
-module.exports.retry = async function _retry(fn, options) {
+export async function retry(fn, options) {
   const { maxRetries = 8, count = maxRetries, delay = defaultDelay, signal } = options ?? {}
 
   for (let retryCount = 0; true; ++retryCount) {
@@ -372,7 +367,7 @@ module.exports.retry = async function _retry(fn, options) {
   }
 }
 
-module.exports.parseHeaders = function parseHeaders(rawHeaders, obj = {}) {
+export function parseHeaders(rawHeaders, obj = {}) {
   for (let i = 0; i < rawHeaders.length; i += 2) {
     const key = rawHeaders[i].toString().toLowerCase()
     let val = obj[key]

package/logger.js

@@ -1,10 +1,10 @@
-const { isMainThread } = require('node:worker_threads')
-const serializers = require('./serializers')
-const pino = require('pino')
+import { isMainThread } from 'node:worker_threads'
+import serializers from './serializers.js'
+import pino from 'pino'
 
 const isProduction = process.env.NODE_ENV === 'production'
 
-module.exports.createLogger = function (
+export function createLogger(
   { level = isProduction ? 'debug' : 'trace', flushInterval = 1e3, stream = null, ...options } = {},
   onTerminate,
 ) {

package/merge-ranges.js

@@ -1,6 +1,6 @@
 const EMPTY_ARR = Object.freeze([])
 
-module.exports = function mergeRanges(ranges) {
+export function mergeRanges(ranges) {
   if (!Array.isArray(ranges) || ranges.length === 0) {
     return EMPTY_ARR
   }

package/mime.js

@@ -1,6 +1,6 @@
-const mime = require('mime')
+import mime from 'mime'
 
-function lookup(name) {
+export function lookup(name) {
   if (typeof name !== 'string' || name.length === 0) {
     return null
   }
@@ -29,7 +29,7 @@ function lookup(name) {
   return mime.getType(name)
 }
 
-function extension(type, name) {
+export function extension(type, name) {
   if (typeof type !== 'string' || type.length === 0) {
     return null
   }
@@ -57,10 +57,3 @@ function extension(type, name) {
 
   return extension
 }
-
-module.exports = {
-  extension,
-  getExtension: extension,
-  lookup,
-  getType: lookup,
-}