@companion-module/host 1.0.3 → 1.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (48) hide show
  1. package/CHANGELOG.md +29 -0
  2. package/dist/context.d.ts +10 -2
  3. package/dist/context.d.ts.map +1 -1
  4. package/dist/instance.d.ts +32 -7
  5. package/dist/instance.d.ts.map +1 -1
  6. package/dist/instance.js +53 -12
  7. package/dist/instance.js.map +1 -1
  8. package/dist/internal/actions.d.ts +5 -4
  9. package/dist/internal/actions.d.ts.map +1 -1
  10. package/dist/internal/actions.js +72 -20
  11. package/dist/internal/actions.js.map +1 -1
  12. package/dist/internal/composite-elements.d.ts +3 -0
  13. package/dist/internal/composite-elements.d.ts.map +1 -0
  14. package/dist/internal/composite-elements.js +44 -0
  15. package/dist/internal/composite-elements.js.map +1 -0
  16. package/dist/internal/feedback.d.ts +4 -3
  17. package/dist/internal/feedback.d.ts.map +1 -1
  18. package/dist/internal/feedback.js +102 -19
  19. package/dist/internal/feedback.js.map +1 -1
  20. package/dist/internal/presets.d.ts +4 -1
  21. package/dist/internal/presets.d.ts.map +1 -1
  22. package/dist/internal/presets.js +344 -57
  23. package/dist/internal/presets.js.map +1 -1
  24. package/dist/internal/upgrade.d.ts +1 -1
  25. package/dist/internal/upgrade.d.ts.map +1 -1
  26. package/dist/internal/upgrade.js +4 -1
  27. package/dist/internal/upgrade.js.map +1 -1
  28. package/dist/internal/util.d.ts +13 -1
  29. package/dist/internal/util.d.ts.map +1 -1
  30. package/dist/internal/util.js +24 -0
  31. package/dist/internal/util.js.map +1 -1
  32. package/dist/main.d.ts +1 -0
  33. package/dist/main.d.ts.map +1 -1
  34. package/dist/main.js +1 -0
  35. package/dist/main.js.map +1 -1
  36. package/dist/schema/common.d.ts +11 -0
  37. package/dist/schema/common.d.ts.map +1 -0
  38. package/dist/schema/common.js +13 -0
  39. package/dist/schema/common.js.map +1 -0
  40. package/dist/schema/elements.d.ts +4 -0
  41. package/dist/schema/elements.d.ts.map +1 -0
  42. package/dist/schema/elements.js +170 -0
  43. package/dist/schema/elements.js.map +1 -0
  44. package/dist/schema/options.d.ts +116 -0
  45. package/dist/schema/options.d.ts.map +1 -0
  46. package/dist/schema/options.js +92 -0
  47. package/dist/schema/options.js.map +1 -0
  48. package/package.json +6 -4
package/CHANGELOG.md CHANGED
@@ -1,5 +1,34 @@
1
1
  # Changelog
2
2
 
3
+ ## [1.1.1](https://github.com/bitfocus/companion-module-base/compare/companion-module-host-v1.1.0...companion-module-host-v1.1.1) (2026-06-27)
4
+
5
+
6
+ ### Bug Fixes
7
+
8
+ * allow upgrade scripts to convert setCustomVariable usages to new result flow ([d26c7c0](https://github.com/bitfocus/companion-module-base/commit/d26c7c090715e1df23d88b34a0412687bde789b8))
9
+
10
+ ## [1.1.0](https://github.com/bitfocus/companion-module-base/compare/companion-module-host-v1.0.3...companion-module-host-v1.1.0) (2026-06-26)
11
+
12
+
13
+ ### Features
14
+
15
+ * Allow action callbacks to return a result value ([#217](https://github.com/bitfocus/companion-module-base/issues/217)) ([95c00ff](https://github.com/bitfocus/companion-module-base/commit/95c00ffc362c9bc405eef653e210ff35b8a0f7c3))
16
+ * allow internal actions and feedbacks in presets ([#232](https://github.com/bitfocus/companion-module-base/issues/232)) ([a5e55f1](https://github.com/bitfocus/companion-module-base/commit/a5e55f121c1fb9658c0ed9bfad33b1a9f38101f9))
17
+ * encourage modules to declare the properties produced by advanced feedbacks ([#229](https://github.com/bitfocus/companion-module-base/issues/229)) ([9ffd88e](https://github.com/bitfocus/companion-module-base/commit/9ffd88e5cc2b9f4c522e75079c59c962ed57efff))
18
+ * filter out options/config with duplicate ids and produce warnings ([2fd11f6](https://github.com/bitfocus/companion-module-base/commit/2fd11f6b86f39388a0e648e51827d9c4296bf68e))
19
+ * graphics overhaul ([#171](https://github.com/bitfocus/companion-module-base/issues/171)) ([1341cbe](https://github.com/bitfocus/companion-module-base/commit/1341cbe3c78862f7c3ae3157edff5399dc3354ef))
20
+ * make learn callbacks abortable ([#222](https://github.com/bitfocus/companion-module-base/issues/222)) ([6950513](https://github.com/bitfocus/companion-module-base/commit/6950513d60472ac886636a523cd9f7ce14a5a4db))
21
+ * pass abort signal to action execution ([37741b4](https://github.com/bitfocus/companion-module-base/commit/37741b45d573219b63af88e25f8d9b133e957439))
22
+ * pass abort signal to feedbacks ([661ee14](https://github.com/bitfocus/companion-module-base/commit/661ee14c1e695f3df99d845be7643d5d383cb25a))
23
+ * preset alternatives ([#240](https://github.com/bitfocus/companion-module-base/issues/240)) ([c45332b](https://github.com/bitfocus/companion-module-base/commit/c45332be507c49381f6c29694c50e5630b884a3f))
24
+ * support gauges in presets ([8370e66](https://github.com/bitfocus/companion-module-base/commit/8370e66204c096321cae379822df58614e05b9eb))
25
+
26
+
27
+ ### Bug Fixes
28
+
29
+ * expose runThroughUpgradeScripts for offline upgrade script execution ([5c49de0](https://github.com/bitfocus/companion-module-base/commit/5c49de0c7650debbe409d24006918f70e7a05f9f))
30
+ * update schema validation ([528508a](https://github.com/bitfocus/companion-module-base/commit/528508aab7cbf2e684750c2bf8962182770548aa))
31
+
3
32
  ## [1.0.3](https://github.com/bitfocus/companion-module-base/compare/companion-module-host-v1.0.2...companion-module-host-v1.0.3) (2026-04-25)
4
33
 
5
34
 
package/dist/context.d.ts CHANGED
@@ -1,5 +1,5 @@
1
- import type { CompanionFeedbackButtonStyleResult, CompanionPresetDefinitions, CompanionPresetSection, CompanionRecordedAction, CompanionVariableValue, InstanceStatus, JsonValue, ExpressionOptionsObject, CompanionOptionValues, OSCSomeArguments, SomeCompanionActionInputField, SomeCompanionFeedbackInputField, ExpressionOrValue } from '@companion-module/base';
2
- import { SharedUdpSocketMessageJoin, SharedUdpSocketMessageLeave, SharedUdpSocketMessageSend } from '@companion-module/base/host-api';
1
+ import type { CompanionFeedbackButtonStyleResult, CompanionGraphicsCompositeElementDefinitions, CompanionMigrationActionStoreResult, CompanionOptionValues, CompanionPresetDefinitions, CompanionPresetSection, CompanionRecordedAction, CompanionVariableValue, ExpressionOptionsObject, ExpressionOrValue, InstanceStatus, JsonValue, OSCSomeArguments, SomeCompanionActionInputField, SomeCompanionFeedbackInputField } from '@companion-module/base';
2
+ import type { SharedUdpSocketMessageJoin, SharedUdpSocketMessageLeave, SharedUdpSocketMessageSend } from '@companion-module/base/host-api';
3
3
  export interface ModuleHostContext<TConfig, TSecrets> {
4
4
  /** The connection status has changed */
5
5
  setStatus: (status: InstanceStatus, message: string | null) => void;
@@ -11,6 +11,8 @@ export interface ModuleHostContext<TConfig, TSecrets> {
11
11
  setVariableDefinitions: (definitions: HostVariableDefinition[], values: HostVariableValue[]) => void;
12
12
  /** The presets provided by the connection have changed */
13
13
  setPresetDefinitions: (structure: CompanionPresetSection[], presets: CompanionPresetDefinitions) => void;
14
+ /** The composite graphics elements provided by the connection have changed */
15
+ setCompositeElementDefinitions: (compositeElements: CompanionGraphicsCompositeElementDefinitions) => void;
14
16
  /** The connection has some new values for variables */
15
17
  setVariableValues: (values: HostVariableValue[]) => void;
16
18
  /** The connection has some new values for feedbacks it is running */
@@ -36,6 +38,7 @@ export interface HostActionDefinition {
36
38
  sortName: string | undefined;
37
39
  description: string | undefined;
38
40
  options: SomeCompanionActionInputField[];
41
+ hasResult?: boolean;
39
42
  optionsToMonitorForSubscribe: string[] | undefined;
40
43
  hasLearn: boolean;
41
44
  learnTimeout: number | undefined;
@@ -50,6 +53,7 @@ export interface HostFeedbackDefinition {
50
53
  options: SomeCompanionFeedbackInputField[];
51
54
  type: HostFeedbackType;
52
55
  defaultStyle?: CompanionFeedbackButtonStyleResult;
56
+ affectedProperties: string[] | undefined;
53
57
  hasLearn: boolean;
54
58
  showInvert: boolean | undefined;
55
59
  learnTimeout: number | undefined;
@@ -91,6 +95,10 @@ export interface ActionInstance extends ActionInstanceBase {
91
95
  }
92
96
  export interface UpgradeActionInstance extends Omit<ActionInstanceBase, 'options'> {
93
97
  options: ExpressionOptionsObject;
98
+ /**
99
+ * Only used as an output from the module, when converting to the action-result store flow
100
+ */
101
+ storeResult?: CompanionMigrationActionStoreResult;
94
102
  controlId: string;
95
103
  upgradeIndex: number | null;
96
104
  }
@@ -1 +1 @@
1
- {"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"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"}
@@ -1,24 +1,40 @@
1
- import type { CompanionHTTPRequest, CompanionHTTPResponse, CompanionOptionValues, CompanionStaticUpgradeScript, SomeCompanionConfigField, InstanceConstructor, InstanceTypes } from '@companion-module/base';
2
- import type { ActionInstance, FeedbackInstance, ModuleHostContext, UpgradeActionAndFeedbackInstancesResponse, UpgradeActionInstance, UpgradeFeedbackInstance } from './context.js';
1
+ import { type CompanionHTTPRequest, type CompanionHTTPResponse, type CompanionOptionValues, type CompanionStaticUpgradeScript, type InstanceConstructor, type InstanceTypes, type JsonValue, type SomeCompanionConfigField } from '@companion-module/base';
3
2
  import type { SharedUdpSocketMessage } from '@companion-module/base/host-api';
3
+ import type { ActionInstance, FeedbackInstance, ModuleHostContext, UpgradeActionAndFeedbackInstancesResponse, UpgradeActionInstance, UpgradeFeedbackInstance } from './context.js';
4
4
  export declare class InstanceWrapper<TManifest extends InstanceTypes> {
5
5
  #private;
6
- constructor(id: string, host: ModuleHostContext<TManifest['config'], TManifest['secrets']>, instanceFactory: InstanceConstructor<TManifest>, upgradeScripts: CompanionStaticUpgradeScript<TManifest['config'], TManifest['secrets']>[]);
6
+ constructor(id: string, host: ModuleHostContext<TManifest['config'], TManifest['secrets']>, instanceFactory: InstanceConstructor<TManifest>, upgradeScripts: CompanionStaticUpgradeScript<TManifest['config'], TManifest['secrets']>[], moduleApiVersion: string);
7
7
  init(msg: InitMessage): Promise<InitResponseMessage>;
8
8
  destroy(): Promise<void>;
9
9
  configUpdateAndLabel(label: string, config: TManifest['config'], secrets: TManifest['secrets']): Promise<void>;
10
+ /**
11
+ * @deprecated use executeActionWithSignal instead, which allows passing an AbortSignal to the action callback, so that it can be cancelled if needed
12
+ */
10
13
  executeAction(action: ActionInstance, surfaceId: string | undefined): Promise<ExecuteActionResult>;
14
+ executeActionWithSignal(action: ActionInstance, surfaceId: string | undefined, signal: AbortSignal): Promise<ExecuteActionResult>;
11
15
  updateFeedbacks(feedbacks: Record<string, FeedbackInstance | null | undefined>): Promise<void>;
12
16
  updateActions(actions: Record<string, ActionInstance | null | undefined>): Promise<void>;
13
17
  upgradeActionsAndFeedbacks(defaultUpgradeIndex: number | null, actions: UpgradeActionInstance[], feedbacks: UpgradeFeedbackInstance[]): Promise<UpgradeActionAndFeedbackInstancesResponse>;
14
18
  getConfigFields(): Promise<SomeCompanionConfigField[]>;
15
19
  httpRequest(request: CompanionHTTPRequest): Promise<CompanionHTTPResponse>;
20
+ /**
21
+ * @deprecated use learnActionWithSignal instead, which allows passing an AbortSignal to the learn function, so that it can be cancelled if needed
22
+ */
16
23
  learnAction(action: ActionInstance): Promise<{
17
24
  options: CompanionOptionValues | undefined;
18
25
  }>;
26
+ learnActionWithSignal(action: ActionInstance, signal: AbortSignal): Promise<{
27
+ options: CompanionOptionValues | undefined;
28
+ }>;
29
+ /**
30
+ * @deprecated use learnFeedbackWithSignal instead, which allows passing an AbortSignal to the learn function, so that it can be cancelled if needed
31
+ */
19
32
  learnFeedback(feedback: FeedbackInstance): Promise<{
20
33
  options: CompanionOptionValues | undefined;
21
34
  }>;
35
+ learnFeedbackWithSignal(feedback: FeedbackInstance, signal: AbortSignal): Promise<{
36
+ options: CompanionOptionValues | undefined;
37
+ }>;
22
38
  startStopRecordActions(recording: boolean): Promise<void>;
23
39
  sharedUdpSocketMessage(msg: SharedUdpSocketMessage): Promise<void>;
24
40
  sharedUdpSocketError(msg: SharedUdpSocketError): Promise<void>;
@@ -38,11 +54,20 @@ export interface InitResponseMessage {
38
54
  updatedConfig: unknown | undefined;
39
55
  updatedSecrets: unknown | undefined;
40
56
  }
41
- export interface ExecuteActionResult {
42
- success: boolean;
43
- /** If success=false, a reason for the failure */
44
- errorMessage: string | undefined;
57
+ export interface ExecuteActionSuccess {
58
+ success: true;
59
+ /**
60
+ * The result returned by the callback, or `undefined` if the callback
61
+ * doesn't return a result.
62
+ */
63
+ result: JsonValue | undefined;
64
+ }
65
+ export interface ExecuteActionFailure {
66
+ success: false;
67
+ /** A reason for the failure */
68
+ errorMessage: string;
45
69
  }
70
+ export type ExecuteActionResult = ExecuteActionSuccess | ExecuteActionFailure;
46
71
  export interface SharedUdpSocketError {
47
72
  handleId: string;
48
73
  portNumber: number;
@@ -1 +1 @@
1
- {"version":3,"file":"instance.d.ts","sourceRoot":"","sources":["../src/instance.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"instance.d.ts","sourceRoot":"","sources":["../src/instance.ts"],"names":[],"mappings":"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"}
package/dist/instance.js CHANGED
@@ -1,11 +1,13 @@
1
- import { BANNED_PROPS } from './internal/util.js';
2
1
  import PQueue from 'p-queue';
2
+ import { createModuleLogger, } from '@companion-module/base';
3
3
  import { ActionManager } from './internal/actions.js';
4
+ import { sanitiseCompositeElementDefinitions } from './internal/composite-elements.js';
4
5
  import { FeedbackManager } from './internal/feedback.js';
6
+ import { sanitisePresetDefinitions } from './internal/presets.js';
5
7
  import { runThroughUpgradeScripts } from './internal/upgrade.js';
6
- import { validatePresetDefinitions } from './internal/presets.js';
8
+ import { BANNED_PROPS, filterDuplicateOptionIds } from './internal/util.js';
7
9
  export class InstanceWrapper {
8
- // readonly #logger = createModuleLogger('InstanceWrapper')
10
+ #logger = createModuleLogger('InstanceWrapper');
9
11
  #lifecycleQueue = new PQueue({ concurrency: 1 });
10
12
  #initialized = false;
11
13
  #recordingActions = false;
@@ -18,11 +20,11 @@ export class InstanceWrapper {
18
20
  #feedbackManager;
19
21
  #instanceContext;
20
22
  #instance;
21
- constructor(id, host, instanceFactory, upgradeScripts) {
23
+ constructor(id, host, instanceFactory, upgradeScripts, moduleApiVersion) {
22
24
  this.#host = host;
23
25
  // this.#plugin = plugin
24
26
  this.#actionManager = new ActionManager((actions) => this.#host.setActionDefinitions(actions), (controlId, variableId, value) => this.#host.setCustomVariable(controlId, variableId, value));
25
- this.#feedbackManager = new FeedbackManager((feedbacks) => this.#host.setFeedbackDefinitions(feedbacks), (values) => this.#host.updateFeedbackValues(values));
27
+ this.#feedbackManager = new FeedbackManager((feedbacks) => this.#host.setFeedbackDefinitions(feedbacks), (values) => this.#host.updateFeedbackValues(values), moduleApiVersion);
26
28
  this.#instanceContext = {
27
29
  _isInstanceContext: true,
28
30
  id,
@@ -71,8 +73,12 @@ export class InstanceWrapper {
71
73
  this.#feedbackManager.checkFeedbacksById(feedbackIds);
72
74
  },
73
75
  setPresetDefinitions: (structure, presets) => {
74
- validatePresetDefinitions(this.#actionManager, this.#feedbackManager, structure, presets);
75
- this.#host.setPresetDefinitions(structure, presets);
76
+ const sanitised = sanitisePresetDefinitions(this.#actionManager, this.#feedbackManager, structure, presets, moduleApiVersion);
77
+ this.#host.setPresetDefinitions(sanitised.structure, sanitised.presets);
78
+ },
79
+ setCompositeElementDefinitions: (compositeElements) => {
80
+ const sanitisedElements = sanitiseCompositeElementDefinitions(compositeElements);
81
+ this.#host.setCompositeElementDefinitions(sanitisedElements);
76
82
  },
77
83
  setVariableDefinitions: (variables) => {
78
84
  const hostVariables = [];
@@ -176,7 +182,7 @@ export class InstanceWrapper {
176
182
  if (msg.isFirstInit) {
177
183
  const newConfig = {};
178
184
  const newSecrets = {};
179
- const fields = this.#instance.getConfigFields();
185
+ const fields = this.#getConfigFields();
180
186
  for (const field of fields) {
181
187
  if ('default' in field) {
182
188
  if (field.type.startsWith('secret')) {
@@ -240,8 +246,16 @@ export class InstanceWrapper {
240
246
  await this.#instance.configUpdated(this.#lastConfig, this.#lastSecrets);
241
247
  });
242
248
  }
249
+ /**
250
+ * @deprecated use executeActionWithSignal instead, which allows passing an AbortSignal to the action callback, so that it can be cancelled if needed
251
+ */
243
252
  async executeAction(action, surfaceId) {
244
- return this.#actionManager.handleExecuteAction(action, surfaceId);
253
+ // Create a constant signal that will never abort
254
+ const signal = new AbortController().signal;
255
+ return this.#actionManager.handleExecuteAction(action, surfaceId, signal);
256
+ }
257
+ async executeActionWithSignal(action, surfaceId, signal) {
258
+ return this.#actionManager.handleExecuteAction(action, surfaceId, signal);
245
259
  }
246
260
  async updateFeedbacks(feedbacks) {
247
261
  this.#feedbackManager.handleUpdateFeedbacks(feedbacks);
@@ -253,7 +267,18 @@ export class InstanceWrapper {
253
267
  return runThroughUpgradeScripts(actions, feedbacks, defaultUpgradeIndex, this.#instanceContext.upgradeScripts, this.#lastConfig, this.#lastSecrets, true);
254
268
  }
255
269
  async getConfigFields() {
256
- return this.#instance.getConfigFields();
270
+ return this.#getConfigFields();
271
+ }
272
+ #getConfigFields() {
273
+ const rawFields = this.#instance.getConfigFields();
274
+ // Remove any fields which reuse the same id, keeping only the first usage of each
275
+ const { options: fields, duplicateIds } = filterDuplicateOptionIds(rawFields ?? []);
276
+ if (duplicateIds.length > 0) {
277
+ this.#logger.warn(`The config fields reuse the same id. Each field id must be unique, or they will overwrite each other. The ids: ${duplicateIds
278
+ .sort()
279
+ .join(', ')}`);
280
+ }
281
+ return fields;
257
282
  }
258
283
  async httpRequest(request) {
259
284
  if (!this.#instance.handleHttpRequest)
@@ -261,11 +286,27 @@ export class InstanceWrapper {
261
286
  const res = await this.#instance.handleHttpRequest(request);
262
287
  return res;
263
288
  }
289
+ /**
290
+ * @deprecated use learnActionWithSignal instead, which allows passing an AbortSignal to the learn function, so that it can be cancelled if needed
291
+ */
264
292
  async learnAction(action) {
265
- return this.#actionManager.handleLearnAction(action);
293
+ // Create a constant signal that will never abort
294
+ const signal = new AbortController().signal;
295
+ return this.#actionManager.handleLearnAction(action, signal);
296
+ }
297
+ async learnActionWithSignal(action, signal) {
298
+ return this.#actionManager.handleLearnAction(action, signal);
266
299
  }
300
+ /**
301
+ * @deprecated use learnFeedbackWithSignal instead, which allows passing an AbortSignal to the learn function, so that it can be cancelled if needed
302
+ */
267
303
  async learnFeedback(feedback) {
268
- return this.#feedbackManager.handleLearnFeedback(feedback);
304
+ // Create a constant signal that will never abort
305
+ const signal = new AbortController().signal;
306
+ return this.#feedbackManager.handleLearnFeedback(feedback, signal);
307
+ }
308
+ async learnFeedbackWithSignal(feedback, signal) {
309
+ return this.#feedbackManager.handleLearnFeedback(feedback, signal);
269
310
  }
270
311
  async startStopRecordActions(recording) {
271
312
  if (!recording) {
@@ -1 +1 @@
1
- {"version":3,"file":"instance.js","sourceRoot":"","sources":["../src/instance.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"instance.js","sourceRoot":"","sources":["../src/instance.ts"],"names":[],"mappings":"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"}
@@ -1,13 +1,14 @@
1
- import { type CompanionActionDefinitions, type CompanionOptionValues, type CompanionVariableValue } from '@companion-module/base';
1
+ import { type CompanionActionDefinition, type CompanionActionDefinitions, type CompanionOptionValues, type CompanionVariableValue } from '@companion-module/base';
2
2
  import type { ActionInstance, HostActionDefinition } from '../context.js';
3
- import { ExecuteActionResult } from '../instance.js';
3
+ import type { ExecuteActionResult } from '../instance.js';
4
4
  export declare class ActionManager {
5
5
  #private;
6
6
  constructor(setActionDefinitions: (msg: HostActionDefinition[]) => void, setCustomVariableValue: (controlId: string, variableId: string, value: CompanionVariableValue | undefined) => void);
7
7
  getDefinitionIds(): string[];
8
- handleExecuteAction(action: ActionInstance, surfaceId: string | undefined): Promise<ExecuteActionResult>;
8
+ getDefinition(id: string): CompanionActionDefinition | undefined;
9
+ handleExecuteAction(action: ActionInstance, surfaceId: string | undefined, signal: AbortSignal): Promise<ExecuteActionResult>;
9
10
  handleUpdateActions(actions: Record<string, ActionInstance | null | undefined>): void;
10
- handleLearnAction(action: ActionInstance): Promise<{
11
+ handleLearnAction(action: ActionInstance, signal: AbortSignal): Promise<{
11
12
  options: CompanionOptionValues | undefined;
12
13
  }>;
13
14
  setActionDefinitions(actions: CompanionActionDefinitions): void;
@@ -1 +1 @@
1
- {"version":3,"file":"actions.d.ts","sourceRoot":"","sources":["../../src/internal/actions.ts"],"names":[],"mappings":"AAAA,OAAO,EAGN,KAAK,0BAA0B,EAE/B,KAAK,qBAAqB,EAC1B,KAAK,sBAAsB,EAE3B,MAAM,wBAAwB,CAAA;AAE/B,OAAO,KAAK,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAA;AACzE,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAA;AAYpD,qBAAa,aAAa;;gBAcxB,oBAAoB,EAAE,CAAC,GAAG,EAAE,oBAAoB,EAAE,KAAK,IAAI,EAC3D,sBAAsB,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,sBAAsB,GAAG,SAAS,KAAK,IAAI;IAM5G,gBAAgB,IAAI,MAAM,EAAE;IAItB,mBAAmB,CAC/B,MAAM,EAAE,cAAc,EACtB,SAAS,EAAE,MAAM,GAAG,SAAS,GAC3B,OAAO,CAAC,mBAAmB,CAAC;IAyCxB,mBAAmB,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,GAAG,IAAI,GAAG,SAAS,CAAC,GAAG,IAAI;IAmD/E,iBAAiB,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC;QAAE,OAAO,EAAE,qBAAqB,GAAG,SAAS,CAAA;KAAE,CAAC;IAiC/G,oBAAoB,CAAC,OAAO,EAAE,0BAA0B,GAAG,IAAI;IAuE/D,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,IAAI;IAuB3C,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,IAAI;CAsB7C"}
1
+ {"version":3,"file":"actions.d.ts","sourceRoot":"","sources":["../../src/internal/actions.ts"],"names":[],"mappings":"AAAA,OAAO,EAIN,KAAK,yBAAyB,EAC9B,KAAK,0BAA0B,EAK/B,KAAK,qBAAqB,EAC1B,KAAK,sBAAsB,EAE3B,MAAM,wBAAwB,CAAA;AAC/B,OAAO,KAAK,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAA;AACzE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAA;AAiBzD,qBAAa,aAAa;;gBAoBxB,oBAAoB,EAAE,CAAC,GAAG,EAAE,oBAAoB,EAAE,KAAK,IAAI,EAC3D,sBAAsB,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,sBAAsB,GAAG,SAAS,KAAK,IAAI;IAM5G,gBAAgB,IAAI,MAAM,EAAE;IAI5B,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,yBAAyB,GAAG,SAAS;IAI1D,mBAAmB,CAC/B,MAAM,EAAE,cAAc,EACtB,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,MAAM,EAAE,WAAW,GACjB,OAAO,CAAC,mBAAmB,CAAC;IAyDxB,mBAAmB,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,GAAG,IAAI,GAAG,SAAS,CAAC,GAAG,IAAI;IAmD/E,iBAAiB,CAC7B,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,WAAW,GACjB,OAAO,CAAC;QAAE,OAAO,EAAE,qBAAqB,GAAG,SAAS,CAAA;KAAE,CAAC;IAwD1D,oBAAoB,CAAC,OAAO,EAAE,0BAA0B,GAAG,IAAI;IAuF/D,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,IAAI;IAuB3C,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,IAAI;CAsB7C"}
@@ -1,6 +1,5 @@
1
1
  import { createModuleLogger, } from '@companion-module/base';
2
- import { BANNED_PROPS } from './util.js';
3
- import { hasAnyOldIsVisibleFunctions, hasAnyOldRequiredProperties } from './util.js';
2
+ import { BANNED_PROPS, filterDuplicateOptionIds, hasAnyOldIsVisibleFunctions, hasAnyOldRequiredProperties, } from './util.js';
4
3
  function convertActionInstanceToEvent(action) {
5
4
  return {
6
5
  id: action.id,
@@ -22,7 +21,10 @@ export class ActionManager {
22
21
  getDefinitionIds() {
23
22
  return this.#actionDefinitions.keys().toArray();
24
23
  }
25
- async handleExecuteAction(action, surfaceId) {
24
+ getDefinition(id) {
25
+ return this.#actionDefinitions.get(id);
26
+ }
27
+ async handleExecuteAction(action, surfaceId, signal) {
26
28
  const actionDefinition = this.#actionDefinitions.get(action.actionId);
27
29
  if (!actionDefinition) {
28
30
  return {
@@ -32,12 +34,19 @@ export class ActionManager {
32
34
  }
33
35
  const context = {
34
36
  type: 'action',
37
+ signal,
35
38
  setCustomVariableValue: (variableName, value) => {
36
39
  this.#setCustomVariableValue(action.controlId, variableName, value);
37
40
  },
38
41
  };
42
+ if (signal.aborted) {
43
+ return {
44
+ success: false,
45
+ errorMessage: 'Action execution was aborted',
46
+ };
47
+ }
39
48
  try {
40
- await actionDefinition.callback({
49
+ const result = await actionDefinition.callback({
41
50
  id: action.id,
42
51
  actionId: action.actionId,
43
52
  controlId: action.controlId,
@@ -46,10 +55,17 @@ export class ActionManager {
46
55
  }, context);
47
56
  return {
48
57
  success: true,
49
- errorMessage: undefined,
58
+ result: actionDefinition.hasResult ? result : undefined,
50
59
  };
51
60
  }
52
61
  catch (e) {
62
+ if (signal.aborted) {
63
+ // The execution was aborted, ignore the error
64
+ return {
65
+ success: false,
66
+ errorMessage: 'Action execution was aborted',
67
+ };
68
+ }
53
69
  return {
54
70
  success: false,
55
71
  errorMessage: e?.message ?? String(e),
@@ -101,25 +117,48 @@ export class ActionManager {
101
117
  }
102
118
  }
103
119
  }
104
- async handleLearnAction(action) {
120
+ async handleLearnAction(action, signal) {
105
121
  const definition = this.#actionDefinitions.get(action.actionId);
106
122
  if (definition && definition.learn) {
107
123
  const context = {
108
124
  type: 'action',
109
- setCustomVariableValue: () => {
110
- throw new Error(`setCustomVariableValue is not available during learn`);
111
- },
112
- };
113
- const newOptions = await definition.learn({
114
- id: action.id,
115
- actionId: action.actionId,
116
- controlId: action.controlId,
117
- options: action.options,
118
- surfaceId: undefined,
119
- }, context);
120
- return {
121
- options: newOptions,
125
+ signal,
122
126
  };
127
+ if (signal.aborted) {
128
+ // The learn was aborted, return undefined options as a signal of this
129
+ return {
130
+ options: undefined,
131
+ };
132
+ }
133
+ try {
134
+ const newOptions = await definition.learn({
135
+ id: action.id,
136
+ actionId: action.actionId,
137
+ controlId: action.controlId,
138
+ options: action.options,
139
+ surfaceId: undefined,
140
+ }, context);
141
+ if (signal.aborted) {
142
+ // The learn was aborted, return undefined options as a signal of this
143
+ return {
144
+ options: undefined,
145
+ };
146
+ }
147
+ return {
148
+ options: newOptions,
149
+ };
150
+ }
151
+ catch (e) {
152
+ if (signal.aborted) {
153
+ // The learn was aborted, return undefined options as a signal of this
154
+ return {
155
+ options: undefined,
156
+ };
157
+ }
158
+ else {
159
+ throw e;
160
+ }
161
+ }
123
162
  }
124
163
  else {
125
164
  // Not supported
@@ -135,18 +174,26 @@ export class ActionManager {
135
174
  const definitionsWithOptionsToIgnore = [];
136
175
  const definitionsWithOldIsVisible = [];
137
176
  const definitionsWithOldRequiredProperties = [];
177
+ const definitionsWithDuplicateOptionIds = [];
138
178
  for (const [actionId, action] of Object.entries(actions)) {
139
179
  if (!action)
140
180
  continue;
141
181
  if (BANNED_PROPS.has(actionId))
142
182
  throw new Error(`Action id "${actionId}" is a reserved word`);
183
+ if (actionId.startsWith('internal:'))
184
+ throw new Error(`Action id "${actionId}" uses the reserved "internal:" prefix`);
143
185
  const hasSubscriptionMethods = !!action.subscribe || !!action.unsubscribe;
186
+ // Remove any options which reuse the same id, keeping only the first usage of each
187
+ const { options: filteredOptions, duplicateIds } = filterDuplicateOptionIds(action.options ?? []);
188
+ if (duplicateIds.length > 0)
189
+ definitionsWithDuplicateOptionIds.push(`${actionId} (${duplicateIds.sort().join(', ')})`);
144
190
  hostActions.push({
145
191
  id: actionId,
146
192
  name: action.name,
147
193
  sortName: action.sortName,
148
194
  description: action.description,
149
- options: action.options,
195
+ options: filteredOptions,
196
+ hasResult: !!action.hasResult,
150
197
  optionsToMonitorForSubscribe: action.optionsToMonitorForSubscribe,
151
198
  hasLearn: !!action.learn,
152
199
  learnTimeout: action.learnTimeout,
@@ -185,6 +232,11 @@ export class ActionManager {
185
232
  .sort()
186
233
  .join(', ')}`);
187
234
  }
235
+ if (definitionsWithDuplicateOptionIds.length > 0) {
236
+ this.#logger.warn(`The following action definitions have options which reuse the same id. Each option id must be unique within a definition, or they will overwrite each other. The definitions: ${definitionsWithDuplicateOptionIds
237
+ .sort()
238
+ .join(', ')}`);
239
+ }
188
240
  }
189
241
  subscribeActions(actionIds) {
190
242
  let actions = this.#actionInstances.values().toArray();
@@ -1 +1 @@
1
- {"version":3,"file":"actions.js","sourceRoot":"","sources":["../../src/internal/actions.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"actions.js","sourceRoot":"","sources":["../../src/internal/actions.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,3 @@
1
+ import { type CompanionGraphicsCompositeElementDefinitions } from '@companion-module/base';
2
+ export declare function sanitiseCompositeElementDefinitions(definitions: CompanionGraphicsCompositeElementDefinitions<any>): CompanionGraphicsCompositeElementDefinitions<any>;
3
+ //# sourceMappingURL=composite-elements.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"composite-elements.d.ts","sourceRoot":"","sources":["../../src/internal/composite-elements.ts"],"names":[],"mappings":"AACA,OAAO,EAGN,KAAK,4CAA4C,EACjD,MAAM,wBAAwB,CAAA;AAkB/B,wBAAgB,mCAAmC,CAClD,WAAW,EAAE,4CAA4C,CAAC,GAAG,CAAC,GAC5D,4CAA4C,CAAC,GAAG,CAAC,CAoCnD"}