@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.
Files changed (180) hide show
  1. package/dist/app.module.js +1 -1
  2. package/dist/app.module.js.map +1 -1
  3. package/dist/common/utils/cancellable-exec.utils.d.ts +5 -0
  4. package/dist/common/utils/cancellable-exec.utils.js +34 -0
  5. package/dist/common/utils/cancellable-exec.utils.js.map +1 -0
  6. package/dist/common/utils/remote-access-observation.utils.d.ts +11 -0
  7. package/dist/common/utils/remote-access-observation.utils.js +89 -0
  8. package/dist/common/utils/remote-access-observation.utils.js.map +1 -0
  9. package/dist/modules/auth/auth.module.js +4 -0
  10. package/dist/modules/auth/auth.module.js.map +1 -1
  11. package/dist/modules/auth/guards/auth.guard.js +8 -13
  12. package/dist/modules/auth/guards/auth.guard.js.map +1 -1
  13. package/dist/modules/auth/services/token-metadata.service.d.ts +42 -0
  14. package/dist/modules/auth/services/token-metadata.service.js +202 -0
  15. package/dist/modules/auth/services/token-metadata.service.js.map +1 -0
  16. package/dist/modules/auth/services/token-usage.service.d.ts +22 -0
  17. package/dist/modules/auth/services/token-usage.service.js +93 -0
  18. package/dist/modules/auth/services/token-usage.service.js.map +1 -0
  19. package/dist/modules/auth/services/tokens.service.d.ts +8 -2
  20. package/dist/modules/auth/services/tokens.service.js +16 -10
  21. package/dist/modules/auth/services/tokens.service.js.map +1 -1
  22. package/dist/modules/devices/devices.module.js +7 -0
  23. package/dist/modules/devices/devices.module.js.map +1 -1
  24. package/dist/modules/devices/dto/property-command.dto.js +2 -8
  25. package/dist/modules/devices/dto/property-command.dto.js.map +1 -1
  26. package/dist/modules/devices/services/device-command-graph.service.d.ts +18 -0
  27. package/dist/modules/devices/services/device-command-graph.service.js +92 -0
  28. package/dist/modules/devices/services/device-command-graph.service.js.map +1 -0
  29. package/dist/modules/devices/services/devices.service.js +2 -17
  30. package/dist/modules/devices/services/devices.service.js.map +1 -1
  31. package/dist/modules/devices/services/property-command-dispatch.service.d.ts +5 -3
  32. package/dist/modules/devices/services/property-command-dispatch.service.js +15 -12
  33. package/dist/modules/devices/services/property-command-dispatch.service.js.map +1 -1
  34. package/dist/modules/devices/services/property-command.service.d.ts +7 -5
  35. package/dist/modules/devices/services/property-command.service.js +41 -20
  36. package/dist/modules/devices/services/property-command.service.js.map +1 -1
  37. package/dist/modules/devices/services/property-metadata.service.d.ts +9 -2
  38. package/dist/modules/devices/services/property-metadata.service.js +67 -17
  39. package/dist/modules/devices/services/property-metadata.service.js.map +1 -1
  40. package/dist/modules/devices/utils/device-graph-query.utils.d.ts +3 -0
  41. package/dist/modules/devices/utils/device-graph-query.utils.js +23 -0
  42. package/dist/modules/devices/utils/device-graph-query.utils.js.map +1 -0
  43. package/dist/modules/devices/validators/property-command-target-constraint.validator.d.ts +9 -0
  44. package/dist/modules/devices/validators/property-command-target-constraint.validator.js +58 -0
  45. package/dist/modules/devices/validators/property-command-target-constraint.validator.js.map +1 -0
  46. package/dist/modules/remote-access/controllers/remote-access.controller.js +9 -5
  47. package/dist/modules/remote-access/controllers/remote-access.controller.js.map +1 -1
  48. package/dist/modules/remote-access/models/provider.model.d.ts +3 -0
  49. package/dist/modules/remote-access/models/provider.model.js +23 -0
  50. package/dist/modules/remote-access/models/provider.model.js.map +1 -1
  51. package/dist/modules/remote-access/models/status.model.d.ts +2 -0
  52. package/dist/modules/remote-access/models/status.model.js +18 -1
  53. package/dist/modules/remote-access/models/status.model.js.map +1 -1
  54. package/dist/modules/remote-access/models/urls.model.d.ts +2 -0
  55. package/dist/modules/remote-access/models/urls.model.js +17 -0
  56. package/dist/modules/remote-access/models/urls.model.js.map +1 -1
  57. package/dist/modules/remote-access/platforms/remote-access-provider.platform.d.ts +18 -1
  58. package/dist/modules/remote-access/remote-access.constants.d.ts +2 -1
  59. package/dist/modules/remote-access/remote-access.constants.js +2 -1
  60. package/dist/modules/remote-access/remote-access.constants.js.map +1 -1
  61. package/dist/modules/remote-access/services/remote-access-proxy-contribution.service.d.ts +1 -0
  62. package/dist/modules/remote-access/services/remote-access-proxy-contribution.service.js +4 -1
  63. package/dist/modules/remote-access/services/remote-access-proxy-contribution.service.js.map +1 -1
  64. package/dist/modules/remote-access/services/remote-access-status.service.d.ts +40 -8
  65. package/dist/modules/remote-access/services/remote-access-status.service.js +314 -65
  66. package/dist/modules/remote-access/services/remote-access-status.service.js.map +1 -1
  67. package/dist/modules/remote-access/services/remote-access-url.service.d.ts +2 -2
  68. package/dist/modules/remote-access/services/remote-access-url.service.js +4 -2
  69. package/dist/modules/remote-access/services/remote-access-url.service.js.map +1 -1
  70. package/dist/modules/spaces/services/module-reset.service.d.ts +5 -1
  71. package/dist/modules/spaces/services/module-reset.service.js +10 -2
  72. package/dist/modules/spaces/services/module-reset.service.js.map +1 -1
  73. package/dist/modules/spaces/services/space-activity.service.d.ts +14 -0
  74. package/dist/modules/spaces/services/space-activity.service.js +56 -0
  75. package/dist/modules/spaces/services/space-activity.service.js.map +1 -0
  76. package/dist/modules/spaces/spaces.module.js +5 -0
  77. package/dist/modules/spaces/spaces.module.js.map +1 -1
  78. package/dist/modules/spaces/subscribers/space-activity.subscriber.d.ts +17 -0
  79. package/dist/modules/spaces/subscribers/space-activity.subscriber.js +89 -0
  80. package/dist/modules/spaces/subscribers/space-activity.subscriber.js.map +1 -0
  81. package/dist/modules/websocket/gateway/websocket.gateway.js +1 -0
  82. package/dist/modules/websocket/gateway/websocket.gateway.js.map +1 -1
  83. package/dist/modules/websocket/services/ws-auth.service.js +12 -28
  84. package/dist/modules/websocket/services/ws-auth.service.js.map +1 -1
  85. package/dist/plugins/devices-virtual/platforms/virtual-device.platform.d.ts +3 -8
  86. package/dist/plugins/devices-virtual/platforms/virtual-device.platform.js +6 -36
  87. package/dist/plugins/devices-virtual/platforms/virtual-device.platform.js.map +1 -1
  88. package/dist/plugins/remote-access-cloudflare-tunnel/controllers/setup.controller.d.ts +5 -3
  89. package/dist/plugins/remote-access-cloudflare-tunnel/controllers/setup.controller.js +20 -8
  90. package/dist/plugins/remote-access-cloudflare-tunnel/controllers/setup.controller.js.map +1 -1
  91. package/dist/plugins/remote-access-cloudflare-tunnel/controllers/status.controller.d.ts +3 -5
  92. package/dist/plugins/remote-access-cloudflare-tunnel/controllers/status.controller.js +11 -10
  93. package/dist/plugins/remote-access-cloudflare-tunnel/controllers/status.controller.js.map +1 -1
  94. package/dist/plugins/remote-access-cloudflare-tunnel/models/status.model.d.ts +2 -0
  95. package/dist/plugins/remote-access-cloudflare-tunnel/models/status.model.js +17 -0
  96. package/dist/plugins/remote-access-cloudflare-tunnel/models/status.model.js.map +1 -1
  97. package/dist/plugins/remote-access-cloudflare-tunnel/services/cloudflare-tunnel-managed.service.d.ts +20 -2
  98. package/dist/plugins/remote-access-cloudflare-tunnel/services/cloudflare-tunnel-managed.service.js +105 -48
  99. package/dist/plugins/remote-access-cloudflare-tunnel/services/cloudflare-tunnel-managed.service.js.map +1 -1
  100. package/dist/plugins/remote-access-cloudflare-tunnel/services/cloudflare-tunnel-provider.service.d.ts +13 -1
  101. package/dist/plugins/remote-access-cloudflare-tunnel/services/cloudflare-tunnel-provider.service.js +8 -2
  102. package/dist/plugins/remote-access-cloudflare-tunnel/services/cloudflare-tunnel-provider.service.js.map +1 -1
  103. package/dist/plugins/remote-access-cloudflare-tunnel/services/cloudflared-cli.service.d.ts +1 -1
  104. package/dist/plugins/remote-access-cloudflare-tunnel/services/cloudflared-cli.service.js +12 -24
  105. package/dist/plugins/remote-access-cloudflare-tunnel/services/cloudflared-cli.service.js.map +1 -1
  106. package/dist/plugins/remote-access-cloudflare-tunnel/services/cloudflared-metrics.service.d.ts +1 -1
  107. package/dist/plugins/remote-access-cloudflare-tunnel/services/cloudflared-metrics.service.js +5 -2
  108. package/dist/plugins/remote-access-cloudflare-tunnel/services/cloudflared-metrics.service.js.map +1 -1
  109. package/dist/plugins/remote-access-tailscale/controllers/setup.controller.d.ts +10 -5
  110. package/dist/plugins/remote-access-tailscale/controllers/setup.controller.js +105 -15
  111. package/dist/plugins/remote-access-tailscale/controllers/setup.controller.js.map +1 -1
  112. package/dist/plugins/remote-access-tailscale/controllers/status.controller.d.ts +5 -4
  113. package/dist/plugins/remote-access-tailscale/controllers/status.controller.js +19 -9
  114. package/dist/plugins/remote-access-tailscale/controllers/status.controller.js.map +1 -1
  115. package/dist/plugins/remote-access-tailscale/models/status.model.d.ts +16 -0
  116. package/dist/plugins/remote-access-tailscale/models/status.model.js +100 -1
  117. package/dist/plugins/remote-access-tailscale/models/status.model.js.map +1 -1
  118. package/dist/plugins/remote-access-tailscale/remote-access-tailscale.constants.d.ts +2 -0
  119. package/dist/plugins/remote-access-tailscale/remote-access-tailscale.constants.js +3 -1
  120. package/dist/plugins/remote-access-tailscale/remote-access-tailscale.constants.js.map +1 -1
  121. package/dist/plugins/remote-access-tailscale/remote-access-tailscale.exceptions.d.ts +17 -1
  122. package/dist/plugins/remote-access-tailscale/remote-access-tailscale.exceptions.js +33 -1
  123. package/dist/plugins/remote-access-tailscale/remote-access-tailscale.exceptions.js.map +1 -1
  124. package/dist/plugins/remote-access-tailscale/remote-access-tailscale.openapi.d.ts +2 -2
  125. package/dist/plugins/remote-access-tailscale/remote-access-tailscale.openapi.js +1 -0
  126. package/dist/plugins/remote-access-tailscale/remote-access-tailscale.openapi.js.map +1 -1
  127. package/dist/plugins/remote-access-tailscale/remote-access-tailscale.plugin.js +2 -0
  128. package/dist/plugins/remote-access-tailscale/remote-access-tailscale.plugin.js.map +1 -1
  129. package/dist/plugins/remote-access-tailscale/services/tailscale-cli.service.d.ts +8 -4
  130. package/dist/plugins/remote-access-tailscale/services/tailscale-cli.service.js +58 -14
  131. package/dist/plugins/remote-access-tailscale/services/tailscale-cli.service.js.map +1 -1
  132. package/dist/plugins/remote-access-tailscale/services/tailscale-login.service.d.ts +8 -3
  133. package/dist/plugins/remote-access-tailscale/services/tailscale-login.service.js +175 -151
  134. package/dist/plugins/remote-access-tailscale/services/tailscale-login.service.js.map +1 -1
  135. package/dist/plugins/remote-access-tailscale/services/tailscale-node-managed.service.d.ts +51 -7
  136. package/dist/plugins/remote-access-tailscale/services/tailscale-node-managed.service.js +481 -101
  137. package/dist/plugins/remote-access-tailscale/services/tailscale-node-managed.service.js.map +1 -1
  138. package/dist/plugins/remote-access-tailscale/services/tailscale-operation-coordinator.service.d.ts +33 -0
  139. package/dist/plugins/remote-access-tailscale/services/tailscale-operation-coordinator.service.js +167 -0
  140. package/dist/plugins/remote-access-tailscale/services/tailscale-operation-coordinator.service.js.map +1 -0
  141. package/dist/plugins/remote-access-tailscale/services/tailscale-provider.service.d.ts +13 -1
  142. package/dist/plugins/remote-access-tailscale/services/tailscale-provider.service.js +8 -2
  143. package/dist/plugins/remote-access-tailscale/services/tailscale-provider.service.js.map +1 -1
  144. package/dist/plugins/remote-access-tailscale/services/tailscale-serve.service.d.ts +1 -1
  145. package/dist/plugins/remote-access-tailscale/services/tailscale-serve.service.js +7 -6
  146. package/dist/plugins/remote-access-tailscale/services/tailscale-serve.service.js.map +1 -1
  147. package/dist/plugins/remote-access-tailscale/services/tailscale-setup.service.d.ts +1 -3
  148. package/dist/plugins/remote-access-tailscale/services/tailscale-setup.service.js +9 -11
  149. package/dist/plugins/remote-access-tailscale/services/tailscale-setup.service.js.map +1 -1
  150. package/dist/plugins/remote-access-tailscale/utils/tailscale-control.utils.d.ts +5 -0
  151. package/dist/plugins/remote-access-tailscale/utils/tailscale-control.utils.js +36 -0
  152. package/dist/plugins/remote-access-tailscale/utils/tailscale-control.utils.js.map +1 -0
  153. package/dist/plugins/spaces-home-control/listeners/space-activity.listener.d.ts +6 -7
  154. package/dist/plugins/spaces-home-control/listeners/space-activity.listener.js +19 -44
  155. package/dist/plugins/spaces-home-control/listeners/space-activity.listener.js.map +1 -1
  156. package/dist/plugins/spaces-home-control/listeners/space-climate-state.listener.d.ts +4 -4
  157. package/dist/plugins/spaces-home-control/listeners/space-climate-state.listener.js +9 -22
  158. package/dist/plugins/spaces-home-control/listeners/space-climate-state.listener.js.map +1 -1
  159. package/dist/plugins/spaces-home-control/listeners/space-lighting-state.listener.d.ts +4 -4
  160. package/dist/plugins/spaces-home-control/listeners/space-lighting-state.listener.js +9 -22
  161. package/dist/plugins/spaces-home-control/listeners/space-lighting-state.listener.js.map +1 -1
  162. package/dist/plugins/spaces-home-control/listeners/space-sensor-state.listener.d.ts +4 -4
  163. package/dist/plugins/spaces-home-control/listeners/space-sensor-state.listener.js +9 -22
  164. package/dist/plugins/spaces-home-control/listeners/space-sensor-state.listener.js.map +1 -1
  165. package/dist/plugins/spaces-home-control/services/space-climate-state.service.d.ts +3 -5
  166. package/dist/plugins/spaces-home-control/services/space-climate-state.service.js +9 -12
  167. package/dist/plugins/spaces-home-control/services/space-climate-state.service.js.map +1 -1
  168. package/dist/plugins/spaces-home-control/services/space-lighting-state.service.d.ts +3 -5
  169. package/dist/plugins/spaces-home-control/services/space-lighting-state.service.js +7 -10
  170. package/dist/plugins/spaces-home-control/services/space-lighting-state.service.js.map +1 -1
  171. package/dist/plugins/spaces-home-control/services/space-sensor-state.service.d.ts +3 -5
  172. package/dist/plugins/spaces-home-control/services/space-sensor-state.service.js +7 -10
  173. package/dist/plugins/spaces-home-control/services/space-sensor-state.service.js.map +1 -1
  174. package/dist/plugins/spaces-home-control/services/space-state-read.service.d.ts +47 -0
  175. package/dist/plugins/spaces-home-control/services/space-state-read.service.js +262 -0
  176. package/dist/plugins/spaces-home-control/services/space-state-read.service.js.map +1 -0
  177. package/dist/plugins/spaces-home-control/spaces-home-control.plugin.js +4 -0
  178. package/dist/plugins/spaces-home-control/spaces-home-control.plugin.js.map +1 -1
  179. package/dist/tsconfig.build.tsbuildinfo +1 -1
  180. package/package.json +2 -2
@@ -1 +1 @@
1
- {"version":3,"file":"tailscale-setup.service.js","sourceRoot":"","sources":["../../../../src/plugins/remote-access-tailscale/services/tailscale-setup.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"tailscale-setup.service.js","sourceRoot":"","sources":["../../../../src/plugins/remote-access-tailscale/services/tailscale-setup.service.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,5 @@
1
+ import { RemoteAccessProviderState } from '../../../modules/remote-access/platforms/remote-access-provider.platform';
2
+ import { UserRole } from '../../../modules/users/users.constants';
3
+ import { RemoteAccessTailscalePluginControlModel } from '../models/status.model';
4
+ import { TailscaleRequirement } from '../services/tailscale-node-managed.service';
5
+ export declare function buildTailscaleControlModel(control: Omit<RemoteAccessTailscalePluginControlModel, 'availableActions'>, state: RemoteAccessProviderState, requirements: TailscaleRequirement[], role: UserRole | undefined): RemoteAccessTailscalePluginControlModel;
@@ -0,0 +1,36 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.buildTailscaleControlModel = buildTailscaleControlModel;
4
+ const users_constants_1 = require("../../../modules/users/users.constants");
5
+ const status_model_1 = require("../models/status.model");
6
+ function buildTailscaleControlModel(control, state, requirements, role) {
7
+ const result = Object.assign(new status_model_1.RemoteAccessTailscalePluginControlModel(), control);
8
+ result.availableActions = [];
9
+ if (role !== users_constants_1.UserRole.ADMIN && role !== users_constants_1.UserRole.OWNER) {
10
+ return result;
11
+ }
12
+ const stopping = control.operation === 'disconnect' || control.operation === 'shutdown' || control.operation === 'reset';
13
+ if (!stopping && (control.serviceState !== 'stopped' || control.operation !== null)) {
14
+ result.availableActions.push('disconnect');
15
+ }
16
+ if (!control.enabled || control.operation !== null || control.serviceState === 'stopping') {
17
+ return result;
18
+ }
19
+ const ready = requirements.length > 0 && requirements.every((requirement) => requirement.satisfied);
20
+ if (!ready) {
21
+ return result;
22
+ }
23
+ if (control.authentication === 'authenticated') {
24
+ if (state !== 'connected' && state !== 'connecting' && state !== 'pending-approval') {
25
+ result.availableActions.push('connect');
26
+ }
27
+ if (role === users_constants_1.UserRole.OWNER) {
28
+ result.availableActions.push('logout', 'reset-preferences');
29
+ }
30
+ }
31
+ else {
32
+ result.availableActions.push('login');
33
+ }
34
+ return result;
35
+ }
36
+ //# sourceMappingURL=tailscale-control.utils.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"tailscale-control.utils.js","sourceRoot":"","sources":["../../../../src/plugins/remote-access-tailscale/utils/tailscale-control.utils.ts"],"names":[],"mappings":";;AAMA,gEA6CC;AAlDD,4EAAkE;AAClE,yDAAiF;AAIjF,SAAgB,0BAA0B,CACzC,OAA0E,EAC1E,KAAgC,EAChC,YAAoC,EACpC,IAA0B;IAE1B,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,sDAAuC,EAAE,EAAE,OAAO,CAAC,CAAC;IACrF,MAAM,CAAC,gBAAgB,GAAG,EAAE,CAAC;IAE7B,IAAI,IAAI,KAAK,0BAAQ,CAAC,KAAK,IAAI,IAAI,KAAK,0BAAQ,CAAC,KAAK,EAAE,CAAC;QACxD,OAAO,MAAM,CAAC;IACf,CAAC;IAID,MAAM,QAAQ,GACb,OAAO,CAAC,SAAS,KAAK,YAAY,IAAI,OAAO,CAAC,SAAS,KAAK,UAAU,IAAI,OAAO,CAAC,SAAS,KAAK,OAAO,CAAC;IAEzG,IAAI,CAAC,QAAQ,IAAI,CAAC,OAAO,CAAC,YAAY,KAAK,SAAS,IAAI,OAAO,CAAC,SAAS,KAAK,IAAI,CAAC,EAAE,CAAC;QACrF,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC5C,CAAC;IAED,IAAI,CAAC,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,SAAS,KAAK,IAAI,IAAI,OAAO,CAAC,YAAY,KAAK,UAAU,EAAE,CAAC;QAC3F,OAAO,MAAM,CAAC;IACf,CAAC;IAED,MAAM,KAAK,GAAG,YAAY,CAAC,MAAM,GAAG,CAAC,IAAI,YAAY,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IAEpG,IAAI,CAAC,KAAK,EAAE,CAAC;QACZ,OAAO,MAAM,CAAC;IACf,CAAC;IAED,IAAI,OAAO,CAAC,cAAc,KAAK,eAAe,EAAE,CAAC;QAChD,IAAI,KAAK,KAAK,WAAW,IAAI,KAAK,KAAK,YAAY,IAAI,KAAK,KAAK,kBAAkB,EAAE,CAAC;YACrF,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACzC,CAAC;QAED,IAAI,IAAI,KAAK,0BAAQ,CAAC,KAAK,EAAE,CAAC;YAC7B,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,QAAQ,EAAE,mBAAmB,CAAC,CAAC;QAC7D,CAAC;IACF,CAAC;SAAM,CAAC;QACP,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACvC,CAAC;IAED,OAAO,MAAM,CAAC;AACf,CAAC"}
@@ -1,13 +1,12 @@
1
- import { Repository } from 'typeorm';
2
1
  import { OnModuleInit } from '@nestjs/common';
3
- import { ChannelEntity, ChannelPropertyEntity } from '../../../modules/devices/entities/devices.entity';
4
- import { SpaceEntity } from '../../../modules/spaces/entities/space.entity';
2
+ import { ChannelPropertyEntity } from '../../../modules/devices/entities/devices.entity';
3
+ import { PropertyMetadataService } from '../../../modules/devices/services/property-metadata.service';
4
+ import { SpaceActivityService } from '../../../modules/spaces/services/space-activity.service';
5
5
  export declare class SpaceActivityListener implements OnModuleInit {
6
- private readonly spaceRepository;
7
- private readonly channelRepository;
6
+ private readonly propertyMetadata;
7
+ private readonly activity;
8
8
  private readonly logger;
9
- constructor(spaceRepository: Repository<SpaceEntity>, channelRepository: Repository<ChannelEntity>);
9
+ constructor(propertyMetadata: PropertyMetadataService, activity: SpaceActivityService);
10
10
  onModuleInit(): void;
11
11
  handlePropertyUpdated(property: ChannelPropertyEntity): Promise<void>;
12
- private updateSpaceActivity;
13
12
  }
@@ -8,68 +8,45 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
8
8
  var __metadata = (this && this.__metadata) || function (k, v) {
9
9
  if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
10
10
  };
11
- var __param = (this && this.__param) || function (paramIndex, decorator) {
12
- return function (target, key) { decorator(target, key, paramIndex); }
13
- };
14
11
  Object.defineProperty(exports, "__esModule", { value: true });
15
12
  exports.SpaceActivityListener = void 0;
16
- const typeorm_1 = require("typeorm");
17
13
  const common_1 = require("@nestjs/common");
18
14
  const event_emitter_1 = require("@nestjs/event-emitter");
19
- const typeorm_2 = require("@nestjs/typeorm");
20
15
  const logger_1 = require("../../../common/logger");
21
16
  const devices_constants_1 = require("../../../modules/devices/devices.constants");
22
17
  const devices_entity_1 = require("../../../modules/devices/entities/devices.entity");
23
- const space_entity_1 = require("../../../modules/spaces/entities/space.entity");
18
+ const property_metadata_service_1 = require("../../../modules/devices/services/property-metadata.service");
19
+ const space_activity_service_1 = require("../../../modules/spaces/services/space-activity.service");
24
20
  const spaces_constants_1 = require("../../../modules/spaces/spaces.constants");
25
21
  let SpaceActivityListener = class SpaceActivityListener {
26
- constructor(spaceRepository, channelRepository) {
27
- this.spaceRepository = spaceRepository;
28
- this.channelRepository = channelRepository;
22
+ constructor(propertyMetadata, activity) {
23
+ this.propertyMetadata = propertyMetadata;
24
+ this.activity = activity;
29
25
  this.logger = (0, logger_1.createExtensionLogger)(spaces_constants_1.SPACES_MODULE_NAME, 'SpaceActivityListener');
30
26
  }
31
27
  onModuleInit() {
32
28
  this.logger.debug('Space activity listener initialized');
33
29
  }
34
30
  async handlePropertyUpdated(property) {
31
+ const observedAt = new Date();
32
+ const generation = this.activity.getGeneration();
35
33
  try {
36
- await this.updateSpaceActivity(property);
34
+ if (!property.id)
35
+ return;
36
+ const metadata = await this.propertyMetadata.findOne(property.id);
37
+ const channel = metadata?.channel;
38
+ if (!channel || typeof channel === 'string')
39
+ return;
40
+ const device = channel.device;
41
+ if (!device || typeof device === 'string' || !device.roomId)
42
+ return;
43
+ this.activity.record(device.roomId, observedAt, generation);
37
44
  }
38
45
  catch (error) {
39
46
  const err = error;
40
47
  this.logger.warn(`Failed to update space activity on property update: ${err.message}`, err.stack);
41
48
  }
42
49
  }
43
- async updateSpaceActivity(property) {
44
- const channelId = typeof property.channel === 'string' ? property.channel : property.channel?.id;
45
- if (!channelId) {
46
- this.logger.debug('Property has no channel, skipping activity update');
47
- return;
48
- }
49
- const channel = await this.channelRepository
50
- .createQueryBuilder('channel')
51
- .innerJoinAndSelect('channel.device', 'device')
52
- .where('channel.id = :channelId', { channelId })
53
- .andWhere('device.roomId IS NOT NULL')
54
- .getOne();
55
- if (!channel) {
56
- this.logger.debug('Channel not found or device has no room, skipping activity update');
57
- return;
58
- }
59
- const device = channel.device;
60
- if (!device.roomId) {
61
- this.logger.debug('Device has no room, skipping activity update');
62
- return;
63
- }
64
- const now = new Date();
65
- await this.spaceRepository
66
- .createQueryBuilder()
67
- .update()
68
- .set({ lastActivityAt: now })
69
- .where('id = :roomId', { roomId: device.roomId })
70
- .execute();
71
- this.logger.debug(`Updated lastActivityAt for room=${device.roomId} to ${now.toISOString()}`);
72
- }
73
50
  };
74
51
  exports.SpaceActivityListener = SpaceActivityListener;
75
52
  __decorate([
@@ -81,9 +58,7 @@ __decorate([
81
58
  ], SpaceActivityListener.prototype, "handlePropertyUpdated", null);
82
59
  exports.SpaceActivityListener = SpaceActivityListener = __decorate([
83
60
  (0, common_1.Injectable)(),
84
- __param(0, (0, typeorm_2.InjectRepository)(space_entity_1.SpaceEntity)),
85
- __param(1, (0, typeorm_2.InjectRepository)(devices_entity_1.ChannelEntity)),
86
- __metadata("design:paramtypes", [typeorm_1.Repository,
87
- typeorm_1.Repository])
61
+ __metadata("design:paramtypes", [property_metadata_service_1.PropertyMetadataService,
62
+ space_activity_service_1.SpaceActivityService])
88
63
  ], SpaceActivityListener);
89
64
  //# sourceMappingURL=space-activity.listener.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"space-activity.listener.js","sourceRoot":"","sources":["../../../../src/plugins/spaces-home-control/listeners/space-activity.listener.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"space-activity.listener.js","sourceRoot":"","sources":["../../../../src/plugins/spaces-home-control/listeners/space-activity.listener.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA0D;AAC1D,yDAAgD;AAEhD,mDAA+D;AAC/D,kFAA2F;AAC3F,qFAAyF;AACzF,2GAAsG;AACtG,oGAA+F;AAC/F,+EAA8E;AAGvE,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAGjC,YACkB,gBAAyC,EACzC,QAA8B;QAD9B,qBAAgB,GAAhB,gBAAgB,CAAyB;QACzC,aAAQ,GAAR,QAAQ,CAAsB;QAJ/B,WAAM,GAAG,IAAA,8BAAqB,EAAC,qCAAkB,EAAE,uBAAuB,CAAC,CAAC;IAK1F,CAAC;IAEJ,YAAY;QACX,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAC;IAC1D,CAAC;IAIK,AAAN,KAAK,CAAC,qBAAqB,CAAC,QAA+B;QAC1D,MAAM,UAAU,GAAG,IAAI,IAAI,EAAE,CAAC;QAC9B,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,aAAa,EAAE,CAAC;QACjD,IAAI,CAAC;YACJ,IAAI,CAAC,QAAQ,CAAC,EAAE;gBAAE,OAAO;YAGzB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;YAClE,MAAM,OAAO,GAAG,QAAQ,EAAE,OAAO,CAAC;YAClC,IAAI,CAAC,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ;gBAAE,OAAO;YACpD,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;YAC9B,IAAI,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,MAAM;gBAAE,OAAO;YACpE,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;QAC7D,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,GAAG,GAAG,KAAc,CAAC;YAC3B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,uDAAuD,GAAG,CAAC,OAAO,EAAE,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;QACnG,CAAC;IACF,CAAC;CACD,CAAA;AAhCY,sDAAqB;AAc3B;IAFL,IAAA,uBAAO,EAAC,6BAAgB,CAAC,wBAAwB,CAAC;IAClD,IAAA,uBAAO,EAAC,6BAAgB,CAAC,0BAA0B,CAAC;;qCACf,sCAAqB;;kEAiB1D;gCA/BW,qBAAqB;IADjC,IAAA,mBAAU,GAAE;qCAKwB,mDAAuB;QAC/B,6CAAoB;GALpC,qBAAqB,CAgCjC"}
@@ -1,15 +1,15 @@
1
- import { Repository } from 'typeorm';
2
1
  import { OnModuleDestroy, OnModuleInit } from '@nestjs/common';
3
2
  import { EventEmitter2 } from '@nestjs/event-emitter';
4
- import { ChannelEntity, ChannelPropertyEntity } from '../../../modules/devices/entities/devices.entity';
3
+ import { ChannelPropertyEntity } from '../../../modules/devices/entities/devices.entity';
4
+ import { PropertyMetadataService } from '../../../modules/devices/services/property-metadata.service';
5
5
  import { SpaceClimateStateService } from '../services/space-climate-state.service';
6
6
  export declare class SpaceClimateStateListener implements OnModuleInit, OnModuleDestroy {
7
- private readonly channelRepository;
7
+ private readonly propertyMetadata;
8
8
  private readonly climateStateService;
9
9
  private readonly eventEmitter;
10
10
  private readonly logger;
11
11
  private readonly debounceTimers;
12
- constructor(channelRepository: Repository<ChannelEntity>, climateStateService: SpaceClimateStateService, eventEmitter: EventEmitter2);
12
+ constructor(propertyMetadata: PropertyMetadataService, climateStateService: SpaceClimateStateService, eventEmitter: EventEmitter2);
13
13
  onModuleInit(): void;
14
14
  onModuleDestroy(): void;
15
15
  handlePropertyChanged(property: ChannelPropertyEntity): Promise<void>;
@@ -8,20 +8,16 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
8
8
  var __metadata = (this && this.__metadata) || function (k, v) {
9
9
  if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
10
10
  };
11
- var __param = (this && this.__param) || function (paramIndex, decorator) {
12
- return function (target, key) { decorator(target, key, paramIndex); }
13
- };
14
11
  Object.defineProperty(exports, "__esModule", { value: true });
15
12
  exports.SpaceClimateStateListener = void 0;
16
- const typeorm_1 = require("typeorm");
17
13
  const common_1 = require("@nestjs/common");
18
14
  const event_emitter_1 = require("@nestjs/event-emitter");
19
- const typeorm_2 = require("@nestjs/typeorm");
20
15
  const logger_1 = require("../../../common/logger");
21
16
  const transform_utils_1 = require("../../../common/utils/transform.utils");
22
17
  const devices_constants_1 = require("../../../modules/devices/devices.constants");
23
18
  const devices_constants_2 = require("../../../modules/devices/devices.constants");
24
19
  const devices_entity_1 = require("../../../modules/devices/entities/devices.entity");
20
+ const property_metadata_service_1 = require("../../../modules/devices/services/property-metadata.service");
25
21
  const spaces_constants_1 = require("../../../modules/spaces/spaces.constants");
26
22
  const spaces_response_model_1 = require("../models/spaces-response.model");
27
23
  const space_climate_state_service_1 = require("../services/space-climate-state.service");
@@ -42,8 +38,8 @@ const CLIMATE_PROPERTY_CATEGORIES = [
42
38
  devices_constants_1.PropertyCategory.LOCKED,
43
39
  ];
44
40
  let SpaceClimateStateListener = class SpaceClimateStateListener {
45
- constructor(channelRepository, climateStateService, eventEmitter) {
46
- this.channelRepository = channelRepository;
41
+ constructor(propertyMetadata, climateStateService, eventEmitter) {
42
+ this.propertyMetadata = propertyMetadata;
47
43
  this.climateStateService = climateStateService;
48
44
  this.eventEmitter = eventEmitter;
49
45
  this.logger = (0, logger_1.createExtensionLogger)(spaces_constants_1.SPACES_MODULE_NAME, 'SpaceClimateStateListener');
@@ -68,27 +64,19 @@ let SpaceClimateStateListener = class SpaceClimateStateListener {
68
64
  }
69
65
  }
70
66
  async processClimatePropertyChange(property) {
71
- if (!CLIMATE_PROPERTY_CATEGORIES.includes(property.category)) {
72
- return;
73
- }
74
- const channelId = typeof property.channel === 'string' ? property.channel : property.channel?.id;
75
- if (!channelId) {
67
+ if (!property.id || !CLIMATE_PROPERTY_CATEGORIES.includes(property.category)) {
76
68
  return;
77
69
  }
78
- const channel = await this.channelRepository
79
- .createQueryBuilder('channel')
80
- .innerJoinAndSelect('channel.device', 'device')
81
- .where('channel.id = :channelId', { channelId })
82
- .andWhere('device.roomId IS NOT NULL')
83
- .getOne();
84
- if (!channel) {
70
+ const metadata = await this.propertyMetadata.findOne(property.id);
71
+ const channel = metadata?.channel;
72
+ if (!channel || typeof channel === 'string') {
85
73
  return;
86
74
  }
87
75
  if (!CLIMATE_CHANNEL_CATEGORIES.includes(channel.category)) {
88
76
  return;
89
77
  }
90
78
  const device = channel.device;
91
- const roomId = device.roomId;
79
+ const roomId = device && typeof device !== 'string' ? device.roomId : null;
92
80
  if (!roomId) {
93
81
  return;
94
82
  }
@@ -135,8 +123,7 @@ __decorate([
135
123
  ], SpaceClimateStateListener.prototype, "handlePropertyChanged", null);
136
124
  exports.SpaceClimateStateListener = SpaceClimateStateListener = __decorate([
137
125
  (0, common_1.Injectable)(),
138
- __param(0, (0, typeorm_2.InjectRepository)(devices_entity_1.ChannelEntity)),
139
- __metadata("design:paramtypes", [typeorm_1.Repository,
126
+ __metadata("design:paramtypes", [property_metadata_service_1.PropertyMetadataService,
140
127
  space_climate_state_service_1.SpaceClimateStateService,
141
128
  event_emitter_1.EventEmitter2])
142
129
  ], SpaceClimateStateListener);
@@ -1 +1 @@
1
- {"version":3,"file":"space-climate-state.listener.js","sourceRoot":"","sources":["../../../../src/plugins/spaces-home-control/listeners/space-climate-state.listener.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"space-climate-state.listener.js","sourceRoot":"","sources":["../../../../src/plugins/spaces-home-control/listeners/space-climate-state.listener.ts"],"names":[],"mappings":"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"}
@@ -1,15 +1,15 @@
1
- import { Repository } from 'typeorm';
2
1
  import { OnModuleDestroy, OnModuleInit } from '@nestjs/common';
3
2
  import { EventEmitter2 } from '@nestjs/event-emitter';
4
- import { ChannelEntity, ChannelPropertyEntity } from '../../../modules/devices/entities/devices.entity';
3
+ import { ChannelPropertyEntity } from '../../../modules/devices/entities/devices.entity';
4
+ import { PropertyMetadataService } from '../../../modules/devices/services/property-metadata.service';
5
5
  import { SpaceLightingStateService } from '../services/space-lighting-state.service';
6
6
  export declare class SpaceLightingStateListener implements OnModuleInit, OnModuleDestroy {
7
- private readonly channelRepository;
7
+ private readonly propertyMetadata;
8
8
  private readonly lightingStateService;
9
9
  private readonly eventEmitter;
10
10
  private readonly logger;
11
11
  private readonly debounceTimers;
12
- constructor(channelRepository: Repository<ChannelEntity>, lightingStateService: SpaceLightingStateService, eventEmitter: EventEmitter2);
12
+ constructor(propertyMetadata: PropertyMetadataService, lightingStateService: SpaceLightingStateService, eventEmitter: EventEmitter2);
13
13
  onModuleInit(): void;
14
14
  onModuleDestroy(): void;
15
15
  handlePropertyChanged(property: ChannelPropertyEntity): Promise<void>;
@@ -8,19 +8,15 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
8
8
  var __metadata = (this && this.__metadata) || function (k, v) {
9
9
  if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
10
10
  };
11
- var __param = (this && this.__param) || function (paramIndex, decorator) {
12
- return function (target, key) { decorator(target, key, paramIndex); }
13
- };
14
11
  Object.defineProperty(exports, "__esModule", { value: true });
15
12
  exports.SpaceLightingStateListener = void 0;
16
- const typeorm_1 = require("typeorm");
17
13
  const common_1 = require("@nestjs/common");
18
14
  const event_emitter_1 = require("@nestjs/event-emitter");
19
- const typeorm_2 = require("@nestjs/typeorm");
20
15
  const logger_1 = require("../../../common/logger");
21
16
  const devices_constants_1 = require("../../../modules/devices/devices.constants");
22
17
  const devices_constants_2 = require("../../../modules/devices/devices.constants");
23
18
  const devices_entity_1 = require("../../../modules/devices/entities/devices.entity");
19
+ const property_metadata_service_1 = require("../../../modules/devices/services/property-metadata.service");
24
20
  const spaces_constants_1 = require("../../../modules/spaces/spaces.constants");
25
21
  const spaces_response_model_1 = require("../models/spaces-response.model");
26
22
  const space_lighting_state_service_1 = require("../services/space-lighting-state.service");
@@ -39,8 +35,8 @@ const LIGHTING_PROPERTY_CATEGORIES = [
39
35
  devices_constants_1.PropertyCategory.SATURATION,
40
36
  ];
41
37
  let SpaceLightingStateListener = class SpaceLightingStateListener {
42
- constructor(channelRepository, lightingStateService, eventEmitter) {
43
- this.channelRepository = channelRepository;
38
+ constructor(propertyMetadata, lightingStateService, eventEmitter) {
39
+ this.propertyMetadata = propertyMetadata;
44
40
  this.lightingStateService = lightingStateService;
45
41
  this.eventEmitter = eventEmitter;
46
42
  this.logger = (0, logger_1.createExtensionLogger)(spaces_constants_1.SPACES_MODULE_NAME, 'SpaceLightingStateListener');
@@ -65,27 +61,19 @@ let SpaceLightingStateListener = class SpaceLightingStateListener {
65
61
  }
66
62
  }
67
63
  async processLightingPropertyChange(property) {
68
- if (!LIGHTING_PROPERTY_CATEGORIES.includes(property.category)) {
69
- return;
70
- }
71
- const channelId = typeof property.channel === 'string' ? property.channel : property.channel?.id;
72
- if (!channelId) {
64
+ if (!property.id || !LIGHTING_PROPERTY_CATEGORIES.includes(property.category)) {
73
65
  return;
74
66
  }
75
- const channel = await this.channelRepository
76
- .createQueryBuilder('channel')
77
- .innerJoinAndSelect('channel.device', 'device')
78
- .where('channel.id = :channelId', { channelId })
79
- .andWhere('device.roomId IS NOT NULL')
80
- .getOne();
81
- if (!channel) {
67
+ const metadata = await this.propertyMetadata.findOne(property.id);
68
+ const channel = metadata?.channel;
69
+ if (!channel || typeof channel === 'string') {
82
70
  return;
83
71
  }
84
72
  if (!LIGHTING_CHANNEL_CATEGORIES.includes(channel.category)) {
85
73
  return;
86
74
  }
87
75
  const device = channel.device;
88
- const roomId = device.roomId;
76
+ const roomId = device && typeof device !== 'string' ? device.roomId : null;
89
77
  if (!roomId) {
90
78
  return;
91
79
  }
@@ -134,8 +122,7 @@ __decorate([
134
122
  ], SpaceLightingStateListener.prototype, "handlePropertyChanged", null);
135
123
  exports.SpaceLightingStateListener = SpaceLightingStateListener = __decorate([
136
124
  (0, common_1.Injectable)(),
137
- __param(0, (0, typeorm_2.InjectRepository)(devices_entity_1.ChannelEntity)),
138
- __metadata("design:paramtypes", [typeorm_1.Repository,
125
+ __metadata("design:paramtypes", [property_metadata_service_1.PropertyMetadataService,
139
126
  space_lighting_state_service_1.SpaceLightingStateService,
140
127
  event_emitter_1.EventEmitter2])
141
128
  ], SpaceLightingStateListener);
@@ -1 +1 @@
1
- {"version":3,"file":"space-lighting-state.listener.js","sourceRoot":"","sources":["../../../../src/plugins/spaces-home-control/listeners/space-lighting-state.listener.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"space-lighting-state.listener.js","sourceRoot":"","sources":["../../../../src/plugins/spaces-home-control/listeners/space-lighting-state.listener.ts"],"names":[],"mappings":"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"}
@@ -1,15 +1,15 @@
1
- import { Repository } from 'typeorm';
2
1
  import { OnModuleDestroy, OnModuleInit } from '@nestjs/common';
3
2
  import { EventEmitter2 } from '@nestjs/event-emitter';
4
- import { ChannelEntity, ChannelPropertyEntity } from '../../../modules/devices/entities/devices.entity';
3
+ import { ChannelPropertyEntity } from '../../../modules/devices/entities/devices.entity';
4
+ import { PropertyMetadataService } from '../../../modules/devices/services/property-metadata.service';
5
5
  import { SpaceSensorStateService } from '../services/space-sensor-state.service';
6
6
  export declare class SpaceSensorStateListener implements OnModuleInit, OnModuleDestroy {
7
- private readonly channelRepository;
7
+ private readonly propertyMetadata;
8
8
  private readonly sensorStateService;
9
9
  private readonly eventEmitter;
10
10
  private readonly logger;
11
11
  private readonly debounceTimers;
12
- constructor(channelRepository: Repository<ChannelEntity>, sensorStateService: SpaceSensorStateService, eventEmitter: EventEmitter2);
12
+ constructor(propertyMetadata: PropertyMetadataService, sensorStateService: SpaceSensorStateService, eventEmitter: EventEmitter2);
13
13
  onModuleInit(): void;
14
14
  onModuleDestroy(): void;
15
15
  handleSensorRoleChanged(payload: {
@@ -8,19 +8,15 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
8
8
  var __metadata = (this && this.__metadata) || function (k, v) {
9
9
  if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
10
10
  };
11
- var __param = (this && this.__param) || function (paramIndex, decorator) {
12
- return function (target, key) { decorator(target, key, paramIndex); }
13
- };
14
11
  Object.defineProperty(exports, "__esModule", { value: true });
15
12
  exports.SpaceSensorStateListener = void 0;
16
- const typeorm_1 = require("typeorm");
17
13
  const common_1 = require("@nestjs/common");
18
14
  const event_emitter_1 = require("@nestjs/event-emitter");
19
- const typeorm_2 = require("@nestjs/typeorm");
20
15
  const logger_1 = require("../../../common/logger");
21
16
  const transform_utils_1 = require("../../../common/utils/transform.utils");
22
17
  const devices_constants_1 = require("../../../modules/devices/devices.constants");
23
18
  const devices_entity_1 = require("../../../modules/devices/entities/devices.entity");
19
+ const property_metadata_service_1 = require("../../../modules/devices/services/property-metadata.service");
24
20
  const spaces_constants_1 = require("../../../modules/spaces/spaces.constants");
25
21
  const spaces_response_model_1 = require("../models/spaces-response.model");
26
22
  const space_sensor_state_service_1 = require("../services/space-sensor-state.service");
@@ -39,8 +35,8 @@ const SENSOR_PROPERTY_CATEGORIES = [
39
35
  devices_constants_1.PropertyCategory.PERCENTAGE,
40
36
  ];
41
37
  let SpaceSensorStateListener = class SpaceSensorStateListener {
42
- constructor(channelRepository, sensorStateService, eventEmitter) {
43
- this.channelRepository = channelRepository;
38
+ constructor(propertyMetadata, sensorStateService, eventEmitter) {
39
+ this.propertyMetadata = propertyMetadata;
44
40
  this.sensorStateService = sensorStateService;
45
41
  this.eventEmitter = eventEmitter;
46
42
  this.logger = (0, logger_1.createExtensionLogger)(spaces_constants_1.SPACES_MODULE_NAME, 'SpaceSensorStateListener');
@@ -72,27 +68,19 @@ let SpaceSensorStateListener = class SpaceSensorStateListener {
72
68
  }
73
69
  }
74
70
  async processSensorPropertyChange(property) {
75
- if (!SENSOR_PROPERTY_CATEGORIES.includes(property.category)) {
76
- return;
77
- }
78
- const channelId = typeof property.channel === 'string' ? property.channel : property.channel?.id;
79
- if (!channelId) {
71
+ if (!property.id || !SENSOR_PROPERTY_CATEGORIES.includes(property.category)) {
80
72
  return;
81
73
  }
82
- const channel = await this.channelRepository
83
- .createQueryBuilder('channel')
84
- .innerJoinAndSelect('channel.device', 'device')
85
- .where('channel.id = :channelId', { channelId })
86
- .andWhere('device.roomId IS NOT NULL')
87
- .getOne();
88
- if (!channel) {
74
+ const metadata = await this.propertyMetadata.findOne(property.id);
75
+ const channel = metadata?.channel;
76
+ if (!channel || typeof channel === 'string') {
89
77
  return;
90
78
  }
91
79
  if (!spaces_home_control_constants_1.SENSOR_CHANNEL_CATEGORIES.includes(channel.category)) {
92
80
  return;
93
81
  }
94
82
  const device = channel.device;
95
- const roomId = device.roomId;
83
+ const roomId = device && typeof device !== 'string' ? device.roomId : null;
96
84
  if (!roomId) {
97
85
  return;
98
86
  }
@@ -147,8 +135,7 @@ __decorate([
147
135
  ], SpaceSensorStateListener.prototype, "handlePropertyChanged", null);
148
136
  exports.SpaceSensorStateListener = SpaceSensorStateListener = __decorate([
149
137
  (0, common_1.Injectable)(),
150
- __param(0, (0, typeorm_2.InjectRepository)(devices_entity_1.ChannelEntity)),
151
- __metadata("design:paramtypes", [typeorm_1.Repository,
138
+ __metadata("design:paramtypes", [property_metadata_service_1.PropertyMetadataService,
152
139
  space_sensor_state_service_1.SpaceSensorStateService,
153
140
  event_emitter_1.EventEmitter2])
154
141
  ], SpaceSensorStateListener);
@@ -1 +1 @@
1
- {"version":3,"file":"space-sensor-state.listener.js","sourceRoot":"","sources":["../../../../src/plugins/spaces-home-control/listeners/space-sensor-state.listener.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,qCAAqC;AAErC,2CAA2E;AAC3E,yDAA+D;AAC/D,6CAAmD;AAEnD,mDAA+D;AAC/D,2EAAmE;AACnE,kFAA6G;AAC7G,qFAAsH;AACtH,+EAA8E;AAC9E,2EAAuE;AACvE,uFAAiF;AACjF,oFAAwF;AAMxF,MAAM,wBAAwB,GAAG,GAAG,CAAC;AAMrC,MAAM,0BAA0B,GAAuB;IACtD,oCAAgB,CAAC,WAAW;IAC5B,oCAAgB,CAAC,QAAQ;IACzB,oCAAgB,CAAC,QAAQ;IACzB,oCAAgB,CAAC,WAAW;IAC5B,oCAAgB,CAAC,aAAa;IAC9B,oCAAgB,CAAC,GAAG;IACpB,oCAAgB,CAAC,QAAQ;IACzB,oCAAgB,CAAC,KAAK;IACtB,oCAAgB,CAAC,WAAW;IAC5B,oCAAgB,CAAC,UAAU;CAC3B,CAAC;AAGK,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;IASpC,YAEC,iBAA6D,EAC5C,kBAA2C,EAC3C,YAA2B;QAF3B,sBAAiB,GAAjB,iBAAiB,CAA2B;QAC5C,uBAAkB,GAAlB,kBAAkB,CAAyB;QAC3C,iBAAY,GAAZ,YAAY,CAAe;QAZ5B,WAAM,GAAG,IAAA,8BAAqB,EAAC,qCAAkB,EAAE,0BAA0B,CAAC,CAAC;QAM/E,mBAAc,GAAG,IAAI,GAAG,EAA0B,CAAC;IAOjE,CAAC;IAEJ,YAAY;QACX,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,yCAAyC,CAAC,CAAC;IAC9D,CAAC;IAED,eAAe;QAEd,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,EAAE,CAAC;YAClD,YAAY,CAAC,KAAK,CAAC,CAAC;QACrB,CAAC;QACD,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC;IAC7B,CAAC;IAKD,uBAAuB,CAAC,OAA6B;QACpD,MAAM,OAAO,GAAG,OAAO,EAAE,QAAQ,CAAC;QAElC,IAAI,CAAC,OAAO,EAAE,CAAC;YACd,OAAO;QACR,CAAC;QAED,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAAC;IACvC,CAAC;IAIK,AAAN,KAAK,CAAC,qBAAqB,CAAC,QAA+B;QAC1D,IAAI,CAAC;YACJ,MAAM,IAAI,CAAC,2BAA2B,CAAC,QAAQ,CAAC,CAAC;QAClD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,GAAG,GAAG,KAAc,CAAC;YAC3B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,6CAA6C,GAAG,CAAC,OAAO,EAAE,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;QACzF,CAAC;IACF,CAAC;IAEO,KAAK,CAAC,2BAA2B,CAAC,QAA+B;QAExE,IAAI,CAAC,0BAA0B,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC7D,OAAO;QACR,CAAC;QAGD,MAAM,SAAS,GAAG,OAAO,QAAQ,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC;QAEjG,IAAI,CAAC,SAAS,EAAE,CAAC;YAChB,OAAO;QACR,CAAC;QAGD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,iBAAiB;aAC1C,kBAAkB,CAAC,SAAS,CAAC;aAC7B,kBAAkB,CAAC,gBAAgB,EAAE,QAAQ,CAAC;aAC9C,KAAK,CAAC,yBAAyB,EAAE,EAAE,SAAS,EAAE,CAAC;aAC/C,QAAQ,CAAC,2BAA2B,CAAC;aACrC,MAAM,EAAE,CAAC;QAEX,IAAI,CAAC,OAAO,EAAE,CAAC;YACd,OAAO;QACR,CAAC;QAGD,IAAI,CAAC,yDAAyB,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAsD,CAAC,EAAE,CAAC;YACzG,OAAO;QACR,CAAC;QAED,MAAM,MAAM,GAAG,OAAO,CAAC,MAAsB,CAAC;QAC9C,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;QAE7B,IAAI,CAAC,MAAM,EAAE,CAAC;YACb,OAAO;QACR,CAAC;QAGD,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;IACtC,CAAC;IAOO,uBAAuB,CAAC,MAAc;QAE7C,MAAM,aAAa,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACtD,IAAI,aAAa,EAAE,CAAC;YACnB,YAAY,CAAC,aAAa,CAAC,CAAC;QAC7B,CAAC;QAGD,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;YAC7B,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YACnC,KAAK,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC;QACzC,CAAC,EAAE,wBAAwB,CAAC,CAAC;QAE7B,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACxC,CAAC;IAKO,KAAK,CAAC,qBAAqB,CAAC,MAAc;QACjD,IAAI,CAAC;YACJ,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;YAEnE,IAAI,CAAC,KAAK,EAAE,CAAC;gBACZ,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,4BAA4B,MAAM,2BAA2B,CAAC,CAAC;gBACjF,OAAO;YACR,CAAC;YAKD,MAAM,UAAU,GAAG,IAAA,4BAAU,EAAC,4CAAoB,EAAE,KAAK,CAAC,CAAC;YAE3D,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,yCAAS,CAAC,oBAAoB,EAAE;gBACtD,QAAQ,EAAE,MAAM;gBAChB,KAAK,EAAE,UAAU;aACjB,CAAC,CAAC;YAEH,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,yCAAyC,MAAM,gBAAgB,KAAK,CAAC,UAAU,GAAG,CAAC,CAAC;QACvG,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,GAAG,GAAG,KAAc,CAAC;YAC3B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,+CAA+C,MAAM,KAAK,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;QAC3F,CAAC;IACF,CAAC;CACD,CAAA;AA9IY,4DAAwB;AA+BpC;IAHC,IAAA,uBAAO,EAAC,yCAAS,CAAC,qBAAqB,CAAC;IACxC,IAAA,uBAAO,EAAC,yCAAS,CAAC,qBAAqB,CAAC;IACxC,IAAA,uBAAO,EAAC,yCAAS,CAAC,qBAAqB,CAAC;;;;uEASxC;AAIK;IAFL,IAAA,uBAAO,EAAC,6BAAgB,CAAC,0BAA0B,CAAC;IACpD,IAAA,uBAAO,EAAC,6BAAgB,CAAC,wBAAwB,CAAC;;qCACb,sCAAqB;;qEAO1D;mCAlDW,wBAAwB;IADpC,IAAA,mBAAU,GAAE;IAWV,WAAA,IAAA,0BAAgB,EAAC,8BAAa,CAAC,CAAA;qCACI,oBAAU;QACT,oDAAuB;QAC7B,6BAAa;GAbjC,wBAAwB,CA8IpC"}
1
+ {"version":3,"file":"space-sensor-state.listener.js","sourceRoot":"","sources":["../../../../src/plugins/spaces-home-control/listeners/space-sensor-state.listener.ts"],"names":[],"mappings":"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"}
@@ -1,10 +1,9 @@
1
1
  import { DeviceCategory } from '../../../modules/devices/devices.constants';
2
2
  import { ChannelEntity, ChannelPropertyEntity, DeviceEntity } from '../../../modules/devices/entities/devices.entity';
3
3
  import { IntentTimeseriesService } from '../../../modules/intents/services/intent-timeseries.service';
4
- import { SpacesService } from '../../../modules/spaces/services/spaces.service';
5
4
  import { ClimateMode, ClimateRole } from '../spaces-home-control.constants';
6
- import { SpaceClimateRoleService } from './space-climate-role.service';
7
5
  import { SpaceIntentBaseService } from './space-intent-base.service';
6
+ import { SpaceStateReadService } from './space-state-read.service';
8
7
  export interface PrimaryClimateDevice {
9
8
  device: DeviceEntity;
10
9
  deviceCategory: DeviceCategory;
@@ -51,11 +50,10 @@ export interface ClimateState {
51
50
  lastAppliedAt: Date | null;
52
51
  }
53
52
  export declare class SpaceClimateStateService extends SpaceIntentBaseService {
54
- private readonly spacesService;
55
- private readonly climateRoleService;
53
+ private readonly stateReads;
56
54
  private readonly intentTimeseriesService;
57
55
  private readonly logger;
58
- constructor(spacesService: SpacesService, climateRoleService: SpaceClimateRoleService, intentTimeseriesService: IntentTimeseriesService);
56
+ constructor(stateReads: SpaceStateReadService, intentTimeseriesService: IntentTimeseriesService);
59
57
  getClimateState(spaceId: string): Promise<ClimateState | null>;
60
58
  getPrimaryClimateDevicesInSpace(spaceId: string): Promise<PrimaryClimateDevice[]>;
61
59
  private extractPrimaryClimateDevices;