@fastybird/smart-panel-backend 1.1.0-alpha.40 → 1.1.0-alpha.41

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 (81) hide show
  1. package/dist/modules/auth/auth.module.js +4 -0
  2. package/dist/modules/auth/auth.module.js.map +1 -1
  3. package/dist/modules/auth/guards/auth.guard.js +8 -13
  4. package/dist/modules/auth/guards/auth.guard.js.map +1 -1
  5. package/dist/modules/auth/services/token-metadata.service.d.ts +42 -0
  6. package/dist/modules/auth/services/token-metadata.service.js +202 -0
  7. package/dist/modules/auth/services/token-metadata.service.js.map +1 -0
  8. package/dist/modules/auth/services/token-usage.service.d.ts +22 -0
  9. package/dist/modules/auth/services/token-usage.service.js +93 -0
  10. package/dist/modules/auth/services/token-usage.service.js.map +1 -0
  11. package/dist/modules/auth/services/tokens.service.d.ts +8 -2
  12. package/dist/modules/auth/services/tokens.service.js +16 -10
  13. package/dist/modules/auth/services/tokens.service.js.map +1 -1
  14. package/dist/modules/devices/devices.module.js +7 -0
  15. package/dist/modules/devices/devices.module.js.map +1 -1
  16. package/dist/modules/devices/dto/property-command.dto.js +2 -8
  17. package/dist/modules/devices/dto/property-command.dto.js.map +1 -1
  18. package/dist/modules/devices/services/device-command-graph.service.d.ts +18 -0
  19. package/dist/modules/devices/services/device-command-graph.service.js +92 -0
  20. package/dist/modules/devices/services/device-command-graph.service.js.map +1 -0
  21. package/dist/modules/devices/services/devices.service.js +2 -17
  22. package/dist/modules/devices/services/devices.service.js.map +1 -1
  23. package/dist/modules/devices/services/property-command-dispatch.service.d.ts +5 -3
  24. package/dist/modules/devices/services/property-command-dispatch.service.js +15 -12
  25. package/dist/modules/devices/services/property-command-dispatch.service.js.map +1 -1
  26. package/dist/modules/devices/services/property-command.service.d.ts +7 -5
  27. package/dist/modules/devices/services/property-command.service.js +41 -20
  28. package/dist/modules/devices/services/property-command.service.js.map +1 -1
  29. package/dist/modules/devices/services/property-metadata.service.d.ts +9 -2
  30. package/dist/modules/devices/services/property-metadata.service.js +67 -17
  31. package/dist/modules/devices/services/property-metadata.service.js.map +1 -1
  32. package/dist/modules/devices/utils/device-graph-query.utils.d.ts +3 -0
  33. package/dist/modules/devices/utils/device-graph-query.utils.js +23 -0
  34. package/dist/modules/devices/utils/device-graph-query.utils.js.map +1 -0
  35. package/dist/modules/devices/validators/property-command-target-constraint.validator.d.ts +9 -0
  36. package/dist/modules/devices/validators/property-command-target-constraint.validator.js +58 -0
  37. package/dist/modules/devices/validators/property-command-target-constraint.validator.js.map +1 -0
  38. package/dist/modules/spaces/services/module-reset.service.d.ts +5 -1
  39. package/dist/modules/spaces/services/module-reset.service.js +10 -2
  40. package/dist/modules/spaces/services/module-reset.service.js.map +1 -1
  41. package/dist/modules/spaces/services/space-activity.service.d.ts +14 -0
  42. package/dist/modules/spaces/services/space-activity.service.js +56 -0
  43. package/dist/modules/spaces/services/space-activity.service.js.map +1 -0
  44. package/dist/modules/spaces/spaces.module.js +5 -0
  45. package/dist/modules/spaces/spaces.module.js.map +1 -1
  46. package/dist/modules/spaces/subscribers/space-activity.subscriber.d.ts +17 -0
  47. package/dist/modules/spaces/subscribers/space-activity.subscriber.js +89 -0
  48. package/dist/modules/spaces/subscribers/space-activity.subscriber.js.map +1 -0
  49. package/dist/modules/websocket/services/ws-auth.service.js +12 -28
  50. package/dist/modules/websocket/services/ws-auth.service.js.map +1 -1
  51. package/dist/plugins/devices-virtual/platforms/virtual-device.platform.d.ts +3 -8
  52. package/dist/plugins/devices-virtual/platforms/virtual-device.platform.js +6 -36
  53. package/dist/plugins/devices-virtual/platforms/virtual-device.platform.js.map +1 -1
  54. package/dist/plugins/spaces-home-control/listeners/space-activity.listener.d.ts +6 -7
  55. package/dist/plugins/spaces-home-control/listeners/space-activity.listener.js +19 -44
  56. package/dist/plugins/spaces-home-control/listeners/space-activity.listener.js.map +1 -1
  57. package/dist/plugins/spaces-home-control/listeners/space-climate-state.listener.d.ts +4 -4
  58. package/dist/plugins/spaces-home-control/listeners/space-climate-state.listener.js +9 -22
  59. package/dist/plugins/spaces-home-control/listeners/space-climate-state.listener.js.map +1 -1
  60. package/dist/plugins/spaces-home-control/listeners/space-lighting-state.listener.d.ts +4 -4
  61. package/dist/plugins/spaces-home-control/listeners/space-lighting-state.listener.js +9 -22
  62. package/dist/plugins/spaces-home-control/listeners/space-lighting-state.listener.js.map +1 -1
  63. package/dist/plugins/spaces-home-control/listeners/space-sensor-state.listener.d.ts +4 -4
  64. package/dist/plugins/spaces-home-control/listeners/space-sensor-state.listener.js +9 -22
  65. package/dist/plugins/spaces-home-control/listeners/space-sensor-state.listener.js.map +1 -1
  66. package/dist/plugins/spaces-home-control/services/space-climate-state.service.d.ts +3 -5
  67. package/dist/plugins/spaces-home-control/services/space-climate-state.service.js +9 -12
  68. package/dist/plugins/spaces-home-control/services/space-climate-state.service.js.map +1 -1
  69. package/dist/plugins/spaces-home-control/services/space-lighting-state.service.d.ts +3 -5
  70. package/dist/plugins/spaces-home-control/services/space-lighting-state.service.js +7 -10
  71. package/dist/plugins/spaces-home-control/services/space-lighting-state.service.js.map +1 -1
  72. package/dist/plugins/spaces-home-control/services/space-sensor-state.service.d.ts +3 -5
  73. package/dist/plugins/spaces-home-control/services/space-sensor-state.service.js +7 -10
  74. package/dist/plugins/spaces-home-control/services/space-sensor-state.service.js.map +1 -1
  75. package/dist/plugins/spaces-home-control/services/space-state-read.service.d.ts +47 -0
  76. package/dist/plugins/spaces-home-control/services/space-state-read.service.js +262 -0
  77. package/dist/plugins/spaces-home-control/services/space-state-read.service.js.map +1 -0
  78. package/dist/plugins/spaces-home-control/spaces-home-control.plugin.js +4 -0
  79. package/dist/plugins/spaces-home-control/spaces-home-control.plugin.js.map +1 -1
  80. package/dist/tsconfig.build.tsbuildinfo +1 -1
  81. package/package.json +2 -2
@@ -1 +1 @@
1
- {"version":3,"file":"property-command-dispatch.service.js","sourceRoot":"","sources":["../../../../src/modules/devices/services/property-command-dispatch.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAsD;AAEtD,4DAAsD;AACtD,qFAA0E;AAE1E,wFAA2G;AAE3G,+EAA0E;AAC1E,yDAAqD;AACrD,uGAAgG;AAChG,mFAA6E;AAC7E,uDAAmD;AACnD,2EAAsE;AACtE,uFAI2C;AAC3C,6FAAuF;AACvF,qGAA8F;AA6CvF,IAAM,8BAA8B,GAApC,MAAM,8BAA8B;IAC1C,YACkB,yBAAoD,EACpD,eAAgC,EAChC,cAA8B,EAC9B,uBAAgD,EAChD,mBAAuD,EACvD,aAAyC,EACzC,wBAAyD,EACzD,oBAAkD,EAElD,+BAAoE,IAAI,6EAAmC,EAAE;QAT7G,8BAAyB,GAAzB,yBAAyB,CAA2B;QACpD,oBAAe,GAAf,eAAe,CAAiB;QAChC,mBAAc,GAAd,cAAc,CAAgB;QAC9B,4BAAuB,GAAvB,uBAAuB,CAAyB;QAChD,wBAAmB,GAAnB,mBAAmB,CAAoC;QACvD,kBAAa,GAAb,aAAa,CAA4B;QACzC,6BAAwB,GAAxB,wBAAwB,CAAiC;QACzD,yBAAoB,GAApB,oBAAoB,CAA8B;QAElD,iCAA4B,GAA5B,4BAA4B,CAAiF;IAC5H,CAAC;IAEJ,KAAK,CAAC,aAAa,CAClB,OAAuC,EACvC,UAA0C,EAAE;QAE5C,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC1B,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;QAC1B,CAAC;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;QAErE,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;YACvB,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,yBAAyB,EAAE,CAAC;QAC9D,CAAC;QAED,MAAM,OAAO,GAAG,OAAO,CAAC,aAAa,IAAI,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC;QAElH,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC3B,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,oEAAoE,EAAE,CAAC;QACzG,CAAC;QACD,IAAI,OAAO,CAAC,aAAa,KAAK,SAAS,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,sBAAsB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,EAAE,CAAC;YACnG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;YAExB,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,mDAAmD,EAAE,CAAC;QACxF,CAAC;QAED,IAAI,CAAC;YACJ,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,YAAY,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;YAE1D,IAAI,CAAC,OAAO,EAAE,CAAC;gBACd,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;gBAExB,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,kBAAkB,EAAE,CAAC;YACvD,CAAC;YAED,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;QAC1B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;YAExB,MAAM,KAAK,CAAC;QACb,CAAC;IACF,CAAC;IAOD,KAAK,CAAC,iBAAiB,CAAC,MAA2B,EAAE,KAAa;QACjE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;QAC9D,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC;QAE5B,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACzB,OAAO,IAAI,CAAC;QACb,CAAC;QAED,OAAO;YACN,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,mBAAmB,EAAE,KAAK,CAAC,SAAS,CAAC,mBAAmB;YACxD,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,QAAQ;YAClC,kBAAkB,EACjB,KAAK,CAAC,SAAS,CAAC,mBAAmB,KAAK,MAAM,CAAC,QAAQ,CAAC,EAAE,IAAI,KAAK,CAAC,SAAS,CAAC,QAAQ,KAAK,IAAI;SAChG,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,YAAY,CACzB,OAAuC,EACvC,OAAuC;QAEvC,OAAO,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,KAAK,IAAI,EAAE;YAC9C,MAAM,oBAAoB,GAAG,IAAI,GAAG,EAAiC,CAAC;YAEtE,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;gBAC9B,MAAM,mBAAmB,GAAG,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;gBAC9E,MAAM,SAAS,GAAG,oBAAoB,CAAC,GAAG,CAAC,mBAAmB,CAAC,IAAI,EAAE,CAAC;gBAEtE,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBACvB,oBAAoB,CAAC,GAAG,CAAC,mBAAmB,EAAE,SAAS,CAAC,CAAC;YAC1D,CAAC;YAED,MAAM,QAAQ,GAAqB,EAAE,CAAC;YAEtC,KAAK,MAAM,CAAC,mBAAmB,EAAE,gBAAgB,CAAC,IAAI,oBAAoB,EAAE,CAAC;gBAC5E,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,mBAAmB,EAAE,KAAK,IAAI,EAAE,CACzF,IAAI,CAAC,eAAe,CAAC,mBAAmB,EAAE,gBAAgB,CAAC,CAC3D,CAAC;gBAEF,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;oBACxB,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;oBAErD,OAAO,IAAI,CAAC;gBACb,CAAC;gBAED,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;oBACzB,SAAS;gBACV,CAAC;gBAED,MAAM,MAAM,GAAG,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC;oBAC7C,eAAe,EAAE,SAAS,CAAC,eAAe;oBAC1C,gBAAgB,EAAE,SAAS,CAAC,gBAAgB;oBAC5C,QAAQ,EAAE,OAAO,CAAC,QAAQ;oBAC1B,cAAc,EAAE,SAAS,CAAC,cAAc;oBACxC,aAAa,EAAE,SAAS,CAAC,aAAa;oBACtC,KAAK,EAAE,OAAO,CAAC,KAAK,IAAI,KAAK;iBAC7B,CAAC,CAAC;gBACH,IAAI,CAAC,4BAA4B,CAAC,UAAU,CAC3C,OAAO,CAAC,QAAQ,EAChB,SAAS,CAAC,mBAAmB,EAC7B,MAAM,CAAC,UAAU,CACjB,CAAC;gBACF,QAAQ,CAAC,IAAI,CAAC;oBACb,MAAM;oBACN,SAAS;iBACT,CAAC,CAAC;YACJ,CAAC;YAED,OAAO,QAAQ,CAAC;QACjB,CAAC,CAAC,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,eAAe,CAC5B,mBAA2B,EAC3B,gBAAgD;QAEhD,MAAM,KAAK,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC;QAElC,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACzB,OAAO,IAAI,CAAC;QACb,CAAC;QAID,KAAK,MAAM,SAAS,IAAI,gBAAgB,EAAE,CAAC;YAC1C,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;YAE7F,IAAI,gBAAgB,KAAK,IAAI,IAAI,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,gBAAgB,CAAC,KAAK,mBAAmB,EAAE,CAAC;gBAC7G,OAAO,IAAI,CAAC;YACb,CAAC;QACF,CAAC;QAED,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;QAEzF,IAAI,cAAc,KAAK,IAAI,IAAI,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,cAAc,CAAC,KAAK,cAAc,CAAC,EAAE,EAAE,CAAC;YACvG,OAAO,IAAI,CAAC;QACb,CAAC;QAID,MAAM,aAAa,GAClB,OAAO,cAAc,CAAC,OAAO,KAAK,QAAQ;YACzC,CAAC,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC;YAC5D,CAAC,CAAC,CAAC,cAAc,CAAC,OAAO,IAAI,IAAI,CAAC,CAAC;QACrC,MAAM,YAAY,GACjB,OAAO,aAAa,EAAE,MAAM,KAAK,QAAQ;YACxC,CAAC,CAAC,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC;YACzD,CAAC,CAAC,CAAC,aAAa,EAAE,MAAM,IAAI,IAAI,CAAC,CAAC;QAEpC,IAAI,aAAa,KAAK,IAAI,IAAI,YAAY,KAAK,IAAI,EAAE,CAAC;YACrD,OAAO,IAAI,CAAC;QACb,CAAC;QAED,IAAI,cAAgD,CAAC;QAErD,KAAK,MAAM,SAAS,IAAI,gBAAgB,EAAE,CAAC;YAC1C,MAAM,UAAU,GAAG,IAAA,2DAA4B,EAAC,cAAc,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC;YAEjF,IAAI,CAAC,UAAU,CAAC,KAAK,IAAI,UAAU,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;gBACzD,OAAO,IAAI,CAAC;YACb,CAAC;YAED,IAAI,cAAc,KAAK,SAAS,IAAI,cAAc,KAAK,UAAU,CAAC,KAAK,EAAE,CAAC;gBACzE,OAAO,IAAI,CAAC;YACb,CAAC;YAED,cAAc,GAAG,UAAU,CAAC,KAAK,CAAC;QACnC,CAAC;QAED,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;YAClC,OAAO,IAAI,CAAC;QACb,CAAC;QAED,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACxD,MAAM,eAAe,GAAG,QAAQ,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,cAAc,EAAE,CAAC,CAAC;QAC7G,MAAM,QAAQ,GAAG,cAAc,CAAC,WAAW,CAAC,QAAQ,CAAC,kCAAc,CAAC,UAAU,CAAC,CAAC;QAChF,MAAM,aAAa,GAAG,IAAI,CAAC,uBAAuB,CAAC,iCAAiC,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;QAEnH,OAAO;YACN,mBAAmB;YACnB,eAAe;YACf,gBAAgB;YAChB,cAAc;YACd,aAAa,EAAE,cAAc,CAAC,KAAK,EAAE,KAAK,IAAI,IAAI;YAClD,QAAQ,EACP,cAAc,CAAC,KAAK,KAAK,IAAI;gBAC5B,CAAC,CAAC,IAAI;gBACN,CAAC,CAAC,IAAI,+CAAkB,CACtB,cAAc,CAAC,KAAK,CAAC,KAAK,EAC1B,cAAc,CAAC,KAAK,CAAC,WAAW,EAChC,cAAc,CAAC,KAAK,CAAC,KAAK,CAC1B;YACJ,QAAQ,EAAE,QAAQ,IAAI,CAAC,aAAa;SACpC,CAAC;IACH,CAAC;IAGO,KAAK,CAAC,sBAAsB,CACnC,OAAuC,EACvC,OAA+C;QAE/C,OAAO,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,KAAK,IAAI,EAAE;YAC9C,MAAM,oBAAoB,GAAG,IAAI,GAAG,EAAiC,CAAC;YAEtE,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;gBAC9B,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;gBACjF,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;oBACtB,OAAO,KAAK,CAAC;gBACd,CAAC;gBAED,MAAM,mBAAmB,GAAG,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;gBACtE,MAAM,SAAS,GAAG,oBAAoB,CAAC,GAAG,CAAC,mBAAmB,CAAC,IAAI,EAAE,CAAC;gBACtE,SAAS,CAAC,IAAI,CAAC,EAAE,GAAG,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;gBACjD,oBAAoB,CAAC,GAAG,CAAC,mBAAmB,EAAE,SAAS,CAAC,CAAC;YAC1D,CAAC;YAED,IAAI,oBAAoB,CAAC,IAAI,KAAK,OAAO,CAAC,MAAM,EAAE,CAAC;gBAClD,OAAO,KAAK,CAAC;YACd,CAAC;YAED,KAAK,MAAM,CAAC,mBAAmB,EAAE,gBAAgB,CAAC,IAAI,oBAAoB,EAAE,CAAC;gBAC5E,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,mBAAmB,KAAK,mBAAmB,CAAC,CAAC;gBAClG,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;oBAC1B,OAAO,KAAK,CAAC;gBACd,CAAC;gBAED,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,mBAAmB,EAAE,KAAK,IAAI,EAAE,CACzF,IAAI,CAAC,eAAe,CAAC,mBAAmB,EAAE,gBAAgB,CAAC,CAC3D,CAAC;gBACF,MAAM,MAAM,GAAG,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;gBAElE,IAAI,SAAS,KAAK,IAAI,IAAI,CAAC,SAAS,CAAC,QAAQ,IAAI,MAAM,KAAK,IAAI,IAAI,MAAM,CAAC,UAAU,KAAK,MAAM,CAAC,UAAU,EAAE,CAAC;oBAC7G,OAAO,KAAK,CAAC;gBACd,CAAC;YACF,CAAC;YAED,OAAO,IAAI,CAAC;QACb,CAAC,CAAC,CAAC;IACJ,CAAC;IAEO,SAAS,CAAC,OAA+C;QAChE,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC9B,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACxC,CAAC;IACF,CAAC;CACD,CAAA;AA1QY,wEAA8B;yCAA9B,8BAA8B;IAD1C,IAAA,mBAAU,GAAE;IAWV,WAAA,IAAA,iBAAQ,GAAE,CAAA;qCARiC,uDAAyB;QACnC,kCAAe;QAChB,gCAAc;QACL,mDAAuB;QAC3B,2EAAkC;QACxC,0DAA0B;QACf,oEAA+B;QACnC,8DAA4B;QAEpB,6EAAmC;GAXvE,8BAA8B,CA0Q1C;AAED,MAAM,QAAQ,GAAG,CAAC,EACjB,MAAM,EACN,OAAO,EACP,QAAQ,GACsD,EAA+B,EAAE,CAAC,CAAC;IACjG,QAAQ,EAAE,MAAM,CAAC,EAAE;IACnB,SAAS,EAAE,OAAO,CAAC,EAAE;IACrB,UAAU,EAAE,QAAQ,CAAC,EAAE;CACvB,CAAC,CAAC"}
1
+ {"version":3,"file":"property-command-dispatch.service.js","sourceRoot":"","sources":["../../../../src/modules/devices/services/property-command-dispatch.service.ts"],"names":[],"mappings":"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"}
@@ -5,13 +5,14 @@ import { UpdateChannelPropertyDto } from '../dto/update-channel-property.dto';
5
5
  import { ChannelEntity, ChannelPropertyEntity, DeviceEntity } from '../entities/devices.entity';
6
6
  import { PropertyValueState } from '../models/property-value-state.model';
7
7
  import { PropertyCommandValue } from '../utils/property-command-value.utils';
8
- import { ChannelsPropertiesService } from './channels.properties.service';
9
8
  import { ChannelsService } from './channels.service';
10
9
  import { CommandLatencyTraceCollectorService } from './command-latency-trace-collector.service';
11
- import { DevicesService } from './devices.service';
10
+ import { DeviceCommandGraphService } from './device-command-graph.service';
12
11
  import { PlatformRegistryService } from './platform.registry.service';
13
12
  import { PropertyCommandDispatchService } from './property-command-dispatch.service';
14
13
  import { PropertyCommandWindowHandle, PropertyCommandWindowService } from './property-command-window.service';
14
+ import { PropertyMetadataService } from './property-metadata.service';
15
+ import { PropertyValueService } from './property-value.service';
15
16
  export interface PropertyCommandExecutionOptions {
16
17
  requestId?: string;
17
18
  context?: IntentContext;
@@ -40,16 +41,17 @@ export interface PropertyBatchCommandResult {
40
41
  results: SinglePropertyCommandResult[];
41
42
  }
42
43
  export declare class PropertyCommandService {
43
- private readonly devicesService;
44
+ private readonly deviceGraphs;
44
45
  private readonly channelsService;
45
- private readonly channelsPropertiesService;
46
+ private readonly propertyMetadata;
47
+ private readonly propertyValues;
46
48
  private readonly platformRegistryService;
47
49
  private readonly intentsService;
48
50
  private readonly propertyCommandDispatchService;
49
51
  private readonly propertyCommandWindowService;
50
52
  private readonly commandLatencyTraceCollector;
51
53
  private readonly logger;
52
- constructor(devicesService: DevicesService, channelsService: ChannelsService, channelsPropertiesService: ChannelsPropertiesService, platformRegistryService: PlatformRegistryService, intentsService: IntentsService, propertyCommandDispatchService: PropertyCommandDispatchService, propertyCommandWindowService: PropertyCommandWindowService, commandLatencyTraceCollector?: CommandLatencyTraceCollectorService);
54
+ constructor(deviceGraphs: DeviceCommandGraphService, channelsService: ChannelsService, propertyMetadata: PropertyMetadataService, propertyValues: PropertyValueService, platformRegistryService: PlatformRegistryService, intentsService: IntentsService, propertyCommandDispatchService: PropertyCommandDispatchService, propertyCommandWindowService: PropertyCommandWindowService, commandLatencyTraceCollector?: CommandLatencyTraceCollectorService);
53
55
  handleInternal(user: ClientUserDto, payload?: object): Promise<{
54
56
  success: boolean;
55
57
  results: Array<{
@@ -25,18 +25,20 @@ const websocket_exceptions_1 = require("../../websocket/websocket.exceptions");
25
25
  const devices_constants_1 = require("../devices.constants");
26
26
  const property_command_dto_1 = require("../dto/property-command.dto");
27
27
  const property_command_value_utils_1 = require("../utils/property-command-value.utils");
28
- const channels_properties_service_1 = require("./channels.properties.service");
29
28
  const channels_service_1 = require("./channels.service");
30
29
  const command_latency_trace_collector_service_1 = require("./command-latency-trace-collector.service");
31
- const devices_service_1 = require("./devices.service");
30
+ const device_command_graph_service_1 = require("./device-command-graph.service");
32
31
  const platform_registry_service_1 = require("./platform.registry.service");
33
32
  const property_command_dispatch_service_1 = require("./property-command-dispatch.service");
34
33
  const property_command_window_service_1 = require("./property-command-window.service");
34
+ const property_metadata_service_1 = require("./property-metadata.service");
35
+ const property_value_service_1 = require("./property-value.service");
35
36
  let PropertyCommandService = class PropertyCommandService {
36
- constructor(devicesService, channelsService, channelsPropertiesService, platformRegistryService, intentsService, propertyCommandDispatchService, propertyCommandWindowService, commandLatencyTraceCollector = new command_latency_trace_collector_service_1.CommandLatencyTraceCollectorService()) {
37
- this.devicesService = devicesService;
37
+ constructor(deviceGraphs, channelsService, propertyMetadata, propertyValues, platformRegistryService, intentsService, propertyCommandDispatchService, propertyCommandWindowService, commandLatencyTraceCollector = new command_latency_trace_collector_service_1.CommandLatencyTraceCollectorService()) {
38
+ this.deviceGraphs = deviceGraphs;
38
39
  this.channelsService = channelsService;
39
- this.channelsPropertiesService = channelsPropertiesService;
40
+ this.propertyMetadata = propertyMetadata;
41
+ this.propertyValues = propertyValues;
40
42
  this.platformRegistryService = platformRegistryService;
41
43
  this.intentsService = intentsService;
42
44
  this.propertyCommandDispatchService = propertyCommandDispatchService;
@@ -78,7 +80,7 @@ let PropertyCommandService = class PropertyCommandService {
78
80
  });
79
81
  }
80
82
  async executePropertyCommandById(propertyId, rawValue, options = {}) {
81
- const property = await this.channelsPropertiesService.findOne(propertyId);
83
+ const property = await this.propertyMetadata.findOne(propertyId);
82
84
  if (!property) {
83
85
  return { device: '', success: false, reason: 'Property not found' };
84
86
  }
@@ -88,7 +90,7 @@ let PropertyCommandService = class PropertyCommandService {
88
90
  return { device: '', success: false, property: property.id, reason: 'Channel not found' };
89
91
  }
90
92
  const channelDevice = channel.device;
91
- const device = typeof channelDevice === 'string' ? await this.devicesService.findOne(channelDevice) : channelDevice;
93
+ const device = typeof channelDevice === 'string' ? await this.deviceGraphs.findOne(channelDevice) : channelDevice;
92
94
  if (!device) {
93
95
  return {
94
96
  device: '',
@@ -145,7 +147,7 @@ let PropertyCommandService = class PropertyCommandService {
145
147
  const resolved = [];
146
148
  let targetDeviceId = null;
147
149
  for (const cmd of commands) {
148
- const property = await this.channelsPropertiesService.findOne(cmd.propertyId);
150
+ const property = await this.propertyMetadata.findOne(cmd.propertyId);
149
151
  if (!property) {
150
152
  return {
151
153
  success: false,
@@ -171,7 +173,7 @@ let PropertyCommandService = class PropertyCommandService {
171
173
  };
172
174
  }
173
175
  const channelDevice = channel.device;
174
- const device = typeof channelDevice === 'string' ? await this.devicesService.findOne(channelDevice) : channelDevice;
176
+ const device = typeof channelDevice === 'string' ? await this.deviceGraphs.findOne(channelDevice) : channelDevice;
175
177
  if (!device) {
176
178
  return {
177
179
  success: false,
@@ -329,9 +331,17 @@ let PropertyCommandService = class PropertyCommandService {
329
331
  const executions = [];
330
332
  for (const [deviceId, commands] of Object.entries(groupedProperties)) {
331
333
  try {
332
- const device = await this.devicesService.findIdentity(deviceId);
333
- if (device !== null) {
334
- executions.push({ device, commandCount: commands.length });
334
+ const command = commands[0];
335
+ const property = command ? await this.propertyMetadata.findOne(command.property) : null;
336
+ const channel = property?.channel;
337
+ const device = channel && typeof channel !== 'string' ? channel.device : null;
338
+ if (channel &&
339
+ typeof channel !== 'string' &&
340
+ channel.id === command.channel &&
341
+ device &&
342
+ typeof device !== 'string' &&
343
+ device.id === deviceId) {
344
+ executions.push({ device: { id: device.id, type: device.type }, commandCount: commands.length });
335
345
  }
336
346
  }
337
347
  catch {
@@ -341,7 +351,7 @@ let PropertyCommandService = class PropertyCommandService {
341
351
  return this.platformRegistryService.getCommandTtlMs(executions, intents_constants_1.DEFAULT_TTL_DEVICE_COMMAND);
342
352
  }
343
353
  async processDeviceCommands(deviceId, commands, dispatchOptions) {
344
- const device = await this.devicesService.findOne(deviceId);
354
+ const device = await this.deviceGraphs.findOne(deviceId);
345
355
  if (!device) {
346
356
  this.logger.warn(`Device not found id=${deviceId}`);
347
357
  return { device: deviceId, success: false, reason: 'Device not found' };
@@ -362,8 +372,9 @@ let PropertyCommandService = class PropertyCommandService {
362
372
  this.logger.warn(`Channel not found id=${command.channel} for deviceId=${device.id}`);
363
373
  return { device: deviceId, success: false, reason: 'Channel not found' };
364
374
  }
365
- const property = await this.channelsPropertiesService.findOne(command.property, channel.id);
366
- if (!property) {
375
+ const property = await this.propertyMetadata.findOne(command.property);
376
+ const propertyChannelId = typeof property?.channel === 'string' ? property.channel : property?.channel.id;
377
+ if (!property || propertyChannelId !== channel.id) {
367
378
  this.logger.warn(`Property not found id=${command.property} for channelId=${channel.id}`);
368
379
  return { device: deviceId, success: false, reason: 'Property not found' };
369
380
  }
@@ -376,6 +387,15 @@ let PropertyCommandService = class PropertyCommandService {
376
387
  this.logger.warn(`Invalid value for property id=${property.id} dataType=${property.dataType} reason=${validation.reason}`);
377
388
  return { device: deviceId, success: false, reason: validation.reason ?? 'Invalid property value' };
378
389
  }
390
+ try {
391
+ property.value = await this.propertyValues.readLatest(property);
392
+ }
393
+ catch (error) {
394
+ this.logger.error(`Failed to load command property value id=${property.id}: ${error instanceof Error ? error.message : String(error)}`);
395
+ }
396
+ if (typeof property.channel !== 'string' && typeof property.channel.device !== 'string') {
397
+ property.channel.device.status = device.status;
398
+ }
379
399
  this.logger.log(`Adding command for propertyId=${property.id} value=${validation.value}`);
380
400
  propertyUpdates.push({ device, channel, property, value: validation.value });
381
401
  }
@@ -401,7 +421,7 @@ let PropertyCommandService = class PropertyCommandService {
401
421
  }
402
422
  async prepareApiPropertyCommand(device, channel, property, value) {
403
423
  try {
404
- const resolvedDevice = typeof device === 'string' ? await this.devicesService.findOne(device) : device;
424
+ const resolvedDevice = typeof device === 'string' ? await this.deviceGraphs.findOne(device) : device;
405
425
  if (resolvedDevice === null) {
406
426
  return null;
407
427
  }
@@ -420,7 +440,7 @@ let PropertyCommandService = class PropertyCommandService {
420
440
  this.propertyCommandWindowService.fail(receipt.handle);
421
441
  }
422
442
  async usesAuthoritativePropertyReadback(device, property, update) {
423
- const resolvedDevice = typeof device === 'string' ? await this.devicesService.findOne(device) : device;
443
+ const resolvedDevice = typeof device === 'string' ? await this.deviceGraphs.findOne(device) : device;
424
444
  const effectiveProperty = update
425
445
  ? Object.setPrototypeOf({ ...property, ...update }, Reflect.getPrototypeOf(property))
426
446
  : property;
@@ -431,10 +451,11 @@ let PropertyCommandService = class PropertyCommandService {
431
451
  exports.PropertyCommandService = PropertyCommandService;
432
452
  exports.PropertyCommandService = PropertyCommandService = __decorate([
433
453
  (0, common_1.Injectable)(),
434
- __param(7, (0, common_1.Optional)()),
435
- __metadata("design:paramtypes", [devices_service_1.DevicesService,
454
+ __param(8, (0, common_1.Optional)()),
455
+ __metadata("design:paramtypes", [device_command_graph_service_1.DeviceCommandGraphService,
436
456
  channels_service_1.ChannelsService,
437
- channels_properties_service_1.ChannelsPropertiesService,
457
+ property_metadata_service_1.PropertyMetadataService,
458
+ property_value_service_1.PropertyValueService,
438
459
  platform_registry_service_1.PlatformRegistryService,
439
460
  intents_service_1.IntentsService,
440
461
  property_command_dispatch_service_1.PropertyCommandDispatchService,
@@ -1 +1 @@
1
- {"version":3,"file":"property-command.service.js","sourceRoot":"","sources":["../../../../src/modules/devices/services/property-command.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"property-command.service.js","sourceRoot":"","sources":["../../../../src/modules/devices/services/property-command.service.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,7 @@
1
1
  import { DataSource, EntitySubscriberInterface, InsertEvent, RemoveEvent, TransactionCommitEvent, TransactionRollbackEvent, UpdateEvent } from 'typeorm';
2
2
  import { OnModuleDestroy, OnModuleInit } from '@nestjs/common';
3
3
  import { ConfigService as NestConfigService } from '@nestjs/config';
4
- import { ChannelPropertyEntity } from '../entities/devices.entity';
4
+ import { ChannelPropertyEntity, DeviceEntity } from '../entities/devices.entity';
5
5
  export declare class PropertyMetadataService implements EntitySubscriberInterface, OnModuleInit, OnModuleDestroy {
6
6
  private readonly dataSource;
7
7
  private readonly logger;
@@ -9,11 +9,14 @@ export declare class PropertyMetadataService implements EntitySubscriberInterfac
9
9
  private generation;
10
10
  private readonly catalog;
11
11
  private readonly loading;
12
+ private readonly deviceGraphs;
13
+ private readonly loadingGraphs;
12
14
  private readonly dirtyTransactions;
13
15
  constructor(dataSource: DataSource, configService?: NestConfigService);
14
16
  onModuleInit(): Promise<void>;
15
17
  onModuleDestroy(): void;
16
18
  findOne(id: string): Promise<ChannelPropertyEntity | null>;
19
+ findDevice(id: string): Promise<DeviceEntity | null>;
17
20
  beforeInsert(event: InsertEvent<unknown>): void;
18
21
  afterInsert(event: InsertEvent<unknown>): void;
19
22
  beforeUpdate(event: UpdateEvent<unknown>): void;
@@ -24,8 +27,12 @@ export declare class PropertyMetadataService implements EntitySubscriberInterfac
24
27
  afterTransactionRollback(event: TransactionRollbackEvent): void;
25
28
  private structuralMutation;
26
29
  private transactionSettled;
27
- private invalidate;
30
+ getGeneration(): number;
31
+ invalidate(): void;
28
32
  private findCached;
33
+ private loadCached;
34
+ private isEagerGraphDependency;
35
+ private copyGraph;
29
36
  private query;
30
37
  private copy;
31
38
  }
@@ -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) => type === devices_entity_1.ChannelPropertyEntity || type === devices_entity_1.ChannelEntity || type === devices_entity_1.DeviceEntity))
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.delete(event.queryRunner))
107
- this.invalidate();
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
- async findCached(id) {
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 = this.catalog.get(id);
149
+ const cached = catalog.get(id);
116
150
  if (cached)
117
151
  return cached;
118
152
  const generation = this.generation;
119
- if (this.loading.get(id)?.generation !== generation) {
120
- this.loading.set(id, {
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 = this.loading.get(id);
156
+ const loading = pending.get(id);
126
157
  try {
127
- const property = await loading.promise;
158
+ const entity = await loading.promise;
128
159
  if (generation === this.generation) {
129
- if (property)
130
- this.catalog.set(id, property);
131
- return property;
160
+ if (entity)
161
+ catalog.set(id, entity);
162
+ return entity;
132
163
  }
133
164
  }
134
165
  finally {
135
- if (this.loading.get(id) === loading)
136
- this.loading.delete(id);
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":"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"}
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,3 @@
1
+ import { Repository } from 'typeorm';
2
+ import { DeviceEntity } from '../entities/devices.entity';
3
+ export declare function buildDeviceGraphQuery<T extends DeviceEntity>(repository: Repository<T>): import("typeorm").SelectQueryBuilder<T>;
@@ -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;