@companion-module/base 1.99.0-0-nightly-feat-split-api-20251221-153951-fa12995 → 1.99.0-nightly-feat-graphics-overhaul-20251222-140818-911eb31

package/dist/internal/feedback.js

@@ -0,0 +1,307 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FeedbackManager = void 0;
+const tslib_1 = require("tslib");
+const base_js_1 = require("./base.js");
+// eslint-disable-next-line n/no-missing-import
+const index_js_1 = tslib_1.__importDefault(require("../../lib/debounce-fn/index.js"));
+const util_js_1 = require("../util.js");
+function convertFeedbackInstanceToEvent(type, feedback) {
+    return {
+        type: type,
+        id: feedback.id,
+        feedbackId: feedback.feedbackId,
+        controlId: feedback.controlId,
+        options: feedback.options,
+    };
+}
+class FeedbackManager {
+    #parseVariablesInString;
+    #updateFeedbackValues;
+    #setFeedbackDefinitions;
+    #log;
+    #feedbackDefinitions = new Map();
+    #feedbackInstances = new Map();
+    // Feedback values waiting to be sent
+    #pendingFeedbackValues = new Map();
+    // Feedbacks currently being checked
+    #feedbacksBeingChecked = new Map();
+    // while in a context which provides an alternate parseVariablesInString, we should log when the original is called
+    #parseVariablesContext;
+    get parseVariablesContext() {
+        return this.#parseVariablesContext;
+    }
+    constructor(parseVariablesInString, updateFeedbackValues, setFeedbackDefinitions, log) {
+        this.#parseVariablesInString = parseVariablesInString;
+        this.#updateFeedbackValues = updateFeedbackValues;
+        this.#setFeedbackDefinitions = setFeedbackDefinitions;
+        this.#log = log;
+    }
+    getDefinitionIds() {
+        return Array.from(this.#feedbackDefinitions.keys());
+    }
+    getInstanceIds() {
+        return Array.from(this.#feedbackInstances.keys());
+    }
+    handleUpdateFeedbacks(feedbacks) {
+        for (const [id, feedback] of Object.entries(feedbacks)) {
+            const existing = this.#feedbackInstances.get(id);
+            if (existing && !feedback) {
+                // Call unsubscribe
+                const definition = this.#feedbackDefinitions.get(existing.feedbackId);
+                if (definition?.unsubscribe) {
+                    const context = {
+                        parseVariablesInString: async (text) => {
+                            // No-op, any values parsed here will not be stable
+                            return text;
+                        },
+                    };
+                    Promise.resolve(definition.unsubscribe(convertFeedbackInstanceToEvent(definition.type, existing), context)).catch((e) => {
+                        this.#log('error', `Feedback unsubscribe failed: ${JSON.stringify(existing)} - ${e?.message ?? e} ${e?.stack}`);
+                    });
+                }
+            }
+            if (!feedback || feedback.disabled) {
+                // Deleted
+                this.#feedbackInstances.delete(id);
+            }
+            else {
+                // TODO module-lib - deep freeze the feedback to avoid mutation?
+                this.#feedbackInstances.set(id, { ...feedback });
+                // Inserted
+                if (!existing) {
+                    const definition = this.#feedbackDefinitions.get(feedback.feedbackId);
+                    if (definition?.subscribe) {
+                        const context = {
+                            parseVariablesInString: async (text) => {
+                                // No-op, any values parsed here will not be stable
+                                return text;
+                            },
+                        };
+                        Promise.resolve(definition.subscribe(convertFeedbackInstanceToEvent(definition.type, feedback), context)).catch((e) => {
+                            this.#log('error', `Feedback subscribe failed: ${JSON.stringify(feedback)} - ${e?.message ?? e} ${e?.stack}`);
+                        });
+                    }
+                }
+                // update the feedback value
+                this.#triggerCheckFeedback(id);
+            }
+        }
+    }
+    async handleLearnFeedback(msg) {
+        const definition = this.#feedbackDefinitions.get(msg.feedback.feedbackId);
+        if (definition && definition.learn) {
+            const context = {
+                parseVariablesInString: async (text) => {
+                    const res = await this.#parseVariablesInString({
+                        text: text,
+                        controlId: msg.feedback.controlId,
+                        actionInstanceId: undefined,
+                        feedbackInstanceId: msg.feedback.id,
+                    });
+                    return res.text;
+                },
+            };
+            const newOptions = await definition.learn({
+                id: msg.feedback.id,
+                feedbackId: msg.feedback.feedbackId,
+                controlId: msg.feedback.controlId,
+                options: msg.feedback.options,
+                type: definition.type,
+            }, context);
+            return {
+                options: newOptions,
+            };
+        }
+        else {
+            // Not supported
+            return {
+                options: undefined,
+            };
+        }
+    }
+    #triggerCheckFeedback(id) {
+        const existingRecheck = this.#feedbacksBeingChecked.get(id);
+        if (existingRecheck) {
+            // Already being checked
+            existingRecheck.needsRecheck = true;
+            return;
+        }
+        const feedback0 = this.#feedbackInstances.get(id);
+        if (!feedback0)
+            return;
+        const feedback = feedback0;
+        const feedbackCheckStatus = {
+            needsRecheck: false,
+        };
+        // mark it as being checked
+        this.#feedbacksBeingChecked.set(id, feedbackCheckStatus);
+        Promise.resolve()
+            .then(async () => {
+            const definition = this.#feedbackDefinitions.get(feedback.feedbackId);
+            let value;
+            // Calculate the new value for the feedback
+            if (definition) {
+                // Set this while the promise starts executing
+                this.#parseVariablesContext = `Feedback ${feedback.feedbackId} (${id})`;
+                const context = {
+                    parseVariablesInString: async (text) => {
+                        const res = await this.#parseVariablesInString({
+                            text: text,
+                            controlId: feedback.controlId,
+                            actionInstanceId: undefined,
+                            feedbackInstanceId: id,
+                        });
+                        return res.text;
+                    },
+                };
+                switch (definition.type) {
+                    case 'boolean':
+                        value = definition.callback({
+                            ...convertFeedbackInstanceToEvent('boolean', feedback),
+                            type: 'boolean',
+                        }, context);
+                        break;
+                    case 'value':
+                        value = definition.callback({
+                            ...convertFeedbackInstanceToEvent('value', feedback),
+                            type: 'value',
+                        }, context);
+                        break;
+                    case 'advanced':
+                        value = definition.callback({
+                            ...convertFeedbackInstanceToEvent('advanced', feedback),
+                            type: 'advanced',
+                            image: feedback.image,
+                        }, context);
+                        break;
+                    default:
+                        (0, util_js_1.assertNever)(definition);
+                        break;
+                }
+                this.#parseVariablesContext = undefined;
+            }
+            // Await the value before looking at this.#pendingFeedbackValues, to avoid race conditions
+            const resolvedValue = await value;
+            this.#pendingFeedbackValues.set(id, {
+                id: id,
+                controlId: feedback.controlId,
+                value: resolvedValue,
+            });
+            this.#sendFeedbackValues();
+        })
+            .catch((e) => {
+            console.error(`Feedback check failed: ${JSON.stringify(feedback)} - ${e?.message ?? e} ${e?.stack}`);
+        })
+            .finally(() => {
+            // ensure this.#parseVariablesContext is cleared
+            this.#parseVariablesContext = undefined;
+            // it is no longer being checked
+            this.#feedbacksBeingChecked.delete(id);
+            // If queued, trigger a check
+            if (feedbackCheckStatus.needsRecheck) {
+                setImmediate(() => {
+                    this.#triggerCheckFeedback(id);
+                });
+            }
+        });
+    }
+    /**
+     * Send pending feedback values (from this.#pendingFeedbackValues) to companion, with a debounce
+     */
+    #sendFeedbackValues = (0, index_js_1.default)(() => {
+        const newValues = this.#pendingFeedbackValues;
+        this.#pendingFeedbackValues = new Map();
+        // Send the new values back
+        if (newValues.size > 0) {
+            this.#updateFeedbackValues({
+                values: Array.from(newValues.values()),
+            });
+        }
+    }, {
+        wait: 5,
+        maxWait: 25,
+    });
+    setFeedbackDefinitions(feedbacks) {
+        const hostFeedbacks = [];
+        this.#feedbackDefinitions.clear();
+        for (const [feedbackId, feedback] of Object.entries(feedbacks)) {
+            if (feedback) {
+                hostFeedbacks.push({
+                    id: feedbackId,
+                    name: feedback.name,
+                    description: feedback.description,
+                    options: (0, base_js_1.serializeIsVisibleFn)(feedback.options),
+                    type: feedback.type,
+                    defaultStyle: feedback.type === 'boolean' ? feedback.defaultStyle : undefined,
+                    hasLearn: !!feedback.learn,
+                    learnTimeout: feedback.learnTimeout,
+                    showInvert: feedback.type === 'boolean' ? feedback.showInvert : false,
+                });
+                // Remember the definition locally
+                this.#feedbackDefinitions.set(feedbackId, feedback);
+            }
+        }
+        this.#setFeedbackDefinitions({ feedbacks: hostFeedbacks });
+    }
+    checkFeedbacks(feedbackTypes) {
+        const types = new Set(feedbackTypes);
+        for (const [id, feedback] of this.#feedbackInstances.entries()) {
+            const definition = this.#feedbackDefinitions.get(feedback.feedbackId);
+            if (definition) {
+                if (types.size === 0 || types.has(feedback.feedbackId)) {
+                    // update the feedback value
+                    this.#triggerCheckFeedback(id);
+                }
+            }
+        }
+    }
+    checkFeedbacksById(feedbackIds) {
+        for (const id of feedbackIds) {
+            // update the feedback value
+            this.#triggerCheckFeedback(id);
+        }
+    }
+    subscribeFeedbacks(feedbackIds) {
+        let feedbacks = Array.from(this.#feedbackInstances.values());
+        const feedbackIdSet = new Set(feedbackIds);
+        if (feedbackIdSet.size)
+            feedbacks = feedbacks.filter((fb) => feedbackIdSet.has(fb.feedbackId));
+        for (const fb of feedbacks) {
+            const def = this.#feedbackDefinitions.get(fb.feedbackId);
+            if (def?.subscribe) {
+                const context = {
+                    parseVariablesInString: async (text) => {
+                        // No-op, any values parsed here will not be stable
+                        return text;
+                    },
+                };
+                Promise.resolve(def.subscribe(convertFeedbackInstanceToEvent(def.type, fb), context)).catch((e) => {
+                    this.#log('error', `Feedback subscribe failed: ${JSON.stringify(fb)} - ${e?.message ?? e} ${e?.stack}`);
+                });
+            }
+        }
+    }
+    unsubscribeFeedbacks(feedbackIds) {
+        let feedbacks = Array.from(this.#feedbackInstances.values());
+        const feedbackIdSet = new Set(feedbackIds);
+        if (feedbackIdSet.size)
+            feedbacks = feedbacks.filter((fb) => feedbackIdSet.has(fb.feedbackId));
+        for (const fb of feedbacks) {
+            const def = this.#feedbackDefinitions.get(fb.feedbackId);
+            if (def && def.unsubscribe) {
+                const context = {
+                    parseVariablesInString: async (text) => {
+                        // No-op, any values parsed here will not be stable
+                        return text;
+                    },
+                };
+                Promise.resolve(def.unsubscribe(convertFeedbackInstanceToEvent(def.type, fb), context)).catch((e) => {
+                    this.#log('error', `Feedback unsubscribe failed: ${JSON.stringify(fb)} - ${e?.message ?? e} ${e?.stack}`);
+                });
+            }
+        }
+    }
+}
+exports.FeedbackManager = FeedbackManager;
+//# sourceMappingURL=feedback.js.map

package/dist/internal/feedback.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"feedback.js","sourceRoot":"","sources":["../../src/internal/feedback.ts"],"names":[],"mappings":"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"}

package/dist/internal/upgrade.d.ts

@@ -0,0 +1,15 @@
+import type { CompanionStaticUpgradeScript } from '../module-api/upgrade.js';
+import type { UpgradeActionInstance, UpgradeFeedbackInstance, UpgradeActionAndFeedbackInstancesResponse } from '../host-api/api.js';
+/**
+ * Run through the upgrade scripts for the given data
+ * Note: this updates the inputs in place, but the result needs to be sent back to companion
+ * @param allActions Actions that may need upgrading
+ * @param allFeedbacks Feedbacks that may need upgrading
+ * @param defaultUpgradeIndex The lastUpgradeIndex of the connection, if known
+ * @param upgradeScripts The scripts that may be run
+ * @param config The current config of the module
+ * @param skipConfigAndSecretsUpgrade Whether to skip upgrading the config and secrets
+ * @returns The upgraded data that needs persisting
+ */
+export declare function runThroughUpgradeScripts(allActionsArray: UpgradeActionInstance[], allFeedbacksArray: UpgradeFeedbackInstance[], defaultUpgradeIndex: number | null, upgradeScripts: CompanionStaticUpgradeScript<any, any>[], config: unknown, secrets: unknown, skipConfigAndSecretsUpgrade: boolean): UpgradeActionAndFeedbackInstancesResponse;
+//# sourceMappingURL=upgrade.d.ts.map

package/dist/internal/upgrade.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"upgrade.d.ts","sourceRoot":"","sources":["../../src/internal/upgrade.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGX,4BAA4B,EAC5B,MAAM,0BAA0B,CAAA;AACjC,OAAO,KAAK,EACX,qBAAqB,EACrB,uBAAuB,EACvB,yCAAyC,EACzC,MAAM,oBAAoB,CAAA;AAO3B;;;;;;;;;;GAUG;AACH,wBAAgB,wBAAwB,CACvC,eAAe,EAAE,qBAAqB,EAAE,EACxC,iBAAiB,EAAE,uBAAuB,EAAE,EAC5C,mBAAmB,EAAE,MAAM,GAAG,IAAI,EAClC,cAAc,EAAE,4BAA4B,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EACxD,MAAM,EAAE,OAAO,EACf,OAAO,EAAE,OAAO,EAChB,2BAA2B,EAAE,OAAO,GAClC,yCAAyC,CAgL3C"}

package/dist/internal/upgrade.js

@@ -0,0 +1,174 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runThroughUpgradeScripts = runThroughUpgradeScripts;
+const util_js_1 = require("../util.js");
+function clone(val) {
+    return JSON.parse(JSON.stringify(val));
+}
+/**
+ * Run through the upgrade scripts for the given data
+ * Note: this updates the inputs in place, but the result needs to be sent back to companion
+ * @param allActions Actions that may need upgrading
+ * @param allFeedbacks Feedbacks that may need upgrading
+ * @param defaultUpgradeIndex The lastUpgradeIndex of the connection, if known
+ * @param upgradeScripts The scripts that may be run
+ * @param config The current config of the module
+ * @param skipConfigAndSecretsUpgrade Whether to skip upgrading the config and secrets
+ * @returns The upgraded data that needs persisting
+ */
+function runThroughUpgradeScripts(allActionsArray, allFeedbacksArray, defaultUpgradeIndex, upgradeScripts, config, secrets, skipConfigAndSecretsUpgrade) {
+    // First we group all the actions and feedbacks by the version they currently are.
+    const pendingUpgradesGrouped = new Map();
+    const getPendingUpgradeGroup = (i) => {
+        let v = pendingUpgradesGrouped.get(i);
+        if (!v) {
+            v = { actions: [], feedbacks: [], config: false };
+            pendingUpgradesGrouped.set(i, v);
+        }
+        return v;
+    };
+    for (const action of allActionsArray) {
+        const upgradeIndex = action?.upgradeIndex ?? defaultUpgradeIndex;
+        if (action && typeof upgradeIndex === 'number') {
+            const pending = getPendingUpgradeGroup(upgradeIndex);
+            pending.actions.push(action.id);
+        }
+    }
+    for (const feedback of allFeedbacksArray) {
+        const upgradeIndex = feedback?.upgradeIndex ?? defaultUpgradeIndex;
+        if (feedback && typeof upgradeIndex === 'number') {
+            const pending = getPendingUpgradeGroup(upgradeIndex);
+            pending.feedbacks.push(feedback.id);
+        }
+    }
+    if (!skipConfigAndSecretsUpgrade) {
+        // If there is config we still need to upgrade that
+        for (let i = defaultUpgradeIndex ?? -1; i < upgradeScripts.length; i++) {
+            // ensure the group is registered
+            getPendingUpgradeGroup(i).config = true;
+        }
+    }
+    const allActions = Object.fromEntries(allActionsArray.map((a) => [a.id, a]));
+    const allFeedbacks = Object.fromEntries(allFeedbacksArray.map((a) => [a.id, a]));
+    const updatedFeedbacks = {};
+    const updatedActions = {};
+    let updatedConfig;
+    let updatedSecrets;
+    if (pendingUpgradesGrouped.size > 0) {
+        // Figure out which script to run first. Note: we track the last index we ran, so it is offset by one
+        const pendingUpgradeGroups = Array.from(pendingUpgradesGrouped.keys()).sort();
+        const firstUpgradeGroup = Math.min(...pendingUpgradeGroups, defaultUpgradeIndex ?? -1) + 1;
+        // Start building arrays of the ids which we are upgrading as we go
+        const actionsIdsToUpgrade = [];
+        const feedbackIdsToUpgrade = [];
+        // Perform the upgrades. We start on the first batch/instance, and work our way up to the last
+        const targetCount = upgradeScripts.length;
+        for (let i = firstUpgradeGroup; i < targetCount; i++) {
+            const group = pendingUpgradesGrouped.get(i - 1);
+            if (group) {
+                // Update the list of objects that need upgrading
+                actionsIdsToUpgrade.push(...group.actions);
+                feedbackIdsToUpgrade.push(...group.feedbacks);
+            }
+            // Only upgrade the config, if we are past the last version we had for it
+            const upgradeConfigAndSecrets = !!group?.config;
+            // Ensure there is something to upgrade
+            if (!upgradeConfigAndSecrets && actionsIdsToUpgrade.length === 0 && feedbackIdsToUpgrade.length === 0)
+                continue;
+            const inputConfig = updatedConfig ?? config;
+            const inputSecrets = updatedSecrets ?? secrets;
+            // We have an upgrade script that can be run
+            const fcn = upgradeScripts[i];
+            const res = fcn({
+                // Pass a clone to avoid mutations
+                currentConfig: clone(inputConfig),
+            }, {
+                config: upgradeConfigAndSecrets ? inputConfig : null,
+                secrets: upgradeConfigAndSecrets ? inputSecrets : null,
+                // Only pass the actions & feedbacks which need upgrading from this version
+                actions: actionsIdsToUpgrade
+                    .map((id) => {
+                    const inst = allActions[id];
+                    if (inst) {
+                        return (0, util_js_1.literal)({
+                            id: inst.id,
+                            controlId: inst.controlId,
+                            actionId: inst.actionId,
+                            options: inst.options !== undefined ? clone(inst.options) : {},
+                        });
+                    }
+                })
+                    .filter((v) => !!v),
+                feedbacks: feedbackIdsToUpgrade
+                    .map((id) => {
+                    const inst = allFeedbacks[id];
+                    if (inst) {
+                        return (0, util_js_1.literal)({
+                            id: inst.id,
+                            controlId: inst.controlId,
+                            feedbackId: inst.feedbackId,
+                            options: inst.options !== undefined ? clone(inst.options) : {},
+                            // TODO - style?
+                            isInverted: inst.isInverted,
+                        });
+                    }
+                })
+                    .filter((v) => !!v),
+            });
+            // Apply changes
+            if (upgradeConfigAndSecrets && res.updatedConfig)
+                updatedConfig = res.updatedConfig;
+            if (upgradeConfigAndSecrets && res.updatedSecrets)
+                updatedSecrets = res.updatedSecrets;
+            for (const action of res.updatedActions) {
+                if (action) {
+                    const instance = allActions[action.id];
+                    if (instance) {
+                        instance.actionId = action.actionId;
+                        instance.options = action.options;
+                        instance.upgradeIndex = i;
+                        // Mark it as changed
+                        updatedActions[action.id] = instance;
+                    }
+                }
+            }
+            for (const feedback of res.updatedFeedbacks) {
+                if (feedback) {
+                    const instance = allFeedbacks[feedback.id];
+                    if (instance) {
+                        instance.feedbackId = feedback.feedbackId;
+                        instance.options = feedback.options;
+                        instance.upgradeIndex = i;
+                        // Mark it as changed
+                        updatedFeedbacks[feedback.id] = {
+                            ...instance,
+                            style: updatedFeedbacks[feedback.id]?.style ?? feedback.style,
+                            isInverted: feedback.isInverted ?? false,
+                        };
+                    }
+                }
+            }
+        }
+        // Make sure that everything with a upgradeIndex set is sent back
+        for (const [id, action] of Object.entries(allActions)) {
+            if (!updatedActions[id] && typeof action?.upgradeIndex === 'number') {
+                // Send it back to acknowledge that it has been 'upgraded'
+                updatedActions[id] = action;
+            }
+        }
+        for (const [id, feedback] of Object.entries(allFeedbacks)) {
+            if (!updatedFeedbacks[id] && typeof feedback?.upgradeIndex === 'number') {
+                // Send it back to acknowledge that it has been 'upgraded'
+                updatedFeedbacks[id] = feedback;
+            }
+        }
+    }
+    return {
+        updatedActions: Object.values(updatedActions),
+        updatedFeedbacks: Object.values(updatedFeedbacks),
+        updatedConfig,
+        updatedSecrets,
+        latestUpgradeIndex: upgradeScripts.length - 1,
+    };
+}
+//# sourceMappingURL=upgrade.js.map

package/dist/internal/upgrade.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"upgrade.js","sourceRoot":"","sources":["../../src/internal/upgrade.ts"],"names":[],"mappings":"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"}

package/dist/manifest.d.ts

@@ -2,3 +2,4 @@ import type { ModuleManifest, ModuleManifestMaintainer, ModuleManifestRuntime, M
 export { ModuleManifest, ModuleManifestMaintainer, ModuleManifestRuntime, ModuleBonjourQuery };
 /** Validate that a manifest looks correctly populated */
 export declare function validateManifest(manifest: ModuleManifest, looseChecks: boolean): void;
+//# sourceMappingURL=manifest.d.ts.map

package/dist/manifest.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"manifest.d.ts","sourceRoot":"","sources":["../src/manifest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACX,cAAc,EACd,wBAAwB,EACxB,qBAAqB,EACrB,kBAAkB,EAClB,MAAM,4BAA4B,CAAA;AAKnC,OAAO,EAAE,cAAc,EAAE,wBAAwB,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,CAAA;AAE9F,yDAAyD;AACzD,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,cAAc,EAAE,WAAW,EAAE,OAAO,GAAG,IAAI,CAmCrF"}

package/dist/module-api/action.d.ts

@@ -97,3 +97,4 @@ export interface CompanionRecordedAction {
      */
     delay?: number;
 }
+//# sourceMappingURL=action.d.ts.map

package/dist/module-api/action.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"action.d.ts","sourceRoot":"","sources":["../../src/module-api/action.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,aAAa,CAAA;AACjE,OAAO,KAAK,EACX,qBAAqB,EACrB,2BAA2B,EAC3B,wBAAwB,EACxB,2BAA2B,EAC3B,gCAAgC,EAChC,yBAAyB,EACzB,6BAA6B,EAC7B,4BAA4B,EAC5B,iCAAiC,EACjC,MAAM,YAAY,CAAA;AACnB,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAA;AAE3D,MAAM,MAAM,6BAA6B,GACtC,6BAA6B,GAC7B,wBAAwB,GACxB,4BAA4B,GAC5B,2BAA2B,GAC3B,gCAAgC,GAChC,yBAAyB,GACzB,2BAA2B,GAC3B,iCAAiC,CAAA;AAEpC;;GAEG;AACH,MAAM,WAAW,sBAAuB,SAAQ,8BAA8B;IAC7E;;;;;;OAMG;IACH,sBAAsB,CAAC,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,sBAAsB,GAAG,IAAI,CAAA;CACjF;AAED;;GAEG;AACH,MAAM,WAAW,yBAAyB;IACzC,uCAAuC;IACvC,IAAI,EAAE,MAAM,CAAA;IACZ,2CAA2C;IAC3C,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,sCAAsC;IACtC,OAAO,EAAE,6BAA6B,EAAE,CAAA;IAExC;;;OAGG;IACH,2BAA2B,CAAC,EAAE,MAAM,EAAE,CAAA;IAEtC;;OAEG;IACH,8BAA8B,CAAC,EAAE,OAAO,CAAA;IAExC,mCAAmC;IACnC,QAAQ,EAAE,CAAC,MAAM,EAAE,oBAAoB,EAAE,OAAO,EAAE,sBAAsB,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAA;IACjG;;;OAGG;IACH,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,mBAAmB,EAAE,OAAO,EAAE,sBAAsB,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAA;IAClG;;;OAGG;IACH,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,mBAAmB,EAAE,OAAO,EAAE,sBAAsB,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAA;IAEpG;;OAEG;IACH,KAAK,CAAC,EAAE,CACP,MAAM,EAAE,oBAAoB,EAC5B,OAAO,EAAE,sBAAsB,KAC3B,qBAAqB,GAAG,SAAS,GAAG,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAAA;IAEnF;;;;OAIG;IACH,YAAY,CAAC,EAAE,MAAM,CAAA;CACrB;AAED;;GAEG;AACH,MAAM,WAAW,0BAA0B;IAC1C,CAAC,QAAQ,EAAE,MAAM,GAAG,yBAAyB,GAAG,SAAS,CAAA;CACzD;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB;IACnC,oCAAoC;IACpC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;IACnB,oDAAoD;IACpD,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IAC1B,sCAAsC;IACtC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,+CAA+C;IAC/C,QAAQ,CAAC,OAAO,EAAE,qBAAqB,CAAA;CACvC;AAED;;GAEG;AACH,MAAM,WAAW,oBAAqB,SAAQ,mBAAmB;IAChE,4DAA4D;IAC5D,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAA;CACtC;AAED;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACvC,sCAAsC;IACtC,QAAQ,EAAE,MAAM,CAAA;IAChB,+CAA+C;IAC/C,OAAO,EAAE,qBAAqB,CAAA;IAE9B;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAA;CACd"}

package/dist/module-api/base.d.ts

@@ -1,14 +1,14 @@
 import type { CompanionActionDefinitions, CompanionRecordedAction } from './action.js';
 import type { CompanionFeedbackDefinitions } from './feedback.js';
 import type { CompanionPresetDefinitions } from './preset.js';
-import type { InstanceStatus } from './enums.js';
-import { type LogLevel } from '../logging.js';
+import type { InstanceStatus, LogLevel } from './enums.js';
 import type { InstanceBaseShared } from '../instance-base.js';
 import type { CompanionVariableDefinition, CompanionVariableValue, CompanionVariableValues } from './variable.js';
 import type { OSCSomeArguments } from '../common/osc.js';
 import type { SomeCompanionConfigField } from './config.js';
 import type { CompanionHTTPRequest, CompanionHTTPResponse } from './http.js';
 import { SharedUdpSocket, SharedUdpSocketMessageCallback, SharedUdpSocketOptions } from './shared-udp-socket.js';
+import { CompanionGraphicsCompositeElementDefinition } from './graphics-composite.js';
 export interface InstanceBaseOptions {
     /**
      * Disable enforcement of variables requiring a definition.
@@ -27,7 +27,7 @@ export interface InstanceBaseOptions {
 }
 export declare abstract class InstanceBase<TConfig, TSecrets = undefined> implements InstanceBaseShared<TConfig, TSecrets> {
     #private;
-    get id(): string;
+    readonly id: string;
     get instanceOptions(): InstanceBaseOptions;
     /**
      * The user chosen name for this instance.
@@ -38,6 +38,20 @@ export declare abstract class InstanceBase<TConfig, TSecrets = undefined> implem
      * Create an instance of the module
      */
     constructor(internal: unknown);
+    private _handleInit;
+    private _handleDestroy;
+    private _handleConfigUpdateAndLabel;
+    private _handleExecuteAction;
+    private _handleUpdateFeedbacks;
+    private _handleUpdateActions;
+    private _handleUpgradeActionsAndFeedbacks;
+    private _handleGetConfigFields;
+    private _handleHttpRequest;
+    private _handleLearnAction;
+    private _handleLearnFeedback;
+    private _handleStartStopRecordActions;
+    private _handleSharedUdpSocketMessage;
+    private _handleSharedUdpSocketError;
     /**
      * Main initialization function called
      * once the module is OK to start doing things.
@@ -89,6 +103,11 @@ export declare abstract class InstanceBase<TConfig, TSecrets = undefined> implem
      * @param presets The preset definitions
      */
     setPresetDefinitions(presets: CompanionPresetDefinitions): void;
+    /**
+     * Set the composite graphics elements for this instance
+     * @param compositeElements The composite element definitions
+     */
+    setCompositeElementDefinitions(compositeElements: CompanionGraphicsCompositeElementDefinition[]): void;
     /**
      * Set the variable definitions for this instance
      * @param variables The variable definitions
@@ -192,3 +211,4 @@ export declare abstract class InstanceBase<TConfig, TSecrets = undefined> implem
     createSharedUdpSocket(type: 'udp4' | 'udp6', callback?: SharedUdpSocketMessageCallback): SharedUdpSocket;
     createSharedUdpSocket(options: SharedUdpSocketOptions, callback?: SharedUdpSocketMessageCallback): SharedUdpSocket;
 }
+//# sourceMappingURL=base.d.ts.map

package/dist/module-api/base.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../src/module-api/base.ts"],"names":[],"mappings":"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"}