@farberg/reveal-template 1.0.61 → 1.0.63

package/init-reveal.js

@@ -198,23 +198,29 @@ export function initReveal(opts) {
 		window.Reveal = Reveal
 
 		//Add markdown doc to presentation
-		addMarkdownSectionToPresentation(getDocumentToLoadOrRedirectToIndexDocument(options), options);
+		const doc = getDocumentToLoadOrRedirectToIndexDocument(options)
 
-		//Initialize Reveal
-		const finalOptions = Object.assign(defaultRevealOptions, options.revealOptions);
+		if (doc) {
+			addMarkdownSectionToPresentation(doc, options);
 
-		//Add plugins
-		finalOptions.plugins = [
-			...modules,
-			...defaultDennisPlugins,
-			window.RevealChalkboard,
-			...finalOptions.plugins
-		]
+			//Initialize Reveal
+			const finalOptions = Object.assign(defaultRevealOptions, options.revealOptions);
 
-		if (options.verbose)
-			console.log("Invoking Reveal.initialize with options: ", finalOptions)
+			//Add plugins
+			finalOptions.plugins = [
+				...modules,
+				...defaultDennisPlugins,
+				window.RevealChalkboard,
+				...finalOptions.plugins
+			]
 
-		Reveal.initialize(finalOptions);
+			if (options.verbose)
+				console.log("Invoking Reveal.initialize with options: ", finalOptions)
+
+			Reveal.initialize(finalOptions);
+		} else {
+			console.error("No document to load, aborting");
+		}
 
 	}).catch(error => {
 		console.error("Unable to load dependencies: ", error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@farberg/reveal-template",
-  "version": "1.0.61",
+  "version": "1.0.63",
   "homepage": "https://github.com/pfisterer/reveal-template",
   "description": "Reveal.js template for Dennis' lectures",
   "main": "index.js",
@@ -22,6 +22,8 @@
     "reveal.js": "^4.5.0",
     "reveal.js-plugins": "^4.2.0",
     "serve-static": "^1.15.0",
-    "asciinema-player": "^3.5.0"
+    "asciinema-player": "^3.5.0",
+    "pdf-merger-js": "^4.3.0",
+    "puppeteer": "^21.5.2"
   }
 }

package/scripts/generate_pdfs.js

@@ -4,9 +4,9 @@ const serveStatic = require('serve-static')
 const os = require('os');
 const path = require('path');
 const fs = require('fs');
-const { spawn } = require('child_process');
+const puppeteer = require('puppeteer')
+const PDFMerger = require('pdf-merger-js');
 const { combined_pdf, pdf_exists_and_is_newer_than_markdown } = require('./helpers')
-const decktape_image = 'astefanutti/decktape:3.7'
 
 const cwd = process.cwd()
 const slides_dir = cwd
@@ -17,8 +17,7 @@ const verbose = true
 const package_json = JSON.parse(fs.readFileSync('package.json'))
 const combined_pdf_name = combined_pdf(package_json)
 const args = process.argv.slice(2);
-const url = args[0] ? args[0] : `http://${host}:${port}`
-const maxProcessesRunning = Math.max(Math.floor(os.cpus().length / 2, 1))
+const url = args[0] ? args[0] : `http://localhost:${port}`
 
 function start_web_server() {
 	var app = connect();
@@ -32,56 +31,6 @@ function start_web_server() {
 	return app
 }
 
-function update_docker_image() {
-	return new Promise((resolve, reject) => {
-
-		let cmd = "docker"
-		let args = ["pull", decktape_image]
-		let cmdLine = `${cmd} ${args.reduce((a, b) => `${a} '${b}'`, "")}`
-
-		if (verbose)
-			console.log(`Running ${cmdLine}`)
-
-		const update_process = spawn(cmd, args)
-
-		update_process.on('close', code => resolve(code))
-	})
-}
-
-function spawn_convert_md_to_pdf(url, pdf_dir, pdf_name) {
-	let cmd = "docker"
-	let args = ["run", "--rm", "-u", `${os.userInfo().uid}`, "-v", `${pdf_dir}:/slides`, decktape_image, "--load-pause", "2000", "--pause", "500", "-s", "1200x800", "automatic", url, `/slides/${path.basename(pdf_name)}`]
-
-	let cmdLine = `${cmd} ${args.reduce((a, b) => `${a} '${b}'`, "")}`
-
-	if (verbose)
-		console.log(`Running ${cmdLine}`)
-
-	return spawn(cmd, args)
-}
-
-function spawn_merge_to_single_pdf(pdfs, pdf, pdf_dir) {
-	let output_pdf = `/slides/${path.basename(pdf)}`
-	let cmd = "docker"
-	let args = ["run", "--rm", "-v", `${pdf_dir}:/slides`, "agileek/pdftk"]
-	args = args.concat(
-		pdfs.map(pdf_file => '/slides/' + path.basename(pdf_file)),
-		["cat", "output", output_pdf]
-	)
-
-	let cmdLine = `${cmd} ${args.reduce((a, b) => `${a} '${b}'`, "")}`
-	if (verbose)
-		console.log(`Running ${cmdLine}`)
-
-	return spawn(cmd, args)
-}
-
-function touch_file(path) {
-	const time = new Date();
-	if (fs.existsSync(path))
-		fs.utimesSync(path, time, time);
-}
-
 function get_todos(md_dir, pdf_dir, url) {
 	//Get list of markdown files
 	let md_files = fs.readdirSync(md_dir)
@@ -101,7 +50,7 @@ function get_todos(md_dir, pdf_dir, url) {
 		let pdf_exists = fs.existsSync(pdf_file)
 		let pdf_size = pdf_exists ? fs.statSync(pdf_file)["size"] : 0;
 		let pdf_newer = pdf_size > 0 ? pdf_exists_and_is_newer_than_markdown(md_file, pdf_file, verbose) : 0
-		let presentation_url = `${url}/index.html?${encodeURIComponent(md_file)}`
+		let presentation_url = `${url}/index.html?${encodeURIComponent(md_file)}/print-pdf#/`
 
 		let o = {
 			md_file,
@@ -112,25 +61,11 @@ function get_todos(md_dir, pdf_dir, url) {
 			pdf_newer,
 			requires_conversion: !pdf_exists || !pdf_newer,
 			presentation_url,
-			start_conversion: () => {
-				o.process = spawn_convert_md_to_pdf(presentation_url, pdf_dir, pdf_name)
-				o.process.stdout.on('data', data => o.stdout.push(data))
-				o.process.stderr.on('data', data => o.stderr.push(data))
-				o.process.on('close', code => {
-					touch_file(pdf_file)
-					console.log(`Processed file ${md_file}, exited with code ${code}`)
-				})
-			},
-			process: null,
-			stdout: [],
-			stderr: []
 		}
 
 		return o
 	})
 
-	//if (verbose) console.log("All todos (not filtered):", todos)
-
 	const todos_that_require_action = todos.filter(todo => todo.requires_conversion === true)
 	const todos_that_dont_require_action = todos.filter(todo => todo.requires_conversion === false)
 	return { todos, todos_that_require_action, todos_that_dont_require_action };
@@ -163,54 +98,64 @@ function delete_stale_pdf_files(todos, pdf_dir, combined_pdf_name) {
 	})
 }
 
-function run_todos(todos, maxProcessesRunning) {
-	return new Promise((resolve, reject) => {
+async function convert_to_pdf_single(todo) {
+	async function waitForEvent(page, event, timeout = 2500) {
+		return Promise.race([
+			page.evaluate(
+				event => new Promise(resolve => document.addEventListener(event, resolve, { once: true })),
+				event
+			),
+			new Promise(r => setTimeout(r, timeout))
+		])
+	}
 
-		let interval = setInterval(() => {
-			const running_processes = todos.filter(todo => todo.process && todo.process.exitCode == null)
-			const waiting_processes = todos.filter(todo => !todo.process)
+	const browser = await puppeteer.launch({ headless: 'new' })
+	const page = await browser.newPage();
 
-			//console.log(`Running ${running_processes.length}, waiting ${waiting_processes.length}`)
-			//console.log("todos_that_require_action", todos_that_require_action); console.log("running_processes", running_processes); console.log("waiting_processes", waiting_processes);
+	await page.goto(todo.presentation_url, { timeout: 5000, waitUntil: ['load', 'domcontentloaded'] });
+	await page.waitForSelector('div.lecturetitle > h1')
 
-			if (running_processes.length < maxProcessesRunning && waiting_processes.length > 0) {
-				console.log(`Starting next process: ${waiting_processes[0].md_file}`)
-				waiting_processes[0].start_conversion()
-
-			} else if (running_processes.length === 0 && waiting_processes.length === 0) {
-				console.log(`No more running/required processes, done converting.`)
-				clearInterval(interval)
-				resolve()
-			}
-		}, 300)
-
-	})
+	if (verbose)
+		console.log(`Converting ${todo.md_file} to ${todo.pdf_file} using ${todo.presentation_url}`)
+
+	const optionsa4 = {
+		format: 'A4',
+		printBackground: true,
+		landscape: true,
+		margin: {
+			top: '0.25cm',
+			bottom: '0.25cm',
+			left: '0.25cm',
+			right: '0.25cm'
+		},
+		path: todo.pdf_file
+	}
+
+	const pdf = await page.pdf(optionsa4);
+	await browser.close();
+	return pdf
 }
 
-function merge_pdfs(todos, out_file) {
-	return new Promise((resolve, reject) => {
 
-		//Merge to a single PDF (only if the PDFs have more than 0 bytes)
-		let pdfs = todos
-			.filter(todo => fs.existsSync(todo.pdf_file))
-			.filter(todo => fs.statSync(todo.pdf_file).size > 0)
-			.map(todo => todo.pdf_name)
+async function merge_pdfs(todos, out_file) {
+	const merger = new PDFMerger()
 
-		let p = spawn_merge_to_single_pdf(pdfs, out_file, pdf_dir)
+	let pdfs = todos
+		.filter(todo => fs.existsSync(todo.pdf_file))
+		.filter(todo => fs.statSync(todo.pdf_file).size > 0)
+		.map(todo => todo.pdf_file)
 
-		p.on('close', code => {
-			console.log(`PDF merge exited with code ${code} `)
-			resolve(code)
-			process.exit(0)
-		})
-	})
+	for (const pdf of pdfs) {
+		//if (verbose)console.log(`Adding ${pdf} to merged file`)
+		await merger.add(pdf)
+	}
+	if (verbose)
+		console.log(`Saving merged file to ${out_file}`)
+	await merger.save(out_file);
 }
 
-//Update docker image first
-update_docker_image().then(code => {
-	if (verbose)
-		console.log("Docker image updated")
 
+async function main() {
 	//Start an embedded web server to load the slides from
 	const app = start_web_server();
 
@@ -222,9 +167,17 @@ update_docker_image().then(code => {
 
 	delete_stale_pdf_files(todos, pdf_dir, combined_pdf_name)
 
-	run_todos(todos_that_require_action, maxProcessesRunning).then(() => {
-		console.log("Merging pdfs");
-		merge_pdfs(todos, combined_pdf_name)
-		console.log("Done")
-	})
-})
+	for (const todo of todos_that_require_action) {
+		await convert_to_pdf_single(todo)
+	}
+
+	await merge_pdfs(todos, combined_pdf_name)
+}
+
+main().then(() => {
+	console.log("Done")
+	process.exit(0)
+}).catch(e => {
+	console.error(e)
+	process.exit(1)
+})