From a567f00dd68a3ce0f583a9b02005808d3a27d3d7 Mon Sep 17 00:00:00 2001
From: Olly Namey <9575458+OllysCoding@users.noreply.github.com>
Date: Mon, 6 Jan 2025 23:17:33 +0000
Subject: [PATCH 1/4] Use main node image & upgrade fabric
---
Containerfile | 18 +-
apps/backend/package.json | 5 +-
apps/backend/src/canvas2video/encoder.ts | 29 +-
apps/backend/src/canvas2video/renderer.ts | 16 +-
apps/backend/src/canvas2video/types.ts | 14 +-
apps/backend/src/fonts/index.ts | 2 +-
apps/backend/src/video-generator/index.ts | 2 -
package-lock.json | 1035 +++++------------
packages/example-plugin/package.json | 3 +-
packages/shared/package.json | 3 +-
packages/shared/src/types.ts | 2 +-
packages/templates/package.json | 5 +-
.../templates/src/centre-title-and-time.ts | 7 +-
13 files changed, 285 insertions(+), 856 deletions(-)
diff --git a/Containerfile b/Containerfile
index 8ab9adc..3d903d7 100644
--- a/Containerfile
+++ b/Containerfile
@@ -1,19 +1,7 @@
-FROM node:alpine
+FROM node:22
-ENV PYTHONUNBUFFERED=1
-RUN apk update
-RUN apk add --update --no-cache python3 && ln -sf python3 /usr/bin/python
-RUN apk add --update --no-cache \
- make \
- g++ \
- jpeg-dev \
- cairo-dev \
- giflib-dev \
- pango-dev \
- libtool \
- autoconf \
- automake
-RUN apk add --update --no-cache font-noto
+RUN apt-get update
+RUN apt-get install build-essential libcairo2-dev libpango1.0-dev libjpeg-dev libgif-dev librsvg2-dev -y
WORKDIR /usr/src/app
diff --git a/apps/backend/package.json b/apps/backend/package.json
index 545adbe..a9e360e 100644
--- a/apps/backend/package.json
+++ b/apps/backend/package.json
@@ -21,9 +21,8 @@
"ajv": "^8.17.1",
"ajv-formats": "^3.0.1",
"canvas": "^2.11.2",
- "cli-progress": "^3.12.0",
"dotenv": "^16.4.7",
- "fabric": "^4.6.0",
+ "fabric": "^6.5.4",
"fastify": "^5.1.0",
"ffmpeg-static": "^4.4.1",
"ffprobe-static": "^3.1.0",
@@ -37,8 +36,6 @@
"@swc/cli": "^0.5.2",
"@swc/core": "^1.10.4",
"@tsconfig/node22": "^22.0.0",
- "@types/cli-progress": "^3.11.6",
- "@types/fabric": "^5.3.9",
"@types/ffmpeg-static": "^3.0.3",
"@types/ffprobe-static": "^2.0.3",
"@types/fluent-ffmpeg": "^2.1.27",
diff --git a/apps/backend/src/canvas2video/encoder.ts b/apps/backend/src/canvas2video/encoder.ts
index f091648..beb85eb 100644
--- a/apps/backend/src/canvas2video/encoder.ts
+++ b/apps/backend/src/canvas2video/encoder.ts
@@ -1,20 +1,11 @@
import ffmpeg from "fluent-ffmpeg";
import * as fs from "fs";
import * as path from "path";
-import * as cliProgress from "cli-progress";
import { type Encoder } from "./types.js";
import { logError } from "../logger/index.js";
-const progressBar = new cliProgress.SingleBar({
- format: `Processing | {bar} | {percentage}%`,
- barCompleteChar: "\u2588",
- barIncompleteChar: "\u2591",
- hideCursor: true,
-});
-
const createDir = (
reject: (reason?: Error) => void,
- silent: boolean,
output: string,
) => {
try {
@@ -49,9 +40,6 @@ const createFilter = (backgroundVideo: {
];
};
-const percent: (percent?: number) => number = (percent) =>
- percent ? parseFloat((percent as number).toFixed(2)) : 0;
-
const outputOptions = [
"-preset veryfast",
"-crf 24",
@@ -63,8 +51,8 @@ const outputOptions = [
const encoder: Encoder = (config) =>
new Promise((resolve, reject) => {
- const { frameStream, output, backgroundVideo, fps, silent = true } = config;
- createDir(reject, silent, output);
+ const { frameStream, output, backgroundVideo, fps } = config;
+ createDir(reject, output);
const outputStream = fs.createWriteStream(output);
const command = ffmpeg();
@@ -87,25 +75,12 @@ const encoder: Encoder = (config) =>
command.complexFilter([...createFilter(backgroundVideo)], "tmp");
command.output(outputStream);
- // command.size(`${width}x${height}`);
-
- command.on("start", () => {
- if (!silent) progressBar.start(100, 0);
- });
command.on("end", () => {
- if (!silent) progressBar.stop();
- if (!silent) console.log("Processing complete...");
resolve({ path: output, stream: outputStream });
});
- command.on("progress", (progress) => {
- if (!silent) progressBar.update(percent(progress.percent));
- });
-
command.on("error", (err: Error) => {
- if (!silent)
- console.log("An error occured while processing,", err.message);
reject(new Error(err.message));
});
diff --git a/apps/backend/src/canvas2video/renderer.ts b/apps/backend/src/canvas2video/renderer.ts
index d62db7d..4645e1d 100644
--- a/apps/backend/src/canvas2video/renderer.ts
+++ b/apps/backend/src/canvas2video/renderer.ts
@@ -1,7 +1,6 @@
import ffmpeg from "fluent-ffmpeg";
-import { fabric } from "fabric";
+import * as fabric from "fabric/node";
import { Readable } from "stream";
-import * as cliProgress from "cli-progress";
import ffmpegPath from "ffmpeg-static";
import * as ffprobe from "ffprobe-static";
@@ -12,17 +11,10 @@ import { gsap } from "gsap";
ffmpeg.setFfmpegPath(ffmpegPath);
ffmpeg.setFfprobePath(ffprobe.path);
-const progressBar = new cliProgress.SingleBar({
- format: `Rendering | {bar} | {percentage}%`,
- barCompleteChar: "\u2588",
- barIncompleteChar: "\u2591",
- hideCursor: true,
-});
-
const renderer: Renderer = (config) =>
new Promise((resolve, reject) => {
try {
- const { width, height, fps, makeScene, silent = true } = config;
+ const { width, height, fps, makeScene } = config;
const canvas = new fabric.StaticCanvas(null, { width, height });
const anim = gsap.timeline({ paused: true });
const stream = new Readable();
@@ -34,7 +26,6 @@ const renderer: Renderer = (config) =>
const renderFrames = () => {
anim.progress(currentFrame++ / totalFrames);
if (currentFrame <= totalFrames) {
- if (!silent) progressBar.update(currentFrame);
canvas.renderAll();
const buffer = Buffer.from(
@@ -44,8 +35,6 @@ const renderer: Renderer = (config) =>
stream.push(buffer);
renderFrames();
} else {
- if (!silent) console.log("\nRendering complete...");
- if (!silent) progressBar.stop();
stream.push(null);
resolve(stream);
}
@@ -55,7 +44,6 @@ const renderer: Renderer = (config) =>
const duration = anim.duration();
totalFrames = Math.max(1, Math.ceil((duration / 1) * fps));
- if (!silent) progressBar.start(totalFrames, 0);
renderFrames();
});
} catch (e) {
diff --git a/apps/backend/src/canvas2video/types.ts b/apps/backend/src/canvas2video/types.ts
index ca76244..55760f9 100644
--- a/apps/backend/src/canvas2video/types.ts
+++ b/apps/backend/src/canvas2video/types.ts
@@ -1,13 +1,9 @@
import { Readable, Writable } from "stream";
-import fabric from "fabric";
+import * as fabric from "fabric/node";
type mediaPath = string;
-interface BaseConfig {
- silent?: boolean;
-}
-
-export interface EncoderConfig extends BaseConfig {
+export interface EncoderConfig {
frameStream: Readable;
output: mediaPath;
width: number;
@@ -32,13 +28,13 @@ interface EncoderOutput {
}
type makeSceneFunction = (
- fabricInstance: typeof fabric.fabric,
- canvas: fabric.fabric.StaticCanvas,
+ fabricInstance: typeof fabric,
+ canvas: fabric.StaticCanvas,
anim: gsap.core.Timeline,
compose: () => void,
) => void;
-export interface RendererConfig extends BaseConfig {
+export interface RendererConfig {
width: number;
height: number;
fps: number;
diff --git a/apps/backend/src/fonts/index.ts b/apps/backend/src/fonts/index.ts
index 89f650f..eba8ace 100644
--- a/apps/backend/src/fonts/index.ts
+++ b/apps/backend/src/fonts/index.ts
@@ -113,7 +113,7 @@ export abstract class Fonts {
weight: properties.weight ?? "normal",
style: properties.style ?? "normal",
};
- registerFont(fontFilePath, parsedProperties);
+ await registerFont(fontFilePath, parsedProperties);
if (!this._fonts[parsed.family]) this._fonts[parsed.family] = [];
this._fonts[parsed.family]?.push(parsedProperties);
logInfo(`Successfully registered font from ${fontFilePath}`);
diff --git a/apps/backend/src/video-generator/index.ts b/apps/backend/src/video-generator/index.ts
index 725f77a..b0b6fed 100644
--- a/apps/backend/src/video-generator/index.ts
+++ b/apps/backend/src/video-generator/index.ts
@@ -131,7 +131,6 @@ export const makeVideo = async (
const height = 1080;
const stream = await renderer({
- silent: true,
width,
height,
fps: 1,
@@ -147,7 +146,6 @@ export const makeVideo = async (
});
const baseEncoderConfig: EncoderConfig = {
- silent: true,
width: 1920,
height: 1080,
frameStream: stream,
diff --git a/package-lock.json b/package-lock.json
index 6c7ed9d..cd7812a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -35,9 +35,8 @@
"ajv": "^8.17.1",
"ajv-formats": "^3.0.1",
"canvas": "^2.11.2",
- "cli-progress": "^3.12.0",
"dotenv": "^16.4.7",
- "fabric": "^4.6.0",
+ "fabric": "^6.5.4",
"fastify": "^5.1.0",
"ffmpeg-static": "^4.4.1",
"ffprobe-static": "^3.1.0",
@@ -51,8 +50,6 @@
"@swc/cli": "^0.5.2",
"@swc/core": "^1.10.4",
"@tsconfig/node22": "^22.0.0",
- "@types/cli-progress": "^3.11.6",
- "@types/fabric": "^5.3.9",
"@types/ffmpeg-static": "^3.0.3",
"@types/ffprobe-static": "^2.0.3",
"@types/fluent-ffmpeg": "^2.1.27",
@@ -1472,6 +1469,16 @@
"dev": true,
"license": "MIT"
},
+ "node_modules/@tootallnate/once": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
+ "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
+ "license": "MIT",
+ "optional": true,
+ "engines": {
+ "node": ">= 10"
+ }
+ },
"node_modules/@tsconfig/node10": {
"version": "1.0.11",
"resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz",
@@ -1503,16 +1510,6 @@
"dev": true,
"license": "MIT"
},
- "node_modules/@types/cli-progress": {
- "version": "3.11.6",
- "resolved": "https://registry.npmjs.org/@types/cli-progress/-/cli-progress-3.11.6.tgz",
- "integrity": "sha512-cE3+jb9WRlu+uOSAugewNpITJDt1VF8dHOopPO4IABFc3SXYL5WE/+PTz/FCdZRRfIujiWW3n3aMbv1eIGVRWA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@types/node": "*"
- }
- },
"node_modules/@types/estree": {
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
@@ -1520,13 +1517,6 @@
"dev": true,
"license": "MIT"
},
- "node_modules/@types/fabric": {
- "version": "5.3.9",
- "resolved": "https://registry.npmjs.org/@types/fabric/-/fabric-5.3.9.tgz",
- "integrity": "sha512-2UEVcGUG/taX5MRqW7mjCedHFdh6VZLseyMWw3DiILH0h/fdwW0mwijgZGTqAvl+uhfdv793wU3XcQxMVbuXZA==",
- "dev": true,
- "license": "MIT"
- },
"node_modules/@types/ffmpeg-static": {
"version": "3.0.3",
"resolved": "https://registry.npmjs.org/@types/ffmpeg-static/-/ffmpeg-static-3.0.3.tgz",
@@ -1981,27 +1971,14 @@
}
},
"node_modules/acorn-globals": {
- "version": "4.3.4",
- "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.4.tgz",
- "integrity": "sha512-clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A==",
+ "version": "7.0.1",
+ "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-7.0.1.tgz",
+ "integrity": "sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==",
"license": "MIT",
"optional": true,
"dependencies": {
- "acorn": "^6.0.1",
- "acorn-walk": "^6.0.1"
- }
- },
- "node_modules/acorn-globals/node_modules/acorn": {
- "version": "6.4.2",
- "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
- "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
- "license": "MIT",
- "optional": true,
- "bin": {
- "acorn": "bin/acorn"
- },
- "engines": {
- "node": ">=0.4.0"
+ "acorn": "^8.1.0",
+ "acorn-walk": "^8.0.2"
}
},
"node_modules/acorn-jsx": {
@@ -2015,11 +1992,13 @@
}
},
"node_modules/acorn-walk": {
- "version": "6.2.0",
- "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.2.0.tgz",
- "integrity": "sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==",
+ "version": "8.3.4",
+ "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz",
+ "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==",
"license": "MIT",
- "optional": true,
+ "dependencies": {
+ "acorn": "^8.11.0"
+ },
"engines": {
"node": ">=0.4.0"
}
@@ -2150,36 +2129,6 @@
"dev": true,
"license": "Python-2.0"
},
- "node_modules/array-equal": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.2.tgz",
- "integrity": "sha512-gUHx76KtnhEgB3HOuFYiCm3FIdEs6ocM2asHvNTkfu/Y09qQVrrVVaOKENmS2KkSaGoxgXNqC+ZVtR/n0MOkSA==",
- "license": "MIT",
- "optional": true,
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/asn1": {
- "version": "0.2.6",
- "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
- "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==",
- "license": "MIT",
- "optional": true,
- "dependencies": {
- "safer-buffer": "~2.1.0"
- }
- },
- "node_modules/assert-plus": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
- "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
- "license": "MIT",
- "optional": true,
- "engines": {
- "node": ">=0.8"
- }
- },
"node_modules/async": {
"version": "0.2.10",
"resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
@@ -2211,23 +2160,6 @@
"fastq": "^1.17.1"
}
},
- "node_modules/aws-sign2": {
- "version": "0.7.0",
- "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
- "integrity": "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==",
- "license": "Apache-2.0",
- "optional": true,
- "engines": {
- "node": "*"
- }
- },
- "node_modules/aws4": {
- "version": "1.13.2",
- "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.13.2.tgz",
- "integrity": "sha512-lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw==",
- "license": "MIT",
- "optional": true
- },
"node_modules/b4a": {
"version": "1.6.7",
"resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.7.tgz",
@@ -2270,16 +2202,6 @@
],
"license": "MIT"
},
- "node_modules/bcrypt-pbkdf": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
- "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==",
- "license": "BSD-3-Clause",
- "optional": true,
- "dependencies": {
- "tweetnacl": "^0.14.3"
- }
- },
"node_modules/bin-version": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/bin-version/-/bin-version-6.0.0.tgz",
@@ -2338,13 +2260,6 @@
"node": ">=8"
}
},
- "node_modules/browser-process-hrtime": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
- "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
- "license": "BSD-2-Clause",
- "optional": true
- },
"node_modules/buffer": {
"version": "5.7.1",
"resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
@@ -2488,18 +2403,6 @@
"node": ">=10"
}
},
- "node_modules/cli-progress": {
- "version": "3.12.0",
- "resolved": "https://registry.npmjs.org/cli-progress/-/cli-progress-3.12.0.tgz",
- "integrity": "sha512-tRkV3HJ1ASwm19THiiLIXLO7Im7wlTuKnvkYaTkyoAPefqjNg7W7DHKUlGRxy9vxDvbyCYQkQozvptuMkGCg8A==",
- "license": "MIT",
- "dependencies": {
- "string-width": "^4.2.3"
- },
- "engines": {
- "node": ">=4"
- }
- },
"node_modules/color-convert": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -2599,13 +2502,6 @@
"node": ">=18"
}
},
- "node_modules/core-util-is": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
- "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
- "license": "MIT",
- "optional": true
- },
"node_modules/create-require": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
@@ -2639,9 +2535,9 @@
}
},
"node_modules/cssom": {
- "version": "0.4.4",
- "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz",
- "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==",
+ "version": "0.5.0",
+ "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.5.0.tgz",
+ "integrity": "sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==",
"license": "MIT",
"optional": true
},
@@ -2665,29 +2561,19 @@
"license": "MIT",
"optional": true
},
- "node_modules/dashdash": {
- "version": "1.14.1",
- "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
- "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==",
+ "node_modules/data-urls": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-3.0.2.tgz",
+ "integrity": "sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==",
"license": "MIT",
"optional": true,
"dependencies": {
- "assert-plus": "^1.0.0"
+ "abab": "^2.0.6",
+ "whatwg-mimetype": "^3.0.0",
+ "whatwg-url": "^11.0.0"
},
"engines": {
- "node": ">=0.10"
- }
- },
- "node_modules/data-urls": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-1.1.0.tgz",
- "integrity": "sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ==",
- "license": "MIT",
- "optional": true,
- "dependencies": {
- "abab": "^2.0.0",
- "whatwg-mimetype": "^2.2.0",
- "whatwg-url": "^7.0.0"
+ "node": ">=12"
}
},
"node_modules/debug": {
@@ -2707,6 +2593,13 @@
}
}
},
+ "node_modules/decimal.js": {
+ "version": "10.4.3",
+ "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz",
+ "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==",
+ "license": "MIT",
+ "optional": true
+ },
"node_modules/decompress-response": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
@@ -2740,7 +2633,7 @@
"version": "0.1.4",
"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
"integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
- "devOptional": true,
+ "dev": true,
"license": "MIT"
},
"node_modules/defaults": {
@@ -2801,14 +2694,17 @@
}
},
"node_modules/domexception": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz",
- "integrity": "sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==",
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz",
+ "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==",
"deprecated": "Use your platform's native DOMException instead",
"license": "MIT",
"optional": true,
"dependencies": {
- "webidl-conversions": "^4.0.2"
+ "webidl-conversions": "^7.0.0"
+ },
+ "engines": {
+ "node": ">=12"
}
},
"node_modules/dotenv": {
@@ -2829,23 +2725,25 @@
"integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
"license": "MIT"
},
- "node_modules/ecc-jsbn": {
- "version": "0.1.2",
- "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
- "integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==",
- "license": "MIT",
- "optional": true,
- "dependencies": {
- "jsbn": "~0.1.0",
- "safer-buffer": "^2.1.0"
- }
- },
"node_modules/emoji-regex": {
"version": "8.0.0",
"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
"license": "MIT"
},
+ "node_modules/entities": {
+ "version": "4.5.0",
+ "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
+ "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+ "license": "BSD-2-Clause",
+ "optional": true,
+ "engines": {
+ "node": ">=0.12"
+ },
+ "funding": {
+ "url": "https://github.com/fb55/entities?sponsor=1"
+ }
+ },
"node_modules/env-paths": {
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
@@ -2869,79 +2767,27 @@
}
},
"node_modules/escodegen": {
- "version": "1.14.3",
- "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz",
- "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==",
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz",
+ "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==",
"license": "BSD-2-Clause",
"optional": true,
"dependencies": {
"esprima": "^4.0.1",
- "estraverse": "^4.2.0",
- "esutils": "^2.0.2",
- "optionator": "^0.8.1"
+ "estraverse": "^5.2.0",
+ "esutils": "^2.0.2"
},
"bin": {
"escodegen": "bin/escodegen.js",
"esgenerate": "bin/esgenerate.js"
},
"engines": {
- "node": ">=4.0"
+ "node": ">=6.0"
},
"optionalDependencies": {
"source-map": "~0.6.1"
}
},
- "node_modules/escodegen/node_modules/estraverse": {
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
- "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
- "license": "BSD-2-Clause",
- "optional": true,
- "engines": {
- "node": ">=4.0"
- }
- },
- "node_modules/escodegen/node_modules/levn": {
- "version": "0.3.0",
- "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
- "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
- "license": "MIT",
- "optional": true,
- "dependencies": {
- "prelude-ls": "~1.1.2",
- "type-check": "~0.3.2"
- },
- "engines": {
- "node": ">= 0.8.0"
- }
- },
- "node_modules/escodegen/node_modules/optionator": {
- "version": "0.8.3",
- "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
- "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
- "license": "MIT",
- "optional": true,
- "dependencies": {
- "deep-is": "~0.1.3",
- "fast-levenshtein": "~2.0.6",
- "levn": "~0.3.0",
- "prelude-ls": "~1.1.2",
- "type-check": "~0.3.2",
- "word-wrap": "~1.2.3"
- },
- "engines": {
- "node": ">= 0.8.0"
- }
- },
- "node_modules/escodegen/node_modules/prelude-ls": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
- "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==",
- "optional": true,
- "engines": {
- "node": ">= 0.8.0"
- }
- },
"node_modules/escodegen/node_modules/source-map": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -2952,19 +2798,6 @@
"node": ">=0.10.0"
}
},
- "node_modules/escodegen/node_modules/type-check": {
- "version": "0.3.2",
- "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
- "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
- "license": "MIT",
- "optional": true,
- "dependencies": {
- "prelude-ls": "~1.1.2"
- },
- "engines": {
- "node": ">= 0.8.0"
- }
- },
"node_modules/eslint": {
"version": "9.17.0",
"resolved": "https://registry.npmjs.org/eslint/-/eslint-9.17.0.tgz",
@@ -3154,7 +2987,7 @@
"version": "5.3.0",
"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
- "dev": true,
+ "devOptional": true,
"license": "BSD-2-Clause",
"engines": {
"node": ">=4.0"
@@ -3228,34 +3061,17 @@
"node": ">=4"
}
},
- "node_modules/extend": {
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
- "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
- "license": "MIT",
- "optional": true
- },
- "node_modules/extsprintf": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
- "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==",
- "engines": [
- "node >=0.6.0"
- ],
- "license": "MIT",
- "optional": true
- },
"node_modules/fabric": {
- "version": "4.6.0",
- "resolved": "https://registry.npmjs.org/fabric/-/fabric-4.6.0.tgz",
- "integrity": "sha512-MhJXCD/ZugOGV5aPHIG0MY1q2EfrlzC2sasrAHj0HHXN50JTe1bHFrlRdkXBijCJ0dG81fGu/A/Pct9DyuwCzQ==",
+ "version": "6.5.4",
+ "resolved": "https://registry.npmjs.org/fabric/-/fabric-6.5.4.tgz",
+ "integrity": "sha512-X+O8G+3aDQSp3lxRekvIy/gMwtzcjAG7IvGXjb4PeUD6+nUJfSfGnaEWpni9aAcXuGz8zXhpMQQELV+4FfRTwA==",
"license": "MIT",
"engines": {
- "node": ">=8.0.0"
+ "node": ">=16.20.0"
},
"optionalDependencies": {
- "canvas": "^2.6.1",
- "jsdom": "^15.2.1"
+ "canvas": "^2.11.2",
+ "jsdom": "^20.0.1"
}
},
"node_modules/fast-decode-uri-component": {
@@ -3311,7 +3127,7 @@
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
"integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
- "devOptional": true,
+ "dev": true,
"license": "MIT"
},
"node_modules/fast-json-stringify": {
@@ -3339,7 +3155,7 @@
"version": "2.0.6",
"resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
"integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
- "devOptional": true,
+ "dev": true,
"license": "MIT"
},
"node_modules/fast-querystring": {
@@ -3655,29 +3471,19 @@
"url": "https://github.com/sponsors/isaacs"
}
},
- "node_modules/forever-agent": {
- "version": "0.6.1",
- "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
- "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==",
- "license": "Apache-2.0",
- "optional": true,
- "engines": {
- "node": "*"
- }
- },
"node_modules/form-data": {
- "version": "2.3.3",
- "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
- "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.1.tgz",
+ "integrity": "sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==",
"license": "MIT",
"optional": true,
"dependencies": {
"asynckit": "^0.4.0",
- "combined-stream": "^1.0.6",
+ "combined-stream": "^1.0.8",
"mime-types": "^2.1.12"
},
"engines": {
- "node": ">= 0.12"
+ "node": ">= 6"
}
},
"node_modules/form-data-encoder": {
@@ -3809,16 +3615,6 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
- "node_modules/getpass": {
- "version": "0.1.7",
- "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
- "integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==",
- "license": "MIT",
- "optional": true,
- "dependencies": {
- "assert-plus": "^1.0.0"
- }
- },
"node_modules/glob": {
"version": "11.0.0",
"resolved": "https://registry.npmjs.org/glob/-/glob-11.0.0.tgz",
@@ -3938,55 +3734,6 @@
"integrity": "sha512-srBfnk4n+Oe/ZnMIOXt3gT605BX9x5+rh/prT2F1SsNJsU1XuMiP0E2aptW481OnonOGACZWBqseH5Z7csHxhQ==",
"license": "Standard 'no charge' license: https://gsap.com/standard-license. Club GSAP members get more: https://gsap.com/licensing/. Why GreenSock doesn't employ an MIT license: https://gsap.com/why-license/"
},
- "node_modules/har-schema": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
- "integrity": "sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==",
- "license": "ISC",
- "optional": true,
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/har-validator": {
- "version": "5.1.5",
- "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
- "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
- "deprecated": "this library is no longer supported",
- "license": "MIT",
- "optional": true,
- "dependencies": {
- "ajv": "^6.12.3",
- "har-schema": "^2.0.0"
- },
- "engines": {
- "node": ">=6"
- }
- },
- "node_modules/har-validator/node_modules/ajv": {
- "version": "6.12.6",
- "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
- "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
- "license": "MIT",
- "optional": true,
- "dependencies": {
- "fast-deep-equal": "^3.1.1",
- "fast-json-stable-stringify": "^2.0.0",
- "json-schema-traverse": "^0.4.1",
- "uri-js": "^4.2.2"
- },
- "funding": {
- "type": "github",
- "url": "https://github.com/sponsors/epoberezkin"
- }
- },
- "node_modules/har-validator/node_modules/json-schema-traverse": {
- "version": "0.4.1",
- "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
- "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
- "license": "MIT",
- "optional": true
- },
"node_modules/has-flag": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -4017,13 +3764,16 @@
}
},
"node_modules/html-encoding-sniffer": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz",
- "integrity": "sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==",
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz",
+ "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==",
"license": "MIT",
"optional": true,
"dependencies": {
- "whatwg-encoding": "^1.0.1"
+ "whatwg-encoding": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=12"
}
},
"node_modules/http-cache-semantics": {
@@ -4033,6 +3783,21 @@
"dev": true,
"license": "BSD-2-Clause"
},
+ "node_modules/http-proxy-agent": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
+ "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
+ "license": "MIT",
+ "optional": true,
+ "dependencies": {
+ "@tootallnate/once": "2",
+ "agent-base": "6",
+ "debug": "4"
+ },
+ "engines": {
+ "node": ">= 6"
+ }
+ },
"node_modules/http-response-object": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/http-response-object/-/http-response-object-3.0.2.tgz",
@@ -4048,22 +3813,6 @@
"integrity": "sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw==",
"license": "MIT"
},
- "node_modules/http-signature": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
- "integrity": "sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==",
- "license": "MIT",
- "optional": true,
- "dependencies": {
- "assert-plus": "^1.0.0",
- "jsprim": "^1.2.2",
- "sshpk": "^1.7.0"
- },
- "engines": {
- "node": ">=0.8",
- "npm": ">=1.3.7"
- }
- },
"node_modules/http2-wrapper": {
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-2.2.1.tgz",
@@ -4102,13 +3851,13 @@
}
},
"node_modules/iconv-lite": {
- "version": "0.4.24",
- "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
- "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+ "version": "0.6.3",
+ "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+ "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
"license": "MIT",
"optional": true,
"dependencies": {
- "safer-buffer": ">= 2.1.2 < 3"
+ "safer-buffer": ">= 2.1.2 < 3.0.0"
},
"engines": {
"node": ">=0.10.0"
@@ -4199,16 +3948,6 @@
"kind-of": "^6.0.2"
}
},
- "node_modules/ip-regex": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
- "integrity": "sha512-58yWmlHpp7VYfcdTwMTvwMmqx/Elfxjd9RXTDyMsbL7lLWmhMylLEqiYVLKuLzOZqVgiWXD9MfR62Vv89VRxkw==",
- "license": "MIT",
- "optional": true,
- "engines": {
- "node": ">=4"
- }
- },
"node_modules/ipaddr.js": {
"version": "1.9.1",
"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
@@ -4286,6 +4025,13 @@
"node": ">=0.10.0"
}
},
+ "node_modules/is-potential-custom-element-name": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
+ "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
+ "license": "MIT",
+ "optional": true
+ },
"node_modules/is-stream": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
@@ -4299,26 +4045,12 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
- "node_modules/is-typedarray": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
- "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
- "license": "MIT",
- "optional": true
- },
"node_modules/isexe": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
"integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
"license": "ISC"
},
- "node_modules/isstream": {
- "version": "0.1.2",
- "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
- "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==",
- "license": "MIT",
- "optional": true
- },
"node_modules/jackspeak": {
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-4.0.2.tgz",
@@ -4347,49 +4079,42 @@
"js-yaml": "bin/js-yaml.js"
}
},
- "node_modules/jsbn": {
- "version": "0.1.1",
- "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
- "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==",
- "license": "MIT",
- "optional": true
- },
"node_modules/jsdom": {
- "version": "15.2.1",
- "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-15.2.1.tgz",
- "integrity": "sha512-fAl1W0/7T2G5vURSyxBzrJ1LSdQn6Tr5UX/xD4PXDx/PDgwygedfW6El/KIj3xJ7FU61TTYnc/l/B7P49Eqt6g==",
+ "version": "20.0.3",
+ "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-20.0.3.tgz",
+ "integrity": "sha512-SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ==",
"license": "MIT",
"optional": true,
"dependencies": {
- "abab": "^2.0.0",
- "acorn": "^7.1.0",
- "acorn-globals": "^4.3.2",
- "array-equal": "^1.0.0",
- "cssom": "^0.4.1",
- "cssstyle": "^2.0.0",
- "data-urls": "^1.1.0",
- "domexception": "^1.0.1",
- "escodegen": "^1.11.1",
- "html-encoding-sniffer": "^1.0.2",
- "nwsapi": "^2.2.0",
- "parse5": "5.1.0",
- "pn": "^1.1.0",
- "request": "^2.88.0",
- "request-promise-native": "^1.0.7",
- "saxes": "^3.1.9",
- "symbol-tree": "^3.2.2",
- "tough-cookie": "^3.0.1",
- "w3c-hr-time": "^1.0.1",
- "w3c-xmlserializer": "^1.1.2",
- "webidl-conversions": "^4.0.2",
- "whatwg-encoding": "^1.0.5",
- "whatwg-mimetype": "^2.3.0",
- "whatwg-url": "^7.0.0",
- "ws": "^7.0.0",
- "xml-name-validator": "^3.0.0"
+ "abab": "^2.0.6",
+ "acorn": "^8.8.1",
+ "acorn-globals": "^7.0.0",
+ "cssom": "^0.5.0",
+ "cssstyle": "^2.3.0",
+ "data-urls": "^3.0.2",
+ "decimal.js": "^10.4.2",
+ "domexception": "^4.0.0",
+ "escodegen": "^2.0.0",
+ "form-data": "^4.0.0",
+ "html-encoding-sniffer": "^3.0.0",
+ "http-proxy-agent": "^5.0.0",
+ "https-proxy-agent": "^5.0.1",
+ "is-potential-custom-element-name": "^1.0.1",
+ "nwsapi": "^2.2.2",
+ "parse5": "^7.1.1",
+ "saxes": "^6.0.0",
+ "symbol-tree": "^3.2.4",
+ "tough-cookie": "^4.1.2",
+ "w3c-xmlserializer": "^4.0.0",
+ "webidl-conversions": "^7.0.0",
+ "whatwg-encoding": "^2.0.0",
+ "whatwg-mimetype": "^3.0.0",
+ "whatwg-url": "^11.0.0",
+ "ws": "^8.11.0",
+ "xml-name-validator": "^4.0.0"
},
"engines": {
- "node": ">=8"
+ "node": ">=14"
},
"peerDependencies": {
"canvas": "^2.5.0"
@@ -4400,19 +4125,6 @@
}
}
},
- "node_modules/jsdom/node_modules/acorn": {
- "version": "7.4.1",
- "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
- "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
- "license": "MIT",
- "optional": true,
- "bin": {
- "acorn": "bin/acorn"
- },
- "engines": {
- "node": ">=0.4.0"
- }
- },
"node_modules/json-buffer": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
@@ -4420,13 +4132,6 @@
"dev": true,
"license": "MIT"
},
- "node_modules/json-schema": {
- "version": "0.4.0",
- "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
- "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==",
- "license": "(AFL-2.1 OR BSD-3-Clause)",
- "optional": true
- },
"node_modules/json-schema-ref-resolver": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/json-schema-ref-resolver/-/json-schema-ref-resolver-1.0.1.tgz",
@@ -4449,29 +4154,6 @@
"dev": true,
"license": "MIT"
},
- "node_modules/json-stringify-safe": {
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
- "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==",
- "license": "ISC",
- "optional": true
- },
- "node_modules/jsprim": {
- "version": "1.4.2",
- "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz",
- "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==",
- "license": "MIT",
- "optional": true,
- "dependencies": {
- "assert-plus": "1.0.0",
- "extsprintf": "1.3.0",
- "json-schema": "0.4.0",
- "verror": "1.10.0"
- },
- "engines": {
- "node": ">=0.6.0"
- }
- },
"node_modules/keyv": {
"version": "4.5.4",
"resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
@@ -4533,13 +4215,6 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
- "node_modules/lodash": {
- "version": "4.17.21",
- "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
- "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
- "license": "MIT",
- "optional": true
- },
"node_modules/lodash.merge": {
"version": "4.6.2",
"resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
@@ -4547,13 +4222,6 @@
"dev": true,
"license": "MIT"
},
- "node_modules/lodash.sortby": {
- "version": "4.7.0",
- "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
- "integrity": "sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==",
- "license": "MIT",
- "optional": true
- },
"node_modules/long-timeout": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/long-timeout/-/long-timeout-0.1.1.tgz",
@@ -4894,16 +4562,6 @@
"license": "MIT",
"optional": true
},
- "node_modules/oauth-sign": {
- "version": "0.9.0",
- "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
- "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
- "license": "Apache-2.0",
- "optional": true,
- "engines": {
- "node": "*"
- }
- },
"node_modules/object-assign": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@@ -5032,11 +4690,17 @@
"integrity": "sha512-60zvsJReQPX5/QP0Kzfd/VrpjScIQ7SHBW6bFCYfEP+fp0Eppr1SHhIO5nd1PjZtvclzSzES9D/p5nFJurwfWg=="
},
"node_modules/parse5": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.0.tgz",
- "integrity": "sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ==",
+ "version": "7.2.1",
+ "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.2.1.tgz",
+ "integrity": "sha512-BuBYQYlv1ckiPdQi/ohiivi9Sagc9JG+Ozs0r7b/0iK3sKmrb0b9FdWdBbOdx6hBCM/F9Ir82ofnBhtZOjCRPQ==",
"license": "MIT",
- "optional": true
+ "optional": true,
+ "dependencies": {
+ "entities": "^4.5.0"
+ },
+ "funding": {
+ "url": "https://github.com/inikulin/parse5?sponsor=1"
+ }
},
"node_modules/path-exists": {
"version": "4.0.0",
@@ -5110,13 +4774,6 @@
"dev": true,
"license": "MIT"
},
- "node_modules/performance-now": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
- "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==",
- "license": "MIT",
- "optional": true
- },
"node_modules/picomatch": {
"version": "2.3.1",
"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
@@ -5177,13 +4834,6 @@
"@napi-rs/nice": "^1.0.1"
}
},
- "node_modules/pn": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz",
- "integrity": "sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==",
- "license": "MIT",
- "optional": true
- },
"node_modules/prelude-ls": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
@@ -5271,15 +4921,12 @@
"node": ">=6"
}
},
- "node_modules/qs": {
- "version": "6.5.3",
- "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
- "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==",
- "license": "BSD-3-Clause",
- "optional": true,
- "engines": {
- "node": ">=0.6"
- }
+ "node_modules/querystringify": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
+ "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
+ "license": "MIT",
+ "optional": true
},
"node_modules/queue-microtask": {
"version": "1.2.3",
@@ -5351,102 +4998,6 @@
"node": ">= 12.13.0"
}
},
- "node_modules/request": {
- "version": "2.88.2",
- "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
- "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
- "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142",
- "license": "Apache-2.0",
- "optional": true,
- "dependencies": {
- "aws-sign2": "~0.7.0",
- "aws4": "^1.8.0",
- "caseless": "~0.12.0",
- "combined-stream": "~1.0.6",
- "extend": "~3.0.2",
- "forever-agent": "~0.6.1",
- "form-data": "~2.3.2",
- "har-validator": "~5.1.3",
- "http-signature": "~1.2.0",
- "is-typedarray": "~1.0.0",
- "isstream": "~0.1.2",
- "json-stringify-safe": "~5.0.1",
- "mime-types": "~2.1.19",
- "oauth-sign": "~0.9.0",
- "performance-now": "^2.1.0",
- "qs": "~6.5.2",
- "safe-buffer": "^5.1.2",
- "tough-cookie": "~2.5.0",
- "tunnel-agent": "^0.6.0",
- "uuid": "^3.3.2"
- },
- "engines": {
- "node": ">= 6"
- }
- },
- "node_modules/request-promise-core": {
- "version": "1.1.4",
- "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz",
- "integrity": "sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==",
- "license": "ISC",
- "optional": true,
- "dependencies": {
- "lodash": "^4.17.19"
- },
- "engines": {
- "node": ">=0.10.0"
- },
- "peerDependencies": {
- "request": "^2.34"
- }
- },
- "node_modules/request-promise-native": {
- "version": "1.0.9",
- "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.9.tgz",
- "integrity": "sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==",
- "deprecated": "request-promise-native has been deprecated because it extends the now deprecated request package, see https://github.com/request/request/issues/3142",
- "license": "ISC",
- "optional": true,
- "dependencies": {
- "request-promise-core": "1.1.4",
- "stealthy-require": "^1.1.1",
- "tough-cookie": "^2.3.3"
- },
- "engines": {
- "node": ">=0.12.0"
- },
- "peerDependencies": {
- "request": "^2.34"
- }
- },
- "node_modules/request-promise-native/node_modules/tough-cookie": {
- "version": "2.5.0",
- "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
- "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
- "license": "BSD-3-Clause",
- "optional": true,
- "dependencies": {
- "psl": "^1.1.28",
- "punycode": "^2.1.1"
- },
- "engines": {
- "node": ">=0.8"
- }
- },
- "node_modules/request/node_modules/tough-cookie": {
- "version": "2.5.0",
- "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
- "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
- "license": "BSD-3-Clause",
- "optional": true,
- "dependencies": {
- "psl": "^1.1.28",
- "punycode": "^2.1.1"
- },
- "engines": {
- "node": ">=0.8"
- }
- },
"node_modules/require-from-string": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
@@ -5456,6 +5007,13 @@
"node": ">=0.10.0"
}
},
+ "node_modules/requires-port": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+ "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
+ "license": "MIT",
+ "optional": true
+ },
"node_modules/resolve": {
"version": "1.22.10",
"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz",
@@ -5691,16 +5249,16 @@
"optional": true
},
"node_modules/saxes": {
- "version": "3.1.11",
- "resolved": "https://registry.npmjs.org/saxes/-/saxes-3.1.11.tgz",
- "integrity": "sha512-Ydydq3zC+WYDJK1+gRxRapLIED9PWeSuuS41wqyoRmzvhhh9nc+QQrVMKJYzJFULazeGhzSV0QleN2wD3boh2g==",
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz",
+ "integrity": "sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==",
"license": "ISC",
"optional": true,
"dependencies": {
- "xmlchars": "^2.1.1"
+ "xmlchars": "^2.2.0"
},
"engines": {
- "node": ">=8"
+ "node": ">=v12.22.7"
}
},
"node_modules/secure-json-parse": {
@@ -5948,42 +5506,6 @@
"node": ">= 10.x"
}
},
- "node_modules/sshpk": {
- "version": "1.18.0",
- "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.18.0.tgz",
- "integrity": "sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==",
- "license": "MIT",
- "optional": true,
- "dependencies": {
- "asn1": "~0.2.3",
- "assert-plus": "^1.0.0",
- "bcrypt-pbkdf": "^1.0.0",
- "dashdash": "^1.12.0",
- "ecc-jsbn": "~0.1.1",
- "getpass": "^0.1.1",
- "jsbn": "~0.1.0",
- "safer-buffer": "^2.0.2",
- "tweetnacl": "~0.14.0"
- },
- "bin": {
- "sshpk-conv": "bin/sshpk-conv",
- "sshpk-sign": "bin/sshpk-sign",
- "sshpk-verify": "bin/sshpk-verify"
- },
- "engines": {
- "node": ">=0.10.0"
- }
- },
- "node_modules/stealthy-require": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
- "integrity": "sha512-ZnWpYnYugiOVEY5GkcuJK1io5V8QmNYChG62gSit9pQVGErXtrKuPC55ITaVSukmMta5qpMU7vqLt2Lnni4f/g==",
- "license": "ISC",
- "optional": true,
- "engines": {
- "node": ">=0.10.0"
- }
- },
"node_modules/streamx": {
"version": "2.21.1",
"resolved": "https://registry.npmjs.org/streamx/-/streamx-2.21.1.tgz",
@@ -6306,28 +5828,32 @@
}
},
"node_modules/tough-cookie": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz",
- "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==",
+ "version": "4.1.4",
+ "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.4.tgz",
+ "integrity": "sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==",
"license": "BSD-3-Clause",
"optional": true,
"dependencies": {
- "ip-regex": "^2.1.0",
- "psl": "^1.1.28",
- "punycode": "^2.1.1"
+ "psl": "^1.1.33",
+ "punycode": "^2.1.1",
+ "universalify": "^0.2.0",
+ "url-parse": "^1.5.3"
},
"engines": {
"node": ">=6"
}
},
"node_modules/tr46": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz",
- "integrity": "sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==",
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz",
+ "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==",
"license": "MIT",
"optional": true,
"dependencies": {
- "punycode": "^2.1.0"
+ "punycode": "^2.1.1"
+ },
+ "engines": {
+ "node": ">=12"
}
},
"node_modules/ts-api-utils": {
@@ -6386,18 +5912,6 @@
}
}
},
- "node_modules/ts-node/node_modules/acorn-walk": {
- "version": "8.3.4",
- "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz",
- "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==",
- "license": "MIT",
- "dependencies": {
- "acorn": "^8.11.0"
- },
- "engines": {
- "node": ">=0.4.0"
- }
- },
"node_modules/tslib": {
"version": "2.8.1",
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
@@ -6405,26 +5919,6 @@
"dev": true,
"license": "0BSD"
},
- "node_modules/tunnel-agent": {
- "version": "0.6.0",
- "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
- "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
- "license": "Apache-2.0",
- "optional": true,
- "dependencies": {
- "safe-buffer": "^5.0.1"
- },
- "engines": {
- "node": "*"
- }
- },
- "node_modules/tweetnacl": {
- "version": "0.14.5",
- "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
- "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==",
- "license": "Unlicense",
- "optional": true
- },
"node_modules/type-check": {
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
@@ -6510,111 +6004,107 @@
"integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
"license": "MIT"
},
+ "node_modules/universalify": {
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
+ "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
+ "license": "MIT",
+ "optional": true,
+ "engines": {
+ "node": ">= 4.0.0"
+ }
+ },
"node_modules/uri-js": {
"version": "4.4.1",
"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
"integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
- "devOptional": true,
+ "dev": true,
"license": "BSD-2-Clause",
"dependencies": {
"punycode": "^2.1.0"
}
},
+ "node_modules/url-parse": {
+ "version": "1.5.10",
+ "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+ "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
+ "license": "MIT",
+ "optional": true,
+ "dependencies": {
+ "querystringify": "^2.1.1",
+ "requires-port": "^1.0.0"
+ }
+ },
"node_modules/util-deprecate": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
"integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
"license": "MIT"
},
- "node_modules/uuid": {
- "version": "3.4.0",
- "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
- "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
- "deprecated": "Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details.",
- "license": "MIT",
- "optional": true,
- "bin": {
- "uuid": "bin/uuid"
- }
- },
"node_modules/v8-compile-cache-lib": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
"integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==",
"license": "MIT"
},
- "node_modules/verror": {
- "version": "1.10.0",
- "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
- "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==",
- "engines": [
- "node >=0.6.0"
- ],
- "license": "MIT",
- "optional": true,
- "dependencies": {
- "assert-plus": "^1.0.0",
- "core-util-is": "1.0.2",
- "extsprintf": "^1.2.0"
- }
- },
- "node_modules/w3c-hr-time": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
- "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
- "deprecated": "Use your platform's native performance.now() and performance.timeOrigin.",
- "license": "MIT",
- "optional": true,
- "dependencies": {
- "browser-process-hrtime": "^1.0.0"
- }
- },
"node_modules/w3c-xmlserializer": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-1.1.2.tgz",
- "integrity": "sha512-p10l/ayESzrBMYWRID6xbuCKh2Fp77+sA0doRuGn4tTIMrrZVeqfpKjXHY+oDh3K4nLdPgNwMTVP6Vp4pvqbNg==",
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz",
+ "integrity": "sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==",
"license": "MIT",
"optional": true,
"dependencies": {
- "domexception": "^1.0.1",
- "webidl-conversions": "^4.0.2",
- "xml-name-validator": "^3.0.0"
+ "xml-name-validator": "^4.0.0"
+ },
+ "engines": {
+ "node": ">=14"
}
},
"node_modules/webidl-conversions": {
- "version": "4.0.2",
- "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
- "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==",
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
+ "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
"license": "BSD-2-Clause",
- "optional": true
+ "optional": true,
+ "engines": {
+ "node": ">=12"
+ }
},
"node_modules/whatwg-encoding": {
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
- "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz",
+ "integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==",
"license": "MIT",
"optional": true,
"dependencies": {
- "iconv-lite": "0.4.24"
+ "iconv-lite": "0.6.3"
+ },
+ "engines": {
+ "node": ">=12"
}
},
"node_modules/whatwg-mimetype": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
- "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==",
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz",
+ "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==",
"license": "MIT",
- "optional": true
+ "optional": true,
+ "engines": {
+ "node": ">=12"
+ }
},
"node_modules/whatwg-url": {
- "version": "7.1.0",
- "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz",
- "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==",
+ "version": "11.0.0",
+ "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz",
+ "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==",
"license": "MIT",
"optional": true,
"dependencies": {
- "lodash.sortby": "^4.7.0",
- "tr46": "^1.0.1",
- "webidl-conversions": "^4.0.2"
+ "tr46": "^3.0.0",
+ "webidl-conversions": "^7.0.0"
+ },
+ "engines": {
+ "node": ">=12"
}
},
"node_modules/which": {
@@ -6645,7 +6135,7 @@
"version": "1.2.5",
"resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
"integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
- "devOptional": true,
+ "dev": true,
"license": "MIT",
"engines": {
"node": ">=0.10.0"
@@ -6749,17 +6239,17 @@
"license": "ISC"
},
"node_modules/ws": {
- "version": "7.5.10",
- "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
- "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
+ "version": "8.18.0",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
+ "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
"license": "MIT",
"optional": true,
"engines": {
- "node": ">=8.3.0"
+ "node": ">=10.0.0"
},
"peerDependencies": {
"bufferutil": "^4.0.1",
- "utf-8-validate": "^5.0.2"
+ "utf-8-validate": ">=5.0.2"
},
"peerDependenciesMeta": {
"bufferutil": {
@@ -6771,11 +6261,14 @@
}
},
"node_modules/xml-name-validator": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
- "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz",
+ "integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==",
"license": "Apache-2.0",
- "optional": true
+ "optional": true,
+ "engines": {
+ "node": ">=12"
+ }
},
"node_modules/xmlchars": {
"version": "2.2.0",
@@ -6832,12 +6325,11 @@
"license": "ISC",
"dependencies": {
"canvas": "^2.11.2",
- "fabric": "^4.6.0",
+ "fabric": "^6.5.4",
"gsap": "^3.12.5"
},
"devDependencies": {
"@rollup/plugin-typescript": "^12.1.2",
- "@types/fabric": "^5.3.9",
"rollup": "^4.29.1",
"tslib": "^2.8.1"
}
@@ -6848,12 +6340,10 @@
"license": "ISC",
"dependencies": {
"canvas": "^2.11.2",
- "fabric": "^4.6.0",
+ "fabric": "^6.5.4",
"gsap": "^3.12.5"
},
- "devDependencies": {
- "@types/fabric": "^5.3.9"
- }
+ "devDependencies": {}
},
"packages/templates": {
"name": "bumpgen-templates",
@@ -6861,13 +6351,12 @@
"license": "ISC",
"dependencies": {
"canvas": "^2.11.2",
- "fabric": "^4.6.0",
+ "fabric": "^6.5.4",
"gsap": "^3.12.5"
},
"devDependencies": {
"@swc/cli": "^0.5.2",
- "@swc/core": "^1.10.4",
- "@types/fabric": "^5.3.9"
+ "@swc/core": "^1.10.4"
}
}
}
diff --git a/packages/example-plugin/package.json b/packages/example-plugin/package.json
index 607aaca..a2851fc 100644
--- a/packages/example-plugin/package.json
+++ b/packages/example-plugin/package.json
@@ -15,12 +15,11 @@
"description": "",
"dependencies": {
"canvas": "^2.11.2",
- "fabric": "^4.6.0",
+ "fabric": "^6.5.4",
"gsap": "^3.12.5"
},
"devDependencies": {
"@rollup/plugin-typescript": "^12.1.2",
- "@types/fabric": "^5.3.9",
"rollup": "^4.29.1",
"tslib": "^2.8.1"
}
diff --git a/packages/shared/package.json b/packages/shared/package.json
index 4391b7d..9fecfe9 100644
--- a/packages/shared/package.json
+++ b/packages/shared/package.json
@@ -20,10 +20,9 @@
"description": "",
"dependencies": {
"canvas": "^2.11.2",
- "fabric": "^4.6.0",
+ "fabric": "^6.5.4",
"gsap": "^3.12.5"
},
"devDependencies": {
- "@types/fabric": "^5.3.9"
}
}
diff --git a/packages/shared/src/types.ts b/packages/shared/src/types.ts
index e194028..e977a27 100644
--- a/packages/shared/src/types.ts
+++ b/packages/shared/src/types.ts
@@ -1,5 +1,5 @@
import "gsap";
-import { fabric } from "fabric";
+import * as fabric from "fabric/node";
export interface VideoOverlay {
title: string;
diff --git a/packages/templates/package.json b/packages/templates/package.json
index 43c6e41..fb9d2aa 100644
--- a/packages/templates/package.json
+++ b/packages/templates/package.json
@@ -19,12 +19,11 @@
"description": "",
"dependencies": {
"canvas": "^2.11.2",
- "fabric": "^4.6.0",
+ "fabric": "^6.5.4",
"gsap": "^3.12.5"
},
"devDependencies": {
"@swc/cli": "^0.5.2",
- "@swc/core": "^1.10.4",
- "@types/fabric": "^5.3.9"
+ "@swc/core": "^1.10.4"
}
}
diff --git a/packages/templates/src/centre-title-and-time.ts b/packages/templates/src/centre-title-and-time.ts
index 2b9f5fd..46d2227 100644
--- a/packages/templates/src/centre-title-and-time.ts
+++ b/packages/templates/src/centre-title-and-time.ts
@@ -1,9 +1,10 @@
import type { BumpGenPlugin, FabricTemplate } from "bumpgen-shared/types";
+import type { FabricObject } from "fabric";
export const centreTitleAndTime: FabricTemplate =
(overlay, { convertX, convertY, getFontProperties }) =>
(fabric, canvas) => {
- const textGroupObjects: fabric.Object[] = [];
+ const textGroupObjects: FabricObject[] = [];
const fontProperties = getFontProperties("Poppins");
if (overlay.start) {
@@ -14,7 +15,7 @@ export const centreTitleAndTime: FabricTemplate =
});
const time = startString
- ? new fabric.Text(startString, {
+ ? new fabric.FabricText(startString, {
...fontProperties,
originX: "center",
fontSize: 80,
@@ -29,7 +30,7 @@ export const centreTitleAndTime: FabricTemplate =
const titleText = overlay.episode
? `${overlay.title} | ${overlay.episode}`
: overlay.title;
- const title = new fabric.Text(titleText, {
+ const title = new fabric.FabricText(titleText, {
...fontProperties,
originX: "center",
top: timeBounding && timeBounding.height + 20,
From 8a384ab33778be96162a363d2469e959cc62827b Mon Sep 17 00:00:00 2001
From: Olly Namey <9575458+OllysCoding@users.noreply.github.com>
Date: Mon, 6 Jan 2025 23:18:08 +0000
Subject: [PATCH 2/4] prettier
---
apps/backend/src/canvas2video/encoder.ts | 5 +----
apps/backend/src/canvas2video/renderer.ts | 1 -
packages/shared/package.json | 3 +--
3 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/apps/backend/src/canvas2video/encoder.ts b/apps/backend/src/canvas2video/encoder.ts
index beb85eb..aedc260 100644
--- a/apps/backend/src/canvas2video/encoder.ts
+++ b/apps/backend/src/canvas2video/encoder.ts
@@ -4,10 +4,7 @@ import * as path from "path";
import { type Encoder } from "./types.js";
import { logError } from "../logger/index.js";
-const createDir = (
- reject: (reason?: Error) => void,
- output: string,
-) => {
+const createDir = (reject: (reason?: Error) => void, output: string) => {
try {
const outDir = path.dirname(output);
if (!fs.existsSync(outDir)) {
diff --git a/apps/backend/src/canvas2video/renderer.ts b/apps/backend/src/canvas2video/renderer.ts
index 4645e1d..7eaefad 100644
--- a/apps/backend/src/canvas2video/renderer.ts
+++ b/apps/backend/src/canvas2video/renderer.ts
@@ -26,7 +26,6 @@ const renderer: Renderer = (config) =>
const renderFrames = () => {
anim.progress(currentFrame++ / totalFrames);
if (currentFrame <= totalFrames) {
-
canvas.renderAll();
const buffer = Buffer.from(
canvas.toDataURL().replace(/^data:\w+\/\w+;base64,/, ""),
diff --git a/packages/shared/package.json b/packages/shared/package.json
index 9fecfe9..1d9e537 100644
--- a/packages/shared/package.json
+++ b/packages/shared/package.json
@@ -23,6 +23,5 @@
"fabric": "^6.5.4",
"gsap": "^3.12.5"
},
- "devDependencies": {
- }
+ "devDependencies": {}
}
From 19f7c6b840b3eb112c70749ab0be333686e2b039 Mon Sep 17 00:00:00 2001
From: Olly Namey <9575458+OllysCoding@users.noreply.github.com>
Date: Sun, 12 Jan 2025 15:28:08 +0000
Subject: [PATCH 3/4] create new templates
---
.vscode/extensions.json | 3 +
.vscode/settings.json | 7 ++
README.md | 40 +++++++
apps/backend/src/canvas2video/types.ts | 2 +-
apps/backend/src/config/app.ts | 4 +-
apps/backend/src/jobs/main.ts | 21 ++--
apps/backend/src/video-generator/index.ts | 80 +++++++------
apps/backend/src/xmltv/index.ts | 19 +--
.../template_centre-title-and-time.png | Bin 0 -> 8994942 bytes
docs/screenshots/template_left-panel-info.png | Bin 0 -> 5796939 bytes
.../template_left-panel-next-five.png | Bin 0 -> 5536168 bytes
eslint.config.mjs | 5 +
package.json | 4 +-
packages/shared/.swcrc | 8 ++
packages/shared/package.json | 9 +-
packages/shared/src/index.ts | 2 -
packages/shared/src/utils.ts | 13 +++
packages/shared/{src => }/types.ts | 7 +-
.../templates/src/centre-title-and-time.ts | 22 ++--
packages/templates/src/left-panel-info.ts | 110 +++++++++++++++++-
.../templates/src/left-panel-next-five.ts | 102 ++++++++++++++++
21 files changed, 383 insertions(+), 75 deletions(-)
create mode 100644 .vscode/extensions.json
create mode 100644 .vscode/settings.json
create mode 100644 docs/screenshots/template_centre-title-and-time.png
create mode 100644 docs/screenshots/template_left-panel-info.png
create mode 100644 docs/screenshots/template_left-panel-next-five.png
create mode 100644 packages/shared/.swcrc
delete mode 100644 packages/shared/src/index.ts
create mode 100644 packages/shared/src/utils.ts
rename packages/shared/{src => }/types.ts (87%)
create mode 100644 packages/templates/src/left-panel-next-five.ts
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
new file mode 100644
index 0000000..1d7ac85
--- /dev/null
+++ b/.vscode/extensions.json
@@ -0,0 +1,3 @@
+{
+ "recommendations": ["dbaeumer.vscode-eslint", "esbenp.prettier-vscode"]
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..ee214f9
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,7 @@
+{
+ "editor.defaultFormatter": "esbenp.prettier-vscode",
+ "editor.formatOnSave": true,
+ "editor.codeActionsOnSave": {
+ "source.fixAll.eslint": "explicit"
+ }
+}
diff --git a/README.md b/README.md
index 7f82739..3eb60d7 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,13 @@ Bumper content are clips which can be used inbetween the main content of your TV
A file is output for each channel on your service, and which is replaced each time a new show starts (with an updated bumper based on what will be playing next). This content can then be imported in your chosen IPTV service.
+---
+
+🛠️ Project under active development 🛠️
+There is no official release yet (though dev releases are available on ollyscoding/bumpgen-test:<commit-sha>), and breaking changes will be actively made until v0.1 is released
+
+---
+
## Getting Started
You can run bumpgen through docker compose, create a docker compose file from the [the template](./docs/compose.yml).
@@ -13,3 +20,36 @@ You'll need to update the `/path/to/your/output` and `/path/to/your/background-c
If you haven't already, create the config directory, then create a file called `bumpgen.config.json` within it, and copy across the contents of [bumpgen.config.example.json](./configs/bumpgen.config.example.json). Then add the URL for your XML TV file, and change any other settings as desired.
You should now be good to go, run `docker compose up -d` to get started!
+
+### Templates
+
+Bumpgen offers a number of default templates to use for your channels, as well as exerimental plugin support if you want to develop your own templates.
+
+
+
+ | Name |
+ Example |
+
+
+ centre-title-and-time |
+  |
+
+
+ left-panel-info |
+  |
+
+
+ left-panel-next-five |
+  |
+
+
+
+
+## What's still needed for MVP?
+
+- Give templates all upcoming shows not just the next one & build 'left-panel-next-5' template
+- Options for resolution (per channel)
+- Option for length including \* as 'fill'
+- Plugins: some kind of versioning + publish types + example repo + language/locale in template
+- Frontend for configuring
+- Allow animations?
diff --git a/apps/backend/src/canvas2video/types.ts b/apps/backend/src/canvas2video/types.ts
index 55760f9..cffe189 100644
--- a/apps/backend/src/canvas2video/types.ts
+++ b/apps/backend/src/canvas2video/types.ts
@@ -32,7 +32,7 @@ type makeSceneFunction = (
canvas: fabric.StaticCanvas,
anim: gsap.core.Timeline,
compose: () => void,
-) => void;
+) => Promise;
export interface RendererConfig {
width: number;
diff --git a/apps/backend/src/config/app.ts b/apps/backend/src/config/app.ts
index 530c79a..7aa1ba1 100644
--- a/apps/backend/src/config/app.ts
+++ b/apps/backend/src/config/app.ts
@@ -12,7 +12,7 @@ addFormats(ajv);
type ChannelId = string;
export interface ChannelConfig {
- template: "centre-title-and-time";
+ template: string;
backgroundContent: "*" | string[];
}
@@ -54,7 +54,7 @@ const schema: JSONSchemaType = {
properties: {
template: {
type: "string",
- enum: ["centre-title-and-time"],
+ // enum: ["centre-title-and-time"],
},
backgroundContent: {
oneOf: [
diff --git a/apps/backend/src/jobs/main.ts b/apps/backend/src/jobs/main.ts
index 5dc54ce..9dda487 100644
--- a/apps/backend/src/jobs/main.ts
+++ b/apps/backend/src/jobs/main.ts
@@ -1,6 +1,6 @@
import {
fetchAndParseXmlTv,
- getNextProgrammeForChannel,
+ getNextProgrammesForChannel,
getValueForConfiguredLang,
} from "../xmltv/index.js";
import {
@@ -12,7 +12,7 @@ import {
type Result,
} from "../result/index.js";
import {
- createOverlayConfigFromProgramme,
+ createProgrammeInfoFromProgrammes,
makeVideo,
} from "../video-generator/index.js";
import { appConfig, type ChannelConfig } from "../config/app.js";
@@ -67,14 +67,17 @@ const channelTask = async (
programmes: XmltvProgramme[],
channelConfig: ChannelConfig,
): ReturnType => {
- const currentProgramme = getNextProgrammeForChannel(channel, programmes);
- if (isFailure(currentProgramme)) {
- return failure("Failed to get next programme", currentProgramme.error);
+ const nextProgrammes = getNextProgrammesForChannel(channel, programmes);
+ if (isFailure(nextProgrammes)) {
+ return failure("Failed to get next programme", nextProgrammes.error);
}
- const overlay = createOverlayConfigFromProgramme(currentProgramme.result);
- if (isFailure(overlay)) {
- return failure("Failed to get overlay config", overlay.error);
+ const programmeInfo = createProgrammeInfoFromProgrammes(
+ nextProgrammes.result,
+ );
+
+ if (isFailure(programmeInfo)) {
+ return failure("Failed to get overlay config", programmeInfo.error);
}
const backgroundContentPath =
@@ -90,7 +93,7 @@ const channelTask = async (
return makeVideo({
template: template.result,
- overlay: overlay.result,
+ programmes: programmeInfo.result,
outputDir: appConfig.outputFolder,
outputFileName: `channel-${channel.id}.mp4`,
length: 20,
diff --git a/apps/backend/src/video-generator/index.ts b/apps/backend/src/video-generator/index.ts
index b0b6fed..c44dd6b 100644
--- a/apps/backend/src/video-generator/index.ts
+++ b/apps/backend/src/video-generator/index.ts
@@ -1,5 +1,7 @@
import type { XmltvProgramme } from "@iptv/xmltv";
-import type { FabricTemplate } from "bumpgen-shared/types";
+import type { FabricTemplate, ProgrammeInfo } from "bumpgen-shared/types";
+import { isNotUndefined } from "bumpgen-shared/utils";
+
import {
failure,
isFailure,
@@ -22,15 +24,6 @@ import { logDebug, logError } from "../logger/index.js";
import { existsSync } from "node:fs";
import { Fonts } from "../fonts/index.js";
-export interface VideoOverlay {
- title: string;
- subtitle?: string;
- episode?: string;
- description?: string;
- iconUrl?: string;
- start?: Date;
-}
-
export interface ChannelInfo {
id: string;
name?: string;
@@ -44,7 +37,7 @@ export interface VideoBackground {
export interface VideoOptions {
channelInfo: ChannelInfo;
- overlay: VideoOverlay;
+ programmes: [ProgrammeInfo, ...ProgrammeInfo[]];
background?: VideoBackground;
outputDir: string;
outputFileName: string;
@@ -72,7 +65,7 @@ const getBackgroundVideoStartAndEnd = (
};
const getProgrammeId = (options: VideoOptions) =>
- `${options.overlay.title}-${options.overlay.episode}`;
+ `${options.programmes[0].title}-${options.programmes[0].episode}`;
const shouldGenerateVideo = async (
options: VideoOptions,
@@ -134,8 +127,8 @@ export const makeVideo = async (
width,
height,
fps: 1,
- makeScene: (fabric, canvas, anim, compose) => {
- options.template(options.overlay, {
+ makeScene: async (fabric, canvas, anim, compose) => {
+ await options.template(options.programmes, {
getFontProperties: (...args) => Fonts.getFontProperties(...args),
convertX: (val: number) => val * width,
convertY: (val: number) => val * height,
@@ -183,25 +176,46 @@ export const makeVideo = async (
}
};
-export const createOverlayConfigFromProgramme = (
- programme: XmltvProgramme,
-): Result => {
- const title = getValueForConfiguredLang(programme.title);
- if (isFailure(title)) {
- return failure("Title required to create overlay");
+export const createProgrammeInfoFromProgrammes = (
+ programmes: [XmltvProgramme, ...XmltvProgramme[]],
+): Result<[ProgrammeInfo, ...ProgrammeInfo[]]> => {
+ const createProgrammeInfo = (
+ programme: XmltvProgramme,
+ ): Result => {
+ const title = getValueForConfiguredLang(programme.title);
+ if (isFailure(title)) {
+ return failure("Title required to create overlay");
+ }
+
+ const subtitle = getValueForConfiguredLang(programme.subTitle);
+ const episode = getOnScreenEpisodeNumber(programme.episodeNum);
+ const description = getValueForConfiguredLang(programme.desc);
+ const iconUrl = getBestIcon(programme.icon);
+
+ return success({
+ title: title.result,
+ subtitle: unwrap(subtitle),
+ episode: unwrap(episode),
+ description: unwrap(description),
+ start: programme.start,
+ end: programme.stop,
+ iconUrl: unwrap(iconUrl),
+ });
+ };
+
+ const firstItemResult = createProgrammeInfo(programmes[0]);
+
+ if (isFailure(firstItemResult)) {
+ // Pass on the failure
+ return firstItemResult;
}
- const subtitle = getValueForConfiguredLang(programme.subTitle);
- const episode = getOnScreenEpisodeNumber(programme.episodeNum);
- const description = getValueForConfiguredLang(programme.desc);
- const iconUrl = getBestIcon(programme.icon);
-
- return success({
- title: title.result,
- subtitle: unwrap(subtitle),
- episode: unwrap(episode),
- description: unwrap(description),
- start: programme.start,
- iconUrl: unwrap(iconUrl),
- });
+ return success([
+ firstItemResult.result,
+ ...programmes
+ .slice(1)
+ .map(createProgrammeInfo)
+ .map(unwrap)
+ .filter(isNotUndefined),
+ ]);
};
diff --git a/apps/backend/src/xmltv/index.ts b/apps/backend/src/xmltv/index.ts
index a6be9b4..56b6e04 100644
--- a/apps/backend/src/xmltv/index.ts
+++ b/apps/backend/src/xmltv/index.ts
@@ -21,7 +21,9 @@ export const fetchAndParseXmlTv = async (
try {
const response = await fetch(path);
const body = await response.text();
- const xmlTv = parseXmltv(body);
+ // Fix a weird bug where the apostrophe specifically isn't decoded
+ const bodyFixed = body.replaceAll("'", "'");
+ const xmlTv = parseXmltv(bodyFixed);
const { channels, programmes } = xmlTv;
if (!channels) {
@@ -40,29 +42,32 @@ export const fetchAndParseXmlTv = async (
}
};
-export const getNextProgrammeForChannel = (
+export const getNextProgrammesForChannel = (
channel: XmltvChannel,
programmes: XmltvProgramme[],
-): Result => {
+): Result<[XmltvProgramme, ...XmltvProgramme[]]> => {
const forChannel = programmes.filter((p) => p.channel === channel.id);
const sorted = [...forChannel].sort((a, b) => {
return a.start.getTime() - b.start.getTime();
});
- const current = sorted.find((programme) => {
+ const nextUpIndex = sorted.findIndex((programme) => {
if (Date.now() < programme.start.getTime()) return true;
else return false;
});
- if (current) {
- return success(current);
- } else {
+ if (nextUpIndex === -1) {
logDebug("Failed to find current program for channel " + channel.id);
return failure(
"Failed to find current programme playing on channel with id " +
channel.id,
);
}
+
+ return success([
+ programmes[nextUpIndex]!,
+ ...programmes.slice(nextUpIndex + 1),
+ ]);
};
export const getOnScreenEpisodeNumber = (
diff --git a/docs/screenshots/template_centre-title-and-time.png b/docs/screenshots/template_centre-title-and-time.png
new file mode 100644
index 0000000000000000000000000000000000000000..58c3fda597dc72f9a3f2815301d41657167996f4
GIT binary patch
literal 8994942
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