@remotion/renderer 2.6.0 → 2.6.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/assets/download-and-map-assets-to-file.js +3 -3
- package/dist/assets/download-and-map-assets-to-file.js.map +1 -1
- package/dist/assets/sanitize-filename.d.ts +2 -0
- package/dist/assets/sanitize-filename.d.ts.map +1 -0
- package/dist/assets/sanitize-filename.js +59 -0
- package/dist/assets/sanitize-filename.js.map +1 -0
- package/dist/assets/sanitize-filepath.d.ts +2 -0
- package/dist/assets/sanitize-filepath.d.ts.map +1 -0
- package/dist/assets/sanitize-filepath.js +16 -0
- package/dist/assets/sanitize-filepath.js.map +1 -0
- package/dist/assets/truncate-utf8-bytes.d.ts +2 -0
- package/dist/assets/truncate-utf8-bytes.d.ts.map +1 -0
- package/dist/assets/truncate-utf8-bytes.js +38 -0
- package/dist/assets/truncate-utf8-bytes.js.map +1 -0
- package/dist/create-ffmpeg-complex-filter.d.ts +4 -1
- package/dist/create-ffmpeg-complex-filter.d.ts.map +1 -1
- package/dist/ensure-frames-in-order.d.ts +1 -2
- package/dist/ensure-frames-in-order.d.ts.map +1 -1
- package/dist/ensure-frames-in-order.js +3 -9
- package/dist/ensure-frames-in-order.js.map +1 -1
- package/dist/get-compositions.d.ts +1 -0
- package/dist/get-compositions.d.ts.map +1 -1
- package/dist/get-compositions.js +3 -0
- package/dist/get-compositions.js.map +1 -1
- package/dist/render-media.d.ts +4 -3
- package/dist/render-media.d.ts.map +1 -1
- package/dist/render-media.js +4 -2
- package/dist/render-media.js.map +1 -1
- package/dist/render-still.d.ts +2 -1
- package/dist/render-still.d.ts.map +1 -1
- package/dist/render-still.js +4 -1
- package/dist/render-still.js.map +1 -1
- package/dist/render.d.ts +2 -1
- package/dist/render.d.ts.map +1 -1
- package/dist/render.js +4 -1
- package/dist/render.js.map +1 -1
- package/dist/set-props-and-env.d.ts +2 -1
- package/dist/set-props-and-env.d.ts.map +1 -1
- package/dist/set-props-and-env.js +22 -16
- package/dist/set-props-and-env.js.map +1 -1
- package/dist/validate-puppeteer-timeout.d.ts +2 -0
- package/dist/validate-puppeteer-timeout.d.ts.map +1 -0
- package/dist/validate-puppeteer-timeout.js +25 -0
- package/dist/validate-puppeteer-timeout.js.map +1 -0
- package/package.json +4 -5
|
@@ -9,7 +9,7 @@ const fs_2 = require("fs");
|
|
|
9
9
|
const got_1 = __importDefault(require("got"));
|
|
10
10
|
const path_1 = __importDefault(require("path"));
|
|
11
11
|
const remotion_1 = require("remotion");
|
|
12
|
-
const
|
|
12
|
+
const sanitize_filepath_1 = require("./sanitize-filepath");
|
|
13
13
|
const isDownloadingMap = {};
|
|
14
14
|
const hasBeenDownloadedMap = {};
|
|
15
15
|
const listeners = {};
|
|
@@ -129,14 +129,14 @@ const getSanitizedFilenameForAssetUrl = ({ src, isRemote, webpackBundle, }) => {
|
|
|
129
129
|
}
|
|
130
130
|
const { pathname, search } = new URL(src);
|
|
131
131
|
if (!isRemote) {
|
|
132
|
-
return path_1.default.join(webpackBundle, (0,
|
|
132
|
+
return path_1.default.join(webpackBundle, (0, sanitize_filepath_1.sanitizeFilePath)(pathname));
|
|
133
133
|
}
|
|
134
134
|
const split = pathname.split('.');
|
|
135
135
|
const fileExtension = split.length > 1 && split[split.length - 1]
|
|
136
136
|
? `.${split[split.length - 1]}`
|
|
137
137
|
: '';
|
|
138
138
|
const hashedFileName = String((0, remotion_1.random)(`${pathname}${search}`)).replace('0.', '');
|
|
139
|
-
return path_1.default.join(webpackBundle, (0,
|
|
139
|
+
return path_1.default.join(webpackBundle, (0, sanitize_filepath_1.sanitizeFilePath)(hashedFileName + fileExtension));
|
|
140
140
|
};
|
|
141
141
|
exports.getSanitizedFilenameForAssetUrl = getSanitizedFilenameForAssetUrl;
|
|
142
142
|
const downloadAndMapAssetsToFileUrl = async ({ localhostAsset, webpackBundle, onDownload, }) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"download-and-map-assets-to-file.js","sourceRoot":"","sources":["../../src/assets/download-and-map-assets-to-file.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,2BAAgD;AAChD,8CAAsB;AACtB,gDAAwB;AAExB,uCAAmD;AACnD,
|
|
1
|
+
{"version":3,"file":"download-and-map-assets-to-file.js","sourceRoot":"","sources":["../../src/assets/download-and-map-assets-to-file.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sanitize-filename.d.ts","sourceRoot":"","sources":["../../src/assets/sanitize-filename.ts"],"names":[],"mappings":"AAoDA,eAAO,MAAM,gBAAgB,UAAW,MAAM,WAQ7C,CAAC"}
|
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
// Inlined from https://github.com/parshap/node-sanitize-filename/blob/master/index.js
|
|
3
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
|
+
exports.sanitizeFilename = void 0;
|
|
5
|
+
const truncate_utf8_bytes_1 = require("./truncate-utf8-bytes");
|
|
6
|
+
/**
|
|
7
|
+
* Replaces characters in strings that are illegal/unsafe for filenames.
|
|
8
|
+
* Unsafe characters are either removed or replaced by a substitute set
|
|
9
|
+
* in the optional `options` object.
|
|
10
|
+
*
|
|
11
|
+
* Illegal Characters on Various Operating Systems
|
|
12
|
+
* / ? < > \ : * | "
|
|
13
|
+
* https://kb.acronis.com/content/39790
|
|
14
|
+
*
|
|
15
|
+
* Unicode Control codes
|
|
16
|
+
* C0 0x00-0x1f & C1 (0x80-0x9f)
|
|
17
|
+
* http://en.wikipedia.org/wiki/C0_and_C1_control_codes
|
|
18
|
+
*
|
|
19
|
+
* Reserved filenames on Unix-based systems (".", "..")
|
|
20
|
+
* Reserved filenames in Windows ("CON", "PRN", "AUX", "NUL", "COM1",
|
|
21
|
+
* "COM2", "COM3", "COM4", "COM5", "COM6", "COM7", "COM8", "COM9",
|
|
22
|
+
* "LPT1", "LPT2", "LPT3", "LPT4", "LPT5", "LPT6", "LPT7", "LPT8", and
|
|
23
|
+
* "LPT9") case-insesitively and with or without filename extensions.
|
|
24
|
+
*
|
|
25
|
+
* Capped at 255 characters in length.
|
|
26
|
+
* http://unix.stackexchange.com/questions/32795/what-is-the-maximum-allowed-filename-and-folder-size-with-ecryptfs
|
|
27
|
+
*
|
|
28
|
+
* @param {String} input Original filename
|
|
29
|
+
* @param {Object} options {replacement: String | Function }
|
|
30
|
+
* @return {String} Sanitized filename
|
|
31
|
+
*/
|
|
32
|
+
const illegalRe = /[/?<>\\:*|"]/g;
|
|
33
|
+
// eslint-disable-next-line no-control-regex
|
|
34
|
+
const controlRe = /[\x00-\x1f\x80-\x9f]/g;
|
|
35
|
+
const reservedRe = /^\.+$/;
|
|
36
|
+
const windowsReservedRe = /^(con|prn|aux|nul|com[0-9]|lpt[0-9])(\..*)?$/i;
|
|
37
|
+
const windowsTrailingRe = /[. ]+$/;
|
|
38
|
+
function sanitize(input, replacement) {
|
|
39
|
+
if (typeof input !== 'string') {
|
|
40
|
+
throw new Error('Input must be string');
|
|
41
|
+
}
|
|
42
|
+
const sanitized = input
|
|
43
|
+
.replace(illegalRe, replacement)
|
|
44
|
+
.replace(controlRe, replacement)
|
|
45
|
+
.replace(reservedRe, replacement)
|
|
46
|
+
.replace(windowsReservedRe, replacement)
|
|
47
|
+
.replace(windowsTrailingRe, replacement);
|
|
48
|
+
return (0, truncate_utf8_bytes_1.truncateUtf8Bytes)(sanitized, 255);
|
|
49
|
+
}
|
|
50
|
+
const sanitizeFilename = (input) => {
|
|
51
|
+
const replacement = '';
|
|
52
|
+
const output = sanitize(input, replacement);
|
|
53
|
+
if (replacement === '') {
|
|
54
|
+
return output;
|
|
55
|
+
}
|
|
56
|
+
return sanitize(output, '');
|
|
57
|
+
};
|
|
58
|
+
exports.sanitizeFilename = sanitizeFilename;
|
|
59
|
+
//# sourceMappingURL=sanitize-filename.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sanitize-filename.js","sourceRoot":"","sources":["../../src/assets/sanitize-filename.ts"],"names":[],"mappings":";AAAA,sFAAsF;;;AAEtF,+DAAwD;AAExD;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAEH,MAAM,SAAS,GAAG,eAAe,CAAC;AAClC,4CAA4C;AAC5C,MAAM,SAAS,GAAG,uBAAuB,CAAC;AAC1C,MAAM,UAAU,GAAG,OAAO,CAAC;AAC3B,MAAM,iBAAiB,GAAG,+CAA+C,CAAC;AAC1E,MAAM,iBAAiB,GAAG,QAAQ,CAAC;AAEnC,SAAS,QAAQ,CAAC,KAAa,EAAE,WAAmB;IACnD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QAC9B,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;KACxC;IAED,MAAM,SAAS,GAAG,KAAK;SACrB,OAAO,CAAC,SAAS,EAAE,WAAW,CAAC;SAC/B,OAAO,CAAC,SAAS,EAAE,WAAW,CAAC;SAC/B,OAAO,CAAC,UAAU,EAAE,WAAW,CAAC;SAChC,OAAO,CAAC,iBAAiB,EAAE,WAAW,CAAC;SACvC,OAAO,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC;IAC1C,OAAO,IAAA,uCAAiB,EAAC,SAAS,EAAE,GAAG,CAAC,CAAC;AAC1C,CAAC;AAEM,MAAM,gBAAgB,GAAG,CAAC,KAAa,EAAE,EAAE;IACjD,MAAM,WAAW,GAAG,EAAE,CAAC;IACvB,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;IAC5C,IAAI,WAAW,KAAK,EAAE,EAAE;QACvB,OAAO,MAAM,CAAC;KACd;IAED,OAAO,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;AAC7B,CAAC,CAAC;AARW,QAAA,gBAAgB,oBAQ3B"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sanitize-filepath.d.ts","sourceRoot":"","sources":["../../src/assets/sanitize-filepath.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,gBAAgB,mBAAoB,MAAM,WAKtD,CAAC"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.sanitizeFilePath = void 0;
|
|
7
|
+
const path_1 = __importDefault(require("path"));
|
|
8
|
+
const sanitize_filename_1 = require("./sanitize-filename");
|
|
9
|
+
const sanitizeFilePath = (pathToSanitize) => {
|
|
10
|
+
return pathToSanitize
|
|
11
|
+
.split(path_1.default.sep)
|
|
12
|
+
.map((s) => (0, sanitize_filename_1.sanitizeFilename)(s))
|
|
13
|
+
.join(path_1.default.sep);
|
|
14
|
+
};
|
|
15
|
+
exports.sanitizeFilePath = sanitizeFilePath;
|
|
16
|
+
//# sourceMappingURL=sanitize-filepath.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sanitize-filepath.js","sourceRoot":"","sources":["../../src/assets/sanitize-filepath.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AACxB,2DAAqD;AAE9C,MAAM,gBAAgB,GAAG,CAAC,cAAsB,EAAE,EAAE;IAC1D,OAAO,cAAc;SACnB,KAAK,CAAC,cAAI,CAAC,GAAG,CAAC;SACf,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,oCAAgB,EAAC,CAAC,CAAC,CAAC;SAC/B,IAAI,CAAC,cAAI,CAAC,GAAG,CAAC,CAAC;AAClB,CAAC,CAAC;AALW,QAAA,gBAAgB,oBAK3B"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"truncate-utf8-bytes.d.ts","sourceRoot":"","sources":["../../src/assets/truncate-utf8-bytes.ts"],"names":[],"mappings":"AAUA,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,UAkCnE"}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.truncateUtf8Bytes = void 0;
|
|
4
|
+
function isHighSurrogate(codePoint) {
|
|
5
|
+
return codePoint >= 0xd800 && codePoint <= 0xdbff;
|
|
6
|
+
}
|
|
7
|
+
function isLowSurrogate(codePoint) {
|
|
8
|
+
return codePoint >= 0xdc00 && codePoint <= 0xdfff;
|
|
9
|
+
}
|
|
10
|
+
const getLength = Buffer.byteLength.bind(Buffer);
|
|
11
|
+
function truncateUtf8Bytes(string, byteLength) {
|
|
12
|
+
if (typeof string !== 'string') {
|
|
13
|
+
throw new Error('Input must be string');
|
|
14
|
+
}
|
|
15
|
+
const charLength = string.length;
|
|
16
|
+
let curByteLength = 0;
|
|
17
|
+
let codePoint;
|
|
18
|
+
let segment;
|
|
19
|
+
for (let i = 0; i < charLength; i += 1) {
|
|
20
|
+
codePoint = string.charCodeAt(i);
|
|
21
|
+
segment = string[i];
|
|
22
|
+
if (isHighSurrogate(codePoint) &&
|
|
23
|
+
isLowSurrogate(string.charCodeAt(i + 1))) {
|
|
24
|
+
i += 1;
|
|
25
|
+
segment += string[i];
|
|
26
|
+
}
|
|
27
|
+
curByteLength += getLength(segment);
|
|
28
|
+
if (curByteLength === byteLength) {
|
|
29
|
+
return string.slice(0, i + 1);
|
|
30
|
+
}
|
|
31
|
+
if (curByteLength > byteLength) {
|
|
32
|
+
return string.slice(0, i - segment.length + 1);
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
return string;
|
|
36
|
+
}
|
|
37
|
+
exports.truncateUtf8Bytes = truncateUtf8Bytes;
|
|
38
|
+
//# sourceMappingURL=truncate-utf8-bytes.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"truncate-utf8-bytes.js","sourceRoot":"","sources":["../../src/assets/truncate-utf8-bytes.ts"],"names":[],"mappings":";;;AAAA,SAAS,eAAe,CAAC,SAAiB;IACzC,OAAO,SAAS,IAAI,MAAM,IAAI,SAAS,IAAI,MAAM,CAAC;AACnD,CAAC;AAED,SAAS,cAAc,CAAC,SAAiB;IACxC,OAAO,SAAS,IAAI,MAAM,IAAI,SAAS,IAAI,MAAM,CAAC;AACnD,CAAC;AAED,MAAM,SAAS,GAAG,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAEjD,SAAgB,iBAAiB,CAAC,MAAc,EAAE,UAAkB;IACnE,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;QAC/B,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;KACxC;IAED,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC;IACjC,IAAI,aAAa,GAAG,CAAC,CAAC;IACtB,IAAI,SAAS,CAAC;IACd,IAAI,OAAO,CAAC;IAEZ,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,EAAE,CAAC,IAAI,CAAC,EAAE;QACvC,SAAS,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QACjC,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QAEpB,IACC,eAAe,CAAC,SAAS,CAAC;YAC1B,cAAc,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EACvC;YACD,CAAC,IAAI,CAAC,CAAC;YACP,OAAO,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC;SACrB;QAED,aAAa,IAAI,SAAS,CAAC,OAAO,CAAC,CAAC;QAEpC,IAAI,aAAa,KAAK,UAAU,EAAE;YACjC,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;SAC9B;QAED,IAAI,aAAa,GAAG,UAAU,EAAE;YAC/B,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;SAC/C;KACD;IAED,OAAO,MAAM,CAAC;AACf,CAAC;AAlCD,8CAkCC"}
|
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
import { FfmpegFilterCalculation } from './calculate-ffmpeg-filters';
|
|
2
2
|
export declare const createFfmpegComplexFilter: (filters: FfmpegFilterCalculation[]) => Promise<{
|
|
3
|
-
complexFilterFlag: [
|
|
3
|
+
complexFilterFlag: [
|
|
4
|
+
string,
|
|
5
|
+
string
|
|
6
|
+
] | null;
|
|
4
7
|
cleanup: () => void;
|
|
5
8
|
}>;
|
|
6
9
|
//# sourceMappingURL=create-ffmpeg-complex-filter.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-ffmpeg-complex-filter.d.ts","sourceRoot":"","sources":["../src/create-ffmpeg-complex-filter.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,uBAAuB,EAAC,MAAM,4BAA4B,CAAC;AAmBnE,eAAO,MAAM,yBAAyB,YAC5B,uBAAuB,EAAE,KAChC,QAAQ;IACV,iBAAiB,EAAE,
|
|
1
|
+
{"version":3,"file":"create-ffmpeg-complex-filter.d.ts","sourceRoot":"","sources":["../src/create-ffmpeg-complex-filter.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,uBAAuB,EAAC,MAAM,4BAA4B,CAAC;AAmBnE,eAAO,MAAM,yBAAyB,YAC5B,uBAAuB,EAAE,KAChC,QAAQ;IACV,iBAAiB,EAAE;QAAC,MAAM;QAAE,MAAM;KAAC,GAAG,IAAI,CAAC;IAC3C,OAAO,EAAE,MAAM,IAAI,CAAC;CACpB,CA2BA,CAAC"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
export declare const ensureFramesInOrder: (frameRange: FrameRange | null) => {
|
|
1
|
+
export declare const ensureFramesInOrder: (frameRange: [number, number]) => {
|
|
3
2
|
waitForRightTimeOfFrameToBeInserted: (frameToBe: number) => Promise<void>;
|
|
4
3
|
setFrameToStitch: (f: number) => void;
|
|
5
4
|
waitForFinish: () => Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ensure-frames-in-order.d.ts","sourceRoot":"","sources":["../src/ensure-frames-in-order.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ensure-frames-in-order.d.ts","sourceRoot":"","sources":["../src/ensure-frames-in-order.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,mBAAmB,eAAgB,CAAC,MAAM,EAAE,MAAM,CAAC;qDAcD,MAAM;0BAWvC,MAAM;;CAcnC,CAAC"}
|
|
@@ -2,12 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ensureFramesInOrder = void 0;
|
|
4
4
|
const ensureFramesInOrder = (frameRange) => {
|
|
5
|
-
let
|
|
6
|
-
let frameToStitch = typeof frameRange === 'number'
|
|
7
|
-
? frameRange
|
|
8
|
-
: frameRange === null
|
|
9
|
-
? 0
|
|
10
|
-
: frameRange[0];
|
|
5
|
+
let [frameToStitch, finalFrame] = frameRange;
|
|
11
6
|
let waiters = [];
|
|
12
7
|
const resolveWaiters = () => {
|
|
13
8
|
for (const waiter of waiters.slice(0)) {
|
|
@@ -18,11 +13,10 @@ const ensureFramesInOrder = (frameRange) => {
|
|
|
18
13
|
}
|
|
19
14
|
};
|
|
20
15
|
const waitForRightTimeOfFrameToBeInserted = async (frameToBe) => {
|
|
21
|
-
lastFrame = Math.max(frameToBe, lastFrame);
|
|
22
16
|
return new Promise((resolve) => {
|
|
23
17
|
waiters.push({
|
|
24
18
|
id: String(Math.random()),
|
|
25
|
-
forFrame:
|
|
19
|
+
forFrame: frameToBe,
|
|
26
20
|
resolve,
|
|
27
21
|
});
|
|
28
22
|
resolveWaiters();
|
|
@@ -33,7 +27,7 @@ const ensureFramesInOrder = (frameRange) => {
|
|
|
33
27
|
resolveWaiters();
|
|
34
28
|
};
|
|
35
29
|
const waitForFinish = async () => {
|
|
36
|
-
await waitForRightTimeOfFrameToBeInserted(
|
|
30
|
+
await waitForRightTimeOfFrameToBeInserted(finalFrame + 1);
|
|
37
31
|
};
|
|
38
32
|
return {
|
|
39
33
|
waitForRightTimeOfFrameToBeInserted,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ensure-frames-in-order.js","sourceRoot":"","sources":["../src/ensure-frames-in-order.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"ensure-frames-in-order.js","sourceRoot":"","sources":["../src/ensure-frames-in-order.ts"],"names":[],"mappings":";;;AAMO,MAAM,mBAAmB,GAAG,CAAC,UAA4B,EAAE,EAAE;IACnE,IAAI,CAAC,aAAa,EAAE,UAAU,CAAC,GAAG,UAAU,CAAC;IAE7C,IAAI,OAAO,GAAa,EAAE,CAAC;IAE3B,MAAM,cAAc,GAAG,GAAG,EAAE;QAC3B,KAAK,MAAM,MAAM,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;YACtC,IAAI,aAAa,KAAK,MAAM,CAAC,QAAQ,EAAE;gBACtC,MAAM,CAAC,OAAO,EAAE,CAAC;gBACjB,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,MAAM,CAAC,EAAE,CAAC,CAAC;aACpD;SACD;IACF,CAAC,CAAC;IAEF,MAAM,mCAAmC,GAAG,KAAK,EAAE,SAAiB,EAAE,EAAE;QACvE,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;YACpC,OAAO,CAAC,IAAI,CAAC;gBACZ,EAAE,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;gBACzB,QAAQ,EAAE,SAAS;gBACnB,OAAO;aACP,CAAC,CAAC;YACH,cAAc,EAAE,CAAC;QAClB,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC;IAEF,MAAM,gBAAgB,GAAG,CAAC,CAAS,EAAE,EAAE;QACtC,aAAa,GAAG,CAAC,CAAC;QAClB,cAAc,EAAE,CAAC;IAClB,CAAC,CAAC;IAEF,MAAM,aAAa,GAAG,KAAK,IAAI,EAAE;QAChC,MAAM,mCAAmC,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC;IAC3D,CAAC,CAAC;IAEF,OAAO;QACN,mCAAmC;QACnC,gBAAgB;QAChB,aAAa;KACb,CAAC;AACH,CAAC,CAAC;AAvCW,QAAA,mBAAmB,uBAuC9B"}
|
|
@@ -6,6 +6,7 @@ declare type GetCompositionsConfig = {
|
|
|
6
6
|
envVariables?: Record<string, string>;
|
|
7
7
|
browserInstance?: PuppeteerBrowser;
|
|
8
8
|
browserExecutable?: BrowserExecutable;
|
|
9
|
+
timeoutInMilliseconds?: number;
|
|
9
10
|
};
|
|
10
11
|
export declare const getCompositions: (webpackBundle: string, config?: GetCompositionsConfig | undefined) => Promise<TCompMetadata[]>;
|
|
11
12
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-compositions.d.ts","sourceRoot":"","sources":["../src/get-compositions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,IAAI,gBAAgB,EAAO,MAAM,gBAAgB,CAAC;AACjE,OAAO,EAAC,OAAO,EAAE,iBAAiB,EAAa,aAAa,EAAC,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"get-compositions.d.ts","sourceRoot":"","sources":["../src/get-compositions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,IAAI,gBAAgB,EAAO,MAAM,gBAAgB,CAAC;AACjE,OAAO,EAAC,OAAO,EAAE,iBAAiB,EAAa,aAAa,EAAC,MAAM,UAAU,CAAC;AAM9E,aAAK,qBAAqB,GAAG;IAC5B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,eAAe,CAAC,EAAE,gBAAgB,CAAC;IACnC,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAC/B,CAAC;AA+CF,eAAO,MAAM,eAAe,kBACZ,MAAM,iDAEnB,QAAQ,aAAa,EAAE,CAiCzB,CAAC"}
|
package/dist/get-compositions.js
CHANGED
|
@@ -5,6 +5,7 @@ const remotion_1 = require("remotion");
|
|
|
5
5
|
const open_browser_1 = require("./open-browser");
|
|
6
6
|
const serve_static_1 = require("./serve-static");
|
|
7
7
|
const set_props_and_env_1 = require("./set-props-and-env");
|
|
8
|
+
const validate_puppeteer_timeout_1 = require("./validate-puppeteer-timeout");
|
|
8
9
|
const getPageAndCleanupFn = async ({ passedInInstance, browser, browserExecutable, }) => {
|
|
9
10
|
if (passedInInstance) {
|
|
10
11
|
const page = await passedInInstance.newPage();
|
|
@@ -35,6 +36,7 @@ const getPageAndCleanupFn = async ({ passedInInstance, browser, browserExecutabl
|
|
|
35
36
|
};
|
|
36
37
|
const getCompositions = async (webpackBundle, config) => {
|
|
37
38
|
var _a, _b;
|
|
39
|
+
(0, validate_puppeteer_timeout_1.validatePuppeteerTimeout)(config === null || config === void 0 ? void 0 : config.timeoutInMilliseconds);
|
|
38
40
|
const { page, cleanup } = await getPageAndCleanupFn({
|
|
39
41
|
passedInInstance: config === null || config === void 0 ? void 0 : config.browserInstance,
|
|
40
42
|
browser: (_a = config === null || config === void 0 ? void 0 : config.browser) !== null && _a !== void 0 ? _a : remotion_1.Internals.DEFAULT_BROWSER,
|
|
@@ -49,6 +51,7 @@ const getCompositions = async (webpackBundle, config) => {
|
|
|
49
51
|
page,
|
|
50
52
|
port,
|
|
51
53
|
initialFrame: 0,
|
|
54
|
+
timeoutInMilliseconds: config === null || config === void 0 ? void 0 : config.timeoutInMilliseconds,
|
|
52
55
|
});
|
|
53
56
|
await page.goto(`http://localhost:${port}/index.html?evaluation=true`);
|
|
54
57
|
await page.waitForFunction('window.ready === true');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-compositions.js","sourceRoot":"","sources":["../src/get-compositions.ts"],"names":[],"mappings":";;;AACA,uCAA8E;AAC9E,iDAA2C;AAC3C,iDAA2C;AAC3C,2DAAmD;
|
|
1
|
+
{"version":3,"file":"get-compositions.js","sourceRoot":"","sources":["../src/get-compositions.ts"],"names":[],"mappings":"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"}
|
package/dist/render-media.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { Browser as PuppeteerBrowser } from 'puppeteer-core';
|
|
2
|
-
import { Codec, FfmpegExecutable, FrameRange, PixelFormat, ProResProfile,
|
|
2
|
+
import { Codec, FfmpegExecutable, FrameRange, PixelFormat, ProResProfile, SmallTCompMetadata } from 'remotion';
|
|
3
3
|
import { BrowserLog } from './browser-log';
|
|
4
4
|
import { OnStartData } from './types';
|
|
5
5
|
import { RenderMediaOnDownload } from './assets/download-and-map-assets-to-file';
|
|
@@ -15,7 +15,7 @@ export declare type RenderMediaOnProgress = (progress: {
|
|
|
15
15
|
export declare type RenderMediaOptions = {
|
|
16
16
|
outputLocation: string;
|
|
17
17
|
codec: Codec;
|
|
18
|
-
composition:
|
|
18
|
+
composition: SmallTCompMetadata;
|
|
19
19
|
inputProps?: unknown;
|
|
20
20
|
parallelism?: number | null;
|
|
21
21
|
crf?: number | null;
|
|
@@ -33,6 +33,7 @@ export declare type RenderMediaOptions = {
|
|
|
33
33
|
dumpBrowserLogs?: boolean;
|
|
34
34
|
onBrowserLog?: ((log: BrowserLog) => void) | undefined;
|
|
35
35
|
onStart?: (data: OnStartData) => void;
|
|
36
|
+
timeoutInMilliseconds?: number;
|
|
36
37
|
} & ServeUrlOrWebpackBundle;
|
|
37
|
-
export declare const renderMedia: ({ parallelism, proResProfile, crf, composition, imageFormat, ffmpegExecutable, inputProps, pixelFormat, codec, envVariables, quality, frameRange, puppeteerInstance, outputLocation, onProgress, overwrite, onDownload, dumpBrowserLogs, onBrowserLog, onStart, ...options }: RenderMediaOptions) => Promise<void>;
|
|
38
|
+
export declare const renderMedia: ({ parallelism, proResProfile, crf, composition, imageFormat, ffmpegExecutable, inputProps, pixelFormat, codec, envVariables, quality, frameRange, puppeteerInstance, outputLocation, onProgress, overwrite, onDownload, dumpBrowserLogs, onBrowserLog, onStart, timeoutInMilliseconds, ...options }: RenderMediaOptions) => Promise<void>;
|
|
38
39
|
//# sourceMappingURL=render-media.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render-media.d.ts","sourceRoot":"","sources":["../src/render-media.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,OAAO,IAAI,gBAAgB,EAAC,MAAM,gBAAgB,CAAC;AAChE,OAAO,EACN,KAAK,EACL,gBAAgB,EAChB,UAAU,EAEV,WAAW,EACX,aAAa,EACb,
|
|
1
|
+
{"version":3,"file":"render-media.d.ts","sourceRoot":"","sources":["../src/render-media.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,OAAO,IAAI,gBAAgB,EAAC,MAAM,gBAAgB,CAAC;AAChE,OAAO,EACN,KAAK,EACL,gBAAgB,EAChB,UAAU,EAEV,WAAW,EACX,aAAa,EACb,kBAAkB,EAClB,MAAM,UAAU,CAAC;AAGlB,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AACzC,OAAO,EAAC,WAAW,EAAC,MAAM,SAAS,CAAC;AACpC,OAAO,EAAC,qBAAqB,EAAC,MAAM,0CAA0C,CAAC;AAG/E,OAAO,EAEN,uBAAuB,EACvB,MAAM,yBAAyB,CAAC;AAKjC,oBAAY,cAAc,GAAG,UAAU,GAAG,QAAQ,CAAC;AAEnD,oBAAY,qBAAqB,GAAG,CAAC,QAAQ,EAAE;IAC9C,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,WAAW,EAAE,cAAc,CAAC;CAC5B,KAAK,IAAI,CAAC;AAEX,oBAAY,kBAAkB,GAAG;IAChC,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,EAAE,KAAK,CAAC;IACb,WAAW,EAAE,kBAAkB,CAAC;IAChC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,WAAW,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,MAAM,CAAC;IACtC,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,UAAU,GAAG,IAAI,CAAC;IAC/B,iBAAiB,CAAC,EAAE,gBAAgB,CAAC;IACrC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,qBAAqB,CAAC;IACnC,UAAU,CAAC,EAAE,qBAAqB,CAAC;IACnC,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,YAAY,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,UAAU,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;IACvD,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,WAAW,KAAK,IAAI,CAAC;IACtC,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAC/B,GAAG,uBAAuB,CAAC;AAI5B,eAAO,MAAM,WAAW,wSAuBrB,kBAAkB,kBAsJpB,CAAC"}
|
package/dist/render-media.js
CHANGED
|
@@ -14,7 +14,8 @@ const get_extension_from_codec_1 = require("./get-extension-from-codec");
|
|
|
14
14
|
const legacy_webpack_config_1 = require("./legacy-webpack-config");
|
|
15
15
|
const ensure_output_directory_1 = require("./ensure-output-directory");
|
|
16
16
|
const ensure_frames_in_order_1 = require("./ensure-frames-in-order");
|
|
17
|
-
const
|
|
17
|
+
const get_frame_to_render_1 = require("./get-frame-to-render");
|
|
18
|
+
const renderMedia = async ({ parallelism, proResProfile, crf, composition, imageFormat, ffmpegExecutable, inputProps, pixelFormat, codec, envVariables, quality, frameRange, puppeteerInstance, outputLocation, onProgress, overwrite, onDownload, dumpBrowserLogs, onBrowserLog, onStart, timeoutInMilliseconds, ...options }) => {
|
|
18
19
|
var _a, _b;
|
|
19
20
|
remotion_1.Internals.validateQuality(quality);
|
|
20
21
|
if (typeof crf !== 'undefined' && crf !== null) {
|
|
@@ -66,7 +67,7 @@ const renderMedia = async ({ parallelism, proResProfile, crf, composition, image
|
|
|
66
67
|
});
|
|
67
68
|
stitcherFfmpeg = preStitcher.task;
|
|
68
69
|
}
|
|
69
|
-
const { waitForRightTimeOfFrameToBeInserted, setFrameToStitch, waitForFinish, } = (0, ensure_frames_in_order_1.ensureFramesInOrder)(frameRange !== null && frameRange !== void 0 ? frameRange : null);
|
|
70
|
+
const { waitForRightTimeOfFrameToBeInserted, setFrameToStitch, waitForFinish, } = (0, ensure_frames_in_order_1.ensureFramesInOrder)((0, get_frame_to_render_1.getRealFrameRange)(composition.durationInFrames, frameRange !== null && frameRange !== void 0 ? frameRange : null));
|
|
70
71
|
const { assetsInfo } = await (0, render_1.renderFrames)({
|
|
71
72
|
config: composition,
|
|
72
73
|
onFrameUpdate: (frame) => {
|
|
@@ -96,6 +97,7 @@ const renderMedia = async ({ parallelism, proResProfile, crf, composition, image
|
|
|
96
97
|
dumpBrowserLogs,
|
|
97
98
|
onBrowserLog,
|
|
98
99
|
onDownload,
|
|
100
|
+
timeoutInMilliseconds,
|
|
99
101
|
});
|
|
100
102
|
if (stitcherFfmpeg) {
|
|
101
103
|
await waitForFinish();
|
package/dist/render-media.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render-media.js","sourceRoot":"","sources":["../src/render-media.ts"],"names":[],"mappings":";;;;;;AACA,4CAAoB;AACpB,gDAAwB;AAExB,uCAQkB;AAClB,yCAA4D;AAC5D,qCAAsC;AAItC,uCAAiC;AACjC,yEAAqE;AACrE,mEAGiC;AACjC,uEAAgE;AAChE,qEAA6D;
|
|
1
|
+
{"version":3,"file":"render-media.js","sourceRoot":"","sources":["../src/render-media.ts"],"names":[],"mappings":"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"}
|
package/dist/render-still.d.ts
CHANGED
|
@@ -3,7 +3,7 @@ import { Browser, BrowserExecutable, TCompMetadata } from 'remotion';
|
|
|
3
3
|
/**
|
|
4
4
|
* @description Render a still frame from a composition and returns an image path
|
|
5
5
|
*/
|
|
6
|
-
export declare const renderStill: ({ composition, quality, imageFormat, webpackBundle, browser, puppeteerInstance, dumpBrowserLogs, onError, inputProps, envVariables, output, frame, overwrite, browserExecutable, }: {
|
|
6
|
+
export declare const renderStill: ({ composition, quality, imageFormat, webpackBundle, browser, puppeteerInstance, dumpBrowserLogs, onError, inputProps, envVariables, output, frame, overwrite, browserExecutable, timeoutInMilliseconds, }: {
|
|
7
7
|
composition: TCompMetadata;
|
|
8
8
|
output: string;
|
|
9
9
|
webpackBundle: string;
|
|
@@ -18,5 +18,6 @@ export declare const renderStill: ({ composition, quality, imageFormat, webpackB
|
|
|
18
18
|
envVariables?: Record<string, string> | undefined;
|
|
19
19
|
overwrite?: boolean | undefined;
|
|
20
20
|
browserExecutable?: BrowserExecutable | undefined;
|
|
21
|
+
timeoutInMilliseconds?: number | undefined;
|
|
21
22
|
}) => Promise<void>;
|
|
22
23
|
//# sourceMappingURL=render-still.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render-still.d.ts","sourceRoot":"","sources":["../src/render-still.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,OAAO,IAAI,gBAAgB,EAAC,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EAAC,OAAO,EAAE,iBAAiB,EAAa,aAAa,EAAC,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"render-still.d.ts","sourceRoot":"","sources":["../src/render-still.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,OAAO,IAAI,gBAAgB,EAAC,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EAAC,OAAO,EAAE,iBAAiB,EAAa,aAAa,EAAC,MAAM,UAAU,CAAC;AAQ9E;;GAEG;AACH,eAAO,MAAM,WAAW;iBAiBV,aAAa;YAClB,MAAM;mBACC,MAAM;;iBAER,OAAO;;;;;;qBAMJ,KAAK,KAAK,IAAI;;;;;mBAuI9B,CAAC"}
|
package/dist/render-still.js
CHANGED
|
@@ -31,16 +31,18 @@ const provide_screenshot_1 = require("./provide-screenshot");
|
|
|
31
31
|
const seek_to_frame_1 = require("./seek-to-frame");
|
|
32
32
|
const serve_static_1 = require("./serve-static");
|
|
33
33
|
const set_props_and_env_1 = require("./set-props-and-env");
|
|
34
|
+
const validate_puppeteer_timeout_1 = require("./validate-puppeteer-timeout");
|
|
34
35
|
/**
|
|
35
36
|
* @description Render a still frame from a composition and returns an image path
|
|
36
37
|
*/
|
|
37
|
-
const renderStill = async ({ composition, quality, imageFormat = 'png', webpackBundle, browser = remotion_1.Internals.DEFAULT_BROWSER, puppeteerInstance, dumpBrowserLogs = false, onError, inputProps, envVariables, output, frame = 0, overwrite = true, browserExecutable, }) => {
|
|
38
|
+
const renderStill = async ({ composition, quality, imageFormat = 'png', webpackBundle, browser = remotion_1.Internals.DEFAULT_BROWSER, puppeteerInstance, dumpBrowserLogs = false, onError, inputProps, envVariables, output, frame = 0, overwrite = true, browserExecutable, timeoutInMilliseconds, }) => {
|
|
38
39
|
remotion_1.Internals.validateDimension(composition.height, 'height', 'in the `config` object passed to `renderStill()`');
|
|
39
40
|
remotion_1.Internals.validateDimension(composition.width, 'width', 'in the `config` object passed to `renderStill()`');
|
|
40
41
|
remotion_1.Internals.validateFps(composition.fps, 'in the `config` object of `renderStill()`');
|
|
41
42
|
remotion_1.Internals.validateDurationInFrames(composition.durationInFrames, 'in the `config` object passed to `renderStill()`');
|
|
42
43
|
remotion_1.Internals.validateNonNullImageFormat(imageFormat);
|
|
43
44
|
remotion_1.Internals.validateFrame(frame, composition.durationInFrames);
|
|
45
|
+
(0, validate_puppeteer_timeout_1.validatePuppeteerTimeout)(timeoutInMilliseconds);
|
|
44
46
|
if (typeof output !== 'string') {
|
|
45
47
|
throw new TypeError('`output` parameter was not passed or is not a string');
|
|
46
48
|
}
|
|
@@ -84,6 +86,7 @@ const renderStill = async ({ composition, quality, imageFormat = 'png', webpackB
|
|
|
84
86
|
page,
|
|
85
87
|
port,
|
|
86
88
|
initialFrame: frame,
|
|
89
|
+
timeoutInMilliseconds,
|
|
87
90
|
});
|
|
88
91
|
const site = `http://localhost:${port}/index.html?composition=${composition.id}`;
|
|
89
92
|
await page.goto(site);
|
package/dist/render-still.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render-still.js","sourceRoot":"","sources":["../src/render-still.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yCAA2C;AAC3C,gDAAwB;AAExB,uCAA8E;AAC9E,iDAA2C;AAC3C,6DAAuD;AACvD,mDAA4C;AAC5C,iDAA2C;AAC3C,2DAAmD;
|
|
1
|
+
{"version":3,"file":"render-still.js","sourceRoot":"","sources":["../src/render-still.ts"],"names":[],"mappings":"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"}
|
package/dist/render.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Browser as PuppeteerBrowser } from 'puppeteer-core';
|
|
2
2
|
import { Browser, BrowserExecutable, FrameRange, ImageFormat, VideoConfig } from 'remotion';
|
|
3
3
|
import { OnErrorInfo, OnStartData, RenderFramesOutput } from './types';
|
|
4
|
-
export declare const renderFrames: ({ config, parallelism, onFrameUpdate, compositionId, outputDir, onStart, inputProps, envVariables, webpackBundle, quality, imageFormat, browser, frameRange, dumpBrowserLogs, puppeteerInstance, onError, browserExecutable, }: {
|
|
4
|
+
export declare const renderFrames: ({ config, parallelism, onFrameUpdate, compositionId, outputDir, onStart, inputProps, envVariables, webpackBundle, quality, imageFormat, browser, frameRange, dumpBrowserLogs, puppeteerInstance, onError, browserExecutable, timeoutInMilliseconds, }: {
|
|
5
5
|
config: VideoConfig;
|
|
6
6
|
compositionId: string;
|
|
7
7
|
onStart: (data: OnStartData) => void;
|
|
@@ -19,5 +19,6 @@ export declare const renderFrames: ({ config, parallelism, onFrameUpdate, compos
|
|
|
19
19
|
puppeteerInstance?: PuppeteerBrowser | undefined;
|
|
20
20
|
browserExecutable?: BrowserExecutable | undefined;
|
|
21
21
|
onError?: ((info: OnErrorInfo) => void) | undefined;
|
|
22
|
+
timeoutInMilliseconds?: number | undefined;
|
|
22
23
|
}) => Promise<RenderFramesOutput>;
|
|
23
24
|
//# sourceMappingURL=render.d.ts.map
|
package/dist/render.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../src/render.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,OAAO,IAAI,gBAAgB,EAAC,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EACN,OAAO,EACP,iBAAiB,EACjB,UAAU,EACV,WAAW,EAGX,WAAW,EACX,MAAM,UAAU,CAAC;AAYlB,OAAO,EAAC,WAAW,EAAE,WAAW,EAAE,kBAAkB,EAAC,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../src/render.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,OAAO,IAAI,gBAAgB,EAAC,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EACN,OAAO,EACP,iBAAiB,EACjB,UAAU,EACV,WAAW,EAGX,WAAW,EACX,MAAM,UAAU,CAAC;AAYlB,OAAO,EAAC,WAAW,EAAE,WAAW,EAAE,kBAAkB,EAAC,MAAM,SAAS,CAAC;AAGrE,eAAO,MAAM,YAAY;YAoBhB,WAAW;mBACJ,MAAM;oBACL,WAAW,KAAK,IAAI;uBACjB,MAAM,KAAK,IAAI;eACvB,MAAM;gBACL,OAAO;;mBAEJ,MAAM;iBACR,WAAW;;;;;;;;sBAQP,WAAW,KAAK,IAAI;;MAElC,QAAQ,kBAAkB,CAqL7B,CAAC"}
|
package/dist/render.js
CHANGED
|
@@ -17,7 +17,8 @@ const provide_screenshot_1 = require("./provide-screenshot");
|
|
|
17
17
|
const seek_to_frame_1 = require("./seek-to-frame");
|
|
18
18
|
const serve_static_1 = require("./serve-static");
|
|
19
19
|
const set_props_and_env_1 = require("./set-props-and-env");
|
|
20
|
-
const
|
|
20
|
+
const validate_puppeteer_timeout_1 = require("./validate-puppeteer-timeout");
|
|
21
|
+
const renderFrames = async ({ config, parallelism, onFrameUpdate, compositionId, outputDir, onStart, inputProps, envVariables = {}, webpackBundle, quality, imageFormat = image_format_1.DEFAULT_IMAGE_FORMAT, browser = remotion_1.Internals.DEFAULT_BROWSER, frameRange, dumpBrowserLogs = false, puppeteerInstance, onError, browserExecutable, timeoutInMilliseconds, }) => {
|
|
21
22
|
remotion_1.Internals.validateDimension(config.height, 'height', 'in the `config` object passed to `renderFrames()`');
|
|
22
23
|
remotion_1.Internals.validateDimension(config.width, 'width', 'in the `config` object passed to `renderFrames()`');
|
|
23
24
|
remotion_1.Internals.validateFps(config.fps, 'in the `config` object of `renderFrames()`');
|
|
@@ -26,6 +27,7 @@ const renderFrames = async ({ config, parallelism, onFrameUpdate, compositionId,
|
|
|
26
27
|
throw new Error("You can only pass the `quality` option if `imageFormat` is 'jpeg'.");
|
|
27
28
|
}
|
|
28
29
|
remotion_1.Internals.validateQuality(quality);
|
|
30
|
+
(0, validate_puppeteer_timeout_1.validatePuppeteerTimeout)(timeoutInMilliseconds);
|
|
29
31
|
const actualParallelism = (0, get_concurrency_1.getActualConcurrency)(parallelism !== null && parallelism !== void 0 ? parallelism : null);
|
|
30
32
|
const [{ port, close }, browserInstance] = await Promise.all([
|
|
31
33
|
(0, serve_static_1.serveStatic)(webpackBundle),
|
|
@@ -56,6 +58,7 @@ const renderFrames = async ({ config, parallelism, onFrameUpdate, compositionId,
|
|
|
56
58
|
page,
|
|
57
59
|
port,
|
|
58
60
|
initialFrame,
|
|
61
|
+
timeoutInMilliseconds,
|
|
59
62
|
});
|
|
60
63
|
const site = `http://localhost:${port}/index.html?composition=${compositionId}`;
|
|
61
64
|
await page.goto(site);
|
package/dist/render.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render.js","sourceRoot":"","sources":["../src/render.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAExB,uCAQkB;AAClB,6DAAsD;AACtD,uDAAuD;AACvD,uDAAgD;AAChD,+DAAuD;AACvD,iDAAoD;AACpD,iDAA2C;AAC3C,iCAA4B;AAC5B,6DAAuD;AACvD,mDAA4C;AAC5C,iDAA2C;AAC3C,2DAAmD;
|
|
1
|
+
{"version":3,"file":"render.js","sourceRoot":"","sources":["../src/render.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { Page } from 'puppeteer-core';
|
|
2
|
-
export declare const setPropsAndEnv: ({ inputProps, envVariables, page, port, initialFrame, }: {
|
|
2
|
+
export declare const setPropsAndEnv: ({ inputProps, envVariables, page, port, initialFrame, timeoutInMilliseconds, }: {
|
|
3
3
|
inputProps: unknown;
|
|
4
4
|
envVariables: Record<string, string> | undefined;
|
|
5
5
|
page: Page;
|
|
6
6
|
port: number;
|
|
7
7
|
initialFrame: number;
|
|
8
|
+
timeoutInMilliseconds: number | undefined;
|
|
8
9
|
}) => Promise<void>;
|
|
9
10
|
//# sourceMappingURL=set-props-and-env.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"set-props-and-env.d.ts","sourceRoot":"","sources":["../src/set-props-and-env.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAC,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"set-props-and-env.d.ts","sourceRoot":"","sources":["../src/set-props-and-env.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAC,MAAM,gBAAgB,CAAC;AAIpC,eAAO,MAAM,cAAc;gBAQd,OAAO;kBACL,OAAO,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS;UAC1C,IAAI;UACJ,MAAM;kBACE,MAAM;2BACG,MAAM,GAAG,SAAS;mBA2CzC,CAAC"}
|
|
@@ -2,23 +2,29 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.setPropsAndEnv = void 0;
|
|
4
4
|
const remotion_1 = require("remotion");
|
|
5
|
-
const
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
window.localStorage.setItem(key, value);
|
|
20
|
-
}, remotion_1.Internals.INITIAL_FRAME_LOCAL_STORAGE_KEY, initialFrame);
|
|
5
|
+
const validate_puppeteer_timeout_1 = require("./validate-puppeteer-timeout");
|
|
6
|
+
const setPropsAndEnv = async ({ inputProps, envVariables, page, port, initialFrame, timeoutInMilliseconds, }) => {
|
|
7
|
+
(0, validate_puppeteer_timeout_1.validatePuppeteerTimeout)(timeoutInMilliseconds);
|
|
8
|
+
const actualTimeout = timeoutInMilliseconds !== null && timeoutInMilliseconds !== void 0 ? timeoutInMilliseconds : remotion_1.Internals.DEFAULT_PUPPETEER_TIMEOUT;
|
|
9
|
+
page.setDefaultTimeout(actualTimeout);
|
|
10
|
+
page.setDefaultNavigationTimeout(actualTimeout);
|
|
11
|
+
await page.goto(`http://localhost:${port}/index.html`);
|
|
12
|
+
await page.evaluate((key, value) => {
|
|
13
|
+
window.localStorage.setItem(key, value);
|
|
14
|
+
}, remotion_1.Internals.PUPPETEER_TIMEOUT_KEY, actualTimeout);
|
|
15
|
+
if (inputProps) {
|
|
16
|
+
await page.evaluate((key, input) => {
|
|
17
|
+
window.localStorage.setItem(key, input);
|
|
18
|
+
}, remotion_1.Internals.INPUT_PROPS_KEY, JSON.stringify(inputProps));
|
|
21
19
|
}
|
|
20
|
+
if (envVariables) {
|
|
21
|
+
await page.evaluate((key, input) => {
|
|
22
|
+
window.localStorage.setItem(key, input);
|
|
23
|
+
}, remotion_1.Internals.ENV_VARIABLES_LOCAL_STORAGE_KEY, JSON.stringify(envVariables));
|
|
24
|
+
}
|
|
25
|
+
await page.evaluate((key, value) => {
|
|
26
|
+
window.localStorage.setItem(key, value);
|
|
27
|
+
}, remotion_1.Internals.INITIAL_FRAME_LOCAL_STORAGE_KEY, initialFrame);
|
|
22
28
|
};
|
|
23
29
|
exports.setPropsAndEnv = setPropsAndEnv;
|
|
24
30
|
//# sourceMappingURL=set-props-and-env.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"set-props-and-env.js","sourceRoot":"","sources":["../src/set-props-and-env.ts"],"names":[],"mappings":";;;AACA,uCAAmC;
|
|
1
|
+
{"version":3,"file":"set-props-and-env.js","sourceRoot":"","sources":["../src/set-props-and-env.ts"],"names":[],"mappings":";;;AACA,uCAAmC;AACnC,6EAAsE;AAE/D,MAAM,cAAc,GAAG,KAAK,EAAE,EACpC,UAAU,EACV,YAAY,EACZ,IAAI,EACJ,IAAI,EACJ,YAAY,EACZ,qBAAqB,GAQrB,EAAE,EAAE;IACJ,IAAA,qDAAwB,EAAC,qBAAqB,CAAC,CAAC;IAChD,MAAM,aAAa,GAClB,qBAAqB,aAArB,qBAAqB,cAArB,qBAAqB,GAAI,oBAAS,CAAC,yBAAyB,CAAC;IAC9D,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAC;IACtC,IAAI,CAAC,2BAA2B,CAAC,aAAa,CAAC,CAAC;IAEhD,MAAM,IAAI,CAAC,IAAI,CAAC,oBAAoB,IAAI,aAAa,CAAC,CAAC;IACvD,MAAM,IAAI,CAAC,QAAQ,CAClB,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;QACd,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IACzC,CAAC,EACD,oBAAS,CAAC,qBAAqB,EAC/B,aAAa,CACb,CAAC;IACF,IAAI,UAAU,EAAE;QACf,MAAM,IAAI,CAAC,QAAQ,CAClB,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;YACd,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QACzC,CAAC,EACD,oBAAS,CAAC,eAAe,EACzB,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAC1B,CAAC;KACF;IAED,IAAI,YAAY,EAAE;QACjB,MAAM,IAAI,CAAC,QAAQ,CAClB,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;YACd,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QACzC,CAAC,EACD,oBAAS,CAAC,+BAA+B,EACzC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAC5B,CAAC;KACF;IAED,MAAM,IAAI,CAAC,QAAQ,CAClB,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;QACd,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IACzC,CAAC,EACD,oBAAS,CAAC,+BAA+B,EACzC,YAAY,CACZ,CAAC;AACH,CAAC,CAAC;AAxDW,QAAA,cAAc,kBAwDzB"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"validate-puppeteer-timeout.d.ts","sourceRoot":"","sources":["../src/validate-puppeteer-timeout.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,wBAAwB,0BAA2B,OAAO,SAoCtE,CAAC"}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.validatePuppeteerTimeout = void 0;
|
|
4
|
+
const validatePuppeteerTimeout = (timeoutInMilliseconds) => {
|
|
5
|
+
if (timeoutInMilliseconds === null || timeoutInMilliseconds === undefined) {
|
|
6
|
+
return;
|
|
7
|
+
}
|
|
8
|
+
if (typeof timeoutInMilliseconds !== 'number') {
|
|
9
|
+
throw new TypeError(`'timeoutInMilliseconds' should be a number, but is: ${JSON.stringify(timeoutInMilliseconds)}`);
|
|
10
|
+
}
|
|
11
|
+
if (timeoutInMilliseconds < 7000) {
|
|
12
|
+
throw new TypeError(`'timeoutInMilliseconds' should be bigger or equal than 7000, but is ${timeoutInMilliseconds}`);
|
|
13
|
+
}
|
|
14
|
+
if (Number.isNaN(timeoutInMilliseconds)) {
|
|
15
|
+
throw new TypeError(`'timeoutInMilliseconds' should not be NaN, but is ${timeoutInMilliseconds}`);
|
|
16
|
+
}
|
|
17
|
+
if (!Number.isFinite(timeoutInMilliseconds)) {
|
|
18
|
+
throw new TypeError(`'timeoutInMilliseconds' should be finite, but is ${timeoutInMilliseconds}`);
|
|
19
|
+
}
|
|
20
|
+
if (timeoutInMilliseconds % 1 !== 0) {
|
|
21
|
+
throw new TypeError(`'timeoutInMilliseconds' should be an integer, but is ${timeoutInMilliseconds}`);
|
|
22
|
+
}
|
|
23
|
+
};
|
|
24
|
+
exports.validatePuppeteerTimeout = validatePuppeteerTimeout;
|
|
25
|
+
//# sourceMappingURL=validate-puppeteer-timeout.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"validate-puppeteer-timeout.js","sourceRoot":"","sources":["../src/validate-puppeteer-timeout.ts"],"names":[],"mappings":";;;AAAO,MAAM,wBAAwB,GAAG,CAAC,qBAA8B,EAAE,EAAE;IAC1E,IAAI,qBAAqB,KAAK,IAAI,IAAI,qBAAqB,KAAK,SAAS,EAAE;QAC1E,OAAO;KACP;IAED,IAAI,OAAO,qBAAqB,KAAK,QAAQ,EAAE;QAC9C,MAAM,IAAI,SAAS,CAClB,uDAAuD,IAAI,CAAC,SAAS,CACpE,qBAAqB,CACrB,EAAE,CACH,CAAC;KACF;IAED,IAAI,qBAAqB,GAAG,IAAI,EAAE;QACjC,MAAM,IAAI,SAAS,CAClB,uEAAuE,qBAAqB,EAAE,CAC9F,CAAC;KACF;IAED,IAAI,MAAM,CAAC,KAAK,CAAC,qBAAqB,CAAC,EAAE;QACxC,MAAM,IAAI,SAAS,CAClB,qDAAqD,qBAAqB,EAAE,CAC5E,CAAC;KACF;IAED,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,qBAAqB,CAAC,EAAE;QAC5C,MAAM,IAAI,SAAS,CAClB,oDAAoD,qBAAqB,EAAE,CAC3E,CAAC;KACF;IAED,IAAI,qBAAqB,GAAG,CAAC,KAAK,CAAC,EAAE;QACpC,MAAM,IAAI,SAAS,CAClB,wDAAwD,qBAAqB,EAAE,CAC/E,CAAC;KACF;AACF,CAAC,CAAC;AApCW,QAAA,wBAAwB,4BAoCnC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@remotion/renderer",
|
|
3
|
-
"version": "2.6.
|
|
3
|
+
"version": "2.6.4",
|
|
4
4
|
"description": "Renderer for Remotion",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -16,14 +16,13 @@
|
|
|
16
16
|
"url": "https://github.com/remotion-dev/remotion"
|
|
17
17
|
},
|
|
18
18
|
"dependencies": {
|
|
19
|
-
"@remotion/bundler": "2.6.
|
|
19
|
+
"@remotion/bundler": "2.6.4",
|
|
20
20
|
"@testing-library/dom": "^8.7.2",
|
|
21
21
|
"execa": "^4.0.2",
|
|
22
22
|
"got": "11.8.2",
|
|
23
23
|
"p-limit": "^3.1.0",
|
|
24
24
|
"puppeteer-core": "^10.2.0",
|
|
25
|
-
"remotion": "2.6.
|
|
26
|
-
"sanitize-filename": "^1.6.3",
|
|
25
|
+
"remotion": "2.6.4",
|
|
27
26
|
"serve-handler": "^6.1.3"
|
|
28
27
|
},
|
|
29
28
|
"peerDependencies": {
|
|
@@ -46,5 +45,5 @@
|
|
|
46
45
|
"publishConfig": {
|
|
47
46
|
"access": "public"
|
|
48
47
|
},
|
|
49
|
-
"gitHead": "
|
|
48
|
+
"gitHead": "729afee8ec8dd9c59a5aa087d135997e5ccf53b3"
|
|
50
49
|
}
|