@fastybird/smart-panel-backend 1.1.0-alpha.40 → 1.1.0-alpha.42
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/dist/app.module.js +1 -1
- package/dist/app.module.js.map +1 -1
- package/dist/common/utils/cancellable-exec.utils.d.ts +5 -0
- package/dist/common/utils/cancellable-exec.utils.js +34 -0
- package/dist/common/utils/cancellable-exec.utils.js.map +1 -0
- package/dist/common/utils/remote-access-observation.utils.d.ts +11 -0
- package/dist/common/utils/remote-access-observation.utils.js +89 -0
- package/dist/common/utils/remote-access-observation.utils.js.map +1 -0
- package/dist/modules/auth/auth.module.js +4 -0
- package/dist/modules/auth/auth.module.js.map +1 -1
- package/dist/modules/auth/guards/auth.guard.js +8 -13
- package/dist/modules/auth/guards/auth.guard.js.map +1 -1
- package/dist/modules/auth/services/token-metadata.service.d.ts +42 -0
- package/dist/modules/auth/services/token-metadata.service.js +202 -0
- package/dist/modules/auth/services/token-metadata.service.js.map +1 -0
- package/dist/modules/auth/services/token-usage.service.d.ts +22 -0
- package/dist/modules/auth/services/token-usage.service.js +93 -0
- package/dist/modules/auth/services/token-usage.service.js.map +1 -0
- package/dist/modules/auth/services/tokens.service.d.ts +8 -2
- package/dist/modules/auth/services/tokens.service.js +16 -10
- package/dist/modules/auth/services/tokens.service.js.map +1 -1
- package/dist/modules/devices/devices.module.js +7 -0
- package/dist/modules/devices/devices.module.js.map +1 -1
- package/dist/modules/devices/dto/property-command.dto.js +2 -8
- package/dist/modules/devices/dto/property-command.dto.js.map +1 -1
- package/dist/modules/devices/services/device-command-graph.service.d.ts +18 -0
- package/dist/modules/devices/services/device-command-graph.service.js +92 -0
- package/dist/modules/devices/services/device-command-graph.service.js.map +1 -0
- package/dist/modules/devices/services/devices.service.js +2 -17
- package/dist/modules/devices/services/devices.service.js.map +1 -1
- package/dist/modules/devices/services/property-command-dispatch.service.d.ts +5 -3
- package/dist/modules/devices/services/property-command-dispatch.service.js +15 -12
- package/dist/modules/devices/services/property-command-dispatch.service.js.map +1 -1
- package/dist/modules/devices/services/property-command.service.d.ts +7 -5
- package/dist/modules/devices/services/property-command.service.js +41 -20
- package/dist/modules/devices/services/property-command.service.js.map +1 -1
- package/dist/modules/devices/services/property-metadata.service.d.ts +9 -2
- package/dist/modules/devices/services/property-metadata.service.js +67 -17
- package/dist/modules/devices/services/property-metadata.service.js.map +1 -1
- package/dist/modules/devices/utils/device-graph-query.utils.d.ts +3 -0
- package/dist/modules/devices/utils/device-graph-query.utils.js +23 -0
- package/dist/modules/devices/utils/device-graph-query.utils.js.map +1 -0
- package/dist/modules/devices/validators/property-command-target-constraint.validator.d.ts +9 -0
- package/dist/modules/devices/validators/property-command-target-constraint.validator.js +58 -0
- package/dist/modules/devices/validators/property-command-target-constraint.validator.js.map +1 -0
- package/dist/modules/remote-access/controllers/remote-access.controller.js +9 -5
- package/dist/modules/remote-access/controllers/remote-access.controller.js.map +1 -1
- package/dist/modules/remote-access/models/provider.model.d.ts +3 -0
- package/dist/modules/remote-access/models/provider.model.js +23 -0
- package/dist/modules/remote-access/models/provider.model.js.map +1 -1
- package/dist/modules/remote-access/models/status.model.d.ts +2 -0
- package/dist/modules/remote-access/models/status.model.js +18 -1
- package/dist/modules/remote-access/models/status.model.js.map +1 -1
- package/dist/modules/remote-access/models/urls.model.d.ts +2 -0
- package/dist/modules/remote-access/models/urls.model.js +17 -0
- package/dist/modules/remote-access/models/urls.model.js.map +1 -1
- package/dist/modules/remote-access/platforms/remote-access-provider.platform.d.ts +18 -1
- package/dist/modules/remote-access/remote-access.constants.d.ts +2 -1
- package/dist/modules/remote-access/remote-access.constants.js +2 -1
- package/dist/modules/remote-access/remote-access.constants.js.map +1 -1
- package/dist/modules/remote-access/services/remote-access-proxy-contribution.service.d.ts +1 -0
- package/dist/modules/remote-access/services/remote-access-proxy-contribution.service.js +4 -1
- package/dist/modules/remote-access/services/remote-access-proxy-contribution.service.js.map +1 -1
- package/dist/modules/remote-access/services/remote-access-status.service.d.ts +40 -8
- package/dist/modules/remote-access/services/remote-access-status.service.js +314 -65
- package/dist/modules/remote-access/services/remote-access-status.service.js.map +1 -1
- package/dist/modules/remote-access/services/remote-access-url.service.d.ts +2 -2
- package/dist/modules/remote-access/services/remote-access-url.service.js +4 -2
- package/dist/modules/remote-access/services/remote-access-url.service.js.map +1 -1
- package/dist/modules/spaces/services/module-reset.service.d.ts +5 -1
- package/dist/modules/spaces/services/module-reset.service.js +10 -2
- package/dist/modules/spaces/services/module-reset.service.js.map +1 -1
- package/dist/modules/spaces/services/space-activity.service.d.ts +14 -0
- package/dist/modules/spaces/services/space-activity.service.js +56 -0
- package/dist/modules/spaces/services/space-activity.service.js.map +1 -0
- package/dist/modules/spaces/spaces.module.js +5 -0
- package/dist/modules/spaces/spaces.module.js.map +1 -1
- package/dist/modules/spaces/subscribers/space-activity.subscriber.d.ts +17 -0
- package/dist/modules/spaces/subscribers/space-activity.subscriber.js +89 -0
- package/dist/modules/spaces/subscribers/space-activity.subscriber.js.map +1 -0
- package/dist/modules/websocket/gateway/websocket.gateway.js +1 -0
- package/dist/modules/websocket/gateway/websocket.gateway.js.map +1 -1
- package/dist/modules/websocket/services/ws-auth.service.js +12 -28
- package/dist/modules/websocket/services/ws-auth.service.js.map +1 -1
- package/dist/plugins/devices-virtual/platforms/virtual-device.platform.d.ts +3 -8
- package/dist/plugins/devices-virtual/platforms/virtual-device.platform.js +6 -36
- package/dist/plugins/devices-virtual/platforms/virtual-device.platform.js.map +1 -1
- package/dist/plugins/remote-access-cloudflare-tunnel/controllers/setup.controller.d.ts +5 -3
- package/dist/plugins/remote-access-cloudflare-tunnel/controllers/setup.controller.js +20 -8
- package/dist/plugins/remote-access-cloudflare-tunnel/controllers/setup.controller.js.map +1 -1
- package/dist/plugins/remote-access-cloudflare-tunnel/controllers/status.controller.d.ts +3 -5
- package/dist/plugins/remote-access-cloudflare-tunnel/controllers/status.controller.js +11 -10
- package/dist/plugins/remote-access-cloudflare-tunnel/controllers/status.controller.js.map +1 -1
- package/dist/plugins/remote-access-cloudflare-tunnel/models/status.model.d.ts +2 -0
- package/dist/plugins/remote-access-cloudflare-tunnel/models/status.model.js +17 -0
- package/dist/plugins/remote-access-cloudflare-tunnel/models/status.model.js.map +1 -1
- package/dist/plugins/remote-access-cloudflare-tunnel/services/cloudflare-tunnel-managed.service.d.ts +20 -2
- package/dist/plugins/remote-access-cloudflare-tunnel/services/cloudflare-tunnel-managed.service.js +105 -48
- package/dist/plugins/remote-access-cloudflare-tunnel/services/cloudflare-tunnel-managed.service.js.map +1 -1
- package/dist/plugins/remote-access-cloudflare-tunnel/services/cloudflare-tunnel-provider.service.d.ts +13 -1
- package/dist/plugins/remote-access-cloudflare-tunnel/services/cloudflare-tunnel-provider.service.js +8 -2
- package/dist/plugins/remote-access-cloudflare-tunnel/services/cloudflare-tunnel-provider.service.js.map +1 -1
- package/dist/plugins/remote-access-cloudflare-tunnel/services/cloudflared-cli.service.d.ts +1 -1
- package/dist/plugins/remote-access-cloudflare-tunnel/services/cloudflared-cli.service.js +12 -24
- package/dist/plugins/remote-access-cloudflare-tunnel/services/cloudflared-cli.service.js.map +1 -1
- package/dist/plugins/remote-access-cloudflare-tunnel/services/cloudflared-metrics.service.d.ts +1 -1
- package/dist/plugins/remote-access-cloudflare-tunnel/services/cloudflared-metrics.service.js +5 -2
- package/dist/plugins/remote-access-cloudflare-tunnel/services/cloudflared-metrics.service.js.map +1 -1
- package/dist/plugins/remote-access-tailscale/controllers/setup.controller.d.ts +10 -5
- package/dist/plugins/remote-access-tailscale/controllers/setup.controller.js +105 -15
- package/dist/plugins/remote-access-tailscale/controllers/setup.controller.js.map +1 -1
- package/dist/plugins/remote-access-tailscale/controllers/status.controller.d.ts +5 -4
- package/dist/plugins/remote-access-tailscale/controllers/status.controller.js +19 -9
- package/dist/plugins/remote-access-tailscale/controllers/status.controller.js.map +1 -1
- package/dist/plugins/remote-access-tailscale/models/status.model.d.ts +16 -0
- package/dist/plugins/remote-access-tailscale/models/status.model.js +100 -1
- package/dist/plugins/remote-access-tailscale/models/status.model.js.map +1 -1
- package/dist/plugins/remote-access-tailscale/remote-access-tailscale.constants.d.ts +2 -0
- package/dist/plugins/remote-access-tailscale/remote-access-tailscale.constants.js +3 -1
- package/dist/plugins/remote-access-tailscale/remote-access-tailscale.constants.js.map +1 -1
- package/dist/plugins/remote-access-tailscale/remote-access-tailscale.exceptions.d.ts +17 -1
- package/dist/plugins/remote-access-tailscale/remote-access-tailscale.exceptions.js +33 -1
- package/dist/plugins/remote-access-tailscale/remote-access-tailscale.exceptions.js.map +1 -1
- package/dist/plugins/remote-access-tailscale/remote-access-tailscale.openapi.d.ts +2 -2
- package/dist/plugins/remote-access-tailscale/remote-access-tailscale.openapi.js +1 -0
- package/dist/plugins/remote-access-tailscale/remote-access-tailscale.openapi.js.map +1 -1
- package/dist/plugins/remote-access-tailscale/remote-access-tailscale.plugin.js +2 -0
- package/dist/plugins/remote-access-tailscale/remote-access-tailscale.plugin.js.map +1 -1
- package/dist/plugins/remote-access-tailscale/services/tailscale-cli.service.d.ts +8 -4
- package/dist/plugins/remote-access-tailscale/services/tailscale-cli.service.js +58 -14
- package/dist/plugins/remote-access-tailscale/services/tailscale-cli.service.js.map +1 -1
- package/dist/plugins/remote-access-tailscale/services/tailscale-login.service.d.ts +8 -3
- package/dist/plugins/remote-access-tailscale/services/tailscale-login.service.js +175 -151
- package/dist/plugins/remote-access-tailscale/services/tailscale-login.service.js.map +1 -1
- package/dist/plugins/remote-access-tailscale/services/tailscale-node-managed.service.d.ts +51 -7
- package/dist/plugins/remote-access-tailscale/services/tailscale-node-managed.service.js +481 -101
- package/dist/plugins/remote-access-tailscale/services/tailscale-node-managed.service.js.map +1 -1
- package/dist/plugins/remote-access-tailscale/services/tailscale-operation-coordinator.service.d.ts +33 -0
- package/dist/plugins/remote-access-tailscale/services/tailscale-operation-coordinator.service.js +167 -0
- package/dist/plugins/remote-access-tailscale/services/tailscale-operation-coordinator.service.js.map +1 -0
- package/dist/plugins/remote-access-tailscale/services/tailscale-provider.service.d.ts +13 -1
- package/dist/plugins/remote-access-tailscale/services/tailscale-provider.service.js +8 -2
- package/dist/plugins/remote-access-tailscale/services/tailscale-provider.service.js.map +1 -1
- package/dist/plugins/remote-access-tailscale/services/tailscale-serve.service.d.ts +1 -1
- package/dist/plugins/remote-access-tailscale/services/tailscale-serve.service.js +7 -6
- package/dist/plugins/remote-access-tailscale/services/tailscale-serve.service.js.map +1 -1
- package/dist/plugins/remote-access-tailscale/services/tailscale-setup.service.d.ts +1 -3
- package/dist/plugins/remote-access-tailscale/services/tailscale-setup.service.js +9 -11
- package/dist/plugins/remote-access-tailscale/services/tailscale-setup.service.js.map +1 -1
- package/dist/plugins/remote-access-tailscale/utils/tailscale-control.utils.d.ts +5 -0
- package/dist/plugins/remote-access-tailscale/utils/tailscale-control.utils.js +36 -0
- package/dist/plugins/remote-access-tailscale/utils/tailscale-control.utils.js.map +1 -0
- package/dist/plugins/spaces-home-control/listeners/space-activity.listener.d.ts +6 -7
- package/dist/plugins/spaces-home-control/listeners/space-activity.listener.js +19 -44
- package/dist/plugins/spaces-home-control/listeners/space-activity.listener.js.map +1 -1
- package/dist/plugins/spaces-home-control/listeners/space-climate-state.listener.d.ts +4 -4
- package/dist/plugins/spaces-home-control/listeners/space-climate-state.listener.js +9 -22
- package/dist/plugins/spaces-home-control/listeners/space-climate-state.listener.js.map +1 -1
- package/dist/plugins/spaces-home-control/listeners/space-lighting-state.listener.d.ts +4 -4
- package/dist/plugins/spaces-home-control/listeners/space-lighting-state.listener.js +9 -22
- package/dist/plugins/spaces-home-control/listeners/space-lighting-state.listener.js.map +1 -1
- package/dist/plugins/spaces-home-control/listeners/space-sensor-state.listener.d.ts +4 -4
- package/dist/plugins/spaces-home-control/listeners/space-sensor-state.listener.js +9 -22
- package/dist/plugins/spaces-home-control/listeners/space-sensor-state.listener.js.map +1 -1
- package/dist/plugins/spaces-home-control/services/space-climate-state.service.d.ts +3 -5
- package/dist/plugins/spaces-home-control/services/space-climate-state.service.js +9 -12
- package/dist/plugins/spaces-home-control/services/space-climate-state.service.js.map +1 -1
- package/dist/plugins/spaces-home-control/services/space-lighting-state.service.d.ts +3 -5
- package/dist/plugins/spaces-home-control/services/space-lighting-state.service.js +7 -10
- package/dist/plugins/spaces-home-control/services/space-lighting-state.service.js.map +1 -1
- package/dist/plugins/spaces-home-control/services/space-sensor-state.service.d.ts +3 -5
- package/dist/plugins/spaces-home-control/services/space-sensor-state.service.js +7 -10
- package/dist/plugins/spaces-home-control/services/space-sensor-state.service.js.map +1 -1
- package/dist/plugins/spaces-home-control/services/space-state-read.service.d.ts +47 -0
- package/dist/plugins/spaces-home-control/services/space-state-read.service.js +262 -0
- package/dist/plugins/spaces-home-control/services/space-state-read.service.js.map +1 -0
- package/dist/plugins/spaces-home-control/spaces-home-control.plugin.js +4 -0
- package/dist/plugins/spaces-home-control/spaces-home-control.plugin.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +2 -2
|
@@ -18,8 +18,11 @@ const common_1 = require("@nestjs/common");
|
|
|
18
18
|
const config_1 = require("@nestjs/config");
|
|
19
19
|
const logger_1 = require("../../../common/logger");
|
|
20
20
|
const config_utils_1 = require("../../../common/utils/config.utils");
|
|
21
|
+
const space_entity_1 = require("../../spaces/entities/space.entity");
|
|
21
22
|
const devices_constants_1 = require("../devices.constants");
|
|
23
|
+
const device_zone_entity_1 = require("../entities/device-zone.entity");
|
|
22
24
|
const devices_entity_1 = require("../entities/devices.entity");
|
|
25
|
+
const device_graph_query_utils_1 = require("../utils/device-graph-query.utils");
|
|
23
26
|
const property_metadata_utils_1 = require("../utils/property-metadata.utils");
|
|
24
27
|
let PropertyMetadataService = class PropertyMetadataService {
|
|
25
28
|
constructor(dataSource, configService = new config_1.ConfigService()) {
|
|
@@ -28,6 +31,8 @@ let PropertyMetadataService = class PropertyMetadataService {
|
|
|
28
31
|
this.generation = 0;
|
|
29
32
|
this.catalog = new Map();
|
|
30
33
|
this.loading = new Map();
|
|
34
|
+
this.deviceGraphs = new Map();
|
|
35
|
+
this.loadingGraphs = new Map();
|
|
31
36
|
this.dirtyTransactions = new WeakSet();
|
|
32
37
|
this.enabled = !(0, config_utils_1.getEnvValue)(configService, 'FB_PROPERTY_VALUE_LOCKS_ENABLED', false);
|
|
33
38
|
this.dataSource.subscribers.push(this);
|
|
@@ -71,6 +76,16 @@ let PropertyMetadataService = class PropertyMetadataService {
|
|
|
71
76
|
result.unit = (0, property_metadata_utils_1.resolvePropertyUnit)(result);
|
|
72
77
|
return result;
|
|
73
78
|
}
|
|
79
|
+
async findDevice(id) {
|
|
80
|
+
const query = () => (0, device_graph_query_utils_1.buildDeviceGraphQuery)(this.dataSource.getRepository(devices_entity_1.DeviceEntity))
|
|
81
|
+
.callListeners(false)
|
|
82
|
+
.where('device.id = :id', { id })
|
|
83
|
+
.getOne();
|
|
84
|
+
const device = this.enabled
|
|
85
|
+
? await this.loadCached(id, this.deviceGraphs, this.loadingGraphs, query)
|
|
86
|
+
: await query();
|
|
87
|
+
return device ? this.copyGraph(device) : null;
|
|
88
|
+
}
|
|
74
89
|
beforeInsert(event) {
|
|
75
90
|
this.structuralMutation(event);
|
|
76
91
|
}
|
|
@@ -96,47 +111,82 @@ let PropertyMetadataService = class PropertyMetadataService {
|
|
|
96
111
|
this.transactionSettled(event);
|
|
97
112
|
}
|
|
98
113
|
structuralMutation(event) {
|
|
99
|
-
if (!event.metadata.inheritanceTree.some((type) =>
|
|
114
|
+
if (!event.metadata.inheritanceTree.some((type) => [
|
|
115
|
+
devices_entity_1.ChannelPropertyEntity,
|
|
116
|
+
devices_entity_1.ChannelEntity,
|
|
117
|
+
devices_entity_1.DeviceEntity,
|
|
118
|
+
devices_entity_1.ChannelControlEntity,
|
|
119
|
+
devices_entity_1.DeviceControlEntity,
|
|
120
|
+
device_zone_entity_1.DeviceZoneEntity,
|
|
121
|
+
space_entity_1.SpaceEntity,
|
|
122
|
+
].includes(type)) &&
|
|
123
|
+
!this.isEagerGraphDependency(event.metadata))
|
|
100
124
|
return;
|
|
101
125
|
if (event.queryRunner.isTransactionActive)
|
|
102
126
|
this.dirtyTransactions.add(event.queryRunner);
|
|
103
127
|
this.invalidate();
|
|
104
128
|
}
|
|
105
129
|
transactionSettled(event) {
|
|
106
|
-
if (this.dirtyTransactions.
|
|
107
|
-
|
|
130
|
+
if (!this.dirtyTransactions.has(event.queryRunner))
|
|
131
|
+
return;
|
|
132
|
+
this.invalidate();
|
|
133
|
+
if (!event.queryRunner.isTransactionActive)
|
|
134
|
+
this.dirtyTransactions.delete(event.queryRunner);
|
|
135
|
+
}
|
|
136
|
+
getGeneration() {
|
|
137
|
+
return this.generation;
|
|
108
138
|
}
|
|
109
139
|
invalidate() {
|
|
110
140
|
this.generation += 1;
|
|
111
141
|
this.catalog.clear();
|
|
142
|
+
this.deviceGraphs.clear();
|
|
112
143
|
}
|
|
113
|
-
|
|
144
|
+
findCached(id) {
|
|
145
|
+
return this.loadCached(id, this.catalog, this.loading, () => this.query().where('property.id = :id', { id }).getOne());
|
|
146
|
+
}
|
|
147
|
+
async loadCached(id, catalog, pending, query) {
|
|
114
148
|
while (true) {
|
|
115
|
-
const cached =
|
|
149
|
+
const cached = catalog.get(id);
|
|
116
150
|
if (cached)
|
|
117
151
|
return cached;
|
|
118
152
|
const generation = this.generation;
|
|
119
|
-
if (
|
|
120
|
-
|
|
121
|
-
generation,
|
|
122
|
-
promise: this.query().where('property.id = :id', { id }).getOne(),
|
|
123
|
-
});
|
|
153
|
+
if (pending.get(id)?.generation !== generation) {
|
|
154
|
+
pending.set(id, { generation, promise: query() });
|
|
124
155
|
}
|
|
125
|
-
const loading =
|
|
156
|
+
const loading = pending.get(id);
|
|
126
157
|
try {
|
|
127
|
-
const
|
|
158
|
+
const entity = await loading.promise;
|
|
128
159
|
if (generation === this.generation) {
|
|
129
|
-
if (
|
|
130
|
-
|
|
131
|
-
return
|
|
160
|
+
if (entity)
|
|
161
|
+
catalog.set(id, entity);
|
|
162
|
+
return entity;
|
|
132
163
|
}
|
|
133
164
|
}
|
|
134
165
|
finally {
|
|
135
|
-
if (
|
|
136
|
-
|
|
166
|
+
if (pending.get(id) === loading)
|
|
167
|
+
pending.delete(id);
|
|
137
168
|
}
|
|
138
169
|
}
|
|
139
170
|
}
|
|
171
|
+
isEagerGraphDependency(metadata) {
|
|
172
|
+
return (this.dataSource.entityMetadatas ?? []).some((entity) => entity.inheritanceTree.includes(devices_entity_1.DeviceEntity) &&
|
|
173
|
+
entity.relations.some((relation) => relation.isEager &&
|
|
174
|
+
relation.inverseEntityMetadata.inheritanceTree.some((type) => metadata.inheritanceTree.includes(type))));
|
|
175
|
+
}
|
|
176
|
+
copyGraph(value, seen = new Map()) {
|
|
177
|
+
if (value === null || typeof value !== 'object')
|
|
178
|
+
return value;
|
|
179
|
+
if (value instanceof Date)
|
|
180
|
+
return new Date(value.getTime());
|
|
181
|
+
if (seen.has(value))
|
|
182
|
+
return seen.get(value);
|
|
183
|
+
const prototype = Object.getPrototypeOf(value);
|
|
184
|
+
const result = (Array.isArray(value) ? [] : Object.create(prototype));
|
|
185
|
+
seen.set(value, result);
|
|
186
|
+
for (const [key, child] of Object.entries(value))
|
|
187
|
+
result[key] = this.copyGraph(child, seen);
|
|
188
|
+
return result;
|
|
189
|
+
}
|
|
140
190
|
query() {
|
|
141
191
|
return this.dataSource
|
|
142
192
|
.getRepository(devices_entity_1.ChannelPropertyEntity)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"property-metadata.service.js","sourceRoot":"","sources":["../../../../src/modules/devices/services/property-metadata.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,qCASiB;AAEjB,2CAAqF;AACrF,2CAAoE;AAEpE,mDAA+D;AAC/D,qEAAiE;AACjE,4DAA2D;AAC3D,+
|
|
1
|
+
{"version":3,"file":"property-metadata.service.js","sourceRoot":"","sources":["../../../../src/modules/devices/services/property-metadata.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.buildDeviceGraphQuery = buildDeviceGraphQuery;
|
|
4
|
+
function buildDeviceGraphQuery(repository) {
|
|
5
|
+
const qb = repository
|
|
6
|
+
.createQueryBuilder('device')
|
|
7
|
+
.leftJoinAndSelect('device.controls', 'controls')
|
|
8
|
+
.leftJoinAndSelect('controls.device', 'controlDevice')
|
|
9
|
+
.leftJoinAndSelect('device.channels', 'channels')
|
|
10
|
+
.leftJoinAndSelect('channels.device', 'channelDevice')
|
|
11
|
+
.leftJoinAndSelect('channels.controls', 'channelControls')
|
|
12
|
+
.leftJoinAndSelect('channelControls.channel', 'channelControlChannel')
|
|
13
|
+
.leftJoinAndSelect('channels.properties', 'channelProperties')
|
|
14
|
+
.leftJoinAndSelect('channelProperties.channel', 'channelPropertyChannel')
|
|
15
|
+
.leftJoinAndSelect('device.deviceZones', 'deviceZones');
|
|
16
|
+
for (const relation of repository.metadata?.relations ?? []) {
|
|
17
|
+
if (relation.isEager && !['controls', 'channels', 'deviceZones'].includes(relation.propertyName)) {
|
|
18
|
+
qb.leftJoinAndSelect(`device.${relation.propertyName}`, relation.propertyName);
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
return qb;
|
|
22
|
+
}
|
|
23
|
+
//# sourceMappingURL=device-graph-query.utils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"device-graph-query.utils.js","sourceRoot":"","sources":["../../../../src/modules/devices/utils/device-graph-query.utils.ts"],"names":[],"mappings":";;AAKA,sDAqBC;AArBD,SAAgB,qBAAqB,CAAyB,UAAyB;IACtF,MAAM,EAAE,GAAG,UAAU;SACnB,kBAAkB,CAAC,QAAQ,CAAC;SAC5B,iBAAiB,CAAC,iBAAiB,EAAE,UAAU,CAAC;SAChD,iBAAiB,CAAC,iBAAiB,EAAE,eAAe,CAAC;SACrD,iBAAiB,CAAC,iBAAiB,EAAE,UAAU,CAAC;SAChD,iBAAiB,CAAC,iBAAiB,EAAE,eAAe,CAAC;SACrD,iBAAiB,CAAC,mBAAmB,EAAE,iBAAiB,CAAC;SACzD,iBAAiB,CAAC,yBAAyB,EAAE,uBAAuB,CAAC;SACrE,iBAAiB,CAAC,qBAAqB,EAAE,mBAAmB,CAAC;SAC7D,iBAAiB,CAAC,2BAA2B,EAAE,wBAAwB,CAAC;SACxE,iBAAiB,CAAC,oBAAoB,EAAE,aAAa,CAAC,CAAC;IAGzD,KAAK,MAAM,QAAQ,IAAI,UAAU,CAAC,QAAQ,EAAE,SAAS,IAAI,EAAE,EAAE,CAAC;QAC7D,IAAI,QAAQ,CAAC,OAAO,IAAI,CAAC,CAAC,UAAU,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;YAClG,EAAE,CAAC,iBAAiB,CAAC,UAAU,QAAQ,CAAC,YAAY,EAAE,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC;QAChF,CAAC;IACF,CAAC;IAED,OAAO,EAAE,CAAC;AACX,CAAC"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { ValidationArguments, ValidationOptions, ValidatorConstraintInterface } from 'class-validator';
|
|
2
|
+
import { PropertyMetadataService } from '../services/property-metadata.service';
|
|
3
|
+
export declare class PropertyCommandTargetConstraintValidator implements ValidatorConstraintInterface {
|
|
4
|
+
private readonly propertyMetadata;
|
|
5
|
+
constructor(propertyMetadata: PropertyMetadataService);
|
|
6
|
+
validate(propertyId: unknown, args: ValidationArguments): Promise<boolean>;
|
|
7
|
+
defaultMessage(args: ValidationArguments): string;
|
|
8
|
+
}
|
|
9
|
+
export declare const ValidatePropertyCommandTarget: (validationOptions?: ValidationOptions) => (object: object, propertyName: string) => void;
|
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.ValidatePropertyCommandTarget = exports.PropertyCommandTargetConstraintValidator = void 0;
|
|
13
|
+
const class_validator_1 = require("class-validator");
|
|
14
|
+
const common_1 = require("@nestjs/common");
|
|
15
|
+
const property_metadata_service_1 = require("../services/property-metadata.service");
|
|
16
|
+
let PropertyCommandTargetConstraintValidator = class PropertyCommandTargetConstraintValidator {
|
|
17
|
+
constructor(propertyMetadata) {
|
|
18
|
+
this.propertyMetadata = propertyMetadata;
|
|
19
|
+
}
|
|
20
|
+
async validate(propertyId, args) {
|
|
21
|
+
const { device: deviceId, channel: channelId } = args.object;
|
|
22
|
+
if (typeof propertyId !== 'string' ||
|
|
23
|
+
!(0, class_validator_1.isUUID)(propertyId, '4') ||
|
|
24
|
+
typeof channelId !== 'string' ||
|
|
25
|
+
!(0, class_validator_1.isUUID)(channelId, '4') ||
|
|
26
|
+
typeof deviceId !== 'string' ||
|
|
27
|
+
!(0, class_validator_1.isUUID)(deviceId, '4'))
|
|
28
|
+
return false;
|
|
29
|
+
const property = await this.propertyMetadata.findOne(propertyId);
|
|
30
|
+
if (!property || typeof property.channel === 'string')
|
|
31
|
+
return false;
|
|
32
|
+
const channel = property.channel;
|
|
33
|
+
return channel.id === channelId && typeof channel.device !== 'string' && channel.device.id === deviceId;
|
|
34
|
+
}
|
|
35
|
+
defaultMessage(args) {
|
|
36
|
+
return `[{"field":"${args.property}","reason":"The property must belong to the specified channel and device."}]`;
|
|
37
|
+
}
|
|
38
|
+
};
|
|
39
|
+
exports.PropertyCommandTargetConstraintValidator = PropertyCommandTargetConstraintValidator;
|
|
40
|
+
exports.PropertyCommandTargetConstraintValidator = PropertyCommandTargetConstraintValidator = __decorate([
|
|
41
|
+
(0, common_1.Injectable)(),
|
|
42
|
+
(0, class_validator_1.ValidatorConstraint)({ name: 'PropertyCommandTargetValidation', async: true }),
|
|
43
|
+
__metadata("design:paramtypes", [property_metadata_service_1.PropertyMetadataService])
|
|
44
|
+
], PropertyCommandTargetConstraintValidator);
|
|
45
|
+
const ValidatePropertyCommandTarget = (validationOptions) => {
|
|
46
|
+
return function (object, propertyName) {
|
|
47
|
+
(0, class_validator_1.registerDecorator)({
|
|
48
|
+
name: 'ValidatePropertyCommandTarget',
|
|
49
|
+
target: object.constructor,
|
|
50
|
+
propertyName,
|
|
51
|
+
options: validationOptions,
|
|
52
|
+
constraints: [],
|
|
53
|
+
validator: PropertyCommandTargetConstraintValidator,
|
|
54
|
+
});
|
|
55
|
+
};
|
|
56
|
+
};
|
|
57
|
+
exports.ValidatePropertyCommandTarget = ValidatePropertyCommandTarget;
|
|
58
|
+
//# sourceMappingURL=property-command-target-constraint.validator.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"property-command-target-constraint.validator.js","sourceRoot":"","sources":["../../../../src/modules/devices/validators/property-command-target-constraint.validator.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qDAOyB;AAEzB,2CAA4C;AAE5C,qFAAgF;AAKzE,IAAM,wCAAwC,GAA9C,MAAM,wCAAwC;IACpD,YAA6B,gBAAyC;QAAzC,qBAAgB,GAAhB,gBAAgB,CAAyB;IAAG,CAAC;IAG1E,KAAK,CAAC,QAAQ,CAAC,UAAmB,EAAE,IAAyB;QAC5D,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,MAAiC,CAAC;QAExF,IACC,OAAO,UAAU,KAAK,QAAQ;YAC9B,CAAC,IAAA,wBAAM,EAAC,UAAU,EAAE,GAAG,CAAC;YACxB,OAAO,SAAS,KAAK,QAAQ;YAC7B,CAAC,IAAA,wBAAM,EAAC,SAAS,EAAE,GAAG,CAAC;YACvB,OAAO,QAAQ,KAAK,QAAQ;YAC5B,CAAC,IAAA,wBAAM,EAAC,QAAQ,EAAE,GAAG,CAAC;YAEtB,OAAO,KAAK,CAAC;QAEd,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QACjE,IAAI,CAAC,QAAQ,IAAI,OAAO,QAAQ,CAAC,OAAO,KAAK,QAAQ;YAAE,OAAO,KAAK,CAAC;QACpE,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC;QAEjC,OAAO,OAAO,CAAC,EAAE,KAAK,SAAS,IAAI,OAAO,OAAO,CAAC,MAAM,KAAK,QAAQ,IAAI,OAAO,CAAC,MAAM,CAAC,EAAE,KAAK,QAAQ,CAAC;IACzG,CAAC;IAED,cAAc,CAAC,IAAyB;QACvC,OAAO,cAAc,IAAI,CAAC,QAAQ,8EAA8E,CAAC;IAClH,CAAC;CACD,CAAA;AA3BY,4FAAwC;mDAAxC,wCAAwC;IAFpD,IAAA,mBAAU,GAAE;IACZ,IAAA,qCAAmB,EAAC,EAAE,IAAI,EAAE,iCAAiC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;qCAE9B,mDAAuB;GAD1D,wCAAwC,CA2BpD;AAEM,MAAM,6BAA6B,GAAG,CAAC,iBAAqC,EAAE,EAAE;IACtF,OAAO,UAAU,MAAc,EAAE,YAAoB;QACpD,IAAA,mCAAiB,EAAC;YACjB,IAAI,EAAE,+BAA+B;YACrC,MAAM,EAAE,MAAM,CAAC,WAAW;YAC1B,YAAY;YACZ,OAAO,EAAE,iBAAiB;YAC1B,WAAW,EAAE,EAAE;YACf,SAAS,EAAE,wCAAwC;SACnD,CAAC,CAAC;IACJ,CAAC,CAAC;AACH,CAAC,CAAC;AAXW,QAAA,6BAA6B,iCAWxC"}
|
|
@@ -38,11 +38,14 @@ let RemoteAccessController = class RemoteAccessController {
|
|
|
38
38
|
}
|
|
39
39
|
async getStatus() {
|
|
40
40
|
this.logger.debug('Fetching remote access module status');
|
|
41
|
+
await this.statusService.getAggregatedStatuses();
|
|
42
|
+
const candidates = await this.urlService.getCandidates();
|
|
41
43
|
const config = this.configService.getModuleConfig(remote_access_constants_1.REMOTE_ACCESS_MODULE_NAME);
|
|
42
|
-
const providers =
|
|
43
|
-
const urls =
|
|
44
|
+
const providers = this.statusService.getCachedProviderModels();
|
|
45
|
+
const urls = this.buildUrlsModel(candidates);
|
|
44
46
|
const advisories = this.postureService.getAdvisories();
|
|
45
47
|
const data = new status_model_1.RemoteAccessStatusModel();
|
|
48
|
+
Object.assign(data, this.statusService.getVersion());
|
|
46
49
|
data.enabled = config.enabled;
|
|
47
50
|
data.providers = providers;
|
|
48
51
|
data.urls = urls;
|
|
@@ -74,13 +77,14 @@ let RemoteAccessController = class RemoteAccessController {
|
|
|
74
77
|
async getUrls() {
|
|
75
78
|
this.logger.debug('Fetching remote access URLs');
|
|
76
79
|
const response = new urls_model_1.RemoteAccessUrlsResponseModel();
|
|
77
|
-
response.data = await this.
|
|
80
|
+
response.data = this.buildUrlsModel(await this.urlService.getCandidates());
|
|
78
81
|
return response;
|
|
79
82
|
}
|
|
80
|
-
|
|
83
|
+
buildUrlsModel(candidates) {
|
|
81
84
|
const snapshot = this.urlService.getUrls();
|
|
82
|
-
const candidates = await this.urlService.getCandidates();
|
|
83
85
|
const data = new urls_model_1.RemoteAccessUrlsModel();
|
|
86
|
+
data.epoch = snapshot.epoch;
|
|
87
|
+
data.revision = snapshot.revision;
|
|
84
88
|
data.internal = snapshot.internal;
|
|
85
89
|
data.candidates = candidates;
|
|
86
90
|
data.external = snapshot.external;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote-access.controller.js","sourceRoot":"","sources":["../../../../src/modules/remote-access/controllers/remote-access.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA2E;AAC3E,6CAAkE;AAElE,mDAA+D;AAC/D,yEAAqE;AACrE,sGAA0F;AAC1F,gEAAuD;AACvD,iEAAuD;AAEvD,6DAAiH;AACjH,yDAAkG;AAClG,qDAA4F;AAC5F,wEAA0G;AAC1G,0EAAoF;AACpF,6FAAuF;AACvF,2FAAqF;AACrF,qFAA+E;AAKxE,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAGlC,YACkB,aAA4B,EAC5B,aAAwC,EACxC,UAAkC,EAClC,cAA0C;QAH1C,kBAAa,GAAb,aAAa,CAAe;QAC5B,kBAAa,GAAb,aAAa,CAA2B;QACxC,eAAU,GAAV,UAAU,CAAwB;QAClC,mBAAc,GAAd,cAAc,CAA4B;QAN3C,WAAM,GAAG,IAAA,8BAAqB,EAAC,mDAAyB,EAAE,wBAAwB,CAAC,CAAC;IAOlG,CAAC;IAUE,AAAN,KAAK,CAAC,SAAS;QACd,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAC;QAE1D,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,eAAe,CAA0B,mDAAyB,CAAC,CAAC;QACtG,MAAM,SAAS,GAAG,
|
|
1
|
+
{"version":3,"file":"remote-access.controller.js","sourceRoot":"","sources":["../../../../src/modules/remote-access/controllers/remote-access.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,6 +19,9 @@ export declare class RemoteAccessProviderCapabilitiesModel {
|
|
|
19
19
|
ssh: boolean;
|
|
20
20
|
}
|
|
21
21
|
export declare class RemoteAccessProviderModel {
|
|
22
|
+
enabled: boolean;
|
|
23
|
+
epoch: string;
|
|
24
|
+
revision: number;
|
|
22
25
|
type: string;
|
|
23
26
|
kind: RemoteAccessProviderKind;
|
|
24
27
|
capabilities: RemoteAccessProviderCapabilitiesModel;
|
|
@@ -165,6 +165,29 @@ exports.RemoteAccessProviderCapabilitiesModel = RemoteAccessProviderCapabilities
|
|
|
165
165
|
let RemoteAccessProviderModel = class RemoteAccessProviderModel {
|
|
166
166
|
};
|
|
167
167
|
exports.RemoteAccessProviderModel = RemoteAccessProviderModel;
|
|
168
|
+
__decorate([
|
|
169
|
+
(0, swagger_1.ApiProperty)({ description: 'Whether the owning provider plugin is persistently enabled', type: 'boolean' }),
|
|
170
|
+
(0, class_transformer_1.Expose)(),
|
|
171
|
+
(0, class_validator_1.IsBoolean)(),
|
|
172
|
+
__metadata("design:type", Boolean)
|
|
173
|
+
], RemoteAccessProviderModel.prototype, "enabled", void 0);
|
|
174
|
+
__decorate([
|
|
175
|
+
(0, swagger_1.ApiProperty)({ description: 'Process epoch; changes after backend restart', type: 'string' }),
|
|
176
|
+
(0, class_transformer_1.Expose)(),
|
|
177
|
+
(0, class_validator_1.IsString)(),
|
|
178
|
+
__metadata("design:type", String)
|
|
179
|
+
], RemoteAccessProviderModel.prototype, "epoch", void 0);
|
|
180
|
+
__decorate([
|
|
181
|
+
(0, swagger_1.ApiProperty)({
|
|
182
|
+
description: 'Monotonic accepted publication revision within this epoch',
|
|
183
|
+
type: 'integer',
|
|
184
|
+
minimum: 0,
|
|
185
|
+
}),
|
|
186
|
+
(0, class_transformer_1.Expose)(),
|
|
187
|
+
(0, class_validator_1.IsInt)(),
|
|
188
|
+
(0, class_validator_1.Min)(0),
|
|
189
|
+
__metadata("design:type", Number)
|
|
190
|
+
], RemoteAccessProviderModel.prototype, "revision", void 0);
|
|
168
191
|
__decorate([
|
|
169
192
|
(0, swagger_1.ApiProperty)({
|
|
170
193
|
description: 'Provider plugin type identifier',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider.model.js","sourceRoot":"","sources":["../../../../src/modules/remote-access/models/provider.model.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAAiD;AACjD,
|
|
1
|
+
{"version":3,"file":"provider.model.js","sourceRoot":"","sources":["../../../../src/modules/remote-access/models/provider.model.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,8 @@ import { BaseSuccessResponseModel } from '../../api/models/api-response.model';
|
|
|
2
2
|
import { RemoteAccessAdvisoryModel, RemoteAccessProviderModel } from './provider.model';
|
|
3
3
|
import { RemoteAccessUrlsModel } from './urls.model';
|
|
4
4
|
export declare class RemoteAccessStatusModel {
|
|
5
|
+
epoch: string;
|
|
6
|
+
revision: number;
|
|
5
7
|
enabled: boolean;
|
|
6
8
|
providers: RemoteAccessProviderModel[];
|
|
7
9
|
urls: RemoteAccessUrlsModel;
|
|
@@ -19,9 +19,26 @@ const urls_model_1 = require("./urls.model");
|
|
|
19
19
|
let RemoteAccessStatusModel = class RemoteAccessStatusModel {
|
|
20
20
|
};
|
|
21
21
|
exports.RemoteAccessStatusModel = RemoteAccessStatusModel;
|
|
22
|
+
__decorate([
|
|
23
|
+
(0, swagger_1.ApiProperty)({ description: 'Process epoch; changes after backend restart', type: 'string' }),
|
|
24
|
+
(0, class_transformer_1.Expose)(),
|
|
25
|
+
(0, class_validator_1.IsString)(),
|
|
26
|
+
__metadata("design:type", String)
|
|
27
|
+
], RemoteAccessStatusModel.prototype, "epoch", void 0);
|
|
28
|
+
__decorate([
|
|
29
|
+
(0, swagger_1.ApiProperty)({
|
|
30
|
+
description: 'Monotonic accepted publication revision within this epoch',
|
|
31
|
+
type: 'integer',
|
|
32
|
+
minimum: 0,
|
|
33
|
+
}),
|
|
34
|
+
(0, class_transformer_1.Expose)(),
|
|
35
|
+
(0, class_validator_1.IsInt)(),
|
|
36
|
+
(0, class_validator_1.Min)(0),
|
|
37
|
+
__metadata("design:type", Number)
|
|
38
|
+
], RemoteAccessStatusModel.prototype, "revision", void 0);
|
|
22
39
|
__decorate([
|
|
23
40
|
(0, swagger_1.ApiProperty)({
|
|
24
|
-
description: 'Module enabled state
|
|
41
|
+
description: 'Module URL registry enabled state; provider plugins retain their independent lifecycle',
|
|
25
42
|
type: 'boolean',
|
|
26
43
|
example: true,
|
|
27
44
|
}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status.model.js","sourceRoot":"","sources":["../../../../src/modules/remote-access/models/status.model.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAAiD;AACjD,
|
|
1
|
+
{"version":3,"file":"status.model.js","sourceRoot":"","sources":["../../../../src/modules/remote-access/models/status.model.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAAiD;AACjD,qDAA2F;AAE3F,6CAAwE;AAExE,4EAA+E;AAE/E,qDAAwF;AACxF,6CAAqD;AAQ9C,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;CAuDnC,CAAA;AAvDY,0DAAuB;AAInC;IAHC,IAAA,qBAAW,EAAC,EAAE,WAAW,EAAE,8CAA8C,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;IAC5F,IAAA,0BAAM,GAAE;IACR,IAAA,0BAAQ,GAAE;;sDACG;AAUd;IARC,IAAA,qBAAW,EAAC;QACZ,WAAW,EAAE,2DAA2D;QACxE,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,CAAC;KACV,CAAC;IACD,IAAA,0BAAM,GAAE;IACR,IAAA,uBAAK,GAAE;IACP,IAAA,qBAAG,EAAC,CAAC,CAAC;;yDACU;AASjB;IAPC,IAAA,qBAAW,EAAC;QACZ,WAAW,EAAE,wFAAwF;QACrG,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,IAAI;KACb,CAAC;IACD,IAAA,0BAAM,GAAE;IACR,IAAA,2BAAS,GAAE;;wDACK;AAWjB;IATC,IAAA,qBAAW,EAAC;QACZ,WAAW,EAAE,iDAAiD;QAC9D,IAAI,EAAE,OAAO;QACb,KAAK,EAAE,EAAE,IAAI,EAAE,IAAA,uBAAa,EAAC,0CAAyB,CAAC,EAAE;KACzD,CAAC;IACD,IAAA,0BAAM,GAAE;IACR,IAAA,yBAAO,GAAE;IACT,IAAA,gCAAc,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IAC9B,IAAA,wBAAI,EAAC,GAAG,EAAE,CAAC,0CAAyB,CAAC;;0DACC;AASvC;IAPC,IAAA,qBAAW,EAAC;QACZ,WAAW,EAAE,0BAA0B;QACvC,IAAI,EAAE,GAAG,EAAE,CAAC,kCAAqB;KACjC,CAAC;IACD,IAAA,0BAAM,GAAE;IACR,IAAA,gCAAc,GAAE;IAChB,IAAA,wBAAI,EAAC,GAAG,EAAE,CAAC,kCAAqB,CAAC;8BAC5B,kCAAqB;qDAAC;AAW5B;IATC,IAAA,qBAAW,EAAC;QACZ,WAAW,EAAE,8DAA8D;QAC3E,IAAI,EAAE,OAAO;QACb,KAAK,EAAE,EAAE,IAAI,EAAE,IAAA,uBAAa,EAAC,0CAAyB,CAAC,EAAE;KACzD,CAAC;IACD,IAAA,0BAAM,GAAE;IACR,IAAA,yBAAO,GAAE;IACT,IAAA,gCAAc,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IAC9B,IAAA,wBAAI,EAAC,GAAG,EAAE,CAAC,0CAAyB,CAAC;;2DACE;kCAtD5B,uBAAuB;IADnC,IAAA,mBAAS,EAAC,EAAE,IAAI,EAAE,8BAA8B,EAAE,CAAC;GACvC,uBAAuB,CAuDnC;AAMM,IAAM,+BAA+B,GAArC,MAAM,+BAAgC,SAAQ,6CAAiD;CAOrG,CAAA;AAPY,0EAA+B;AAMnC;IALP,IAAA,qBAAW,EAAC;QACZ,WAAW,EAAE,6CAA6C;QAC1D,IAAI,EAAE,GAAG,EAAE,CAAC,uBAAuB;KACnC,CAAC;IACD,IAAA,0BAAM,GAAE;8BACK,uBAAuB;6DAAC;0CAN1B,+BAA+B;IAD3C,IAAA,mBAAS,EAAC,EAAE,IAAI,EAAE,6BAA6B,EAAE,CAAC;GACtC,+BAA+B,CAO3C"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { BaseSuccessResponseModel } from '../../api/models/api-response.model';
|
|
2
2
|
import { RemoteAccessEndpointModel } from './provider.model';
|
|
3
3
|
export declare class RemoteAccessUrlsModel {
|
|
4
|
+
epoch: string;
|
|
5
|
+
revision: number;
|
|
4
6
|
internal: string;
|
|
5
7
|
candidates: string[];
|
|
6
8
|
external: RemoteAccessEndpointModel[];
|
|
@@ -18,6 +18,23 @@ const provider_model_1 = require("./provider.model");
|
|
|
18
18
|
let RemoteAccessUrlsModel = class RemoteAccessUrlsModel {
|
|
19
19
|
};
|
|
20
20
|
exports.RemoteAccessUrlsModel = RemoteAccessUrlsModel;
|
|
21
|
+
__decorate([
|
|
22
|
+
(0, swagger_1.ApiProperty)({ description: 'Process epoch; changes after backend restart', type: 'string' }),
|
|
23
|
+
(0, class_transformer_1.Expose)(),
|
|
24
|
+
(0, class_validator_1.IsString)(),
|
|
25
|
+
__metadata("design:type", String)
|
|
26
|
+
], RemoteAccessUrlsModel.prototype, "epoch", void 0);
|
|
27
|
+
__decorate([
|
|
28
|
+
(0, swagger_1.ApiProperty)({
|
|
29
|
+
description: 'Monotonic accepted publication revision within this epoch',
|
|
30
|
+
type: 'integer',
|
|
31
|
+
minimum: 0,
|
|
32
|
+
}),
|
|
33
|
+
(0, class_transformer_1.Expose)(),
|
|
34
|
+
(0, class_validator_1.IsInt)(),
|
|
35
|
+
(0, class_validator_1.Min)(0),
|
|
36
|
+
__metadata("design:type", Number)
|
|
37
|
+
], RemoteAccessUrlsModel.prototype, "revision", void 0);
|
|
21
38
|
__decorate([
|
|
22
39
|
(0, swagger_1.ApiProperty)({
|
|
23
40
|
description: 'Resolved internal URL (absolute origin, no path)',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"urls.model.js","sourceRoot":"","sources":["../../../../src/modules/remote-access/models/urls.model.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAAiD;AACjD,
|
|
1
|
+
{"version":3,"file":"urls.model.js","sourceRoot":"","sources":["../../../../src/modules/remote-access/models/urls.model.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAAiD;AACjD,qDAA4F;AAE5F,6CAA6F;AAE7F,4EAA+E;AAE/E,qDAA6D;AAQtD,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;CAyDjC,CAAA;AAzDY,sDAAqB;AAIjC;IAHC,IAAA,qBAAW,EAAC,EAAE,WAAW,EAAE,8CAA8C,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;IAC5F,IAAA,0BAAM,GAAE;IACR,IAAA,0BAAQ,GAAE;;oDACG;AAUd;IARC,IAAA,qBAAW,EAAC;QACZ,WAAW,EAAE,2DAA2D;QACxE,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,CAAC;KACV,CAAC;IACD,IAAA,0BAAM,GAAE;IACR,IAAA,uBAAK,GAAE;IACP,IAAA,qBAAG,EAAC,CAAC,CAAC;;uDACU;AASjB;IAPC,IAAA,qBAAW,EAAC;QACZ,WAAW,EAAE,kDAAkD;QAC/D,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,uBAAuB;KAChC,CAAC;IACD,IAAA,0BAAM,GAAE;IACR,IAAA,0BAAQ,GAAE;;uDACM;AAWjB;IATC,IAAA,qBAAW,EAAC;QACZ,WAAW,EAAE,4FAA4F;QACzG,IAAI,EAAE,OAAO;QACb,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QACzB,OAAO,EAAE,EAAE;KACX,CAAC;IACD,IAAA,0BAAM,GAAE;IACR,IAAA,yBAAO,GAAE;IACT,IAAA,0BAAQ,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;;yDACJ;AAWrB;IATC,IAAA,qBAAW,EAAC;QACZ,WAAW,EAAE,8FAA8F;QAC3G,IAAI,EAAE,OAAO;QACb,KAAK,EAAE,EAAE,IAAI,EAAE,IAAA,uBAAa,EAAC,0CAAyB,CAAC,EAAE;KACzD,CAAC;IACD,IAAA,0BAAM,GAAE;IACR,IAAA,yBAAO,GAAE;IACT,IAAA,gCAAc,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IAC9B,IAAA,wBAAI,EAAC,GAAG,EAAE,CAAC,0CAAyB,CAAC;;uDACA;AAWtC;IATC,IAAA,6BAAmB,EAAC;QACpB,WAAW,EAAE,qGAAqG;QAClH,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,IAAI;KACb,CAAC;IACD,IAAA,0BAAM,GAAE;IACR,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAQ,GAAE;;sDACY;gCAxDX,qBAAqB;IADjC,IAAA,mBAAS,EAAC,EAAE,IAAI,EAAE,4BAA4B,EAAE,CAAC;GACrC,qBAAqB,CAyDjC;AAMM,IAAM,6BAA6B,GAAnC,MAAM,6BAA8B,SAAQ,6CAA+C;CAOjG,CAAA;AAPY,sEAA6B;AAMjC;IALP,IAAA,qBAAW,EAAC;QACZ,WAAW,EAAE,6CAA6C;QAC1D,IAAI,EAAE,GAAG,EAAE,CAAC,qBAAqB;KACjC,CAAC;IACD,IAAA,0BAAM,GAAE;8BACK,qBAAqB;2DAAC;wCANxB,6BAA6B;IADzC,IAAA,mBAAS,EAAC,EAAE,IAAI,EAAE,2BAA2B,EAAE,CAAC;GACpC,6BAA6B,CAOzC"}
|
|
@@ -30,9 +30,26 @@ export interface RemoteAccessProviderCapabilities {
|
|
|
30
30
|
ssh: boolean;
|
|
31
31
|
}
|
|
32
32
|
export type RemoteAccessProviderKind = 'mesh' | 'tunnel' | 'vpn' | 'external';
|
|
33
|
+
export interface RemoteAccessStatusReadOptions {
|
|
34
|
+
signal?: AbortSignal;
|
|
35
|
+
fresh?: boolean;
|
|
36
|
+
}
|
|
37
|
+
export interface RemoteAccessSnapshotVersion {
|
|
38
|
+
epoch: string;
|
|
39
|
+
revision: number;
|
|
40
|
+
}
|
|
41
|
+
export interface RemoteAccessAcceptedProviderStatus extends RemoteAccessProviderStatus, RemoteAccessSnapshotVersion {
|
|
42
|
+
enabled: boolean;
|
|
43
|
+
}
|
|
44
|
+
export interface RemoteAccessProviderSnapshot<T = unknown> {
|
|
45
|
+
status: RemoteAccessProviderStatus;
|
|
46
|
+
metadata?: T;
|
|
47
|
+
}
|
|
33
48
|
export interface IRemoteAccessProvider {
|
|
34
49
|
readonly type: string;
|
|
35
50
|
readonly kind: RemoteAccessProviderKind;
|
|
36
51
|
readonly capabilities: RemoteAccessProviderCapabilities;
|
|
37
|
-
getStatus(): Promise<RemoteAccessProviderStatus>;
|
|
52
|
+
getStatus(options?: RemoteAccessStatusReadOptions): Promise<RemoteAccessProviderStatus>;
|
|
53
|
+
getSnapshot?(options?: RemoteAccessStatusReadOptions): Promise<RemoteAccessProviderSnapshot>;
|
|
54
|
+
awaitObservationIdle?(): Promise<void>;
|
|
38
55
|
}
|
|
@@ -2,9 +2,10 @@ export declare const REMOTE_ACCESS_MODULE_PREFIX = "remote-access";
|
|
|
2
2
|
export declare const REMOTE_ACCESS_MODULE_NAME = "remote-access-module";
|
|
3
3
|
export declare const REMOTE_ACCESS_MODULE_API_TAG_NAME = "Remote access module";
|
|
4
4
|
export declare const REMOTE_ACCESS_MODULE_API_TAG_DESCRIPTION = "Endpoints for the internal/external URL registry, remote-access provider status and posture advisories.";
|
|
5
|
-
export declare const REMOTE_ACCESS_PROVIDER_STATUS_TIMEOUT_MS =
|
|
5
|
+
export declare const REMOTE_ACCESS_PROVIDER_STATUS_TIMEOUT_MS = 7000;
|
|
6
6
|
export declare const REMOTE_ACCESS_CONFIG_READ_RETRY_INTERVAL_MS = 30000;
|
|
7
7
|
export declare enum EventType {
|
|
8
|
+
PROVIDER_OBSERVATION = "RemoteAccessModule.Provider.Observation",
|
|
8
9
|
PROVIDER_STATUS = "RemoteAccessModule.Provider.Status",
|
|
9
10
|
URLS_CHANGED = "RemoteAccessModule.Urls.Changed",
|
|
10
11
|
SETUP_PROGRESS = "RemoteAccessModule.Setup.Progress"
|
|
@@ -5,10 +5,11 @@ exports.REMOTE_ACCESS_MODULE_PREFIX = 'remote-access';
|
|
|
5
5
|
exports.REMOTE_ACCESS_MODULE_NAME = 'remote-access-module';
|
|
6
6
|
exports.REMOTE_ACCESS_MODULE_API_TAG_NAME = 'Remote access module';
|
|
7
7
|
exports.REMOTE_ACCESS_MODULE_API_TAG_DESCRIPTION = 'Endpoints for the internal/external URL registry, remote-access provider status and posture advisories.';
|
|
8
|
-
exports.REMOTE_ACCESS_PROVIDER_STATUS_TIMEOUT_MS =
|
|
8
|
+
exports.REMOTE_ACCESS_PROVIDER_STATUS_TIMEOUT_MS = 7000;
|
|
9
9
|
exports.REMOTE_ACCESS_CONFIG_READ_RETRY_INTERVAL_MS = 30_000;
|
|
10
10
|
var EventType;
|
|
11
11
|
(function (EventType) {
|
|
12
|
+
EventType["PROVIDER_OBSERVATION"] = "RemoteAccessModule.Provider.Observation";
|
|
12
13
|
EventType["PROVIDER_STATUS"] = "RemoteAccessModule.Provider.Status";
|
|
13
14
|
EventType["URLS_CHANGED"] = "RemoteAccessModule.Urls.Changed";
|
|
14
15
|
EventType["SETUP_PROGRESS"] = "RemoteAccessModule.Setup.Progress";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote-access.constants.js","sourceRoot":"","sources":["../../../src/modules/remote-access/remote-access.constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,2BAA2B,GAAG,eAAe,CAAC;AAE9C,QAAA,yBAAyB,GAAG,sBAAsB,CAAC;AAEnD,QAAA,iCAAiC,GAAG,sBAAsB,CAAC;AAE3D,QAAA,wCAAwC,GACpD,yGAAyG,CAAC;
|
|
1
|
+
{"version":3,"file":"remote-access.constants.js","sourceRoot":"","sources":["../../../src/modules/remote-access/remote-access.constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,2BAA2B,GAAG,eAAe,CAAC;AAE9C,QAAA,yBAAyB,GAAG,sBAAsB,CAAC;AAEnD,QAAA,iCAAiC,GAAG,sBAAsB,CAAC;AAE3D,QAAA,wCAAwC,GACpD,yGAAyG,CAAC;AAG9F,QAAA,wCAAwC,GAAG,IAAI,CAAC;AAWhD,QAAA,2CAA2C,GAAG,MAAM,CAAC;AAElE,IAAY,SAQX;AARD,WAAY,SAAS;IAEpB,6EAAgE,CAAA;IAEhE,mEAAsD,CAAA;IACtD,6DAAgD,CAAA;IAEhD,iEAAoD,CAAA;AACrD,CAAC,EARW,SAAS,yBAAT,SAAS,QAQpB"}
|
|
@@ -13,6 +13,7 @@ export declare class RemoteAccessProxyContributionService implements OnModuleIni
|
|
|
13
13
|
private readonly logger;
|
|
14
14
|
private readonly warnedRejectedEntries;
|
|
15
15
|
private cachedAddresses;
|
|
16
|
+
private cachedRevision;
|
|
16
17
|
private lastConfigErrorMessage;
|
|
17
18
|
private configReadFailedAt;
|
|
18
19
|
constructor(trustedProxyRegistry: TrustedProxyRegistryService, configService: ConfigService, statusService: RemoteAccessStatusService);
|
|
@@ -28,6 +28,7 @@ let RemoteAccessProxyContributionService = class RemoteAccessProxyContributionSe
|
|
|
28
28
|
this.logger = (0, logger_1.createExtensionLogger)(remote_access_constants_1.REMOTE_ACCESS_MODULE_NAME, 'RemoteAccessProxyContributionService');
|
|
29
29
|
this.warnedRejectedEntries = new Set();
|
|
30
30
|
this.cachedAddresses = null;
|
|
31
|
+
this.cachedRevision = null;
|
|
31
32
|
this.lastConfigErrorMessage = null;
|
|
32
33
|
this.configReadFailedAt = null;
|
|
33
34
|
}
|
|
@@ -54,8 +55,10 @@ let RemoteAccessProxyContributionService = class RemoteAccessProxyContributionSe
|
|
|
54
55
|
this.cachedAddresses = null;
|
|
55
56
|
}
|
|
56
57
|
computeAddresses() {
|
|
57
|
-
|
|
58
|
+
const revision = this.statusService.getVersion().revision;
|
|
59
|
+
if (this.cachedAddresses === null || this.cachedRevision !== revision || this.isFailedReadDueForRetry()) {
|
|
58
60
|
this.cachedAddresses = this.recomputeAddresses();
|
|
61
|
+
this.cachedRevision = revision;
|
|
59
62
|
}
|
|
60
63
|
return this.cachedAddresses;
|
|
61
64
|
}
|