@remotion/renderer 2.5.5-alpha.12 → 3.0.0-alpha.192

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.
Files changed (98) hide show
  1. package/dist/assets/calculate-asset-positions.d.ts.map +1 -1
  2. package/dist/assets/calculate-asset-positions.js +0 -1
  3. package/dist/assets/calculate-asset-positions.js.map +1 -1
  4. package/dist/assets/convert-assets-to-file-urls.d.ts +4 -3
  5. package/dist/assets/convert-assets-to-file-urls.d.ts.map +1 -1
  6. package/dist/assets/convert-assets-to-file-urls.js +3 -3
  7. package/dist/assets/convert-assets-to-file-urls.js.map +1 -1
  8. package/dist/assets/download-and-map-assets-to-file.d.ts +9 -7
  9. package/dist/assets/download-and-map-assets-to-file.d.ts.map +1 -1
  10. package/dist/assets/download-and-map-assets-to-file.js +17 -21
  11. package/dist/assets/download-and-map-assets-to-file.js.map +1 -1
  12. package/dist/assets/get-asset-audio-details.d.ts +0 -1
  13. package/dist/assets/get-asset-audio-details.d.ts.map +1 -1
  14. package/dist/assets/get-asset-audio-details.js +1 -3
  15. package/dist/assets/get-asset-audio-details.js.map +1 -1
  16. package/dist/create-ffmpeg-complex-filter.d.ts.map +1 -1
  17. package/dist/create-ffmpeg-complex-filter.js +2 -2
  18. package/dist/create-ffmpeg-complex-filter.js.map +1 -1
  19. package/dist/cycle-browser-tabs.d.ts +1 -1
  20. package/dist/cycle-browser-tabs.d.ts.map +1 -1
  21. package/dist/cycle-browser-tabs.js +27 -14
  22. package/dist/cycle-browser-tabs.js.map +1 -1
  23. package/dist/ensure-output-directory.d.ts +2 -0
  24. package/dist/ensure-output-directory.d.ts.map +1 -0
  25. package/dist/ensure-output-directory.js +18 -0
  26. package/dist/ensure-output-directory.js.map +1 -0
  27. package/dist/ffmpeg-flags.d.ts +5 -1
  28. package/dist/ffmpeg-flags.d.ts.map +1 -1
  29. package/dist/ffmpeg-flags.js +5 -1
  30. package/dist/ffmpeg-flags.js.map +1 -1
  31. package/dist/get-audio-codec-name.d.ts.map +1 -1
  32. package/dist/get-audio-codec-name.js +3 -0
  33. package/dist/get-audio-codec-name.js.map +1 -1
  34. package/dist/get-compositions.d.ts +6 -5
  35. package/dist/get-compositions.d.ts.map +1 -1
  36. package/dist/get-compositions.js +55 -47
  37. package/dist/get-compositions.js.map +1 -1
  38. package/dist/get-frame-to-render.d.ts +1 -1
  39. package/dist/get-frame-to-render.d.ts.map +1 -1
  40. package/dist/get-frame-to-render.js +13 -7
  41. package/dist/get-frame-to-render.js.map +1 -1
  42. package/dist/index.d.ts +36 -7
  43. package/dist/index.d.ts.map +1 -1
  44. package/dist/index.js +38 -5
  45. package/dist/index.js.map +1 -1
  46. package/dist/is-serve-url.js +1 -1
  47. package/dist/is-serve-url.js.map +1 -1
  48. package/dist/legacy-webpack-config.d.ts +10 -0
  49. package/dist/legacy-webpack-config.d.ts.map +1 -0
  50. package/dist/legacy-webpack-config.js +14 -0
  51. package/dist/legacy-webpack-config.js.map +1 -0
  52. package/dist/open-browser.d.ts.map +1 -1
  53. package/dist/open-browser.js +13 -0
  54. package/dist/open-browser.js.map +1 -1
  55. package/dist/provide-screenshot.d.ts +2 -2
  56. package/dist/provide-screenshot.d.ts.map +1 -1
  57. package/dist/provide-screenshot.js +1 -1
  58. package/dist/provide-screenshot.js.map +1 -1
  59. package/dist/puppeteer-screenshot.d.ts.map +1 -1
  60. package/dist/puppeteer-screenshot.js.map +1 -1
  61. package/dist/render-media.d.ts +4 -4
  62. package/dist/render-media.d.ts.map +1 -1
  63. package/dist/render-media.js +42 -25
  64. package/dist/render-media.js.map +1 -1
  65. package/dist/render-still.d.ts +18 -17
  66. package/dist/render-still.d.ts.map +1 -1
  67. package/dist/render-still.js +44 -33
  68. package/dist/render-still.js.map +1 -1
  69. package/dist/render.d.ts +35 -17
  70. package/dist/render.d.ts.map +1 -1
  71. package/dist/render.js +150 -69
  72. package/dist/render.js.map +1 -1
  73. package/dist/screenshot-dom-element.d.ts.map +1 -1
  74. package/dist/screenshot-dom-element.js +1 -3
  75. package/dist/screenshot-dom-element.js.map +1 -1
  76. package/dist/screenshot-task.d.ts +2 -1
  77. package/dist/screenshot-task.d.ts.map +1 -1
  78. package/dist/screenshot-task.js.map +1 -1
  79. package/dist/set-props-and-env.d.ts +2 -2
  80. package/dist/set-props-and-env.d.ts.map +1 -1
  81. package/dist/set-props-and-env.js +3 -2
  82. package/dist/set-props-and-env.js.map +1 -1
  83. package/dist/stitcher.d.ts +21 -15
  84. package/dist/stitcher.d.ts.map +1 -1
  85. package/dist/stitcher.js +97 -72
  86. package/dist/stitcher.js.map +1 -1
  87. package/dist/stringify-ffmpeg-filter.d.ts.map +1 -1
  88. package/dist/stringify-ffmpeg-filter.js +3 -0
  89. package/dist/stringify-ffmpeg-filter.js.map +1 -1
  90. package/dist/tmp-dir.d.ts.map +1 -1
  91. package/dist/tmp-dir.js +2 -2
  92. package/dist/tmp-dir.js.map +1 -1
  93. package/dist/types.d.ts +0 -4
  94. package/dist/types.d.ts.map +1 -1
  95. package/dist/validate-ffmpeg.d.ts.map +1 -1
  96. package/dist/validate-ffmpeg.js +7 -2
  97. package/dist/validate-ffmpeg.js.map +1 -1
  98. package/package.json +4 -4
@@ -1,22 +1,23 @@
1
1
  import { Browser as PuppeteerBrowser } from 'puppeteer-core';
2
- import { Browser, BrowserExecutable, TCompMetadata } from 'remotion';
3
- /**
4
- * @description Render a still frame from a composition and returns an image path
5
- */
6
- export declare const renderStill: ({ composition, quality, imageFormat, webpackBundle, browser, puppeteerInstance, dumpBrowserLogs, onError, inputProps, envVariables, output, frame, overwrite, browserExecutable, }: {
2
+ import { BrowserExecutable, StillImageFormat, TCompMetadata } from 'remotion';
3
+ import { ServeUrlOrWebpackBundle } from './legacy-webpack-config';
4
+ declare type InnerStillOptions = {
7
5
  composition: TCompMetadata;
8
6
  output: string;
9
- webpackBundle: string;
10
- frame?: number | undefined;
7
+ frame?: number;
11
8
  inputProps?: unknown;
12
- imageFormat?: "png" | "jpeg" | undefined;
13
- quality?: number | undefined;
14
- browser?: Browser | undefined;
15
- puppeteerInstance?: PuppeteerBrowser | undefined;
16
- dumpBrowserLogs?: boolean | undefined;
17
- onError?: ((err: Error) => void) | undefined;
18
- envVariables?: Record<string, string> | undefined;
19
- overwrite?: boolean | undefined;
20
- browserExecutable?: BrowserExecutable | undefined;
21
- }) => Promise<void>;
9
+ imageFormat?: StillImageFormat;
10
+ quality?: number;
11
+ puppeteerInstance?: PuppeteerBrowser;
12
+ dumpBrowserLogs?: boolean;
13
+ envVariables?: Record<string, string>;
14
+ overwrite?: boolean;
15
+ browserExecutable?: BrowserExecutable;
16
+ };
17
+ export declare type RenderStillOptions = InnerStillOptions & ServeUrlOrWebpackBundle;
18
+ /**
19
+ * @description Render a still frame from a composition and returns an image path
20
+ */
21
+ export declare const renderStill: (options: RenderStillOptions) => Promise<void>;
22
+ export {};
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;AAO9E;;GAEG;AACH,eAAO,MAAM,WAAW;iBAgBV,aAAa;YAClB,MAAM;mBACC,MAAM;;iBAER,OAAO;;;;;;qBAMJ,KAAK,KAAK,IAAI;;;;mBAoI9B,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,EACN,iBAAiB,EAEjB,gBAAgB,EAChB,aAAa,EACb,MAAM,UAAU,CAAC;AAElB,OAAO,EAEN,uBAAuB,EACvB,MAAM,yBAAyB,CAAC;AAQjC,aAAK,iBAAiB,GAAG;IACxB,WAAW,EAAE,aAAa,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,gBAAgB,CAAC;IAC/B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,iBAAiB,CAAC,EAAE,gBAAgB,CAAC;IACrC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;CACtC,CAAC;AAEF,oBAAY,kBAAkB,GAAG,iBAAiB,GAAG,uBAAuB,CAAC;AA+I7E;;GAEG;AAEH,eAAO,MAAM,WAAW,YACd,kBAAkB,KACzB,QAAQ,IAAI,CAgBd,CAAC"}
@@ -26,15 +26,15 @@ exports.renderStill = void 0;
26
26
  const fs_1 = __importStar(require("fs"));
27
27
  const path_1 = __importDefault(require("path"));
28
28
  const remotion_1 = require("remotion");
29
+ const ensure_output_directory_1 = require("./ensure-output-directory");
30
+ const legacy_webpack_config_1 = require("./legacy-webpack-config");
31
+ const normalize_serve_url_1 = require("./normalize-serve-url");
29
32
  const open_browser_1 = require("./open-browser");
33
+ const prepare_server_1 = require("./prepare-server");
30
34
  const provide_screenshot_1 = require("./provide-screenshot");
31
35
  const seek_to_frame_1 = require("./seek-to-frame");
32
- const serve_static_1 = require("./serve-static");
33
36
  const set_props_and_env_1 = require("./set-props-and-env");
34
- /**
35
- * @description Render a still frame from a composition and returns an image path
36
- */
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, }) => {
37
+ const innerRenderStill = async ({ composition, quality, imageFormat = 'png', serveUrl, puppeteerInstance, dumpBrowserLogs = false, onError, inputProps, envVariables, output, frame = 0, overwrite = true, browserExecutable, }) => {
38
38
  remotion_1.Internals.validateDimension(composition.height, 'height', 'in the `config` object passed to `renderStill()`');
39
39
  remotion_1.Internals.validateDimension(composition.width, 'width', 'in the `config` object passed to `renderStill()`');
40
40
  remotion_1.Internals.validateFps(composition.fps, 'in the `config` object of `renderStill()`');
@@ -58,34 +58,41 @@ const renderStill = async ({ composition, quality, imageFormat = 'png', webpackB
58
58
  throw new Error(`The output location ${output} already exists, but is not a file, but something else (e.g. folder). Cannot save to it.`);
59
59
  }
60
60
  }
61
- (0, fs_1.mkdirSync)(path_1.default.resolve(output, '..'), {
62
- recursive: true,
63
- });
64
- const [{ port, close }, browserInstance] = await Promise.all([
65
- (0, serve_static_1.serveStatic)(webpackBundle),
66
- puppeteerInstance !== null && puppeteerInstance !== void 0 ? puppeteerInstance : (0, open_browser_1.openBrowser)(browser, {
67
- browserExecutable,
68
- shouldDumpIo: dumpBrowserLogs,
69
- }),
70
- ]);
61
+ (0, ensure_output_directory_1.ensureOutputDirectory)(output);
62
+ const browserInstance = puppeteerInstance !== null && puppeteerInstance !== void 0 ? puppeteerInstance : (await (0, open_browser_1.openBrowser)(remotion_1.Internals.DEFAULT_BROWSER, {
63
+ browserExecutable,
64
+ shouldDumpIo: dumpBrowserLogs,
65
+ }));
71
66
  const page = await browserInstance.newPage();
72
67
  page.setViewport({
73
68
  width: composition.width,
74
69
  height: composition.height,
75
70
  deviceScaleFactor: 1,
76
71
  });
72
+ const cleanup = async () => {
73
+ page.off('pageerror', errorCallback);
74
+ if (puppeteerInstance) {
75
+ await page.close();
76
+ }
77
+ else {
78
+ browserInstance.close().catch((err) => {
79
+ console.log('Unable to close browser', err);
80
+ });
81
+ }
82
+ };
77
83
  const errorCallback = (err) => {
78
- onError === null || onError === void 0 ? void 0 : onError(err);
84
+ onError(err);
85
+ cleanup();
79
86
  };
80
87
  page.on('pageerror', errorCallback);
88
+ const site = `${(0, normalize_serve_url_1.normalizeServeUrl)(serveUrl)}?composition=${composition.id}`;
81
89
  await (0, set_props_and_env_1.setPropsAndEnv)({
82
90
  inputProps,
83
91
  envVariables,
84
92
  page,
85
- port,
93
+ serveUrl,
86
94
  initialFrame: frame,
87
95
  });
88
- const site = `http://localhost:${port}/index.html?composition=${composition.id}`;
89
96
  await page.goto(site);
90
97
  try {
91
98
  await (0, seek_to_frame_1.seekToFrame)({ frame, page });
@@ -94,10 +101,7 @@ const renderStill = async ({ composition, quality, imageFormat = 'png', webpackB
94
101
  const error = err;
95
102
  if (error.message.includes('timeout') &&
96
103
  error.message.includes('exceeded')) {
97
- errorCallback(new Error('The rendering timed out. See https://www.remotion.dev/docs/timeout/ for possible reasons.'));
98
- }
99
- else {
100
- errorCallback(error);
104
+ throw new Error('The rendering timed out. See https://www.remotion.dev/docs/timeout/ for possible reasons.');
101
105
  }
102
106
  throw error;
103
107
  }
@@ -110,18 +114,25 @@ const renderStill = async ({ composition, quality, imageFormat = 'png', webpackB
110
114
  output,
111
115
  },
112
116
  });
113
- page.off('pageerror', errorCallback);
114
- close().catch((err) => {
115
- console.log('Unable to close web server', err);
117
+ await cleanup();
118
+ };
119
+ /**
120
+ * @description Render a still frame from a composition and returns an image path
121
+ */
122
+ const renderStill = async (options) => {
123
+ const selectedServeUrl = (0, legacy_webpack_config_1.getServeUrlWithFallback)(options);
124
+ const { closeServer, serveUrl } = await (0, prepare_server_1.prepareServer)(selectedServeUrl);
125
+ return new Promise((resolve, reject) => {
126
+ // eslint-disable-next-line promise/catch-or-return
127
+ innerRenderStill({
128
+ ...options,
129
+ serveUrl,
130
+ onError: (err) => reject(err),
131
+ })
132
+ .then((res) => resolve(res))
133
+ .catch((err) => reject(err))
134
+ .finally(() => closeServer());
116
135
  });
117
- if (puppeteerInstance) {
118
- await page.close();
119
- }
120
- else {
121
- browserInstance.close().catch((err) => {
122
- console.log('Unable to close browser', err);
123
- });
124
- }
125
136
  };
126
137
  exports.renderStill = renderStill;
127
138
  //# sourceMappingURL=render-still.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"render-still.js","sourceRoot":"","sources":["../src/render-still.ts"],"names":[],"mappings":"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"}
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,23 +1,41 @@
1
- import { Browser as PuppeteerBrowser } from 'puppeteer-core';
2
- import { Browser, BrowserExecutable, FrameRange, ImageFormat, VideoConfig } from 'remotion';
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, }: {
1
+ /// <reference types="node" />
2
+ import { Browser as PuppeteerBrowser, Page } from 'puppeteer-core';
3
+ import { BrowserExecutable, FrameRange, ImageFormat, VideoConfig } from 'remotion';
4
+ import { RenderMediaOnDownload } from './assets/download-and-map-assets-to-file';
5
+ import { BrowserLog } from './browser-log';
6
+ import { ServeUrlOrWebpackBundle } from './legacy-webpack-config';
7
+ import { OnStartData, RenderFramesOutput } from './types';
8
+ declare type ConfigOrComposition = {
9
+ /**
10
+ * @deprecated This field has been renamed to `composition`
11
+ */
5
12
  config: VideoConfig;
6
- compositionId: string;
13
+ } | {
14
+ composition: VideoConfig;
15
+ };
16
+ declare type RenderFramesOptions = {
7
17
  onStart: (data: OnStartData) => void;
8
- onFrameUpdate: (f: number) => void;
9
- outputDir: string;
18
+ onFrameUpdate: (framesRendered: number, frameIndex: number) => void;
19
+ outputDir: string | null;
10
20
  inputProps: unknown;
11
- envVariables?: Record<string, string> | undefined;
12
- webpackBundle: string;
21
+ envVariables?: Record<string, string>;
13
22
  imageFormat: ImageFormat;
14
- parallelism?: number | null | undefined;
15
- quality?: number | undefined;
16
- browser?: Browser | undefined;
17
- frameRange?: FrameRange | null | undefined;
18
- dumpBrowserLogs?: boolean | undefined;
19
- puppeteerInstance?: PuppeteerBrowser | undefined;
20
- browserExecutable?: BrowserExecutable | undefined;
21
- onError?: ((info: OnErrorInfo) => void) | undefined;
23
+ parallelism?: number | null;
24
+ quality?: number;
25
+ frameRange?: FrameRange | null;
26
+ dumpBrowserLogs?: boolean;
27
+ puppeteerInstance?: PuppeteerBrowser;
28
+ browserExecutable?: BrowserExecutable;
29
+ onBrowserLog?: (log: BrowserLog) => void;
30
+ writeFrame?: (buffer: Buffer, frame: number) => void;
31
+ onDownload?: RenderMediaOnDownload;
32
+ } & ConfigOrComposition & ServeUrlOrWebpackBundle;
33
+ export declare const innerRenderFrames: ({ parallelism, onFrameUpdate, outputDir, onStart, inputProps, quality, imageFormat, frameRange, puppeteerInstance, onError, envVariables, onBrowserLog, writeFrame, onDownload, pagesArray, serveUrl, composition, }: Omit<RenderFramesOptions, "url"> & {
34
+ onError: (err: Error) => void;
35
+ pagesArray: Page[];
36
+ serveUrl: string;
37
+ composition: VideoConfig;
22
38
  }) => Promise<RenderFramesOutput>;
39
+ export declare const renderFrames: (options: RenderFramesOptions) => Promise<RenderFramesOutput>;
40
+ export {};
23
41
  //# sourceMappingURL=render.d.ts.map
@@ -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,EAEX,WAAW,EACX,MAAM,UAAU,CAAC;AAYlB,OAAO,EAAC,WAAW,EAAE,WAAW,EAAE,kBAAkB,EAAC,MAAM,SAAS,CAAC;AAErE,eAAO,MAAM,YAAY;YAmBhB,WAAW;mBACJ,MAAM;oBACL,WAAW,KAAK,IAAI;uBACjB,MAAM,KAAK,IAAI;eACvB,MAAM;gBACL,OAAO;;mBAEJ,MAAM;iBACR,WAAW;;;;;;;;sBAQP,WAAW,KAAK,IAAI;MAClC,QAAQ,kBAAkB,CA4K7B,CAAC"}
1
+ {"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../src/render.ts"],"names":[],"mappings":";AAEA,OAAO,EACN,OAAO,IAAI,gBAAgB,EAE3B,IAAI,EACJ,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACN,iBAAiB,EACjB,UAAU,EACV,WAAW,EAEX,WAAW,EACX,MAAM,UAAU,CAAC;AAClB,OAAO,EAEN,qBAAqB,EACrB,MAAM,0CAA0C,CAAC;AAClD,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AAKzC,OAAO,EAEN,uBAAuB,EACvB,MAAM,yBAAyB,CAAC;AASjC,OAAO,EAAC,WAAW,EAAE,kBAAkB,EAAC,MAAM,SAAS,CAAC;AAExD,aAAK,mBAAmB,GACrB;IACA;;OAEG;IACH,MAAM,EAAE,WAAW,CAAC;CACnB,GACD;IACA,WAAW,EAAE,WAAW,CAAC;CACxB,CAAC;AAEL,aAAK,mBAAmB,GAAG;IAC1B,OAAO,EAAE,CAAC,IAAI,EAAE,WAAW,KAAK,IAAI,CAAC;IACrC,aAAa,EAAE,CAAC,cAAc,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,KAAK,IAAI,CAAC;IACpE,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,UAAU,EAAE,OAAO,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,WAAW,EAAE,WAAW,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,UAAU,GAAG,IAAI,CAAC;IAC/B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,iBAAiB,CAAC,EAAE,gBAAgB,CAAC;IACrC,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,YAAY,CAAC,EAAE,CAAC,GAAG,EAAE,UAAU,KAAK,IAAI,CAAC;IACzC,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACrD,UAAU,CAAC,EAAE,qBAAqB,CAAC;CACnC,GAAG,mBAAmB,GACtB,uBAAuB,CAAC;AAczB,eAAO,MAAM,iBAAiB;mBAmBd,KAAK,KAAK,IAAI;gBACjB,IAAI,EAAE;cACR,MAAM;iBACH,WAAW;MACrB,QAAQ,kBAAkB,CAqL7B,CAAC;AAEF,eAAO,MAAM,YAAY,YACf,mBAAmB,KAC1B,QAAQ,kBAAkB,CAgF5B,CAAC"}
package/dist/render.js CHANGED
@@ -3,48 +3,65 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.renderFrames = void 0;
6
+ exports.renderFrames = exports.innerRenderFrames = void 0;
7
+ const fs_1 = __importDefault(require("fs"));
7
8
  const path_1 = __importDefault(require("path"));
8
9
  const remotion_1 = require("remotion");
10
+ const download_and_map_assets_to_file_1 = require("./assets/download-and-map-assets-to-file");
9
11
  const cycle_browser_tabs_1 = require("./cycle-browser-tabs");
10
12
  const get_concurrency_1 = require("./get-concurrency");
11
- const get_frame_range_1 = require("./get-frame-range");
12
13
  const get_frame_to_render_1 = require("./get-frame-to-render");
13
14
  const image_format_1 = require("./image-format");
15
+ const legacy_webpack_config_1 = require("./legacy-webpack-config");
16
+ const make_assets_download_dir_1 = require("./make-assets-download-dir");
17
+ const normalize_serve_url_1 = require("./normalize-serve-url");
14
18
  const open_browser_1 = require("./open-browser");
15
19
  const pool_1 = require("./pool");
20
+ const prepare_server_1 = require("./prepare-server");
16
21
  const provide_screenshot_1 = require("./provide-screenshot");
17
22
  const seek_to_frame_1 = require("./seek-to-frame");
18
- const serve_static_1 = require("./serve-static");
19
23
  const set_props_and_env_1 = require("./set-props-and-env");
20
- 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, }) => {
21
- remotion_1.Internals.validateDimension(config.height, 'height', 'in the `config` object passed to `renderFrames()`');
22
- remotion_1.Internals.validateDimension(config.width, 'width', 'in the `config` object passed to `renderFrames()`');
23
- remotion_1.Internals.validateFps(config.fps, 'in the `config` object of `renderFrames()`');
24
- remotion_1.Internals.validateDurationInFrames(config.durationInFrames, 'in the `config` object passed to `renderFrames()`');
25
- if (quality !== undefined && imageFormat !== 'jpeg') {
26
- throw new Error("You can only pass the `quality` option if `imageFormat` is 'jpeg'.");
24
+ const getComposition = (others) => {
25
+ if ('composition' in others) {
26
+ return others.composition;
27
+ }
28
+ if ('config' in others) {
29
+ return others.config;
30
+ }
31
+ return undefined;
32
+ };
33
+ const innerRenderFrames = async ({ parallelism, onFrameUpdate, outputDir, onStart, inputProps, quality, imageFormat = image_format_1.DEFAULT_IMAGE_FORMAT, frameRange, puppeteerInstance, onError, envVariables, onBrowserLog, writeFrame, onDownload, pagesArray, serveUrl, composition, }) => {
34
+ if (!puppeteerInstance) {
35
+ throw new Error('weird');
27
36
  }
28
- remotion_1.Internals.validateQuality(quality);
29
37
  const actualParallelism = (0, get_concurrency_1.getActualConcurrency)(parallelism !== null && parallelism !== void 0 ? parallelism : null);
30
- const [{ port, close }, browserInstance] = await Promise.all([
31
- (0, serve_static_1.serveStatic)(webpackBundle),
32
- puppeteerInstance !== null && puppeteerInstance !== void 0 ? puppeteerInstance : (0, open_browser_1.openBrowser)(browser, {
33
- shouldDumpIo: dumpBrowserLogs,
34
- browserExecutable,
35
- }),
36
- ]);
38
+ if (outputDir) {
39
+ if (!fs_1.default.existsSync(outputDir)) {
40
+ fs_1.default.mkdirSync(outputDir, {
41
+ recursive: true,
42
+ });
43
+ }
44
+ }
45
+ const realFrameRange = (0, get_frame_to_render_1.getRealFrameRange)(composition.durationInFrames, frameRange !== null && frameRange !== void 0 ? frameRange : null);
46
+ const frameCount = realFrameRange[1] - realFrameRange[0] + 1;
37
47
  const pages = new Array(actualParallelism).fill(true).map(async () => {
38
- const page = await browserInstance.newPage();
48
+ const page = await puppeteerInstance.newPage();
49
+ pagesArray.push(page);
39
50
  page.setViewport({
40
- width: config.width,
41
- height: config.height,
51
+ width: composition.width,
52
+ height: composition.height,
42
53
  deviceScaleFactor: 1,
43
54
  });
44
- const errorCallback = (err) => {
45
- onError === null || onError === void 0 ? void 0 : onError({ error: err, frame: null });
55
+ const logCallback = (log) => {
56
+ onBrowserLog === null || onBrowserLog === void 0 ? void 0 : onBrowserLog({
57
+ stackTrace: log.stackTrace(),
58
+ text: log.text(),
59
+ type: log.type(),
60
+ });
46
61
  };
47
- page.on('pageerror', errorCallback);
62
+ if (onBrowserLog) {
63
+ page.on('console', logCallback);
64
+ }
48
65
  const initialFrame = typeof frameRange === 'number'
49
66
  ? frameRange
50
67
  : frameRange === null || frameRange === undefined
@@ -54,39 +71,37 @@ const renderFrames = async ({ config, parallelism, onFrameUpdate, compositionId,
54
71
  inputProps,
55
72
  envVariables,
56
73
  page,
57
- port,
74
+ serveUrl,
58
75
  initialFrame,
59
76
  });
60
- const site = `http://localhost:${port}/index.html?composition=${compositionId}`;
77
+ const site = `${(0, normalize_serve_url_1.normalizeServeUrl)(serveUrl)}?composition=${composition.id}`;
61
78
  await page.goto(site);
62
- page.off('pageerror', errorCallback);
79
+ page.off('console', logCallback);
63
80
  return page;
64
81
  });
65
- const { stopCycling } = (0, cycle_browser_tabs_1.cycleBrowserTabs)(browserInstance);
66
82
  const puppeteerPages = await Promise.all(pages);
67
83
  const pool = new pool_1.Pool(puppeteerPages);
68
- const frameCount = (0, get_frame_range_1.getFrameCount)(config.durationInFrames, frameRange !== null && frameRange !== void 0 ? frameRange : null);
84
+ const [firstFrameIndex, lastFrameIndex] = realFrameRange;
69
85
  // Substract one because 100 frames will be 00-99
70
86
  // --> 2 digits
71
- let filePadLength = 0;
72
- if (frameCount) {
73
- filePadLength = String(frameCount - 1).length;
74
- }
87
+ const filePadLength = String(lastFrameIndex).length;
75
88
  let framesRendered = 0;
76
89
  onStart({
77
90
  frameCount,
78
91
  });
92
+ const downloadDir = (0, make_assets_download_dir_1.makeAssetsDownloadTmpDir)();
79
93
  const assets = await Promise.all(new Array(frameCount)
80
94
  .fill(Boolean)
81
95
  .map((x, i) => i)
82
96
  .map(async (index) => {
83
- const frame = (0, get_frame_to_render_1.getFrameToRender)(frameRange !== null && frameRange !== void 0 ? frameRange : null, index);
97
+ const frame = realFrameRange[0] + index;
84
98
  const freePage = await pool.acquire();
85
99
  const paddedIndex = String(frame).padStart(filePadLength, '0');
86
- const errorCallback = (err) => {
87
- onError === null || onError === void 0 ? void 0 : onError({ error: err, frame });
100
+ const errorCallbackOnFrame = (err) => {
101
+ onError(new Error(`Error on rendering frame ${frame}: ${err.stack || err.message}`));
88
102
  };
89
- freePage.on('pageerror', errorCallback);
103
+ freePage.on('pageerror', errorCallbackOnFrame);
104
+ freePage.on('error', errorCallbackOnFrame);
90
105
  try {
91
106
  await (0, seek_to_frame_1.seekToFrame)({ frame, page: freePage });
92
107
  }
@@ -94,57 +109,123 @@ const renderFrames = async ({ config, parallelism, onFrameUpdate, compositionId,
94
109
  const error = err;
95
110
  if (error.message.includes('timeout') &&
96
111
  error.message.includes('exceeded')) {
97
- errorCallback(new Error('The rendering timed out. See https://www.remotion.dev/docs/timeout/ for possible reasons.'));
112
+ errorCallbackOnFrame(new Error('The rendering timed out. See https://www.remotion.dev/docs/timeout/ for possible reasons.'));
98
113
  }
99
114
  else {
100
- errorCallback(error);
115
+ errorCallbackOnFrame(error);
101
116
  }
102
117
  throw error;
103
118
  }
104
119
  if (imageFormat !== 'none') {
105
- await (0, provide_screenshot_1.provideScreenshot)({
106
- page: freePage,
107
- imageFormat,
108
- quality,
109
- options: {
110
- frame,
111
- output: path_1.default.join(outputDir, `element-${paddedIndex}.${imageFormat}`),
112
- },
113
- });
120
+ if (writeFrame) {
121
+ const buffer = await (0, provide_screenshot_1.provideScreenshot)({
122
+ page: freePage,
123
+ imageFormat,
124
+ quality,
125
+ options: {
126
+ frame,
127
+ output: undefined,
128
+ },
129
+ });
130
+ writeFrame(buffer, frame);
131
+ }
132
+ else {
133
+ if (!outputDir) {
134
+ throw new Error('Called renderFrames() without specifying either `outputDir` or `writeFrame`');
135
+ }
136
+ const output = path_1.default.join(outputDir, `element-${paddedIndex}.${imageFormat}`);
137
+ await (0, provide_screenshot_1.provideScreenshot)({
138
+ page: freePage,
139
+ imageFormat,
140
+ quality,
141
+ options: {
142
+ frame,
143
+ output,
144
+ },
145
+ });
146
+ }
114
147
  }
115
148
  const collectedAssets = await freePage.evaluate(() => {
116
149
  return window.remotion_collectAssets();
117
150
  });
151
+ collectedAssets.forEach((asset) => {
152
+ (0, download_and_map_assets_to_file_1.downloadAndMapAssetsToFileUrl)({
153
+ asset,
154
+ downloadDir,
155
+ onDownload: onDownload !== null && onDownload !== void 0 ? onDownload : (() => () => undefined),
156
+ });
157
+ });
118
158
  pool.release(freePage);
119
159
  framesRendered++;
120
- onFrameUpdate(framesRendered);
121
- freePage.off('pageerror', errorCallback);
160
+ onFrameUpdate(framesRendered, frame);
161
+ freePage.off('pageerror', errorCallbackOnFrame);
162
+ freePage.off('error', errorCallbackOnFrame);
122
163
  return collectedAssets;
123
164
  }));
124
- close().catch((err) => {
125
- console.log('Unable to close web server', err);
126
- });
127
- stopCycling();
128
- // If browser instance was passed in, we close all the pages
129
- // we opened.
130
- // If new browser was opened, then closing the browser as a cleanup.
131
- if (puppeteerInstance) {
132
- await Promise.all(puppeteerPages.map((p) => p.close())).catch((err) => {
133
- console.log('Unable to close browser tab', err);
134
- });
135
- }
136
- else {
137
- browserInstance.close().catch((err) => {
138
- console.log('Unable to close browser', err);
139
- });
140
- }
141
- return {
165
+ const returnValue = {
142
166
  assetsInfo: {
143
167
  assets,
144
- bundleDir: webpackBundle,
168
+ downloadDir,
169
+ firstFrameIndex,
170
+ imageSequenceName: `element-%0${filePadLength}d.${imageFormat}`,
145
171
  },
146
172
  frameCount,
147
173
  };
174
+ return returnValue;
175
+ };
176
+ exports.innerRenderFrames = innerRenderFrames;
177
+ const renderFrames = async (options) => {
178
+ var _a;
179
+ const composition = getComposition(options);
180
+ if (!composition) {
181
+ throw new Error('No `composition` option has been specified for renderFrames()');
182
+ }
183
+ remotion_1.Internals.validateDimension(composition.height, 'height', 'in the `config` object passed to `renderFrames()`');
184
+ remotion_1.Internals.validateDimension(composition.width, 'width', 'in the `config` object passed to `renderFrames()`');
185
+ remotion_1.Internals.validateFps(composition.fps, 'in the `config` object of `renderFrames()`');
186
+ remotion_1.Internals.validateDurationInFrames(composition.durationInFrames, 'in the `config` object passed to `renderFrames()`');
187
+ if (options.quality !== undefined && options.imageFormat !== 'jpeg') {
188
+ throw new Error("You can only pass the `quality` option if `imageFormat` is 'jpeg'.");
189
+ }
190
+ const selectedServeUrl = (0, legacy_webpack_config_1.getServeUrlWithFallback)(options);
191
+ remotion_1.Internals.validateQuality(options.quality);
192
+ const { closeServer, serveUrl } = await (0, prepare_server_1.prepareServer)(selectedServeUrl);
193
+ const browserInstance = (_a = options.puppeteerInstance) !== null && _a !== void 0 ? _a : (await (0, open_browser_1.openBrowser)(remotion_1.Internals.DEFAULT_BROWSER, {
194
+ shouldDumpIo: options.dumpBrowserLogs,
195
+ browserExecutable: options.browserExecutable,
196
+ }));
197
+ const { stopCycling } = (0, cycle_browser_tabs_1.cycleBrowserTabs)(browserInstance);
198
+ const openedPages = [];
199
+ return new Promise((resolve, reject) => {
200
+ // eslint-disable-next-line promise/catch-or-return
201
+ (0, exports.innerRenderFrames)({
202
+ ...options,
203
+ puppeteerInstance: browserInstance,
204
+ onError: (err) => reject(err),
205
+ pagesArray: openedPages,
206
+ serveUrl,
207
+ composition,
208
+ })
209
+ .then((res) => resolve(res))
210
+ .catch((err) => reject(err))
211
+ .finally(() => {
212
+ // If browser instance was passed in, we close all the pages
213
+ // we opened.
214
+ // If new browser was opened, then closing the browser as a cleanup.
215
+ if (options.puppeteerInstance) {
216
+ Promise.all(openedPages.map((p) => p.close())).catch((err) => {
217
+ console.log('Unable to close browser tab', err);
218
+ });
219
+ }
220
+ else {
221
+ browserInstance.close().catch((err) => {
222
+ console.log('Unable to close browser', err);
223
+ });
224
+ }
225
+ stopCycling();
226
+ closeServer();
227
+ });
228
+ });
148
229
  };
149
230
  exports.renderFrames = renderFrames;
150
231
  //# sourceMappingURL=render.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"render.js","sourceRoot":"","sources":["../src/render.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"render.js","sourceRoot":"","sources":["../src/render.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"screenshot-dom-element.d.ts","sourceRoot":"","sources":["../src/screenshot-dom-element.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAC,WAAW,EAAC,MAAM,UAAU,CAAC;AAGrC,eAAO,MAAM,oBAAoB;UAM1B,UAAU,IAAI;iBACP,WAAW;aACf,MAAM,GAAG,SAAS;;;;;MAKxB,QAAQ,MAAM,CA2BjB,CAAC"}
1
+ {"version":3,"file":"screenshot-dom-element.d.ts","sourceRoot":"","sources":["../src/screenshot-dom-element.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAC,WAAW,EAAC,MAAM,UAAU,CAAC;AAGrC,eAAO,MAAM,oBAAoB;UAM1B,UAAU,IAAI;iBACP,WAAW;aACf,MAAM,GAAG,SAAS;;;;;MAKxB,QAAQ,MAAM,CA0BjB,CAAC"}
@@ -3,12 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.screenshotDOMElement = void 0;
4
4
  const puppeteer_screenshot_1 = require("./puppeteer-screenshot");
5
5
  const screenshotDOMElement = async ({ page, imageFormat, quality, opts = {}, }) => {
6
- const path = 'path' in opts ? opts.path : null;
6
+ const path = 'path' in opts ? opts.path : undefined;
7
7
  const { selector } = opts;
8
8
  if (!selector)
9
9
  throw Error('Please provide a selector.');
10
- if (!path)
11
- throw Error('Please provide a path.');
12
10
  if (imageFormat === 'png') {
13
11
  await page.evaluate(() => {
14
12
  document.body.style.background = 'transparent';
@@ -1 +1 @@
1
- {"version":3,"file":"screenshot-dom-element.js","sourceRoot":"","sources":["../src/screenshot-dom-element.ts"],"names":[],"mappings":";;;AAEA,iEAAkD;AAE3C,MAAM,oBAAoB,GAAG,KAAK,EAAE,EAC1C,IAAI,EACJ,WAAW,EACX,OAAO,EACP,IAAI,GAAG,EAAE,GAST,EAAmB,EAAE;IACrB,MAAM,IAAI,GAAG,MAAM,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;IAC/C,MAAM,EAAC,QAAQ,EAAC,GAAG,IAAI,CAAC;IAExB,IAAI,CAAC,QAAQ;QAAE,MAAM,KAAK,CAAC,4BAA4B,CAAC,CAAC;IACzD,IAAI,CAAC,IAAI;QAAE,MAAM,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAEjD,IAAI,WAAW,KAAK,KAAK,EAAE;QAC1B,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE;YACxB,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,GAAG,aAAa,CAAC;QAChD,CAAC,CAAC,CAAC;KACH;SAAM;QACN,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE;YACxB,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,GAAG,OAAO,CAAC;QAC1C,CAAC,CAAC,CAAC;KACH;IAED,IAAI,WAAW,KAAK,MAAM,EAAE;QAC3B,MAAM,IAAI,SAAS,CAAC,+CAA+C,CAAC,CAAC;KACrE;IAED,OAAO,IAAA,iCAAU,EAAC,IAAI,EAAE;QACvB,cAAc,EAAE,WAAW,KAAK,KAAK;QACrC,IAAI;QACJ,IAAI,EAAE,WAAW;QACjB,OAAO;KACP,CAAoB,CAAC;AACvB,CAAC,CAAC;AAxCW,QAAA,oBAAoB,wBAwC/B"}
1
+ {"version":3,"file":"screenshot-dom-element.js","sourceRoot":"","sources":["../src/screenshot-dom-element.ts"],"names":[],"mappings":";;;AAEA,iEAAkD;AAE3C,MAAM,oBAAoB,GAAG,KAAK,EAAE,EAC1C,IAAI,EACJ,WAAW,EACX,OAAO,EACP,IAAI,GAAG,EAAE,GAST,EAAmB,EAAE;IACrB,MAAM,IAAI,GAAG,MAAM,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;IACpD,MAAM,EAAC,QAAQ,EAAC,GAAG,IAAI,CAAC;IAExB,IAAI,CAAC,QAAQ;QAAE,MAAM,KAAK,CAAC,4BAA4B,CAAC,CAAC;IAEzD,IAAI,WAAW,KAAK,KAAK,EAAE;QAC1B,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE;YACxB,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,GAAG,aAAa,CAAC;QAChD,CAAC,CAAC,CAAC;KACH;SAAM;QACN,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE;YACxB,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,GAAG,OAAO,CAAC;QAC1C,CAAC,CAAC,CAAC;KACH;IAED,IAAI,WAAW,KAAK,MAAM,EAAE;QAC3B,MAAM,IAAI,SAAS,CAAC,+CAA+C,CAAC,CAAC;KACrE;IAED,OAAO,IAAA,iCAAU,EAAC,IAAI,EAAE;QACvB,cAAc,EAAE,WAAW,KAAK,KAAK;QACrC,IAAI;QACJ,IAAI,EAAE,WAAW;QACjB,OAAO;KACP,CAAoB,CAAC;AACvB,CAAC,CAAC;AAvCW,QAAA,oBAAoB,wBAuC/B"}