@serve.zone/dcrouter 13.40.3 → 13.41.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.
- package/deno.json +1 -1
- package/dist_serve/bundle.js +590 -546
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/classes.dcrouter.d.ts +26 -0
- package/dist_ts/classes.dcrouter.js +296 -80
- package/dist_ts/db/documents/classes.remote-ingress-hub-settings.doc.d.ts +10 -0
- package/dist_ts/db/documents/classes.remote-ingress-hub-settings.doc.js +88 -0
- package/dist_ts/db/documents/index.d.ts +1 -0
- package/dist_ts/db/documents/index.js +2 -1
- package/dist_ts/opsserver/handlers/config.handler.js +2 -2
- package/dist_ts/opsserver/handlers/remoteingress.handler.js +71 -55
- package/dist_ts/remoteingress/classes.remoteingress-manager.d.ts +12 -2
- package/dist_ts/remoteingress/classes.remoteingress-manager.js +136 -3
- package/dist_ts/remoteingress/classes.tunnel-manager.d.ts +2 -0
- package/dist_ts/remoteingress/classes.tunnel-manager.js +45 -13
- package/dist_ts_interfaces/data/remoteingress.d.ts +5 -0
- package/dist_ts_interfaces/requests/remoteingress.d.ts +30 -1
- package/dist_ts_web/00_commitinfo_data.js +1 -1
- package/dist_ts_web/appstate.d.ts +4 -0
- package/dist_ts_web/appstate.js +30 -2
- package/dist_ts_web/elements/network/ops-view-remoteingress.d.ts +4 -0
- package/dist_ts_web/elements/network/ops-view-remoteingress.js +148 -1
- package/package.json +1 -1
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/classes.dcrouter.ts +329 -84
- package/ts/db/documents/classes.remote-ingress-hub-settings.doc.ts +29 -0
- package/ts/db/documents/index.ts +1 -0
- package/ts/opsserver/handlers/config.handler.ts +1 -1
- package/ts/opsserver/handlers/remoteingress.handler.ts +97 -74
- package/ts/remoteingress/classes.remoteingress-manager.ts +172 -3
- package/ts/remoteingress/classes.tunnel-manager.ts +41 -14
- package/ts_web/00_commitinfo_data.ts +1 -1
- package/ts_web/appstate.ts +41 -1
- package/ts_web/elements/network/ops-view-remoteingress.ts +164 -0
|
@@ -1,5 +1,17 @@
|
|
|
1
1
|
import * as plugins from '../plugins.js';
|
|
2
|
-
import { RemoteIngressEdgeDoc } from '../db/index.js';
|
|
2
|
+
import { RemoteIngressEdgeDoc, RemoteIngressHubSettingsDoc } from '../db/index.js';
|
|
3
|
+
const performanceIntegerMaxByField = {
|
|
4
|
+
maxStreamsPerEdge: 100_000,
|
|
5
|
+
totalWindowBudgetBytes: 1_073_741_824,
|
|
6
|
+
minStreamWindowBytes: 16_777_216,
|
|
7
|
+
maxStreamWindowBytes: 134_217_728,
|
|
8
|
+
sustainedStreamWindowBytes: 134_217_728,
|
|
9
|
+
quicDatagramReceiveBufferBytes: 67_108_864,
|
|
10
|
+
streamFramePayloadBytes: 16_777_216,
|
|
11
|
+
firstDataConnectTimeoutMs: 3_600_000,
|
|
12
|
+
clientWriteTimeoutMs: 3_600_000,
|
|
13
|
+
};
|
|
14
|
+
const maxServerFirstPorts = 128;
|
|
3
15
|
function extractPorts(portRange) {
|
|
4
16
|
const ports = new Set(plugins.smartproxy.expandPortRange(portRange));
|
|
5
17
|
return [...ports].sort((a, b) => a - b);
|
|
@@ -10,10 +22,16 @@ function extractPorts(portRange) {
|
|
|
10
22
|
* the allowed edges list for the Rust hub.
|
|
11
23
|
*/
|
|
12
24
|
export class RemoteIngressManager {
|
|
25
|
+
seedHubPerformance;
|
|
13
26
|
edges = new Map();
|
|
14
27
|
routes = [];
|
|
15
28
|
firewallConfig;
|
|
16
|
-
|
|
29
|
+
hubSettings = {
|
|
30
|
+
updatedAt: 0,
|
|
31
|
+
updatedBy: 'default',
|
|
32
|
+
};
|
|
33
|
+
constructor(seedHubPerformance) {
|
|
34
|
+
this.seedHubPerformance = seedHubPerformance;
|
|
17
35
|
}
|
|
18
36
|
/**
|
|
19
37
|
* Load all edge registrations from the database into memory.
|
|
@@ -41,6 +59,25 @@ export class RemoteIngressManager {
|
|
|
41
59
|
};
|
|
42
60
|
this.edges.set(edge.id, edge);
|
|
43
61
|
}
|
|
62
|
+
await this.initializeHubSettings();
|
|
63
|
+
}
|
|
64
|
+
async initializeHubSettings() {
|
|
65
|
+
let doc = await RemoteIngressHubSettingsDoc.load();
|
|
66
|
+
if (!doc) {
|
|
67
|
+
const seedPerformance = this.normalizePerformanceConfig(this.seedHubPerformance);
|
|
68
|
+
if (seedPerformance) {
|
|
69
|
+
doc = new RemoteIngressHubSettingsDoc();
|
|
70
|
+
doc.settingsId = 'remote-ingress-hub-settings';
|
|
71
|
+
doc.performance = seedPerformance;
|
|
72
|
+
doc.updatedAt = Date.now();
|
|
73
|
+
doc.updatedBy = 'seed';
|
|
74
|
+
await doc.save();
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
this.hubSettings = doc ? this.toHubSettings(doc) : {
|
|
78
|
+
updatedAt: 0,
|
|
79
|
+
updatedBy: 'default',
|
|
80
|
+
};
|
|
44
81
|
}
|
|
45
82
|
/**
|
|
46
83
|
* Store the current route configs for port derivation.
|
|
@@ -54,6 +91,30 @@ export class RemoteIngressManager {
|
|
|
54
91
|
setFirewallConfig(firewallConfig) {
|
|
55
92
|
this.firewallConfig = firewallConfig;
|
|
56
93
|
}
|
|
94
|
+
getHubSettings() {
|
|
95
|
+
return {
|
|
96
|
+
...this.hubSettings,
|
|
97
|
+
performance: this.hubSettings.performance ? { ...this.hubSettings.performance } : undefined,
|
|
98
|
+
};
|
|
99
|
+
}
|
|
100
|
+
getHubPerformanceConfig() {
|
|
101
|
+
return this.hubSettings.performance && Object.keys(this.hubSettings.performance).length > 0
|
|
102
|
+
? { ...this.hubSettings.performance }
|
|
103
|
+
: undefined;
|
|
104
|
+
}
|
|
105
|
+
async updateHubSettings(updates, updatedBy) {
|
|
106
|
+
let doc = await RemoteIngressHubSettingsDoc.load();
|
|
107
|
+
if (!doc) {
|
|
108
|
+
doc = new RemoteIngressHubSettingsDoc();
|
|
109
|
+
doc.settingsId = 'remote-ingress-hub-settings';
|
|
110
|
+
}
|
|
111
|
+
doc.performance = this.normalizePerformanceConfig(updates.performance);
|
|
112
|
+
doc.updatedAt = Date.now();
|
|
113
|
+
doc.updatedBy = updatedBy;
|
|
114
|
+
await doc.save();
|
|
115
|
+
this.hubSettings = this.toHubSettings(doc);
|
|
116
|
+
return this.getHubSettings();
|
|
117
|
+
}
|
|
57
118
|
/**
|
|
58
119
|
* Derive listen ports for an edge from routes tagged with remoteIngress.enabled.
|
|
59
120
|
* When a route specifies edgeFilter, only edges whose id or tags match get that route's ports.
|
|
@@ -283,5 +344,77 @@ export class RemoteIngressManager {
|
|
|
283
344
|
}
|
|
284
345
|
return result;
|
|
285
346
|
}
|
|
347
|
+
normalizePerformanceConfig(performance) {
|
|
348
|
+
if (!performance) {
|
|
349
|
+
return undefined;
|
|
350
|
+
}
|
|
351
|
+
const next = {};
|
|
352
|
+
const validProfiles = ['balanced', 'throughput', 'highConcurrency'];
|
|
353
|
+
if (performance.profile !== undefined) {
|
|
354
|
+
if (!validProfiles.includes(performance.profile)) {
|
|
355
|
+
throw new Error('Invalid RemoteIngress performance profile');
|
|
356
|
+
}
|
|
357
|
+
next.profile = performance.profile;
|
|
358
|
+
}
|
|
359
|
+
const assignPositiveInteger = (field) => {
|
|
360
|
+
const value = performance[field];
|
|
361
|
+
if (value === undefined) {
|
|
362
|
+
return;
|
|
363
|
+
}
|
|
364
|
+
const maxValue = performanceIntegerMaxByField[field];
|
|
365
|
+
if (!Number.isSafeInteger(value) || value < 1 || value > maxValue) {
|
|
366
|
+
throw new Error(`${field} must be a positive safe integer no greater than ${maxValue}`);
|
|
367
|
+
}
|
|
368
|
+
next[field] = value;
|
|
369
|
+
};
|
|
370
|
+
assignPositiveInteger('maxStreamsPerEdge');
|
|
371
|
+
assignPositiveInteger('totalWindowBudgetBytes');
|
|
372
|
+
assignPositiveInteger('minStreamWindowBytes');
|
|
373
|
+
assignPositiveInteger('maxStreamWindowBytes');
|
|
374
|
+
assignPositiveInteger('sustainedStreamWindowBytes');
|
|
375
|
+
assignPositiveInteger('quicDatagramReceiveBufferBytes');
|
|
376
|
+
assignPositiveInteger('streamFramePayloadBytes');
|
|
377
|
+
assignPositiveInteger('firstDataConnectTimeoutMs');
|
|
378
|
+
assignPositiveInteger('clientWriteTimeoutMs');
|
|
379
|
+
if (next.minStreamWindowBytes !== undefined
|
|
380
|
+
&& next.maxStreamWindowBytes !== undefined
|
|
381
|
+
&& next.minStreamWindowBytes > next.maxStreamWindowBytes) {
|
|
382
|
+
throw new Error('minStreamWindowBytes must not exceed maxStreamWindowBytes');
|
|
383
|
+
}
|
|
384
|
+
if (next.sustainedStreamWindowBytes !== undefined
|
|
385
|
+
&& next.maxStreamWindowBytes !== undefined
|
|
386
|
+
&& next.sustainedStreamWindowBytes > next.maxStreamWindowBytes) {
|
|
387
|
+
throw new Error('sustainedStreamWindowBytes must not exceed maxStreamWindowBytes');
|
|
388
|
+
}
|
|
389
|
+
const configuredServerFirstPorts = performance.serverFirstPorts;
|
|
390
|
+
if (configuredServerFirstPorts !== undefined) {
|
|
391
|
+
if (!Array.isArray(configuredServerFirstPorts)) {
|
|
392
|
+
throw new Error('serverFirstPorts must contain valid port numbers');
|
|
393
|
+
}
|
|
394
|
+
if (configuredServerFirstPorts.length > maxServerFirstPorts) {
|
|
395
|
+
throw new Error(`serverFirstPorts must contain at most ${maxServerFirstPorts} ports`);
|
|
396
|
+
}
|
|
397
|
+
const serverFirstPorts = [...new Set(configuredServerFirstPorts.map((port) => Number(port)))].sort((a, b) => a - b);
|
|
398
|
+
for (const port of serverFirstPorts) {
|
|
399
|
+
if (!Number.isInteger(port) || port < 1 || port > 65535) {
|
|
400
|
+
throw new Error('serverFirstPorts must contain valid port numbers');
|
|
401
|
+
}
|
|
402
|
+
if (port === 443) {
|
|
403
|
+
throw new Error('Port 443 is client-first TLS and must not be listed as server-first');
|
|
404
|
+
}
|
|
405
|
+
}
|
|
406
|
+
if (serverFirstPorts.length > 0) {
|
|
407
|
+
next.serverFirstPorts = serverFirstPorts;
|
|
408
|
+
}
|
|
409
|
+
}
|
|
410
|
+
return Object.keys(next).length > 0 ? next : undefined;
|
|
411
|
+
}
|
|
412
|
+
toHubSettings(doc) {
|
|
413
|
+
return {
|
|
414
|
+
performance: doc.performance,
|
|
415
|
+
updatedAt: doc.updatedAt,
|
|
416
|
+
updatedBy: doc.updatedBy,
|
|
417
|
+
};
|
|
418
|
+
}
|
|
286
419
|
}
|
|
287
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.remoteingress-manager.js","sourceRoot":"","sources":["../../../ts/remoteingress/classes.remoteingress-manager.ts"],"names":[],"mappings":"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"}
|
|
420
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.remoteingress-manager.js","sourceRoot":"","sources":["../../../ts/remoteingress/classes.remoteingress-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,6 +19,8 @@ export declare class TunnelManager {
|
|
|
19
19
|
private edgeStatuses;
|
|
20
20
|
private reconcileInterval;
|
|
21
21
|
private syncChain;
|
|
22
|
+
private reconcileChain;
|
|
23
|
+
private stopped;
|
|
22
24
|
constructor(manager: RemoteIngressManager, config?: ITunnelManagerConfig);
|
|
23
25
|
/**
|
|
24
26
|
* Start the tunnel hub and load allowed edges.
|
|
@@ -9,6 +9,8 @@ export class TunnelManager {
|
|
|
9
9
|
edgeStatuses = new Map();
|
|
10
10
|
reconcileInterval = null;
|
|
11
11
|
syncChain = Promise.resolve();
|
|
12
|
+
reconcileChain = Promise.resolve();
|
|
13
|
+
stopped = true;
|
|
12
14
|
constructor(manager, config = {}) {
|
|
13
15
|
this.manager = manager;
|
|
14
16
|
this.config = config;
|
|
@@ -45,27 +47,49 @@ export class TunnelManager {
|
|
|
45
47
|
* Start the tunnel hub and load allowed edges.
|
|
46
48
|
*/
|
|
47
49
|
async start() {
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
50
|
+
this.stopped = false;
|
|
51
|
+
try {
|
|
52
|
+
await this.hub.start({
|
|
53
|
+
tunnelPort: this.config.tunnelPort ?? 8443,
|
|
54
|
+
targetHost: this.config.targetHost ?? '127.0.0.1',
|
|
55
|
+
tls: this.config.tls,
|
|
56
|
+
...(this.config.performance ? { performance: this.config.performance } : {}),
|
|
57
|
+
});
|
|
58
|
+
if (this.stopped)
|
|
59
|
+
return;
|
|
60
|
+
// Send allowed edges to the hub
|
|
61
|
+
await this.syncAllowedEdges();
|
|
62
|
+
if (this.stopped)
|
|
63
|
+
return;
|
|
64
|
+
// Periodically reconcile with authoritative Rust hub status
|
|
65
|
+
this.reconcileInterval = setInterval(() => {
|
|
66
|
+
this.reconcileChain = this.reconcileChain
|
|
67
|
+
.catch(() => { })
|
|
68
|
+
.then(() => this.reconcile());
|
|
69
|
+
this.reconcileChain.catch(() => { });
|
|
70
|
+
}, 15_000);
|
|
71
|
+
}
|
|
72
|
+
catch (err) {
|
|
73
|
+
await this.stop();
|
|
74
|
+
throw err;
|
|
75
|
+
}
|
|
60
76
|
}
|
|
61
77
|
/**
|
|
62
78
|
* Stop the tunnel hub.
|
|
63
79
|
*/
|
|
64
80
|
async stop() {
|
|
81
|
+
if (this.stopped) {
|
|
82
|
+
return;
|
|
83
|
+
}
|
|
84
|
+
this.stopped = true;
|
|
65
85
|
if (this.reconcileInterval) {
|
|
66
86
|
clearInterval(this.reconcileInterval);
|
|
67
87
|
this.reconcileInterval = null;
|
|
68
88
|
}
|
|
89
|
+
await Promise.all([
|
|
90
|
+
this.syncChain.catch(() => { }),
|
|
91
|
+
this.reconcileChain.catch(() => { }),
|
|
92
|
+
]);
|
|
69
93
|
// Remove event listeners before stopping to prevent leaks
|
|
70
94
|
this.hub.removeAllListeners();
|
|
71
95
|
await this.hub.stop();
|
|
@@ -76,7 +100,11 @@ export class TunnelManager {
|
|
|
76
100
|
* Overwrites event-derived activeTunnels with the real activeStreams count.
|
|
77
101
|
*/
|
|
78
102
|
async reconcile() {
|
|
103
|
+
if (this.stopped)
|
|
104
|
+
return;
|
|
79
105
|
const hubStatus = await this.hub.getStatus();
|
|
106
|
+
if (this.stopped)
|
|
107
|
+
return;
|
|
80
108
|
if (!hubStatus || !hubStatus.connectedEdges)
|
|
81
109
|
return;
|
|
82
110
|
const rustEdgeIds = new Set();
|
|
@@ -119,7 +147,11 @@ export class TunnelManager {
|
|
|
119
147
|
*/
|
|
120
148
|
async syncAllowedEdges() {
|
|
121
149
|
const run = this.syncChain.catch(() => { }).then(async () => {
|
|
150
|
+
if (this.stopped)
|
|
151
|
+
return;
|
|
122
152
|
const edges = this.manager.getAllowedEdges();
|
|
153
|
+
if (this.stopped)
|
|
154
|
+
return;
|
|
123
155
|
await this.hub.updateAllowedEdges(edges);
|
|
124
156
|
});
|
|
125
157
|
this.syncChain = run;
|
|
@@ -180,4 +212,4 @@ export class TunnelManager {
|
|
|
180
212
|
return total;
|
|
181
213
|
}
|
|
182
214
|
}
|
|
183
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
215
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.tunnel-manager.js","sourceRoot":"","sources":["../../../ts/remoteingress/classes.tunnel-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -58,6 +58,11 @@ export interface IRemoteIngressPerformanceConfig {
|
|
|
58
58
|
clientWriteTimeoutMs?: number;
|
|
59
59
|
serverFirstPorts?: number[];
|
|
60
60
|
}
|
|
61
|
+
export interface IRemoteIngressHubSettings {
|
|
62
|
+
performance?: IRemoteIngressPerformanceConfig;
|
|
63
|
+
updatedAt: number;
|
|
64
|
+
updatedBy: string;
|
|
65
|
+
}
|
|
61
66
|
export interface IRemoteIngressPerformanceEffective {
|
|
62
67
|
profile: TRemoteIngressPerformanceProfile;
|
|
63
68
|
maxStreamsPerEdge: number;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as plugins from '../plugins.js';
|
|
2
2
|
import * as authInterfaces from '../data/auth.js';
|
|
3
|
-
import type { IRemoteIngress, IRemoteIngressPerformanceConfig, IRemoteIngressStatus } from '../data/remoteingress.js';
|
|
3
|
+
import type { IRemoteIngress, IRemoteIngressHubSettings, IRemoteIngressPerformanceConfig, IRemoteIngressStatus } from '../data/remoteingress.js';
|
|
4
4
|
/**
|
|
5
5
|
* Create a new remote ingress edge registration.
|
|
6
6
|
*/
|
|
@@ -115,3 +115,32 @@ export interface IReq_GetRemoteIngressConnectionToken extends plugins.typedreque
|
|
|
115
115
|
message?: string;
|
|
116
116
|
};
|
|
117
117
|
}
|
|
118
|
+
/**
|
|
119
|
+
* Get hub-level RemoteIngress settings.
|
|
120
|
+
*/
|
|
121
|
+
export interface IReq_GetRemoteIngressHubSettings extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IReq_GetRemoteIngressHubSettings> {
|
|
122
|
+
method: 'getRemoteIngressHubSettings';
|
|
123
|
+
request: {
|
|
124
|
+
identity?: authInterfaces.IIdentity;
|
|
125
|
+
apiToken?: string;
|
|
126
|
+
};
|
|
127
|
+
response: {
|
|
128
|
+
settings: IRemoteIngressHubSettings;
|
|
129
|
+
};
|
|
130
|
+
}
|
|
131
|
+
/**
|
|
132
|
+
* Update hub-level RemoteIngress settings.
|
|
133
|
+
*/
|
|
134
|
+
export interface IReq_UpdateRemoteIngressHubSettings extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IReq_UpdateRemoteIngressHubSettings> {
|
|
135
|
+
method: 'updateRemoteIngressHubSettings';
|
|
136
|
+
request: {
|
|
137
|
+
identity?: authInterfaces.IIdentity;
|
|
138
|
+
apiToken?: string;
|
|
139
|
+
performance?: IRemoteIngressPerformanceConfig;
|
|
140
|
+
};
|
|
141
|
+
response: {
|
|
142
|
+
success: boolean;
|
|
143
|
+
settings?: IRemoteIngressHubSettings;
|
|
144
|
+
message?: string;
|
|
145
|
+
};
|
|
146
|
+
}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@serve.zone/dcrouter',
|
|
6
|
-
version: '13.
|
|
6
|
+
version: '13.41.1',
|
|
7
7
|
description: 'A multifaceted routing service handling mail and SMS delivery functions.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vdHNfd2ViLzAwX2NvbW1pdGluZm9fZGF0YS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7R0FFRztBQUNILE1BQU0sQ0FBQyxNQUFNLFVBQVUsR0FBRztJQUN4QixJQUFJLEVBQUUsc0JBQXNCO0lBQzVCLE9BQU8sRUFBRSxTQUFTO0lBQ2xCLFdBQVcsRUFBRSwwRUFBMEU7Q0FDeEYsQ0FBQSJ9
|
|
@@ -131,6 +131,7 @@ export declare const acmeConfigStatePart: plugins.deesElement.domtools.plugins.s
|
|
|
131
131
|
export interface IRemoteIngressState {
|
|
132
132
|
edges: interfaces.data.IRemoteIngress[];
|
|
133
133
|
statuses: interfaces.data.IRemoteIngressStatus[];
|
|
134
|
+
hubSettings: interfaces.data.IRemoteIngressHubSettings | null;
|
|
134
135
|
selectedEdgeId: string | null;
|
|
135
136
|
newEdgeId: string | null;
|
|
136
137
|
isLoading: boolean;
|
|
@@ -259,6 +260,9 @@ export declare const updateRemoteIngressAction: plugins.deesElement.domtools.plu
|
|
|
259
260
|
performance?: interfaces.data.IRemoteIngressPerformanceConfig;
|
|
260
261
|
tags?: string[];
|
|
261
262
|
}>;
|
|
263
|
+
export declare const updateRemoteIngressHubSettingsAction: plugins.deesElement.domtools.plugins.smartstate.StateAction<IRemoteIngressState, {
|
|
264
|
+
performance?: interfaces.data.IRemoteIngressPerformanceConfig;
|
|
265
|
+
}>;
|
|
262
266
|
export declare const regenerateRemoteIngressSecretAction: plugins.deesElement.domtools.plugins.smartstate.StateAction<IRemoteIngressState, string>;
|
|
263
267
|
export declare const clearNewEdgeIdAction: plugins.deesElement.domtools.plugins.smartstate.StateAction<IRemoteIngressState, unknown>;
|
|
264
268
|
export declare const toggleRemoteIngressAction: plugins.deesElement.domtools.plugins.smartstate.StateAction<IRemoteIngressState, {
|