alchemymvc 1.4.4 → 1.4.5

package/lib/app/behaviour/revision_behaviour.js

@@ -285,6 +285,16 @@ Revision.setMethod(function afterSave(record, options, created) {
 	// Find the complete saved item
 	Model.get(this.model.model_name).findByPk(doc.$pk, async function gotRecord(err, result) {
 
+		try {
+			await createRevision(result);
+			pledge.resolve();
+		} catch (err) {
+			pledge.reject(err);
+		}
+	});
+
+	async function createRevision(result) {
+
 		if (result) {
 
 			// Get the new data
@@ -320,13 +330,13 @@ Revision.setMethod(function afterSave(record, options, created) {
 					[that.revision_model.model_name] : revision_data
 				};
 
-				// Save the data (but do not wait for it)
-				that.revision_model.save(revision_data, {allowFields: true});
+				// Save the revision. This IS awaited: a `revert()` right after
+				// a save has to see this revision, and a fire-and-forget save
+				// would also swallow any insert error.
+				await that.revision_model.save(revision_data, {allowFields: true});
 			}
 		}
-
-		pledge.resolve();
-	});
+	}
 
 	return pledge;
 });

package/lib/app/helper_datasource/05-fallback_datasource.js

@@ -165,7 +165,7 @@ Fallback.setMethod(function storeInUpperDatasource(model, data, options) {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.0
- * @version  1.4.2
+ * @version  1.4.5
  *
  * @param    {Alchemy.OperationalContext.ReadDocumentFromDatasource}   context
  *
@@ -183,7 +183,28 @@ Fallback.setMethod(function read(context) {
 		let lower_context = context.createChild();
 		lower_context.setCriteria(lower_criteria);
 
-		tasks.push(() => this.lower.read(lower_context));
+		// A rejected lower (remote) read must not reject the whole query:
+		// resolve to null instead, so the waterfall falls through to the upper
+		// (local cache) read. Without this, being offline made every find fail
+		// even though the cache had the data.
+		tasks.push(() => {
+			let attempt = new Swift();
+
+			Swift.done(this.lower.read(lower_context), (err, result) => {
+
+				if (err) {
+					if (Blast.isBrowser && typeof alchemy != 'undefined' && alchemy.distinctProblem) {
+						alchemy.distinctProblem('fallback-lower-read', 'Remote read failed, using local cache', {repeat_after: 60000});
+					}
+
+					return attempt.resolve(null);
+				}
+
+				attempt.resolve(result);
+			});
+
+			return attempt;
+		});
 	}
 
 	let upper_criteria = criteria.clone();
@@ -202,7 +223,7 @@ Fallback.setMethod(function read(context) {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.0
- * @version  1.4.2
+ * @version  1.4.5
  *
  * @param    {Model}   model
  *
@@ -220,7 +241,13 @@ Fallback.setMethod(function getRecordsToSync(model) {
 	context.setModel(model);
 	context.setCriteria(criteria);
 
-	return this.upper.read(context);
+	// Datasource#read resolves with `{items, available}` since 1.4.2, but the
+	// consumers of this method (getRecordsToBeSavedRemotely) iterate the result
+	// directly - so unwrap to the items array, or offline saves never sync.
+	return Swift.waterfall(
+		this.upper.read(context),
+		result => (result && result.items) ? result.items : (result || [])
+	);
 });
 
 /**

package/lib/app/helper_model/document.js

@@ -1170,6 +1170,31 @@ Document.setMethod(function save(data, options, callback) {
 
 		save_result = save_result[0];
 
+		// Fields edited while the save was in flight would be silently
+		// reverted by adopting the response wholesale (the response only
+		// reflects the record as it was sent), so detect and keep them.
+		let kept_fields;
+
+		if (in_flight_snapshot && that.$main) {
+			let key;
+
+			for (key in that.$main) {
+
+				if (key == pk_name) {
+					continue;
+				}
+
+				if (!that.alikeWhenStored(that.$main[key], in_flight_snapshot[key])) {
+
+					if (!kept_fields) {
+						kept_fields = {};
+					}
+
+					kept_fields[key] = that.$main[key];
+				}
+			}
+		}
+
 		// Use the saved data from now on
 		that.$main = save_result.$main;
 
@@ -1177,10 +1202,21 @@ Document.setMethod(function save(data, options, callback) {
 		that.$attributes.original_record = undefined;
 		that.markUnchanged();
 
-		if (that.hasObjectFields()) {
+		if (kept_fields || that.hasObjectFields()) {
 			that.storeCurrentDataAsOriginalRecord();
 		}
 
+		if (kept_fields) {
+			let key;
+
+			// Put the newer, in-flight edits back on top of the saved state
+			// and mark them as changed, so a follow-up save persists them.
+			for (key in kept_fields) {
+				that.markChangedField(key, kept_fields[key]);
+				that.$main[key] = kept_fields[key];
+			}
+		}
+
 		pledge.resolve(that);
 	}
 
@@ -1218,6 +1254,16 @@ Document.setMethod(function save(data, options, callback) {
 		}
 	}
 
+	// Snapshot the record as it is being sent, so `updateDoc` can tell which
+	// fields were edited while the save was in flight
+	let in_flight_snapshot = null;
+
+	try {
+		in_flight_snapshot = JSON.clone(main);
+	} catch (err) {
+		// Without a snapshot the response is simply adopted as-is
+	}
+
 	sub_pledge = this.$model.save(this, options, updateDoc);
 
 	return pledge;

package/lib/app/helper_model/model.js

@@ -1892,20 +1892,6 @@ Model.setMethod(function saveRecord(document, options, callback) {
 
 		creating = options.create || document.$pk == null;
 		next();
-
-		return;
-
-		// Look through unique indexes if no _id is present
-		that.auditRecord(document, options, function afterAudit(err, doc) {
-
-			if (err) {
-				return next(err);
-			}
-
-			// Is a new record being created?
-			creating = options.create || doc.$pk == null;
-			next();
-		});
 	}, function doBeforeNormalize(next) {
 		// @TODO: make "beforeSave" only use promises
 		that.issueDataEvent('beforeNormalize', [document, options], next);

package/lib/class/model.js

@@ -1402,7 +1402,7 @@ Model.setMethod(function remove(id, callback) {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.5.0
- * @version  1.2.0
+ * @version  1.4.5
  *
  * @param    {Object}    options    Find options
  * @param    {Function}  task       Task to perform on each record
@@ -1425,7 +1425,12 @@ Model.setMethod(function eachRecord(options, task, callback) {
 		options = {};
 	}
 
-	if (!callback) {
+	if (callback) {
+		// Errors are also delivered through the callback, and callers that
+		// pass one routinely discard the returned pledge - its rejection
+		// must not be reported as an uncaught error on top of the callback
+		pledge.warn_uncaught_errors = false;
+	} else {
 		callback = Function.thrower;
 	}
 

package/lib/core/client_base.js

@@ -291,6 +291,13 @@ ClientBase.setMethod(function issueEvent(name, args, next) {
 		args = [];
 	}
 
+	if (next) {
+		// Errors are also delivered through `next`, and callers that pass a
+		// callback routinely discard the returned pledge - its rejection
+		// must not be reported as an uncaught error on top of the callback.
+		pledge.warn_uncaught_errors = false;
+	}
+
 	if (this.constructor.event_to_method_map) {
 		method_name = this.constructor.event_to_method_map.get(name);
 	}

package/lib/stages/50-routes.js

@@ -118,7 +118,17 @@ const hawkejs = routes.createStage('hawkejs', () => {
 				return req.conduit.notFound('Could not find any of the given templates');
 			}
 
-			req.conduit.setHeader('cache-control', 'public, max-age=3600, must-revalidate');
+			// Only allow long-lived caching when the request is versioned
+			// with the CURRENT app version: unversioned (or stale-versioned)
+			// urls would keep serving an old template for up to an hour
+			// after a deploy.
+			let requested_version = req.conduit.param('v');
+
+			if (requested_version && String(requested_version) === String(alchemy.hawkejs.app_version)) {
+				req.conduit.setHeader('cache-control', 'public, max-age=3600, must-revalidate');
+			} else {
+				req.conduit.setHeader('cache-control', 'no-cache');
+			}
 
 			// Don't use json dry, hawkejs expects regular json
 			req.conduit.json_dry = false;

package/lib/testing/browser.js

@@ -24,6 +24,78 @@
  */
 'use strict';
 
+const fs = require('fs'),
+      child_process = require('child_process');
+
+/**
+ * Check if a browser executable actually works in headless mode.
+ * Puppeteer's own bundled-Chrome download can be missing/corrupt in some
+ * sandboxes (e.g. a pinned old revision missing its ICU data file). Such a
+ * binary still exits 0 for `--version`, but hangs and never emits a CDP
+ * handshake when actually launched headless - which is what makes
+ * `puppeteer.launch()` hang until its connect-timeout instead of failing
+ * fast. So a real headless run is checked synchronously up front instead.
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.4.5
+ * @version  1.4.5
+ *
+ * @param    {string}   executable_path
+ *
+ * @return   {boolean}
+ */
+function isUsableBrowser(executable_path) {
+
+	if (!executable_path || !fs.existsSync(executable_path)) {
+		return false;
+	}
+
+	let result = child_process.spawnSync(executable_path, [
+		'--headless',
+		'--disable-gpu',
+		'--no-sandbox',
+		'--dump-dom',
+		'about:blank',
+	], {timeout: 8000});
+
+	return result.status === 0 && !result.error;
+}
+
+/**
+ * Resolve which Chrome/Chromium executable to launch.
+ * Prefers `PUPPETEER_EXECUTABLE_PATH` (puppeteer already honors it, but we
+ * validate it here too) and puppeteer's own bundled download; falls back to
+ * common system-installed locations when neither actually works.
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.4.5
+ * @version  1.4.5
+ *
+ * @param    {Object}   puppeteer
+ *
+ * @return   {string|undefined}
+ */
+function resolveExecutablePath(puppeteer) {
+
+	let candidates = [
+		process.env.PUPPETEER_EXECUTABLE_PATH,
+		puppeteer.executablePath(),
+		'/usr/bin/chromium',
+		'/usr/bin/chromium-browser',
+		'/usr/bin/google-chrome',
+	];
+
+	for (let candidate of candidates) {
+		if (isUsableBrowser(candidate)) {
+			return candidate;
+		}
+	}
+
+	// Nothing usable found: let puppeteer try its own default and produce
+	// its normal error/timeout, rather than silently launching with none
+	return undefined;
+}
+
 /**
  * The BrowserHelper class
  *
@@ -133,7 +205,8 @@ BrowserHelper.setMethod(async function load() {
 	} else {
 		// Launch new browser
 		this.browser = await puppeteer.launch({
-			headless: this.options.headless,
+			headless       : this.options.headless,
+			executablePath : resolveExecutablePath(puppeteer),
 		});
 	}
 

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "alchemymvc",
 	"description": "MVC framework for Node.js",
-	"version": "1.4.4",
+	"version": "1.4.5",
 	"author": "Jelle De Loecker <jelle@elevenways.be>",
 	"keywords": [
 		"alchemy",
@@ -22,7 +22,7 @@
 		"chokidar"         : "~4.0.3",
 		"formidable"       : "~3.5.4",
 		"graceful-fs"      : "~4.2.11",
-		"hawkejs"          : "~2.4.2",
+		"hawkejs"          : "~2.4.3",
 		"jsondiffpatch"    : "~0.5.0",
 		"mime-types"       : "~3.0.2",
 		"minimist"         : "~1.2.8",
@@ -32,7 +32,7 @@
 		"ncp"              : "~2.0.0",
 		"postcss"          : "~8.5.6",
 		"postcss-prune-var": "~1.1.2",
-		"protoblast"       : "~0.9.8",
+		"protoblast"       : "~0.9.9",
 		"semver"           : "~7.7.2",
 		"socket.io"        : "~4.7.5",
 		"@11ways/socket.io-stream" : "~0.9.2",
@@ -66,7 +66,7 @@
 		"mocha"                   : "^11.7.5",
 		"mongo-unit"              : "^3.4.0",
 		"nyc"                     : "^15.1.0",
-		"puppeteer"               : "~21.3.6",
+		"puppeteer"               : "^24.43.1",
 		"source-map"              : "~0.7.3"
 	},
 	"scripts": {