@remotion/renderer 4.0.0-preload.17 → 4.0.0-reorg.27

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 (261) hide show
  1. package/dist/assets/calculate-asset-positions.d.ts +2 -2
  2. package/dist/assets/convert-assets-to-file-urls.d.ts +2 -2
  3. package/dist/assets/download-and-map-assets-to-file.d.ts +11 -9
  4. package/dist/assets/download-and-map-assets-to-file.js +96 -40
  5. package/dist/assets/download-file.d.ts +10 -5
  6. package/dist/assets/download-file.js +18 -5
  7. package/dist/assets/ffmpeg-volume-expression.d.ts +2 -3
  8. package/dist/assets/ffmpeg-volume-expression.js +2 -3
  9. package/dist/assets/flatten-volume-array.d.ts +1 -1
  10. package/dist/assets/get-audio-channels.d.ts +5 -2
  11. package/dist/assets/get-audio-channels.js +15 -4
  12. package/dist/assets/get-video-stream-duration.d.ts +6 -0
  13. package/dist/assets/get-video-stream-duration.js +34 -0
  14. package/dist/assets/read-file.js +4 -1
  15. package/dist/assets/types.d.ts +1 -1
  16. package/dist/browser/Browser.d.ts +60 -0
  17. package/dist/browser/Browser.js +218 -0
  18. package/dist/browser/BrowserConnector.d.ts +19 -0
  19. package/dist/browser/BrowserConnector.js +17 -0
  20. package/dist/browser/BrowserFetcher.d.ts +89 -0
  21. package/dist/browser/BrowserFetcher.js +510 -0
  22. package/dist/browser/BrowserPage.d.ts +74 -0
  23. package/dist/browser/BrowserPage.js +283 -0
  24. package/dist/browser/BrowserRunner.d.ts +39 -0
  25. package/dist/browser/BrowserRunner.js +308 -0
  26. package/dist/browser/Connection.d.ts +42 -0
  27. package/dist/browser/Connection.js +242 -0
  28. package/dist/browser/ConsoleMessage.d.ts +31 -0
  29. package/dist/browser/ConsoleMessage.js +48 -0
  30. package/dist/browser/DOMWorld.d.ts +52 -0
  31. package/dist/browser/DOMWorld.js +272 -0
  32. package/dist/browser/Errors.d.ts +25 -0
  33. package/dist/browser/Errors.js +35 -0
  34. package/dist/browser/EvalTypes.d.ts +27 -0
  35. package/dist/browser/EvalTypes.js +17 -0
  36. package/dist/browser/EventEmitter.d.ts +23 -0
  37. package/dist/browser/EventEmitter.js +53 -0
  38. package/dist/browser/ExecutionContext.d.ts +34 -0
  39. package/dist/browser/ExecutionContext.js +174 -0
  40. package/dist/browser/FrameManager.d.ts +93 -0
  41. package/dist/browser/FrameManager.js +496 -0
  42. package/dist/browser/HTTPRequest.d.ts +28 -0
  43. package/dist/browser/HTTPRequest.js +37 -0
  44. package/dist/browser/HTTPResponse.d.ts +21 -0
  45. package/dist/browser/HTTPResponse.js +41 -0
  46. package/dist/browser/JSHandle.d.ts +35 -0
  47. package/dist/browser/JSHandle.js +90 -0
  48. package/dist/browser/LaunchOptions.d.ts +37 -0
  49. package/dist/browser/LaunchOptions.js +17 -0
  50. package/dist/browser/Launcher.d.ts +9 -0
  51. package/dist/browser/Launcher.js +504 -0
  52. package/dist/browser/LifecycleWatcher.d.ts +29 -0
  53. package/dist/browser/LifecycleWatcher.js +180 -0
  54. package/dist/browser/NetworkEventManager.d.ts +33 -0
  55. package/dist/browser/NetworkEventManager.js +81 -0
  56. package/dist/browser/NetworkManager.d.ts +34 -0
  57. package/dist/browser/NetworkManager.js +231 -0
  58. package/dist/browser/NodeWebSocketTransport.d.ts +17 -0
  59. package/dist/browser/NodeWebSocketTransport.js +87 -0
  60. package/dist/browser/Product.d.ts +16 -0
  61. package/dist/browser/Product.js +17 -0
  62. package/dist/browser/PuppeteerNode.d.ts +40 -0
  63. package/dist/browser/PuppeteerNode.js +81 -0
  64. package/dist/browser/PuppeteerViewport.d.ts +5 -0
  65. package/dist/browser/PuppeteerViewport.js +2 -0
  66. package/dist/browser/ScreenshotOptions.d.ts +14 -0
  67. package/dist/browser/ScreenshotOptions.js +2 -0
  68. package/dist/browser/Target.d.ts +61 -0
  69. package/dist/browser/Target.js +146 -0
  70. package/dist/browser/TaskQueue.d.ts +20 -0
  71. package/dist/browser/TaskQueue.js +47 -0
  72. package/dist/browser/TimeoutSettings.d.ts +24 -0
  73. package/dist/browser/TimeoutSettings.js +62 -0
  74. package/dist/browser/assert.d.ts +1 -0
  75. package/dist/browser/assert.js +9 -0
  76. package/dist/browser/create-browser-fetcher.d.ts +17 -0
  77. package/dist/browser/create-browser-fetcher.js +119 -0
  78. package/dist/browser/devtools-commands.d.ts +270 -0
  79. package/dist/browser/devtools-commands.js +2 -0
  80. package/dist/browser/devtools-types.d.ts +1122 -0
  81. package/dist/browser/devtools-types.js +2 -0
  82. package/dist/browser/get-download-destination.d.ts +1 -0
  83. package/dist/browser/get-download-destination.js +38 -0
  84. package/dist/browser/mitt/index.d.ts +22 -0
  85. package/dist/browser/mitt/index.js +49 -0
  86. package/dist/browser/node.d.ts +2 -0
  87. package/dist/browser/node.js +9 -0
  88. package/dist/browser/revisions.d.ts +21 -0
  89. package/dist/browser/revisions.js +22 -0
  90. package/dist/browser/util.d.ts +47 -0
  91. package/dist/browser/util.js +169 -0
  92. package/dist/browser-executable.d.ts +1 -0
  93. package/dist/browser-executable.js +2 -0
  94. package/dist/browser-log.d.ts +1 -1
  95. package/dist/browser.d.ts +2 -0
  96. package/dist/browser.js +4 -0
  97. package/dist/calculate-ffmpeg-filters.d.ts +1 -1
  98. package/dist/calculate-ffmpeg-filters.js +2 -2
  99. package/dist/calculate-sar-dar-pixels.d.ts +9 -0
  100. package/dist/calculate-sar-dar-pixels.js +19 -0
  101. package/dist/can-use-parallel-encoding.d.ts +1 -1
  102. package/dist/can-use-parallel-encoding.js +2 -2
  103. package/dist/codec-supports-media.d.ts +7 -0
  104. package/dist/codec-supports-media.js +49 -0
  105. package/dist/codec.d.ts +4 -0
  106. package/dist/codec.js +16 -0
  107. package/dist/combine-videos.d.ts +4 -2
  108. package/dist/combine-videos.js +17 -5
  109. package/dist/compress-assets.d.ts +7 -0
  110. package/dist/compress-assets.js +25 -0
  111. package/dist/convert-number-of-gif-loops-to-ffmpeg.d.ts +1 -0
  112. package/dist/convert-number-of-gif-loops-to-ffmpeg.js +17 -0
  113. package/dist/convert-to-pcm.d.ts +1 -1
  114. package/dist/create-ffmpeg-merge-filter.js +3 -3
  115. package/dist/create-silent-audio.d.ts +1 -1
  116. package/dist/crf.d.ts +5 -0
  117. package/dist/crf.js +64 -0
  118. package/dist/cycle-browser-tabs.d.ts +3 -2
  119. package/dist/cycle-browser-tabs.js +9 -2
  120. package/dist/delay-render-embedded-stack.d.ts +1 -1
  121. package/dist/ensure-frames-in-order.d.ts +1 -1
  122. package/dist/ensure-frames-in-order.js +3 -2
  123. package/dist/ensure-presentation-timestamp.d.ts +1 -0
  124. package/dist/ensure-presentation-timestamp.js +67 -0
  125. package/dist/error-handling/handle-javascript-exception.d.ts +2 -2
  126. package/dist/error-handling/handle-javascript-exception.js +3 -4
  127. package/dist/error-handling/symbolicate-error.d.ts +1 -1
  128. package/dist/error-handling/symbolicateable-error.d.ts +1 -1
  129. package/dist/extract-frame-from-video.d.ts +6 -10
  130. package/dist/extract-frame-from-video.js +161 -43
  131. package/dist/ffmpeg-executable.d.ts +1 -0
  132. package/dist/ffmpeg-executable.js +2 -0
  133. package/dist/frame-range.d.ts +2 -0
  134. package/dist/frame-range.js +49 -0
  135. package/dist/get-audio-codec-name.d.ts +1 -1
  136. package/dist/get-audio-codec-name.js +2 -2
  137. package/dist/get-browser-instance.d.ts +4 -3
  138. package/dist/get-browser-instance.js +2 -2
  139. package/dist/get-codec-name.d.ts +1 -1
  140. package/dist/get-codec-name.js +5 -2
  141. package/dist/get-compositions.d.ts +8 -5
  142. package/dist/get-compositions.js +7 -5
  143. package/dist/get-duration-from-frame-range.d.ts +1 -2
  144. package/dist/get-duration-from-frame-range.js +13 -9
  145. package/dist/get-extension-from-codec.d.ts +2 -2
  146. package/dist/get-extension-from-codec.js +5 -0
  147. package/dist/get-extension-of-filename.d.ts +1 -1
  148. package/dist/get-extension-of-filename.js +3 -0
  149. package/dist/get-frame-padded-index.d.ts +14 -0
  150. package/dist/get-frame-padded-index.js +33 -0
  151. package/dist/get-frame-to-render.d.ts +1 -1
  152. package/dist/get-local-browser-executable.d.ts +2 -1
  153. package/dist/get-local-browser-executable.js +7 -5
  154. package/dist/get-port.js +30 -37
  155. package/dist/get-prores-profile-name.d.ts +2 -1
  156. package/dist/get-video-info.d.ts +8 -0
  157. package/dist/get-video-info.js +50 -0
  158. package/dist/guess-extension-for-media.d.ts +1 -0
  159. package/dist/guess-extension-for-media.js +27 -0
  160. package/dist/image-format.d.ts +6 -1
  161. package/dist/image-format.js +25 -1
  162. package/dist/index.d.ts +85 -14
  163. package/dist/index.js +90 -4
  164. package/dist/is-audio-codec.d.ts +2 -0
  165. package/dist/is-audio-codec.js +7 -0
  166. package/dist/is-beyond-last-frame.d.ts +2 -0
  167. package/dist/is-beyond-last-frame.js +12 -0
  168. package/dist/last-frame-from-video-cache.d.ts +15 -0
  169. package/dist/last-frame-from-video-cache.js +55 -0
  170. package/dist/log-level.d.ts +4 -0
  171. package/dist/log-level.js +15 -0
  172. package/dist/make-assets-download-dir.js +6 -1
  173. package/dist/make-cancel-signal.d.ts +7 -0
  174. package/dist/make-cancel-signal.js +25 -0
  175. package/dist/merge-audio-track.d.ts +1 -1
  176. package/dist/merge-audio-track.js +8 -5
  177. package/dist/mime-db.d.ts +6 -0
  178. package/dist/mime-db.js +8636 -0
  179. package/dist/mime-types.d.ts +2 -0
  180. package/dist/mime-types.js +89 -0
  181. package/dist/offthread-video-server.d.ts +7 -4
  182. package/dist/offthread-video-server.js +20 -10
  183. package/dist/open-browser.d.ts +9 -7
  184. package/dist/open-browser.js +15 -15
  185. package/dist/overwrite.d.ts +1 -0
  186. package/dist/overwrite.js +4 -0
  187. package/dist/perf.d.ts +5 -0
  188. package/dist/perf.js +35 -0
  189. package/dist/pixel-format.d.ts +5 -0
  190. package/dist/pixel-format.js +26 -0
  191. package/dist/prepare-server.d.ts +4 -3
  192. package/dist/prepare-server.js +19 -3
  193. package/dist/preprocess-audio-track.d.ts +3 -2
  194. package/dist/preprocess-audio-track.js +2 -2
  195. package/dist/prespawn-ffmpeg.d.ts +7 -1
  196. package/dist/prespawn-ffmpeg.js +13 -7
  197. package/dist/prores-profile.d.ts +5 -0
  198. package/dist/prores-profile.js +23 -0
  199. package/dist/provide-screenshot.d.ts +4 -5
  200. package/dist/provide-screenshot.js +1 -2
  201. package/dist/puppeteer-evaluate.d.ts +1 -1
  202. package/dist/puppeteer-evaluate.js +3 -4
  203. package/dist/puppeteer-screenshot.d.ts +3 -3
  204. package/dist/puppeteer-screenshot.js +7 -5
  205. package/dist/quality.d.ts +1 -0
  206. package/dist/quality.js +21 -0
  207. package/dist/render-frames.d.ts +16 -8
  208. package/dist/render-frames.js +126 -73
  209. package/dist/render-media.d.ts +26 -9
  210. package/dist/render-media.js +149 -62
  211. package/dist/render-still.d.ts +15 -7
  212. package/dist/render-still.js +43 -19
  213. package/dist/screenshot-dom-element.d.ts +6 -8
  214. package/dist/screenshot-dom-element.js +3 -6
  215. package/dist/screenshot-task.d.ts +3 -3
  216. package/dist/screenshot-task.js +10 -12
  217. package/dist/seek-to-frame.d.ts +2 -2
  218. package/dist/seek-to-frame.js +2 -2
  219. package/dist/serve-handler/index.d.ts +4 -0
  220. package/dist/serve-handler/index.js +204 -0
  221. package/dist/serve-handler/is-path-inside.d.ts +1 -0
  222. package/dist/serve-handler/is-path-inside.js +27 -0
  223. package/dist/serve-handler/range-parser.d.ts +13 -0
  224. package/dist/serve-handler/range-parser.js +57 -0
  225. package/dist/serve-static.d.ts +3 -2
  226. package/dist/serve-static.js +8 -7
  227. package/dist/set-props-and-env.d.ts +3 -2
  228. package/dist/set-props-and-env.js +28 -4
  229. package/dist/stitch-frames-to-video.d.ts +15 -5
  230. package/dist/stitch-frames-to-video.js +132 -41
  231. package/dist/stringify-ffmpeg-filter.d.ts +2 -2
  232. package/dist/stringify-ffmpeg-filter.js +11 -9
  233. package/dist/symbolicate-stacktrace.d.ts +1 -1
  234. package/dist/symbolicate-stacktrace.js +3 -3
  235. package/dist/tmp-dir.js +5 -1
  236. package/dist/truthy.d.ts +3 -0
  237. package/dist/truthy.js +7 -0
  238. package/dist/types.d.ts +1 -1
  239. package/dist/validate-concurrency.d.ts +1 -0
  240. package/dist/validate-concurrency.js +24 -0
  241. package/dist/validate-even-dimensions-with-codec.d.ts +1 -1
  242. package/dist/validate-even-dimensions-with-codec.js +2 -2
  243. package/dist/validate-every-nth-frame.d.ts +1 -0
  244. package/dist/validate-every-nth-frame.js +21 -0
  245. package/dist/validate-ffmpeg.js +2 -3
  246. package/dist/validate-frame.d.ts +1 -0
  247. package/dist/validate-frame.js +24 -0
  248. package/dist/validate-opengl-renderer.d.ts +5 -0
  249. package/dist/validate-opengl-renderer.js +15 -0
  250. package/dist/validate-output-filename.d.ts +1 -1
  251. package/dist/validate-output-filename.js +5 -0
  252. package/dist/wait-for-symbolication-error-to-be-done.d.ts +3 -0
  253. package/dist/wait-for-symbolication-error-to-be-done.js +34 -0
  254. package/dist/ws/ws-types.d.ts +14 -0
  255. package/dist/ws/ws-types.js +10 -0
  256. package/package.json +13 -15
  257. package/tsconfig.json +2 -2
  258. package/types/ws/index.d.ts +509 -0
  259. package/vitest.config.ts +8 -0
  260. package/dist/offthread/index.d.ts +0 -0
  261. package/dist/offthread/index.js +0 -1
@@ -1,3 +1,3 @@
1
- import { TAsset } from 'remotion';
2
- import { Assets } from './types';
1
+ import type { TAsset } from 'remotion';
2
+ import type { Assets } from './types';
3
3
  export declare const calculateAssetPositions: (frames: TAsset[][]) => Assets;
@@ -1,5 +1,5 @@
1
- import { TAsset } from 'remotion';
2
- import { RenderMediaOnDownload } from './download-and-map-assets-to-file';
1
+ import type { TAsset } from 'remotion';
2
+ import type { RenderMediaOnDownload } from './download-and-map-assets-to-file';
3
3
  export declare const convertAssetsToFileUrls: ({ assets, downloadDir, onDownload, }: {
4
4
  assets: TAsset[][];
5
5
  downloadDir: string;
@@ -1,20 +1,22 @@
1
- import { TAsset } from 'remotion';
1
+ import type { TAsset } from 'remotion';
2
2
  export declare type RenderMediaOnDownload = (src: string) => ((progress: {
3
- percent: number;
3
+ percent: number | null;
4
+ downloaded: number;
5
+ totalSize: number | null;
4
6
  }) => void) | undefined | void;
5
- export declare const waitForAssetToBeDownloaded: (src: string) => Promise<string>;
7
+ export declare const downloadAsset: ({ src, onDownload, downloadDir, }: {
8
+ src: string;
9
+ onDownload: RenderMediaOnDownload;
10
+ downloadDir: string;
11
+ }) => Promise<string>;
6
12
  export declare const markAllAssetsAsDownloaded: () => void;
7
- export declare const getSanitizedFilenameForAssetUrl: ({ src, downloadDir, }: {
13
+ export declare const getSanitizedFilenameForAssetUrl: ({ src, downloadDir, contentDisposition, }: {
8
14
  src: string;
9
15
  downloadDir: string;
16
+ contentDisposition: string | null;
10
17
  }) => string;
11
18
  export declare const downloadAndMapAssetsToFileUrl: ({ asset, downloadDir, onDownload, }: {
12
19
  asset: TAsset;
13
20
  downloadDir: string;
14
21
  onDownload: RenderMediaOnDownload;
15
22
  }) => Promise<TAsset>;
16
- export declare const startDownloadForSrc: ({ src, downloadDir, onDownload, }: {
17
- src: string;
18
- downloadDir: string;
19
- onDownload: RenderMediaOnDownload;
20
- }) => Promise<string>;
@@ -3,35 +3,54 @@ 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.startDownloadForSrc = exports.downloadAndMapAssetsToFileUrl = exports.getSanitizedFilenameForAssetUrl = exports.markAllAssetsAsDownloaded = exports.waitForAssetToBeDownloaded = void 0;
6
+ exports.downloadAndMapAssetsToFileUrl = exports.getSanitizedFilenameForAssetUrl = exports.markAllAssetsAsDownloaded = exports.downloadAsset = void 0;
7
7
  const fs_1 = __importDefault(require("fs"));
8
8
  const path_1 = __importDefault(require("path"));
9
9
  const remotion_1 = require("remotion");
10
+ const compress_assets_1 = require("../compress-assets");
10
11
  const ensure_output_directory_1 = require("../ensure-output-directory");
11
12
  const download_file_1 = require("./download-file");
12
13
  const sanitize_filepath_1 = require("./sanitize-filepath");
13
14
  const isDownloadingMap = {};
14
15
  const hasBeenDownloadedMap = {};
15
16
  const listeners = {};
16
- const waitForAssetToBeDownloaded = (src) => {
17
- if (hasBeenDownloadedMap[src]) {
18
- return Promise.resolve(hasBeenDownloadedMap[src]);
17
+ const waitForAssetToBeDownloaded = ({ src, downloadDir, }) => {
18
+ var _a, _b;
19
+ if ((_a = hasBeenDownloadedMap[src]) === null || _a === void 0 ? void 0 : _a[downloadDir]) {
20
+ return Promise.resolve((_b = hasBeenDownloadedMap[src]) === null || _b === void 0 ? void 0 : _b[downloadDir]);
19
21
  }
20
22
  if (!listeners[src]) {
21
- listeners[src] = [];
23
+ listeners[src] = {};
24
+ }
25
+ if (!listeners[src][downloadDir]) {
26
+ listeners[src][downloadDir] = [];
22
27
  }
23
28
  return new Promise((resolve) => {
24
- listeners[src].push((to) => resolve(to));
29
+ listeners[src][downloadDir].push(() => {
30
+ const srcMap = hasBeenDownloadedMap[src];
31
+ if (!srcMap || !srcMap[downloadDir]) {
32
+ throw new Error('Expected file for ' + src + 'to be available in ' + downloadDir);
33
+ }
34
+ resolve(srcMap[downloadDir]);
35
+ });
25
36
  });
26
37
  };
27
- exports.waitForAssetToBeDownloaded = waitForAssetToBeDownloaded;
28
- const notifyAssetIsDownloaded = (src, to) => {
38
+ const notifyAssetIsDownloaded = ({ src, downloadDir, to, }) => {
29
39
  if (!listeners[src]) {
30
- listeners[src] = [];
40
+ listeners[src] = {};
41
+ }
42
+ if (!listeners[src][downloadDir]) {
43
+ listeners[src][downloadDir] = [];
44
+ }
45
+ if (!isDownloadingMap[src]) {
46
+ isDownloadingMap[src] = {};
47
+ }
48
+ isDownloadingMap[src][downloadDir] = true;
49
+ if (!hasBeenDownloadedMap[src]) {
50
+ hasBeenDownloadedMap[src] = {};
31
51
  }
32
- listeners[src].forEach((fn) => fn(to));
33
- isDownloadingMap[src] = false;
34
- hasBeenDownloadedMap[src] = to;
52
+ hasBeenDownloadedMap[src][downloadDir] = to;
53
+ listeners[src][downloadDir].forEach((fn) => fn());
35
54
  };
36
55
  const validateMimeType = (mimeType, src) => {
37
56
  if (!mimeType.includes('/')) {
@@ -72,17 +91,40 @@ function validateBufferEncoding(potentialEncoding, dataUrl) {
72
91
  throw new TypeError(errMessage);
73
92
  }
74
93
  }
75
- const downloadAsset = async (src, to, onDownload) => {
76
- if (hasBeenDownloadedMap[src]) {
77
- return;
94
+ const downloadAsset = async ({ src, onDownload, downloadDir, }) => {
95
+ var _a, _b, _c;
96
+ if ((0, compress_assets_1.isAssetCompressed)(src)) {
97
+ return src;
98
+ }
99
+ if ((_a = hasBeenDownloadedMap[src]) === null || _a === void 0 ? void 0 : _a[downloadDir]) {
100
+ const claimedDownloadLocation = (_b = hasBeenDownloadedMap[src]) === null || _b === void 0 ? void 0 : _b[downloadDir];
101
+ // The OS might have deleted the file since even though we marked it as downloaded. In that case we reset the state and download it again
102
+ if (!fs_1.default.existsSync(claimedDownloadLocation)) {
103
+ return claimedDownloadLocation;
104
+ }
105
+ // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
106
+ hasBeenDownloadedMap[src][downloadDir] = null;
107
+ if (!isDownloadingMap[src]) {
108
+ isDownloadingMap[src] = {};
109
+ }
110
+ // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
111
+ isDownloadingMap[src][downloadDir] = false;
112
+ }
113
+ if ((_c = isDownloadingMap[src]) === null || _c === void 0 ? void 0 : _c[downloadDir]) {
114
+ return waitForAssetToBeDownloaded({ src, downloadDir });
78
115
  }
79
- if (isDownloadingMap[src]) {
80
- return (0, exports.waitForAssetToBeDownloaded)(src);
116
+ if (!isDownloadingMap[src]) {
117
+ isDownloadingMap[src] = {};
81
118
  }
82
- isDownloadingMap[src] = true;
119
+ isDownloadingMap[src][downloadDir] = true;
83
120
  const onProgress = onDownload(src);
84
- (0, ensure_output_directory_1.ensureOutputDirectory)(to);
85
121
  if (src.startsWith('data:')) {
122
+ const output = (0, exports.getSanitizedFilenameForAssetUrl)({
123
+ contentDisposition: null,
124
+ downloadDir,
125
+ src,
126
+ });
127
+ (0, ensure_output_directory_1.ensureOutputDirectory)(output);
86
128
  const [assetDetails, assetData] = src.substring('data:'.length).split(',');
87
129
  if (!assetDetails.includes(';')) {
88
130
  const errMessage = [
@@ -97,17 +139,21 @@ const downloadAsset = async (src, to, onDownload) => {
97
139
  validateMimeType(mimeType, src);
98
140
  validateBufferEncoding(encoding, src);
99
141
  const buff = Buffer.from(assetData, encoding);
100
- await fs_1.default.promises.writeFile(to, buff);
101
- notifyAssetIsDownloaded(src, to);
102
- return;
142
+ await fs_1.default.promises.writeFile(output, buff);
143
+ notifyAssetIsDownloaded({ src, downloadDir, to: output });
144
+ return output;
103
145
  }
104
- await (0, download_file_1.downloadFile)(src, to, ({ progress }) => {
105
- onProgress === null || onProgress === void 0 ? void 0 : onProgress({
106
- percent: progress,
107
- });
146
+ const { to } = await (0, download_file_1.downloadFile)({
147
+ url: src,
148
+ onProgress: (progress) => {
149
+ onProgress === null || onProgress === void 0 ? void 0 : onProgress(progress);
150
+ },
151
+ to: (contentDisposition) => (0, exports.getSanitizedFilenameForAssetUrl)({ contentDisposition, downloadDir, src }),
108
152
  });
109
- notifyAssetIsDownloaded(src, to);
153
+ notifyAssetIsDownloaded({ src, downloadDir, to });
154
+ return to;
110
155
  };
156
+ exports.downloadAsset = downloadAsset;
111
157
  const markAllAssetsAsDownloaded = () => {
112
158
  Object.keys(hasBeenDownloadedMap).forEach((key) => {
113
159
  delete hasBeenDownloadedMap[key];
@@ -117,21 +163,39 @@ const markAllAssetsAsDownloaded = () => {
117
163
  });
118
164
  };
119
165
  exports.markAllAssetsAsDownloaded = markAllAssetsAsDownloaded;
120
- const getSanitizedFilenameForAssetUrl = ({ src, downloadDir, }) => {
121
- if (remotion_1.Internals.AssetCompression.isAssetCompressed(src)) {
122
- return src;
166
+ const getFilename = ({ contentDisposition, src, }) => {
167
+ const filenameProbe = 'filename=';
168
+ if (contentDisposition === null || contentDisposition === void 0 ? void 0 : contentDisposition.includes(filenameProbe)) {
169
+ const start = contentDisposition.indexOf(filenameProbe);
170
+ const onlyFromFileName = contentDisposition.substring(start + filenameProbe.length);
171
+ const hasSemi = onlyFromFileName.indexOf(';');
172
+ if (hasSemi === -1) {
173
+ return { pathname: onlyFromFileName.trim(), search: '' };
174
+ }
175
+ return {
176
+ search: '',
177
+ pathname: onlyFromFileName.substring(0, hasSemi).trim(),
178
+ };
123
179
  }
124
180
  const { pathname, search } = new URL(src);
181
+ return { pathname, search };
182
+ };
183
+ const getSanitizedFilenameForAssetUrl = ({ src, downloadDir, contentDisposition, }) => {
184
+ if ((0, compress_assets_1.isAssetCompressed)(src)) {
185
+ return src;
186
+ }
187
+ const { pathname, search } = getFilename({ contentDisposition, src });
125
188
  const split = pathname.split('.');
126
189
  const fileExtension = split.length > 1 && split[split.length - 1]
127
190
  ? `.${split[split.length - 1]}`
128
191
  : '';
129
192
  const hashedFileName = String((0, remotion_1.random)(`${pathname}${search}`)).replace('0.', '');
130
- return path_1.default.join(downloadDir, (0, sanitize_filepath_1.sanitizeFilePath)(hashedFileName + fileExtension));
193
+ const filename = hashedFileName + fileExtension;
194
+ return path_1.default.join(downloadDir, (0, sanitize_filepath_1.sanitizeFilePath)(filename));
131
195
  };
132
196
  exports.getSanitizedFilenameForAssetUrl = getSanitizedFilenameForAssetUrl;
133
197
  const downloadAndMapAssetsToFileUrl = async ({ asset, downloadDir, onDownload, }) => {
134
- const newSrc = await (0, exports.startDownloadForSrc)({
198
+ const newSrc = await (0, exports.downloadAsset)({
135
199
  src: asset.src,
136
200
  downloadDir,
137
201
  onDownload,
@@ -142,11 +206,3 @@ const downloadAndMapAssetsToFileUrl = async ({ asset, downloadDir, onDownload, }
142
206
  };
143
207
  };
144
208
  exports.downloadAndMapAssetsToFileUrl = downloadAndMapAssetsToFileUrl;
145
- const startDownloadForSrc = async ({ src, downloadDir, onDownload, }) => {
146
- const newSrc = (0, exports.getSanitizedFilenameForAssetUrl)({ downloadDir, src });
147
- if (!remotion_1.Internals.AssetCompression.isAssetCompressed(newSrc)) {
148
- await downloadAsset(src, newSrc, onDownload);
149
- }
150
- return newSrc;
151
- };
152
- exports.startDownloadForSrc = startDownloadForSrc;
@@ -1,7 +1,12 @@
1
- export declare const downloadFile: (url: string, to: string, onProgress: ((progress: {
2
- progress: number;
3
- downloaded: number;
4
- totalSize: number;
5
- }) => void) | undefined) => Promise<{
1
+ export declare const downloadFile: ({ onProgress, url, to: toFn, }: {
2
+ url: string;
3
+ to: (contentDisposition: string | null) => string;
4
+ onProgress: ((progress: {
5
+ percent: number | null;
6
+ downloaded: number;
7
+ totalSize: number | null;
8
+ }) => void) | undefined;
9
+ }) => Promise<{
6
10
  sizeInBytes: number;
11
+ to: string;
7
12
  }>;
@@ -2,25 +2,38 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.downloadFile = void 0;
4
4
  const fs_1 = require("fs");
5
+ const ensure_output_directory_1 = require("../ensure-output-directory");
5
6
  const read_file_1 = require("./read-file");
6
- const downloadFile = (url, to, onProgress) => {
7
+ const downloadFile = ({ onProgress, url, to: toFn, }) => {
7
8
  return new Promise((resolve, reject) => {
8
9
  (0, read_file_1.readFile)(url)
9
10
  .then((res) => {
10
- const totalSize = Number(res.headers['content-length']);
11
+ var _a;
12
+ const contentDisposition = (_a = res.headers['content-disposition']) !== null && _a !== void 0 ? _a : null;
13
+ const to = toFn(contentDisposition);
14
+ (0, ensure_output_directory_1.ensureOutputDirectory)(to);
15
+ const sizeHeader = res.headers['content-length'];
16
+ const totalSize = typeof sizeHeader === 'undefined' ? null : Number(sizeHeader);
11
17
  const writeStream = (0, fs_1.createWriteStream)(to);
18
+ let downloaded = 0;
12
19
  // Listen to 'close' event instead of more
13
20
  // concise method to avoid this problem
14
21
  // https://github.com/remotion-dev/remotion/issues/384#issuecomment-844398183
15
- writeStream.on('close', () => resolve({ sizeInBytes: totalSize }));
22
+ writeStream.on('close', () => {
23
+ onProgress === null || onProgress === void 0 ? void 0 : onProgress({
24
+ downloaded,
25
+ percent: 1,
26
+ totalSize: downloaded,
27
+ });
28
+ return resolve({ sizeInBytes: downloaded, to });
29
+ });
16
30
  writeStream.on('error', (err) => reject(err));
17
- let downloaded = 0;
18
31
  res.pipe(writeStream).on('error', (err) => reject(err));
19
32
  res.on('data', (d) => {
20
33
  downloaded += d.length;
21
34
  onProgress === null || onProgress === void 0 ? void 0 : onProgress({
22
35
  downloaded,
23
- progress: downloaded / totalSize,
36
+ percent: totalSize === null ? null : downloaded / totalSize,
24
37
  totalSize,
25
38
  });
26
39
  });
@@ -1,12 +1,11 @@
1
- import { AssetVolume } from './types';
1
+ import type { AssetVolume } from './types';
2
2
  declare type FfmpegEval = 'once' | 'frame';
3
3
  declare type FfmpegVolumeExpression = {
4
4
  eval: FfmpegEval;
5
5
  value: string;
6
6
  };
7
- export declare const ffmpegVolumeExpression: ({ volume, startInVideo, fps, trimLeft, }: {
7
+ export declare const ffmpegVolumeExpression: ({ volume, fps, trimLeft, }: {
8
8
  volume: AssetVolume;
9
- startInVideo: number;
10
9
  trimLeft: number;
11
10
  fps: number;
12
11
  }) => FfmpegVolumeExpression;
@@ -43,7 +43,7 @@ const ffmpegBuildVolumeExpression = (arr, delay, fps) => {
43
43
  const [volume, frames] = first;
44
44
  return ffmpegIfOrElse(ffmpegIsOneOfFrames({ frames, trimLeft: delay, fps }), String(volume), ffmpegBuildVolumeExpression(rest, delay, fps));
45
45
  };
46
- const ffmpegVolumeExpression = ({ volume, startInVideo, fps, trimLeft, }) => {
46
+ const ffmpegVolumeExpression = ({ volume, fps, trimLeft, }) => {
47
47
  // If it's a static volume, we return it and tell
48
48
  // FFMPEG it only has to evaluate it once
49
49
  if (typeof volume === 'number') {
@@ -55,7 +55,6 @@ const ffmpegVolumeExpression = ({ volume, startInVideo, fps, trimLeft, }) => {
55
55
  if ([...new Set(volume)].length === 1) {
56
56
  return (0, exports.ffmpegVolumeExpression)({
57
57
  volume: volume[0],
58
- startInVideo,
59
58
  fps,
60
59
  trimLeft,
61
60
  });
@@ -76,7 +75,7 @@ const ffmpegVolumeExpression = ({ volume, startInVideo, fps, trimLeft, }) => {
76
75
  if (!volumeMap[actualVolume]) {
77
76
  volumeMap[actualVolume] = [];
78
77
  }
79
- volumeMap[actualVolume].push(frame + startInVideo);
78
+ volumeMap[actualVolume].push(frame);
80
79
  });
81
80
  // Sort the map so that the most common volume is last
82
81
  // this is going to be the else statement so the expression is short
@@ -1,3 +1,3 @@
1
- import { AssetVolume, MediaAsset } from './types';
1
+ import type { AssetVolume, MediaAsset } from './types';
2
2
  export declare const flattenVolumeArray: (volume: AssetVolume) => AssetVolume;
3
3
  export declare const convertAssetToFlattenedVolume: (asset: MediaAsset) => MediaAsset;
@@ -1,4 +1,7 @@
1
- export declare function getAudioChannelsAndDuration(path: string): Promise<{
1
+ import type { FfmpegExecutable } from '../ffmpeg-executable';
2
+ declare type Result = {
2
3
  channels: number;
3
4
  duration: number | null;
4
- }>;
5
+ };
6
+ export declare const getAudioChannelsAndDuration: (src: string, ffprobeExecutable: FfmpegExecutable) => Promise<Result>;
7
+ export {};
@@ -5,21 +5,32 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.getAudioChannelsAndDuration = void 0;
7
7
  const execa_1 = __importDefault(require("execa"));
8
- async function getAudioChannelsAndDuration(path) {
8
+ const p_limit_1 = require("../p-limit");
9
+ const durationOfAssetCache = {};
10
+ const limit = (0, p_limit_1.pLimit)(1);
11
+ async function getAudioChannelsAndDurationUnlimited(src, ffprobeExecutable) {
12
+ if (durationOfAssetCache[src]) {
13
+ return durationOfAssetCache[src];
14
+ }
9
15
  const args = [
10
16
  ['-v', 'error'],
11
17
  ['-show_entries', 'stream=channels:format=duration'],
12
18
  ['-of', 'default=nw=1'],
13
- [path],
19
+ [src],
14
20
  ]
15
21
  .reduce((acc, val) => acc.concat(val), [])
16
22
  .filter(Boolean);
17
- const task = await (0, execa_1.default)('ffprobe', args);
23
+ const task = await (0, execa_1.default)(ffprobeExecutable !== null && ffprobeExecutable !== void 0 ? ffprobeExecutable : 'ffprobe', args);
18
24
  const channels = task.stdout.match(/channels=([0-9]+)/);
19
25
  const duration = task.stdout.match(/duration=([0-9.]+)/);
20
- return {
26
+ const result = {
21
27
  channels: channels ? parseInt(channels[1], 10) : 0,
22
28
  duration: duration ? parseFloat(duration[1]) : null,
23
29
  };
30
+ durationOfAssetCache[src] = result;
31
+ return result;
24
32
  }
33
+ const getAudioChannelsAndDuration = (src, ffprobeExecutable) => {
34
+ return limit(() => getAudioChannelsAndDurationUnlimited(src, ffprobeExecutable));
35
+ };
25
36
  exports.getAudioChannelsAndDuration = getAudioChannelsAndDuration;
@@ -0,0 +1,6 @@
1
+ import type { FfmpegExecutable } from 'remotion';
2
+ declare type Result = {
3
+ duration: number | null;
4
+ };
5
+ export declare const getVideoStreamDuration: (src: string, ffprobeExecutable: FfmpegExecutable) => Promise<Result>;
6
+ export {};
@@ -0,0 +1,34 @@
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.getVideoStreamDuration = void 0;
7
+ const execa_1 = __importDefault(require("execa"));
8
+ const p_limit_1 = require("../p-limit");
9
+ const durationOfAssetCache = {};
10
+ const limit = (0, p_limit_1.pLimit)(1);
11
+ async function getVideoStreamDurationUnlimited(src, ffprobeExecutable) {
12
+ if (durationOfAssetCache[src]) {
13
+ return durationOfAssetCache[src];
14
+ }
15
+ const args = [
16
+ ['-v', 'error'],
17
+ ['-select_streams', 'v:0'],
18
+ ['-show_entries', 'stream=duration'],
19
+ [src],
20
+ ]
21
+ .reduce((acc, val) => acc.concat(val), [])
22
+ .filter(Boolean);
23
+ const task = await (0, execa_1.default)(ffprobeExecutable !== null && ffprobeExecutable !== void 0 ? ffprobeExecutable : 'ffprobe', args);
24
+ const duration = task.stdout.match(/duration=([0-9.]+)/);
25
+ const result = {
26
+ duration: duration ? parseFloat(duration[1]) : null,
27
+ };
28
+ durationOfAssetCache[src] = result;
29
+ return result;
30
+ }
31
+ const getVideoStreamDuration = (src, ffprobeExecutable) => {
32
+ return limit(() => getVideoStreamDurationUnlimited(src, ffprobeExecutable));
33
+ };
34
+ exports.getVideoStreamDuration = getVideoStreamDuration;
@@ -29,7 +29,10 @@ const readFile = async (url, redirectsSoFar = 0) => {
29
29
  throw new Error(`Too many redirects while downloading ${url}`);
30
30
  }
31
31
  const file = await readFileWithoutRedirect(url);
32
- if (file.statusCode === 302 || file.statusCode === 301) {
32
+ if (file.statusCode === 302 ||
33
+ file.statusCode === 301 ||
34
+ file.statusCode === 307 ||
35
+ file.statusCode === 308) {
33
36
  if (!file.headers.location) {
34
37
  throw new Error(`Received a status code ${file.statusCode} but no "Location" header while calling ${file.headers.location}`);
35
38
  }
@@ -1,4 +1,4 @@
1
- import { TAsset } from 'remotion';
1
+ import type { TAsset } from 'remotion';
2
2
  export declare type UnsafeAsset = Omit<TAsset, 'frame' | 'id' | 'volume' | 'mediaFrame'> & {
3
3
  startInVideo: number;
4
4
  duration: number | null;
@@ -0,0 +1,60 @@
1
+ /**
2
+ * Copyright 2017 Google Inc. All rights reserved.
3
+ *
4
+ * Licensed under the Apache License, Version 2.0 (the "License");
5
+ * you may not use this file except in compliance with the License.
6
+ * You may obtain a copy of the License at
7
+ *
8
+ * http://www.apache.org/licenses/LICENSE-2.0
9
+ *
10
+ * Unless required by applicable law or agreed to in writing, software
11
+ * distributed under the License is distributed on an "AS IS" BASIS,
12
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13
+ * See the License for the specific language governing permissions and
14
+ * limitations under the License.
15
+ */
16
+ import type { Page } from './BrowserPage';
17
+ import type { Connection } from './Connection';
18
+ import { EventEmitter } from './EventEmitter';
19
+ import type { Viewport } from './PuppeteerViewport';
20
+ import { Target } from './Target';
21
+ declare type BrowserCloseCallback = () => Promise<void> | void;
22
+ interface WaitForTargetOptions {
23
+ timeout?: number;
24
+ }
25
+ export declare const enum BrowserEmittedEvents {
26
+ TargetChanged = "targetchanged",
27
+ TargetCreated = "targetcreated",
28
+ Closed = "closed"
29
+ }
30
+ export declare class Browser extends EventEmitter {
31
+ #private;
32
+ static _create({ connection, contextIds, defaultViewport, closeCallback, }: {
33
+ connection: Connection;
34
+ contextIds: string[];
35
+ defaultViewport: Viewport;
36
+ closeCallback?: BrowserCloseCallback;
37
+ }): Promise<Browser>;
38
+ get _targets(): Map<string, Target>;
39
+ constructor(connection: Connection, contextIds: string[], defaultViewport: Viewport, closeCallback?: BrowserCloseCallback);
40
+ browserContexts(): BrowserContext[];
41
+ newPage(): Promise<Page>;
42
+ _createPageInContext(contextId?: string): Promise<Page>;
43
+ targets(): Target[];
44
+ waitForTarget(predicate: (x: Target) => boolean | Promise<boolean>, options?: WaitForTargetOptions): Promise<Target>;
45
+ pages(): Promise<Page[]>;
46
+ close(): Promise<void>;
47
+ disconnect(): void;
48
+ }
49
+ export declare class BrowserContext extends EventEmitter {
50
+ #private;
51
+ constructor(browser: Browser, contextId?: string);
52
+ targets(): Target[];
53
+ waitForTarget(predicate: (x: Target) => boolean | Promise<boolean>, options?: {
54
+ timeout?: number;
55
+ }): Promise<Target>;
56
+ pages(): Promise<Page[]>;
57
+ newPage(): Promise<Page>;
58
+ browser(): Browser;
59
+ }
60
+ export {};