@iebh/tera-fy 2.0.21 → 2.2.0

package/lib/{terafy.client.js → terafy.client.ts}

@@ -31,21 +31,21 @@ export default class TeraFy {
 	* @property {Array<String|Array<String>>} [debugPaths] List of paths (in either dotted or array notation) to enter debugging mode if a change is detected in dev mode e.g. `{debugPaths: ['foo.bar.baz']}`. This really slows down state writes so should only be used for debugging
 	*/
 	settings = {
-		session: null,
+		session: null as string | null,
 		// client: 'tera-fy', // Reserved by terafy.bootstrapper.js
 		// clientType: 'esm', // Reserved by terafy.bootstrapper.js
 		devMode: false,
 		verbosity: 1,
-		mode: 'detect',
+		mode: 'detect' as 'detect' | 'parent' | 'child' | 'popup',
 		modeTimeout: 300,
 		modeFallback: 'child', // ENUM: 'child' (use iframes), 'popup' (use popup windows)
 		modeOverrides: {
-			child(config) { // When we're in child mode assume a local dev environment and use the dev.tera-tools.com site instead to work around CORS restrictions
+			child(config: any) { // When we're in child mode assume a local dev environment and use the dev.tera-tools.com site instead to work around CORS restrictions
 				if (config.siteUrl == 'https://tera-tools.com/embed') { // Only if we're using the default URL...
 					config.siteUrl = 'https://dev.tera-tools.com/embed'; // Repoint URL to dev site
 				}
 			},
-		},
+		} as { [key: string]: (config: any) => void },
 		siteUrl: 'https://tera-tools.com/embed',
 		restrictOrigin: '*',
 		frameSandbox: [
@@ -62,7 +62,7 @@ export default class TeraFy {
 		],
 		handshakeInterval: 1_000, // ~1s
 		handshakeTimeout: 10_000, // ~10s
-		debugPaths: null, // Transformed into a Array<String> (in Lodash dotted notation) on init()
+		debugPaths: null as Array<string | Array<string>> | null, // Transformed into a Array<String> (in Lodash dotted notation) on init()
 	};
 
 
@@ -70,6 +70,7 @@ export default class TeraFy {
 	* Event emitter subscription endpoint
 	* @type {Mitt}
 	*/
+	// @ts-ignore
 	events = Mitt();
 
 
@@ -83,10 +84,10 @@ export default class TeraFy {
 	* @property {DOMElement} stylesheet The corresponding stylesheet
 	*/
 	dom = {
-		el: null,
-		iframe: null,
-		popup: null,
-		stylesheet: null,
+		el: null as HTMLDivElement | null,
+		iframe: null as HTMLIFrameElement | null,
+		popup: null as Window | null,
+		stylesheet: null as HTMLStyleElement | null,
 	};
 
 
@@ -156,14 +157,14 @@ export default class TeraFy {
 		'uiThrow',
 		'uiSplat',
 		'uiWindow',
-	];
+	] as const;
 
 
 	/**
 	* Loaded plugins via Use()
 	* @type {Array<TeraFyPlugin>}
 	*/
-	plugins = [];
+	plugins: any[] = [];
 
 
 	/**
@@ -173,7 +174,7 @@ export default class TeraFy {
 	*
 	* @type {Object<Object>}
 	*/
-	namespaces = {};
+	namespaces: { [key: string]: any } = {};
 
 
 	// Messages - send(), sendRaw(), rpc(), acceptMessage() {{{
@@ -184,7 +185,7 @@ export default class TeraFy {
 	* @param {Object} message Message object to send
 	* @returns {Promise<*>} A promise which resolves when the operation has completed with the remote reply
 	*/
-	send(message) {
+	send(message: any) {
 		let id = nanoid();
 
 		this.acceptPostboxes[id] = {}; // Stub for the deferred promise
@@ -208,8 +209,8 @@ export default class TeraFy {
 	*
 	* @param {Object} message Message object to send
 	*/
-	sendRaw(message) {
-		let payload;
+	sendRaw(message: any) {
+		let payload: any;
 		try {
 			payload = {
 				TERA: 1,
@@ -220,9 +221,9 @@ export default class TeraFy {
 			if (this.settings.mode == 'parent') {
 				window.parent.postMessage(payload, this.settings.restrictOrigin);
 			} else if (this.settings.mode == 'child') {
-				this.dom.iframe.contentWindow.postMessage(payload, this.settings.restrictOrigin);
+				this.dom.iframe!.contentWindow!.postMessage(payload, this.settings.restrictOrigin);
 			} else if (this.settings.mode == 'popup') {
-				this.dom.popup.postMessage(payload, this.settings.restrictOrigin);
+				this.dom.popup!.postMessage(payload, this.settings.restrictOrigin);
 			} else if (this.settings.mode == 'detect') {
 				throw new Error('Call init() or detectMode() before trying to send data to determine the mode');
 			} else {
@@ -244,7 +245,7 @@ export default class TeraFy {
 	*
 	* @returns {Promise<*>} The resolved output of the server function
 	*/
-	rpc(method, ...args) {
+	rpc(method: any, ...args: any[]) {
 		return this.send({
 			action: 'rpc',
 			method,
@@ -260,7 +261,7 @@ export default class TeraFy {
 	*
 	* @returns {Promise} A promise which will resolve when the message has been processed
 	*/
-	acceptMessage(rawMessage) {
+	acceptMessage(rawMessage: any) {
 		if (rawMessage.origin == window.location.origin) return Promise.resolve(); // Message came from us
 
 		let message = rawMessage.data;
@@ -276,7 +277,7 @@ export default class TeraFy {
 			return Promise.resolve();
 		} else if (message?.action == 'rpc') {
 			return Promise.resolve()
-				.then(()=> this[message.method].apply(this, message.args))
+				.then(()=> (this as any)[message.method].apply(this, message.args as any[]))
 				.then(res => this.sendRaw({
 					id: message.id,
 					action: 'response',
@@ -293,7 +294,7 @@ export default class TeraFy {
 				})
 		} else if (message?.action == 'event') {
 			return Promise.resolve()
-				.then(()=> this.events.emit(message.event, ...message.payload))
+				.then(()=> this.events.emit(message.event, ...(message.payload as [])))
 				.catch(e => {
 					console.warn(`TERA-FY client threw while handling emitted event "${message.event}"`, {message});
 					throw e;
@@ -311,7 +312,7 @@ export default class TeraFy {
 	/**
 	* Listening postboxes, these correspond to outgoing message IDs that expect a response
 	*/
-	acceptPostboxes = {};
+	acceptPostboxes: { [key: string]: any } = {};
 
 	// }}}
 
@@ -325,7 +326,7 @@ export default class TeraFy {
 	*
 	* @returns {Promise<Reactive>} A promise which resolves to the reactive object
 	*/
-	mountNamespace(name) {
+	mountNamespace(name: any) {
 		if (!/^[\w-]+$/.test(name)) throw new Error('Namespaces must be alphanumeric + hyphens + underscores');
 		if (this.namespaces[name]) return Promise.resolve(this.namespaces[name]); // Already mounted
 
@@ -343,7 +344,7 @@ export default class TeraFy {
 	*
 	* @returns {Promise} A promise which resolves when the mount operation has completed
 	*/
-	_mountNamespace(name) { // eslint-disable-line no-unused-vars
+	_mountNamespace(name: any) { // eslint-disable-line no-unused-vars
 		console.warn('teraFy._mountNamespace() has not been overriden by a TERA-fy plugin, load one to add this functionality for your preferred framework');
 		throw new Error('teraFy._mountNamespace() is not supported');
 	}
@@ -359,7 +360,7 @@ export default class TeraFy {
 	*
 	* @returns {Promise} A promise which resolves when the operation has completed
 	*/
-	unmountNamespace(name) {
+	unmountNamespace(name: any) {
 		if (!this.namespaces[name]) return Promise.resolve(); // Already unmounted
 		return this._unmountNamespace(name);
 	}
@@ -373,7 +374,7 @@ export default class TeraFy {
 	*
 	* @returns {Promise} A promise which resolves when the operation has completed
 	*/
-	_unmountNamespace(name) { // eslint-disable-line no-unused-vars
+	_unmountNamespace(name: any) { // eslint-disable-line no-unused-vars
 		console.warn('teraFy.unbindNamespace() has not been overriden by a TERA-fy plugin, load one to add this functionality for your preferred framework');
 	}
 	// }}}
@@ -385,10 +386,11 @@ export default class TeraFy {
 	*
 	* @param {Object} [options] Additional options to merge into `settings` via `set`
 	*/
-	constructor(options) {
+	constructor(options?: any) {
 		if (options) this.set(options);
 	}
 
+	private initPromise: Promise<TeraFy> | null = null;
 
 	/**
 	* Initalize the TERA client singleton
@@ -397,26 +399,27 @@ export default class TeraFy {
 	* @param {Object} [options] Additional options to merge into `settings` via `set`
 	* @returns {Promise<TeraFy>} An eventual promise which will resovle with this terafy instance
 	*/
-	init(options) {
+	init(options?: any): Promise<TeraFy> {
 		if (options) this.set(options);
-		if (this.init.promise) return this.init.promise; // Aleady been called - return init promise
+		if (this.initPromise) return this.initPromise; // Aleady been called - return init promise
 
 		window.addEventListener('message', this.acceptMessage.bind(this));
 
 		const context = this;
-		return this.init.promise = Promise.resolve()
+		this.initPromise = Promise.resolve()
 			.then(()=> this.settings.session ||= 'tfy-' + this.getEntropicString(16))
 			.then(()=> this.debug('INFO', 4, '[0/6] Init', 'Session', this.settings.session, 'against', this.settings.siteUrl))
 			.then(()=> { // Init various options for optimized access
 				if (!this.settings.devMode) return; // Not in dev mode
-				this.settings.debugPaths =
-					!this.settings.debugPaths ? null // Falsy - disable
-					: Array.isArray(this.settings.debugPaths) ? this.settings.debugPaths.map(path =>
+				if (this.settings.debugPaths) {
+					this.settings.debugPaths = (this.settings.debugPaths as any[]).map((path: any) =>
 						Array.isArray(path) ? path.join('.') // Transform arrays into dotted notation
 						: typeof path == 'string' ? path // Assume already in dotted notation
 						: (()=> { throw new Error('Unknown path type - should be an array or string in dotted notation') })()
 					)
-					: (()=> { throw new Error('Unknown terafyClient.settings.debugPaths type') })()
+				} else {
+					this.settings.debugPaths = null;
+				}
 
 				this.debug('INFO', 0, 'Watching state paths', this.settings.debugPaths);
 			})
@@ -459,12 +462,16 @@ export default class TeraFy {
 					plugin.init.call(context, this.settings)
 				)
 			))
-			.then(()=> this.debug('INFO', 4, '[6/6] Init complete'))
-			.then(()=> context)
+			.then(()=> {
+				this.debug('INFO', 4, '[6/6] Init complete');
+				return context; // Resolve with the instance
+			})
 			.catch(e => {
 				this.debug('WARN', 0, 'Init process fault', e);
-				return context;
-			})
+				throw e; // Re-throw
+			});
+
+		return this.initPromise;
 	}
 
 
@@ -475,23 +482,24 @@ export default class TeraFy {
 	*
 	* @returns {Promise<String>} A promise which will resolve with the detected mode to use
 	*/
-	detectMode() {
+	detectMode(): Promise<'parent' | 'child' | 'popup'> {
 		if (this.settings.mode != 'detect') { // Dev has specified a forced mode to use
 			return Promise.resolve(this.settings.mode);
 		} else if (window.self === window.parent) { // This frame is already at the top
-			return Promise.resolve(this.settings.modeFallback);
+			return Promise.resolve(this.settings.modeFallback as 'child' | 'popup');
 		} else { // No idea - try messaging
 			return Promise.resolve()
 				.then(()=> this.settings.mode = 'parent') // Switch to parent mode...
-				.then(()=> new Promise((resolve, reject) => { // And try messaging with a timeout
+				.then(()=> new Promise<void>((resolve, reject) => { // And try messaging with a timeout
 					let timeoutHandle = setTimeout(()=> reject('TIMEOUT'), this.settings.modeTimeout);
 
 					this.rpc('handshake')
 						.then(()=> clearTimeout(timeoutHandle))
-						.then(()=> resolve())
+						.then(()=> resolve(undefined))
+						.catch(reject); // Propagate RPC errors
 				}))
-				.then(()=> 'parent')
-				.catch(()=> this.settings.modeFallback)
+				.then(()=> 'parent' as 'parent')
+				.catch(()=> this.settings.modeFallback as 'child' | 'popup')
 		}
 	}
 
@@ -504,29 +512,29 @@ export default class TeraFy {
 	injectComms() {
 		switch (this.settings.mode) {
 			case 'child': return Promise.resolve()
-				.then(()=> new Promise(resolve => {
+				.then(()=> new Promise<void>(resolve => {
 					this.debug('INFO', 2, 'Injecting TERA site as iFrame child');
 
 					this.dom.el = document.createElement('div')
 					this.dom.el.id = 'tera-fy';
-					this.dom.el.classList.toggle('dev-mode', this.settings.devMode);
-					this.dom.el.classList.add('minimized');
-					document.body.append(this.dom.el);
+					this.dom.el!.classList.toggle('dev-mode', this.settings.devMode);
+					this.dom.el!.classList.add('minimized');
+					document.body.append(this.dom.el!);
 
-					this.dom.el.addEventListener('click', ()=> this.dom.el.classList.toggle('minimized'));
+					this.dom.el!.addEventListener('click', ()=> this.dom.el!.classList.toggle('minimized'));
 
 					this.dom.iframe = document.createElement('iframe')
 
 					// Queue up event chain when document loads
-					this.dom.iframe.setAttribute('sandbox', this.settings.frameSandbox.join(' '));
-					this.dom.iframe.addEventListener('load', ()=> {
+					this.dom.iframe!.setAttribute('sandbox', this.settings.frameSandbox.join(' '));
+					this.dom.iframe!.addEventListener('load', ()=> {
 						this.debug('INFO', 3, 'Embeded iframe ready');
-						resolve();
+						resolve(undefined);
 					});
 
 					// Start document load sequence + append to DOM
-					this.dom.iframe.src = this.settings.siteUrl;
-					this.dom.el.append(this.dom.iframe);
+					this.dom.iframe!.src = this.settings.siteUrl;
+					this.dom.el!.append(this.dom.iframe!);
 				}))
 				.then(()=> this.handshakeLoop())
 
@@ -556,7 +564,7 @@ export default class TeraFy {
 	*
 	* @returns {Promise} A promise which will either resolve when the handshake is successful OR fail with 'TIMEOUT'
 	*/
-	handshakeLoop(options) {
+	handshakeLoop(options?: any) {
 		let settings = {
 			handshakeInterval: this.settings.handshakeInterval,
 			handshakeTimeout: this.settings.handshakeTimeout,
@@ -564,9 +572,9 @@ export default class TeraFy {
 		};
 
 		// Loop until the window context returns a handshake
-		return new Promise((resolve, reject) => {
+		return new Promise<void>((resolve, reject) => {
 			let handshakeCount = 0;
-			let handshakeTimer;
+			let handshakeTimer: any;
 
 			let handshakeTimeout = setTimeout(()=> {
 				clearTimeout(handshakeTimer);
@@ -584,8 +592,8 @@ export default class TeraFy {
 						clearTimeout(handshakeTimeout);
 						clearTimeout(handshakeTimer);
 					})
-					.then(()=> resolve())
-					.catch(reject)
+					.then(()=> resolve(undefined))
+					.catch(reject) // Let RPC errors propagate
 			};
 			tryHandshake(); // Kick off initial handshake
 		});
@@ -601,7 +609,7 @@ export default class TeraFy {
 		switch (this.settings.mode) {
 			case 'child':
 				this.dom.stylesheet = document.createElement('style');
-				this.dom.stylesheet.innerHTML = [
+				this.dom.stylesheet!.innerHTML = [
 					':root {',
 						'--TERA-accent: #4d659c;',
 					'}',
@@ -714,7 +722,7 @@ export default class TeraFy {
 					'}',
 					// }}}
 				].join('\n');
-				document.head.appendChild(this.dom.stylesheet);
+				document.head.appendChild(this.dom.stylesheet!);
 				break;
 			case 'parent':
 			case 'popup':
@@ -732,7 +740,7 @@ export default class TeraFy {
 	*/
 	injectMethods() {
 		this.methods.forEach(method =>
-			this[method] = this.rpc.bind(this, method)
+			(this as any)[method] = this.rpc.bind(this, method)
 		);
 	}
 	// }}}
@@ -748,7 +756,7 @@ export default class TeraFy {
 	* @param {Number} [verboseLevel=1] The verbosity level to trigger at. If `settings.verbosity` is lower than this, the message is ignored
 	* @param {...*} [msg] Output to show
 	*/
-	debug(...msg) {
+	debug(...msg: any[]) {
 		if (!this.settings.devMode || this.settings.verbosity < 1) return; // Debugging is disabled
 		let method = 'log';
 		let verboseLevel = 1;
@@ -765,7 +773,7 @@ export default class TeraFy {
 
 		if (this.settings.verbosity < verboseLevel) return; // Called but this output is too verbose for our settings - skip
 
-		console[method](
+		(console as any)[method](
 			'%c[TERA-FY CLIENT]',
 			'font-weight: bold; color: #ff5722;',
 			...msg,
@@ -786,7 +794,7 @@ export default class TeraFy {
 	*
 	* @returns {TeraFy} This chainable terafy instance
 	*/
-	set(key, value, options) {
+	set(key: string | object, value?: any, options?: { ignoreNullish?: boolean }) {
 		let settings = {
 			ignoreNullish: true,
 			...options,
@@ -794,12 +802,12 @@ export default class TeraFy {
 
 		if (typeof key == 'string') {
 			if (!settings.ignoreNullish || (value !== null && value !== undefined))
-				this.settings[key] = value;
+				(this.settings as any)[key] = value;
 		} else {
 			Object.assign(this.settings, key);
 		}
 
-		return this.toggleDevMode(this.settings.devMode);
+		return this.toggleDevMode(this.settings.devMode as boolean);
 	}
 
 
@@ -813,7 +821,7 @@ export default class TeraFy {
 	*
 	* @returns {TeraFy} This chainable terafy instance
 	*/
-	setIfDev(key, value, options) {
+	setIfDev(key: any, value: any, options?: any) {
 		if (!this.settings.devMode || value === undefined) return this;
 		return this.set(key, value, options);
 	}
@@ -827,8 +835,8 @@ export default class TeraFy {
 	*
 	* @returns {TeraFy} This chainable terafy instance
 	*/
-	use(source, options) {
-		let mod =
+	use(source: any, options?: any) {
+		let mod: any =
 			typeof source == 'function' ? new source(this, options)
 			: typeof source == 'object' ? source
 			: typeof source == 'string' ? (()=> { throw new Error('use(String) is not yet supported') })()
@@ -847,7 +855,7 @@ export default class TeraFy {
 	* @param {Object} target Initalied class instance to extend
 	* @param {Object} source Initalized source object to extend from
 	*/
-	mixin(target, source) {
+	mixin(target: any, source: any) {
 		// Iterate through the source object upwards extracting each prototype
 		let prototypeStack = [];
 		let node = source;
@@ -863,17 +871,17 @@ export default class TeraFy {
 					&& !prop.startsWith('__') // Ignore double underscore meta properties
 				)
 				.forEach(prop => {
-					if (typeof source[prop] == 'function') { // Inheriting function - glue onto object as non-editable, non-enumerable property
+					if (typeof (source as any)[prop] == 'function') { // Inheriting function - glue onto object as non-editable, non-enumerable property
 						Object.defineProperty(
 							target,
 							prop,
 							{
 								enumerable: false,
-								value: source[prop].bind(target), // Rebind functions
+								value: (source as any)[prop].bind(target), // Rebind functions
 							},
 						);
 					} else { // Everything else, just glue onto the object
-						target[prop] = source[prop];
+						target[prop] = (source as any)[prop];
 					}
 				})
 		)
@@ -891,7 +899,7 @@ export default class TeraFy {
 	*
 	* @returns {TeraFy} This chainable terafy instance
 	*/
-	toggleDevMode(devModeEnabled = 'toggle') {
+	toggleDevMode(devModeEnabled: 'toggle' | 'proxy' | boolean = 'toggle') {
 		if (devModeEnabled === 'toggle') {
 			this.settings.devMode = !this.settings.devMode;
 		} else if (devModeEnabled === 'proxy') {
@@ -908,7 +916,7 @@ export default class TeraFy {
 			this.settings.restrictOrigin = '*'; // Allow all upstream iframes
 
 		if (this.dom?.el) // Have we actually set up yet?
-			this.dom.el.classList.toggle('dev-mode', this.settings.devMode);
+			this.dom.el!.classList.toggle('dev-mode', this.settings.devMode);
 
 		return this;
 	}
@@ -920,7 +928,7 @@ export default class TeraFy {
 	*
 	* @param {String|Boolean} [isFocused='toggle'] Whether to fullscreen the embedded component
 	*/
-	toggleFocus(isFocused = 'toggle') {
+	toggleFocus(isFocused: boolean | 'toggle' = 'toggle') {
 		this.debug('INFO', 2, 'Request focus', {isFocused});
 		globalThis.document.body.classList.toggle('tera-fy-focus', isFocused === 'toggle' ? undefined : isFocused);
 	}
@@ -1187,9 +1195,9 @@ export default class TeraFy {
 	*
 	* @returns {Promise<ProjectFile>} The eventually selected file, if in save mode new files are created as stubs
 	*/
-	selectProjectFile(options) {
+	selectProjectFile(options?: any) {
 		return this.rpc('selectProjectFile', options)
-			.then(file => file
+			.then((file: any) => file
 				? new ProjectFile({
 					tera: this,
 					...file,
@@ -1210,9 +1218,9 @@ export default class TeraFy {
 	*
 	* @returns {Promise<Array<ProjectFile>>} A collection of project files for the given project
 	*/
-	getProjectFiles(options) {
+	getProjectFiles(options?: any) {
 		return this.rpc('getProjectFiles', options)
-			.then(files => files.map(file =>
+			.then((files: any) => files.map((file: any) =>
 				new ProjectFile({
 					tera: this,
 					...file,
@@ -1245,9 +1253,9 @@ export default class TeraFy {
 	*
 	* @returns {Promise<ProjectFile>} The eventual fetched ProjectFile (or requested subkey)
 	*/
-	getProjectFile(id, options) {
+	getProjectFile(id: any, options?: any) {
 		return this.rpc('getProjectFile', id, options)
-			.then(file => file
+			.then((file: any) => file
 				? new ProjectFile({
 					tera: this,
 					...file,
@@ -1265,9 +1273,9 @@ export default class TeraFy {
 	* @param {String} name The name + relative directory path component
 	* @returns {Promise<ProjectFile>} The eventual ProjectFile created
 	*/
-	createProjectFile(name) {
+	createProjectFile(name: any) {
 		return this.rpc('createProjectFile', name)
-			.then(file => file
+			.then((file: any) => file
 				? new ProjectFile({
 					tera: this,
 					...file,
@@ -1498,4 +1506,4 @@ export default class TeraFy {
 	*/
 
 	// }}}
-}
+}

package/lib/{terafy.proxy.js → terafy.proxy.ts}

@@ -2,6 +2,19 @@ import {create as createDomain} from 'node:domain';
 import detectPort from 'detect-port';
 import Proxy from 'http-proxy';
 
+// Define options interface based on JSDoc and settings
+interface TeraProxyOptions {
+    force?: boolean;
+    autoStart?: boolean;
+    host?: string;
+    port?: number;
+    targetProtocol?: string;
+    targetHost?: string;
+    targetPort?: number;
+    portConflict?: 'ignore' | 'throw';
+    onLog?: (level: 'INFO' | 'WARN', ...msg: any[]) => void;
+}
+
 export class TeraProxy {
 	/**
 	* Setup a local loopback proxy for TERA-tools.com
@@ -27,8 +40,8 @@ export class TeraProxy {
 		targetProtocol: 'https',
 		targetHost: 'dev.tera-tools.com',
 		targetPort: 443,
-		portConflict: 'ignore',
-		onLog: (level, ...msg) => console.log(...msg),
+		portConflict: 'ignore' as 'ignore' | 'throw', // Add type assertion for stricter checking if needed elsewhere
+		onLog: (level: 'INFO' | 'WARN', ...msg: any[]) => console.log(...msg),
 	}
 
 
@@ -36,7 +49,7 @@ export class TeraProxy {
 	* Eventual proxy server when the plugin has booted
 	* @type {ProxyServer}
 	*/
-	proxyServer;
+	proxyServer: Proxy | undefined;
 
 
 	/**
@@ -49,7 +62,12 @@ export class TeraProxy {
 
 		return Promise.resolve()
 			.then(()=> detectPort(this.settings.port))
-			.then(gotPort => gotPort != this.settings.port && Promise.reject('PORT-CONFLICT'))
+			.then(gotPort => {
+				if (gotPort != this.settings.port) {
+					return Promise.reject('PORT-CONFLICT');
+				}
+				// Only return void if the port is available
+			})
 			.then(() => this.proxyServer = Proxy.createProxyServer({ // Create proxy pass-thru
 				changeOrigin: true,
 				target: {
@@ -58,20 +76,29 @@ export class TeraProxy {
 					port: this.settings.targetPort,
 				},
 			}))
-			.then(()=> new Promise((resolve, reject) => {
+			.then(()=> new Promise<void>((resolve, reject) => {
 				// Wrap listener in a domain so we can correctly catch EADDRINUSE
 				let domain = createDomain();
-				domain.on('error', err => {
+				domain.on('error', (err: NodeJS.ErrnoException) => { // Add type to err
 					if (err.code == 'EADDRINUSE') {
 						reject('PORT-CONFLICT');
 					} else {
 						reject(err);
 					}
 				});
-				this.proxyServer.listen(this.settings.port, ()=> {
-					this.settings.onLog('INFO', 'Routing TERA traffic from', `http://${this.settings.host}:${this.settings.port}`, '→', `${this.settings.targetProtocol}://${this.settings.targetHost}:${this.settings.targetPort}`);
-					resolve();
-				})
+				// Run the server creation and listening within the domain
+				domain.run(() => {
+					if (!this.proxyServer) return reject(new Error('Proxy server not initialized')); // Guard against undefined proxyServer
+					this.proxyServer.listen(this.settings.port, this.settings.host)
+					// Handle errors on the proxy server itself, although domain should catch listen errors
+					this.proxyServer.on('error', (err: NodeJS.ErrnoException) => {
+						if (err.code == 'EADDRINUSE') {
+							reject('PORT-CONFLICT');
+						} else {
+							reject(err);
+						}
+					});
+				});
 			}))
 			.catch(e => {
 				if (e === 'PORT-CONFLICT') {
@@ -79,7 +106,7 @@ export class TeraProxy {
 						this.settings.onLog('WARN', 'Port', this.settings.port, 'is already allocated - assuming TERA is already running locally and skipping proxy');
 						return false; // Do nothing
 					} else {
-						throw err;
+						throw e; // Throw the 'PORT-CONFLICT' string or a new Error
 					}
 				} else {
 					throw e; // Re-throw everything else
@@ -94,15 +121,15 @@ export class TeraProxy {
 	*/
 	stop() {
 		return Promise.resolve()
-			.then(()=> this.proxyServer && new Promise(resolve => this.proxyServer.close(()=> resolve())))
+			.then(()=> this.proxyServer && new Promise<void>(resolve => this.proxyServer!.close(()=> resolve()))) // Use non-null assertion if sure it exists here
 	}
 
 
-	constructor(options) {
+	constructor(options?: TeraProxyOptions) { // Add type annotation and make optional
 		if (options) Object.assign(this.settings, options);
 
 		// Auto start?
-		if (options?.autoStart ?? true) this.start();
+		if (this.settings.autoStart) this.start(); // Use resolved settings.autoStart
 	}
 }
 
@@ -113,6 +140,6 @@ export class TeraProxy {
 * @param {Object} [options] Options to pass to the Proxy module
 * @returns {TeraProxy} A TeraProxy instance
 */
-export default function(options) {
+export default function(options?: TeraProxyOptions) { // Add type annotation and make optional
 	return new TeraProxy(options);
-}
+}