Merge branch 'beta' into develop

lib/Controls/Controller.js

@@ -11,6 +11,7 @@ import ActionRecorder from './ActionRecorder.js'
 import ControlTrigger from './ControlTypes/Triggers/Trigger.js'
 import { nanoid } from 'nanoid'
 import TriggerEvents from './TriggerEvents.js'
+import debounceFn from 'debounce-fn'
 
 export const TriggersListRoom = 'triggers:list'
 
@@ -87,13 +88,21 @@ class ControlsController extends CoreBase {
 	 * Check the instance-status of every control
 	 * @access public
 	 */
-	checkAllStatus() {
-		for (const control of this.#controls.values()) {
-			if (typeof control.checkButtonStatus === 'function') {
-				control.checkButtonStatus()
+	checkAllStatus = debounceFn(
+		() => {
+			for (const control of this.#controls.values()) {
+				if (typeof control.checkButtonStatus === 'function') {
+					control.checkButtonStatus()
+				}
 			}
+		},
+		{
+			before: false,
+			after: true,
+			wait: 100,
+			maxWait: 500,
 		}
-	}
+	)
 
 	/**
 	 * Remove any tracked state for an instance

lib/Instance/Host.js

@@ -43,7 +43,7 @@ class ModuleHost {
 		this.instanceStatus = instanceStatus
 
 		const cpuCount = os.cpus().length // An approximation
-		this.startQueue = new PQueue({ concurrency: cpuCount })
+		this.startQueue = new PQueue({ concurrency: Math.max(cpuCount - 1, 1) })
 
 		this.children = new Map()
 	}
@@ -52,11 +52,14 @@ class ModuleHost {
 	 * Bind events/initialise a connected child process
 	 * @param {?} child
 	 */
-	#listenToModuleSocket(child) {
+	#listenToModuleSocket(child, startupCompleted, startupFailed) {
 		const forceRestart = () => {
 			// Force restart the connection, as it failed to initialise and will be broken
 			child.restartCount++
 
+			// Report the failure
+			startupFailed(new Error('Restart forced'))
+
 			const sleepDuration = sleepStrategy(child.restartCount)
 			if (!child.crashed) {
 				child.crashed = setTimeout(() => {
@@ -148,6 +151,8 @@ class ModuleHost {
 					.then(() => {
 						child.restartCount = 0
 
+						startupCompleted()
+
 						// mark child as ready to receive
 						child.isReady = true
 
@@ -448,11 +453,18 @@ class ModuleHost {
 
 						child.monitor = monitor
 
-						this.#listenToModuleSocket(child)
+						const initialisedPromise = new Promise((resolve, reject) => {
+							this.#listenToModuleSocket(child, resolve, reject)
+						})
 
 						// Start the child
 						child.monitor.start()
 
+						// Wait for init to complete, or fail
+						await initialisedPromise
+						// Sleep for a tick
+						await new Promise((resolve) => setImmediate(resolve))
+
 						// TODO module-lib - timeout for first contact
 					} else {
 						this.logger.debug(`Attempting to start missing connection: "${connectionId}"`)

lib/Instance/Wrapper.js

@@ -68,17 +68,22 @@ class SocketEventsHandler {
 		const allFeedbacks = this.#getAllFeedbackInstances()
 		const allActions = this.#getAllActionInstances()
 
-		const msg = await this.ipcWrapper.sendWithCb('init', {
-			label: config.label,
-			isFirstInit: config.isFirstInit,
-			config: config.config,
+		const msg = await this.ipcWrapper.sendWithCb(
+			'init',
+			{
+				label: config.label,
+				isFirstInit: config.isFirstInit,
+				config: config.config,
 
-			lastUpgradeIndex: config.lastUpgradeIndex,
+				lastUpgradeIndex: config.lastUpgradeIndex,
 
-			// Pass all actions and feedbacks for upgrading and initial subscribe calls
-			actions: allActions,
-			feedbacks: allFeedbacks,
-		})
+				// Pass all actions and feedbacks for upgrading and initial subscribe calls
+				actions: allActions,
+				feedbacks: allFeedbacks,
+			},
+			undefined,
+			10000 // Allow more time before timeout, as init is likely to have a lot to do or high cpu contention
+		)
 
 		// Save the resulting values
 		this.hasHttpHandler = !!msg.hasHttpHandler