@nxtedition/lib 22.0.7 → 22.0.9

package/ass.js

@@ -1,7 +1,14 @@
 import fp from 'lodash/fp.js'
 
-export function encodeASS(events, { styles = {}, width = 1920, height = 1080 } = {}) {
-  return [encASSHeader({ width, height }), encASSStyles(styles), encASSEvents(events)].join('\n')
+const BASE_WIDTH = 1920
+const BASE_HEIGHT = 1080
+
+export function encodeASS(events, { styles = {}, width = BASE_WIDTH, height = BASE_HEIGHT } = {}) {
+  return [
+    encASSHeader({ width, height }),
+    encASSStyles({ styles, width, height }),
+    encASSEvents(events),
+  ].join('\n')
 }
 
 function formatDialogues(events) {
@@ -80,10 +87,24 @@ const formatStyles = fp.pipe(
   }, ''),
 )
 
-function encASSStyles(styles) {
+function encASSStyles({ styles, width, height }) {
+  const scaledStyles = {}
+
+  for (const [id, style] of Object.entries(styles)) {
+    scaledStyles[id] = { ...style }
+    for (const key of ['fontsize', 'marginV', 'marginL', 'marginR']) {
+      const scale = key === 'fontsize' ? height / BASE_HEIGHT : width / BASE_WIDTH
+
+      if (typeof style[key] === 'string') {
+        const scaled = Number(style[key]) * scale
+        scaledStyles[id][key] = String(Math.round(scaled * 10) / 10)
+      }
+    }
+  }
+
   return `[V4+ Styles]
 Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding
-${formatStyles(styles)}`
+${formatStyles(scaledStyles)}`
 }
 
 function encASSHeader({ width, height }) {
@@ -94,8 +115,8 @@ function encASSHeader({ width, height }) {
   // 3: same as 0, but lower line gets wider.
   return `[Script Info]
 ScriptType: v4.00+
-PlayResX: ${width || 1920}
-PlayResY: ${height || 1080}
+PlayResX: ${width || BASE_WIDTH}
+PlayResY: ${height || BASE_HEIGHT}
 WrapStyle: 1
 `
 }

package/http.js

@@ -134,7 +134,7 @@ export async function requestMiddleware(ctx, next) {
 
   pendingSet.add(ctx)
   try {
-    if (req.method === 'GET' || req.method === 'HEAD') {
+    if (req.method === 'GET' || req.method === 'HEAD' || req.method === 'OPTIONS') {
       req.resume() // Dump the body if there is one.
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "22.0.7",
+  "version": "22.0.9",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",
@@ -58,6 +58,7 @@
     "@elastic/elasticsearch": "^8.16.1",
     "@elastic/transport": "^8.9.1",
     "@nxtedition/nxt-undici": "^4.2.26",
+    "@swc/wasm-web": "^1.10.1",
     "content-type": "^1.0.5",
     "date-fns": "^3.6.0",
     "fast-querystring": "^1.1.1",
@@ -94,11 +95,11 @@
     "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-n": "^17.13.2",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^7.1.0",
+    "eslint-plugin-promise": "^7.2.1",
     "husky": "^9.1.7",
-    "lint-staged": "^15.2.10",
+    "lint-staged": "^15.2.11",
     "pinst": "^3.0.0",
-    "prettier": "^3.3.3",
+    "prettier": "^3.4.2",
     "rxjs": "^7.5.6",
     "send": "^0.18.0",
     "tap": "^21.0.1",

package/serializers.js

@@ -37,6 +37,8 @@ function getTiming(obj) {
 
 export default {
   err: (err) => errSerializer(err),
+  error: (err) => errSerializer(err),
+  errors: (err) => errSerializer(err),
   socket: (socket) =>
     socket && {
       id: socket.id || undefined,
@@ -98,8 +100,8 @@ export default {
       bytesRead: ures.bytesRead,
       bytesReadPerSecond:
         ures.bytesReadPerSecond ??
-        (ures.timing?.complete > 0 && ures.bytesRead
-          ? (ures.bytesRead * 1e3) / ures.timing.complete
+        (ures.timing && ures.timing.data > 0 && ures.timing.end > 0
+          ? (ures.bytesRead * 1e3) / (ures.timing.end - ures.timing.data)
           : undefined),
       body: typeof ures.body === 'string' ? ures.body : undefined,
       headers: getHeaders(ures),
@@ -131,8 +133,8 @@ export default {
       bytesWritten: ureq.bytesWritten,
       bytesReadPerSecond:
         ureq.bytesWrittenPerSecond ??
-        (ureq.timing?.complete > 0 && ureq.bytesWritten
-          ? (ureq.bytesWritten * 1e3) / ureq.timing.complete
+        (ureq.timing && ureq.timing.data > 0 && ureq.timing.end > 0
+          ? (ureq.bytesWritten * 1e3) / (ureq.timing.end - ureq.timing.data)
           : undefined),
       headers: getHeaders(ureq),
       query: ureq.query,

package/util/template/javascript.js

@@ -1,16 +1,15 @@
 import assert from 'node:assert'
 import { makeWeakCache } from '../../weakCache.js'
 import * as rxjs from 'rxjs'
-import vm from 'node:vm'
 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 fp from 'lodash/fp.js'
-import _ from 'lodash'
 import moment from 'moment-timezone'
 import Timecode from 'smpte-timecode'
+import transform from './transform.js'
 
 const SEP = String.fromCharCode(30) // ASCII 1E
 
@@ -190,28 +189,6 @@ class PromiseEntry {
   }
 }
 
-function pipe(value, ...fns) {
-  for (const fn of fns) {
-    value = fn(value)
-    if (value == null) {
-      return value
-    }
-  }
-  return value
-}
-
-const globals = {
-  fp,
-  _,
-  moment,
-  Timecode,
-  datefns,
-  JSON5,
-  pipe,
-  $: null,
-  nxt: null,
-}
-
 function proxify(value, expression, handler, suspend = true) {
   assert(expression)
   assert(handler)
@@ -238,8 +215,7 @@ function makeWrapper(expression) {
 
 export default function ({ ds, proxify, compiler }) {
   class Expression {
-    constructor(context, script, expression, args, observer) {
-      this._context = context
+    constructor(script, expression, args, observer) {
       this._expression = expression
       this._observer = observer
       this._script = script
@@ -371,16 +347,48 @@ export default function ({ ds, proxify, compiler }) {
 
       this._counter = (this._counter + 1) & maxInt
 
-      // TODO (fix): freeze?
-      this._context.$ = this._args
-      this._context.nxt = this
-
       const previous = compiler.current
       compiler.current = this
 
       try {
         assert(this._suspended === false)
-        const value = this._script.runInContext(this._context)
+
+        const savedThis = {
+          fp: globalThis.fp,
+          moment: globalThis.moment,
+          Timecode: globalThis.Timecode,
+          datefns: globalThis.datefns,
+          JSON5: globalThis.JSON5,
+          $: globalThis.$,
+          nxt: globalThis.nxt,
+        }
+
+        let value
+        try {
+          globalThis.fp = fp
+          globalThis.moment = moment
+          globalThis.Timecode = Timecode
+          globalThis.datefns = datefns
+          globalThis.JSON5 = JSON5
+          globalThis.$ = this._args
+          globalThis.nxt = this
+
+          // TODO (fix): This should be sandboxed somehow...
+          // - Use a webworker?
+          // - Use vm for Node only?
+          // - Use https://github.com/tc39/proposal-shadowrealm?
+          value = this._script()
+        } finally {
+          globalThis.fp = savedThis.fp
+          globalThis._ = savedThis._
+          globalThis.moment = savedThis.moment
+          globalThis.Timecode = savedThis.Timecode
+          globalThis.datefns = savedThis.datefns
+          globalThis.JSON5 = savedThis.JSON5
+          globalThis.$ = savedThis.$
+          globalThis.nxt = savedThis.nxt
+        }
+
         this._errored = false
         if (this._suspended) {
           return
@@ -410,9 +418,6 @@ export default function ({ ds, proxify, compiler }) {
       } finally {
         compiler.current = previous
 
-        this._context.$ = null
-        this._context.nxt = null
-
         this._suspended = false
         this._disposing = true
 
@@ -598,18 +603,25 @@ export default function ({ ds, proxify, compiler }) {
   return makeWeakCache((expression) => {
     let script
     try {
-      script = new vm.Script(`
-      "use strict";
-      {
-        const _ = pipe;
+      script = new Function(
+        transform(`
+        const _ = (value, ...fns) => {
+          for (const fn of fns) {
+            value = fn(value)
+            if (value == null) {
+              return value
+            }
+          }
+          return value
+        };
         _.asset = (type, state, suspend) => (name) => nxt._asset(name, type, state, suspend);
         _.ds = (postfix, state, suspend) => (name) => nxt._ds(name, postfix, state, suspend);
         _.get = (postfix, path, state, suspend) => (name) => nxt._get(name, postfix, path, state, suspend);
         _.timer = (dueTime) => (dueValue) => nxt.timer(dueTime, dueValue);
         _.fetch = (options, suspend) => (resource) => nxt.fetch(resource, options, suspend);
         ${expression}
-      }
-    `)
+    `),
+      )
     } catch (err) {
       return () =>
         rxjs.throwError(
@@ -617,12 +629,10 @@ export default function ({ ds, proxify, compiler }) {
         )
     }
 
-    const context = vm.createContext({ ...globals })
-
     return (args) =>
       new rxjs.Observable((o) => {
         try {
-          const exp = new Expression(context, script, expression, args, o)
+          const exp = new Expression(script, expression, args, o)
           return () => {
             exp._destroy()
           }

package/util/template/transform.js

@@ -0,0 +1,30 @@
+import { createRequire } from 'node:module'
+import { readFileSync } from 'node:fs'
+import { parseSync, printSync, initSync } from '@swc/wasm-web'
+
+const require = createRequire(import.meta.url)
+const wasmPath = require.resolve('@swc/wasm-web').replace('wasm.js', 'wasm_bg.wasm')
+const wasmBuffer = readFileSync(wasmPath)
+
+initSync({ module: wasmBuffer })
+
+export default function (code) {
+  const ast = parseSync(code, { syntax: 'ecmascript', script: true })
+
+  const { body } = ast
+
+  if (body.length > 0) {
+    const lastStatement = body[body.length - 1]
+
+    if (lastStatement.type !== 'ReturnStatement') {
+      body[body.length - 1] = {
+        type: 'ReturnStatement',
+        argument:
+          lastStatement.type === 'ExpressionStatement' ? lastStatement.expression : lastStatement,
+        span: lastStatement.span,
+      }
+    }
+  }
+
+  return printSync(ast).code
+}

package/util/template/transform.test.js

@@ -0,0 +1,16 @@
+import { test } from 'node:test'
+import assert from 'node:assert'
+import transform from './transform.js'
+
+test('transform', function () {
+  assert.strictEqual(transform('const x = 2; x;'), 'const x = 2;\nreturn x;\n')
+  assert.strictEqual(transform('[1,2,3];'), 'return [\n    1,\n    2,\n    3\n];\n')
+  assert.strictEqual(transform('[1,2,3]'), 'return [\n    1,\n    2,\n    3\n];\n')
+  assert.strictEqual(transform('x\n? \n2 \n: \n3'), `return x ? 2 : 3;\n`)
+  // assert.strictEqual(transform('return x\n? \n2 \n: \n3'), `return x ? 2 : 3;\n`)
+  // assert.strictEqual(transform('return\n x\n? \n2 \n: \n3'), `return x ? 2 : 3;\n`)
+  assert.strictEqual(
+    transform('$.width > $.height ? 30 : 20'),
+    `return $.width > $.height ? 30 : 20;\n`,
+  )
+})