@fastybird/smart-panel-backend 0.5.0-alpha.0 → 0.5.0-alpha.2
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.constants.js.map +1 -1
- package/dist/app.module.js +9 -17
- package/dist/app.module.js.map +1 -1
- package/dist/common/filters/bad-request-exception.filter.js +0 -6
- package/dist/common/filters/bad-request-exception.filter.js.map +1 -1
- package/dist/common/filters/global-error.filter.js +2 -6
- package/dist/common/filters/global-error.filter.js.map +1 -1
- package/dist/common/filters/internal-server-error-exception.filter.js +0 -5
- package/dist/common/filters/internal-server-error-exception.filter.js.map +1 -1
- package/dist/common/filters/not-found-exception.filter.d.ts +4 -0
- package/dist/common/filters/not-found-exception.filter.js +22 -3
- package/dist/common/filters/not-found-exception.filter.js.map +1 -1
- package/dist/common/filters/query-failed-exception.filter.js +0 -5
- package/dist/common/filters/query-failed-exception.filter.js.map +1 -1
- package/dist/common/filters/unprocessable-entity-exception.filter.js +0 -5
- package/dist/common/filters/unprocessable-entity-exception.filter.js.map +1 -1
- package/dist/common/services/app-instance-holder.service.d.ts +1 -2
- package/dist/common/services/app-instance-holder.service.js.map +1 -1
- package/dist/common/utils/config.utils.d.ts +0 -1
- package/dist/common/utils/config.utils.js +1 -11
- package/dist/common/utils/config.utils.js.map +1 -1
- package/dist/main.js +19 -5
- package/dist/main.js.map +1 -1
- package/dist/migrations/1000000000000-InitialSetup.js +8 -0
- package/dist/migrations/1000000000000-InitialSetup.js.map +1 -1
- package/dist/migrations/1000000000002-AddTokenLastUsedAt.d.ts +6 -0
- package/dist/migrations/1000000000002-AddTokenLastUsedAt.js +15 -0
- package/dist/migrations/1000000000002-AddTokenLastUsedAt.js.map +1 -0
- package/dist/modules/auth/auth.module.js +17 -1
- package/dist/modules/auth/auth.module.js.map +1 -1
- package/dist/modules/auth/controllers/auth.controller.js +6 -0
- package/dist/modules/auth/controllers/auth.controller.js.map +1 -1
- package/dist/modules/auth/controllers/tokens.controller.d.ts +10 -3
- package/dist/modules/auth/controllers/tokens.controller.js +96 -7
- package/dist/modules/auth/controllers/tokens.controller.js.map +1 -1
- package/dist/modules/auth/dto/create-personal-token.dto.d.ts +8 -0
- package/dist/modules/auth/dto/create-personal-token.dto.js +75 -0
- package/dist/modules/auth/dto/create-personal-token.dto.js.map +1 -0
- package/dist/modules/auth/dto/register.dto.d.ts +1 -1
- package/dist/modules/auth/dto/register.dto.js +13 -11
- package/dist/modules/auth/dto/register.dto.js.map +1 -1
- package/dist/modules/auth/entities/auth.entity.d.ts +1 -0
- package/dist/modules/auth/entities/auth.entity.js +13 -0
- package/dist/modules/auth/entities/auth.entity.js.map +1 -1
- package/dist/modules/auth/guards/auth.guard.js +7 -17
- package/dist/modules/auth/guards/auth.guard.js.map +1 -1
- package/dist/modules/auth/services/auth.service.js +1 -1
- package/dist/modules/auth/services/auth.service.js.map +1 -1
- package/dist/modules/auth/services/tokens.service.d.ts +10 -0
- package/dist/modules/auth/services/tokens.service.js +35 -0
- package/dist/modules/auth/services/tokens.service.js.map +1 -1
- package/dist/modules/buddy/buddy.module.js +2 -1
- package/dist/modules/buddy/buddy.module.js.map +1 -1
- package/dist/modules/buddy/buddy.utils.d.ts +8 -0
- package/dist/modules/buddy/buddy.utils.js +49 -0
- package/dist/modules/buddy/buddy.utils.js.map +1 -1
- package/dist/modules/buddy/controllers/buddy-suggestions.controller.js +2 -2
- package/dist/modules/buddy/controllers/buddy-suggestions.controller.js.map +1 -1
- package/dist/modules/buddy/entities/buddy-conversation.entity.js +3 -3
- package/dist/modules/buddy/entities/buddy-conversation.entity.js.map +1 -1
- package/dist/modules/buddy/entities/buddy-message.entity.js +2 -2
- package/dist/modules/buddy/entities/buddy-message.entity.js.map +1 -1
- package/dist/modules/buddy/entities/buddy-suggestion.entity.d.ts +19 -0
- package/dist/modules/buddy/entities/buddy-suggestion.entity.js +93 -0
- package/dist/modules/buddy/entities/buddy-suggestion.entity.js.map +1 -0
- package/dist/modules/buddy/platforms/llm-provider.platform.d.ts +6 -0
- package/dist/modules/buddy/platforms/openai-sdk.utils.d.ts +2 -1
- package/dist/modules/buddy/platforms/openai-sdk.utils.js +12 -1
- package/dist/modules/buddy/platforms/openai-sdk.utils.js.map +1 -1
- package/dist/modules/buddy/services/buddy-conversation.service.js +23 -8
- package/dist/modules/buddy/services/buddy-conversation.service.js.map +1 -1
- package/dist/modules/buddy/services/heartbeat.service.js +1 -1
- package/dist/modules/buddy/services/heartbeat.service.js.map +1 -1
- package/dist/modules/buddy/services/llm-provider.service.js +2 -10
- package/dist/modules/buddy/services/llm-provider.service.js.map +1 -1
- package/dist/modules/buddy/services/module-reset.service.d.ts +3 -1
- package/dist/modules/buddy/services/module-reset.service.js +6 -1
- package/dist/modules/buddy/services/module-reset.service.js.map +1 -1
- package/dist/modules/buddy/services/pattern-detector.service.d.ts +4 -1
- package/dist/modules/buddy/services/pattern-detector.service.js +10 -3
- package/dist/modules/buddy/services/pattern-detector.service.js.map +1 -1
- package/dist/modules/buddy/services/scene-suggestion-evaluator.service.d.ts +4 -1
- package/dist/modules/buddy/services/scene-suggestion-evaluator.service.js +10 -4
- package/dist/modules/buddy/services/scene-suggestion-evaluator.service.js.map +1 -1
- package/dist/modules/buddy/services/stt-provider.service.js +2 -10
- package/dist/modules/buddy/services/stt-provider.service.js.map +1 -1
- package/dist/modules/buddy/services/suggestion-engine.service.d.ts +19 -13
- package/dist/modules/buddy/services/suggestion-engine.service.js +170 -103
- package/dist/modules/buddy/services/suggestion-engine.service.js.map +1 -1
- package/dist/modules/buddy/services/tts-provider.service.js +2 -10
- package/dist/modules/buddy/services/tts-provider.service.js.map +1 -1
- package/dist/modules/config/services/config.service.js +1 -1
- package/dist/modules/config/services/config.service.js.map +1 -1
- package/dist/modules/devices/services/devices.service.js.map +1 -1
- package/dist/modules/extensions/controllers/actions.controller.d.ts +9 -4
- package/dist/modules/extensions/controllers/actions.controller.js +63 -10
- package/dist/modules/extensions/controllers/actions.controller.js.map +1 -1
- package/dist/modules/extensions/extensions.module.js +3 -1
- package/dist/modules/extensions/extensions.module.js.map +1 -1
- package/dist/modules/extensions/extensions.openapi.d.ts +3 -3
- package/dist/modules/extensions/extensions.openapi.js +2 -0
- package/dist/modules/extensions/extensions.openapi.js.map +1 -1
- package/dist/modules/extensions/models/action.model.d.ts +13 -0
- package/dist/modules/extensions/models/action.model.js +89 -3
- package/dist/modules/extensions/models/action.model.js.map +1 -1
- package/dist/modules/extensions/models/actions-response.model.d.ts +4 -1
- package/dist/modules/extensions/models/actions-response.model.js +19 -1
- package/dist/modules/extensions/models/actions-response.model.js.map +1 -1
- package/dist/modules/extensions/models/extension.model.js +5 -0
- package/dist/modules/extensions/models/extension.model.js.map +1 -1
- package/dist/modules/extensions/models/service-status.model.js +7 -0
- package/dist/modules/extensions/models/service-status.model.js.map +1 -1
- package/dist/modules/extensions/services/action-audit.service.d.ts +21 -0
- package/dist/modules/extensions/services/action-audit.service.js +49 -0
- package/dist/modules/extensions/services/action-audit.service.js.map +1 -0
- package/dist/modules/extensions/services/base-managed-plugin.service.d.ts +11 -0
- package/dist/modules/extensions/services/base-managed-plugin.service.js +28 -0
- package/dist/modules/extensions/services/base-managed-plugin.service.js.map +1 -0
- package/dist/modules/extensions/services/extension-action-registry.service.d.ts +6 -1
- package/dist/modules/extensions/services/extension-action-registry.service.js +22 -3
- package/dist/modules/extensions/services/extension-action-registry.service.js.map +1 -1
- package/dist/modules/extensions/services/extension-action.interface.d.ts +3 -0
- package/dist/modules/extensions/services/extension-action.interface.js +3 -1
- package/dist/modules/extensions/services/extension-action.interface.js.map +1 -1
- package/dist/modules/platform/dto/system-info.dto.d.ts +2 -0
- package/dist/modules/platform/dto/system-info.dto.js +7 -0
- package/dist/modules/platform/dto/system-info.dto.js.map +1 -1
- package/dist/modules/platform/platforms/abstract.platform.d.ts +44 -0
- package/dist/modules/platform/platforms/abstract.platform.js +267 -0
- package/dist/modules/platform/platforms/abstract.platform.js.map +1 -1
- package/dist/modules/platform/platforms/docker.platform.d.ts +2 -0
- package/dist/modules/platform/platforms/docker.platform.js +3 -0
- package/dist/modules/platform/platforms/docker.platform.js.map +1 -1
- package/dist/modules/platform/platforms/generic.platform.d.ts +2 -1
- package/dist/modules/platform/platforms/generic.platform.js +17 -15
- package/dist/modules/platform/platforms/generic.platform.js.map +1 -1
- package/dist/modules/platform/platforms/home-assistant.platform.d.ts +4 -0
- package/dist/modules/platform/platforms/home-assistant.platform.js +21 -0
- package/dist/modules/platform/platforms/home-assistant.platform.js.map +1 -1
- package/dist/modules/platform/platforms/raspberry.platform.js +22 -40
- package/dist/modules/platform/platforms/raspberry.platform.js.map +1 -1
- package/dist/modules/platform/services/platform.service.d.ts +2 -0
- package/dist/modules/platform/services/platform.service.js +7 -0
- package/dist/modules/platform/services/platform.service.js.map +1 -1
- package/dist/modules/stats/controllers/prometheus.controller.js +0 -2
- package/dist/modules/stats/controllers/prometheus.controller.js.map +1 -1
- package/dist/modules/storage/models/config.model.js +2 -4
- package/dist/modules/storage/models/config.model.js.map +1 -1
- package/dist/modules/storage/services/storage.service.d.ts +4 -10
- package/dist/modules/storage/services/storage.service.js +21 -60
- package/dist/modules/storage/services/storage.service.js.map +1 -1
- package/dist/modules/storage/storage.constants.d.ts +2 -0
- package/dist/modules/storage/storage.constants.js +3 -1
- package/dist/modules/storage/storage.constants.js.map +1 -1
- package/dist/modules/storage/storage.module.js +1 -3
- package/dist/modules/storage/storage.module.js.map +1 -1
- package/dist/modules/swagger/commands/serve-swagger.command.d.ts +14 -0
- package/dist/modules/swagger/commands/serve-swagger.command.js +60 -0
- package/dist/modules/swagger/commands/serve-swagger.command.js.map +1 -0
- package/dist/modules/swagger/swagger.module.js +2 -0
- package/dist/modules/swagger/swagger.module.js.map +1 -1
- package/dist/modules/system/models/system.model.d.ts +3 -1
- package/dist/modules/system/models/system.model.js +26 -0
- package/dist/modules/system/models/system.model.js.map +1 -1
- package/dist/modules/system/scripts/update-worker.sh +304 -0
- package/dist/modules/system/services/system-command.service.d.ts +7 -1
- package/dist/modules/system/services/system-command.service.js +24 -4
- package/dist/modules/system/services/system-command.service.js.map +1 -1
- package/dist/modules/system/services/system.service.js +4 -1
- package/dist/modules/system/services/system.service.js.map +1 -1
- package/dist/modules/system/services/update-executor.service.d.ts +4 -0
- package/dist/modules/system/services/update-executor.service.js +104 -1
- package/dist/modules/system/services/update-executor.service.js.map +1 -1
- package/dist/modules/system/system.constants.d.ts +7 -0
- package/dist/modules/system/system.constants.js +9 -1
- package/dist/modules/system/system.constants.js.map +1 -1
- package/dist/modules/system/system.module.js +6 -3
- package/dist/modules/system/system.module.js.map +1 -1
- package/dist/modules/users/controllers/users.controller.js +9 -0
- package/dist/modules/users/controllers/users.controller.js.map +1 -1
- package/dist/modules/users/dto/create-user.dto.js +1 -0
- package/dist/modules/users/dto/create-user.dto.js.map +1 -1
- package/dist/modules/users/dto/update-user.dto.d.ts +1 -0
- package/dist/modules/users/dto/update-user.dto.js +15 -1
- package/dist/modules/users/dto/update-user.dto.js.map +1 -1
- package/dist/modules/users/services/users.service.d.ts +1 -0
- package/dist/modules/users/services/users.service.js +12 -2
- package/dist/modules/users/services/users.service.js.map +1 -1
- package/dist/modules/websocket/dto/client-user.dto.js +25 -0
- package/dist/modules/websocket/dto/client-user.dto.js.map +1 -1
- package/dist/modules/websocket/dto/ws-client.dto.js +26 -0
- package/dist/modules/websocket/dto/ws-client.dto.js.map +1 -1
- package/dist/modules/websocket/gateway/websocket.gateway.js +7 -2
- package/dist/modules/websocket/gateway/websocket.gateway.js.map +1 -1
- package/dist/modules/websocket/services/command-event-registry.service.d.ts +3 -1
- package/dist/modules/websocket/services/command-event-registry.service.js +5 -4
- package/dist/modules/websocket/services/command-event-registry.service.js.map +1 -1
- package/dist/plugins/buddy-openai/platforms/openai.provider.js +1 -0
- package/dist/plugins/buddy-openai/platforms/openai.provider.js.map +1 -1
- package/dist/plugins/devices-home-assistant/devices-home-assistant.plugin.js +2 -0
- package/dist/plugins/devices-home-assistant/devices-home-assistant.plugin.js.map +1 -1
- package/dist/plugins/devices-home-assistant/dto/home-assistant-discovered-helper.dto.js +22 -2
- package/dist/plugins/devices-home-assistant/dto/home-assistant-discovered-helper.dto.js.map +1 -1
- package/dist/plugins/devices-home-assistant/models/config.model.d.ts +1 -0
- package/dist/plugins/devices-home-assistant/models/config.model.js +12 -0
- package/dist/plugins/devices-home-assistant/models/config.model.js.map +1 -1
- package/dist/plugins/devices-home-assistant/platforms/home-assistant.device.platform.d.ts +3 -1
- package/dist/plugins/devices-home-assistant/platforms/home-assistant.device.platform.js +14 -2
- package/dist/plugins/devices-home-assistant/platforms/home-assistant.device.platform.js.map +1 -1
- package/dist/plugins/devices-home-assistant/services/ha-supervisor.service.d.ts +10 -0
- package/dist/plugins/devices-home-assistant/services/ha-supervisor.service.js +47 -0
- package/dist/plugins/devices-home-assistant/services/ha-supervisor.service.js.map +1 -0
- package/dist/plugins/devices-home-assistant/services/home-assistant-config-validator.service.d.ts +3 -1
- package/dist/plugins/devices-home-assistant/services/home-assistant-config-validator.service.js +8 -2
- package/dist/plugins/devices-home-assistant/services/home-assistant-config-validator.service.js.map +1 -1
- package/dist/plugins/devices-home-assistant/services/home-assistant.http.service.d.ts +5 -1
- package/dist/plugins/devices-home-assistant/services/home-assistant.http.service.js +35 -12
- package/dist/plugins/devices-home-assistant/services/home-assistant.http.service.js.map +1 -1
- package/dist/plugins/devices-home-assistant/services/home-assistant.ws.service.d.ts +9 -7
- package/dist/plugins/devices-home-assistant/services/home-assistant.ws.service.js +64 -24
- package/dist/plugins/devices-home-assistant/services/home-assistant.ws.service.js.map +1 -1
- package/dist/plugins/devices-home-assistant/services/state-changed.event.service.js +1 -0
- package/dist/plugins/devices-home-assistant/services/state-changed.event.service.js.map +1 -1
- package/dist/plugins/devices-shelly-ng/delegates/delegates-manager.service.d.ts +4 -0
- package/dist/plugins/devices-shelly-ng/delegates/delegates-manager.service.js +83 -11
- package/dist/plugins/devices-shelly-ng/delegates/delegates-manager.service.js.map +1 -1
- package/dist/plugins/devices-shelly-ng/delegates/shelly-device.delegate.d.ts +6 -0
- package/dist/plugins/devices-shelly-ng/delegates/shelly-device.delegate.js +42 -0
- package/dist/plugins/devices-shelly-ng/delegates/shelly-device.delegate.js.map +1 -1
- package/dist/plugins/devices-shelly-ng/devices-shelly-ng.plugin.d.ts +6 -1
- package/dist/plugins/devices-shelly-ng/devices-shelly-ng.plugin.js +42 -2
- package/dist/plugins/devices-shelly-ng/devices-shelly-ng.plugin.js.map +1 -1
- package/dist/plugins/devices-shelly-ng/dto/update-config.dto.d.ts +1 -0
- package/dist/plugins/devices-shelly-ng/dto/update-config.dto.js +24 -6
- package/dist/plugins/devices-shelly-ng/dto/update-config.dto.js.map +1 -1
- package/dist/plugins/devices-shelly-ng/entities/devices-shelly-ng.entity.js +12 -0
- package/dist/plugins/devices-shelly-ng/entities/devices-shelly-ng.entity.js.map +1 -1
- package/dist/plugins/devices-shelly-ng/entities/shelly-ng-device-address.entity.js +2 -0
- package/dist/plugins/devices-shelly-ng/entities/shelly-ng-device-address.entity.js.map +1 -1
- package/dist/plugins/devices-shelly-ng/models/config.model.d.ts +1 -0
- package/dist/plugins/devices-shelly-ng/models/config.model.js +18 -6
- package/dist/plugins/devices-shelly-ng/models/config.model.js.map +1 -1
- package/dist/plugins/devices-shelly-ng/services/shelly-ng.service.d.ts +14 -7
- package/dist/plugins/devices-shelly-ng/services/shelly-ng.service.js +91 -14
- package/dist/plugins/devices-shelly-ng/services/shelly-ng.service.js.map +1 -1
- package/dist/plugins/devices-shelly-ng/services/shelly-rpc-client.service.d.ts +5 -0
- package/dist/plugins/devices-shelly-ng/services/shelly-rpc-client.service.js +3 -0
- package/dist/plugins/devices-shelly-ng/services/shelly-rpc-client.service.js.map +1 -1
- package/dist/plugins/devices-shelly-ng/services/shelly-ws-server.service.d.ts +28 -0
- package/dist/plugins/devices-shelly-ng/services/shelly-ws-server.service.js +197 -0
- package/dist/plugins/devices-shelly-ng/services/shelly-ws-server.service.js.map +1 -0
- package/dist/plugins/devices-shelly-v1/services/shellies-adapter.service.d.ts +6 -2
- package/dist/plugins/devices-shelly-v1/services/shellies-adapter.service.js +68 -20
- package/dist/plugins/devices-shelly-v1/services/shellies-adapter.service.js.map +1 -1
- package/dist/plugins/devices-shelly-v1/services/shelly-v1.service.d.ts +3 -6
- package/dist/plugins/devices-shelly-v1/services/shelly-v1.service.js +7 -20
- package/dist/plugins/devices-shelly-v1/services/shelly-v1.service.js.map +1 -1
- package/dist/plugins/devices-wled/services/wled.service.d.ts +3 -6
- package/dist/plugins/devices-wled/services/wled.service.js +3 -20
- package/dist/plugins/devices-wled/services/wled.service.js.map +1 -1
- package/dist/plugins/devices-zigbee2mqtt/services/zigbee2mqtt.service.d.ts +3 -6
- package/dist/plugins/devices-zigbee2mqtt/services/zigbee2mqtt.service.js +3 -20
- package/dist/plugins/devices-zigbee2mqtt/services/zigbee2mqtt.service.js.map +1 -1
- package/dist/{modules/storage/plugins/influx-v1/influx-v1.update-config.dto.d.ts → plugins/influx-v1/dto/update-config.dto.d.ts} +1 -1
- package/dist/{modules/storage/plugins/influx-v1/influx-v1.update-config.dto.js → plugins/influx-v1/dto/update-config.dto.js} +3 -3
- package/dist/plugins/influx-v1/dto/update-config.dto.js.map +1 -0
- package/dist/plugins/influx-v1/influx-v1.constants.js.map +1 -0
- package/dist/{modules/storage/plugins → plugins}/influx-v1/influx-v1.openapi.d.ts +1 -1
- package/dist/plugins/influx-v1/influx-v1.openapi.js +7 -0
- package/dist/plugins/influx-v1/influx-v1.openapi.js.map +1 -0
- package/dist/plugins/influx-v1/influx-v1.plugin.d.ts +15 -0
- package/dist/{modules/storage/plugins/influx-v1/influx-v1.module.js → plugins/influx-v1/influx-v1.plugin.js} +24 -43
- package/dist/plugins/influx-v1/influx-v1.plugin.js.map +1 -0
- package/dist/{modules/storage/plugins/influx-v1/influx-v1.config.model.d.ts → plugins/influx-v1/models/config.model.d.ts} +1 -1
- package/dist/{modules/storage/plugins/influx-v1/influx-v1.config.model.js → plugins/influx-v1/models/config.model.js} +3 -3
- package/dist/plugins/influx-v1/models/config.model.js.map +1 -0
- package/dist/plugins/influx-v1/services/influx-v1-managed.service.d.ts +20 -0
- package/dist/plugins/influx-v1/services/influx-v1-managed.service.js +128 -0
- package/dist/plugins/influx-v1/services/influx-v1-managed.service.js.map +1 -0
- package/dist/{modules/storage/plugins/influx-v1/influx-v1.plugin.d.ts → plugins/influx-v1/services/influx-v1.storage.d.ts} +3 -3
- package/dist/{modules/storage/plugins/influx-v1/influx-v1.plugin.js → plugins/influx-v1/services/influx-v1.storage.js} +9 -9
- package/dist/plugins/influx-v1/services/influx-v1.storage.js.map +1 -0
- package/dist/plugins/influx-v2/dto/update-config.dto.d.ts +8 -0
- package/dist/plugins/influx-v2/dto/update-config.dto.js +82 -0
- package/dist/plugins/influx-v2/dto/update-config.dto.js.map +1 -0
- package/dist/plugins/influx-v2/influx-v2.constants.d.ts +4 -0
- package/dist/plugins/influx-v2/influx-v2.constants.js +8 -0
- package/dist/plugins/influx-v2/influx-v2.constants.js.map +1 -0
- package/dist/plugins/influx-v2/influx-v2.openapi.d.ts +2 -0
- package/dist/plugins/influx-v2/influx-v2.openapi.js +7 -0
- package/dist/plugins/influx-v2/influx-v2.openapi.js.map +1 -0
- package/dist/plugins/influx-v2/influx-v2.plugin.d.ts +15 -0
- package/dist/plugins/influx-v2/influx-v2.plugin.js +76 -0
- package/dist/plugins/influx-v2/influx-v2.plugin.js.map +1 -0
- package/dist/plugins/influx-v2/models/config.model.d.ts +9 -0
- package/dist/plugins/influx-v2/models/config.model.js +93 -0
- package/dist/plugins/influx-v2/models/config.model.js.map +1 -0
- package/dist/plugins/influx-v2/services/influx-v2-managed.service.d.ts +20 -0
- package/dist/plugins/influx-v2/services/influx-v2-managed.service.js +132 -0
- package/dist/plugins/influx-v2/services/influx-v2-managed.service.js.map +1 -0
- package/dist/plugins/influx-v2/services/influx-v2.storage.d.ts +33 -0
- package/dist/plugins/influx-v2/services/influx-v2.storage.js +230 -0
- package/dist/plugins/influx-v2/services/influx-v2.storage.js.map +1 -0
- package/dist/{modules/storage/plugins/memory/memory.update-config.dto.d.ts → plugins/memory-storage/dto/update-config.dto.d.ts} +1 -1
- package/dist/{modules/storage/plugins/memory/memory.update-config.dto.js → plugins/memory-storage/dto/update-config.dto.js} +5 -5
- package/dist/plugins/memory-storage/dto/update-config.dto.js.map +1 -0
- package/dist/{modules/storage/plugins/memory/memory.constants.js → plugins/memory-storage/memory-storage.constants.js} +1 -1
- package/dist/plugins/memory-storage/memory-storage.constants.js.map +1 -0
- package/dist/{modules/storage/plugins/memory/memory.openapi.d.ts → plugins/memory-storage/memory-storage.openapi.d.ts} +1 -1
- package/dist/plugins/memory-storage/memory-storage.openapi.js +7 -0
- package/dist/plugins/memory-storage/memory-storage.openapi.js.map +1 -0
- package/dist/plugins/memory-storage/memory-storage.plugin.d.ts +15 -0
- package/dist/{modules/storage/plugins/memory/memory.module.js → plugins/memory-storage/memory-storage.plugin.js} +29 -28
- package/dist/plugins/memory-storage/memory-storage.plugin.js.map +1 -0
- package/dist/{modules/storage/plugins/memory/memory.config.model.d.ts → plugins/memory-storage/models/config.model.d.ts} +1 -1
- package/dist/{modules/storage/plugins/memory/memory.config.model.js → plugins/memory-storage/models/config.model.js} +5 -5
- package/dist/plugins/memory-storage/models/config.model.js.map +1 -0
- package/dist/{modules/storage/plugins/memory → plugins/memory-storage/services}/in-memory-timeseries.store.d.ts +1 -1
- package/dist/{modules/storage/plugins/memory → plugins/memory-storage/services}/in-memory-timeseries.store.js +4 -4
- package/dist/plugins/memory-storage/services/in-memory-timeseries.store.js.map +1 -0
- package/dist/plugins/memory-storage/services/influxql-parser.js.map +1 -0
- package/dist/plugins/memory-storage/services/memory-storage-managed.service.d.ts +14 -0
- package/dist/plugins/memory-storage/services/memory-storage-managed.service.js +87 -0
- package/dist/plugins/memory-storage/services/memory-storage-managed.service.js.map +1 -0
- package/dist/{modules/storage/plugins/memory/memory.plugin.d.ts → plugins/memory-storage/services/memory-storage.storage.d.ts} +3 -3
- package/dist/{modules/storage/plugins/memory/memory.plugin.js → plugins/memory-storage/services/memory-storage.storage.js} +8 -8
- package/dist/plugins/memory-storage/services/memory-storage.storage.js.map +1 -0
- package/dist/plugins/simulator/services/simulator-actions.service.js +3 -0
- package/dist/plugins/simulator/services/simulator-actions.service.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +6 -2
- package/dist/modules/storage/plugins/influx-v1/influx-v1.config.model.js.map +0 -1
- package/dist/modules/storage/plugins/influx-v1/influx-v1.constants.js.map +0 -1
- package/dist/modules/storage/plugins/influx-v1/influx-v1.module.d.ts +0 -17
- package/dist/modules/storage/plugins/influx-v1/influx-v1.module.js.map +0 -1
- package/dist/modules/storage/plugins/influx-v1/influx-v1.openapi.js +0 -7
- package/dist/modules/storage/plugins/influx-v1/influx-v1.openapi.js.map +0 -1
- package/dist/modules/storage/plugins/influx-v1/influx-v1.plugin.js.map +0 -1
- package/dist/modules/storage/plugins/influx-v1/influx-v1.update-config.dto.js.map +0 -1
- package/dist/modules/storage/plugins/memory/in-memory-timeseries.store.js.map +0 -1
- package/dist/modules/storage/plugins/memory/influxql-parser.js.map +0 -1
- package/dist/modules/storage/plugins/memory/memory.config.model.js.map +0 -1
- package/dist/modules/storage/plugins/memory/memory.constants.js.map +0 -1
- package/dist/modules/storage/plugins/memory/memory.module.d.ts +0 -13
- package/dist/modules/storage/plugins/memory/memory.module.js.map +0 -1
- package/dist/modules/storage/plugins/memory/memory.openapi.js +0 -7
- package/dist/modules/storage/plugins/memory/memory.openapi.js.map +0 -1
- package/dist/modules/storage/plugins/memory/memory.plugin.js.map +0 -1
- package/dist/modules/storage/plugins/memory/memory.update-config.dto.js.map +0 -1
- /package/dist/{modules/storage/plugins → plugins}/influx-v1/influx-v1.constants.d.ts +0 -0
- /package/dist/{modules/storage/plugins → plugins}/influx-v1/influx-v1.constants.js +0 -0
- /package/dist/{modules/storage/plugins/memory/memory.constants.d.ts → plugins/memory-storage/memory-storage.constants.d.ts} +0 -0
- /package/dist/{modules/storage/plugins/memory → plugins/memory-storage/services}/influxql-parser.d.ts +0 -0
- /package/dist/{modules/storage/plugins/memory → plugins/memory-storage/services}/influxql-parser.js +0 -0
|
@@ -10,6 +10,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.ShellyNgService = void 0;
|
|
13
|
+
const crypto_1 = require("crypto");
|
|
13
14
|
const shellies_ds9_1 = require("shellies-ds9");
|
|
14
15
|
const common_1 = require("@nestjs/common");
|
|
15
16
|
const logger_1 = require("../../../common/logger");
|
|
@@ -17,13 +18,16 @@ const config_service_1 = require("../../../modules/config/services/config.servic
|
|
|
17
18
|
const devices_constants_1 = require("../../../modules/devices/devices.constants");
|
|
18
19
|
const device_connectivity_service_1 = require("../../../modules/devices/services/device-connectivity.service");
|
|
19
20
|
const devices_service_1 = require("../../../modules/devices/services/devices.service");
|
|
21
|
+
const base_managed_plugin_service_1 = require("../../../modules/extensions/services/base-managed-plugin.service");
|
|
20
22
|
const plugin_service_manager_service_1 = require("../../../modules/extensions/services/plugin-service-manager.service");
|
|
21
23
|
const delegates_manager_service_1 = require("../delegates/delegates-manager.service");
|
|
22
24
|
const devices_shelly_ng_constants_1 = require("../devices-shelly-ng.constants");
|
|
23
25
|
const database_discoverer_service_1 = require("./database-discoverer.service");
|
|
24
26
|
const device_manager_service_1 = require("./device-manager.service");
|
|
25
|
-
|
|
26
|
-
|
|
27
|
+
const shelly_ws_server_service_1 = require("./shelly-ws-server.service");
|
|
28
|
+
let ShellyNgService = class ShellyNgService extends base_managed_plugin_service_1.BaseManagedPluginService {
|
|
29
|
+
constructor(configService, databaseDiscovererService, delegatesRegistryService, deviceManagerService, devicesService, deviceConnectivityService, pluginServiceManager, wsServer) {
|
|
30
|
+
super();
|
|
27
31
|
this.configService = configService;
|
|
28
32
|
this.databaseDiscovererService = databaseDiscovererService;
|
|
29
33
|
this.delegatesRegistryService = delegatesRegistryService;
|
|
@@ -31,14 +35,17 @@ let ShellyNgService = class ShellyNgService {
|
|
|
31
35
|
this.devicesService = devicesService;
|
|
32
36
|
this.deviceConnectivityService = deviceConnectivityService;
|
|
33
37
|
this.pluginServiceManager = pluginServiceManager;
|
|
38
|
+
this.wsServer = wsServer;
|
|
34
39
|
this.logger = (0, logger_1.createExtensionLogger)(devices_shelly_ng_constants_1.DEVICES_SHELLY_NG_PLUGIN_NAME, 'ShellyService');
|
|
35
40
|
this.pluginName = devices_shelly_ng_constants_1.DEVICES_SHELLY_NG_PLUGIN_NAME;
|
|
36
41
|
this.serviceId = 'connector';
|
|
37
42
|
this.pluginConfig = null;
|
|
38
|
-
this.state = 'stopped';
|
|
39
|
-
this.startStopLock = Promise.resolve();
|
|
40
43
|
this.pendingRestart = null;
|
|
41
44
|
this.restartTimer = null;
|
|
45
|
+
this.healthCheckTimer = null;
|
|
46
|
+
this.healthCheckRunning = false;
|
|
47
|
+
this.statusPollTimer = null;
|
|
48
|
+
this.statusPollRunning = false;
|
|
42
49
|
this.discoveryQueue = [];
|
|
43
50
|
this.processingDiscovery = false;
|
|
44
51
|
this.discoveryGeneration = 0;
|
|
@@ -120,9 +127,6 @@ let ShellyNgService = class ShellyNgService {
|
|
|
120
127
|
}
|
|
121
128
|
});
|
|
122
129
|
}
|
|
123
|
-
getState() {
|
|
124
|
-
return this.state;
|
|
125
|
-
}
|
|
126
130
|
onConfigChanged() {
|
|
127
131
|
if (this.state === 'started' && this.pluginConfig) {
|
|
128
132
|
const oldConfig = this.pluginConfig;
|
|
@@ -136,6 +140,10 @@ let ShellyNgService = class ShellyNgService {
|
|
|
136
140
|
this.logger.log('Config changed, restart required');
|
|
137
141
|
return Promise.resolve({ restartRequired: true });
|
|
138
142
|
}
|
|
143
|
+
if (oldConfig.statusPollInterval !== newConfig.statusPollInterval) {
|
|
144
|
+
this.pluginConfig = newConfig;
|
|
145
|
+
this.startStatusPoll();
|
|
146
|
+
}
|
|
139
147
|
return Promise.resolve({ restartRequired: false });
|
|
140
148
|
}
|
|
141
149
|
this.pluginConfig = null;
|
|
@@ -168,11 +176,6 @@ let ShellyNgService = class ShellyNgService {
|
|
|
168
176
|
});
|
|
169
177
|
return this.pendingRestart;
|
|
170
178
|
}
|
|
171
|
-
withLock(fn) {
|
|
172
|
-
const run = async () => fn();
|
|
173
|
-
this.startStopLock = this.startStopLock.then(run, run);
|
|
174
|
-
return this.startStopLock;
|
|
175
|
-
}
|
|
176
179
|
async doStart() {
|
|
177
180
|
if (typeof this.shellies !== 'undefined') {
|
|
178
181
|
this.state = 'started';
|
|
@@ -194,7 +197,7 @@ let ShellyNgService = class ShellyNgService {
|
|
|
194
197
|
requestTimeout: this.config.websockets.requestTimeout,
|
|
195
198
|
pingInterval: this.config.websockets.pingInterval,
|
|
196
199
|
reconnectInterval: this.config.websockets.reconnectInterval,
|
|
197
|
-
clientId: 'fb-smart-panel-
|
|
200
|
+
clientId: 'fb-smart-panel-' + (0, crypto_1.randomUUID)(),
|
|
198
201
|
},
|
|
199
202
|
autoLoadStatus: true,
|
|
200
203
|
autoLoadConfig: true,
|
|
@@ -238,6 +241,9 @@ let ShellyNgService = class ShellyNgService {
|
|
|
238
241
|
});
|
|
239
242
|
}
|
|
240
243
|
}
|
|
244
|
+
this.startHealthCheck();
|
|
245
|
+
this.startStatusPoll();
|
|
246
|
+
this.wsServer.start();
|
|
241
247
|
this.state = 'started';
|
|
242
248
|
}
|
|
243
249
|
catch (e) {
|
|
@@ -247,6 +253,9 @@ let ShellyNgService = class ShellyNgService {
|
|
|
247
253
|
}
|
|
248
254
|
}
|
|
249
255
|
async doStop() {
|
|
256
|
+
this.stopHealthCheck();
|
|
257
|
+
this.stopStatusPoll();
|
|
258
|
+
this.wsServer.stop();
|
|
250
259
|
if (!this.shellies) {
|
|
251
260
|
this.state = 'stopped';
|
|
252
261
|
return;
|
|
@@ -335,6 +344,14 @@ let ShellyNgService = class ShellyNgService {
|
|
|
335
344
|
if (sysDevice !== null) {
|
|
336
345
|
await this.deviceManagerService.createOrUpdate(sysDevice.id);
|
|
337
346
|
}
|
|
347
|
+
const existingDelegate = this.delegatesRegistryService.get(device.id);
|
|
348
|
+
if (existingDelegate && !existingDelegate.connected) {
|
|
349
|
+
this.logger.log(`mDNS re-discovered disconnected device=${device.id}, re-creating delegate with current address`, {
|
|
350
|
+
resource: device.id,
|
|
351
|
+
});
|
|
352
|
+
await this.delegatesRegistryService.insert(device, true);
|
|
353
|
+
return;
|
|
354
|
+
}
|
|
338
355
|
await this.delegatesRegistryService.insert(device);
|
|
339
356
|
}
|
|
340
357
|
async initialize() {
|
|
@@ -345,6 +362,65 @@ let ShellyNgService = class ShellyNgService {
|
|
|
345
362
|
});
|
|
346
363
|
}
|
|
347
364
|
}
|
|
365
|
+
startHealthCheck() {
|
|
366
|
+
this.stopHealthCheck();
|
|
367
|
+
const HEALTH_CHECK_INTERVAL_MS = 90_000;
|
|
368
|
+
this.healthCheckTimer = setInterval(() => {
|
|
369
|
+
if (this.state !== 'started' || this.healthCheckRunning) {
|
|
370
|
+
return;
|
|
371
|
+
}
|
|
372
|
+
this.healthCheckRunning = true;
|
|
373
|
+
this.delegatesRegistryService
|
|
374
|
+
.checkHealth()
|
|
375
|
+
.catch((err) => {
|
|
376
|
+
this.logger.error('Health check failed', {
|
|
377
|
+
message: err.message,
|
|
378
|
+
stack: err.stack,
|
|
379
|
+
});
|
|
380
|
+
})
|
|
381
|
+
.finally(() => {
|
|
382
|
+
this.healthCheckRunning = false;
|
|
383
|
+
});
|
|
384
|
+
}, HEALTH_CHECK_INTERVAL_MS);
|
|
385
|
+
}
|
|
386
|
+
stopHealthCheck() {
|
|
387
|
+
if (this.healthCheckTimer) {
|
|
388
|
+
clearInterval(this.healthCheckTimer);
|
|
389
|
+
this.healthCheckTimer = null;
|
|
390
|
+
}
|
|
391
|
+
}
|
|
392
|
+
startStatusPoll() {
|
|
393
|
+
this.stopStatusPoll();
|
|
394
|
+
const intervalSec = this.config.statusPollInterval;
|
|
395
|
+
if (intervalSec <= 0) {
|
|
396
|
+
this.logger.log('Status polling disabled (interval = 0)');
|
|
397
|
+
return;
|
|
398
|
+
}
|
|
399
|
+
const intervalMs = intervalSec * 1000;
|
|
400
|
+
this.statusPollTimer = setInterval(() => {
|
|
401
|
+
if (this.state !== 'started' || this.statusPollRunning) {
|
|
402
|
+
return;
|
|
403
|
+
}
|
|
404
|
+
this.statusPollRunning = true;
|
|
405
|
+
this.delegatesRegistryService
|
|
406
|
+
.pollAllDevices()
|
|
407
|
+
.catch((err) => {
|
|
408
|
+
this.logger.error('Status poll failed', {
|
|
409
|
+
message: err.message,
|
|
410
|
+
stack: err.stack,
|
|
411
|
+
});
|
|
412
|
+
})
|
|
413
|
+
.finally(() => {
|
|
414
|
+
this.statusPollRunning = false;
|
|
415
|
+
});
|
|
416
|
+
}, intervalMs);
|
|
417
|
+
}
|
|
418
|
+
stopStatusPoll() {
|
|
419
|
+
if (this.statusPollTimer) {
|
|
420
|
+
clearInterval(this.statusPollTimer);
|
|
421
|
+
this.statusPollTimer = null;
|
|
422
|
+
}
|
|
423
|
+
}
|
|
348
424
|
async waitUntil(...states) {
|
|
349
425
|
const maxWait = 10_000;
|
|
350
426
|
const interval = 25;
|
|
@@ -367,6 +443,7 @@ exports.ShellyNgService = ShellyNgService = __decorate([
|
|
|
367
443
|
device_manager_service_1.DeviceManagerService,
|
|
368
444
|
devices_service_1.DevicesService,
|
|
369
445
|
device_connectivity_service_1.DeviceConnectivityService,
|
|
370
|
-
plugin_service_manager_service_1.PluginServiceManagerService
|
|
446
|
+
plugin_service_manager_service_1.PluginServiceManagerService,
|
|
447
|
+
shelly_ws_server_service_1.ShellyWsServerService])
|
|
371
448
|
], ShellyNgService);
|
|
372
449
|
//# sourceMappingURL=shelly-ng.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shelly-ng.service.js","sourceRoot":"","sources":["../../../../src/plugins/devices-shelly-ng/services/shelly-ng.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAA+F;AAE/F,2CAA4C;AAE5C,mDAAuF;AACvF,oFAAgF;AAChF,kFAA6E;AAC7E,+GAA0G;AAC1G,uFAAmF;AAMnF,wHAAkH;AAClH,sFAAiF;AACjF,gFAAuG;AAIvG,+EAA0E;AAC1E,qEAAgE;AASzD,IAAM,eAAe,GAArB,MAAM,eAAe;IA4B3B,YACkB,aAA4B,EAC5B,yBAAoD,EACpD,wBAAiD,EACjD,oBAA0C,EAC1C,cAA8B,EAC9B,yBAAoD,EACpD,oBAAiD;QANjD,kBAAa,GAAb,aAAa,CAAe;QAC5B,8BAAyB,GAAzB,yBAAyB,CAA2B;QACpD,6BAAwB,GAAxB,wBAAwB,CAAyB;QACjD,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,mBAAc,GAAd,cAAc,CAAgB;QAC9B,8BAAyB,GAAzB,yBAAyB,CAA2B;QACpD,yBAAoB,GAApB,oBAAoB,CAA6B;QAlClD,WAAM,GAA2B,IAAA,8BAAqB,EACtE,2DAA6B,EAC7B,eAAe,CACf,CAAC;QAEO,eAAU,GAAG,2DAA6B,CAAC;QAC3C,cAAS,GAAG,WAAW,CAAC;QAIzB,iBAAY,GAA+B,IAAI,CAAC;QAEhD,UAAK,GAAiB,SAAS,CAAC;QAChC,kBAAa,GAAkB,OAAO,CAAC,OAAO,EAAE,CAAC;QACjD,mBAAc,GAAyB,IAAI,CAAC;QAC5C,iBAAY,GAA0B,IAAI,CAAC;QAQlC,mBAAc,GAAa,EAAE,CAAC;QACvC,wBAAmB,GAAG,KAAK,CAAC;QAC5B,wBAAmB,GAAG,CAAC,CAAC;QAiUtB,sBAAiB,GAAG,CAAC,MAAc,EAAQ,EAAE;YACtD,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAEjC,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE,CAAC;gBAC/B,KAAK,IAAI,CAAC,qBAAqB,EAAE,CAAC;YACnC,CAAC;QACF,CAAC,CAAC;QAyEQ,wBAAmB,GAAG,CAAC,MAAc,EAAQ,EAAE;YACxD,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,GAAU,EAAQ,EAAE;gBAC1E,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,sDAAsD,MAAM,CAAC,EAAE,EAAE,EAAE;oBACpF,QAAQ,EAAE,MAAM,CAAC,EAAE;oBACnB,OAAO,EAAE,GAAG,CAAC,OAAO;oBACpB,KAAK,EAAE,GAAG,CAAC,KAAK;iBAChB,CAAC,CAAC;YACJ,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC;QAKQ,yBAAoB,GAAG,CAAC,QAAkB,EAAQ,EAAE;YAC7D,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,CAAC,GAAU,EAAQ,EAAE;gBACzE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,+DAA+D,QAAQ,EAAE,EAAE;oBAC5F,QAAQ,EAAE,QAAQ;oBAClB,OAAO,EAAE,GAAG,CAAC,OAAO;oBACpB,KAAK,EAAE,GAAG,CAAC,KAAK;iBAChB,CAAC,CAAC;YACJ,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC;QAKQ,wBAAmB,GAAG,CAAC,QAAkB,EAAE,KAAa,EAAQ,EAAE;YAC3E,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,qBAAqB,QAAQ,uBAAuB,KAAK,EAAE,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;QACtG,CAAC,CAAC;QAKQ,gBAAW,GAAG,CAAC,QAAkB,EAAE,KAAY,EAAQ,EAAE;YAClE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gCAAgC,QAAQ,EAAE,EAAE;gBAC7D,QAAQ,EAAE,QAAQ;gBAClB,OAAO,EAAE,KAAK,CAAC,OAAO;gBACtB,KAAK,EAAE,KAAK,CAAC,KAAK;aAClB,CAAC,CAAC;QACJ,CAAC,CAAC;IA7aC,CAAC;IAMJ,KAAK,CAAC,KAAK;QACV,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,IAAI,EAAE;YAC9B,QAAQ,IAAI,CAAC,KAAK,EAAE,CAAC;gBACpB,KAAK,SAAS;oBACb,OAAO;gBACR,KAAK,UAAU;oBACd,OAAO;gBACR,KAAK,UAAU;oBACd,MAAM,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;oBAEhC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;oBACzB,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;oBACxB,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;oBACrB,OAAO;gBACR,KAAK,SAAS,CAAC;gBACf,KAAK,OAAO;oBAGX,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;oBACzB,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;oBACxB,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;oBACrB,OAAO;YACT,CAAC;QACF,CAAC,CAAC,CAAC;IACJ,CAAC;IAMD,KAAK,CAAC,IAAI;QACT,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,IAAI,EAAE;YAC9B,QAAQ,IAAI,CAAC,KAAK,EAAE,CAAC;gBACpB,KAAK,SAAS;oBACb,OAAO;gBACR,KAAK,UAAU;oBACd,OAAO;gBACR,KAAK,UAAU;oBACd,MAAM,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;oBAEpD,IAAI,IAAI,CAAC,QAAQ,EAAE,KAAK,SAAS,EAAE,CAAC;wBACnC,OAAO;oBACR,CAAC;gBAEF,KAAK,SAAS;oBACb,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC;oBACpB,OAAO;gBACR,KAAK,OAAO;oBAEX,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC;oBACpB,OAAO;YACT,CAAC;QACF,CAAC,CAAC,CAAC;IACJ,CAAC;IAKD,QAAQ;QACP,OAAO,IAAI,CAAC,KAAK,CAAC;IACnB,CAAC;IAUD,eAAe;QAEd,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACnD,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC;YACpC,MAAM,SAAS,GAAG,IAAI,CAAC,aAAa,CAAC,eAAe,CAAsB,2DAA6B,CAAC,CAAC;YAGzG,MAAM,WAAW,GAChB,SAAS,CAAC,IAAI,CAAC,OAAO,KAAK,SAAS,CAAC,IAAI,CAAC,OAAO,IAAI,SAAS,CAAC,IAAI,CAAC,SAAS,KAAK,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC;YAE5G,MAAM,iBAAiB,GACtB,SAAS,CAAC,UAAU,CAAC,cAAc,KAAK,SAAS,CAAC,UAAU,CAAC,cAAc;gBAC3E,SAAS,CAAC,UAAU,CAAC,YAAY,KAAK,SAAS,CAAC,UAAU,CAAC,YAAY;gBACvE,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,UAAU,CAAC,iBAAiB,CAAC;oBACrD,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC;YAEzD,IAAI,WAAW,IAAI,iBAAiB,EAAE,CAAC;gBACtC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAC;gBACpD,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC,CAAC;YACnD,CAAC;YAGD,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,eAAe,EAAE,KAAK,EAAE,CAAC,CAAC;QACpD,CAAC;QAGD,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QAEzB,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,eAAe,EAAE,KAAK,EAAE,CAAC,CAAC;IACpD,CAAC;IASD,KAAK,CAAC,OAAO;QACZ,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,cAAc,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QAEhG,IAAI,CAAC,OAAO,EAAE,CAAC;YACd,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,0CAA0C,CAAC,CAAC;QAC/D,CAAC;IACF,CAAC;IAKD,KAAK,CAAC,cAAc,CAAC,UAAkB,GAAG;QACzC,IAAI,IAAI,CAAC,cAAc,KAAK,IAAI,EAAE,CAAC;YAClC,OAAO,IAAI,CAAC,cAAc,CAAC;QAC5B,CAAC;QAED,IAAI,CAAC,cAAc,GAAG,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC7C,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;gBACvB,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YACjC,CAAC;YAED,IAAI,CAAC,YAAY,GAAG,UAAU,CAAC,GAAG,EAAE;gBACnC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;gBAEzB,KAAK,IAAI,CAAC,OAAO,EAAE;qBACjB,KAAK,CAAC,GAAS,EAAE;gBAElB,CAAC,CAAC;qBACD,OAAO,CAAC,GAAG,EAAE;oBACb,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;oBAC3B,OAAO,EAAE,CAAC;gBACX,CAAC,CAAC,CAAC;YACL,CAAC,EAAE,OAAO,CAAC,CAAC;QACb,CAAC,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC,cAAc,CAAC;IAC5B,CAAC;IAEO,QAAQ,CAAI,EAAoB;QACvC,MAAM,GAAG,GAAG,KAAK,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC;QAC7B,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAkB,CAAC;QACxE,OAAO,IAAI,CAAC,aAAsC,CAAC;IACpD,CAAC;IAEO,KAAK,CAAC,OAAO;QACpB,IAAI,OAAO,IAAI,CAAC,QAAQ,KAAK,WAAW,EAAE,CAAC;YAC1C,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;YAEvB,OAAO;QACR,CAAC;QAED,IAAI,CAAC,KAAK,GAAG,UAAU,CAAC;QAExB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,mCAAmC,CAAC,CAAC;QAErD,IAAI,CAAC;YACJ,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAuB,oDAAsB,CAAC,CAAC;YAEhG,MAAM,aAAa,GAAG,IAAI,GAAG,EAAoC,CAAC;YAElE,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;gBACzB,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,UAAU,EAAE;oBAC/B,OAAO,EAAE,CAAC,CAAC,CAAC,OAAO;oBACnB,QAAQ,EAAE,CAAC,CAAC,QAAQ,IAAI,SAAS;iBACjC,CAAC,CAAC;YACJ,CAAC;YAED,IAAI,CAAC,QAAQ,GAAG,IAAI,uBAAQ,CAAC;gBAC5B,SAAS,EAAE;oBACV,cAAc,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,cAAc;oBACrD,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,YAAY;oBACjD,iBAAiB,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,iBAAiB;oBAC3D,QAAQ,EAAE,2BAA2B,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,OAAO,CAAC;iBAC3E;gBACD,cAAc,EAAE,IAAI;gBACpB,cAAc,EAAE,IAAI;gBACpB,aAAa;aACb,CAAC,CAAC;YAEH,IAAI,CAAC,QAAQ;iBACX,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,iBAAiB,CAAC;iBACjC,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,mBAAmB,CAAC;iBACtC,EAAE,CAAC,SAAS,EAAE,IAAI,CAAC,oBAAoB,CAAC;iBACxC,EAAE,CAAC,SAAS,EAAE,IAAI,CAAC,mBAAmB,CAAC;iBACvC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;YAEhC,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;YAEjE,MAAM,IAAI,CAAC,yBAAyB,CAAC,GAAG,EAAE,CAAC;YAE3C,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;gBAC9B,MAAM,UAAU,GAAG,IAAI,mCAAoB,CAAC;oBAC3C,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,IAAI,SAAS;iBAClD,CAAC,CAAC;gBAEH,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC;gBAE7C,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAY,EAAQ,EAAE;oBAE7C,IAAI,0BAA0B,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;wBACpD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,+DAA+D,EAAE;4BACjF,OAAO,EAAE,KAAK,CAAC,OAAO;yBACtB,CAAC,CAAC;oBACJ,CAAC;yBAAM,CAAC;wBACP,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,wDAAwD,EAAE;4BAC3E,OAAO,EAAE,KAAK,CAAC,OAAO;4BACtB,KAAK,EAAE,KAAK,CAAC,KAAK;yBAClB,CAAC,CAAC;oBACJ,CAAC;gBACF,CAAC,CAAC,CAAC;gBAEH,IAAI,CAAC;oBACJ,MAAM,UAAU,CAAC,KAAK,EAAE,CAAC;oBAEzB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAC;gBAClD,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBAChB,MAAM,GAAG,GAAG,KAAc,CAAC;oBAE3B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mDAAmD,EAAE;wBACtE,OAAO,EAAE,GAAG,CAAC,OAAO;wBACpB,KAAK,EAAE,GAAG,CAAC,KAAK;qBAChB,CAAC,CAAC;gBACJ,CAAC;YACF,CAAC;YAED,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;QACxB,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACZ,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC;YACrB,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;YAC1B,MAAM,CAAC,CAAC;QACT,CAAC;IACF,CAAC;IAEO,KAAK,CAAC,MAAM;QACnB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACpB,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;YACvB,OAAO;QACR,CAAC;QAED,IAAI,CAAC,KAAK,GAAG,UAAU,CAAC;QAExB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACpB,OAAO;QACR,CAAC;QAED,IAAI,CAAC,QAAQ;aACX,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,iBAAiB,CAAC;aAClC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,mBAAmB,CAAC;aACvC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,oBAAoB,CAAC;aACzC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,mBAAmB,CAAC;aACxC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QAEjC,IAAI,CAAC,QAAQ,CAAC,kBAAkB,EAAE,CAAC;QAEnC,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;QAEtB,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;QAE1B,IAAI,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC;QAC/B,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC3B,IAAI,CAAC,mBAAmB,GAAG,KAAK,CAAC;QAEjC,IAAI,CAAC,wBAAwB,CAAC,MAAM,EAAE,CAAC;QAGvC,IAAI,CAAC;YACJ,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAuB,oDAAsB,CAAC,CAAC;YAEhG,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;gBAC9B,MAAM,IAAI,CAAC,yBAAyB,CAAC,kBAAkB,CAAC,MAAM,CAAC,EAAE,EAAE;oBAClE,KAAK,EAAE,mCAAe,CAAC,OAAO;iBAC9B,CAAC,CAAC;YACJ,CAAC;QACF,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,GAAG,GAAG,KAAc,CAAC;YAE3B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,sDAAsD,EAAE;gBACzE,OAAO,EAAE,GAAG,CAAC,OAAO;gBACpB,KAAK,EAAE,GAAG,CAAC,KAAK;aAChB,CAAC,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;IACxB,CAAC;IAED,IAAY,MAAM;QACjB,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YACxB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,aAAa,CAAC,eAAe,CAAsB,2DAA6B,CAAC,CAAC;QAC5G,CAAC;QAED,OAAO,IAAI,CAAC,YAAY,CAAC;IAC1B,CAAC;IAiBO,KAAK,CAAC,qBAAqB;QAClC,IAAI,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC9B,OAAO;QACR,CAAC;QAED,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC;QAEhC,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,CAAC;QAE5C,IAAI,CAAC;YACJ,OAAO,IAAI,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,mBAAmB,KAAK,UAAU,EAAE,CAAC;gBAClF,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC;gBAE3C,IAAI,CAAC,MAAM,EAAE,CAAC;oBACb,SAAS;gBACV,CAAC;gBAED,IAAI,CAAC;oBACJ,MAAM,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;gBAC5C,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACd,MAAM,KAAK,GAAG,GAAY,CAAC;oBAG3B,IAAI,iEAAiE,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;wBAC3F,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,qBAAqB,MAAM,CAAC,EAAE,+CAA+C,EAAE;4BAC/F,QAAQ,EAAE,MAAM,CAAC,EAAE;4BACnB,OAAO,EAAE,KAAK,CAAC,OAAO;yBACtB,CAAC,CAAC;oBACJ,CAAC;yBAAM,CAAC;wBACP,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uCAAuC,MAAM,CAAC,EAAE,EAAE,EAAE;4BACrE,QAAQ,EAAE,MAAM,CAAC,EAAE;4BACnB,OAAO,EAAE,KAAK,CAAC,OAAO;4BACtB,KAAK,EAAE,KAAK,CAAC,KAAK;yBAClB,CAAC,CAAC;oBACJ,CAAC;gBACF,CAAC;YACF,CAAC;QACF,CAAC;gBAAS,CAAC;YAIV,IAAI,IAAI,CAAC,mBAAmB,KAAK,UAAU,EAAE,CAAC;gBAC7C,IAAI,CAAC,mBAAmB,GAAG,KAAK,CAAC;YAClC,CAAC;QACF,CAAC;IACF,CAAC;IAMO,KAAK,CAAC,uBAAuB,CAAC,MAAc;QACnD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,SAAS,CACpD,YAAY,EACZ,MAAM,CAAC,EAAE,EACT,oDAAsB,CACtB,CAAC;QAEF,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;YACxB,MAAM,IAAI,CAAC,oBAAoB,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;QAC9D,CAAC;QAED,MAAM,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACpD,CAAC;IA8CO,KAAK,CAAC,UAAU;QACvB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAuB,oDAAsB,CAAC,CAAC;QAEhG,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC9B,MAAM,IAAI,CAAC,yBAAyB,CAAC,kBAAkB,CAAC,MAAM,CAAC,EAAE,EAAE;gBAClE,KAAK,EAAE,mCAAe,CAAC,OAAO;aAC9B,CAAC,CAAC;QACJ,CAAC;IACF,CAAC;IAEO,KAAK,CAAC,SAAS,CAAC,GAAG,MAAsB;QAChD,MAAM,OAAO,GAAG,MAAM,CAAC;QACvB,MAAM,QAAQ,GAAG,EAAE,CAAC;QACpB,IAAI,OAAO,GAAG,CAAC,CAAC;QAEhB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,OAAO,GAAG,OAAO,EAAE,CAAC;YAC1D,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC;YAC9D,OAAO,IAAI,QAAQ,CAAC;QACrB,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YAClC,MAAM,IAAI,KAAK,CAAC,6BAA6B,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,oBAAoB,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;QACnG,CAAC;IACF,CAAC;CACD,CAAA;AA3eY,0CAAe;0BAAf,eAAe;IAD3B,IAAA,mBAAU,GAAE;qCA8BqB,8BAAa;QACD,uDAAyB;QAC1B,mDAAuB;QAC3B,6CAAoB;QAC1B,gCAAc;QACH,uDAAyB;QAC9B,4DAA2B;GAnCvD,eAAe,CA2e3B"}
|
|
1
|
+
{"version":3,"file":"shelly-ng.service.js","sourceRoot":"","sources":["../../../../src/plugins/devices-shelly-ng/services/shelly-ng.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mCAAoC;AACpC,+CAA+F;AAE/F,2CAA4C;AAE5C,mDAAuF;AACvF,oFAAgF;AAChF,kFAA6E;AAC7E,+GAA0G;AAC1G,uFAAmF;AACnF,kHAA4G;AAK5G,wHAAkH;AAClH,sFAAiF;AACjF,gFAAuG;AAIvG,+EAA0E;AAC1E,qEAAgE;AAChE,yEAAmE;AAS5D,IAAM,eAAe,GAArB,MAAM,eAAgB,SAAQ,sDAAwB;IA8B5D,YACkB,aAA4B,EAC5B,yBAAoD,EACpD,wBAAiD,EACjD,oBAA0C,EAC1C,cAA8B,EAC9B,yBAAoD,EACpD,oBAAiD,EACjD,QAA+B;QAEhD,KAAK,EAAE,CAAC;QATS,kBAAa,GAAb,aAAa,CAAe;QAC5B,8BAAyB,GAAzB,yBAAyB,CAA2B;QACpD,6BAAwB,GAAxB,wBAAwB,CAAyB;QACjD,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,mBAAc,GAAd,cAAc,CAAgB;QAC9B,8BAAyB,GAAzB,yBAAyB,CAA2B;QACpD,yBAAoB,GAApB,oBAAoB,CAA6B;QACjD,aAAQ,GAAR,QAAQ,CAAuB;QArChC,WAAM,GAA2B,IAAA,8BAAqB,EACtE,2DAA6B,EAC7B,eAAe,CACf,CAAC;QAEO,eAAU,GAAG,2DAA6B,CAAC;QAC3C,cAAS,GAAG,WAAW,CAAC;QAIzB,iBAAY,GAA+B,IAAI,CAAC;QAEhD,mBAAc,GAAyB,IAAI,CAAC;QAC5C,iBAAY,GAA0B,IAAI,CAAC;QAC3C,qBAAgB,GAA0B,IAAI,CAAC;QAC/C,uBAAkB,GAAG,KAAK,CAAC;QAC3B,oBAAe,GAA0B,IAAI,CAAC;QAC9C,sBAAiB,GAAG,KAAK,CAAC;QAQjB,mBAAc,GAAa,EAAE,CAAC;QACvC,wBAAmB,GAAG,KAAK,CAAC;QAC5B,wBAAmB,GAAG,CAAC,CAAC;QAqUtB,sBAAiB,GAAG,CAAC,MAAc,EAAQ,EAAE;YACtD,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAEjC,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE,CAAC;gBAC/B,KAAK,IAAI,CAAC,qBAAqB,EAAE,CAAC;YACnC,CAAC;QACF,CAAC,CAAC;QAgGQ,wBAAmB,GAAG,CAAC,MAAc,EAAQ,EAAE;YACxD,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,GAAU,EAAQ,EAAE;gBAC1E,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,sDAAsD,MAAM,CAAC,EAAE,EAAE,EAAE;oBACpF,QAAQ,EAAE,MAAM,CAAC,EAAE;oBACnB,OAAO,EAAE,GAAG,CAAC,OAAO;oBACpB,KAAK,EAAE,GAAG,CAAC,KAAK;iBAChB,CAAC,CAAC;YACJ,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC;QAKQ,yBAAoB,GAAG,CAAC,QAAkB,EAAQ,EAAE;YAC7D,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,CAAC,GAAU,EAAQ,EAAE;gBACzE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,+DAA+D,QAAQ,EAAE,EAAE;oBAC5F,QAAQ,EAAE,QAAQ;oBAClB,OAAO,EAAE,GAAG,CAAC,OAAO;oBACpB,KAAK,EAAE,GAAG,CAAC,KAAK;iBAChB,CAAC,CAAC;YACJ,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC;QAKQ,wBAAmB,GAAG,CAAC,QAAkB,EAAE,KAAa,EAAQ,EAAE;YAC3E,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,qBAAqB,QAAQ,uBAAuB,KAAK,EAAE,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;QACtG,CAAC,CAAC;QAKQ,gBAAW,GAAG,CAAC,QAAkB,EAAE,KAAY,EAAQ,EAAE;YAClE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gCAAgC,QAAQ,EAAE,EAAE;gBAC7D,QAAQ,EAAE,QAAQ;gBAClB,OAAO,EAAE,KAAK,CAAC,OAAO;gBACtB,KAAK,EAAE,KAAK,CAAC,KAAK;aAClB,CAAC,CAAC;QACJ,CAAC,CAAC;IArcF,CAAC;IAMD,KAAK,CAAC,KAAK;QACV,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,IAAI,EAAE;YAC9B,QAAQ,IAAI,CAAC,KAAK,EAAE,CAAC;gBACpB,KAAK,SAAS;oBACb,OAAO;gBACR,KAAK,UAAU;oBACd,OAAO;gBACR,KAAK,UAAU;oBACd,MAAM,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;oBAEhC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;oBACzB,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;oBACxB,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;oBACrB,OAAO;gBACR,KAAK,SAAS,CAAC;gBACf,KAAK,OAAO;oBAGX,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;oBACzB,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;oBACxB,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;oBACrB,OAAO;YACT,CAAC;QACF,CAAC,CAAC,CAAC;IACJ,CAAC;IAMD,KAAK,CAAC,IAAI;QACT,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,IAAI,EAAE;YAC9B,QAAQ,IAAI,CAAC,KAAK,EAAE,CAAC;gBACpB,KAAK,SAAS;oBACb,OAAO;gBACR,KAAK,UAAU;oBACd,OAAO;gBACR,KAAK,UAAU;oBACd,MAAM,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;oBAEpD,IAAI,IAAI,CAAC,QAAQ,EAAE,KAAK,SAAS,EAAE,CAAC;wBACnC,OAAO;oBACR,CAAC;gBAEF,KAAK,SAAS;oBACb,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC;oBACpB,OAAO;gBACR,KAAK,OAAO;oBAEX,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC;oBACpB,OAAO;YACT,CAAC;QACF,CAAC,CAAC,CAAC;IACJ,CAAC;IAUD,eAAe;QAEd,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACnD,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC;YACpC,MAAM,SAAS,GAAG,IAAI,CAAC,aAAa,CAAC,eAAe,CAAsB,2DAA6B,CAAC,CAAC;YAGzG,MAAM,WAAW,GAChB,SAAS,CAAC,IAAI,CAAC,OAAO,KAAK,SAAS,CAAC,IAAI,CAAC,OAAO,IAAI,SAAS,CAAC,IAAI,CAAC,SAAS,KAAK,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC;YAE5G,MAAM,iBAAiB,GACtB,SAAS,CAAC,UAAU,CAAC,cAAc,KAAK,SAAS,CAAC,UAAU,CAAC,cAAc;gBAC3E,SAAS,CAAC,UAAU,CAAC,YAAY,KAAK,SAAS,CAAC,UAAU,CAAC,YAAY;gBACvE,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,UAAU,CAAC,iBAAiB,CAAC;oBACrD,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC;YAEzD,IAAI,WAAW,IAAI,iBAAiB,EAAE,CAAC;gBACtC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAC;gBACpD,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC,CAAC;YACnD,CAAC;YAGD,IAAI,SAAS,CAAC,kBAAkB,KAAK,SAAS,CAAC,kBAAkB,EAAE,CAAC;gBACnE,IAAI,CAAC,YAAY,GAAG,SAAS,CAAC;gBAC9B,IAAI,CAAC,eAAe,EAAE,CAAC;YACxB,CAAC;YAGD,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,eAAe,EAAE,KAAK,EAAE,CAAC,CAAC;QACpD,CAAC;QAGD,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QAEzB,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,eAAe,EAAE,KAAK,EAAE,CAAC,CAAC;IACpD,CAAC;IASD,KAAK,CAAC,OAAO;QACZ,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,cAAc,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QAEhG,IAAI,CAAC,OAAO,EAAE,CAAC;YACd,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,0CAA0C,CAAC,CAAC;QAC/D,CAAC;IACF,CAAC;IAKD,KAAK,CAAC,cAAc,CAAC,UAAkB,GAAG;QACzC,IAAI,IAAI,CAAC,cAAc,KAAK,IAAI,EAAE,CAAC;YAClC,OAAO,IAAI,CAAC,cAAc,CAAC;QAC5B,CAAC;QAED,IAAI,CAAC,cAAc,GAAG,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC7C,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;gBACvB,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YACjC,CAAC;YAED,IAAI,CAAC,YAAY,GAAG,UAAU,CAAC,GAAG,EAAE;gBACnC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;gBAEzB,KAAK,IAAI,CAAC,OAAO,EAAE;qBACjB,KAAK,CAAC,GAAS,EAAE;gBAElB,CAAC,CAAC;qBACD,OAAO,CAAC,GAAG,EAAE;oBACb,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;oBAC3B,OAAO,EAAE,CAAC;gBACX,CAAC,CAAC,CAAC;YACL,CAAC,EAAE,OAAO,CAAC,CAAC;QACb,CAAC,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC,cAAc,CAAC;IAC5B,CAAC;IAEO,KAAK,CAAC,OAAO;QACpB,IAAI,OAAO,IAAI,CAAC,QAAQ,KAAK,WAAW,EAAE,CAAC;YAC1C,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;YAEvB,OAAO;QACR,CAAC;QAED,IAAI,CAAC,KAAK,GAAG,UAAU,CAAC;QAExB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,mCAAmC,CAAC,CAAC;QAErD,IAAI,CAAC;YACJ,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAuB,oDAAsB,CAAC,CAAC;YAEhG,MAAM,aAAa,GAAG,IAAI,GAAG,EAAoC,CAAC;YAElE,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;gBACzB,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,UAAU,EAAE;oBAC/B,OAAO,EAAE,CAAC,CAAC,CAAC,OAAO;oBACnB,QAAQ,EAAE,CAAC,CAAC,QAAQ,IAAI,SAAS;iBACjC,CAAC,CAAC;YACJ,CAAC;YAED,IAAI,CAAC,QAAQ,GAAG,IAAI,uBAAQ,CAAC;gBAC5B,SAAS,EAAE;oBACV,cAAc,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,cAAc;oBACrD,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,YAAY;oBACjD,iBAAiB,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,iBAAiB;oBAC3D,QAAQ,EAAE,iBAAiB,GAAG,IAAA,mBAAU,GAAE;iBAC1C;gBACD,cAAc,EAAE,IAAI;gBACpB,cAAc,EAAE,IAAI;gBACpB,aAAa;aACb,CAAC,CAAC;YAEH,IAAI,CAAC,QAAQ;iBACX,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,iBAAiB,CAAC;iBACjC,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,mBAAmB,CAAC;iBACtC,EAAE,CAAC,SAAS,EAAE,IAAI,CAAC,oBAAoB,CAAC;iBACxC,EAAE,CAAC,SAAS,EAAE,IAAI,CAAC,mBAAmB,CAAC;iBACvC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;YAEhC,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;YAEjE,MAAM,IAAI,CAAC,yBAAyB,CAAC,GAAG,EAAE,CAAC;YAE3C,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;gBAC9B,MAAM,UAAU,GAAG,IAAI,mCAAoB,CAAC;oBAC3C,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,IAAI,SAAS;iBAClD,CAAC,CAAC;gBAEH,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC;gBAE7C,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAY,EAAQ,EAAE;oBAE7C,IAAI,0BAA0B,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;wBACpD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,+DAA+D,EAAE;4BACjF,OAAO,EAAE,KAAK,CAAC,OAAO;yBACtB,CAAC,CAAC;oBACJ,CAAC;yBAAM,CAAC;wBACP,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,wDAAwD,EAAE;4BAC3E,OAAO,EAAE,KAAK,CAAC,OAAO;4BACtB,KAAK,EAAE,KAAK,CAAC,KAAK;yBAClB,CAAC,CAAC;oBACJ,CAAC;gBACF,CAAC,CAAC,CAAC;gBAEH,IAAI,CAAC;oBACJ,MAAM,UAAU,CAAC,KAAK,EAAE,CAAC;oBAEzB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAC;gBAClD,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBAChB,MAAM,GAAG,GAAG,KAAc,CAAC;oBAE3B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mDAAmD,EAAE;wBACtE,OAAO,EAAE,GAAG,CAAC,OAAO;wBACpB,KAAK,EAAE,GAAG,CAAC,KAAK;qBAChB,CAAC,CAAC;gBACJ,CAAC;YACF,CAAC;YAED,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACxB,IAAI,CAAC,eAAe,EAAE,CAAC;YACvB,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;YAEtB,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;QACxB,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACZ,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC;YACrB,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;YAC1B,MAAM,CAAC,CAAC;QACT,CAAC;IACF,CAAC;IAEO,KAAK,CAAC,MAAM;QACnB,IAAI,CAAC,eAAe,EAAE,CAAC;QACvB,IAAI,CAAC,cAAc,EAAE,CAAC;QACtB,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;QAErB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACpB,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;YACvB,OAAO;QACR,CAAC;QAED,IAAI,CAAC,KAAK,GAAG,UAAU,CAAC;QAExB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACpB,OAAO;QACR,CAAC;QAED,IAAI,CAAC,QAAQ;aACX,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,iBAAiB,CAAC;aAClC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,mBAAmB,CAAC;aACvC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,oBAAoB,CAAC;aACzC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,mBAAmB,CAAC;aACxC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QAEjC,IAAI,CAAC,QAAQ,CAAC,kBAAkB,EAAE,CAAC;QAEnC,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;QAEtB,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;QAE1B,IAAI,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC;QAC/B,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC3B,IAAI,CAAC,mBAAmB,GAAG,KAAK,CAAC;QAEjC,IAAI,CAAC,wBAAwB,CAAC,MAAM,EAAE,CAAC;QAGvC,IAAI,CAAC;YACJ,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAuB,oDAAsB,CAAC,CAAC;YAEhG,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;gBAC9B,MAAM,IAAI,CAAC,yBAAyB,CAAC,kBAAkB,CAAC,MAAM,CAAC,EAAE,EAAE;oBAClE,KAAK,EAAE,mCAAe,CAAC,OAAO;iBAC9B,CAAC,CAAC;YACJ,CAAC;QACF,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,GAAG,GAAG,KAAc,CAAC;YAE3B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,sDAAsD,EAAE;gBACzE,OAAO,EAAE,GAAG,CAAC,OAAO;gBACpB,KAAK,EAAE,GAAG,CAAC,KAAK;aAChB,CAAC,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;IACxB,CAAC;IAED,IAAY,MAAM;QACjB,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YACxB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,aAAa,CAAC,eAAe,CAAsB,2DAA6B,CAAC,CAAC;QAC5G,CAAC;QAED,OAAO,IAAI,CAAC,YAAY,CAAC;IAC1B,CAAC;IAiBO,KAAK,CAAC,qBAAqB;QAClC,IAAI,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC9B,OAAO;QACR,CAAC;QAED,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC;QAEhC,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,CAAC;QAE5C,IAAI,CAAC;YACJ,OAAO,IAAI,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,mBAAmB,KAAK,UAAU,EAAE,CAAC;gBAClF,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC;gBAE3C,IAAI,CAAC,MAAM,EAAE,CAAC;oBACb,SAAS;gBACV,CAAC;gBAED,IAAI,CAAC;oBACJ,MAAM,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;gBAC5C,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACd,MAAM,KAAK,GAAG,GAAY,CAAC;oBAG3B,IAAI,iEAAiE,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;wBAC3F,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,qBAAqB,MAAM,CAAC,EAAE,+CAA+C,EAAE;4BAC/F,QAAQ,EAAE,MAAM,CAAC,EAAE;4BACnB,OAAO,EAAE,KAAK,CAAC,OAAO;yBACtB,CAAC,CAAC;oBACJ,CAAC;yBAAM,CAAC;wBACP,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uCAAuC,MAAM,CAAC,EAAE,EAAE,EAAE;4BACrE,QAAQ,EAAE,MAAM,CAAC,EAAE;4BACnB,OAAO,EAAE,KAAK,CAAC,OAAO;4BACtB,KAAK,EAAE,KAAK,CAAC,KAAK;yBAClB,CAAC,CAAC;oBACJ,CAAC;gBACF,CAAC;YACF,CAAC;QACF,CAAC;gBAAS,CAAC;YAIV,IAAI,IAAI,CAAC,mBAAmB,KAAK,UAAU,EAAE,CAAC;gBAC7C,IAAI,CAAC,mBAAmB,GAAG,KAAK,CAAC;YAClC,CAAC;QACF,CAAC;IACF,CAAC;IAUO,KAAK,CAAC,uBAAuB,CAAC,MAAc;QACnD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,SAAS,CACpD,YAAY,EACZ,MAAM,CAAC,EAAE,EACT,oDAAsB,CACtB,CAAC;QAEF,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;YACxB,MAAM,IAAI,CAAC,oBAAoB,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;QAC9D,CAAC;QAMD,MAAM,gBAAgB,GAAG,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAEtE,IAAI,gBAAgB,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,CAAC;YACrD,IAAI,CAAC,MAAM,CAAC,GAAG,CACd,0CAA0C,MAAM,CAAC,EAAE,6CAA6C,EAChG;gBACC,QAAQ,EAAE,MAAM,CAAC,EAAE;aACnB,CACD,CAAC;YAEF,MAAM,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;YAEzD,OAAO;QACR,CAAC;QAED,MAAM,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACpD,CAAC;IA8CO,KAAK,CAAC,UAAU;QACvB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAuB,oDAAsB,CAAC,CAAC;QAEhG,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC9B,MAAM,IAAI,CAAC,yBAAyB,CAAC,kBAAkB,CAAC,MAAM,CAAC,EAAE,EAAE;gBAClE,KAAK,EAAE,mCAAe,CAAC,OAAO;aAC9B,CAAC,CAAC;QACJ,CAAC;IACF,CAAC;IAMO,gBAAgB;QACvB,IAAI,CAAC,eAAe,EAAE,CAAC;QAMvB,MAAM,wBAAwB,GAAG,MAAM,CAAC;QAExC,IAAI,CAAC,gBAAgB,GAAG,WAAW,CAAC,GAAG,EAAE;YACxC,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBACzD,OAAO;YACR,CAAC;YAED,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC;YAE/B,IAAI,CAAC,wBAAwB;iBAC3B,WAAW,EAAE;iBACb,KAAK,CAAC,CAAC,GAAU,EAAE,EAAE;gBACrB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,qBAAqB,EAAE;oBACxC,OAAO,EAAE,GAAG,CAAC,OAAO;oBACpB,KAAK,EAAE,GAAG,CAAC,KAAK;iBAChB,CAAC,CAAC;YACJ,CAAC,CAAC;iBACD,OAAO,CAAC,GAAG,EAAE;gBACb,IAAI,CAAC,kBAAkB,GAAG,KAAK,CAAC;YACjC,CAAC,CAAC,CAAC;QACL,CAAC,EAAE,wBAAwB,CAAC,CAAC;IAC9B,CAAC;IAEO,eAAe;QACtB,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC3B,aAAa,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;YACrC,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC;QAC9B,CAAC;IACF,CAAC;IAMO,eAAe;QACtB,IAAI,CAAC,cAAc,EAAE,CAAC;QAEtB,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC;QAEnD,IAAI,WAAW,IAAI,CAAC,EAAE,CAAC;YACtB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,wCAAwC,CAAC,CAAC;YAE1D,OAAO;QACR,CAAC;QAED,MAAM,UAAU,GAAG,WAAW,GAAG,IAAI,CAAC;QAEtC,IAAI,CAAC,eAAe,GAAG,WAAW,CAAC,GAAG,EAAE;YACvC,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;gBACxD,OAAO;YACR,CAAC;YAED,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC;YAE9B,IAAI,CAAC,wBAAwB;iBAC3B,cAAc,EAAE;iBAChB,KAAK,CAAC,CAAC,GAAU,EAAE,EAAE;gBACrB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oBAAoB,EAAE;oBACvC,OAAO,EAAE,GAAG,CAAC,OAAO;oBACpB,KAAK,EAAE,GAAG,CAAC,KAAK;iBAChB,CAAC,CAAC;YACJ,CAAC,CAAC;iBACD,OAAO,CAAC,GAAG,EAAE;gBACb,IAAI,CAAC,iBAAiB,GAAG,KAAK,CAAC;YAChC,CAAC,CAAC,CAAC;QACL,CAAC,EAAE,UAAU,CAAC,CAAC;IAChB,CAAC;IAEO,cAAc;QACrB,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;YAC1B,aAAa,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;YACpC,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;QAC7B,CAAC;IACF,CAAC;IAEO,KAAK,CAAC,SAAS,CAAC,GAAG,MAAsB;QAChD,MAAM,OAAO,GAAG,MAAM,CAAC;QACvB,MAAM,QAAQ,GAAG,EAAE,CAAC;QACpB,IAAI,OAAO,GAAG,CAAC,CAAC;QAEhB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,OAAO,GAAG,OAAO,EAAE,CAAC;YAC1D,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC;YAC9D,OAAO,IAAI,QAAQ,CAAC;QACrB,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YAClC,MAAM,IAAI,KAAK,CAAC,6BAA6B,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,oBAAoB,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;QACnG,CAAC;IACF,CAAC;CACD,CAAA;AA9lBY,0CAAe;0BAAf,eAAe;IAD3B,IAAA,mBAAU,GAAE;qCAgCqB,8BAAa;QACD,uDAAyB;QAC1B,mDAAuB;QAC3B,6CAAoB;QAC1B,gCAAc;QACH,uDAAyB;QAC9B,4DAA2B;QACvC,gDAAqB;GAtCrC,eAAe,CA8lB3B"}
|
|
@@ -659,6 +659,11 @@ export declare class ShellyRpcClientService {
|
|
|
659
659
|
https?: boolean;
|
|
660
660
|
timeoutSec?: number;
|
|
661
661
|
}): Promise<Pm1Status>;
|
|
662
|
+
setWsOutboundConfig(host: string, serverUrl: string, options?: {
|
|
663
|
+
password?: string | null;
|
|
664
|
+
https?: boolean;
|
|
665
|
+
timeoutSec?: number;
|
|
666
|
+
}): Promise<unknown>;
|
|
662
667
|
call<T = unknown>(host: string, rpcMethod: string, params?: Json, options?: {
|
|
663
668
|
password?: string | null;
|
|
664
669
|
https?: boolean;
|
|
@@ -100,6 +100,9 @@ let ShellyRpcClientService = class ShellyRpcClientService {
|
|
|
100
100
|
getPm1Status(host, id, options) {
|
|
101
101
|
return this.call(host, 'PM1.GetStatus', { id }, options);
|
|
102
102
|
}
|
|
103
|
+
setWsOutboundConfig(host, serverUrl, options) {
|
|
104
|
+
return this.call(host, 'Ws.SetConfig', { config: { server: serverUrl, enable: true } }, options);
|
|
105
|
+
}
|
|
103
106
|
async call(host, rpcMethod, params, options) {
|
|
104
107
|
const scheme = options?.https ? 'https' : 'http';
|
|
105
108
|
const httpMethod = options?.httpMethod ?? 'POST';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shelly-rpc-client.service.js","sourceRoot":"","sources":["../../../../src/plugins/devices-shelly-ng/services/shelly-rpc-client.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"shelly-rpc-client.service.js","sourceRoot":"","sources":["../../../../src/plugins/devices-shelly-ng/services/shelly-rpc-client.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import { OnModuleDestroy } from '@nestjs/common';
|
|
2
|
+
import { AppInstanceHolder } from '../../../common/services/app-instance-holder.service';
|
|
3
|
+
import { DeviceConnectivityService } from '../../../modules/devices/services/device-connectivity.service';
|
|
4
|
+
import { DevicesService } from '../../../modules/devices/services/devices.service';
|
|
5
|
+
import { DelegatesManagerService } from '../delegates/delegates-manager.service';
|
|
6
|
+
export declare class ShellyWsServerService implements OnModuleDestroy {
|
|
7
|
+
private readonly appInstanceHolder;
|
|
8
|
+
private readonly delegatesManager;
|
|
9
|
+
private readonly devicesService;
|
|
10
|
+
private readonly deviceConnectivityService;
|
|
11
|
+
private readonly logger;
|
|
12
|
+
private wss;
|
|
13
|
+
private httpServer;
|
|
14
|
+
private upgradeHandler;
|
|
15
|
+
private readonly wsToDeviceId;
|
|
16
|
+
private readonly stateQueue;
|
|
17
|
+
private stopped;
|
|
18
|
+
constructor(appInstanceHolder: AppInstanceHolder, delegatesManager: DelegatesManagerService, devicesService: DevicesService, deviceConnectivityService: DeviceConnectivityService);
|
|
19
|
+
start(): void;
|
|
20
|
+
stop(): void;
|
|
21
|
+
onModuleDestroy(): void;
|
|
22
|
+
private handleMessage;
|
|
23
|
+
private handleStatusNotification;
|
|
24
|
+
private emitFlattened;
|
|
25
|
+
private markDeviceAwake;
|
|
26
|
+
private markDeviceSleeping;
|
|
27
|
+
private enqueueStateChange;
|
|
28
|
+
}
|
|
@@ -0,0 +1,197 @@
|
|
|
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.ShellyWsServerService = void 0;
|
|
13
|
+
const url_1 = require("url");
|
|
14
|
+
const ws_1 = require("ws");
|
|
15
|
+
const common_1 = require("@nestjs/common");
|
|
16
|
+
const logger_1 = require("../../../common/logger");
|
|
17
|
+
const app_instance_holder_service_1 = require("../../../common/services/app-instance-holder.service");
|
|
18
|
+
const devices_constants_1 = require("../../../modules/devices/devices.constants");
|
|
19
|
+
const device_connectivity_service_1 = require("../../../modules/devices/services/device-connectivity.service");
|
|
20
|
+
const devices_service_1 = require("../../../modules/devices/services/devices.service");
|
|
21
|
+
const delegates_manager_service_1 = require("../delegates/delegates-manager.service");
|
|
22
|
+
const devices_shelly_ng_constants_1 = require("../devices-shelly-ng.constants");
|
|
23
|
+
const WS_PATH = '/api/v1/plugins/shelly-ng/ws';
|
|
24
|
+
let ShellyWsServerService = class ShellyWsServerService {
|
|
25
|
+
constructor(appInstanceHolder, delegatesManager, devicesService, deviceConnectivityService) {
|
|
26
|
+
this.appInstanceHolder = appInstanceHolder;
|
|
27
|
+
this.delegatesManager = delegatesManager;
|
|
28
|
+
this.devicesService = devicesService;
|
|
29
|
+
this.deviceConnectivityService = deviceConnectivityService;
|
|
30
|
+
this.logger = (0, logger_1.createExtensionLogger)(devices_shelly_ng_constants_1.DEVICES_SHELLY_NG_PLUGIN_NAME, 'ShellyWsServerService');
|
|
31
|
+
this.wss = null;
|
|
32
|
+
this.httpServer = null;
|
|
33
|
+
this.upgradeHandler = null;
|
|
34
|
+
this.wsToDeviceId = new Map();
|
|
35
|
+
this.stateQueue = new Map();
|
|
36
|
+
this.stopped = false;
|
|
37
|
+
}
|
|
38
|
+
start() {
|
|
39
|
+
if (this.wss) {
|
|
40
|
+
return;
|
|
41
|
+
}
|
|
42
|
+
this.stopped = false;
|
|
43
|
+
this.wss = new ws_1.WebSocketServer({ noServer: true });
|
|
44
|
+
this.wss.on('connection', (ws, req) => {
|
|
45
|
+
const ip = req.socket.remoteAddress ?? 'unknown';
|
|
46
|
+
this.logger.log(`Sleeping device connected from ${ip}`);
|
|
47
|
+
ws.on('message', (data) => {
|
|
48
|
+
this.handleMessage(ws, data, ip);
|
|
49
|
+
});
|
|
50
|
+
ws.on('close', () => {
|
|
51
|
+
const closedDeviceId = this.wsToDeviceId.get(ws);
|
|
52
|
+
this.wsToDeviceId.delete(ws);
|
|
53
|
+
if (this.stopped) {
|
|
54
|
+
return;
|
|
55
|
+
}
|
|
56
|
+
if (closedDeviceId) {
|
|
57
|
+
this.logger.debug(`Sleeping device=${closedDeviceId} from ${ip} disconnected, marking as sleeping`);
|
|
58
|
+
this.markDeviceSleeping(closedDeviceId);
|
|
59
|
+
}
|
|
60
|
+
else {
|
|
61
|
+
this.logger.debug(`Sleeping device from ${ip} disconnected`);
|
|
62
|
+
}
|
|
63
|
+
});
|
|
64
|
+
ws.on('error', (err) => {
|
|
65
|
+
this.logger.warn(`WebSocket error from ${ip}: ${err.message}`);
|
|
66
|
+
});
|
|
67
|
+
});
|
|
68
|
+
try {
|
|
69
|
+
const app = this.appInstanceHolder.getApp();
|
|
70
|
+
const httpAdapter = app.getHttpAdapter();
|
|
71
|
+
const server = httpAdapter.getHttpServer();
|
|
72
|
+
this.httpServer = server;
|
|
73
|
+
this.upgradeHandler = (req, socket, head) => {
|
|
74
|
+
const pathname = (0, url_1.parse)(req.url ?? '').pathname;
|
|
75
|
+
if (pathname === WS_PATH) {
|
|
76
|
+
this.wss?.handleUpgrade(req, socket, head, (ws) => {
|
|
77
|
+
this.wss?.emit('connection', ws, req);
|
|
78
|
+
});
|
|
79
|
+
}
|
|
80
|
+
};
|
|
81
|
+
server.on('upgrade', this.upgradeHandler);
|
|
82
|
+
this.logger.log(`Inbound WebSocket server listening on ${WS_PATH}`);
|
|
83
|
+
}
|
|
84
|
+
catch (err) {
|
|
85
|
+
this.logger.warn(`Failed to start inbound WS server: ${err.message}`);
|
|
86
|
+
if (this.wss) {
|
|
87
|
+
this.wss.close();
|
|
88
|
+
this.wss = null;
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
stop() {
|
|
93
|
+
this.stopped = true;
|
|
94
|
+
this.wsToDeviceId.clear();
|
|
95
|
+
this.stateQueue.clear();
|
|
96
|
+
if (this.wss) {
|
|
97
|
+
for (const client of this.wss.clients) {
|
|
98
|
+
client.close(1000, 'Server shutting down');
|
|
99
|
+
}
|
|
100
|
+
this.wss.close();
|
|
101
|
+
this.wss = null;
|
|
102
|
+
}
|
|
103
|
+
if (this.upgradeHandler && this.httpServer) {
|
|
104
|
+
this.httpServer.off('upgrade', this.upgradeHandler);
|
|
105
|
+
this.upgradeHandler = null;
|
|
106
|
+
this.httpServer = null;
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
onModuleDestroy() {
|
|
110
|
+
this.stop();
|
|
111
|
+
}
|
|
112
|
+
handleMessage(ws, data, ip) {
|
|
113
|
+
if (this.stopped) {
|
|
114
|
+
return;
|
|
115
|
+
}
|
|
116
|
+
let frame;
|
|
117
|
+
try {
|
|
118
|
+
frame = JSON.parse(data.toString());
|
|
119
|
+
}
|
|
120
|
+
catch {
|
|
121
|
+
this.logger.warn(`Invalid JSON from sleeping device at ${ip}`);
|
|
122
|
+
return;
|
|
123
|
+
}
|
|
124
|
+
const deviceId = frame.src;
|
|
125
|
+
if (!deviceId) {
|
|
126
|
+
this.logger.debug(`Received frame without src from ${ip}`);
|
|
127
|
+
return;
|
|
128
|
+
}
|
|
129
|
+
if (!this.wsToDeviceId.has(ws)) {
|
|
130
|
+
this.wsToDeviceId.set(ws, deviceId);
|
|
131
|
+
}
|
|
132
|
+
if (typeof frame.id === 'number') {
|
|
133
|
+
const ack = JSON.stringify({ id: frame.id, src: 'fb-smart-panel', dst: deviceId, result: null });
|
|
134
|
+
ws.send(ack);
|
|
135
|
+
}
|
|
136
|
+
if (frame.method === 'NotifyStatus' || frame.method === 'NotifyFullStatus') {
|
|
137
|
+
this.handleStatusNotification(deviceId, frame.params ?? {}, ip);
|
|
138
|
+
}
|
|
139
|
+
else if (frame.method === 'NotifyEvent') {
|
|
140
|
+
this.logger.debug(`Event from sleeping device=${deviceId}: ${JSON.stringify(frame.params)}`);
|
|
141
|
+
}
|
|
142
|
+
}
|
|
143
|
+
handleStatusNotification(deviceId, params, ip) {
|
|
144
|
+
this.logger.log(`Status update from sleeping device=${deviceId} at ${ip}`);
|
|
145
|
+
const delegate = this.delegatesManager.get(deviceId);
|
|
146
|
+
if (delegate) {
|
|
147
|
+
for (const [key, values] of Object.entries(params)) {
|
|
148
|
+
if (key === 'ts' || typeof values !== 'object' || values === null) {
|
|
149
|
+
continue;
|
|
150
|
+
}
|
|
151
|
+
this.emitFlattened(delegate, key, values);
|
|
152
|
+
}
|
|
153
|
+
this.markDeviceAwake(deviceId);
|
|
154
|
+
}
|
|
155
|
+
else {
|
|
156
|
+
this.logger.debug(`No delegate for sleeping device=${deviceId}, skipping status update`);
|
|
157
|
+
}
|
|
158
|
+
}
|
|
159
|
+
emitFlattened(delegate, compKey, values, prefix = '') {
|
|
160
|
+
for (const [attr, val] of Object.entries(values)) {
|
|
161
|
+
const fullKey = prefix ? `${prefix}.${attr}` : attr;
|
|
162
|
+
delegate.emit('value', compKey, fullKey, val);
|
|
163
|
+
if (typeof val === 'object' && val !== null && !Array.isArray(val)) {
|
|
164
|
+
this.emitFlattened(delegate, compKey, val, fullKey);
|
|
165
|
+
}
|
|
166
|
+
}
|
|
167
|
+
}
|
|
168
|
+
markDeviceAwake(shellyId) {
|
|
169
|
+
this.enqueueStateChange(shellyId, devices_constants_1.ConnectionState.CONNECTED, 'awake');
|
|
170
|
+
}
|
|
171
|
+
markDeviceSleeping(shellyId) {
|
|
172
|
+
this.enqueueStateChange(shellyId, devices_constants_1.ConnectionState.SLEEPING, 'sleeping');
|
|
173
|
+
}
|
|
174
|
+
enqueueStateChange(shellyId, state, label) {
|
|
175
|
+
const prev = this.stateQueue.get(shellyId) ?? Promise.resolve();
|
|
176
|
+
const next = prev
|
|
177
|
+
.then(async () => {
|
|
178
|
+
const device = await this.devicesService.findOneBy('identifier', shellyId, devices_shelly_ng_constants_1.DEVICES_SHELLY_NG_TYPE);
|
|
179
|
+
if (!device)
|
|
180
|
+
return;
|
|
181
|
+
await this.deviceConnectivityService.setConnectionState(device.id, { state });
|
|
182
|
+
})
|
|
183
|
+
.catch((err) => {
|
|
184
|
+
this.logger.warn(`Failed to mark sleeping device=${shellyId} as ${label}: ${err.message}`);
|
|
185
|
+
});
|
|
186
|
+
this.stateQueue.set(shellyId, next);
|
|
187
|
+
}
|
|
188
|
+
};
|
|
189
|
+
exports.ShellyWsServerService = ShellyWsServerService;
|
|
190
|
+
exports.ShellyWsServerService = ShellyWsServerService = __decorate([
|
|
191
|
+
(0, common_1.Injectable)(),
|
|
192
|
+
__metadata("design:paramtypes", [app_instance_holder_service_1.AppInstanceHolder,
|
|
193
|
+
delegates_manager_service_1.DelegatesManagerService,
|
|
194
|
+
devices_service_1.DevicesService,
|
|
195
|
+
device_connectivity_service_1.DeviceConnectivityService])
|
|
196
|
+
], ShellyWsServerService);
|
|
197
|
+
//# sourceMappingURL=shelly-ws-server.service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"shelly-ws-server.service.js","sourceRoot":"","sources":["../../../../src/plugins/devices-shelly-ng/services/shelly-ws-server.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,17 @@
|
|
|
1
1
|
import { ConfigService } from '../../../modules/config/services/config.service';
|
|
2
2
|
import { RegisteredDevice, ShelliesAdapterCallbacks, ShellyDevice } from '../interfaces/shellies.interface';
|
|
3
|
+
import { ShellyV1HttpClientService } from './shelly-v1-http-client.service';
|
|
3
4
|
export declare class ShelliesAdapterService {
|
|
4
5
|
private readonly configService;
|
|
6
|
+
private readonly httpClient;
|
|
5
7
|
private readonly logger;
|
|
6
8
|
private shellies;
|
|
7
9
|
private isStarted;
|
|
8
10
|
private pluginConfig;
|
|
11
|
+
private statusCheckRunning;
|
|
9
12
|
private readonly devicesRegistry;
|
|
10
13
|
private callbacks;
|
|
11
|
-
constructor(configService: ConfigService);
|
|
14
|
+
constructor(configService: ConfigService, httpClient: ShellyV1HttpClientService);
|
|
12
15
|
setCallbacks(callbacks: ShelliesAdapterCallbacks): void;
|
|
13
16
|
start(): Promise<void>;
|
|
14
17
|
stop(): void;
|
|
@@ -23,6 +26,7 @@ export declare class ShelliesAdapterService {
|
|
|
23
26
|
private handleDeviceOnline;
|
|
24
27
|
private handleDeviceRemoved;
|
|
25
28
|
private get config();
|
|
26
|
-
checkDevicesStatus(): void
|
|
29
|
+
checkDevicesStatus(): Promise<void>;
|
|
30
|
+
private pingDevice;
|
|
27
31
|
getNetworkInterface(): Promise<string | null>;
|
|
28
32
|
}
|