@remotion/renderer 3.1.2 → 3.1.5

package/dist/assets/download-and-map-assets-to-file.js

@@ -96,7 +96,18 @@ const downloadAsset = async ({ src, onDownload, downloadDir, }) => {
         return src;
     }
     if ((_a = hasBeenDownloadedMap[src]) === null || _a === void 0 ? void 0 : _a[downloadDir]) {
-        return (_b = hasBeenDownloadedMap[src]) === null || _b === void 0 ? void 0 : _b[downloadDir];
+        const claimedDownloadLocation = (_b = hasBeenDownloadedMap[src]) === null || _b === void 0 ? void 0 : _b[downloadDir];
+        // 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
+        if (!fs_1.default.existsSync(claimedDownloadLocation)) {
+            return claimedDownloadLocation;
+        }
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        hasBeenDownloadedMap[src][downloadDir] = null;
+        if (!isDownloadingMap[src]) {
+            isDownloadingMap[src] = {};
+        }
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        isDownloadingMap[src][downloadDir] = false;
     }
     if ((_c = isDownloadingMap[src]) === null || _c === void 0 ? void 0 : _c[downloadDir]) {
         return waitForAssetToBeDownloaded({ src, downloadDir });

package/dist/create-ffmpeg-complex-filter.d.ts

@@ -1,7 +1,4 @@
 export declare const createFfmpegComplexFilter: (filters: number) => Promise<{
-    complexFilterFlag: [
-        string,
-        string
-    ] | null;
+    complexFilterFlag: [string, string] | null;
     cleanup: () => void;
 }>;

package/dist/extract-frame-from-video.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import type { FfmpegExecutable, OffthreadVideoImageFormat } from 'remotion';
 import type { LastFrameOptions } from './last-frame-from-video-cache';
 export declare const getLastFrameOfVideo: (options: LastFrameOptions) => Promise<Buffer>;

package/dist/get-extension-from-codec.d.ts

@@ -1,2 +1,2 @@
 import type { Codec } from 'remotion';
-export declare const getFileExtensionFromCodec: (codec: Codec, type: 'chunk' | 'final') => "mp3" | "webm" | "wav" | "mp4" | "aac" | "gif" | "mkv" | "mov";
+export declare const getFileExtensionFromCodec: (codec: Codec, type: 'chunk' | 'final') => "mp3" | "aac" | "wav" | "gif" | "webm" | "mp4" | "mov" | "mkv";

package/dist/guess-extension-for-media.d.ts

@@ -1 +1 @@
-export declare const guessExtensionForVideo: (src: string) => Promise<"mp3" | "webm" | "wav" | "mp4">;
+export declare const guessExtensionForVideo: (src: string) => Promise<"mp3" | "wav" | "webm" | "mp4">;

package/dist/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import execa from 'execa';
 import { SymbolicateableError } from './error-handling/symbolicateable-error';
 import { mimeContentType, mimeLookup } from './mime-types';
@@ -47,14 +48,14 @@ export declare const RenderInternals: {
         width: number;
         height: number;
         scale: number;
-        codec: "mp3" | "wav" | "vp9" | "vp8" | "h264" | "h265" | "aac" | "prores" | "h264-mkv" | "gif";
+        codec: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif";
     }) => void;
     normalizeServeUrl: (unnormalized: string) => string;
     spawnFfmpeg: (options: import("./stitch-frames-to-video").StitcherOptions) => Promise<{
         task: Promise<Buffer | null>;
         getLogs: () => string;
     }>;
-    getFileExtensionFromCodec: (codec: "mp3" | "wav" | "vp9" | "vp8" | "h264" | "h265" | "aac" | "prores" | "h264-mkv" | "gif", type: "chunk" | "final") => "mp3" | "webm" | "wav" | "mp4" | "aac" | "gif" | "mkv" | "mov";
+    getFileExtensionFromCodec: (codec: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif", type: "chunk" | "final") => "mp3" | "aac" | "wav" | "gif" | "webm" | "mp4" | "mov" | "mkv";
     tmpDir: (str: string) => string;
     deleteDirectory: (directory: string) => Promise<void>;
     isServeUrl: (potentialUrl: string) => boolean;
@@ -102,7 +103,7 @@ export declare const RenderInternals: {
     };
     registerErrorSymbolicationLock: () => number;
     unlockErrorSymbolicationLock: (id: number) => void;
-    canUseParallelEncoding: (codec: "mp3" | "wav" | "vp9" | "vp8" | "h264" | "h265" | "aac" | "prores" | "h264-mkv" | "gif") => boolean;
+    canUseParallelEncoding: (codec: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif") => boolean;
     mimeContentType: typeof mimeContentType;
     mimeLookup: typeof mimeLookup;
     validateConcurrency: (value: unknown, setting: string) => void;

package/dist/last-frame-from-video-cache.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import type { FfmpegExecutable, OffthreadVideoImageFormat } from 'remotion';
 import type { SpecialVCodecForTransparency } from './get-video-info';
 export declare type LastFrameOptions = {

package/dist/merge-audio-track.js

@@ -11,6 +11,7 @@ const chunk_1 = require("./chunk");
 const convert_to_pcm_1 = require("./convert-to-pcm");
 const create_ffmpeg_complex_filter_1 = require("./create-ffmpeg-complex-filter");
 const create_silent_audio_1 = require("./create-silent-audio");
+const delete_directory_1 = require("./delete-directory");
 const p_limit_1 = require("./p-limit");
 const tmp_dir_1 = require("./tmp-dir");
 const mergeAudioTrackUnlimited = async ({ ffmpegExecutable, outName, files, numberOfSeconds, }) => {
@@ -44,12 +45,14 @@ const mergeAudioTrackUnlimited = async ({ ffmpegExecutable, outName, files, numb
             });
             return chunkOutname;
         }));
-        return (0, exports.mergeAudioTrack)({
+        await (0, exports.mergeAudioTrack)({
             ffmpegExecutable,
             files: chunkNames,
             numberOfSeconds,
             outName,
         });
+        await (0, delete_directory_1.deleteDirectory)(tempPath);
+        return;
     }
     const { complexFilterFlag: mergeFilter, cleanup } = await (0, create_ffmpeg_complex_filter_1.createFfmpegComplexFilter)(files.length);
     const args = [

package/dist/provide-screenshot.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import type { ImageFormat } from 'remotion';
 import type { Page } from './browser/BrowserPage';
 export declare const provideScreenshot: ({ page, imageFormat, options, quality, }: {

package/dist/puppeteer-screenshot.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import type { Page } from './browser/BrowserPage';
 import type { ScreenshotOptions } from './browser/ScreenshotOptions';
 export declare const screenshot: (page: Page, options: ScreenshotOptions) => Promise<Buffer | string | void>;

package/dist/render-media.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import type { BrowserExecutable, Codec, FfmpegExecutable, FrameRange, PixelFormat, ProResProfile, SmallTCompMetadata } from 'remotion';
 import type { RenderMediaOnDownload } from './assets/download-and-map-assets-to-file';
 import type { BrowserLog } from './browser-log';

package/dist/screenshot-dom-element.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import type { ImageFormat } from 'remotion';
 import type { Page } from './browser/BrowserPage';
 export declare const screenshotDOMElement: ({ page, imageFormat, quality, opts, }: {

package/dist/screenshot-task.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import type { StillImageFormat } from 'remotion';
 import type { Page } from './browser/BrowserPage';
 import type { ScreenshotOptions } from './browser/ScreenshotOptions';

package/dist/stitch-frames-to-video.js

@@ -1,11 +1,34 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.stitchFramesToVideo = exports.spawnFfmpeg = void 0;
 const execa_1 = __importDefault(require("execa"));
-const fs_1 = __importDefault(require("fs"));
+const fs_1 = __importStar(require("fs"));
 const promises_1 = require("fs/promises");
 const path_1 = __importDefault(require("path"));
 const remotion_1 = require("remotion");
@@ -59,13 +82,14 @@ const getAssetsData = async ({ assets, downloadDir, onDownload, fps, expectedFra
         updateProgress();
         return result;
     }))).filter(remotion_1.Internals.truthy);
-    const outName = path_1.default.join(tempPath, `audio.wav`);
+    const outName = path_1.default.join((0, tmp_dir_1.tmpDir)('remotion-audio-preprocessing'), `audio.wav`);
     await (0, merge_audio_track_1.mergeAudioTrack)({
         ffmpegExecutable: ffmpegExecutable !== null && ffmpegExecutable !== void 0 ? ffmpegExecutable : null,
         files: preprocessed,
         outName,
         numberOfSeconds: Number((expectedFrames / fps).toFixed(3)),
     });
+    (0, delete_directory_1.deleteDirectory)(tempPath);
     onProgress(1);
     preprocessed.forEach((p) => {
         (0, delete_directory_1.deleteDirectory)(p);
@@ -148,7 +172,22 @@ const spawnFfmpeg = async (options) => {
         });
         await ffmpegTask;
         (_l = options.onProgress) === null || _l === void 0 ? void 0 : _l.call(options, expectedFrames);
-        const file = tempFile ? await (0, promises_1.readFile)(tempFile) : null;
+        if (audio) {
+            await (0, delete_directory_1.deleteDirectory)(path_1.default.dirname(audio));
+        }
+        const file = await new Promise((resolve, reject) => {
+            if (tempFile) {
+                (0, promises_1.readFile)(tempFile)
+                    .then((f) => {
+                    (0, fs_1.unlinkSync)(tempFile);
+                    return resolve(f);
+                })
+                    .catch((e) => reject(e));
+            }
+            else {
+                resolve(null);
+            }
+        });
         return {
             getLogs: () => '',
             task: Promise.resolve(file),
@@ -236,12 +275,12 @@ const spawnFfmpeg = async (options) => {
     });
     return {
         task: task.then(() => {
-            if (options.outputLocation) {
+            if (tempFile === null) {
                 return null;
             }
             return (0, promises_1.readFile)(tempFile)
                 .then((file) => {
-                return Promise.all([file, (0, promises_1.unlink)(tempFile)]);
+                return Promise.all([file, (0, delete_directory_1.deleteDirectory)(path_1.default.dirname(tempFile))]);
             })
                 .then(([file]) => file);
         }),

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remotion/renderer",
-	"version": "3.1.2",
+	"version": "3.1.5",
 	"description": "Renderer for Remotion",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
@@ -22,7 +22,7 @@
 	"dependencies": {
 		"execa": "5.1.1",
 		"extract-zip": "2.0.1",
-		"remotion": "3.1.2",
+		"remotion": "3.1.5",
 		"source-map": "^0.8.0-beta.0",
 		"ws": "8.7.0"
 	},
@@ -57,5 +57,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "7ac5f5675a7390cc776265c667d382149dee9814"
+	"gitHead": "965ca68bd4efce9ca5e27fe30c4a31aec594575c"
 }