@smarthome.exchange/integrations 0.1.0 → 0.2.0

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.
package/changelog.md CHANGED
@@ -1,5 +1,14 @@
1
1
  # Changelog
2
2
 
3
+ ## 2026-08-10 - 0.2.0
4
+
5
+ ### Features
6
+
7
+ - **Breaking:** fail closed on retained runtime cleanup before setup (runtime-manager)
8
+ - Retry pending cleanup for the requested domain before creating or replacing an integration runtime.
9
+ - Reject overlapping same-domain setup and destroyAll calls while setup is in progress instead of queuing them.
10
+ - Retain failed replacement and mismatched-runtime cleanup under the requested domain, with retryPendingCleanup(domain) and hasPendingCleanup(domain) exposing the cleanup gate.
11
+
3
12
  ## 2026-08-10 - 0.1.0
4
13
 
5
14
  ### Features
@@ -3,7 +3,7 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@smarthome.exchange/integrations',
6
- version: '0.1.0',
6
+ version: '0.2.0',
7
7
  description: 'TypeScript-native device integrations for smarthome.exchange.'
8
8
  };
9
9
  //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSxrQ0FBa0M7SUFDeEMsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLCtEQUErRDtDQUM3RSxDQUFBIn0=
@@ -5,7 +5,8 @@ export declare class IntegrationRuntimeManager {
5
5
  private readonly runtimesPendingCleanup;
6
6
  private readonly runtimeDestructionPromises;
7
7
  private readonly destroyedRuntimes;
8
- private operationTail;
8
+ private readonly setupDomainsInProgress;
9
+ private destroyAllPromise?;
9
10
  createRuntime<TConfig>(integrationArg: BaseIntegration<TConfig>, configArg: TConfig, contextArg?: IIntegrationSetupContext): Promise<IIntegrationRuntime>;
10
11
  setupIntegration<TConfig>(integrationArg: BaseIntegration<TConfig>, configArg: TConfig, contextArg?: IIntegrationSetupContext): Promise<IIntegrationRuntime>;
11
12
  activateRuntime(domainArg: string, runtimeArg: IIntegrationRuntime): IIntegrationRuntime | undefined;
@@ -15,8 +16,11 @@ export declare class IntegrationRuntimeManager {
15
16
  getActiveRuntime(domainArg: string): IIntegrationRuntime | undefined;
16
17
  getRuntime(domainArg: string): IIntegrationRuntime | undefined;
17
18
  listRuntimes(): IIntegrationRuntime[];
19
+ retryPendingCleanup(domainArg: string): Promise<void>;
20
+ hasPendingCleanup(domainArg: string): boolean;
18
21
  writeDeviceFeature(requestArg: IDeviceFeatureWriteRequest, expectedRuntimeArg?: IIntegrationRuntime, abortSignalArg?: AbortSignal): Promise<IServiceCallResult>;
19
22
  destroyAll(timeoutMsArg?: number): Promise<void>;
20
23
  private withTimeout;
21
- private runExclusive;
24
+ private performDestroyAll;
25
+ private markRuntimePendingCleanup;
22
26
  }
@@ -1,17 +1,20 @@
1
1
  import { createDescriptorOnlyIntegrationError } from './classes.descriptoronlyintegration.js';
2
2
  export class IntegrationRuntimeManager {
3
3
  runtimes = new Map();
4
- runtimesPendingCleanup = new Set();
4
+ runtimesPendingCleanup = new Map();
5
5
  runtimeDestructionPromises = new Map();
6
6
  destroyedRuntimes = new WeakSet();
7
- operationTail = Promise.resolve();
7
+ setupDomainsInProgress = new Set();
8
+ destroyAllPromise;
8
9
  async createRuntime(integrationArg, configArg, contextArg = {}) {
9
10
  if (integrationArg.status === 'descriptor-only') {
10
11
  throw createDescriptorOnlyIntegrationError(integrationArg.domain);
11
12
  }
13
+ await this.retryPendingCleanup(integrationArg.domain);
12
14
  const runtime = await integrationArg.setup(configArg, contextArg);
13
15
  if (runtime.domain !== integrationArg.domain) {
14
16
  const domainError = new Error(`Integration runtime domain mismatch: expected ${integrationArg.domain}, received ${runtime.domain}`);
17
+ this.markRuntimePendingCleanup(integrationArg.domain, runtime);
15
18
  try {
16
19
  await this.destroyRuntime(runtime);
17
20
  }
@@ -23,26 +26,26 @@ export class IntegrationRuntimeManager {
23
26
  return runtime;
24
27
  }
25
28
  async setupIntegration(integrationArg, configArg, contextArg = {}) {
26
- return this.runExclusive(async () => {
27
- const runtime = await this.createRuntime(integrationArg, configArg, contextArg);
29
+ if (this.destroyAllPromise) {
30
+ throw new Error('Cannot set up an integration while destroyAll is in progress.');
31
+ }
32
+ if (this.setupDomainsInProgress.has(integrationArg.domain)) {
33
+ throw new Error(`Integration setup is already in progress: ${integrationArg.domain}`);
34
+ }
35
+ this.setupDomainsInProgress.add(integrationArg.domain);
36
+ try {
37
+ await this.retryPendingCleanup(integrationArg.domain);
28
38
  const previousRuntime = this.retireRuntime(integrationArg.domain);
29
39
  if (previousRuntime) {
30
- try {
31
- await this.destroyRuntime(previousRuntime);
32
- }
33
- catch (destroyError) {
34
- try {
35
- await this.destroyRuntime(runtime);
36
- }
37
- catch (cleanupError) {
38
- throw new AggregateError([destroyError, cleanupError], `Failed to replace integration runtime for ${integrationArg.domain}`);
39
- }
40
- throw destroyError;
41
- }
40
+ await this.destroyRuntime(previousRuntime);
42
41
  }
42
+ const runtime = await this.createRuntime(integrationArg, configArg, contextArg);
43
43
  this.activateRuntime(integrationArg.domain, runtime);
44
44
  return runtime;
45
- });
45
+ }
46
+ finally {
47
+ this.setupDomainsInProgress.delete(integrationArg.domain);
48
+ }
46
49
  }
47
50
  activateRuntime(domainArg, runtimeArg) {
48
51
  if (runtimeArg.domain !== domainArg) {
@@ -64,16 +67,19 @@ export class IntegrationRuntimeManager {
64
67
  retireRuntime(domainArg, expectedRuntimeArg) {
65
68
  const runtime = this.removeRuntime(domainArg, expectedRuntimeArg);
66
69
  if (runtime) {
67
- this.runtimesPendingCleanup.add(runtime);
70
+ this.markRuntimePendingCleanup(domainArg, runtime);
68
71
  }
69
72
  return runtime;
70
73
  }
71
74
  destroyRuntime(runtimeArg, timeoutMsArg) {
72
75
  this.retireRuntime(runtimeArg.domain, runtimeArg);
73
76
  if (this.destroyedRuntimes.has(runtimeArg)) {
77
+ this.runtimesPendingCleanup.delete(runtimeArg);
74
78
  return Promise.resolve();
75
79
  }
76
- this.runtimesPendingCleanup.add(runtimeArg);
80
+ if (!this.runtimesPendingCleanup.has(runtimeArg)) {
81
+ this.markRuntimePendingCleanup(runtimeArg.domain, runtimeArg);
82
+ }
77
83
  let destructionPromise = this.runtimeDestructionPromises.get(runtimeArg);
78
84
  if (!destructionPromise) {
79
85
  const destroyAttempt = Promise.resolve().then(() => runtimeArg.destroy());
@@ -103,6 +109,24 @@ export class IntegrationRuntimeManager {
103
109
  listRuntimes() {
104
110
  return [...this.runtimes.values()];
105
111
  }
112
+ async retryPendingCleanup(domainArg) {
113
+ const runtimes = [...this.runtimesPendingCleanup]
114
+ .filter(([, cleanupDomainArg]) => cleanupDomainArg === domainArg)
115
+ .map(([runtimeArg]) => runtimeArg);
116
+ if (runtimes.length === 0) {
117
+ return;
118
+ }
119
+ const results = await Promise.allSettled(runtimes.map((runtimeArg) => this.destroyRuntime(runtimeArg)));
120
+ const errors = results
121
+ .filter((resultArg) => resultArg.status === 'rejected')
122
+ .map((resultArg) => resultArg.reason);
123
+ if (errors.length > 0) {
124
+ throw new AggregateError(errors, `Failed to clean up retained integration runtimes for ${domainArg}`);
125
+ }
126
+ }
127
+ hasPendingCleanup(domainArg) {
128
+ return [...this.runtimesPendingCleanup.values()].some((cleanupDomainArg) => cleanupDomainArg === domainArg);
129
+ }
106
130
  async writeDeviceFeature(requestArg, expectedRuntimeArg, abortSignalArg) {
107
131
  const integrationDomain = requestArg.device.integrationDomain;
108
132
  if (!integrationDomain) {
@@ -132,21 +156,20 @@ export class IntegrationRuntimeManager {
132
156
  }
133
157
  return runtime.writeFeature(requestArg, abortSignalArg);
134
158
  }
135
- async destroyAll(timeoutMsArg) {
136
- return this.runExclusive(async () => {
137
- for (const [domain, runtime] of this.runtimes) {
138
- this.runtimes.delete(domain);
139
- this.runtimesPendingCleanup.add(runtime);
140
- }
141
- const runtimes = [...this.runtimesPendingCleanup];
142
- const results = await Promise.allSettled(runtimes.map((runtimeArg) => this.destroyRuntime(runtimeArg, timeoutMsArg)));
143
- const errors = results
144
- .filter((resultArg) => resultArg.status === 'rejected')
145
- .map((resultArg) => resultArg.reason);
146
- if (errors.length > 0) {
147
- throw new AggregateError(errors, 'Failed to destroy all integration runtimes cleanly');
159
+ destroyAll(timeoutMsArg) {
160
+ if (this.destroyAllPromise) {
161
+ return this.destroyAllPromise;
162
+ }
163
+ if (this.setupDomainsInProgress.size > 0) {
164
+ return Promise.reject(new Error('Cannot destroy integration runtimes while setup is in progress.'));
165
+ }
166
+ const destroyAllPromise = this.performDestroyAll(timeoutMsArg).finally(() => {
167
+ if (this.destroyAllPromise === destroyAllPromise) {
168
+ this.destroyAllPromise = undefined;
148
169
  }
149
170
  });
171
+ this.destroyAllPromise = destroyAllPromise;
172
+ return destroyAllPromise;
150
173
  }
151
174
  async withTimeout(promiseArg, timeoutMsArg, messageArg) {
152
175
  let timeout;
@@ -162,12 +185,24 @@ export class IntegrationRuntimeManager {
162
185
  }
163
186
  }
164
187
  }
165
- runExclusive(operationArg) {
166
- const operationPromise = this.operationTail
167
- .catch(() => undefined)
168
- .then(operationArg);
169
- this.operationTail = operationPromise;
170
- return operationPromise;
188
+ async performDestroyAll(timeoutMsArg) {
189
+ for (const [domain, runtime] of this.runtimes) {
190
+ this.runtimes.delete(domain);
191
+ this.markRuntimePendingCleanup(domain, runtime);
192
+ }
193
+ const runtimes = [...this.runtimesPendingCleanup.keys()];
194
+ const results = await Promise.allSettled(runtimes.map((runtimeArg) => this.destroyRuntime(runtimeArg, timeoutMsArg)));
195
+ const errors = results
196
+ .filter((resultArg) => resultArg.status === 'rejected')
197
+ .map((resultArg) => resultArg.reason);
198
+ if (errors.length > 0) {
199
+ throw new AggregateError(errors, 'Failed to destroy all integration runtimes cleanly');
200
+ }
201
+ }
202
+ markRuntimePendingCleanup(domainArg, runtimeArg) {
203
+ if (!this.runtimesPendingCleanup.has(runtimeArg)) {
204
+ this.runtimesPendingCleanup.set(runtimeArg, domainArg);
205
+ }
171
206
  }
172
207
  }
173
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.runtimemanager.js","sourceRoot":"","sources":["../../ts/core/classes.runtimemanager.ts"],"names":[],"mappings":"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"}
208
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.runtimemanager.js","sourceRoot":"","sources":["../../ts/core/classes.runtimemanager.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@smarthome.exchange/integrations",
3
- "version": "0.1.0",
3
+ "version": "0.2.0",
4
4
  "private": false,
5
5
  "description": "TypeScript-native device integrations for smarthome.exchange.",
6
6
  "engines": {
package/readme.md CHANGED
@@ -65,7 +65,7 @@ const matches = await engine.validateCandidate({
65
65
  console.log(matches);
66
66
  ```
67
67
 
68
- The hub uses the same primitives through `discoverIntegrationCandidates()` and `setupIntegration(...)`, then reconciles each runtime's complete normalized device snapshot into the canonical registry. Devices absent from a later snapshot are removed.
68
+ The hub uses the same primitives through `discoverIntegrationCandidates()` and `setupIntegration(...)`, then reconciles each runtime's complete normalized device snapshot into the canonical registry. Devices absent from a later snapshot are removed. `IntegrationRuntimeManager.createRuntime()` and `setupIntegration()` retry retained cleanup for the requested domain before invoking integration setup and fail closed with an `AggregateError` while cleanup still fails. Replacement setup destroys the previous runtime before constructing its successor, and overlapping same-domain setup calls are rejected. Failed replacement and mismatched-runtime cleanup remains retained under the requested domain; `retryPendingCleanup(domain)` is the explicit no-timeout retry entry point, while `hasPendingCleanup(domain)` exposes whether that gate remains closed.
69
69
 
70
70
  Runtime setup receives an optional abort signal. Device snapshots, subscriptions, and feature writes can also accept abort signals, allowing the hub to bound setup, synchronization, and writes. A control runtime may implement `writeFeature(...)`, `callService(...)`, or both; authoritative readable state still comes from a later `devices()` snapshot rather than an optimistic write. Every runtime implements `destroy()` for explicit cleanup.
71
71
 
@@ -3,6 +3,6 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@smarthome.exchange/integrations',
6
- version: '0.1.0',
6
+ version: '0.2.0',
7
7
  description: 'TypeScript-native device integrations for smarthome.exchange.'
8
8
  }
@@ -9,10 +9,11 @@ import type {
9
9
 
10
10
  export class IntegrationRuntimeManager {
11
11
  private readonly runtimes = new Map<string, IIntegrationRuntime>();
12
- private readonly runtimesPendingCleanup = new Set<IIntegrationRuntime>();
12
+ private readonly runtimesPendingCleanup = new Map<IIntegrationRuntime, string>();
13
13
  private readonly runtimeDestructionPromises = new Map<IIntegrationRuntime, Promise<void>>();
14
14
  private readonly destroyedRuntimes = new WeakSet<IIntegrationRuntime>();
15
- private operationTail: Promise<unknown> = Promise.resolve();
15
+ private readonly setupDomainsInProgress = new Set<string>();
16
+ private destroyAllPromise?: Promise<void>;
16
17
 
17
18
  public async createRuntime<TConfig>(
18
19
  integrationArg: BaseIntegration<TConfig>,
@@ -22,11 +23,13 @@ export class IntegrationRuntimeManager {
22
23
  if (integrationArg.status === 'descriptor-only') {
23
24
  throw createDescriptorOnlyIntegrationError(integrationArg.domain);
24
25
  }
26
+ await this.retryPendingCleanup(integrationArg.domain);
25
27
  const runtime = await integrationArg.setup(configArg, contextArg);
26
28
  if (runtime.domain !== integrationArg.domain) {
27
29
  const domainError = new Error(
28
30
  `Integration runtime domain mismatch: expected ${integrationArg.domain}, received ${runtime.domain}`
29
31
  );
32
+ this.markRuntimePendingCleanup(integrationArg.domain, runtime);
30
33
  try {
31
34
  await this.destroyRuntime(runtime);
32
35
  } catch (destroyError) {
@@ -45,29 +48,25 @@ export class IntegrationRuntimeManager {
45
48
  configArg: TConfig,
46
49
  contextArg: IIntegrationSetupContext = {}
47
50
  ): Promise<IIntegrationRuntime> {
48
- return this.runExclusive(async () => {
49
- const runtime = await this.createRuntime(integrationArg, configArg, contextArg);
51
+ if (this.destroyAllPromise) {
52
+ throw new Error('Cannot set up an integration while destroyAll is in progress.');
53
+ }
54
+ if (this.setupDomainsInProgress.has(integrationArg.domain)) {
55
+ throw new Error(`Integration setup is already in progress: ${integrationArg.domain}`);
56
+ }
57
+ this.setupDomainsInProgress.add(integrationArg.domain);
58
+ try {
59
+ await this.retryPendingCleanup(integrationArg.domain);
50
60
  const previousRuntime = this.retireRuntime(integrationArg.domain);
51
-
52
61
  if (previousRuntime) {
53
- try {
54
- await this.destroyRuntime(previousRuntime);
55
- } catch (destroyError) {
56
- try {
57
- await this.destroyRuntime(runtime);
58
- } catch (cleanupError) {
59
- throw new AggregateError(
60
- [destroyError, cleanupError],
61
- `Failed to replace integration runtime for ${integrationArg.domain}`
62
- );
63
- }
64
- throw destroyError;
65
- }
62
+ await this.destroyRuntime(previousRuntime);
66
63
  }
67
-
64
+ const runtime = await this.createRuntime(integrationArg, configArg, contextArg);
68
65
  this.activateRuntime(integrationArg.domain, runtime);
69
66
  return runtime;
70
- });
67
+ } finally {
68
+ this.setupDomainsInProgress.delete(integrationArg.domain);
69
+ }
71
70
  }
72
71
 
73
72
  public activateRuntime(domainArg: string, runtimeArg: IIntegrationRuntime): IIntegrationRuntime | undefined {
@@ -94,7 +93,7 @@ export class IntegrationRuntimeManager {
94
93
  public retireRuntime(domainArg: string, expectedRuntimeArg?: IIntegrationRuntime): IIntegrationRuntime | undefined {
95
94
  const runtime = this.removeRuntime(domainArg, expectedRuntimeArg);
96
95
  if (runtime) {
97
- this.runtimesPendingCleanup.add(runtime);
96
+ this.markRuntimePendingCleanup(domainArg, runtime);
98
97
  }
99
98
  return runtime;
100
99
  }
@@ -105,9 +104,12 @@ export class IntegrationRuntimeManager {
105
104
  ): Promise<void> {
106
105
  this.retireRuntime(runtimeArg.domain, runtimeArg);
107
106
  if (this.destroyedRuntimes.has(runtimeArg)) {
107
+ this.runtimesPendingCleanup.delete(runtimeArg);
108
108
  return Promise.resolve();
109
109
  }
110
- this.runtimesPendingCleanup.add(runtimeArg);
110
+ if (!this.runtimesPendingCleanup.has(runtimeArg)) {
111
+ this.markRuntimePendingCleanup(runtimeArg.domain, runtimeArg);
112
+ }
111
113
  let destructionPromise = this.runtimeDestructionPromises.get(runtimeArg);
112
114
  if (!destructionPromise) {
113
115
  const destroyAttempt = Promise.resolve().then(() => runtimeArg.destroy());
@@ -145,6 +147,33 @@ export class IntegrationRuntimeManager {
145
147
  return [...this.runtimes.values()];
146
148
  }
147
149
 
150
+ public async retryPendingCleanup(domainArg: string): Promise<void> {
151
+ const runtimes = [...this.runtimesPendingCleanup]
152
+ .filter(([, cleanupDomainArg]) => cleanupDomainArg === domainArg)
153
+ .map(([runtimeArg]) => runtimeArg);
154
+ if (runtimes.length === 0) {
155
+ return;
156
+ }
157
+ const results = await Promise.allSettled(
158
+ runtimes.map((runtimeArg) => this.destroyRuntime(runtimeArg))
159
+ );
160
+ const errors = results
161
+ .filter((resultArg): resultArg is PromiseRejectedResult => resultArg.status === 'rejected')
162
+ .map((resultArg) => resultArg.reason);
163
+ if (errors.length > 0) {
164
+ throw new AggregateError(
165
+ errors,
166
+ `Failed to clean up retained integration runtimes for ${domainArg}`
167
+ );
168
+ }
169
+ }
170
+
171
+ public hasPendingCleanup(domainArg: string): boolean {
172
+ return [...this.runtimesPendingCleanup.values()].some(
173
+ (cleanupDomainArg) => cleanupDomainArg === domainArg
174
+ );
175
+ }
176
+
148
177
  public async writeDeviceFeature(
149
178
  requestArg: IDeviceFeatureWriteRequest,
150
179
  expectedRuntimeArg?: IIntegrationRuntime,
@@ -181,24 +210,20 @@ export class IntegrationRuntimeManager {
181
210
  return runtime.writeFeature(requestArg, abortSignalArg);
182
211
  }
183
212
 
184
- public async destroyAll(timeoutMsArg?: number): Promise<void> {
185
- return this.runExclusive(async () => {
186
- for (const [domain, runtime] of this.runtimes) {
187
- this.runtimes.delete(domain);
188
- this.runtimesPendingCleanup.add(runtime);
189
- }
190
-
191
- const runtimes = [...this.runtimesPendingCleanup];
192
- const results = await Promise.allSettled(
193
- runtimes.map((runtimeArg) => this.destroyRuntime(runtimeArg, timeoutMsArg))
194
- );
195
- const errors = results
196
- .filter((resultArg): resultArg is PromiseRejectedResult => resultArg.status === 'rejected')
197
- .map((resultArg) => resultArg.reason);
198
- if (errors.length > 0) {
199
- throw new AggregateError(errors, 'Failed to destroy all integration runtimes cleanly');
213
+ public destroyAll(timeoutMsArg?: number): Promise<void> {
214
+ if (this.destroyAllPromise) {
215
+ return this.destroyAllPromise;
216
+ }
217
+ if (this.setupDomainsInProgress.size > 0) {
218
+ return Promise.reject(new Error('Cannot destroy integration runtimes while setup is in progress.'));
219
+ }
220
+ const destroyAllPromise = this.performDestroyAll(timeoutMsArg).finally(() => {
221
+ if (this.destroyAllPromise === destroyAllPromise) {
222
+ this.destroyAllPromise = undefined;
200
223
  }
201
224
  });
225
+ this.destroyAllPromise = destroyAllPromise;
226
+ return destroyAllPromise;
202
227
  }
203
228
 
204
229
  private async withTimeout<TResult>(
@@ -219,11 +244,30 @@ export class IntegrationRuntimeManager {
219
244
  }
220
245
  }
221
246
 
222
- private runExclusive<TResult>(operationArg: () => Promise<TResult>): Promise<TResult> {
223
- const operationPromise = this.operationTail
224
- .catch(() => undefined)
225
- .then(operationArg);
226
- this.operationTail = operationPromise;
227
- return operationPromise;
247
+ private async performDestroyAll(timeoutMsArg?: number): Promise<void> {
248
+ for (const [domain, runtime] of this.runtimes) {
249
+ this.runtimes.delete(domain);
250
+ this.markRuntimePendingCleanup(domain, runtime);
251
+ }
252
+
253
+ const runtimes = [...this.runtimesPendingCleanup.keys()];
254
+ const results = await Promise.allSettled(
255
+ runtimes.map((runtimeArg) => this.destroyRuntime(runtimeArg, timeoutMsArg))
256
+ );
257
+ const errors = results
258
+ .filter((resultArg): resultArg is PromiseRejectedResult => resultArg.status === 'rejected')
259
+ .map((resultArg) => resultArg.reason);
260
+ if (errors.length > 0) {
261
+ throw new AggregateError(errors, 'Failed to destroy all integration runtimes cleanly');
262
+ }
263
+ }
264
+
265
+ private markRuntimePendingCleanup(
266
+ domainArg: string,
267
+ runtimeArg: IIntegrationRuntime
268
+ ): void {
269
+ if (!this.runtimesPendingCleanup.has(runtimeArg)) {
270
+ this.runtimesPendingCleanup.set(runtimeArg, domainArg);
271
+ }
228
272
  }
229
273
  }