@nxtedition/lib 15.1.7 → 16.0.0

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "@nxtedition/lib",
-  "version": "15.1.7",
+  "version": "16.0.0",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
+  "type": "module",
   "files": [
     "hash.js",
     "ass.js",
@@ -72,10 +73,12 @@
     "/__tests__"
   ],
   "dependencies": {
-    "@nxtedition/nxt-undici": "^1.4.3",
+    "@elastic/elasticsearch": "^8.10.0",
+    "@elastic/transport": "^8.3.4",
+    "@nxtedition/nxt-undici": "^1.4.4",
     "date-fns": "^2.29.3",
     "fast-querystring": "^1.1.1",
-    "hasha": "^5.2.2",
+    "hasha": "^6.0.0",
     "http-errors": "^2.0.0",
     "json5": "^2.2.3",
     "koa-compose": "^4.1.0",
@@ -90,26 +93,29 @@
     "request-target": "^1.0.2",
     "smpte-timecode": "^1.3.3",
     "split-string": "^6.0.0",
+    "split2": "^4.2.0",
     "toobusy-js": "^0.5.1",
     "undici": "^5.27.2",
-    "url-join": "^4.0.0"
+    "url-join": "^5.0.0"
   },
   "devDependencies": {
-    "@types/node": "^20.8.10",
+    "@nxtedition/deepstream.io-client-js": ">=14.1.0",
+    "@types/lodash": "^4.14.201",
+    "@types/node": "^20.9.0",
     "eslint": "^8.53.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-config-standard": "^17.0.0",
     "eslint-plugin-import": "^2.29.0",
-    "eslint-plugin-n": "^16.3.0",
+    "eslint-plugin-n": "^16.3.1",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6.0.0",
     "husky": "^8.0.3",
-    "lint-staged": "^15.0.2",
+    "lint-staged": "^15.1.0",
     "pinst": "^3.0.0",
-    "prettier": "^3.0.3",
+    "prettier": "^3.1.0",
     "rxjs": "^7.5.6",
     "send": "^0.18.0",
-    "tap": "^18.5.7"
+    "tap": "^18.5.8"
   },
   "peerDependencies": {
     "@elastic/elasticsearch": "^8.6.0",
@@ -117,9 +123,5 @@
     "@nxtedition/deepstream.io-client-js": ">=14.1.0",
     "pino": ">=7.0.0",
     "rxjs": ">=6.0.0"
-  },
-  "optionalDependencies": {
-    "linux-perf": "^0.3.1",
-    "nice-napi": ">=1.0.0"
   }
 }

package/platform.js

@@ -1,4 +1,4 @@
-module.exports.SIGNALS =
+export const SIGNALS =
   {
     linux: {
       129: 'SIGHUP', //  1

package/rxjs/auditMap.js

@@ -1,6 +1,6 @@
-const rxjs = require('rxjs')
+import rxjs from 'rxjs'
 
-function auditMap(project) {
+function auditMapImpl(project) {
   return new rxjs.Observable((o) => {
     let pendingValue = null
     let hasPendingValue = false
@@ -78,6 +78,8 @@ function auditMap(project) {
   })
 }
 
-rxjs.Observable.prototype.auditMap = auditMap
+rxjs.Observable.prototype.auditMap = auditMapImpl
 
-module.exports = (project) => (o) => auditMap.call(o, project)
+export default function auditMap(project) {
+  return (o) => auditMapImpl.call(o, project)
+}

package/rxjs/combineMap.js

@@ -1,8 +1,8 @@
-const rxjs = require('rxjs')
+import rxjs from 'rxjs'
 
 const EMPTY = Object.freeze([])
 
-function combineMap(project, equals = (a, b) => a === b) {
+function combineMapImpl(project, equals = (a, b) => a === b) {
   const self = this
   return new rxjs.Observable((o) => {
     let curr = EMPTY
@@ -146,6 +146,8 @@ function combineMap(project, equals = (a, b) => a === b) {
   })
 }
 
-rxjs.Observable.prototype.combineMap = combineMap
+rxjs.Observable.prototype.combineMap = combineMapImpl
 
-module.exports = (project, equals) => (o) => combineMap.call(o, project, equals)
+export default function combineMap(project, equals) {
+  return (o) => combineMapImpl.call(o, project, equals)
+}

package/rxjs/firstValueFrom.js

@@ -1,7 +1,7 @@
-const rx = require('rxjs/operators')
-const withAbortSignal = require('./withAbortSignal')
+import rx from 'rxjs/operators'
+import withAbortSignal from './withAbortSignal.js'
 
-module.exports = function firstValueFrom(x$, config) {
+export default function firstValueFrom(x$, config) {
   const hasConfig = config && typeof config === 'object'
   const signal = hasConfig ? config.signal : undefined
   const timeout = hasConfig ? config.timeout : undefined

package/rxjs/lastValueFrom.js

@@ -1,8 +1,8 @@
-const rxjs = require('rxjs')
-const rx = require('rxjs/operators')
-const { AbortError } = require('../errors')
+import rxjs from 'rxjs'
+import rx from 'rxjs/operators'
+import { AbortError } from '../errors'
 
-module.exports = function lastValueFrom(x$, config) {
+export default function lastValueFrom(x$, config) {
   const hasConfig = config && typeof config === 'object'
   const signal = hasConfig ? config.signal : undefined
 

package/rxjs/withAbortSignal.js

@@ -1,7 +1,7 @@
-const rxjs = require('rxjs')
-const { AbortError } = require('../errors')
+import rxjs from 'rxjs'
+import { AbortError } from '../errors.js'
 
-function withAbortSignal(signal) {
+function withAbortSignalImpl(signal) {
   return new rxjs.Observable((o) => {
     o.add(this.subscribe(o))
 
@@ -24,6 +24,8 @@ function withAbortSignal(signal) {
   })
 }
 
-rxjs.Observable.prototype.withAbortSignal = withAbortSignal
+rxjs.Observable.prototype.withAbortSignal = withAbortSignalImpl
 
-module.exports = (signal) => (o) => withAbortSignal.call(o, signal)
+export default function withAbortSignal(signal) {
+  return (o) => withAbortSignalImpl.call(o, signal)
+}

package/serializers.js

@@ -28,7 +28,7 @@ function getHeaders(obj) {
   )
 }
 
-module.exports = {
+export default {
   err: (err) => {
     // TODO (fix): Merge with errors/serializeError?
 
@@ -108,14 +108,14 @@ module.exports = {
     const url = ureq.url?.href
       ? ureq.url.href
       : typeof ureq.url === 'string'
-      ? ureq.url
-      : ureq.origin
-      ? `${ureq.origin}${ureq.path || ''}`
-      : ureq.hostname
-      ? `${ureq.protocol || 'http:'}//${ureq.hostname}:${
-          ureq.port || { 'http:': 80, 'https:': 443 }[ureq.protocol]
-        }${ureq.path || ''}`
-      : ureq.path || ureq.pathname
+        ? ureq.url
+        : ureq.origin
+          ? `${ureq.origin}${ureq.path || ''}`
+          : ureq.hostname
+            ? `${ureq.protocol || 'http:'}//${ureq.hostname}:${
+                ureq.port || { 'http:': 80, 'https:': 443 }[ureq.protocol]
+              }${ureq.path || ''}`
+            : ureq.path || ureq.pathname
 
     return {
       id: ureq.id || getHeader(ureq, 'request-id'),

package/stream.js

@@ -1,4 +1,4 @@
-function isReadableNodeStream(obj, strict = false) {
+export function isReadableNodeStream(obj, strict = false) {
   return !!(
     (
       obj &&
@@ -11,13 +11,13 @@ function isReadableNodeStream(obj, strict = false) {
   )
 }
 
-function isStream(obj) {
+export function isStream(obj) {
   return (
     obj && typeof obj === 'object' && typeof obj.pipe === 'function' && typeof obj.on === 'function'
   )
 }
 
-function readableStreamLength(stream) {
+export function readableStreamLength(stream) {
   if (!isReadableNodeStream(stream)) {
     return null
   }
@@ -29,9 +29,3 @@ function readableStreamLength(stream) {
   const state = stream._readableState
   return state && state.ended === true && Number.isFinite(state.length) ? state.length : null
 }
-
-module.exports = {
-  isStream,
-  isReadableNodeStream,
-  readableStreamLength,
-}

package/subtract-ranges.js

@@ -1,4 +1,4 @@
-module.exports = function subtractRanges(a, b) {
+export function subtractRanges(a, b) {
   a = a.slice(0)
 
   const c = []

package/timeline.js

@@ -1,10 +1,10 @@
-const fp = require('lodash/fp')
+import fp from 'lodash/fp.js'
 
 const STOP_TIME = 5
 const PRELOAD_TIME = 5
 
 // Events must have start/end/source/data, and should be sorted by start
-function eventsToTimeline(events) {
+export function eventsToTimeline(events) {
   const timeline = []
   events = [...events]
   let active = []
@@ -52,7 +52,7 @@ function eventsToTimeline(events) {
   return timeline
 }
 
-function timelineToCommands(timeline) {
+export function timelineToCommands(timeline) {
   const commands = []
   let current = { time: -Infinity }
   for (let i = 0; i < timeline.length; i++) {
@@ -70,7 +70,7 @@ function timelineToCommands(timeline) {
         {
           command: 'play',
           ...fp.omit(['source', 'data'], next),
-        }
+        },
       )
     } else if (next.source) {
       if (next.source !== current.source || !current.data) {
@@ -96,7 +96,7 @@ function timelineToCommands(timeline) {
   return commands
 }
 
-function pickLayer(source, min = 11, max = 99999) {
+export function pickLayer(source, min = 11, max = 99999) {
   if (!source) {
     return min
   }
@@ -113,9 +113,3 @@ function pickLayer(source, min = 11, max = 99999) {
 
   return min + (hash % (max - min + 1))
 }
-
-module.exports = {
-  eventsToTimeline,
-  timelineToCommands,
-  pickLayer,
-}

package/trace.js

@@ -1,10 +1,10 @@
-const { Pool } = require('undici')
+import { Pool } from 'undici'
 
 function sleep(n) {
   Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, n)
 }
 
-module.exports = function ({
+export function makeTrace({
   url,
   stringify = JSON.stringify,
   index,

package/util/cached.js

@@ -1,4 +1,4 @@
-const { Observable, ReplaySubject, Subject } = require('rxjs')
+import { Observable, ReplaySubject, Subject } from 'rxjs'
 
 const registry = new FinalizationRegistry(({ interval, array }) => {
   clearInterval(interval)
@@ -7,7 +7,7 @@ const registry = new FinalizationRegistry(({ interval, array }) => {
   }
 })
 
-module.exports = function cached(fn, options, keySelector) {
+export default function cached(fn, options, keySelector) {
   if (Number.isFinite(options)) {
     options = { maxAge: options }
   } else if (options == null) {

package/util/compare-rev.js

@@ -197,7 +197,7 @@ const compareRevBufferString = (a, b) => {
   return lenA - lenB
 }
 
-module.exports = function (a, b) {
+export default function compareRev(a, b) {
   // Handle null and undefined
   if (!a || !a.length) {
     return !b || !b.length ? 0 : -1
@@ -213,6 +213,6 @@ module.exports = function (a, b) {
       ? compareRevStringString(a, b)
       : -compareRevBufferString(b, a)
     : isStringB
-    ? compareRevBufferString(a, b)
-    : compareRevBufferBuffer(a, b)
+      ? compareRevBufferString(a, b)
+      : compareRevBufferBuffer(a, b)
 }

package/util/template/index.js

@@ -1,14 +1,14 @@
-const rx = require('rxjs/operators')
-const rxjs = require('rxjs')
-const fp = require('lodash/fp')
-const getNxtpressionsCompiler = require('./nextpressions')
-const getJavascriptCompiler = require('./javascript')
-const JSON5 = require('json5')
-const objectHash = require('object-hash')
-const weakCache = require('../../weakCache')
-const firstValueFrom = require('../../rxjs/firstValueFrom')
-
-module.exports = ({ ds, proxify }) => {
+import rx from 'rxjs/operators'
+import rxjs from 'rxjs'
+import fp from 'lodash/fp.js'
+import getNxtpressionsCompiler from './nextpressions.js'
+import getJavascriptCompiler from './javascript.js'
+import JSON5 from 'json5'
+import objectHash from 'object-hash'
+import { makeWeakCache } from '../../weakCache.js'
+import firstValueFrom from '../../rxjs/firstValueFrom.js'
+
+export function makeTemplateCompiler({ ds, proxify }) {
   const compiler = {
     current: null,
     resolveTemplate,
@@ -207,7 +207,7 @@ module.exports = ({ ds, proxify }) => {
     return typeof val === 'string' && val.indexOf('{{') !== -1
   }
 
-  const _compileTemplateCache = weakCache(
+  const _compileTemplateCache = makeWeakCache(
     (template) => {
       if (fp.isPlainObject(template)) {
         return compileObjectTemplate(template)

package/util/template/javascript.js

@@ -1,12 +1,12 @@
-const assert = require('node:assert')
-const weakCache = require('../../weakCache')
-const rxjs = require('rxjs')
-const vm = require('node:vm')
-const objectHash = require('object-hash')
-const datefns = require('date-fns')
-const JSON5 = require('json5')
-const { request } = require('@nxtedition/nxt-undici')
-const undici = require('undici')
+import assert from 'node:assert'
+import { makeWeakCache } from '../../weakCache.js'
+import rxjs from 'rxjs'
+import vm from 'node:vm'
+import objectHash from 'object-hash'
+import datefns from 'date-fns'
+import JSON5 from 'json5'
+import { request } from '@nxtedition/nxt-undici'
+import undici from 'undici'
 
 const kSuspend = Symbol('kSuspend')
 const kEmpty = Symbol('kEmpty')
@@ -178,10 +178,10 @@ function pipe(value, ...fns) {
 }
 
 const globals = {
-  fp: require('lodash/fp'),
-  _: require('lodash'),
-  moment: require('moment-timezone'),
-  Timecode: require('smpte-timecode'),
+  fp: await import('lodash/fp.js'),
+  _: await import('lodash'),
+  moment: await import('moment-timezone'),
+  Timecode: await import('smpte-timecode'),
   datefns,
   JSON5,
   pipe,
@@ -215,7 +215,7 @@ function makeWrapper(expression) {
   return (value, suspend = true) => proxify(value, expression, handler, suspend)
 }
 
-module.exports = ({ ds, proxify, compiler }) => {
+export default function ({ ds, proxify, compiler }) {
   class Expression {
     constructor(context, script, expression, args, observer) {
       this._context = context
@@ -539,7 +539,7 @@ module.exports = ({ ds, proxify, compiler }) => {
     }
   }
 
-  return weakCache((expression) => {
+  return makeWeakCache((expression) => {
     let script
     try {
       script = new vm.Script(`

package/util/template/nextpressions.js

@@ -1,13 +1,14 @@
-const moment = require('moment-timezone')
-const rx = require('rxjs/operators')
-const Observable = require('rxjs')
-const JSON5 = require('json5')
-const fp = require('lodash/fp')
-const NestedError = require('nested-error-stacks')
-const hasha = require('hasha')
-const split = require('split-string')
+import moment from 'moment-timezone'
+import rx from 'rxjs/operators'
+import Observable from 'rxjs'
+import JSON5 from 'json5'
+import fp from 'lodash/fp.js'
+import NestedError from 'nested-error-stacks'
+import { hashSync } from 'hasha'
+import split from 'split-string'
+import { makeWeakCache } from '../../weakCache.js'
+
 const RETURN = {}
-const weakCache = require('../../weakCache')
 
 function asFilter(transform, predicate, obj) {
   return fp.mapValues(
@@ -23,11 +24,11 @@ function asFilter(transform, predicate, obj) {
           }
         }
       },
-    obj
+    obj,
   )
 }
 
-module.exports = ({ ds } = {}) => {
+export default function ({ ds } = {}) {
   const FILTERS = {
     // any
     ...asFilter(null, null, {
@@ -52,7 +53,7 @@ module.exports = ({ ds } = {}) => {
         }
         return Number(value)
       },
-      date: (tz) => (value) => tz ? moment.tz(value, tz) : moment(value),
+      date: (tz) => (value) => (tz ? moment.tz(value, tz) : moment(value)),
       array: () => (value) => [value],
       value: (value) => () => value,
       int:
@@ -85,11 +86,11 @@ module.exports = ({ ds } = {}) => {
       isNil: () => (value) => value == null,
       isNumber: () => (value) => Number.isFinite(value),
       isString: () => (value) => fp.isString(value),
-      ternary: (a, b) => (value) => value ? a : b,
-      cond: (a, b) => (value) => value ? a : b,
-      hasha: (options) => (value) => hasha(JSON.stringify(value), options || {}),
+      ternary: (a, b) => (value) => (value ? a : b),
+      cond: (a, b) => (value) => (value ? a : b),
+      hasha: (options) => (value) => hashSync(JSON.stringify(value), options || {}),
       hashaint: (options) => (value) =>
-        parseInt(hasha(JSON.stringify(value), options || {}).slice(-13), 16),
+        parseInt(hashSync(JSON.stringify(value), options || {}).slice(-13), 16),
       return: () => (value) => value || RETURN,
       add:
         (...args) =>
@@ -131,7 +132,7 @@ module.exports = ({ ds } = {}) => {
         floor: () => (value) => Math.floor(value),
         ceil: () => (value) => Math.ceil(value),
         clamp: (min, max) => (value) => Math.max(min, Math.min(max, value)),
-      }
+      },
     ),
     ...asFilter(
       (value) =>
@@ -148,7 +149,7 @@ module.exports = ({ ds } = {}) => {
           (...args) =>
           (value) =>
             Math.max(...value, ...args),
-      }
+      },
     ),
     // date
     ...asFilter(
@@ -172,7 +173,7 @@ module.exports = ({ ds } = {}) => {
           // TODO (fix): Validate arguments...
           return (value) => value.endOf(endOf)
         },
-      }
+      },
     ),
     // ds
     ...asFilter(null, (value) => value && (typeof value === 'string' || Array.isArray(value)), {
@@ -224,8 +225,8 @@ module.exports = ({ ds } = {}) => {
         value == null || fp.isPlainObject(value) || Array.isArray(value) ? '' : String(value),
       (value) => typeof value === 'string',
       {
-        fromJSON: () => (value) => value ? JSON.parse(value) : null,
-        fromJSON5: () => (value) => value ? JSON5.parse(value) : null,
+        fromJSON: () => (value) => (value ? JSON.parse(value) : null),
+        fromJSON5: () => (value) => (value ? JSON5.parse(value) : null),
         toSlate: () => (value) => ({
           object: 'value',
           document: {
@@ -268,7 +269,7 @@ module.exports = ({ ds } = {}) => {
                   rx.filter(({ state, data }) => data || state >= ds.record.PROVIDER),
                   rx.pluck('data'),
                   rx.distinctUntilChanged(),
-                  rx.map((isType) => (isType ? value : _return ? RETURN : null))
+                  rx.map((isType) => (isType ? value : _return ? RETURN : null)),
                 )
               : null
         },
@@ -371,7 +372,7 @@ module.exports = ({ ds } = {}) => {
           },
         wordcount: () => (value) => fp.words(value).length,
         words: () => (value) => fp.words(value),
-      }
+      },
     ),
     ...asFilter(
       (value) => (Array.isArray(value) || typeof value === 'string' ? value : []),
@@ -381,7 +382,7 @@ module.exports = ({ ds } = {}) => {
           (...args) =>
           (value) =>
             value.includes(...args),
-      }
+      },
     ),
     // array
     ...asFilter(
@@ -443,7 +444,7 @@ module.exports = ({ ds } = {}) => {
           (...args) =>
           (value) =>
             fp.pull(args[0], value),
-      }
+      },
     ),
     // object
     ...asFilter(
@@ -452,7 +453,7 @@ module.exports = ({ ds } = {}) => {
       {
         merge: (value) => fp.merge(value),
         set: (path, value) => fp.set(path, value),
-      }
+      },
     ),
     // collection
     ...asFilter(
@@ -467,7 +468,7 @@ module.exports = ({ ds } = {}) => {
         keys: () => (value) => fp.keys(value),
         size: () => (value) => fp.size(value),
         entries: () => (value) => fp.entries(value),
-      }
+      },
     ),
     // misc
     ...asFilter(null, null, {
@@ -491,13 +492,13 @@ module.exports = ({ ds } = {}) => {
 
         return Observable.timer(dueTime, period).pipe(
           rx.map(() => moment()),
-          rx.startWith(null)
+          rx.startWith(null),
         )
       },
     }),
   }
 
-  const getFilter = weakCache((filterStr) => {
+  const getFilter = makeWeakCache((filterStr) => {
     const [, filterName, argsStr] =
       filterStr
         .replace(/\n/g, '\\n')
@@ -541,7 +542,7 @@ module.exports = ({ ds } = {}) => {
       return Observable.isObservable(value)
         ? value.pipe(
             rx.switchMap((value) => getValue(value[path], rest)),
-            rx.distinctUntilChanged()
+            rx.distinctUntilChanged(),
           )
         : getValue(value[path], rest)
     }
@@ -564,7 +565,7 @@ module.exports = ({ ds } = {}) => {
           rx.switchMap((value) => reduceValue(value, index, filters, options)),
           rx.distinctUntilChanged(),
           // TODO (fix): better error handling...
-          rx.catchError(() => Observable.of(null))
+          rx.catchError(() => Observable.of(null)),
         )
       }
     }
@@ -572,7 +573,7 @@ module.exports = ({ ds } = {}) => {
     return Observable.of(value)
   }
 
-  return weakCache((expression) => {
+  return makeWeakCache((expression) => {
     try {
       const [basePathStr, ...tokens] = split(expression, {
         separator: '|',
@@ -589,10 +590,10 @@ module.exports = ({ ds } = {}) => {
           rx.catchError((err) => {
             options?.logger?.error(
               { err, expression: { expression, context: JSON.stringify(context) } },
-              'expression failed'
+              'expression failed',
             )
             return Observable.of(null)
-          })
+          }),
         )
     } catch (err) {
       throw new NestedError(`failed to parse expression ${expression}`, err)

package/weakCache.js

@@ -1,6 +1,6 @@
 /* globals WeakRef FinalizationRegistry */
 
-module.exports = function weakCache(valueSelector, keySelector) {
+export function makeWeakCache(valueSelector, keySelector) {
   const cache = new Map()
   const finalizationRegistry = new FinalizationRegistry((key) => {
     const ref = cache.get(key)

package/worker.js

@@ -1,12 +1,12 @@
-const EE = require('events')
+import { once } from 'node:events'
 
-module.exports.terminate = async function terminate(worker, { logger, timeout = 10e3 } = {}) {
+export async function terminate(worker, { logger = null, timeout = 10e3 } = {}) {
   try {
     worker.postMessage({ type: 'nxt:worker:terminate' })
     await Promise.race([
-      EE.once(worker, 'exit'),
+      once(worker, 'exit'),
       new Promise((resolve, reject) =>
-        setTimeout(() => reject(new Error('worker close timeout')), timeout)
+        setTimeout(() => reject(new Error('worker close timeout')), timeout),
       ),
     ])
   } catch (err) {