@fastybird/smart-panel-backend 0.4.0-alpha.0 → 0.4.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.module.js +7 -17
- package/dist/app.module.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 -1
- package/dist/common/filters/not-found-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 +15 -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/modules/auth/auth.module.js +1 -1
- package/dist/modules/auth/auth.module.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/dashboard/dashboard.module.js +1 -1
- package/dist/modules/dashboard/dashboard.module.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 +87 -1
- 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/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/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/platforms/abstract.platform.d.ts +40 -0
- package/dist/modules/platform/platforms/abstract.platform.js +242 -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 +15 -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 +20 -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/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.js +3 -0
- 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 +1 -0
- package/dist/modules/system/models/system.model.js +11 -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 +2 -0
- package/dist/modules/system/system.constants.js +2 -0
- 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/update-user.dto.d.ts +1 -0
- package/dist/modules/users/dto/update-user.dto.js +14 -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 +10 -0
- package/dist/modules/users/services/users.service.js.map +1 -1
- package/dist/modules/websocket/gateway/websocket.gateway.js +5 -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/data-sources-device-channel/data-sources-device-channel.plugin.js +1 -1
- package/dist/plugins/data-sources-device-channel/data-sources-device-channel.plugin.js.map +1 -1
- package/dist/plugins/data-sources-weather/data-sources-weather.plugin.js +1 -1
- package/dist/plugins/data-sources-weather/data-sources-weather.plugin.js.map +1 -1
- package/dist/plugins/devices-home-assistant/devices-home-assistant.openapi.d.ts +2 -2
- package/dist/plugins/devices-home-assistant/devices-home-assistant.plugin.js +3 -1
- package/dist/plugins/devices-home-assistant/devices-home-assistant.plugin.js.map +1 -1
- package/dist/plugins/devices-home-assistant/dto/helper-mapping-preview.dto.d.ts +1 -0
- package/dist/plugins/devices-home-assistant/dto/helper-mapping-preview.dto.js +14 -0
- package/dist/plugins/devices-home-assistant/dto/helper-mapping-preview.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/device-adoption.service.js +2 -2
- package/dist/plugins/devices-home-assistant/services/device-adoption.service.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/helper-adoption.service.js +1 -7
- package/dist/plugins/devices-home-assistant/services/helper-adoption.service.js.map +1 -1
- 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 +9 -3
- 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 +6 -1
- package/dist/plugins/devices-home-assistant/services/home-assistant.ws.service.js +63 -6
- 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-reterminal/devices-reterminal.plugin.js +1 -1
- package/dist/plugins/devices-reterminal/devices-reterminal.plugin.js.map +1 -1
- package/dist/plugins/devices-shelly-ng/delegates/delegates-manager.service.d.ts +1 -0
- package/dist/plugins/devices-shelly-ng/delegates/delegates-manager.service.js +28 -0
- 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 +4 -0
- package/dist/plugins/devices-shelly-ng/delegates/shelly-device.delegate.js +36 -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.js +1 -1
- package/dist/plugins/devices-shelly-ng/devices-shelly-ng.plugin.js.map +1 -1
- package/dist/plugins/devices-shelly-ng/dto/update-config.dto.js +6 -6
- package/dist/plugins/devices-shelly-ng/dto/update-config.dto.js.map +1 -1
- package/dist/plugins/devices-shelly-ng/models/config.model.js +6 -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 +4 -0
- package/dist/plugins/devices-shelly-ng/services/shelly-ng.service.js +33 -1
- package/dist/plugins/devices-shelly-ng/services/shelly-ng.service.js.map +1 -1
- package/dist/plugins/devices-shelly-v1/devices-shelly-v1.plugin.js +1 -1
- package/dist/plugins/devices-shelly-v1/devices-shelly-v1.plugin.js.map +1 -1
- 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.js +4 -0
- package/dist/plugins/devices-shelly-v1/services/shelly-v1.service.js.map +1 -1
- package/dist/plugins/devices-third-party/devices-third-party.plugin.js +1 -1
- package/dist/plugins/devices-third-party/devices-third-party.plugin.js.map +1 -1
- package/dist/plugins/devices-wled/devices-wled.plugin.js +1 -1
- package/dist/plugins/devices-wled/devices-wled.plugin.js.map +1 -1
- package/dist/plugins/devices-zigbee2mqtt/devices-zigbee2mqtt.plugin.js +1 -1
- package/dist/plugins/devices-zigbee2mqtt/devices-zigbee2mqtt.plugin.js.map +1 -1
- package/dist/plugins/devices-zigbee2mqtt/services/zigbee2mqtt-config-validator.service.js +1 -1
- package/dist/plugins/devices-zigbee2mqtt/services/zigbee2mqtt-config-validator.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/{modules/storage/plugins/influx-v1/influx-v1.module.d.ts → plugins/influx-v1/influx-v1.plugin.d.ts} +6 -6
- package/dist/{modules/storage/plugins/influx-v1/influx-v1.module.js → plugins/influx-v1/influx-v1.plugin.js} +22 -22
- 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/{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 +17 -0
- package/dist/plugins/influx-v2/influx-v2.plugin.js +95 -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.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 +13 -0
- package/dist/{modules/storage/plugins/memory/memory.module.js → plugins/memory-storage/memory-storage.plugin.js} +24 -24
- 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/{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/plugins/simulator/simulator.plugin.js +4 -4
- package/dist/plugins/simulator/simulator.plugin.js.map +1 -1
- package/dist/plugins/tiles-device-preview/tiles-device-preview.plugin.js +1 -1
- package/dist/plugins/tiles-device-preview/tiles-device-preview.plugin.js.map +1 -1
- package/dist/plugins/tiles-scene/tiles-scene.plugin.js +1 -1
- package/dist/plugins/tiles-scene/tiles-scene.plugin.js.map +1 -1
- package/dist/plugins/tiles-time/tiles-time.plugin.js +1 -1
- package/dist/plugins/weather-openweathermap-onecall/weather-openweathermap-onecall.plugin.js +1 -1
- package/dist/plugins/weather-openweathermap-onecall/weather-openweathermap-onecall.plugin.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +4 -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.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
|
@@ -51,10 +51,22 @@ const system_constants_1 = require("../system.constants");
|
|
|
51
51
|
const update_service_1 = require("./update.service");
|
|
52
52
|
const STATUS_FILE = '/var/lib/smart-panel/update-status.json';
|
|
53
53
|
const UPDATE_TIMEOUT_MS = 10 * 60 * 1000;
|
|
54
|
+
const STATUS_POLL_INTERVAL_MS = 3_000;
|
|
55
|
+
const STATUS_POLL_MAX_MS = UPDATE_TIMEOUT_MS + 30_000;
|
|
56
|
+
const PHASE_PROGRESS = {
|
|
57
|
+
downloading: 20,
|
|
58
|
+
installing: 45,
|
|
59
|
+
stopping: 45,
|
|
60
|
+
migrating: 65,
|
|
61
|
+
starting: 85,
|
|
62
|
+
complete: 100,
|
|
63
|
+
};
|
|
54
64
|
let UpdateExecutorService = class UpdateExecutorService {
|
|
55
65
|
constructor(updateService) {
|
|
56
66
|
this.updateService = updateService;
|
|
57
67
|
this.logger = (0, logger_1.createExtensionLogger)(system_constants_1.SYSTEM_MODULE_NAME, 'UpdateExecutorService');
|
|
68
|
+
this.statusPollTimer = null;
|
|
69
|
+
this.progressHighWaterMark = 0;
|
|
58
70
|
}
|
|
59
71
|
onModuleInit() {
|
|
60
72
|
this.checkPendingUpdateStatus();
|
|
@@ -158,7 +170,27 @@ let UpdateExecutorService = class UpdateExecutorService {
|
|
|
158
170
|
error: null,
|
|
159
171
|
startedAt: new Date(),
|
|
160
172
|
});
|
|
161
|
-
const updateScript = (0, path_1.join)(__dirname, '..', '
|
|
173
|
+
const updateScript = (0, path_1.join)(__dirname, '..', 'scripts', 'update-worker.sh');
|
|
174
|
+
if (!(0, fs_1.existsSync)(updateScript)) {
|
|
175
|
+
this.updateService.releaseUpdateLock();
|
|
176
|
+
const errorMsg = `Update worker script not found at ${updateScript}`;
|
|
177
|
+
this.logger.error(errorMsg);
|
|
178
|
+
this.updateService.setStatus({
|
|
179
|
+
status: system_constants_1.UpdateStatusType.FAILED,
|
|
180
|
+
phase: system_constants_1.UpdatePhase.FAILED,
|
|
181
|
+
progressPercent: null,
|
|
182
|
+
message: null,
|
|
183
|
+
error: errorMsg,
|
|
184
|
+
});
|
|
185
|
+
this.writeStatusFile({
|
|
186
|
+
status: system_constants_1.UpdateStatusType.FAILED,
|
|
187
|
+
phase: system_constants_1.UpdatePhase.FAILED,
|
|
188
|
+
targetVersion,
|
|
189
|
+
startedAt: new Date().toISOString(),
|
|
190
|
+
error: errorMsg,
|
|
191
|
+
});
|
|
192
|
+
throw new Error(errorMsg);
|
|
193
|
+
}
|
|
162
194
|
try {
|
|
163
195
|
const { spawn } = await Promise.resolve().then(() => __importStar(require('child_process')));
|
|
164
196
|
const child = spawn('bash', [updateScript, targetVersion], {
|
|
@@ -175,6 +207,7 @@ let UpdateExecutorService = class UpdateExecutorService {
|
|
|
175
207
|
});
|
|
176
208
|
child.unref();
|
|
177
209
|
this.logger.log(`Update worker spawned for version ${targetVersion} (PID: ${child.pid}, type: ${installType})`);
|
|
210
|
+
this.startStatusPolling();
|
|
178
211
|
}
|
|
179
212
|
catch (error) {
|
|
180
213
|
const err = error;
|
|
@@ -196,6 +229,76 @@ let UpdateExecutorService = class UpdateExecutorService {
|
|
|
196
229
|
throw error;
|
|
197
230
|
}
|
|
198
231
|
}
|
|
232
|
+
startStatusPolling() {
|
|
233
|
+
this.stopStatusPolling();
|
|
234
|
+
this.progressHighWaterMark = 10;
|
|
235
|
+
const startedAt = Date.now();
|
|
236
|
+
this.statusPollTimer = setInterval(() => {
|
|
237
|
+
if (Date.now() - startedAt > STATUS_POLL_MAX_MS) {
|
|
238
|
+
this.logger.error('Update status polling timed out');
|
|
239
|
+
this.updateService.setStatus({
|
|
240
|
+
status: system_constants_1.UpdateStatusType.FAILED,
|
|
241
|
+
phase: system_constants_1.UpdatePhase.FAILED,
|
|
242
|
+
progressPercent: null,
|
|
243
|
+
message: null,
|
|
244
|
+
error: 'Update timed out — no completion signal received',
|
|
245
|
+
});
|
|
246
|
+
this.updateService.releaseUpdateLock();
|
|
247
|
+
this.stopStatusPolling();
|
|
248
|
+
return;
|
|
249
|
+
}
|
|
250
|
+
if (!(0, fs_1.existsSync)(STATUS_FILE)) {
|
|
251
|
+
return;
|
|
252
|
+
}
|
|
253
|
+
try {
|
|
254
|
+
const raw = (0, fs_1.readFileSync)(STATUS_FILE, 'utf-8');
|
|
255
|
+
const fileStatus = JSON.parse(raw);
|
|
256
|
+
if (fileStatus.status === system_constants_1.UpdateStatusType.FAILED) {
|
|
257
|
+
this.logger.error(`Update worker failed: ${fileStatus.error ?? 'unknown error'}`);
|
|
258
|
+
this.updateService.setStatus({
|
|
259
|
+
status: system_constants_1.UpdateStatusType.FAILED,
|
|
260
|
+
phase: system_constants_1.UpdatePhase.FAILED,
|
|
261
|
+
progressPercent: null,
|
|
262
|
+
message: null,
|
|
263
|
+
error: fileStatus.error ?? 'Update failed with unknown error',
|
|
264
|
+
});
|
|
265
|
+
this.updateService.releaseUpdateLock();
|
|
266
|
+
this.stopStatusPolling();
|
|
267
|
+
}
|
|
268
|
+
else if (fileStatus.status === system_constants_1.UpdateStatusType.COMPLETE) {
|
|
269
|
+
this.updateService.setStatus({
|
|
270
|
+
status: system_constants_1.UpdateStatusType.COMPLETE,
|
|
271
|
+
phase: system_constants_1.UpdatePhase.COMPLETE,
|
|
272
|
+
progressPercent: 100,
|
|
273
|
+
message: `Successfully updated to ${fileStatus.targetVersion}`,
|
|
274
|
+
error: null,
|
|
275
|
+
});
|
|
276
|
+
this.updateService.releaseUpdateLock();
|
|
277
|
+
this.stopStatusPolling();
|
|
278
|
+
}
|
|
279
|
+
else {
|
|
280
|
+
const rawProgress = PHASE_PROGRESS[fileStatus.phase] ?? 10;
|
|
281
|
+
const progress = Math.max(this.progressHighWaterMark, rawProgress);
|
|
282
|
+
this.progressHighWaterMark = progress;
|
|
283
|
+
this.updateService.setStatus({
|
|
284
|
+
status: fileStatus.status ?? system_constants_1.UpdateStatusType.DOWNLOADING,
|
|
285
|
+
phase: fileStatus.phase ?? system_constants_1.UpdatePhase.DOWNLOADING,
|
|
286
|
+
progressPercent: progress,
|
|
287
|
+
message: `Update in progress: ${fileStatus.phase}...`,
|
|
288
|
+
error: null,
|
|
289
|
+
});
|
|
290
|
+
}
|
|
291
|
+
}
|
|
292
|
+
catch {
|
|
293
|
+
}
|
|
294
|
+
}, STATUS_POLL_INTERVAL_MS);
|
|
295
|
+
}
|
|
296
|
+
stopStatusPolling() {
|
|
297
|
+
if (this.statusPollTimer) {
|
|
298
|
+
clearInterval(this.statusPollTimer);
|
|
299
|
+
this.statusPollTimer = null;
|
|
300
|
+
}
|
|
301
|
+
}
|
|
199
302
|
writeStatusFile(status) {
|
|
200
303
|
try {
|
|
201
304
|
const dir = (0, path_1.dirname)(STATUS_FILE);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-executor.service.js","sourceRoot":"","sources":["../../../../src/modules/system/services/update-executor.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2BAAgG;AAChG,+BAAqC;AAErC,2CAA0D;AAE1D,mDAA+D;AAC/D,0DAAwF;AAExF,qDAAiD;AAWjD,MAAM,WAAW,GAAG,yCAAyC,CAAC;AAC9D,MAAM,iBAAiB,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"update-executor.service.js","sourceRoot":"","sources":["../../../../src/modules/system/services/update-executor.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,9 +11,11 @@ export declare enum EventType {
|
|
|
11
11
|
SYSTEM_REBOOT = "SystemModule.System.Reboot",
|
|
12
12
|
SYSTEM_POWER_OFF = "SystemModule.System.PowerOff",
|
|
13
13
|
SYSTEM_FACTORY_RESET = "SystemModule.System.FactoryReset",
|
|
14
|
+
SYSTEM_SERVICE_RESTART = "SystemModule.System.ServiceRestart",
|
|
14
15
|
SYSTEM_REBOOT_SET = "SystemModule.System.Reboot.Set",
|
|
15
16
|
SYSTEM_POWER_OFF_SET = "SystemModule.System.PowerOff.Set",
|
|
16
17
|
SYSTEM_FACTORY_RESET_SET = "SystemModule.System.FactoryReset.Set",
|
|
18
|
+
SYSTEM_SERVICE_RESTART_SET = "SystemModule.System.ServiceRestart.Set",
|
|
17
19
|
DISPLAY_REBOOT = "SystemModule.Display.Reboot",
|
|
18
20
|
DISPLAY_POWER_OFF = "SystemModule.Display.PowerOff",
|
|
19
21
|
DISPLAY_FACTORY_RESET = "SystemModule.Display.FactoryReset",
|
|
@@ -16,9 +16,11 @@ var EventType;
|
|
|
16
16
|
EventType["SYSTEM_REBOOT"] = "SystemModule.System.Reboot";
|
|
17
17
|
EventType["SYSTEM_POWER_OFF"] = "SystemModule.System.PowerOff";
|
|
18
18
|
EventType["SYSTEM_FACTORY_RESET"] = "SystemModule.System.FactoryReset";
|
|
19
|
+
EventType["SYSTEM_SERVICE_RESTART"] = "SystemModule.System.ServiceRestart";
|
|
19
20
|
EventType["SYSTEM_REBOOT_SET"] = "SystemModule.System.Reboot.Set";
|
|
20
21
|
EventType["SYSTEM_POWER_OFF_SET"] = "SystemModule.System.PowerOff.Set";
|
|
21
22
|
EventType["SYSTEM_FACTORY_RESET_SET"] = "SystemModule.System.FactoryReset.Set";
|
|
23
|
+
EventType["SYSTEM_SERVICE_RESTART_SET"] = "SystemModule.System.ServiceRestart.Set";
|
|
22
24
|
EventType["DISPLAY_REBOOT"] = "SystemModule.Display.Reboot";
|
|
23
25
|
EventType["DISPLAY_POWER_OFF"] = "SystemModule.Display.PowerOff";
|
|
24
26
|
EventType["DISPLAY_FACTORY_RESET"] = "SystemModule.Display.FactoryReset";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"system.constants.js","sourceRoot":"","sources":["../../../src/modules/system/system.constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,oBAAoB,GAAG,QAAQ,CAAC;AAEhC,QAAA,kBAAkB,GAAG,eAAe,CAAC;AAErC,QAAA,0BAA0B,GAAG,eAAe,CAAC;AAE7C,QAAA,iCAAiC,GAC7C,wHAAwH,CAAC;AAE1H,IAAY,gBAGX;AAHD,WAAY,gBAAgB;IAC3B,qFAAiE,CAAA;IACjE,mFAA+D,CAAA;AAChE,CAAC,EAHW,gBAAgB,gCAAhB,gBAAgB,QAG3B;AAED,IAAY,
|
|
1
|
+
{"version":3,"file":"system.constants.js","sourceRoot":"","sources":["../../../src/modules/system/system.constants.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,6 +26,7 @@ const stats_module_1 = require("../stats/stats.module");
|
|
|
26
26
|
const storage_module_1 = require("../storage/storage.module");
|
|
27
27
|
const api_tag_decorator_1 = require("../swagger/decorators/api-tag.decorator");
|
|
28
28
|
const swagger_models_registry_service_1 = require("../swagger/services/swagger-models-registry.service");
|
|
29
|
+
const users_constants_1 = require("../users/users.constants");
|
|
29
30
|
const users_module_1 = require("../users/users.module");
|
|
30
31
|
const command_event_registry_service_1 = require("../websocket/services/command-event-registry.service");
|
|
31
32
|
const websocket_module_1 = require("../websocket/websocket.module");
|
|
@@ -67,9 +68,11 @@ let SystemModule = class SystemModule {
|
|
|
67
68
|
class: config_model_1.SystemConfigModel,
|
|
68
69
|
configDto: update_config_dto_1.UpdateSystemConfigDto,
|
|
69
70
|
});
|
|
70
|
-
|
|
71
|
-
this.eventRegistry.register(system_constants_1.EventType.
|
|
72
|
-
this.eventRegistry.register(system_constants_1.EventType.
|
|
71
|
+
const adminRoles = [users_constants_1.UserRole.ADMIN, users_constants_1.UserRole.OWNER];
|
|
72
|
+
this.eventRegistry.register(system_constants_1.EventType.SYSTEM_REBOOT_SET, system_constants_1.EventHandlerName.INTERNAL_PLATFORM_ACTION, async (user, _payload) => this.systemCommandService.reboot(user), adminRoles);
|
|
73
|
+
this.eventRegistry.register(system_constants_1.EventType.SYSTEM_POWER_OFF_SET, system_constants_1.EventHandlerName.INTERNAL_PLATFORM_ACTION, async (user, _payload) => this.systemCommandService.powerOff(user), adminRoles);
|
|
74
|
+
this.eventRegistry.register(system_constants_1.EventType.SYSTEM_SERVICE_RESTART_SET, system_constants_1.EventHandlerName.INTERNAL_PLATFORM_ACTION, async (user, _payload) => this.systemCommandService.restartService(user), adminRoles);
|
|
75
|
+
this.eventRegistry.register(system_constants_1.EventType.SYSTEM_FACTORY_RESET_SET, system_constants_1.EventHandlerName.INTERNAL_PLATFORM_ACTION, async (user, _payload) => this.systemCommandService.factoryReset(user), adminRoles);
|
|
73
76
|
this.eventRegistry.register(system_constants_1.EventType.DISPLAY_REBOOT_SET, system_constants_1.EventHandlerName.INTERNAL_DISPLAY_ACTION, (user, _payload) => Promise.resolve(this.displayCommandService.displayReboot(user)));
|
|
74
77
|
this.eventRegistry.register(system_constants_1.EventType.DISPLAY_POWER_OFF_SET, system_constants_1.EventHandlerName.INTERNAL_DISPLAY_ACTION, (user, _payload) => Promise.resolve(this.displayCommandService.displayPowerOff(user)));
|
|
75
78
|
this.eventRegistry.register(system_constants_1.EventType.DISPLAY_FACTORY_RESET_SET, system_constants_1.EventHandlerName.INTERNAL_DISPLAY_ACTION, async (user, _payload) => this.displayCommandService.displayFactoryReset(user));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"system.module.js","sourceRoot":"","sources":["../../../src/modules/system/system.module.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA8E;AAC9E,qEAAqF;AAErF,qDAAiD;AACjD,sEAAkE;AAClE,gGAA0F;AAC1F,8DAA0D;AAC1D,iEAA6D;AAC7D,uEAAmE;AACnE,kFAA8E;AAC9E,iEAA6D;AAC7D,2DAAuD;AACvD,qFAAgF;AAChF,wDAAoD;AACpD,8DAA0D;AAC1D,+EAAiE;AACjE,yGAAmG;AACnG,wDAAoD;AAEpD,yGAAmG;AACnG,oEAAgE;AAEhE,0EAAqE;AACrE,0EAAqE;AACrE,4EAAuE;AACvE,mEAA+D;AAC/D,uEAAmE;AACnE,uEAAmE;AACnE,+DAAgE;AAChE,wDAA0D;AAC1D,6EAAwE;AACxE,gFAA2E;AAC3E,sFAAgF;AAChF,sEAAkE;AAClE,8EAAyE;AACzE,4EAAuE;AACvE,8DAA0D;AAC1D,gFAA2E;AAC3E,8DAA0D;AAC1D,yDAO4B;AAC5B,qDAA+D;AAsCxD,IAAM,YAAY,GAAlB,MAAM,YAAY;IACxB,YACkB,aAA0C,EAC1C,oBAA0C,EAC1C,qBAA4C,EAC5C,mBAAwC,EACxC,mBAAwC,EACxC,oBAA0C,EAC1C,aAA4B,EAC5B,eAA6C,EAC7C,oBAA8C,EAC9C,iBAAoC;QATpC,kBAAa,GAAb,aAAa,CAA6B;QAC1C,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,kBAAa,GAAb,aAAa,CAAe;QAC5B,oBAAe,GAAf,eAAe,CAA8B;QAC7C,yBAAoB,GAApB,oBAAoB,CAA0B;QAC9C,sBAAiB,GAAjB,iBAAiB,CAAmB;IACnD,CAAC;IAEJ,YAAY;QAEX,IAAI,CAAC,oBAAoB,CAAC,eAAe,CAA2C;YACnF,IAAI,EAAE,qCAAkB;YACxB,KAAK,EAAE,gCAAiB;YACxB,SAAS,EAAE,yCAAqB;SAChC,CAAC,CAAC;QAEH,IAAI,CAAC,aAAa,CAAC,QAAQ,CAC1B,4BAAS,CAAC,iBAAiB,EAC3B,mCAAgB,CAAC,wBAAwB,EACzC,KAAK,EAAE,IAAmB,EAAE,QAAiB,EAAkD,EAAE,CAChG,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"system.module.js","sourceRoot":"","sources":["../../../src/modules/system/system.module.ts"],"names":[],"mappings":"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"}
|
|
@@ -89,6 +89,15 @@ let UsersController = class UsersController {
|
|
|
89
89
|
this.logger.warn('Attempted to change owner role');
|
|
90
90
|
throw new common_1.UnprocessableEntityException('The owner role cannot be changed');
|
|
91
91
|
}
|
|
92
|
+
if (updateDto.data.password && authenticatedUserId !== null && authenticatedUserId === id) {
|
|
93
|
+
if (!updateDto.data.currentPassword) {
|
|
94
|
+
throw new common_1.UnprocessableEntityException('Current password is required when changing your own password');
|
|
95
|
+
}
|
|
96
|
+
const isCurrentPasswordValid = await this.usersService.verifyPassword(user.id, updateDto.data.currentPassword);
|
|
97
|
+
if (!isCurrentPasswordValid) {
|
|
98
|
+
throw new common_1.UnprocessableEntityException('Current password is incorrect');
|
|
99
|
+
}
|
|
100
|
+
}
|
|
92
101
|
if (updateDto.data.email) {
|
|
93
102
|
const existingEmail = await this.usersService.findByEmail(updateDto.data.email);
|
|
94
103
|
if (existingEmail && existingEmail.id !== id) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"users.controller.js","sourceRoot":"","sources":["../../../../src/modules/users/controllers/users.controller.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"users.controller.js","sourceRoot":"","sources":["../../../../src/modules/users/controllers/users.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,7 +32,7 @@ __decorate([
|
|
|
32
32
|
], UpdateUserDto.prototype, "username", void 0);
|
|
33
33
|
__decorate([
|
|
34
34
|
(0, swagger_1.ApiPropertyOptional)({
|
|
35
|
-
description: "User's password.",
|
|
35
|
+
description: "User's new password.",
|
|
36
36
|
type: 'string',
|
|
37
37
|
format: 'password',
|
|
38
38
|
example: 'superstrongpassword',
|
|
@@ -45,6 +45,19 @@ __decorate([
|
|
|
45
45
|
(0, class_validator_1.ValidateIf)((_, value) => value !== null),
|
|
46
46
|
__metadata("design:type", String)
|
|
47
47
|
], UpdateUserDto.prototype, "password", void 0);
|
|
48
|
+
__decorate([
|
|
49
|
+
(0, swagger_1.ApiPropertyOptional)({
|
|
50
|
+
name: 'current_password',
|
|
51
|
+
description: 'Current password for verification when changing password.',
|
|
52
|
+
type: 'string',
|
|
53
|
+
format: 'password',
|
|
54
|
+
example: 'oldpassword',
|
|
55
|
+
}),
|
|
56
|
+
(0, class_transformer_1.Expose)({ name: 'current_password' }),
|
|
57
|
+
(0, class_validator_1.IsOptional)(),
|
|
58
|
+
(0, class_validator_1.IsString)({ message: '[{"field":"current_password","reason":"Current password must be a string."}]' }),
|
|
59
|
+
__metadata("design:type", String)
|
|
60
|
+
], UpdateUserDto.prototype, "currentPassword", void 0);
|
|
48
61
|
__decorate([
|
|
49
62
|
(0, swagger_1.ApiPropertyOptional)({
|
|
50
63
|
description: "User's email address.",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-user.dto.js","sourceRoot":"","sources":["../../../../src/modules/users/dto/update-user.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAA4D;AAC5D,qDAAgH;AAEhH,6CAA8E;AAE9E,wDAA4D;AAGrD,IAAM,aAAa,GAAnB,MAAM,aAAa;
|
|
1
|
+
{"version":3,"file":"update-user.dto.js","sourceRoot":"","sources":["../../../../src/modules/users/dto/update-user.dto.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,6 +16,7 @@ export declare class UsersService {
|
|
|
16
16
|
findByEmail(email: string): Promise<UserEntity | null>;
|
|
17
17
|
findAllByRole(role: UserRole): Promise<UserEntity[]>;
|
|
18
18
|
create(createDto: CreateUserDto): Promise<UserEntity>;
|
|
19
|
+
verifyPassword(id: string, plainPassword: string): Promise<boolean>;
|
|
19
20
|
update(id: string, updateDto: UpdateUserDto): Promise<UserEntity>;
|
|
20
21
|
remove(id: string): Promise<void>;
|
|
21
22
|
getOneOrThrow(id: string): Promise<UserEntity>;
|
|
@@ -75,6 +75,16 @@ let UsersService = class UsersService {
|
|
|
75
75
|
this.eventEmitter.emit(users_constants_1.EventType.USER_CREATED, savedUser);
|
|
76
76
|
return savedUser;
|
|
77
77
|
}
|
|
78
|
+
async verifyPassword(id, plainPassword) {
|
|
79
|
+
const user = await this.repository.findOne({
|
|
80
|
+
where: { id },
|
|
81
|
+
select: ['id', 'password'],
|
|
82
|
+
});
|
|
83
|
+
if (!user || !user.password) {
|
|
84
|
+
return false;
|
|
85
|
+
}
|
|
86
|
+
return bcrypt_1.default.compare(plainPassword, user.password);
|
|
87
|
+
}
|
|
78
88
|
async update(id, updateDto) {
|
|
79
89
|
const user = await this.getOneOrThrow(id);
|
|
80
90
|
const dtoInstance = await this.validateDto(update_user_dto_1.UpdateUserDto, updateDto);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"users.service.js","sourceRoot":"","sources":["../../../../src/modules/users/services/users.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"users.service.js","sourceRoot":"","sources":["../../../../src/modules/users/services/users.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -121,9 +121,12 @@ let WebsocketGateway = WebsocketGateway_1 = class WebsocketGateway {
|
|
|
121
121
|
}
|
|
122
122
|
try {
|
|
123
123
|
const handlers = this.commandEventRegistry.get(event);
|
|
124
|
-
const
|
|
124
|
+
const clientData = client.data;
|
|
125
|
+
const results = (await Promise.all(handlers.map(async ({ name, handler, requiredRoles }) => {
|
|
125
126
|
try {
|
|
126
|
-
|
|
127
|
+
if (requiredRoles && (!clientData.user || !requiredRoles.includes(clientData.user.role))) {
|
|
128
|
+
return { handler: name, success: false, reason: 'Insufficient permissions' };
|
|
129
|
+
}
|
|
127
130
|
const response = await handler(clientData.user, payload);
|
|
128
131
|
return response !== null ? { handler: name, ...response } : null;
|
|
129
132
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocket.gateway.js","sourceRoot":"","sources":["../../../../src/modules/websocket/gateway/websocket.gateway.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yDAAoD;AACpD,qDAA0C;AAC1C,yCAA2C;AAE3C,yDAAsD;AACtD,mDAS4B;AAE5B,mDAA+D;AAC/D,2EAAmE;AACnE,8DAA2D;AAE3D,oEAA+D;AAC/D,kEAA6D;AAC7D,wDAAsE;AACtE,+FAAyF;AACzF,iEAA4D;AAC5D,gDAA8D;AAC9D,gEAMgC;AAChC,kEAAuE;AAWhE,IAAM,gBAAgB,wBAAtB,MAAM,gBAAgB;IAO5B,YACkB,oBAAiD,EACjD,YAA2B,EAC3B,aAA4B;QAF5B,yBAAoB,GAApB,oBAAoB,CAA6B;QACjD,iBAAY,GAAZ,YAAY,CAAe;QAC3B,kBAAa,GAAb,aAAa,CAAe;QATtC,mBAAc,GAAG,KAAK,CAAC;QAId,WAAM,GAAG,IAAA,8BAAqB,EAAC,2CAAqB,EAAE,kBAAkB,CAAC,CAAC;QAO1F,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,KAAa,EAAE,OAA4B,EAAE,EAAE;YACvE,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QACrC,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,MAAM;QACL,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;IAC5B,CAAC;IAED,IAAI,OAAO;QACV,OAAO,IAAI,CAAC,cAAc,CAAC;IAC5B,CAAC;IAED,IAAI,YAAY;QACf,OAAO,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,IAAI,IAAI,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,IAAI,CAAC,CAAC;IACtF,CAAC;IAED,mBAAmB,CAAC,IAAY;QAC/B,OAAO,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,IAAI,CAAC,CAAC;IACnE,CAAC;IAED,SAAS;QACR,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAC;IACjD,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,MAAc;QACpC,IAAI,CAAC;YACJ,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;YAElE,IAAI,CAAC,SAAS,EAAE,CAAC;gBAChB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,6CAA6C,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;gBAEhG,MAAM,CAAC,UAAU,EAAE,CAAC;YACrB,CAAC;YAED,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,qBAAqB,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC;YAElD,MAAM,MAAM,CAAC,IAAI,CAAC,yCAAmB,CAAC,CAAC;YAEvC,MAAM,UAAU,GAAG,MAAM,CAAC,IAAkB,CAAC;YAC7C,MAAM,QAAQ,GAAG,IAAA,oCAAyB,EAAC,MAAM,CAAC,CAAC;YAEnD,IAAI,UAAU,CAAC,IAAI,IAAI,UAAU,CAAC,IAAI,CAAC,IAAI,KAAK,OAAO,IAAI,UAAU,CAAC,IAAI,CAAC,SAAS,KAAK,+BAAc,CAAC,OAAO,EAAE,CAAC;gBACjH,MAAM,MAAM,CAAC,IAAI,CAAC,2CAAqB,CAAC,CAAC;gBAGzC,IAAI,UAAU,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;oBACxB,MAAM,MAAM,CAAC,IAAI,CAAC,WAAW,UAAU,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;gBACpD,CAAC;YACF,CAAC;YAGD,MAAM,WAAW,GAAG,IAAA,4BAAU,EAAC,2BAAW,EAAE;gBAC3C,SAAS,EAAE,MAAM,CAAC,EAAE;gBACpB,UAAU,EAAE,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI;gBACpD,IAAI,EAAE,UAAU,CAAC,IAAI,IAAI,IAAI;gBAC7B,UAAU,EAAE,iCAAiB,CAAC,SAAS;gBACvC,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;aACnC,CAAC,CAAC;YAEH,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,iCAAW,CAAC,gBAAgB,EAAE,WAAW,CAAC,CAAC;QACnE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,GAAG,GAAG,KAAc,CAAC;YAE3B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,6CAA6C,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,IAAI,KAAK,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;YAEhH,MAAM,CAAC,UAAU,EAAE,CAAC;QACrB,CAAC;IACF,CAAC;IAED,gBAAgB,CAAC,MAAc;QAC9B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,wBAAwB,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC;QAErD,MAAM,UAAU,GAAG,MAAM,CAAC,IAAkB,CAAC;QAC7C,MAAM,QAAQ,GAAG,IAAA,oCAAyB,EAAC,MAAM,CAAC,CAAC;QAGnD,MAAM,WAAW,GAAG,IAAA,4BAAU,EAAC,2BAAW,EAAE;YAC3C,SAAS,EAAE,MAAM,CAAC,EAAE;YACpB,UAAU,EAAE,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI;YACpD,IAAI,EAAE,UAAU,CAAC,IAAI,IAAI,IAAI;YAC7B,UAAU,EAAE,iCAAiB,CAAC,YAAY;YAC1C,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;SACnC,CAAC,CAAC;QAEH,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,iCAAW,CAAC,mBAAmB,EAAE,WAAW,CAAC,CAAC;IACtE,CAAC;IAGK,AAAN,KAAK,CAAC,uBAAuB,CACb,QAA2B,EACvB,MAAc;QAEjC,IAAI,CAAC;YACJ,MAAM,MAAM,CAAC,IAAI,CAAC,mCAAa,CAAC,CAAC;YAEjC,OAAO,IAAI,CAAC;QACb,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,GAAG,GAAG,KAAc,CAAC;YAE3B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,8BAA8B,EAAE,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC;YAE9F,OAAO,KAAK,CAAC;QACd,CAAC;IACF,CAAC;IAGK,AAAN,KAAK,CAAC,aAAa,CACH,OAA0B,EACtB,MAAc;QAEjC,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;QAEnC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,qBAAqB,KAAK,iBAAiB,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC;QAExE,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YAC3C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,6BAA6B,KAAK,EAAE,CAAC,CAAC;YAEvD,OAAO,IAAA,4BAAU,EAAC,qCAAgB,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,KAAK,qBAAqB,EAAE,CAAC,CAAC;QACzG,CAAC;QAED,IAAI,CAAC;YACJ,MAAM,QAAQ,GAAG,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YAEtD,MAAM,OAAO,GAAG,CACf,MAAM,OAAO,CAAC,GAAG,CAChB,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"websocket.gateway.js","sourceRoot":"","sources":["../../../../src/modules/websocket/gateway/websocket.gateway.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { UserRole } from '../../users/users.constants';
|
|
1
2
|
import { ClientUserDto } from '../dto/client-user.dto';
|
|
2
3
|
type CommandEventHandler = (user: ClientUserDto, payload: unknown) => Promise<{
|
|
3
4
|
success: boolean;
|
|
@@ -5,10 +6,11 @@ type CommandEventHandler = (user: ClientUserDto, payload: unknown) => Promise<{
|
|
|
5
6
|
} | null>;
|
|
6
7
|
export declare class CommandEventRegistryService {
|
|
7
8
|
private readonly events;
|
|
8
|
-
register(event: string, name: string, handler: CommandEventHandler): void;
|
|
9
|
+
register(event: string, name: string, handler: CommandEventHandler, requiredRoles?: UserRole[]): void;
|
|
9
10
|
get(event: string): {
|
|
10
11
|
name: string;
|
|
11
12
|
handler: CommandEventHandler;
|
|
13
|
+
requiredRoles?: UserRole[];
|
|
12
14
|
}[];
|
|
13
15
|
has(event: string): boolean;
|
|
14
16
|
}
|
|
@@ -12,23 +12,24 @@ let CommandEventRegistryService = class CommandEventRegistryService {
|
|
|
12
12
|
constructor() {
|
|
13
13
|
this.events = new Map();
|
|
14
14
|
}
|
|
15
|
-
register(event, name, handler) {
|
|
15
|
+
register(event, name, handler, requiredRoles) {
|
|
16
16
|
if (!this.events.has(event)) {
|
|
17
17
|
this.events.set(event, new Map());
|
|
18
18
|
}
|
|
19
19
|
if (this.events.get(event).has(name)) {
|
|
20
20
|
throw new Error(`Command event handler "${name}" for event "${event}" is already registered.`);
|
|
21
21
|
}
|
|
22
|
-
this.events.get(event).set(name, handler);
|
|
22
|
+
this.events.get(event).set(name, { handler, requiredRoles });
|
|
23
23
|
}
|
|
24
24
|
get(event) {
|
|
25
25
|
const handlers = this.events.get(event);
|
|
26
26
|
if (!handlers) {
|
|
27
27
|
return [];
|
|
28
28
|
}
|
|
29
|
-
return Array.from(handlers.entries()).map(([name,
|
|
29
|
+
return Array.from(handlers.entries()).map(([name, entry]) => ({
|
|
30
30
|
name,
|
|
31
|
-
handler,
|
|
31
|
+
handler: entry.handler,
|
|
32
|
+
requiredRoles: entry.requiredRoles,
|
|
32
33
|
}));
|
|
33
34
|
}
|
|
34
35
|
has(event) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command-event-registry.service.js","sourceRoot":"","sources":["../../../../src/modules/websocket/services/command-event-registry.service.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAA4C;
|
|
1
|
+
{"version":3,"file":"command-event-registry.service.js","sourceRoot":"","sources":["../../../../src/modules/websocket/services/command-event-registry.service.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAA4C;AAgBrC,IAAM,2BAA2B,GAAjC,MAAM,2BAA2B;IAAjC;QACW,WAAM,GAAG,IAAI,GAAG,EAA0C,CAAC;IA+B7E,CAAC;IA7BA,QAAQ,CAAC,KAAa,EAAE,IAAY,EAAE,OAA4B,EAAE,aAA0B;QAC7F,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YAC7B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,GAAG,EAA6B,CAAC,CAAC;QAC9D,CAAC;QAED,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YACtC,MAAM,IAAI,KAAK,CAAC,0BAA0B,IAAI,gBAAgB,KAAK,0BAA0B,CAAC,CAAC;QAChG,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC,CAAC;IAC9D,CAAC;IAED,GAAG,CAAC,KAAa;QAChB,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAExC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACf,OAAO,EAAE,CAAC;QACX,CAAC;QAED,OAAO,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;YAC7D,IAAI;YACJ,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,aAAa,EAAE,KAAK,CAAC,aAAa;SAClC,CAAC,CAAC,CAAC;IACL,CAAC;IAED,GAAG,CAAC,KAAa;QAChB,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;CACD,CAAA;AAhCY,kEAA2B;sCAA3B,2BAA2B;IADvC,IAAA,mBAAU,GAAE;GACA,2BAA2B,CAgCvC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai.provider.js","sourceRoot":"","sources":["../../../../src/plugins/buddy-openai/platforms/openai.provider.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAQ5C,wFAAsF;AACtF,oFAAgF;AAChF,sEAImC;AAI5B,IAAM,cAAc,GAApB,MAAM,cAAc;IAC1B,YAA6B,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;IAAG,CAAC;IAE7D,OAAO;QACN,OAAO,iDAAwB,CAAC;IACjC,CAAC;IAED,OAAO;QACN,OAAO,QAAQ,CAAC;IACjB,CAAC;IAED,cAAc;QACb,OAAO,gEAAuC,CAAC;IAChD,CAAC;IAED,eAAe;QACd,OAAO,mDAA0B,CAAC;IACnC,CAAC;IAED,YAAY,CAAC,YAAqC;QACjD,MAAM,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC;QAEnC,OAAO,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;IACxD,CAAC;IAED,aAAa;QACZ,OAAO,IAAI,CAAC;IACb,CAAC;IAED,KAAK,CAAC,WAAW,CAChB,YAAoB,EACpB,QAAuB,EACvB,KAAa,EACb,OAAoB;QAEpB,MAAM,MAAM,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;QACtC,MAAM,MAAM,GAAG,MAAM,EAAE,MAAM,CAAC;QAE9B,IAAI,CAAC,MAAM,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;QACrD,CAAC;QAED,MAAM,aAAa,GAAG,MAAM,EAAE,KAAK,IAAI,KAAK,CAAC;QAC7C,MAAM,OAAO,GAAG,OAAO,EAAE,OAAO,IAAI,MAAM,CAAC;QAE3C,MAAM,SAAS,GAAG,OAAO,EAAE,SAAS,IAAI,IAAI,CAAC;QAE7C,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACzB,MAAM,MAAM,GAAG,MAAM,IAAA,oCAAiB,EACrC,MAAM,EACN,aAAa,EACb,YAAY,EACZ,QAAQ,EACR,OAAO,EACP,SAAS,EACT,OAAO,EAAE,KAAK,CACd,CAAC;QACF,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC;QAEtC,OAAO;YACN,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,SAAS,EAAE,MAAM,CAAC,SAAS;YAC3B,IAAI,EAAE;gBACL,QAAQ,EAAE,iDAAwB;gBAClC,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,WAAW,EAAE,MAAM,CAAC,WAAW;gBAC/B,YAAY,EAAE,MAAM,CAAC,YAAY;gBACjC,YAAY,EAAE,MAAM,CAAC,YAAY;gBACjC,UAAU;gBACV,eAAe,EAAE,IAAI;gBACrB,gBAAgB,EAAE,IAAI;aACtB;SACD,CAAC;IACH,CAAC;IAEO,eAAe;QACtB,IAAI,CAAC;YACJ,OAAO,IAAI,CAAC,aAAa,CAAC,eAAe,CAAyB,iDAAwB,CAAC,CAAC;QAC7F,CAAC;QAAC,MAAM,CAAC;YACR,OAAO,IAAI,CAAC;QACb,CAAC;IACF,CAAC;CACD,CAAA;
|
|
1
|
+
{"version":3,"file":"openai.provider.js","sourceRoot":"","sources":["../../../../src/plugins/buddy-openai/platforms/openai.provider.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAQ5C,wFAAsF;AACtF,oFAAgF;AAChF,sEAImC;AAI5B,IAAM,cAAc,GAApB,MAAM,cAAc;IAC1B,YAA6B,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;IAAG,CAAC;IAE7D,OAAO;QACN,OAAO,iDAAwB,CAAC;IACjC,CAAC;IAED,OAAO;QACN,OAAO,QAAQ,CAAC;IACjB,CAAC;IAED,cAAc;QACb,OAAO,gEAAuC,CAAC;IAChD,CAAC;IAED,eAAe;QACd,OAAO,mDAA0B,CAAC;IACnC,CAAC;IAED,YAAY,CAAC,YAAqC;QACjD,MAAM,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC;QAEnC,OAAO,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;IACxD,CAAC;IAED,aAAa;QACZ,OAAO,IAAI,CAAC;IACb,CAAC;IAED,KAAK,CAAC,WAAW,CAChB,YAAoB,EACpB,QAAuB,EACvB,KAAa,EACb,OAAoB;QAEpB,MAAM,MAAM,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;QACtC,MAAM,MAAM,GAAG,MAAM,EAAE,MAAM,CAAC;QAE9B,IAAI,CAAC,MAAM,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;QACrD,CAAC;QAED,MAAM,aAAa,GAAG,MAAM,EAAE,KAAK,IAAI,KAAK,CAAC;QAC7C,MAAM,OAAO,GAAG,OAAO,EAAE,OAAO,IAAI,MAAM,CAAC;QAE3C,MAAM,SAAS,GAAG,OAAO,EAAE,SAAS,IAAI,IAAI,CAAC;QAE7C,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACzB,MAAM,MAAM,GAAG,MAAM,IAAA,oCAAiB,EACrC,MAAM,EACN,aAAa,EACb,YAAY,EACZ,QAAQ,EACR,OAAO,EACP,SAAS,EACT,OAAO,EAAE,KAAK,CACd,CAAC;QACF,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC;QAEtC,OAAO;YACN,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,SAAS,EAAE,MAAM,CAAC,SAAS;YAC3B,UAAU,EAAE,MAAM,CAAC,UAAU;YAC7B,IAAI,EAAE;gBACL,QAAQ,EAAE,iDAAwB;gBAClC,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,WAAW,EAAE,MAAM,CAAC,WAAW;gBAC/B,YAAY,EAAE,MAAM,CAAC,YAAY;gBACjC,YAAY,EAAE,MAAM,CAAC,YAAY;gBACjC,UAAU;gBACV,eAAe,EAAE,IAAI;gBACrB,gBAAgB,EAAE,IAAI;aACtB;SACD,CAAC;IACH,CAAC;IAEO,eAAe;QACtB,IAAI,CAAC;YACJ,OAAO,IAAI,CAAC,aAAa,CAAC,eAAe,CAAyB,iDAAwB,CAAC,CAAC;QAC7F,CAAC;QAAC,MAAM,CAAC;YACR,OAAO,IAAI,CAAC;QACb,CAAC;IACF,CAAC;CACD,CAAA;AAnFY,wCAAc;yBAAd,cAAc;IAD1B,IAAA,mBAAU,GAAE;qCAEgC,8BAAa;GAD7C,cAAc,CAmF1B"}
|
|
@@ -83,7 +83,7 @@ let DataSourcesDeviceChannelPlugin = class DataSourcesDeviceChannelPlugin {
|
|
|
83
83
|
});
|
|
84
84
|
this.extensionsService.registerPluginMetadata({
|
|
85
85
|
type: data_sources_device_channel_constants_1.DATA_SOURCES_DEVICE_PLUGIN_NAME,
|
|
86
|
-
name: 'Device Channel Data
|
|
86
|
+
name: 'Device Channel Property Data Source',
|
|
87
87
|
description: 'Data sources for connecting tiles to device channel properties',
|
|
88
88
|
author: 'FastyBird',
|
|
89
89
|
readme: `# Device Channel Data Sources Plugin
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-sources-device-channel.plugin.js","sourceRoot":"","sources":["../../../src/plugins/data-sources-device-channel/data-sources-device-channel.plugin.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAwC;AACxC,6CAAgD;AAEhD,sEAAkE;AAClE,2GAAqG;AACrG,+EAA2E;AAC3E,+FAAyF;AACzF,+FAAyF;AACzF,wFAAqF;AACrF,kJAA0I;AAC1I,sHAAgH;AAChH,yEAAqE;AACrE,kFAA8E;AAC9E,6FAAyF;AACzF,kHAA6G;AAC7G,oHAA8G;AAC9G,yEAAqE;AAErE,mGAAoH;AACpH,+FAAgH;AAChH,yEAAgF;AAChF,+DAA6E;AAC7E,yEAAgF;AAChF,sGAA8F;AAC9F,wDAAiE;AACjE,0GAAmG;AACnG,4HAAqH;AACrH,wHAAiH;AACjH,wGAAkG;AAkB3F,IAAM,8BAA8B,GAApC,MAAM,8BAA8B;IAC1C,YACkB,YAAsC,EACtC,iBAA+C,EAC/C,wCAAkF,EAClF,gCAAkE,EAClE,eAA6C,EAC7C,qBAAmD,EACnD,iBAAoC;QANpC,iBAAY,GAAZ,YAAY,CAA0B;QACtC,sBAAiB,GAAjB,iBAAiB,CAA8B;QAC/C,6CAAwC,GAAxC,wCAAwC,CAA0C;QAClF,qCAAgC,GAAhC,gCAAgC,CAAkC;QAClE,oBAAe,GAAf,eAAe,CAA8B;QAC7C,0BAAqB,GAArB,qBAAqB,CAA8B;QACnD,sBAAiB,GAAjB,iBAAiB,CAAmB;IACnD,CAAC;IAEJ,YAAY;QACX,IAAI,CAAC,YAAY,CAAC,eAAe,CAA+D;YAC/F,IAAI,EAAE,uEAA+B;YACrC,KAAK,EAAE,uCAAwB;YAC/B,SAAS,EAAE,sDAAkC;SAC7C,CAAC,CAAC;QAEH,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAIpC;YACD,IAAI,EAAE,gEAAwB;YAC9B,KAAK,EAAE,kEAA6B;YACpC,SAAS,EAAE,yDAAgC;YAC3C,SAAS,EAAE,yDAAgC;SAC3C,CAAC,CAAC;QAEH,IAAI,CAAC,wCAAwC,CAAC,QAAQ,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;QAE9F,KAAK,MAAM,KAAK,IAAI,6FAAuD,EAAE,CAAC;YAC7E,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACtC,CAAC;QAED,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC;YACnC,WAAW,EAAE,mCAAgB;YAC7B,qBAAqB,EAAE,MAAM;YAC7B,kBAAkB,EAAE,gEAAwB;YAC5C,UAAU,EAAE,kEAA6B;SACzC,CAAC,CAAC;QAEH,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC;YACnC,WAAW,EAAE,4CAAmB;YAChC,qBAAqB,EAAE,MAAM;YAC7B,kBAAkB,EAAE,gEAAwB;YAC5C,UAAU,EAAE,yDAAgC;SAC5C,CAAC,CAAC;QAEH,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC;YACnC,WAAW,EAAE,4CAAmB;YAChC,qBAAqB,EAAE,MAAM;YAC7B,kBAAkB,EAAE,gEAAwB;YAC5C,UAAU,EAAE,yDAAgC;SAC5C,CAAC,CAAC;QAEH,IAAI,CAAC,iBAAiB,CAAC,sBAAsB,CAAC;YAC7C,IAAI,EAAE,uEAA+B;YACrC,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"data-sources-device-channel.plugin.js","sourceRoot":"","sources":["../../../src/plugins/data-sources-device-channel/data-sources-device-channel.plugin.ts"],"names":[],"mappings":"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"}
|