@iebh/tera-fy 2.0.20 → 2.0.21

package/lib/terafy.server.js

@@ -69,9 +69,9 @@ export default class TeraFyServer {
 						...cloneDeep(message), // Need to clone to resolve promise nasties
 					};
 					e.source.postMessage(payload, this.settings.restrictOrigin);
-				} catch (e) {
-					this.debug('ERROR', 1, 'Attempted to dispatch payload server(via reply)->client', {payload, e});
-					throw e;
+				} catch (err) {
+					this.debug('ERROR', 1, 'Attempted to dispatch payload server(via reply)->client', {payload, err});
+					throw err;
 				}
 			},
 		});
@@ -127,14 +127,16 @@ export default class TeraFyServer {
 								...cloneDeep(message), // Need to clone to resolve promise nasties
 							};
 							iFrame.contentWindow.postMessage(payload, this.settings.restrictOrigin);
-						} catch (e) {
-							this.debug('ERROR', 1, 'Attempted to dispatch payload server(top level window)->cient(iframe)', {payload, e});
-							throw e;
+						} catch (err) {
+							this.debug('ERROR', 1, 'Attempted to dispatch payload server(top level window)->cient(iframe)', {payload, err});
+							throw err;
 						}
 					},
 				});
 			}
 			case TeraFyServer.SERVERMODE_POPUP:
+				// FIXME: Need implementation for POPUP mode?
+				throw new Error('SERVERMODE_POPUP getClientContext not implemented');
 		}
 	}
 
@@ -190,7 +192,7 @@ export default class TeraFyServer {
 	* @returns {Promise<*>} A promise which resolves when the operation has completed with the remote reply
 	*/
 	send(message) {
-		if (!this.messageEvent) throw new Error('send() can only be used if given a context from `createContext()`');
+		if (!this.messageEvent?.source) throw new Error('send() requires a messageEvent with a source');
 
 		let id = nanoid();
 
@@ -199,10 +201,12 @@ export default class TeraFyServer {
 			Object.assign(this.acceptPostboxes[id], {
 				resolve, reject,
 			});
+
+			// Use sendRaw with the specific source from the stored messageEvent
 			this.sendRaw({
 				id,
 				...message,
-			});
+			}, this.messageEvent?.source); // Pass the source explicitly
 		});
 
 		return this.acceptPostboxes[id].promise;
@@ -224,7 +228,10 @@ export default class TeraFyServer {
 				...cloneDeep(message), // Need to clone to resolve promise nasties
 			};
 			this.debug('INFO', 3, 'Dispatch response', message, '<=>', payload);
-			(sendVia || globalThis.parent).postMessage(payload, this.settings.restrictOrigin);
+
+			let target = sendVia || globalThis.parent;
+			if (!target) this.debug('WARN', 1, 'Cannot sendRaw, no target window (sendVia or parent) found.');
+			target.postMessage(payload, this.settings.restrictOrigin);
 		} catch (e) {
 			this.debug('ERROR', 2, 'Attempted to dispatch response server->client', payload);
 			this.debug('ERROR', 2, 'Message compose server->client:', e);
@@ -274,6 +281,7 @@ export default class TeraFyServer {
 					} else {
 						this.acceptPostboxes[message.id].resolve(message.response);
 					}
+					delete this.acceptPostboxes[message.id]; // Clean up postbox
 				} else if (message.action == 'rpc') { // Relay RPC calls
 					if (!this[message.method]) throw new Error(`Unknown RPC method "${message.method}"`);
 					return this[message.method].apply(this.createContext(rawMessage), message.args);
@@ -289,12 +297,16 @@ export default class TeraFyServer {
 			}, rawMessage.source))
 			.catch(e => {
 				console.warn(`TERA-FY server threw on RPC:${message.method}:`, e);
-				this.sendRaw({
-					id: message.id,
-					action: 'response',
-					isError: true,
-					response: e ? e.toString() : e,
-				}, rawMessage.source);
+				if (message.action === 'rpc' && message.id && rawMessage.source) {
+					this.sendRaw({
+						id: message.id,
+						action: 'response',
+						isError: true,
+						response: e instanceof Error ? e.message : String(e), // Return error message to requester
+					}, rawMessage.source);
+				} else {
+					console.warn(`Unable to respond with errored RPC:${message.method} as reply postbox is invalid`);
+				}
 			})
 	}
 
@@ -315,6 +327,13 @@ export default class TeraFyServer {
 	* @returns {Promise<*>} A promise which resolves with the resulting inner callback payload
 	*/
 	requestFocus(cb) {
+		// Ensure messageEvent is set before calling senderRpc
+		if (!this.messageEvent && this.settings.serverMode != TeraFyServer.SERVERMODE_TERA) {
+			console.warn("requestFocus called without a messageEvent context. Cannot toggle focus.");
+			// Proceed without toggling focus if no context is available
+			return Promise.resolve().then(() => cb.call(this));
+		}
+
 		return Promise.resolve()
 			.then(()=> this.settings.serverMode != TeraFyServer.SERVERMODE_TERA && this.senderRpc('toggleFocus', true))
 			.then(()=> cb.call(this))
@@ -403,7 +422,10 @@ export default class TeraFyServer {
 				}
 				: null
 			)
-			.catch(e => console.warn('getUser() catch', e))
+			.catch(e => {
+				console.warn('getUser() catch', e);
+				return null; // Return null on error
+			})
 	}
 
 
@@ -517,8 +539,8 @@ export default class TeraFyServer {
 				// Force refresh projects against the new user
 				await app.service('$projects').refresh();
 				return;
-			} catch (e) {
-				throw new Error(`Failed to decode local dev state - ${e.toString()}`);
+			} catch (err) {
+				throw new Error(`Failed to decode local dev state - ${err.toString()}`);
 			}
 		}
 
@@ -530,7 +552,7 @@ export default class TeraFyServer {
 
 		// Attach click listner to internal button to re-popup the auth window (in case popups are blocked)
 		focusContent.querySelector('a.btn').addEventListener('click', ()=>
-			this.uiWindow(new URL(this.settings.sitePathLogin, this.settings.siteUrl))
+			this.uiWindow(new URL(this.settings.sitePathLogin, this.settings.siteUrl).toString())
 		);
 
 		// Create a deferred promise which will (eventually) resolve when the downstream window signals its ready
@@ -565,7 +587,7 @@ export default class TeraFyServer {
 		// Go fullscreen, try to open the auth window + prompt the user to retry (if popups are blocked) and wait for resolution
 		await this.requestFocus(()=> {
 			// Try opening the popup automatically - this will likely fail if the user has popup blocking enabled
-			this.uiWindow(new URL(this.settings.sitePathLogin, this.settings.siteUrl));
+			this.uiWindow(new URL(this.settings.sitePathLogin, this.settings.siteUrl).toString());
 
 			// Display a message to the user, offering the ability to re-open the popup if it was originally denied
 			this.uiSplat(focusContent, {logo: true});
@@ -685,7 +707,7 @@ export default class TeraFyServer {
 						}))
 						.then(project => resolve(project))
 						.catch(e => {
-							if (e == 'cancel') {
+							if (e.toLowerCase() == 'cancel') {
 								return this.requestFocus(()=>
 									app.service('$prompt').dialog({
 										title: settings.noSelectTitle,
@@ -732,7 +754,7 @@ export default class TeraFyServer {
 				app.service('$prompt').dialog({
 					title: settings.title,
 					component: 'projectsSelect',
-					buttons: settings.allowCancel && ['cancel'],
+					buttons: settings.allowCancel ? ['cancel'] : false,
 				})
 			))
 			.then(project => settings.setActive
@@ -773,11 +795,11 @@ export default class TeraFyServer {
 	* @returns {Promise<Object>} A promise which resolves to the namespace POJO state
 	*/
 	setNamespace(name, state, options) {
-		if (!/^[\w--]+$/.test(name)) throw new Error('Namespaces must be alphanumeric + hyphens + underscores');
+		if (!/^[\w-]+$/.test(name)) throw new Error('Namespaces must be alphanumeric + hyphens + underscores');
 		if (typeof state != 'object') throw new Error('State must be an object');
 
 		return app.service('$sync').setSnapshot(`project_namespaces::${app.service('$projects').active.id}}::${name}`, state, {
-			method: options.method,
+			method: options.method ?? 'merge',
 		});
 	}
 
@@ -839,7 +861,6 @@ export default class TeraFyServer {
 	*/
 	setProjectState(path, value, options) {
 		let settings = {
-			save: true,
 			strategy: 'set',
 			...options,
 		};
@@ -863,7 +884,8 @@ export default class TeraFyServer {
 			},
 		);
 
-		return Promise.resolve(); // Sync functionality for the moment but could be async in the future
+		// Sync functionality for the moment but could be async in the future
+		return Promise.resolve(value);
 	}
 
 
@@ -902,7 +924,7 @@ export default class TeraFyServer {
 				newState: cloneDeep(target),
 			});
 
-			return value;
+			return Promise.resolve(value);
 		}
 	}
 
@@ -1011,7 +1033,7 @@ export default class TeraFyServer {
 						},
 					},
 					modalDialogClass: 'modal-dialog-lg',
-					buttons: settings.allowCancel && ['cancel'],
+					buttons: settings.allowCancel ? ['cancel'] : false,
 				})
 			))
 	}
@@ -1188,11 +1210,7 @@ export default class TeraFyServer {
 		};
 
 		return Promise.resolve()
-			.then(()=> {
-				console.log('Checking for project, is required:', settings.autoRequire);
-				settings.autoRequire && this.requireProject()
-				console.log('Project set!')
-			})
+			.then(()=> settings.autoRequire && this.requireProject())
 			.then(()=> {
 				if (settings.id) return; // We already have a file ID specified - skip
 
@@ -1206,6 +1224,9 @@ export default class TeraFyServer {
 				})
 					.then(file => settings.id = file.id)
 			})
+			.then(()=> { // Final checks
+				if (!settings.id) throw new Error("Could not determine file ID to save to.");
+			})
 			.then(()=> app.service('$supabase').fileSet(app.service('$projects').decodeFilePath(settings.id), contents, {
 				overwrite: true,
 				toast: false,
@@ -1242,7 +1263,7 @@ export default class TeraFyServer {
 			autoRequire: true,
 			filters: {
 				library: true,
-				...options?.filter,
+				...(options?.filters ?? {}), // Use filters from options if provided
 			},
 			...options,
 		};
@@ -1283,6 +1304,8 @@ export default class TeraFyServer {
 				toast: false,
 			}))
 			.then(blob => {
+				if (!blob) throw new Error(`File not found or empty: ${filePath}`);
+
 				switch (settings.format) {
 					// NOTE: Any updates to the format list should also extend setProjectLibrary()
 					case 'pojo':
@@ -1365,7 +1388,7 @@ export default class TeraFyServer {
 				filePath = app.service('$projects').decodeFilePath(settings.id);
 			})
 			.then(()=> {
-				// Mutate settings.ref -> Blob or File format needed by Supabase
+				// Mutate settings.refs -> Blob or File format needed by Supabase
 				if (settings.format == 'auto') {
 					settings.format =
 						Array.isArray(settings.refs) ? 'pojo'
@@ -1388,7 +1411,7 @@ export default class TeraFyServer {
 						if (!(settings.refs instanceof Blob)) throw new Error("setProjectLibrary({format: 'blob'} but non-Blob provided as `refs`");
 						return new File([settings.refs], app.service('$supabase')._parsePath(filePath).basename);
 					case 'file':
-						if (!(settings.ref instanceof File)) throw new Error("setProjectLibrary({format: 'file'} but non-File provided as `refs`");
+						if (!(settings.refs instanceof File)) throw new Error("setProjectLibrary({format: 'file'} but non-File provided as `refs`");
 						return settings.refs;
 					default:
 						throw new Error(`Unsupported library format "${settings.format}"`);
@@ -1396,7 +1419,7 @@ export default class TeraFyServer {
 			})
 			.then(fileBlob => app.service('$supabase').fileUpload(filePath, {
 				file: fileBlob,
-				overwrite: true,
+				overwrite: settings.overwrite,
 				mode: 'encoded',
 			}))
 			.then(()=> null)
@@ -1484,11 +1507,9 @@ export default class TeraFyServer {
 			app.service('$prompt').dialog({
 				title: settings.title,
 				body: settings.body,
-				buttons:
-					settings.buttons == 'ok' ? ['ok']
-					: false,
+				buttons: settings.buttons == 'ok' ? ['ok'] : false,
 				isHtml: settings.isHtml,
-				dialogClose: 'resolve',
+				dialogClose: 'resolve', // Resolve promise when closed
 			})
 		);
 	}
@@ -1527,7 +1548,7 @@ export default class TeraFyServer {
 					{
 						title: 'OK',
 						class: 'btn btn-success',
-						click: 'resolve',
+						click: 'resolve', // Resolve promise with default value (usually true or button index)
 					},
 					{
 						title: 'Cancel',
@@ -1536,8 +1557,8 @@ export default class TeraFyServer {
 					},
 				],
 			})
-				.then(()=> 'OK')
-				.catch(()=> Promise.reject('CANCEL'))
+				.then(()=> 'OK') // Resolve with 'OK' if OK button clicked
+				.catch(()=> Promise.reject('CANCEL')) // Reject with 'CANCEL' if Cancel button clicked or closed
 		);
 	}
 
@@ -1557,7 +1578,7 @@ export default class TeraFyServer {
 	* Display, update or dispose of windows for long running tasks
 	* All options are cumulative - i.e. they are merged with other options previously provided
 	*
-	* @param {Object|Boolean} [options] Additional options to mutate behaviour, if boolean false `{close: true}` is assumed
+	* @param {Object|Boolean} [options] Additional options to mutate behaviour, if boolean false `close: true` is assumed
 	* @param {String} [options.body=''] Window body text
 	* @param {Boolean} [options.bodyHtml=false] If truthy, treat the body as HTML
 	* @param {String} [options.title='TERA'] Window title, can only be set on the initial call
@@ -1648,7 +1669,7 @@ export default class TeraFyServer {
 		return this.requestFocus(()=>
 			app.service('$prompt').dialog({
 				title: settings.title,
-				closable: true,
+				closable: true, // Allow closing via backdrop click (will reject)
 				component: 'UiPrompt',
 				componentProps: {
 					body: settings.body,
@@ -1662,7 +1683,7 @@ export default class TeraFyServer {
 						icon: 'fas fa-check',
 						title: 'Ok',
 						click() {
-							return this.$prompt.close(true, this.newValue);
+							return app.service('$prompt').close(true, this.newValue);
 						},
 					},
 					'cancel',
@@ -1672,9 +1693,9 @@ export default class TeraFyServer {
 			.then(answer => {
 				if (answer) {
 					return answer;
-				} else if (settings.required) {
+				} else if (settings.required) { // Required answer but returned response is falsy
 					return Promise.reject('CANCEL');
-				} else {
+				} else { // Everything else - relay the raw value
 					return answer;
 				}
 			})
@@ -1719,7 +1740,7 @@ export default class TeraFyServer {
 				location: false,
 				menubar: false,
 				status: false,
-				scrolbars: false,
+				scrollbars: false,
 			},
 			...options,
 		};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iebh/tera-fy",
-  "version": "2.0.20",
+  "version": "2.0.21",
   "description": "TERA website worker",
   "scripts": {
     "dev": "esbuild --platform=browser --format=esm --bundle lib/terafy.client.js --outfile=dist/terafy.js --minify --serve --servedir=.",
@@ -86,7 +86,7 @@
     "uuid": "^11.1.0"
   },
   "devDependencies": {
-    "@momsfriendlydevco/eslint-config": "^2.1.2",
+    "@momsfriendlydevco/eslint-config": "^2.1.3",
     "@release-it/conventional-changelog": "^10.0.0",
     "concurrently": "^9.1.2",
     "documentation": "^14.0.3",
@@ -117,8 +117,9 @@
       "before:init": "git reset HEAD -- api.md docs/ dist/",
       "before:bump": [
         "npm run build",
-        "git add api.md docs/ dist/"
-      ]
+        "git add -f api.md docs/ dist/"
+      ],
+      "after:release": "git rm --cached -r dist && echo 'Untracked dist/ for subsequent commits.'"
     },
     "plugins": {
       "@release-it/conventional-changelog": {

package/utils/pathTools.js

@@ -121,11 +121,9 @@ export function merge(target, path, value) {
 */
 export function defaults(target, path, value) {
 	if (typeof path == 'string' || Array.isArray(path)) { // Called as (target, path, value)
-		if (!has(target, path)) { // Target path doesn't exist at all
-			return set(target, path, value);
-		} else { // Target path exists - apply Lodash defaults
-			return _defaults(get(target, path), value);
-		}
+		return !has(target, path)  // Target path doesn't exist at all
+			? set(target, path, value)
+			: _defaults(get(target, path), value);
 	} else { // Called as (target, value)
 		return _defaults(target, path);
 	}