Add fall throuhg

renderer.js

@@ -48,7 +48,13 @@ export function getNpmScript(mediaType) {
 	}
 }
 
-export async function doRender(jobId, composition, sendToObserver, target = 'render', ssrOptions, proxyOptions) {
+export async function doRender(
+	jobId,
+	composition,
+	sendToObserver,
+	target = 'render',
+	ssrOptions,
+	proxyOptions) {
 	let outFile = path.join(process.cwd(), `out`, `${jobId}-video.mp4`);
 	if (ssrOptions) {
 		await renderSSR(outFile, ssrOptions.startFrame, ssrOptions.endFrame)

routes.js

@@ -71,16 +71,143 @@ RenderRouter.post('/api/render-sync', async (req, res) => {
 				path.join(__dirname, `public`, `original_manuscript.json`)
 			);
 			if (!skipRender) {
-				await doRender(
-					jobId,
-					originalManuscript.meta.renderComposition,
-					(jobId, log) => {
-						logs.push(log);
-					},
-					getNpmScript(req.query.media_type),
-					req.body.ssr,
-					req.body.proxy
-				);
+				let renderMethod = req.body.method || req.query.method || 'all';
+				if (renderMethod === 'all') {
+					let errorMsg = ''
+					let renderComplete = false;
+					try {
+						console.log('Render start via CLI')
+						await doRender(
+							jobId,
+							originalManuscript.meta.renderComposition,
+							(jobId, log) => {
+								logs.push(log);
+							},
+							getNpmScript(req.query.media_type),
+							undefined,
+							undefined
+						)
+						renderComplete = true;
+					} catch (e) {
+						console.log('Render via CLI failed', e.message)
+						errorMsg = "CLI: " + e.message
+					}
+					if (!renderComplete) {
+						try {
+							console.log('Render start via Proxy')
+							await doRender(
+								jobId,
+								originalManuscript.meta.renderComposition,
+								(jobId, log) => {
+									logs.push(log);
+								},
+								getNpmScript(req.query.media_type),
+								undefined,
+								{
+									...req.body.proxy,
+									"framesPerChunk": req.body.proxy?.framesPerChunk || 99999
+								}
+							)
+							renderComplete = true;
+						} catch (e) {
+							console.log('Render via Proxy failed', e.message)
+							errorMsg = errorMsg + "\n\nProxy: " + e.message
+						}
+					}
+
+					if (!renderComplete) {
+						try {
+							console.log('Render start via Proxy Chunked')
+							await doRender(
+								jobId,
+								originalManuscript.meta.renderComposition,
+								(jobId, log) => {
+									logs.push(log);
+								},
+								getNpmScript(req.query.media_type),
+								undefined,
+								{
+									...req.body.proxy
+								}
+							)
+							renderComplete = true;
+						} catch (e) {
+							console.log('Render via Proxy Chunked failed', e.message)
+							errorMsg = errorMsg + "\n\nProxyChunked: " + e.message
+						}
+					}
+
+					if (!renderComplete) {
+						try {
+							console.log('Render start via SSR')
+							await doRender(
+								jobId,
+								originalManuscript.meta.renderComposition,
+								(jobId, log) => {
+									logs.push(log);
+								},
+								getNpmScript(req.query.media_type),
+								req.body.ssr || {},
+								undefined
+							)
+							renderComplete = true;
+						} catch (e) {
+							console.log('Render via SSR failed', e.message)
+							errorMsg = errorMsg + "\n\nSSR: " + e.message
+						}
+					}
+					if (!renderComplete) {
+						throw new Error('All render methods exhausted. Failed to render. ' + errorMsg)
+					}
+				}
+				else if (renderMethod === 'ssr') {
+					await doRender(
+						jobId,
+						originalManuscript.meta.renderComposition,
+						(jobId, log) => {
+							logs.push(log);
+						},
+						getNpmScript(req.query.media_type),
+						req.body.ssr || {},
+						undefined
+					);
+				} else if (renderMethod === 'proxy') {
+					await doRender(
+						jobId,
+						originalManuscript.meta.renderComposition,
+						(jobId, log) => {
+							logs.push(log);
+						},
+						getNpmScript(req.query.media_type),
+						undefined,
+						{
+							...req.body.proxy,
+							"framesPerChunk": req.body.proxy?.framesPerChunk || 99999
+						}
+					);
+				} else if (renderMethod === 'proxy-chunked') {
+					await doRender(
+						jobId,
+						originalManuscript.meta.renderComposition,
+						(jobId, log) => {
+							logs.push(log);
+						},
+						getNpmScript(req.query.media_type),
+						undefined,
+						req.body.proxy || {}
+					);
+				} else {
+					await doRender(
+						jobId,
+						originalManuscript.meta.renderComposition,
+						(jobId, log) => {
+							logs.push(log);
+						},
+						getNpmScript(req.query.media_type),
+						undefined,
+						undefined
+					);
+				}
 			}
 			const uploader = new FileUploader('oracle', {
 				url: targetUrl + jobId + '/',