rapier-embed 1.1.2 → 1.1.4

package/embed.mjs

@@ -12,6 +12,8 @@ export function connectRapier(iframe, options) {
 	if (capabilities.includes('read') && typeof store?.write !== 'function') throw new TypeError('read needs store.write(requestId, content, baseRevision) -> {revision} or {conflict: true, currentRevision}');
 	const ids = {sessionId, documentId};
 	const answered = new Map(), waiting = new Map();
+	// save() waits on the frame's own save-request, not the command id the helper just minted.
+	const commandWaiters = {save: []};
 	let port = null, posted = false, connected = false, seq = 0;
 	const listeners = new Map();
 
@@ -19,31 +21,57 @@ export function connectRapier(iframe, options) {
 	const fail = error => { emit('error', error); if (onError) onError(error); };
 	const sameFrame = event => event.source === iframe.contentWindow && event.origin === origin;
 
-	function send(type, payload, baseRevision) {
+	function send(type, payload, baseRevision, quiet) {
 		if (!port || !connected) return Promise.reject(new Error('not connected'));
 		const requestId = 'h' + (++seq) + '-' + Math.random().toString(36).slice(2, 10);
 		const message = {type, ...ids, requestId, ...(baseRevision !== undefined ? {baseRevision} : {}), ...(payload ? {payload} : {})};
+		// Theme is painted and not answered. A refusal has this requestId and reaches onError below.
+		if (quiet) {
+			try { port.postMessage(message); } catch (error) { return Promise.reject(error); }
+			return Promise.resolve();
+		}
 		return new Promise((resolve, reject) => {
 			waiting.set(requestId, {resolve, reject, type});
 			try { port.postMessage(message); } catch (error) { waiting.delete(requestId); reject(error); }
 		});
 	}
 
+	// Drop the command's own waiter once the frame has answered it by another id, so it cannot hang.
+	function releaseCommand(type) {
+		for (const [requestId, pending] of waiting) {
+			if (pending.type !== type) continue;
+			waiting.delete(requestId);
+			pending.resolve();
+			return;
+		}
+	}
+
 	async function answerSave(message) {
 		const {requestId, baseRevision} = message;
 		// The answer is held from the moment storage starts: a Retry while it is pending shares the one write.
-		if (!answered.has(requestId)) answered.set(requestId, (async () => {
-			let reply;
-			try {
-				const outcome = await store.write(requestId, message.payload?.content ?? '', baseRevision, message.payload);
-				reply = outcome && outcome.conflict
-					? {type: 'save-nack', payload: {code: 'conflict', ...(outcome.currentRevision !== undefined ? {currentRevision: outcome.currentRevision} : {})}}
-					: {type: 'save-ack', payload: {revision: outcome.revision}};
-			} catch (error) {
-				reply = {type: 'save-nack', payload: {code: 'failed', reason: String(error?.message || error).slice(0, 500)}};
-			}
-			return {...ids, requestId, baseRevision, ...reply};
-		})());
+		if (!answered.has(requestId)) {
+			const job = (async () => {
+				let reply;
+				try {
+					const outcome = await store.write(requestId, message.payload?.content ?? '', baseRevision, message.payload);
+					reply = outcome && outcome.conflict
+						? {type: 'save-nack', payload: {code: 'conflict', ...(outcome.currentRevision !== undefined ? {currentRevision: outcome.currentRevision} : {})}}
+						: {type: 'save-ack', payload: {revision: outcome.revision}};
+				} catch (error) {
+					reply = {type: 'save-nack', payload: {code: 'failed', reason: String(error?.message || error).slice(0, 500)}};
+				}
+				return {...ids, requestId, baseRevision, ...reply};
+			})();
+			answered.set(requestId, job);
+			// The host's save() is settled by this save-request, which carries the frame's id, not the command's.
+			job.then(reply => {
+				const slot = commandWaiters.save.shift();
+				if (!slot) return;
+				releaseCommand('save');
+				if (reply.type === 'save-ack') slot.resolve(reply.payload);
+				else slot.reject(Object.assign(new Error(reply.payload?.reason || reply.payload?.code || 'refused'), {code: reply.payload?.code, payload: reply.payload}));
+			}, () => {});
+		}
 		port.postMessage(await answered.get(requestId));
 	}
 
@@ -99,10 +127,45 @@ export function connectRapier(iframe, options) {
 	return Object.freeze({
 		get connected() { return connected; },
 		load: (content, {filename, revision = 1, readOnly, title} = {}) => send('load', {content, ...(filename ? {filename} : {}), revision, ...(readOnly !== undefined ? {readOnly} : {}), ...(title ? {title} : {})}, null),
-		save: () => send('save'),
+		save() {
+			const posted = send('save');
+			return new Promise((resolve, reject) => {
+				let settled = false;
+				const slot = {
+					resolve: value => { if (settled) return; settled = true; resolve(value); },
+					reject: error => { if (settled) return; settled = true; reject(error); },
+				};
+				commandWaiters.save.push(slot);
+				posted.catch(error => {
+					const index = commandWaiters.save.indexOf(slot);
+					if (index >= 0) commandWaiters.save.splice(index, 1);
+					slot.reject(error);
+				});
+			});
+		},
 		compare: (content, {filename} = {}) => send('compare', {content, ...(filename ? {filename} : {})}),
-		close: () => send('close'),
-		theme: value => send('theme', {theme: value}),
+		close() {
+			const posted = send('close');
+			return new Promise((resolve, reject) => {
+				let settled = false;
+				const finish = payload => {
+					if (settled) return;
+					settled = true;
+					listeners.get('closed')?.delete(finish);
+					releaseCommand('close');
+					resolve(payload);
+				};
+				if (!listeners.has('closed')) listeners.set('closed', new Set());
+				listeners.get('closed').add(finish);
+				posted.catch(error => {
+					if (settled) return;
+					settled = true;
+					listeners.get('closed')?.delete(finish);
+					reject(error);
+				});
+			});
+		},
+		theme: value => send('theme', {theme: value}, undefined, true),
 		disconnect() {
 			send('disconnect').catch(() => {});
 			globalThis.removeEventListener?.('message', onWindowMessage);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rapier-embed",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "Put the Rapier editor in your site: one call frames rapier.html?embed=1, connects, loads your document and answers its saves.",
   "keywords": [
     "markdown",