@nxtedition/lib 22.0.13 → 22.0.14

package/ass.js

@@ -1,5 +1,6 @@
 // @ts-check
 import fp from 'lodash/fp.js'
+import { wordwrap } from './wordwrap.js'
 
 const BASE_WIDTH = 1920
 const BASE_HEIGHT = 1080
@@ -38,10 +39,11 @@ const BASE_HEIGHT = 1080
  * @property {string} [encoding]
  *
  * @typedef {object} Options
- * @property {Styles} [styles]
+ * @property {{ [styleName: string]: Styles }} [styles]
  * @property {number} [width]
  * @property {number} [height]
  * @property {boolean} [scaledBorderAndShadow] TODO: default to true when all client styles depend on it?
+ * @property {boolean} [futureWordWrapping]
  */
 
 /**
@@ -51,27 +53,54 @@ const BASE_HEIGHT = 1080
  */
 export function encodeASS(
   events,
-  { styles = {}, width = BASE_WIDTH, height = BASE_HEIGHT, scaledBorderAndShadow = false } = {},
+  {
+    styles = {},
+    width = BASE_WIDTH,
+    height = BASE_HEIGHT,
+    scaledBorderAndShadow = false,
+    futureWordWrapping = false,
+  } = {},
 ) {
+  const scale = typeof width === 'number' ? BASE_WIDTH / width : 1
+  const playResX = scale * (width || BASE_WIDTH)
+  const playResY = scale * (height || BASE_HEIGHT)
   return [
-    encASSHeader({ width, height, scaledBorderAndShadow }),
+    encASSHeader({ playResX, playResY, scaledBorderAndShadow, futureWordWrapping }),
     encASSStyles(styles),
-    encASSEvents(events),
+    encASSEvents(events, styles, playResX, futureWordWrapping),
   ].join('\n')
 }
 
 /**
  * @param {SubtitleEvent[]} events
+ * @param {{ [styleName: string]: Styles }} styles
+ * @param {number} scriptResX
+ * @param {boolean} futureWordWrapping
  */
-function formatDialogues(events) {
+function formatDialogues(events, styles, scriptResX, futureWordWrapping) {
   let s = ''
   for (const { start, duration, end = duration != null ? start + duration : null, text, style } of [
     ...events,
   ].sort((a, b) => a.start - b.start)) {
+    const styleName = style || 'nxt-default'
+    const eventStyle = styles[styleName]
+    const fontSize = parseFloat(eventStyle.fontsize || '32')
+    const fontFamily = eventStyle.fontname ?? 'Arial'
+    const maxWidth = Math.max(
+      0,
+      scriptResX - parseFloat(eventStyle.marginL || '0') - parseFloat(eventStyle.marginR || '0'),
+    )
     if (typeof text === 'string' && text.length > 0 && Number.isFinite(start)) {
       s += `Dialogue: 0,${formatASSTime(start) || '0:00:00.00'},${
         formatASSTime(end) || '9:59:59.00'
-      },${style || 'nxt-default'},,0000,0000,0000,,${(text || '').replace(/\\n|\n/, '\\N')}\n`
+      },${styleName},,0000,0000,0000,,${text
+        .split(/\\n|\n|\\N/)
+        .map((line) => line.trim())
+        .flatMap((line) =>
+          futureWordWrapping ? wordwrap(line, fontSize, fontFamily, maxWidth) : [line],
+        )
+        .map((line) => line.trim())
+        .join('\\N')}`
     }
   }
   return s
@@ -79,15 +108,18 @@ function formatDialogues(events) {
 
 /**
  * @param {SubtitleEvent[]} events
+ * @param {{ [styleName: string]: Styles }} styles
+ * @param {number} scriptResX
+ * @param {boolean} futureWordWrapping
  */
-function encASSEvents(events) {
+function encASSEvents(events, styles, scriptResX, futureWordWrapping) {
   return `[Events]
 Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text
-${formatDialogues(events)}`
+${formatDialogues(events, styles, scriptResX, futureWordWrapping)}`
 }
 
 /**
- * @param {Styles} styles
+ * @param {{ [styleName: string]: Styles }} styles
  */
 const formatStyles = fp.pipe(
   fp.entries,
@@ -157,12 +189,12 @@ ${formatStyles(styles)}`
 
 /**
  * @param {object} params
- * @param {number} [params.width]
- * @param {number} [params.height]
+ * @param {number} params.playResX
+ * @param {number} params.playResY
  * @param {boolean} [params.scaledBorderAndShadow]
+ * @param {boolean} params.futureWordWrapping
  */
-function encASSHeader({ width, height, scaledBorderAndShadow }) {
-  const scale = typeof width === 'number' ? BASE_WIDTH / width : 1
+function encASSHeader({ playResX, playResY, scaledBorderAndShadow, futureWordWrapping }) {
   // WrapStyle
   // 0: smart wrapping, lines are evenly broken
   // 1: end-of-line word wrapping, only \N breaks
@@ -171,9 +203,11 @@ function encASSHeader({ width, height, scaledBorderAndShadow }) {
   const header = [
     '[Script Info]',
     'ScriptType: v4.00+',
-    `PlayResX: ${scale * (width || BASE_WIDTH)}`,
-    `PlayResY: ${scale * (height || BASE_HEIGHT)}`,
-    'WrapStyle: 1',
+    `PlayResX: ${playResX}`,
+    `PlayResY: ${playResY}`,
+    // new way is to not let ass wrap (2) -- we handle it ourselves
+    // to make sure hub and render gets the same result
+    `WrapStyle: ${futureWordWrapping ? 2 : 1}`,
   ]
   if (scaledBorderAndShadow) {
     header.push('ScaledBorderAndShadow: Yes')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "22.0.13",
+  "version": "22.0.14",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",
@@ -59,6 +59,7 @@
     "@elastic/transport": "^8.9.1",
     "@nxtedition/nxt-undici": "^4.2.26",
     "@swc/wasm-web": "^1.10.1",
+    "canvas": "^3.1.0",
     "content-type": "^1.0.5",
     "date-fns": "^3.6.0",
     "fast-querystring": "^1.1.1",