@fastybird/smart-panel-backend 1.1.0-alpha.2 → 1.1.0-alpha.20
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 +8 -0
- package/dist/app.module.js.map +1 -1
- package/dist/common/filters/conflict-exception.filter.d.ts +6 -0
- package/dist/common/filters/conflict-exception.filter.js +59 -0
- package/dist/common/filters/conflict-exception.filter.js.map +1 -0
- package/dist/common/filters/global-error.filter.js +1 -4
- package/dist/common/filters/global-error.filter.js.map +1 -1
- package/dist/common/filters/global-filters.d.ts +3 -0
- package/dist/common/filters/global-filters.js +22 -0
- package/dist/common/filters/global-filters.js.map +1 -0
- package/dist/common/filters/unprocessable-entity-exception.filter.d.ts +1 -0
- package/dist/common/filters/unprocessable-entity-exception.filter.js +15 -3
- package/dist/common/filters/unprocessable-entity-exception.filter.js.map +1 -1
- package/dist/common/utils/transform.utils.js +3 -0
- package/dist/common/utils/transform.utils.js.map +1 -1
- package/dist/dataSource.js +1 -0
- package/dist/dataSource.js.map +1 -1
- package/dist/main.js +2 -7
- package/dist/main.js.map +1 -1
- package/dist/migrations/1000000000026-AddHardwareInputCategories.d.ts +7 -0
- package/dist/migrations/1000000000026-AddHardwareInputCategories.js +364 -0
- package/dist/migrations/1000000000026-AddHardwareInputCategories.js.map +1 -0
- package/dist/modules/devices/controllers/channels.controller.d.ts +5 -1
- package/dist/modules/devices/controllers/channels.controller.js +34 -2
- package/dist/modules/devices/controllers/channels.controller.js.map +1 -1
- package/dist/modules/devices/controllers/channels.properties.controller.js +21 -4
- package/dist/modules/devices/controllers/channels.properties.controller.js.map +1 -1
- package/dist/modules/devices/controllers/devices.channels.controller.d.ts +5 -1
- package/dist/modules/devices/controllers/devices.channels.controller.js +38 -2
- package/dist/modules/devices/controllers/devices.channels.controller.js.map +1 -1
- package/dist/modules/devices/controllers/devices.channels.properties.controller.js +21 -4
- package/dist/modules/devices/controllers/devices.channels.properties.controller.js.map +1 -1
- package/dist/modules/devices/devices.constants.d.ts +6 -0
- package/dist/modules/devices/devices.constants.js +6 -0
- package/dist/modules/devices/devices.constants.js.map +1 -1
- package/dist/modules/devices/devices.module.js +18 -0
- package/dist/modules/devices/devices.module.js.map +1 -1
- package/dist/modules/devices/devices.openapi.d.ts +3 -1
- package/dist/modules/devices/devices.openapi.js +7 -0
- package/dist/modules/devices/devices.openapi.js.map +1 -1
- package/dist/modules/devices/dto/channel-input-occurrence.dto.d.ts +10 -0
- package/dist/modules/devices/dto/channel-input-occurrence.dto.js +99 -0
- package/dist/modules/devices/dto/channel-input-occurrence.dto.js.map +1 -0
- package/dist/modules/devices/models/channel-input-capabilities.model.d.ts +20 -0
- package/dist/modules/devices/models/channel-input-capabilities.model.js +111 -0
- package/dist/modules/devices/models/channel-input-capabilities.model.js.map +1 -0
- package/dist/modules/devices/models/channel-input-occurrence.model.d.ts +22 -0
- package/dist/modules/devices/models/channel-input-occurrence.model.js +154 -0
- package/dist/modules/devices/models/channel-input-occurrence.model.js.map +1 -0
- package/dist/modules/devices/services/channel-input-deduplication.service.d.ts +17 -0
- package/dist/modules/devices/services/channel-input-deduplication.service.js +88 -0
- package/dist/modules/devices/services/channel-input-deduplication.service.js.map +1 -0
- package/dist/modules/devices/services/channel-input-occurrences.service.d.ts +21 -0
- package/dist/modules/devices/services/channel-input-occurrences.service.js +163 -0
- package/dist/modules/devices/services/channel-input-occurrences.service.js.map +1 -0
- package/dist/modules/devices/services/channels.properties.service.d.ts +27 -3
- package/dist/modules/devices/services/channels.properties.service.js +304 -28
- package/dist/modules/devices/services/channels.properties.service.js.map +1 -1
- package/dist/modules/devices/services/channels.service.js +42 -38
- package/dist/modules/devices/services/channels.service.js.map +1 -1
- package/dist/modules/devices/services/command-latency-trace-collector.service.d.ts +101 -0
- package/dist/modules/devices/services/command-latency-trace-collector.service.js +451 -0
- package/dist/modules/devices/services/command-latency-trace-collector.service.js.map +1 -0
- package/dist/modules/devices/services/device-structure-lock.service.d.ts +10 -2
- package/dist/modules/devices/services/device-structure-lock.service.js +86 -7
- package/dist/modules/devices/services/device-structure-lock.service.js.map +1 -1
- package/dist/modules/devices/services/devices.service.js +37 -33
- package/dist/modules/devices/services/devices.service.js.map +1 -1
- package/dist/modules/devices/services/module-reset.service.d.ts +3 -1
- package/dist/modules/devices/services/module-reset.service.js +21 -16
- package/dist/modules/devices/services/module-reset.service.js.map +1 -1
- package/dist/modules/devices/services/property-command-dispatch.service.d.ts +45 -0
- package/dist/modules/devices/services/property-command-dispatch.service.js +227 -0
- package/dist/modules/devices/services/property-command-dispatch.service.js.map +1 -0
- package/dist/modules/devices/services/property-command-window.service.d.ts +71 -0
- package/dist/modules/devices/services/property-command-window.service.js +204 -0
- package/dist/modules/devices/services/property-command-window.service.js.map +1 -0
- package/dist/modules/devices/services/property-command.service.d.ts +20 -3
- package/dist/modules/devices/services/property-command.service.js +56 -10
- package/dist/modules/devices/services/property-command.service.js.map +1 -1
- package/dist/modules/devices/services/property-state-coordinator.service.d.ts +4 -0
- package/dist/modules/devices/services/property-state-coordinator.service.js +35 -0
- package/dist/modules/devices/services/property-state-coordinator.service.js.map +1 -0
- package/dist/modules/devices/services/property-value.service.d.ts +1 -0
- package/dist/modules/devices/services/property-value.service.js +4 -0
- package/dist/modules/devices/services/property-value.service.js.map +1 -1
- package/dist/modules/devices/utils/schema.utils.js +1 -1
- package/dist/modules/devices/utils/schema.utils.js.map +1 -1
- package/dist/modules/platform/services/platform.service.d.ts +13 -4
- package/dist/modules/platform/services/platform.service.js +57 -35
- package/dist/modules/platform/services/platform.service.js.map +1 -1
- package/dist/modules/remote-access/dto/update-config.dto.js +5 -0
- package/dist/modules/remote-access/dto/update-config.dto.js.map +1 -1
- package/dist/modules/remote-access/validators/is-remote-access-url.validator.js +5 -2
- package/dist/modules/remote-access/validators/is-remote-access-url.validator.js.map +1 -1
- package/dist/modules/system/scripts/update-worker.sh +668 -59
- package/dist/modules/system/services/privileged-worker.service.d.ts +10 -0
- package/dist/modules/system/services/privileged-worker.service.js +137 -11
- package/dist/modules/system/services/privileged-worker.service.js.map +1 -1
- package/dist/modules/system/services/update-executor.service.d.ts +20 -2
- package/dist/modules/system/services/update-executor.service.js +256 -25
- package/dist/modules/system/services/update-executor.service.js.map +1 -1
- package/dist/modules/websocket/gateway/websocket.gateway.d.ts +4 -1
- package/dist/modules/websocket/gateway/websocket.gateway.js +28 -5
- package/dist/modules/websocket/gateway/websocket.gateway.js.map +1 -1
- package/dist/modules/websocket/services/command-acknowledgement-trace.service.d.ts +143 -0
- package/dist/modules/websocket/services/command-acknowledgement-trace.service.js +523 -0
- package/dist/modules/websocket/services/command-acknowledgement-trace.service.js.map +1 -0
- package/dist/modules/websocket/websocket.module.js +9 -1
- package/dist/modules/websocket/websocket.module.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.d.ts +6 -1
- package/dist/plugins/devices-home-assistant/devices-home-assistant.plugin.js +16 -1
- package/dist/plugins/devices-home-assistant/devices-home-assistant.plugin.js.map +1 -1
- package/dist/plugins/devices-home-assistant/dto/mapping-preview.dto.d.ts +1 -0
- package/dist/plugins/devices-home-assistant/dto/mapping-preview.dto.js +11 -0
- package/dist/plugins/devices-home-assistant/dto/mapping-preview.dto.js.map +1 -1
- package/dist/plugins/devices-home-assistant/mappers/button.entity.mapper.service.d.ts +19 -0
- package/dist/plugins/devices-home-assistant/mappers/button.entity.mapper.service.js +51 -0
- package/dist/plugins/devices-home-assistant/mappers/button.entity.mapper.service.js.map +1 -0
- package/dist/plugins/devices-home-assistant/mappings/definitions/entity-mappings.yaml +56 -7
- package/dist/plugins/devices-home-assistant/models/mapping-preview.model.d.ts +1 -0
- package/dist/plugins/devices-home-assistant/models/mapping-preview.model.js +11 -0
- package/dist/plugins/devices-home-assistant/models/mapping-preview.model.js.map +1 -1
- package/dist/plugins/devices-home-assistant/services/device-adoption.service.js +17 -0
- package/dist/plugins/devices-home-assistant/services/device-adoption.service.js.map +1 -1
- package/dist/plugins/devices-home-assistant/services/home-assistant-raw-event.service.d.ts +27 -0
- package/dist/plugins/devices-home-assistant/services/home-assistant-raw-event.service.js +271 -0
- package/dist/plugins/devices-home-assistant/services/home-assistant-raw-event.service.js.map +1 -0
- package/dist/plugins/devices-home-assistant/services/home-assistant.ws.service.d.ts +2 -2
- package/dist/plugins/devices-home-assistant/services/home-assistant.ws.service.js +33 -14
- package/dist/plugins/devices-home-assistant/services/home-assistant.ws.service.js.map +1 -1
- package/dist/plugins/devices-home-assistant/services/mapping-preview.service.js +24 -4
- package/dist/plugins/devices-home-assistant/services/mapping-preview.service.js.map +1 -1
- package/dist/plugins/devices-home-assistant/services/state-changed.event.service.d.ts +4 -1
- package/dist/plugins/devices-home-assistant/services/state-changed.event.service.js +84 -5
- package/dist/plugins/devices-home-assistant/services/state-changed.event.service.js.map +1 -1
- package/dist/plugins/devices-home-assistant/services/wizard.service.js +1 -0
- package/dist/plugins/devices-home-assistant/services/wizard.service.js.map +1 -1
- package/dist/plugins/devices-home-assistant/utils/ha-event.utils.d.ts +2 -0
- package/dist/plugins/devices-home-assistant/utils/ha-event.utils.js +50 -0
- package/dist/plugins/devices-home-assistant/utils/ha-event.utils.js.map +1 -0
- package/dist/plugins/devices-homekit/listeners/homekit-event.listener.d.ts +2 -0
- package/dist/plugins/devices-homekit/listeners/homekit-event.listener.js +28 -1
- package/dist/plugins/devices-homekit/listeners/homekit-event.listener.js.map +1 -1
- package/dist/plugins/devices-homekit/mappers/base.mapper.js +27 -4
- package/dist/plugins/devices-homekit/mappers/base.mapper.js.map +1 -1
- package/dist/plugins/devices-homekit/mappers/button.mapper.d.ts +15 -0
- package/dist/plugins/devices-homekit/mappers/button.mapper.js +143 -0
- package/dist/plugins/devices-homekit/mappers/button.mapper.js.map +1 -0
- package/dist/plugins/devices-homekit/mappers/homekit-mapper.interface.d.ts +16 -0
- package/dist/plugins/devices-homekit/mappers/thermostat-coordinator.d.ts +7 -0
- package/dist/plugins/devices-homekit/mappers/thermostat-coordinator.js +84 -73
- package/dist/plugins/devices-homekit/mappers/thermostat-coordinator.js.map +1 -1
- package/dist/plugins/devices-homekit/services/homekit-mapper-registry.service.d.ts +5 -1
- package/dist/plugins/devices-homekit/services/homekit-mapper-registry.service.js +42 -0
- package/dist/plugins/devices-homekit/services/homekit-mapper-registry.service.js.map +1 -1
- package/dist/plugins/devices-homey/mappings/definitions/channels.yaml +50 -0
- package/dist/plugins/devices-homey/mappings/definitions/devices.yaml +18 -0
- package/dist/plugins/devices-homey/mappings/definitions/properties.yaml +55 -0
- package/dist/plugins/devices-homey/mappings/device-support.js +10 -0
- package/dist/plugins/devices-homey/mappings/device-support.js.map +1 -1
- package/dist/plugins/devices-homey/mappings/mapping-loader.service.d.ts +1 -0
- package/dist/plugins/devices-homey/mappings/mapping-loader.service.js +66 -8
- package/dist/plugins/devices-homey/mappings/mapping-loader.service.js.map +1 -1
- package/dist/plugins/devices-homey/models/inventory.model.d.ts +2 -1
- package/dist/plugins/devices-homey/models/inventory.model.js +1 -0
- package/dist/plugins/devices-homey/models/inventory.model.js.map +1 -1
- package/dist/plugins/devices-homey/models/mapping-preview.model.d.ts +1 -0
- package/dist/plugins/devices-homey/models/mapping-preview.model.js +1 -0
- package/dist/plugins/devices-homey/models/mapping-preview.model.js.map +1 -1
- package/dist/plugins/devices-homey/services/homey-mapping-preview.service.js +7 -0
- package/dist/plugins/devices-homey/services/homey-mapping-preview.service.js.map +1 -1
- package/dist/plugins/devices-homey/services/homey-synchronizer.service.d.ts +3 -1
- package/dist/plugins/devices-homey/services/homey-synchronizer.service.js +37 -6
- package/dist/plugins/devices-homey/services/homey-synchronizer.service.js.map +1 -1
- package/dist/plugins/devices-reterminal/services/reterminal-button.service.d.ts +7 -3
- package/dist/plugins/devices-reterminal/services/reterminal-button.service.js +63 -17
- package/dist/plugins/devices-reterminal/services/reterminal-button.service.js.map +1 -1
- package/dist/plugins/devices-shelly-ng/delegates/delegates-manager.service.d.ts +38 -3
- package/dist/plugins/devices-shelly-ng/delegates/delegates-manager.service.js +840 -134
- 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 +15 -1
- package/dist/plugins/devices-shelly-ng/delegates/shelly-device.delegate.js +117 -10
- package/dist/plugins/devices-shelly-ng/delegates/shelly-device.delegate.js.map +1 -1
- package/dist/plugins/devices-shelly-ng/devices-shelly-ng.constants.js +11 -13
- package/dist/plugins/devices-shelly-ng/devices-shelly-ng.constants.js.map +1 -1
- package/dist/plugins/devices-shelly-ng/devices-shelly-ng.plugin.js +2 -0
- package/dist/plugins/devices-shelly-ng/devices-shelly-ng.plugin.js.map +1 -1
- package/dist/plugins/devices-shelly-ng/mappings/definitions/inputs.yaml +80 -0
- package/dist/plugins/devices-shelly-ng/mappings/mapping-loader.service.js +11 -1
- package/dist/plugins/devices-shelly-ng/mappings/mapping-loader.service.js.map +1 -1
- package/dist/plugins/devices-shelly-ng/mappings/mapping.types.d.ts +6 -3
- package/dist/plugins/devices-shelly-ng/mappings/schema/mapping-schema.json +5 -0
- package/dist/plugins/devices-shelly-ng/services/device-manager.service.js +130 -7
- package/dist/plugins/devices-shelly-ng/services/device-manager.service.js.map +1 -1
- package/dist/plugins/devices-shelly-ng/services/poll-placement-diagnostics.service.d.ts +48 -0
- package/dist/plugins/devices-shelly-ng/services/poll-placement-diagnostics.service.js +457 -0
- package/dist/plugins/devices-shelly-ng/services/poll-placement-diagnostics.service.js.map +1 -0
- package/dist/plugins/devices-shelly-ng/services/shelly-ng.service.d.ts +12 -2
- package/dist/plugins/devices-shelly-ng/services/shelly-ng.service.js +86 -28
- 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.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 +1 -1
- package/dist/plugins/devices-shelly-ng/services/shelly-ws-server.service.js +18 -13
- package/dist/plugins/devices-shelly-ng/services/shelly-ws-server.service.js.map +1 -1
- package/dist/plugins/devices-shelly-ng/utils/transform.utils.d.ts +2 -0
- package/dist/plugins/devices-shelly-ng/utils/transform.utils.js +14 -1
- package/dist/plugins/devices-shelly-ng/utils/transform.utils.js.map +1 -1
- package/dist/plugins/devices-shelly-v1/devices-shelly-v1.constants.d.ts +2 -0
- package/dist/plugins/devices-shelly-v1/devices-shelly-v1.constants.js +66 -4
- package/dist/plugins/devices-shelly-v1/devices-shelly-v1.constants.js.map +1 -1
- package/dist/plugins/devices-shelly-v1/devices-shelly-v1.plugin.js +2 -0
- package/dist/plugins/devices-shelly-v1/devices-shelly-v1.plugin.js.map +1 -1
- package/dist/plugins/devices-shelly-v1/platforms/shelly-v1.device.platform.js +7 -0
- package/dist/plugins/devices-shelly-v1/platforms/shelly-v1.device.platform.js.map +1 -1
- package/dist/plugins/devices-shelly-v1/services/device-mapper.service.d.ts +3 -1
- package/dist/plugins/devices-shelly-v1/services/device-mapper.service.js +20 -2
- package/dist/plugins/devices-shelly-v1/services/device-mapper.service.js.map +1 -1
- package/dist/plugins/devices-shelly-v1/services/shelly-v1-input-tracker.service.d.ts +16 -0
- package/dist/plugins/devices-shelly-v1/services/shelly-v1-input-tracker.service.js +107 -0
- package/dist/plugins/devices-shelly-v1/services/shelly-v1-input-tracker.service.js.map +1 -0
- package/dist/plugins/devices-shelly-v1/services/shelly-v1.service.d.ts +7 -1
- package/dist/plugins/devices-shelly-v1/services/shelly-v1.service.js +98 -3
- package/dist/plugins/devices-shelly-v1/services/shelly-v1.service.js.map +1 -1
- package/dist/plugins/devices-third-party/controllers/third-party-inputs.controller.d.ts +17 -0
- package/dist/plugins/devices-third-party/controllers/third-party-inputs.controller.js +205 -0
- package/dist/plugins/devices-third-party/controllers/third-party-inputs.controller.js.map +1 -0
- package/dist/plugins/devices-third-party/devices-third-party.openapi.d.ts +1 -1
- package/dist/plugins/devices-third-party/devices-third-party.plugin.js +2 -1
- package/dist/plugins/devices-third-party/devices-third-party.plugin.js.map +1 -1
- package/dist/plugins/devices-third-party/dto/report-input-occurrence-response.dto.d.ts +5 -0
- package/dist/plugins/devices-third-party/dto/report-input-occurrence-response.dto.js +50 -0
- package/dist/plugins/devices-third-party/dto/report-input-occurrence-response.dto.js.map +1 -0
- package/dist/plugins/devices-third-party/dto/report-input-occurrence.dto.d.ts +8 -0
- package/dist/plugins/devices-third-party/dto/report-input-occurrence.dto.js +81 -0
- package/dist/plugins/devices-third-party/dto/report-input-occurrence.dto.js.map +1 -0
- package/dist/plugins/devices-third-party/platforms/third-party-device.platform.js +19 -4
- package/dist/plugins/devices-third-party/platforms/third-party-device.platform.js.map +1 -1
- package/dist/plugins/devices-virtual/listeners/virtual-projection.listener.d.ts +2 -0
- package/dist/plugins/devices-virtual/listeners/virtual-projection.listener.js +57 -0
- package/dist/plugins/devices-virtual/listeners/virtual-projection.listener.js.map +1 -1
- package/dist/plugins/devices-zigbee2mqtt/devices-zigbee2mqtt.constants.d.ts +3 -0
- package/dist/plugins/devices-zigbee2mqtt/devices-zigbee2mqtt.constants.js +41 -5
- package/dist/plugins/devices-zigbee2mqtt/devices-zigbee2mqtt.constants.js.map +1 -1
- package/dist/plugins/devices-zigbee2mqtt/interfaces/zigbee2mqtt.interface.d.ts +7 -1
- package/dist/plugins/devices-zigbee2mqtt/mappings/config-driven.converter.js +16 -15
- package/dist/plugins/devices-zigbee2mqtt/mappings/config-driven.converter.js.map +1 -1
- package/dist/plugins/devices-zigbee2mqtt/mappings/definitions/remotes.yaml +505 -74
- package/dist/plugins/devices-zigbee2mqtt/mappings/schema/mapping-schema.json +3 -3
- package/dist/plugins/devices-zigbee2mqtt/mappings/transformers/transformer.types.d.ts +1 -1
- package/dist/plugins/devices-zigbee2mqtt/services/base-client-adapter.d.ts +8 -2
- package/dist/plugins/devices-zigbee2mqtt/services/base-client-adapter.js +6 -5
- package/dist/plugins/devices-zigbee2mqtt/services/base-client-adapter.js.map +1 -1
- package/dist/plugins/devices-zigbee2mqtt/services/device-adoption.service.js +18 -11
- package/dist/plugins/devices-zigbee2mqtt/services/device-adoption.service.js.map +1 -1
- package/dist/plugins/devices-zigbee2mqtt/services/device-mapper.service.d.ts +9 -3
- package/dist/plugins/devices-zigbee2mqtt/services/device-mapper.service.js +166 -3
- package/dist/plugins/devices-zigbee2mqtt/services/device-mapper.service.js.map +1 -1
- package/dist/plugins/devices-zigbee2mqtt/services/mqtt-client-adapter.service.js +5 -2
- package/dist/plugins/devices-zigbee2mqtt/services/mqtt-client-adapter.service.js.map +1 -1
- package/dist/plugins/devices-zigbee2mqtt/services/zigbee2mqtt.service.d.ts +1 -0
- package/dist/plugins/devices-zigbee2mqtt/services/zigbee2mqtt.service.js +44 -4
- package/dist/plugins/devices-zigbee2mqtt/services/zigbee2mqtt.service.js.map +1 -1
- package/dist/plugins/remote-access-cloudflare-tunnel/controllers/setup.controller.d.ts +17 -0
- package/dist/plugins/remote-access-cloudflare-tunnel/controllers/setup.controller.js +147 -0
- package/dist/plugins/remote-access-cloudflare-tunnel/controllers/setup.controller.js.map +1 -0
- package/dist/plugins/remote-access-cloudflare-tunnel/controllers/status.controller.d.ts +15 -0
- package/dist/plugins/remote-access-cloudflare-tunnel/controllers/status.controller.js +98 -0
- package/dist/plugins/remote-access-cloudflare-tunnel/controllers/status.controller.js.map +1 -0
- package/dist/plugins/remote-access-cloudflare-tunnel/dto/update-config.dto.d.ts +9 -0
- package/dist/plugins/remote-access-cloudflare-tunnel/dto/update-config.dto.js +94 -0
- package/dist/plugins/remote-access-cloudflare-tunnel/dto/update-config.dto.js.map +1 -0
- package/dist/plugins/remote-access-cloudflare-tunnel/models/config.model.d.ts +9 -0
- package/dist/plugins/remote-access-cloudflare-tunnel/models/config.model.js +92 -0
- package/dist/plugins/remote-access-cloudflare-tunnel/models/config.model.js.map +1 -0
- package/dist/plugins/remote-access-cloudflare-tunnel/models/install.model.d.ts +7 -0
- package/dist/plugins/remote-access-cloudflare-tunnel/models/install.model.js +48 -0
- package/dist/plugins/remote-access-cloudflare-tunnel/models/install.model.js.map +1 -0
- package/dist/plugins/remote-access-cloudflare-tunnel/models/status.model.d.ts +42 -0
- package/dist/plugins/remote-access-cloudflare-tunnel/models/status.model.js +352 -0
- package/dist/plugins/remote-access-cloudflare-tunnel/models/status.model.js.map +1 -0
- package/dist/plugins/remote-access-cloudflare-tunnel/remote-access-cloudflare-tunnel.constants.d.ts +24 -0
- package/dist/plugins/remote-access-cloudflare-tunnel/remote-access-cloudflare-tunnel.constants.js +27 -0
- package/dist/plugins/remote-access-cloudflare-tunnel/remote-access-cloudflare-tunnel.constants.js.map +1 -0
- package/dist/plugins/remote-access-cloudflare-tunnel/remote-access-cloudflare-tunnel.exceptions.d.ts +8 -0
- package/dist/plugins/remote-access-cloudflare-tunnel/remote-access-cloudflare-tunnel.exceptions.js +19 -0
- package/dist/plugins/remote-access-cloudflare-tunnel/remote-access-cloudflare-tunnel.exceptions.js.map +1 -0
- package/dist/plugins/remote-access-cloudflare-tunnel/remote-access-cloudflare-tunnel.openapi.d.ts +4 -0
- package/dist/plugins/remote-access-cloudflare-tunnel/remote-access-cloudflare-tunnel.openapi.js +20 -0
- package/dist/plugins/remote-access-cloudflare-tunnel/remote-access-cloudflare-tunnel.openapi.js.map +1 -0
- package/dist/plugins/remote-access-cloudflare-tunnel/remote-access-cloudflare-tunnel.plugin.d.ts +21 -0
- package/dist/plugins/remote-access-cloudflare-tunnel/remote-access-cloudflare-tunnel.plugin.js +135 -0
- package/dist/plugins/remote-access-cloudflare-tunnel/remote-access-cloudflare-tunnel.plugin.js.map +1 -0
- package/dist/plugins/remote-access-cloudflare-tunnel/scripts/cloudflared-setup.sh +185 -0
- package/dist/plugins/remote-access-cloudflare-tunnel/services/cloudflare-tunnel-managed.service.d.ts +82 -0
- package/dist/plugins/remote-access-cloudflare-tunnel/services/cloudflare-tunnel-managed.service.js +507 -0
- package/dist/plugins/remote-access-cloudflare-tunnel/services/cloudflare-tunnel-managed.service.js.map +1 -0
- package/dist/plugins/remote-access-cloudflare-tunnel/services/cloudflare-tunnel-provider.service.d.ts +10 -0
- package/dist/plugins/remote-access-cloudflare-tunnel/services/cloudflare-tunnel-provider.service.js +37 -0
- package/dist/plugins/remote-access-cloudflare-tunnel/services/cloudflare-tunnel-provider.service.js.map +1 -0
- package/dist/plugins/remote-access-cloudflare-tunnel/services/cloudflare-tunnel-setup.service.d.ts +38 -0
- package/dist/plugins/remote-access-cloudflare-tunnel/services/cloudflare-tunnel-setup.service.js +147 -0
- package/dist/plugins/remote-access-cloudflare-tunnel/services/cloudflare-tunnel-setup.service.js.map +1 -0
- package/dist/plugins/remote-access-cloudflare-tunnel/services/cloudflared-cli.service.d.ts +15 -0
- package/dist/plugins/remote-access-cloudflare-tunnel/services/cloudflared-cli.service.js +67 -0
- package/dist/plugins/remote-access-cloudflare-tunnel/services/cloudflared-cli.service.js.map +1 -0
- package/dist/plugins/remote-access-cloudflare-tunnel/services/cloudflared-metrics.service.d.ts +8 -0
- package/dist/plugins/remote-access-cloudflare-tunnel/services/cloudflared-metrics.service.js +46 -0
- package/dist/plugins/remote-access-cloudflare-tunnel/services/cloudflared-metrics.service.js.map +1 -0
- package/dist/plugins/remote-access-cloudflare-tunnel/services/cloudflared-process.service.d.ts +27 -0
- package/dist/plugins/remote-access-cloudflare-tunnel/services/cloudflared-process.service.js +139 -0
- package/dist/plugins/remote-access-cloudflare-tunnel/services/cloudflared-process.service.js.map +1 -0
- package/dist/plugins/remote-access-tailscale/controllers/setup.controller.d.ts +1 -0
- package/dist/plugins/remote-access-tailscale/controllers/setup.controller.js +26 -10
- package/dist/plugins/remote-access-tailscale/controllers/setup.controller.js.map +1 -1
- package/dist/plugins/remote-access-tailscale/controllers/status.controller.d.ts +6 -1
- package/dist/plugins/remote-access-tailscale/controllers/status.controller.js +28 -3
- package/dist/plugins/remote-access-tailscale/controllers/status.controller.js.map +1 -1
- package/dist/plugins/remote-access-tailscale/models/status.model.d.ts +19 -0
- package/dist/plugins/remote-access-tailscale/models/status.model.js +158 -1
- package/dist/plugins/remote-access-tailscale/models/status.model.js.map +1 -1
- package/dist/plugins/remote-access-tailscale/remote-access-tailscale.constants.d.ts +3 -0
- package/dist/plugins/remote-access-tailscale/remote-access-tailscale.constants.js +4 -1
- package/dist/plugins/remote-access-tailscale/remote-access-tailscale.constants.js.map +1 -1
- package/dist/plugins/remote-access-tailscale/remote-access-tailscale.exceptions.d.ts +13 -0
- package/dist/plugins/remote-access-tailscale/remote-access-tailscale.exceptions.js +27 -0
- package/dist/plugins/remote-access-tailscale/remote-access-tailscale.exceptions.js.map +1 -0
- package/dist/plugins/remote-access-tailscale/remote-access-tailscale.openapi.d.ts +2 -2
- package/dist/plugins/remote-access-tailscale/remote-access-tailscale.openapi.js +2 -0
- package/dist/plugins/remote-access-tailscale/remote-access-tailscale.openapi.js.map +1 -1
- package/dist/plugins/remote-access-tailscale/remote-access-tailscale.plugin.js +1 -1
- package/dist/plugins/remote-access-tailscale/scripts/tailscale-setup.sh +61 -0
- package/dist/plugins/remote-access-tailscale/services/tailscale-cli.service.d.ts +9 -0
- package/dist/plugins/remote-access-tailscale/services/tailscale-cli.service.js +12 -0
- package/dist/plugins/remote-access-tailscale/services/tailscale-cli.service.js.map +1 -1
- package/dist/plugins/remote-access-tailscale/services/tailscale-login.service.d.ts +1 -0
- package/dist/plugins/remote-access-tailscale/services/tailscale-login.service.js +27 -2
- package/dist/plugins/remote-access-tailscale/services/tailscale-login.service.js.map +1 -1
- package/dist/plugins/remote-access-tailscale/services/tailscale-node-managed.service.d.ts +31 -1
- package/dist/plugins/remote-access-tailscale/services/tailscale-node-managed.service.js +316 -30
- package/dist/plugins/remote-access-tailscale/services/tailscale-node-managed.service.js.map +1 -1
- package/dist/plugins/remote-access-tailscale/services/tailscale-serve.service.d.ts +8 -3
- package/dist/plugins/remote-access-tailscale/services/tailscale-serve.service.js +39 -12
- package/dist/plugins/remote-access-tailscale/services/tailscale-serve.service.js.map +1 -1
- package/dist/plugins/remote-access-tailscale/services/tailscale-setup.service.d.ts +14 -5
- package/dist/plugins/remote-access-tailscale/services/tailscale-setup.service.js +51 -16
- package/dist/plugins/remote-access-tailscale/services/tailscale-setup.service.js.map +1 -1
- package/dist/plugins/scenes-local/platforms/local-scene.platform.d.ts +3 -1
- package/dist/plugins/scenes-local/platforms/local-scene.platform.js +12 -7
- package/dist/plugins/scenes-local/platforms/local-scene.platform.js.map +1 -1
- package/dist/plugins/simulator/controllers/simulator.controller.d.ts +8 -2
- package/dist/plugins/simulator/controllers/simulator.controller.js +102 -2
- package/dist/plugins/simulator/controllers/simulator.controller.js.map +1 -1
- package/dist/plugins/simulator/dto/simulate-occurrence.dto.d.ts +12 -0
- package/dist/plugins/simulator/dto/simulate-occurrence.dto.js +122 -0
- package/dist/plugins/simulator/dto/simulate-occurrence.dto.js.map +1 -0
- package/dist/plugins/simulator/models/simulator-response.model.d.ts +12 -0
- package/dist/plugins/simulator/models/simulator-response.model.js +84 -1
- package/dist/plugins/simulator/models/simulator-response.model.js.map +1 -1
- package/dist/plugins/simulator/scenarios/definitions/small-apartment.yaml +78 -0
- package/dist/plugins/simulator/services/scenario-executor.service.js +3 -1
- package/dist/plugins/simulator/services/scenario-executor.service.js.map +1 -1
- package/dist/plugins/simulator/services/simulation.service.js +10 -1
- package/dist/plugins/simulator/services/simulation.service.js.map +1 -1
- package/dist/plugins/simulator/simulator.openapi.d.ts +3 -2
- package/dist/plugins/simulator/simulator.openapi.js +5 -0
- package/dist/plugins/simulator/simulator.openapi.js.map +1 -1
- package/dist/plugins/simulator/simulators/device-simulator.interface.d.ts +2 -0
- package/dist/plugins/simulator/simulators/device-simulator.interface.js +83 -0
- package/dist/plugins/simulator/simulators/device-simulator.interface.js.map +1 -1
- package/dist/plugins/simulator/simulators/index.d.ts +1 -0
- package/dist/plugins/simulator/simulators/index.js +1 -0
- package/dist/plugins/simulator/simulators/index.js.map +1 -1
- package/dist/plugins/simulator/simulators/input-controller.simulator.d.ts +10 -0
- package/dist/plugins/simulator/simulators/input-controller.simulator.js +57 -0
- package/dist/plugins/simulator/simulators/input-controller.simulator.js.map +1 -0
- package/dist/plugins/simulator/simulators/lighting.simulator.js +1 -0
- package/dist/plugins/simulator/simulators/lighting.simulator.js.map +1 -1
- package/dist/plugins/spaces-home-control/services/climate-intent.service.d.ts +3 -1
- package/dist/plugins/spaces-home-control/services/climate-intent.service.js +6 -3
- package/dist/plugins/spaces-home-control/services/climate-intent.service.js.map +1 -1
- package/dist/plugins/spaces-home-control/services/covers-intent.service.d.ts +3 -1
- package/dist/plugins/spaces-home-control/services/covers-intent.service.js +6 -3
- package/dist/plugins/spaces-home-control/services/covers-intent.service.js.map +1 -1
- package/dist/plugins/spaces-home-control/services/lighting-intent.service.d.ts +3 -1
- package/dist/plugins/spaces-home-control/services/lighting-intent.service.js +7 -4
- package/dist/plugins/spaces-home-control/services/lighting-intent.service.js.map +1 -1
- package/dist/plugins/spaces-home-control/services/space-media-activity.service.d.ts +3 -1
- package/dist/plugins/spaces-home-control/services/space-media-activity.service.js +11 -5
- package/dist/plugins/spaces-home-control/services/space-media-activity.service.js.map +1 -1
- package/dist/plugins/spaces-home-control/services/space-undo-history.service.d.ts +3 -1
- package/dist/plugins/spaces-home-control/services/space-undo-history.service.js +8 -5
- package/dist/plugins/spaces-home-control/services/space-undo-history.service.js.map +1 -1
- package/dist/spec/channels.d.ts +51 -1
- package/dist/spec/channels.js +64 -1
- package/dist/spec/channels.js.map +1 -1
- package/dist/spec/devices.d.ts +155 -2
- package/dist/spec/devices.js +161 -2
- package/dist/spec/devices.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +2 -2
package/dist/plugins/remote-access-cloudflare-tunnel/services/cloudflare-tunnel-setup.service.js
ADDED
|
@@ -0,0 +1,147 @@
|
|
|
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.CloudflareTunnelSetupService = exports.CloudflareTunnelSetupUnavailableException = void 0;
|
|
13
|
+
const fs_1 = require("fs");
|
|
14
|
+
const path_1 = require("path");
|
|
15
|
+
const common_1 = require("@nestjs/common");
|
|
16
|
+
const config_1 = require("@nestjs/config");
|
|
17
|
+
const event_emitter_1 = require("@nestjs/event-emitter");
|
|
18
|
+
const logger_1 = require("../../../common/logger");
|
|
19
|
+
const config_utils_1 = require("../../../common/utils/config.utils");
|
|
20
|
+
const config_service_1 = require("../../../modules/config/services/config.service");
|
|
21
|
+
const managed_service_manager_service_1 = require("../../../modules/extensions/services/managed-service-manager.service");
|
|
22
|
+
const platform_service_1 = require("../../../modules/platform/services/platform.service");
|
|
23
|
+
const remote_access_constants_1 = require("../../../modules/remote-access/remote-access.constants");
|
|
24
|
+
const privileged_worker_service_1 = require("../../../modules/system/services/privileged-worker.service");
|
|
25
|
+
const remote_access_cloudflare_tunnel_constants_1 = require("../remote-access-cloudflare-tunnel.constants");
|
|
26
|
+
const remote_access_cloudflare_tunnel_exceptions_1 = require("../remote-access-cloudflare-tunnel.exceptions");
|
|
27
|
+
Object.defineProperty(exports, "CloudflareTunnelSetupUnavailableException", { enumerable: true, get: function () { return remote_access_cloudflare_tunnel_exceptions_1.CloudflareTunnelSetupUnavailableException; } });
|
|
28
|
+
const cloudflare_tunnel_managed_service_1 = require("./cloudflare-tunnel-managed.service");
|
|
29
|
+
let CloudflareTunnelSetupService = class CloudflareTunnelSetupService {
|
|
30
|
+
constructor(privilegedWorker, nestConfigService, tunnelManagedService, eventEmitter, platformService, configService, managedServiceManager) {
|
|
31
|
+
this.privilegedWorker = privilegedWorker;
|
|
32
|
+
this.nestConfigService = nestConfigService;
|
|
33
|
+
this.tunnelManagedService = tunnelManagedService;
|
|
34
|
+
this.eventEmitter = eventEmitter;
|
|
35
|
+
this.platformService = platformService;
|
|
36
|
+
this.configService = configService;
|
|
37
|
+
this.managedServiceManager = managedServiceManager;
|
|
38
|
+
this.logger = (0, logger_1.createExtensionLogger)(remote_access_cloudflare_tunnel_constants_1.REMOTE_ACCESS_CLOUDFLARE_TUNNEL_PLUGIN_NAME, 'CloudflareTunnelSetupService');
|
|
39
|
+
this.lastJob = null;
|
|
40
|
+
}
|
|
41
|
+
async install() {
|
|
42
|
+
const privilegedWorkerSupport = await this.platformService.getPrivilegedWorkerSupport();
|
|
43
|
+
if (!privilegedWorkerSupport.supported) {
|
|
44
|
+
if (!this.platformService.isPlatformCapableOfPrivilegedWorkers()) {
|
|
45
|
+
throw new remote_access_cloudflare_tunnel_exceptions_1.CloudflareTunnelSetupUnavailableException(`Cloudflare Tunnel setup requires a platform with privileged-worker support; the '${this.platformService.getPlatformType()}' platform does not have it.`, 'platform-unsupported');
|
|
46
|
+
}
|
|
47
|
+
const reason = privilegedWorkerSupport.reason ?? 'Privileged jobs are currently unavailable on this installation.';
|
|
48
|
+
throw new remote_access_cloudflare_tunnel_exceptions_1.CloudflareTunnelSetupUnavailableException(`${reason} Re-run \`sudo smart-panel-service install\`, or add the sudoers grant from the installation guide.`, 'privileged-worker-unavailable');
|
|
49
|
+
}
|
|
50
|
+
const dataDir = (0, config_utils_1.getEnvValue)(this.nestConfigService, 'FB_DATA_DIR', '/var/lib/smart-panel');
|
|
51
|
+
const remoteAccessDir = (0, path_1.join)(dataDir, remote_access_cloudflare_tunnel_constants_1.CLOUDFLARE_TUNNEL_DATA_SUBDIR);
|
|
52
|
+
this.ensureDir(remoteAccessDir);
|
|
53
|
+
const statusFile = (0, path_1.join)(remoteAccessDir, remote_access_cloudflare_tunnel_constants_1.CLOUDFLARE_TUNNEL_SETUP_STATUS_FILENAME);
|
|
54
|
+
const script = (0, path_1.join)(__dirname, '..', 'scripts', 'cloudflared-setup.sh');
|
|
55
|
+
if (!(0, fs_1.existsSync)(script)) {
|
|
56
|
+
throw new Error(`Cloudflare Tunnel setup script not found at ${script}`);
|
|
57
|
+
}
|
|
58
|
+
const { id } = await this.privilegedWorker.run({
|
|
59
|
+
unit: remote_access_cloudflare_tunnel_constants_1.CLOUDFLARE_TUNNEL_SETUP_WORKER_UNIT,
|
|
60
|
+
script,
|
|
61
|
+
args: [],
|
|
62
|
+
env: {
|
|
63
|
+
STATUS_FILE: statusFile,
|
|
64
|
+
HOME: process.env.HOME ?? '/root',
|
|
65
|
+
PATH: process.env.PATH ?? '/usr/local/bin:/usr/bin:/bin',
|
|
66
|
+
},
|
|
67
|
+
statusFile,
|
|
68
|
+
});
|
|
69
|
+
this.logger.log(`Cloudflare Tunnel setup job spawned (job: ${id})`);
|
|
70
|
+
const initialStatus = this.privilegedWorker.getStatus(id) ?? {
|
|
71
|
+
id,
|
|
72
|
+
state: 'running',
|
|
73
|
+
updatedAt: new Date().toISOString(),
|
|
74
|
+
};
|
|
75
|
+
this.lastJob = { id, status: initialStatus };
|
|
76
|
+
this.watchJob(id);
|
|
77
|
+
return { id };
|
|
78
|
+
}
|
|
79
|
+
getLastJob() {
|
|
80
|
+
return this.lastJob;
|
|
81
|
+
}
|
|
82
|
+
watchJob(id) {
|
|
83
|
+
const unsubscribe = this.privilegedWorker.onStatus(id, (status) => {
|
|
84
|
+
this.lastJob = { id, status };
|
|
85
|
+
const event = {
|
|
86
|
+
type: remote_access_cloudflare_tunnel_constants_1.REMOTE_ACCESS_CLOUDFLARE_TUNNEL_PLUGIN_NAME,
|
|
87
|
+
job: id,
|
|
88
|
+
step: status.step,
|
|
89
|
+
state: status.state,
|
|
90
|
+
message: status.message,
|
|
91
|
+
};
|
|
92
|
+
this.eventEmitter.emit(remote_access_constants_1.EventType.SETUP_PROGRESS, event);
|
|
93
|
+
if (status.state === 'running') {
|
|
94
|
+
return;
|
|
95
|
+
}
|
|
96
|
+
if (status.state === 'complete') {
|
|
97
|
+
this.logger.log(`Cloudflare Tunnel setup job completed (job: ${id})`);
|
|
98
|
+
void this.onSetupComplete();
|
|
99
|
+
}
|
|
100
|
+
else {
|
|
101
|
+
this.logger.error(`Cloudflare Tunnel setup job did not complete (job: ${id}, state: ${status.state})`, {
|
|
102
|
+
step: status.step,
|
|
103
|
+
message: status.message,
|
|
104
|
+
});
|
|
105
|
+
}
|
|
106
|
+
unsubscribe();
|
|
107
|
+
});
|
|
108
|
+
}
|
|
109
|
+
async onSetupComplete() {
|
|
110
|
+
try {
|
|
111
|
+
await this.tunnelManagedService.refreshRequirements();
|
|
112
|
+
}
|
|
113
|
+
catch (error) {
|
|
114
|
+
this.logger.warn('Failed to refresh Cloudflare Tunnel requirements after setup', {
|
|
115
|
+
message: error instanceof Error ? error.message : String(error),
|
|
116
|
+
});
|
|
117
|
+
}
|
|
118
|
+
try {
|
|
119
|
+
const pluginConfig = this.configService.getPluginConfig(remote_access_cloudflare_tunnel_constants_1.REMOTE_ACCESS_CLOUDFLARE_TUNNEL_PLUGIN_NAME);
|
|
120
|
+
if (pluginConfig.enabled) {
|
|
121
|
+
await this.managedServiceManager.restartService('plugin', remote_access_cloudflare_tunnel_constants_1.REMOTE_ACCESS_CLOUDFLARE_TUNNEL_PLUGIN_NAME, 'tunnel');
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
catch (error) {
|
|
125
|
+
this.logger.warn('Failed to restart the Cloudflare Tunnel service after setup', {
|
|
126
|
+
message: error instanceof Error ? error.message : String(error),
|
|
127
|
+
});
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
ensureDir(dir) {
|
|
131
|
+
if (!(0, fs_1.existsSync)(dir)) {
|
|
132
|
+
(0, fs_1.mkdirSync)(dir, { recursive: true, mode: 0o700 });
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
};
|
|
136
|
+
exports.CloudflareTunnelSetupService = CloudflareTunnelSetupService;
|
|
137
|
+
exports.CloudflareTunnelSetupService = CloudflareTunnelSetupService = __decorate([
|
|
138
|
+
(0, common_1.Injectable)(),
|
|
139
|
+
__metadata("design:paramtypes", [privileged_worker_service_1.PrivilegedWorkerService,
|
|
140
|
+
config_1.ConfigService,
|
|
141
|
+
cloudflare_tunnel_managed_service_1.CloudflareTunnelManagedService,
|
|
142
|
+
event_emitter_1.EventEmitter2,
|
|
143
|
+
platform_service_1.PlatformService,
|
|
144
|
+
config_service_1.ConfigService,
|
|
145
|
+
managed_service_manager_service_1.ManagedServiceManagerService])
|
|
146
|
+
], CloudflareTunnelSetupService);
|
|
147
|
+
//# sourceMappingURL=cloudflare-tunnel-setup.service.js.map
|
package/dist/plugins/remote-access-cloudflare-tunnel/services/cloudflare-tunnel-setup.service.js.map
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cloudflare-tunnel-setup.service.js","sourceRoot":"","sources":["../../../../src/plugins/remote-access-cloudflare-tunnel/services/cloudflare-tunnel-setup.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
export type CloudflaredCliErrorKind = 'not-installed' | 'unknown';
|
|
2
|
+
export declare class CloudflaredCliError extends Error {
|
|
3
|
+
readonly kind: CloudflaredCliErrorKind;
|
|
4
|
+
readonly cause?: unknown;
|
|
5
|
+
constructor(kind: CloudflaredCliErrorKind, message: string, cause?: unknown);
|
|
6
|
+
}
|
|
7
|
+
export interface CloudflaredVersionInfo {
|
|
8
|
+
version: string;
|
|
9
|
+
raw: string;
|
|
10
|
+
}
|
|
11
|
+
export declare class CloudflaredCliService {
|
|
12
|
+
private readonly logger;
|
|
13
|
+
getVersion(): Promise<CloudflaredVersionInfo>;
|
|
14
|
+
private exec;
|
|
15
|
+
}
|
|
@@ -0,0 +1,67 @@
|
|
|
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
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
|
+
exports.CloudflaredCliService = exports.CloudflaredCliError = void 0;
|
|
10
|
+
const node_child_process_1 = require("node:child_process");
|
|
11
|
+
const common_1 = require("@nestjs/common");
|
|
12
|
+
const logger_1 = require("../../../common/logger");
|
|
13
|
+
const remote_access_cloudflare_tunnel_constants_1 = require("../remote-access-cloudflare-tunnel.constants");
|
|
14
|
+
class CloudflaredCliError extends Error {
|
|
15
|
+
constructor(kind, message, cause) {
|
|
16
|
+
super(message);
|
|
17
|
+
this.kind = kind;
|
|
18
|
+
this.cause = cause;
|
|
19
|
+
this.name = 'CloudflaredCliError';
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
exports.CloudflaredCliError = CloudflaredCliError;
|
|
23
|
+
const VERSION_PATTERN = /(\d+\.\d+\.\d+)/;
|
|
24
|
+
let CloudflaredCliService = class CloudflaredCliService {
|
|
25
|
+
constructor() {
|
|
26
|
+
this.logger = (0, logger_1.createExtensionLogger)(remote_access_cloudflare_tunnel_constants_1.REMOTE_ACCESS_CLOUDFLARE_TUNNEL_PLUGIN_NAME, 'CloudflaredCliService');
|
|
27
|
+
}
|
|
28
|
+
async getVersion() {
|
|
29
|
+
const { stdout, stderr, exitCode } = await this.exec(['--version']);
|
|
30
|
+
if (exitCode !== 0) {
|
|
31
|
+
const detail = stderr.trim() || stdout.trim();
|
|
32
|
+
throw new CloudflaredCliError('unknown', `cloudflared --version exited with code ${exitCode}${detail ? `: ${detail}` : ''}`);
|
|
33
|
+
}
|
|
34
|
+
const match = VERSION_PATTERN.exec(stdout);
|
|
35
|
+
if (!match) {
|
|
36
|
+
throw new CloudflaredCliError('unknown', '`cloudflared --version` did not include a recognizable version number.');
|
|
37
|
+
}
|
|
38
|
+
return { version: match[1], raw: stdout.trim() };
|
|
39
|
+
}
|
|
40
|
+
exec(args) {
|
|
41
|
+
const argv = [...args];
|
|
42
|
+
this.logger.debug(`Running: ${remote_access_cloudflare_tunnel_constants_1.CLOUDFLARED_BINARY} ${argv.join(' ')}`);
|
|
43
|
+
return new Promise((resolve, reject) => {
|
|
44
|
+
(0, node_child_process_1.execFile)(remote_access_cloudflare_tunnel_constants_1.CLOUDFLARED_BINARY, argv, { timeout: remote_access_cloudflare_tunnel_constants_1.CLOUDFLARED_CLI_DEFAULT_TIMEOUT_MS }, (error, stdout, stderr) => {
|
|
45
|
+
const out = stdout ?? '';
|
|
46
|
+
const err = stderr ?? '';
|
|
47
|
+
if (error) {
|
|
48
|
+
const nodeError = error;
|
|
49
|
+
if (nodeError.code === 'ENOENT') {
|
|
50
|
+
this.logger.warn(`cloudflared binary not found: ${remote_access_cloudflare_tunnel_constants_1.CLOUDFLARED_BINARY} ${argv.join(' ')}`);
|
|
51
|
+
reject(new CloudflaredCliError('not-installed', 'The cloudflared CLI is not installed or not on PATH.', error));
|
|
52
|
+
return;
|
|
53
|
+
}
|
|
54
|
+
const exitCode = typeof nodeError.code === 'number' ? nodeError.code : -1;
|
|
55
|
+
resolve({ stdout: out, stderr: err, exitCode });
|
|
56
|
+
return;
|
|
57
|
+
}
|
|
58
|
+
resolve({ stdout: out, stderr: err, exitCode: 0 });
|
|
59
|
+
});
|
|
60
|
+
});
|
|
61
|
+
}
|
|
62
|
+
};
|
|
63
|
+
exports.CloudflaredCliService = CloudflaredCliService;
|
|
64
|
+
exports.CloudflaredCliService = CloudflaredCliService = __decorate([
|
|
65
|
+
(0, common_1.Injectable)()
|
|
66
|
+
], CloudflaredCliService);
|
|
67
|
+
//# sourceMappingURL=cloudflared-cli.service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cloudflared-cli.service.js","sourceRoot":"","sources":["../../../../src/plugins/remote-access-cloudflare-tunnel/services/cloudflared-cli.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,46 @@
|
|
|
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
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
|
+
exports.CloudflaredMetricsService = void 0;
|
|
10
|
+
const common_1 = require("@nestjs/common");
|
|
11
|
+
const logger_1 = require("../../../common/logger");
|
|
12
|
+
const remote_access_cloudflare_tunnel_constants_1 = require("../remote-access-cloudflare-tunnel.constants");
|
|
13
|
+
let CloudflaredMetricsService = class CloudflaredMetricsService {
|
|
14
|
+
constructor() {
|
|
15
|
+
this.logger = (0, logger_1.createExtensionLogger)(remote_access_cloudflare_tunnel_constants_1.REMOTE_ACCESS_CLOUDFLARE_TUNNEL_PLUGIN_NAME, 'CloudflaredMetricsService');
|
|
16
|
+
}
|
|
17
|
+
async fetchReady(address) {
|
|
18
|
+
try {
|
|
19
|
+
const response = await fetch(`http://${address}/ready`, {
|
|
20
|
+
signal: AbortSignal.timeout(remote_access_cloudflare_tunnel_constants_1.CLOUDFLARED_METRICS_TIMEOUT_MS),
|
|
21
|
+
});
|
|
22
|
+
if (!response.ok) {
|
|
23
|
+
return null;
|
|
24
|
+
}
|
|
25
|
+
const data = (await response.json());
|
|
26
|
+
const readyConnections = typeof data.readyConnections === 'number' ? data.readyConnections : 0;
|
|
27
|
+
const connectorId = typeof data.connectorId === 'string'
|
|
28
|
+
? data.connectorId
|
|
29
|
+
: typeof data.connectorID === 'string'
|
|
30
|
+
? data.connectorID
|
|
31
|
+
: '';
|
|
32
|
+
return { readyConnections, connectorId };
|
|
33
|
+
}
|
|
34
|
+
catch (error) {
|
|
35
|
+
this.logger.debug('Failed to fetch the cloudflared /ready endpoint', {
|
|
36
|
+
message: error instanceof Error ? error.message : String(error),
|
|
37
|
+
});
|
|
38
|
+
return null;
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
};
|
|
42
|
+
exports.CloudflaredMetricsService = CloudflaredMetricsService;
|
|
43
|
+
exports.CloudflaredMetricsService = CloudflaredMetricsService = __decorate([
|
|
44
|
+
(0, common_1.Injectable)()
|
|
45
|
+
], CloudflaredMetricsService);
|
|
46
|
+
//# sourceMappingURL=cloudflared-metrics.service.js.map
|
package/dist/plugins/remote-access-cloudflare-tunnel/services/cloudflared-metrics.service.js.map
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cloudflared-metrics.service.js","sourceRoot":"","sources":["../../../../src/plugins/remote-access-cloudflare-tunnel/services/cloudflared-metrics.service.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAA4C;AAE5C,mDAA+D;AAC/D,4GAGsD;AAe/C,IAAM,yBAAyB,GAA/B,MAAM,yBAAyB;IAA/B;QACW,WAAM,GAAG,IAAA,8BAAqB,EAC9C,uFAA2C,EAC3C,2BAA2B,CAC3B,CAAC;IA+BH,CAAC;IA7BA,KAAK,CAAC,UAAU,CAAC,OAAe;QAC/B,IAAI,CAAC;YACJ,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,UAAU,OAAO,QAAQ,EAAE;gBACvD,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,0EAA8B,CAAC;aAC3D,CAAC,CAAC;YAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;gBAClB,OAAO,IAAI,CAAC;YACb,CAAC;YAED,MAAM,IAAI,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAA4B,CAAC;YAEhE,MAAM,gBAAgB,GAAG,OAAO,IAAI,CAAC,gBAAgB,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC;YAC/F,MAAM,WAAW,GAChB,OAAO,IAAI,CAAC,WAAW,KAAK,QAAQ;gBACnC,CAAC,CAAC,IAAI,CAAC,WAAW;gBAClB,CAAC,CAAC,OAAO,IAAI,CAAC,WAAW,KAAK,QAAQ;oBACrC,CAAC,CAAC,IAAI,CAAC,WAAW;oBAClB,CAAC,CAAC,EAAE,CAAC;YAER,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,CAAC;QAC1C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iDAAiD,EAAE;gBACpE,OAAO,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;aAC/D,CAAC,CAAC;YAEH,OAAO,IAAI,CAAC;QACb,CAAC;IACF,CAAC;CACD,CAAA;AAnCY,8DAAyB;oCAAzB,yBAAyB;IADrC,IAAA,mBAAU,GAAE;GACA,yBAAyB,CAmCrC"}
|
package/dist/plugins/remote-access-cloudflare-tunnel/services/cloudflared-process.service.d.ts
ADDED
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
export interface CloudflaredProcessOptions {
|
|
2
|
+
token: string;
|
|
3
|
+
protocol: string;
|
|
4
|
+
metricsAddress: string;
|
|
5
|
+
}
|
|
6
|
+
export interface CloudflaredExitInfo {
|
|
7
|
+
code: number | null;
|
|
8
|
+
signal: NodeJS.Signals | null;
|
|
9
|
+
}
|
|
10
|
+
export declare class CloudflaredProcessService {
|
|
11
|
+
private readonly logger;
|
|
12
|
+
private child;
|
|
13
|
+
private startedAt;
|
|
14
|
+
private currentToken;
|
|
15
|
+
private stderrRing;
|
|
16
|
+
private stderrCarry;
|
|
17
|
+
private lastExit;
|
|
18
|
+
isRunning(): boolean;
|
|
19
|
+
getStartedAt(): number | null;
|
|
20
|
+
getLastExit(): CloudflaredExitInfo | null;
|
|
21
|
+
getLastStderrLine(): string | null;
|
|
22
|
+
getStderrLines(): readonly string[];
|
|
23
|
+
start(options: CloudflaredProcessOptions): void;
|
|
24
|
+
stop(graceMs?: number): Promise<void>;
|
|
25
|
+
private appendStderr;
|
|
26
|
+
private redact;
|
|
27
|
+
}
|
|
@@ -0,0 +1,139 @@
|
|
|
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
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
|
+
exports.CloudflaredProcessService = void 0;
|
|
10
|
+
const node_child_process_1 = require("node:child_process");
|
|
11
|
+
const common_1 = require("@nestjs/common");
|
|
12
|
+
const logger_1 = require("../../../common/logger");
|
|
13
|
+
const remote_access_cloudflare_tunnel_constants_1 = require("../remote-access-cloudflare-tunnel.constants");
|
|
14
|
+
let CloudflaredProcessService = class CloudflaredProcessService {
|
|
15
|
+
constructor() {
|
|
16
|
+
this.logger = (0, logger_1.createExtensionLogger)(remote_access_cloudflare_tunnel_constants_1.REMOTE_ACCESS_CLOUDFLARE_TUNNEL_PLUGIN_NAME, 'CloudflaredProcessService');
|
|
17
|
+
this.child = null;
|
|
18
|
+
this.startedAt = null;
|
|
19
|
+
this.currentToken = '';
|
|
20
|
+
this.stderrRing = [];
|
|
21
|
+
this.stderrCarry = '';
|
|
22
|
+
this.lastExit = null;
|
|
23
|
+
}
|
|
24
|
+
isRunning() {
|
|
25
|
+
return this.child !== null;
|
|
26
|
+
}
|
|
27
|
+
getStartedAt() {
|
|
28
|
+
return this.startedAt;
|
|
29
|
+
}
|
|
30
|
+
getLastExit() {
|
|
31
|
+
return this.lastExit;
|
|
32
|
+
}
|
|
33
|
+
getLastStderrLine() {
|
|
34
|
+
for (let i = this.stderrRing.length - 1; i >= 0; i--) {
|
|
35
|
+
if (this.stderrRing[i].length > 0) {
|
|
36
|
+
return this.stderrRing[i];
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
return null;
|
|
40
|
+
}
|
|
41
|
+
getStderrLines() {
|
|
42
|
+
return this.stderrRing;
|
|
43
|
+
}
|
|
44
|
+
start(options) {
|
|
45
|
+
if (this.child) {
|
|
46
|
+
return;
|
|
47
|
+
}
|
|
48
|
+
this.currentToken = options.token;
|
|
49
|
+
this.stderrRing = [];
|
|
50
|
+
this.stderrCarry = '';
|
|
51
|
+
this.lastExit = null;
|
|
52
|
+
const args = [
|
|
53
|
+
'tunnel',
|
|
54
|
+
'--no-autoupdate',
|
|
55
|
+
'--metrics',
|
|
56
|
+
options.metricsAddress,
|
|
57
|
+
'--protocol',
|
|
58
|
+
options.protocol,
|
|
59
|
+
'run',
|
|
60
|
+
];
|
|
61
|
+
this.logger.log(`Spawning: ${remote_access_cloudflare_tunnel_constants_1.CLOUDFLARED_BINARY} ${args.join(' ')}`);
|
|
62
|
+
const child = (0, node_child_process_1.spawn)(remote_access_cloudflare_tunnel_constants_1.CLOUDFLARED_BINARY, args, {
|
|
63
|
+
env: {
|
|
64
|
+
TUNNEL_TOKEN: options.token,
|
|
65
|
+
HOME: process.env.HOME ?? '',
|
|
66
|
+
PATH: process.env.PATH ?? '',
|
|
67
|
+
},
|
|
68
|
+
stdio: ['ignore', 'pipe', 'pipe'],
|
|
69
|
+
});
|
|
70
|
+
this.child = child;
|
|
71
|
+
this.startedAt = Date.now();
|
|
72
|
+
child.stderr?.on('data', (chunk) => {
|
|
73
|
+
this.appendStderr(chunk.toString('utf8'));
|
|
74
|
+
});
|
|
75
|
+
child.once('exit', (code, signal) => {
|
|
76
|
+
this.lastExit = { code, signal };
|
|
77
|
+
this.child = null;
|
|
78
|
+
this.startedAt = null;
|
|
79
|
+
});
|
|
80
|
+
child.once('error', (error) => {
|
|
81
|
+
this.appendStderr(`${error.message}\n`);
|
|
82
|
+
this.lastExit = { code: null, signal: null };
|
|
83
|
+
this.child = null;
|
|
84
|
+
this.startedAt = null;
|
|
85
|
+
this.logger.warn(`cloudflared failed to spawn: ${error.message}`);
|
|
86
|
+
});
|
|
87
|
+
}
|
|
88
|
+
async stop(graceMs = remote_access_cloudflare_tunnel_constants_1.CLOUDFLARED_STOP_GRACE_MS) {
|
|
89
|
+
const child = this.child;
|
|
90
|
+
if (!child) {
|
|
91
|
+
return;
|
|
92
|
+
}
|
|
93
|
+
await new Promise((resolve) => {
|
|
94
|
+
const timer = setTimeout(() => {
|
|
95
|
+
try {
|
|
96
|
+
child.kill('SIGKILL');
|
|
97
|
+
}
|
|
98
|
+
catch {
|
|
99
|
+
}
|
|
100
|
+
}, graceMs);
|
|
101
|
+
timer.unref?.();
|
|
102
|
+
child.once('exit', () => {
|
|
103
|
+
clearTimeout(timer);
|
|
104
|
+
resolve();
|
|
105
|
+
});
|
|
106
|
+
try {
|
|
107
|
+
child.kill('SIGTERM');
|
|
108
|
+
}
|
|
109
|
+
catch {
|
|
110
|
+
clearTimeout(timer);
|
|
111
|
+
resolve();
|
|
112
|
+
}
|
|
113
|
+
});
|
|
114
|
+
this.child = null;
|
|
115
|
+
this.startedAt = null;
|
|
116
|
+
}
|
|
117
|
+
appendStderr(text) {
|
|
118
|
+
this.stderrCarry += text;
|
|
119
|
+
const lines = this.stderrCarry.split('\n');
|
|
120
|
+
this.stderrCarry = lines.pop() ?? '';
|
|
121
|
+
for (const rawLine of lines) {
|
|
122
|
+
this.stderrRing.push(this.redact(rawLine));
|
|
123
|
+
if (this.stderrRing.length > remote_access_cloudflare_tunnel_constants_1.CLOUDFLARED_STDERR_RING_SIZE) {
|
|
124
|
+
this.stderrRing.shift();
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
redact(line) {
|
|
129
|
+
if (!this.currentToken) {
|
|
130
|
+
return line;
|
|
131
|
+
}
|
|
132
|
+
return line.split(this.currentToken).join('***redacted***');
|
|
133
|
+
}
|
|
134
|
+
};
|
|
135
|
+
exports.CloudflaredProcessService = CloudflaredProcessService;
|
|
136
|
+
exports.CloudflaredProcessService = CloudflaredProcessService = __decorate([
|
|
137
|
+
(0, common_1.Injectable)()
|
|
138
|
+
], CloudflaredProcessService);
|
|
139
|
+
//# sourceMappingURL=cloudflared-process.service.js.map
|
package/dist/plugins/remote-access-cloudflare-tunnel/services/cloudflared-process.service.js.map
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cloudflared-process.service.js","sourceRoot":"","sources":["../../../../src/plugins/remote-access-cloudflare-tunnel/services/cloudflared-process.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,5 +17,6 @@ export declare class SetupController {
|
|
|
17
17
|
login(body: RemoteAccessTailscalePluginLoginDto, res: Response): Promise<RemoteAccessTailscalePluginLoginResponseModel>;
|
|
18
18
|
logout(res: Response): Promise<RemoteAccessTailscalePluginStatusResponseModel>;
|
|
19
19
|
resetPreferences(res: Response): Promise<RemoteAccessTailscalePluginStatusResponseModel>;
|
|
20
|
+
private mapActionError;
|
|
20
21
|
private buildStatusResponse;
|
|
21
22
|
}
|
|
@@ -26,6 +26,8 @@ const login_dto_1 = require("../dto/login.dto");
|
|
|
26
26
|
const login_model_1 = require("../models/login.model");
|
|
27
27
|
const status_model_1 = require("../models/status.model");
|
|
28
28
|
const remote_access_tailscale_constants_1 = require("../remote-access-tailscale.constants");
|
|
29
|
+
const remote_access_tailscale_exceptions_1 = require("../remote-access-tailscale.exceptions");
|
|
30
|
+
const tailscale_cli_service_1 = require("../services/tailscale-cli.service");
|
|
29
31
|
const tailscale_login_service_1 = require("../services/tailscale-login.service");
|
|
30
32
|
const tailscale_node_managed_service_1 = require("../services/tailscale-node-managed.service");
|
|
31
33
|
const tailscale_provider_service_1 = require("../services/tailscale-provider.service");
|
|
@@ -53,7 +55,7 @@ let SetupController = class SetupController {
|
|
|
53
55
|
throw new common_1.ConflictException(error.message);
|
|
54
56
|
}
|
|
55
57
|
if (error instanceof tailscale_setup_service_1.TailscaleSetupUnavailableException) {
|
|
56
|
-
throw new common_1.UnprocessableEntityException(error.message);
|
|
58
|
+
throw new common_1.UnprocessableEntityException({ code: error.code, message: error.message });
|
|
57
59
|
}
|
|
58
60
|
const err = error;
|
|
59
61
|
this.logger.error(`Failed to start Tailscale setup: ${err.message}`);
|
|
@@ -77,9 +79,7 @@ let SetupController = class SetupController {
|
|
|
77
79
|
if (error instanceof tailscale_login_service_1.TailscaleLoginInProgressException) {
|
|
78
80
|
throw new common_1.ConflictException(error.message);
|
|
79
81
|
}
|
|
80
|
-
|
|
81
|
-
this.logger.error(`Tailscale login failed: ${err.message}`);
|
|
82
|
-
throw new common_1.InternalServerErrorException('Failed to sign in to Tailscale');
|
|
82
|
+
this.mapActionError(error, 'Tailscale login failed', 'Failed to sign in to Tailscale');
|
|
83
83
|
}
|
|
84
84
|
}
|
|
85
85
|
async logout(res) {
|
|
@@ -88,9 +88,7 @@ let SetupController = class SetupController {
|
|
|
88
88
|
await this.loginService.logout();
|
|
89
89
|
}
|
|
90
90
|
catch (error) {
|
|
91
|
-
|
|
92
|
-
this.logger.error(`Tailscale logout failed: ${err.message}`);
|
|
93
|
-
throw new common_1.InternalServerErrorException('Failed to sign out of Tailscale');
|
|
91
|
+
this.mapActionError(error, 'Tailscale logout failed', 'Failed to sign out of Tailscale');
|
|
94
92
|
}
|
|
95
93
|
return this.buildStatusResponse(res);
|
|
96
94
|
}
|
|
@@ -100,12 +98,30 @@ let SetupController = class SetupController {
|
|
|
100
98
|
await this.loginService.resetPreferences();
|
|
101
99
|
}
|
|
102
100
|
catch (error) {
|
|
103
|
-
|
|
104
|
-
this.logger.error(`Tailscale reset-preferences failed: ${err.message}`);
|
|
105
|
-
throw new common_1.InternalServerErrorException('Failed to reset Tailscale preferences');
|
|
101
|
+
this.mapActionError(error, 'Tailscale reset-preferences failed', 'Failed to reset Tailscale preferences');
|
|
106
102
|
}
|
|
107
103
|
return this.buildStatusResponse(res);
|
|
108
104
|
}
|
|
105
|
+
mapActionError(error, logPrefix, fallbackMessage) {
|
|
106
|
+
if (error instanceof remote_access_tailscale_exceptions_1.TailscaleRequirementUnsatisfiedException) {
|
|
107
|
+
throw new common_1.ConflictException({ code: error.requirement.code, message: error.message });
|
|
108
|
+
}
|
|
109
|
+
if (error instanceof tailscale_cli_service_1.TailscaleCliError) {
|
|
110
|
+
switch (error.kind) {
|
|
111
|
+
case 'permission-denied':
|
|
112
|
+
throw new common_1.ConflictException({ code: 'operator-not-granted', message: error.message });
|
|
113
|
+
case 'daemon-down':
|
|
114
|
+
throw new common_1.ConflictException({ code: 'daemon-not-active', message: error.message });
|
|
115
|
+
case 'needs-login':
|
|
116
|
+
throw new common_1.ConflictException({ code: 'not-signed-in', message: error.message });
|
|
117
|
+
default:
|
|
118
|
+
break;
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
const err = error;
|
|
122
|
+
this.logger.error(`${logPrefix}: ${err.message}`);
|
|
123
|
+
throw new common_1.InternalServerErrorException(fallbackMessage);
|
|
124
|
+
}
|
|
109
125
|
async buildStatusResponse(res) {
|
|
110
126
|
const [status, requirements] = await Promise.all([
|
|
111
127
|
this.providerService.getStatus(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup.controller.js","sourceRoot":"","sources":["../../../../src/plugins/remote-access-tailscale/controllers/setup.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAEA,2CAUwB;AACxB,6CAAiE;AAEjE,mDAA+D;AAC/D,2EAAmE;AACnE,yFAG8D;AAC9D,iHAGyE;AACzE,iFAAiG;AACjG,2EAAkE;AAClE,4EAAkE;AAClE,gDAAuE;AACvE,uDAK+B;AAC/B,yDAIgC;AAChC,4FAG8C;AAC9C,iFAA+G;AAC/G,+FAAyF;AACzF,uFAAkF;AAClF,iFAAgH;AAUzG,IAAM,eAAe,GAArB,MAAM,eAAe;IAG3B,YACkB,YAAmC,EACnC,YAAmC,EACnC,eAAyC,EACzC,kBAA+C;QAH/C,iBAAY,GAAZ,YAAY,CAAuB;QACnC,iBAAY,GAAZ,YAAY,CAAuB;QACnC,oBAAe,GAAf,eAAe,CAA0B;QACzC,uBAAkB,GAAlB,kBAAkB,CAA6B;QANhD,WAAM,GAAG,IAAA,8BAAqB,EAAC,uEAAmC,EAAE,iBAAiB,CAAC,CAAC;IAOrG,CAAC;IAaE,AAAN,KAAK,CAAC,OAAO;QACZ,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;QAEjD,IAAI,CAAC;YACJ,MAAM,EAAE,EAAE,EAAE,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC;YAEjD,MAAM,IAAI,GAAG,IAAI,qDAAuC,EAAE,CAAC;YAC3D,IAAI,CAAC,GAAG,GAAG,EAAE,CAAC;YAEd,MAAM,QAAQ,GAAG,IAAI,6DAA+C,EAAE,CAAC;YACvE,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAC;YAErB,OAAO,QAAQ,CAAC;QACjB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"setup.controller.js","sourceRoot":"","sources":["../../../../src/plugins/remote-access-tailscale/controllers/setup.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,18 @@
|
|
|
1
1
|
import { FastifyReply as Response } from 'fastify';
|
|
2
|
+
import { PlatformService } from '../../../modules/platform/services/platform.service';
|
|
2
3
|
import { RemoteAccessTailscalePluginStatusResponseModel } from '../models/status.model';
|
|
3
4
|
import { TailscaleLoginService } from '../services/tailscale-login.service';
|
|
4
5
|
import { TailscaleNodeManagedService } from '../services/tailscale-node-managed.service';
|
|
5
6
|
import { TailscaleProviderService } from '../services/tailscale-provider.service';
|
|
7
|
+
import { TailscaleSetupService } from '../services/tailscale-setup.service';
|
|
6
8
|
export declare class StatusController {
|
|
7
9
|
private readonly providerService;
|
|
8
10
|
private readonly nodeManagedService;
|
|
9
11
|
private readonly loginService;
|
|
12
|
+
private readonly setupService;
|
|
13
|
+
private readonly platformService;
|
|
10
14
|
private readonly logger;
|
|
11
|
-
constructor(providerService: TailscaleProviderService, nodeManagedService: TailscaleNodeManagedService, loginService: TailscaleLoginService);
|
|
15
|
+
constructor(providerService: TailscaleProviderService, nodeManagedService: TailscaleNodeManagedService, loginService: TailscaleLoginService, setupService: TailscaleSetupService, platformService: PlatformService);
|
|
12
16
|
getStatus(res: Response): Promise<RemoteAccessTailscalePluginStatusResponseModel>;
|
|
17
|
+
private buildSetupJobModel;
|
|
13
18
|
}
|