@fastybird/smart-panel-backend 1.1.0-alpha.4 → 1.1.0-alpha.6

package/dist/plugins/devices-shelly-ng/services/shelly-ng.service.js

@@ -8,6 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+var ShellyNgService_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ShellyNgService = void 0;
 const crypto_1 = require("crypto");
@@ -25,7 +26,7 @@ const devices_shelly_ng_constants_1 = require("../devices-shelly-ng.constants");
 const database_discoverer_service_1 = require("./database-discoverer.service");
 const device_manager_service_1 = require("./device-manager.service");
 const shelly_ws_server_service_1 = require("./shelly-ws-server.service");
-let ShellyNgService = class ShellyNgService extends base_managed_extension_service_1.BaseManagedExtensionService {
+let ShellyNgService = ShellyNgService_1 = class ShellyNgService extends base_managed_extension_service_1.BaseManagedExtensionService {
     constructor(configService, databaseDiscovererService, delegatesRegistryService, deviceManagerService, devicesService, deviceConnectivityService, managedServiceManager, wsServer) {
         super();
         this.configService = configService;
@@ -45,7 +46,10 @@ let ShellyNgService = class ShellyNgService extends base_managed_extension_servi
         this.healthCheckTimer = null;
         this.healthCheckRunning = false;
         this.statusPollTimer = null;
-        this.statusPollRunning = false;
+        this.statusPollTimers = new Set();
+        this.statusPollInFlight = new Set();
+        this.statusPollGeneration = 0;
+        this.statusPollActive = 0;
         this.discoveryQueue = [];
         this.processingDiscovery = false;
         this.discoveryGeneration = 0;
@@ -421,30 +425,59 @@ let ShellyNgService = class ShellyNgService extends base_managed_extension_servi
             this.logger.log('Status polling disabled (interval = 0)');
             return;
         }
-        const intervalMs = intervalSec * 1000;
-        this.statusPollTimer = setInterval(() => {
-            if (this.state !== 'started' || this.statusPollRunning) {
-                return;
-            }
-            this.statusPollRunning = true;
-            this.delegatesRegistryService
-                .pollAllDevices()
-                .catch((err) => {
-                this.logger.error('Status poll failed', {
-                    message: err.message,
-                    stack: err.stack,
-                });
-            })
-                .finally(() => {
-                this.statusPollRunning = false;
-            });
-        }, intervalMs);
+        this.scheduleStatusPollCycle(intervalSec * 1000, this.statusPollGeneration);
     }
     stopStatusPoll() {
-        if (this.statusPollTimer) {
-            clearInterval(this.statusPollTimer);
-            this.statusPollTimer = null;
+        this.statusPollGeneration++;
+        this.delegatesRegistryService.invalidateStatusPolls();
+        for (const timer of this.statusPollTimers) {
+            clearTimeout(timer);
+        }
+        this.statusPollTimers.clear();
+        this.statusPollTimer = null;
+    }
+    scheduleStatusPollCycle(intervalMs, generation) {
+        if ((this.state !== 'started' && this.state !== 'starting') || generation !== this.statusPollGeneration) {
+            return;
+        }
+        const delegates = this.delegatesRegistryService.getConnectedDelegateIds().slice().sort();
+        for (const [index, delegateId] of delegates.entries()) {
+            const delay = Math.floor((index * intervalMs) / delegates.length);
+            this.scheduleStatusPollTimeout(() => this.runStatusPollSlot(delegateId, generation), delay);
+        }
+        this.statusPollTimer = this.scheduleStatusPollTimeout(() => this.scheduleStatusPollCycle(intervalMs, generation), intervalMs);
+    }
+    scheduleStatusPollTimeout(callback, delayMs) {
+        const timer = setTimeout(() => {
+            this.statusPollTimers.delete(timer);
+            callback();
+        }, delayMs);
+        this.statusPollTimers.add(timer);
+        return timer;
+    }
+    runStatusPollSlot(delegateId, generation) {
+        if (this.state !== 'started' ||
+            generation !== this.statusPollGeneration ||
+            this.statusPollActive >= ShellyNgService_1.STATUS_POLL_CONCURRENCY ||
+            this.statusPollInFlight.has(delegateId)) {
+            return;
         }
+        this.statusPollActive++;
+        this.statusPollInFlight.add(delegateId);
+        void this.delegatesRegistryService
+            .pollDevice(delegateId, ShellyNgService_1.STATUS_POLL_TIMEOUT_MS)
+            .catch((err) => {
+            if (generation === this.statusPollGeneration) {
+                this.logger.error(`Status poll failed for device=${delegateId}`, {
+                    message: err.message,
+                    stack: err.stack,
+                });
+            }
+        })
+            .finally(() => {
+            this.statusPollActive--;
+            this.statusPollInFlight.delete(delegateId);
+        });
     }
     async waitUntil(...states) {
         const maxWait = 10_000;
@@ -460,7 +493,9 @@ let ShellyNgService = class ShellyNgService extends base_managed_extension_servi
     }
 };
 exports.ShellyNgService = ShellyNgService;
-exports.ShellyNgService = ShellyNgService = __decorate([
+ShellyNgService.STATUS_POLL_CONCURRENCY = 10;
+ShellyNgService.STATUS_POLL_TIMEOUT_MS = 10_000;
+exports.ShellyNgService = ShellyNgService = ShellyNgService_1 = __decorate([
     (0, common_1.Injectable)(),
     __metadata("design:paramtypes", [config_service_1.ConfigService,
         database_discoverer_service_1.DatabaseDiscovererService,

package/dist/plugins/devices-shelly-ng/services/shelly-ng.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"shelly-ng.service.js","sourceRoot":"","sources":["../../../../src/plugins/devices-shelly-ng/services/shelly-ng.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"shelly-ng.service.js","sourceRoot":"","sources":["../../../../src/plugins/devices-shelly-ng/services/shelly-ng.service.ts"],"names":[],"mappings":"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"}

package/dist/plugins/devices-shelly-ng/services/shelly-ws-server.service.js

@@ -20,7 +20,6 @@ const device_connectivity_service_1 = require("../../../modules/devices/services
 const devices_service_1 = require("../../../modules/devices/services/devices.service");
 const delegates_manager_service_1 = require("../delegates/delegates-manager.service");
 const devices_shelly_ng_constants_1 = require("../devices-shelly-ng.constants");
-const transform_utils_1 = require("../utils/transform.utils");
 const WS_PATH = '/api/v1/plugins/shelly-ng/ws';
 let ShellyWsServerService = class ShellyWsServerService {
     constructor(appInstanceHolder, delegatesManager, devicesService, deviceConnectivityService) {
@@ -148,13 +147,12 @@ let ShellyWsServerService = class ShellyWsServerService {
         this.logger.log(`Status update from sleeping device=${deviceId} at ${ip}`);
         const delegate = this.delegatesManager.get(deviceId);
         if (delegate) {
-            const emit = (event, ...args) => delegate.emit(event, ...args);
             for (const [compKey, values] of Object.entries(params)) {
                 if (compKey === 'ts' || typeof values !== 'object' || values === null) {
                     continue;
                 }
                 for (const [attr, val] of Object.entries(values)) {
-                    (0, transform_utils_1.emitFlattenedValue)(emit, compKey, attr, val);
+                    delegate.emitNotificationValue(compKey, attr, val);
                 }
             }
             this.markDeviceAwake(deviceId);

package/dist/plugins/devices-shelly-ng/services/shelly-ws-server.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"shelly-ws-server.service.js","sourceRoot":"","sources":["../../../../src/plugins/devices-shelly-ng/services/shelly-ws-server.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,6BAAwC;AACxC,2BAAgD;AAEhD,2CAA6D;AAE7D,mDAAuF;AACvF,sGAAyF;AACzF,kFAA6E;AAC7E,+GAA0G;AAC1G,uFAAmF;AACnF,sFAAiF;AACjF,gFAAuG;AAEvG,8DAA2E;AAE3E,MAAM,OAAO,GAAG,8BAA8B,CAAC;AAUxC,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAajC,YACkB,iBAAoC,EACpC,gBAAyC,EACzC,cAA8B,EAC9B,yBAAoD;QAHpD,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,qBAAgB,GAAhB,gBAAgB,CAAyB;QACzC,mBAAc,GAAd,cAAc,CAAgB;QAC9B,8BAAyB,GAAzB,yBAAyB,CAA2B;QAhBrD,WAAM,GAA2B,IAAA,8BAAqB,EACtE,2DAA6B,EAC7B,uBAAuB,CACvB,CAAC;QAEM,QAAG,GAA2B,IAAI,CAAC;QACnC,eAAU,GAAsB,IAAI,CAAC;QACrC,mBAAc,GAA0E,IAAI,CAAC;QACpF,iBAAY,GAA2B,IAAI,GAAG,EAAE,CAAC;QACjD,eAAU,GAA+B,IAAI,GAAG,EAAE,CAAC;QAC5D,YAAO,GAAG,KAAK,CAAC;IAOrB,CAAC;IAEJ,SAAS;QACR,OAAO,IAAI,CAAC,GAAG,KAAK,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;IAC3C,CAAC;IAOD,KAAK;QACJ,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;YACd,OAAO;QACR,CAAC;QAED,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;QAErB,IAAI,CAAC,GAAG,GAAG,IAAI,oBAAe,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;QAEnD,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,EAAa,EAAE,GAAoB,EAAE,EAAE;YACjE,MAAM,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC,aAAa,IAAI,SAAS,CAAC;YAEjD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,kCAAkC,EAAE,EAAE,CAAC,CAAC;YAExD,EAAE,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,IAAY,EAAE,EAAE;gBACjC,IAAI,CAAC,aAAa,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;YAClC,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;gBACnB,MAAM,cAAc,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBAEjD,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBAI7B,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;oBAClB,OAAO;gBACR,CAAC;gBAED,IAAI,cAAc,EAAE,CAAC;oBACpB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mBAAmB,cAAc,SAAS,EAAE,oCAAoC,CAAC,CAAC;oBACpG,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC,CAAC;gBACzC,CAAC;qBAAM,CAAC;oBACP,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,wBAAwB,EAAE,eAAe,CAAC,CAAC;gBAC9D,CAAC;YACF,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAU,EAAE,EAAE;gBAC7B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,wBAAwB,EAAE,KAAK,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;YAChE,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;QAGH,IAAI,CAAC;YACJ,MAAM,GAAG,GAAG,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,CAAC;YAC5C,MAAM,WAAW,GAAG,GAAG,CAAC,cAAc,EAAE,CAAC;YACzC,MAAM,MAAM,GAAG,WAAW,CAAC,aAAa,EAAgB,CAAC;YAEzD,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC;YAEzB,IAAI,CAAC,cAAc,GAAG,CAAC,GAAoB,EAAE,MAAc,EAAE,IAAY,EAAQ,EAAE;gBAClF,MAAM,QAAQ,GAAG,IAAA,WAAQ,EAAC,GAAG,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC;gBAElD,IAAI,QAAQ,KAAK,OAAO,EAAE,CAAC;oBAC1B,IAAI,CAAC,GAAG,EAAE,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE;wBACjD,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,YAAY,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;oBACvC,CAAC,CAAC,CAAC;gBACJ,CAAC;YAGF,CAAC,CAAC;YAEF,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;YAE1C,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,yCAAyC,OAAO,EAAE,CAAC,CAAC;QACrE,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACd,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,sCAAuC,GAAa,CAAC,OAAO,EAAE,CAAC,CAAC;YAEjF,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;gBACd,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;gBACjB,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC;YACjB,CAAC;QACF,CAAC;IACF,CAAC;IAED,IAAI;QACH,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;QAC1B,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;QAExB,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;YAEd,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;gBACvC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC;YAC5C,CAAC;YAED,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;YACjB,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC;QACjB,CAAC;QAED,IAAI,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YAC5C,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;YACpD,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;YAC3B,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACxB,CAAC;IACF,CAAC;IAED,eAAe;QACd,IAAI,CAAC,IAAI,EAAE,CAAC;IACb,CAAC;IAEO,aAAa,CAAC,EAAa,EAAE,IAAY,EAAE,EAAU;QAC5D,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YAClB,OAAO;QACR,CAAC;QAED,IAAI,KAAqB,CAAC;QAE1B,IAAI,CAAC;YACJ,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAmB,CAAC;QACvD,CAAC;QAAC,MAAM,CAAC;YACR,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,wCAAwC,EAAE,EAAE,CAAC,CAAC;YAE/D,OAAO;QACR,CAAC;QAED,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC;QAE3B,IAAI,CAAC,QAAQ,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,EAAE,EAAE,CAAC,CAAC;YAE3D,OAAO;QACR,CAAC;QAGD,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;YAChC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;QACrC,CAAC;QAID,IAAI,OAAO,KAAK,CAAC,EAAE,KAAK,QAAQ,EAAE,CAAC;YAClC,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,GAAG,EAAE,gBAAgB,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;YAEjG,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACd,CAAC;QAED,IAAI,KAAK,CAAC,MAAM,KAAK,cAAc,IAAI,KAAK,CAAC,MAAM,KAAK,kBAAkB,EAAE,CAAC;YAC5E,IAAI,CAAC,wBAAwB,CAAC,QAAQ,EAAE,KAAK,CAAC,MAAM,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;QACjE,CAAC;aAAM,IAAI,KAAK,CAAC,MAAM,KAAK,aAAa,EAAE,CAAC;YAC3C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,8BAA8B,QAAQ,KAAK,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC9F,CAAC;IACF,CAAC;IAEO,wBAAwB,CAAC,QAAgB,EAAE,MAA+B,EAAE,EAAU;QAC7F,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,sCAAsC,QAAQ,OAAO,EAAE,EAAE,CAAC,CAAC;QAE3E,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAErD,IAAI,QAAQ,EAAE,CAAC;YAId,MAAM,IAAI,GAAgB,CAAC,KAAa,EAAE,GAAG,IAAe,EAAW,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,CAAC;YAExG,KAAK,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;gBACxD,IAAI,OAAO,KAAK,IAAI,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;oBACvE,SAAS;gBACV,CAAC;gBAED,KAAK,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAiC,CAAC,EAAE,CAAC;oBAC7E,IAAA,oCAAkB,EAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;gBAC9C,CAAC;YACF,CAAC;YAGD,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;QAChC,CAAC;aAAM,CAAC;YACP,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,QAAQ,0BAA0B,CAAC,CAAC;QAC1F,CAAC;IACF,CAAC;IAEO,eAAe,CAAC,QAAgB;QACvC,IAAI,CAAC,kBAAkB,CAAC,QAAQ,EAAE,mCAAe,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IACvE,CAAC;IAEO,kBAAkB,CAAC,QAAgB;QAC1C,IAAI,CAAC,kBAAkB,CAAC,QAAQ,EAAE,mCAAe,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IACzE,CAAC;IAMO,kBAAkB,CAAC,QAAgB,EAAE,KAAsB,EAAE,KAAa;QACjF,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;QAEhE,MAAM,IAAI,GAAG,IAAI;aACf,IAAI,CAAC,KAAK,IAAI,EAAE;YAChB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,SAAS,CACjD,YAAY,EACZ,QAAQ,EACR,oDAAsB,CACtB,CAAC;YAEF,IAAI,CAAC,MAAM;gBAAE,OAAO;YAEpB,MAAM,IAAI,CAAC,yBAAyB,CAAC,kBAAkB,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;QAC/E,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,GAAU,EAAE,EAAE;YACrB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,kCAAkC,QAAQ,OAAO,KAAK,KAAK,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;QAC5F,CAAC,CAAC,CAAC;QAEJ,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IACrC,CAAC;CACD,CAAA;AA1OY,sDAAqB;gCAArB,qBAAqB;IADjC,IAAA,mBAAU,GAAE;qCAeyB,+CAAiB;QAClB,mDAAuB;QACzB,gCAAc;QACH,uDAAyB;GAjB1D,qBAAqB,CA0OjC"}
+{"version":3,"file":"shelly-ws-server.service.js","sourceRoot":"","sources":["../../../../src/plugins/devices-shelly-ng/services/shelly-ws-server.service.ts"],"names":[],"mappings":"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"}

package/dist/plugins/remote-access-cloudflare-tunnel/controllers/setup.controller.d.ts

@@ -0,0 +1,17 @@
+import { ConfigService } from '../../../modules/config/services/config.service';
+import { RemoteAccessCloudflareTunnelPluginInstallResponseModel } from '../models/install.model';
+import { RemoteAccessCloudflareTunnelPluginStatusResponseModel } from '../models/status.model';
+import { CloudflareTunnelManagedService } from '../services/cloudflare-tunnel-managed.service';
+import { CloudflareTunnelProviderService } from '../services/cloudflare-tunnel-provider.service';
+import { CloudflareTunnelSetupService } from '../services/cloudflare-tunnel-setup.service';
+export declare class SetupController {
+    private readonly setupService;
+    private readonly providerService;
+    private readonly tunnelManagedService;
+    private readonly configService;
+    private readonly logger;
+    constructor(setupService: CloudflareTunnelSetupService, providerService: CloudflareTunnelProviderService, tunnelManagedService: CloudflareTunnelManagedService, configService: ConfigService);
+    install(): Promise<RemoteAccessCloudflareTunnelPluginInstallResponseModel>;
+    reset(): Promise<RemoteAccessCloudflareTunnelPluginStatusResponseModel>;
+    private buildStatusResponse;
+}

package/dist/plugins/remote-access-cloudflare-tunnel/controllers/setup.controller.js

@@ -0,0 +1,147 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    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;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SetupController = void 0;
+const common_1 = require("@nestjs/common");
+const swagger_1 = require("@nestjs/swagger");
+const logger_1 = require("../../../common/logger");
+const transform_utils_1 = require("../../../common/utils/transform.utils");
+const config_service_1 = require("../../../modules/config/services/config.service");
+const provider_model_1 = require("../../../modules/remote-access/models/provider.model");
+const api_documentation_decorator_1 = require("../../../modules/swagger/decorators/api-documentation.decorator");
+const system_exceptions_1 = require("../../../modules/system/system.exceptions");
+const roles_guard_1 = require("../../../modules/users/guards/roles.guard");
+const users_constants_1 = require("../../../modules/users/users.constants");
+const update_config_dto_1 = require("../dto/update-config.dto");
+const install_model_1 = require("../models/install.model");
+const status_model_1 = require("../models/status.model");
+const remote_access_cloudflare_tunnel_constants_1 = require("../remote-access-cloudflare-tunnel.constants");
+const cloudflare_tunnel_managed_service_1 = require("../services/cloudflare-tunnel-managed.service");
+const cloudflare_tunnel_provider_service_1 = require("../services/cloudflare-tunnel-provider.service");
+const cloudflare_tunnel_setup_service_1 = require("../services/cloudflare-tunnel-setup.service");
+let SetupController = class SetupController {
+    constructor(setupService, providerService, tunnelManagedService, configService) {
+        this.setupService = setupService;
+        this.providerService = providerService;
+        this.tunnelManagedService = tunnelManagedService;
+        this.configService = configService;
+        this.logger = (0, logger_1.createExtensionLogger)(remote_access_cloudflare_tunnel_constants_1.REMOTE_ACCESS_CLOUDFLARE_TUNNEL_PLUGIN_NAME, 'SetupController');
+    }
+    async install() {
+        this.logger.debug('Cloudflare Tunnel install requested');
+        try {
+            const { id } = await this.setupService.install();
+            const data = new install_model_1.RemoteAccessCloudflareTunnelPluginInstallModel();
+            data.job = id;
+            const response = new install_model_1.RemoteAccessCloudflareTunnelPluginInstallResponseModel();
+            response.data = data;
+            return response;
+        }
+        catch (error) {
+            if (error instanceof system_exceptions_1.PrivilegedWorkerUnavailableException) {
+                throw new common_1.ConflictException(error.message);
+            }
+            if (error instanceof cloudflare_tunnel_setup_service_1.CloudflareTunnelSetupUnavailableException) {
+                throw new common_1.UnprocessableEntityException({ code: error.code, message: error.message });
+            }
+            const err = error;
+            this.logger.error(`Failed to start Cloudflare Tunnel setup: ${err.message}`);
+            throw new common_1.InternalServerErrorException('Failed to start Cloudflare Tunnel setup');
+        }
+    }
+    async reset() {
+        this.logger.debug('Cloudflare Tunnel reset requested');
+        try {
+            await this.tunnelManagedService.stop();
+        }
+        catch (error) {
+            this.logger.warn('Failed to stop the Cloudflare Tunnel process while resetting', {
+                message: error instanceof Error ? error.message : String(error),
+            });
+        }
+        try {
+            const plain = {
+                type: remote_access_cloudflare_tunnel_constants_1.REMOTE_ACCESS_CLOUDFLARE_TUNNEL_PLUGIN_NAME,
+                tunnel_token: null,
+                public_hostname: null,
+            };
+            const dto = (0, transform_utils_1.toInstance)(update_config_dto_1.UpdateRemoteAccessCloudflareTunnelPluginConfigDto, plain, {
+                excludeExtraneousValues: false,
+            });
+            await this.configService.updatePluginConfig(remote_access_cloudflare_tunnel_constants_1.REMOTE_ACCESS_CLOUDFLARE_TUNNEL_PLUGIN_NAME, dto, plain);
+        }
+        catch (error) {
+            const err = error;
+            this.logger.error(`Failed to clear the Cloudflare Tunnel configuration during reset: ${err.message}`);
+            throw new common_1.InternalServerErrorException('Failed to reset the Cloudflare Tunnel configuration');
+        }
+        return this.buildStatusResponse();
+    }
+    async buildStatusResponse() {
+        const [status, requirements] = await Promise.all([
+            this.providerService.getStatus(),
+            this.tunnelManagedService.refreshRequirements(),
+        ]);
+        const data = new status_model_1.RemoteAccessCloudflareTunnelPluginStatusModel();
+        data.type = status.type;
+        data.state = status.state;
+        data.endpoints = (0, transform_utils_1.toInstance)(provider_model_1.RemoteAccessEndpointModel, status.endpoints);
+        data.message = status.message ?? null;
+        data.details = status.details;
+        data.proxyAddresses = status.proxyAddresses;
+        data.advisories = (0, transform_utils_1.toInstance)(provider_model_1.RemoteAccessAdvisoryModel, status.advisories);
+        data.updatedAt = status.updatedAt;
+        data.requirements = (0, transform_utils_1.toInstance)(status_model_1.RemoteAccessCloudflareTunnelPluginRequirementModel, requirements);
+        data.setup = null;
+        const response = new status_model_1.RemoteAccessCloudflareTunnelPluginStatusResponseModel();
+        response.data = data;
+        return response;
+    }
+};
+exports.SetupController = SetupController;
+__decorate([
+    (0, swagger_1.ApiOperation)({
+        tags: [remote_access_cloudflare_tunnel_constants_1.REMOTE_ACCESS_CLOUDFLARE_TUNNEL_PLUGIN_API_TAG_NAME],
+        summary: 'Install cloudflared',
+        description: 'Starts the privileged setup job: installs the cloudflared package if missing. Progress is streamed as RemoteAccessModule.Setup.Progress events.',
+        operationId: 'create-remote-access-cloudflare-tunnel-plugin-install',
+    }),
+    (0, api_documentation_decorator_1.ApiAcceptedSuccessResponse)(install_model_1.RemoteAccessCloudflareTunnelPluginInstallResponseModel, 'Cloudflare Tunnel setup job started'),
+    (0, common_1.Post)('install'),
+    (0, common_1.HttpCode)(common_1.HttpStatus.ACCEPTED),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], SetupController.prototype, "install", null);
+__decorate([
+    (0, swagger_1.ApiOperation)({
+        tags: [remote_access_cloudflare_tunnel_constants_1.REMOTE_ACCESS_CLOUDFLARE_TUNNEL_PLUGIN_API_TAG_NAME],
+        summary: 'Reset the Cloudflare Tunnel',
+        description: 'Stops the tunnel service and clears the stored tunnel token and public hostname, returning the resulting status.',
+        operationId: 'create-remote-access-cloudflare-tunnel-plugin-reset',
+    }),
+    (0, api_documentation_decorator_1.ApiSuccessResponse)(status_model_1.RemoteAccessCloudflareTunnelPluginStatusResponseModel, 'Cloudflare Tunnel status after reset'),
+    (0, common_1.HttpCode)(common_1.HttpStatus.OK),
+    (0, common_1.Post)('reset'),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], SetupController.prototype, "reset", null);
+exports.SetupController = SetupController = __decorate([
+    (0, swagger_1.ApiTags)(remote_access_cloudflare_tunnel_constants_1.REMOTE_ACCESS_CLOUDFLARE_TUNNEL_PLUGIN_API_TAG_NAME),
+    (0, common_1.Controller)(),
+    (0, roles_guard_1.Roles)(users_constants_1.UserRole.OWNER),
+    __metadata("design:paramtypes", [cloudflare_tunnel_setup_service_1.CloudflareTunnelSetupService,
+        cloudflare_tunnel_provider_service_1.CloudflareTunnelProviderService,
+        cloudflare_tunnel_managed_service_1.CloudflareTunnelManagedService,
+        config_service_1.ConfigService])
+], SetupController);
+//# sourceMappingURL=setup.controller.js.map

package/dist/plugins/remote-access-cloudflare-tunnel/controllers/setup.controller.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"setup.controller.js","sourceRoot":"","sources":["../../../../src/plugins/remote-access-cloudflare-tunnel/controllers/setup.controller.ts"],"names":[],"mappings":"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"}

package/dist/plugins/remote-access-cloudflare-tunnel/controllers/status.controller.d.ts

@@ -0,0 +1,15 @@
+import { PlatformService } from '../../../modules/platform/services/platform.service';
+import { RemoteAccessCloudflareTunnelPluginStatusResponseModel } from '../models/status.model';
+import { CloudflareTunnelManagedService } from '../services/cloudflare-tunnel-managed.service';
+import { CloudflareTunnelProviderService } from '../services/cloudflare-tunnel-provider.service';
+import { CloudflareTunnelSetupService } from '../services/cloudflare-tunnel-setup.service';
+export declare class StatusController {
+    private readonly providerService;
+    private readonly tunnelManagedService;
+    private readonly setupService;
+    private readonly platformService;
+    private readonly logger;
+    constructor(providerService: CloudflareTunnelProviderService, tunnelManagedService: CloudflareTunnelManagedService, setupService: CloudflareTunnelSetupService, platformService: PlatformService);
+    getStatus(): Promise<RemoteAccessCloudflareTunnelPluginStatusResponseModel>;
+    private buildSetupJobModel;
+}

package/dist/plugins/remote-access-cloudflare-tunnel/controllers/status.controller.js

@@ -0,0 +1,98 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    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;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.StatusController = void 0;
+const common_1 = require("@nestjs/common");
+const swagger_1 = require("@nestjs/swagger");
+const logger_1 = require("../../../common/logger");
+const transform_utils_1 = require("../../../common/utils/transform.utils");
+const platform_service_1 = require("../../../modules/platform/services/platform.service");
+const provider_model_1 = require("../../../modules/remote-access/models/provider.model");
+const api_documentation_decorator_1 = require("../../../modules/swagger/decorators/api-documentation.decorator");
+const roles_guard_1 = require("../../../modules/users/guards/roles.guard");
+const users_constants_1 = require("../../../modules/users/users.constants");
+const status_model_1 = require("../models/status.model");
+const remote_access_cloudflare_tunnel_constants_1 = require("../remote-access-cloudflare-tunnel.constants");
+const cloudflare_tunnel_managed_service_1 = require("../services/cloudflare-tunnel-managed.service");
+const cloudflare_tunnel_provider_service_1 = require("../services/cloudflare-tunnel-provider.service");
+const cloudflare_tunnel_setup_service_1 = require("../services/cloudflare-tunnel-setup.service");
+let StatusController = class StatusController {
+    constructor(providerService, tunnelManagedService, setupService, platformService) {
+        this.providerService = providerService;
+        this.tunnelManagedService = tunnelManagedService;
+        this.setupService = setupService;
+        this.platformService = platformService;
+        this.logger = (0, logger_1.createExtensionLogger)(remote_access_cloudflare_tunnel_constants_1.REMOTE_ACCESS_CLOUDFLARE_TUNNEL_PLUGIN_NAME, 'StatusController');
+    }
+    async getStatus() {
+        this.logger.debug('Fetching Cloudflare Tunnel status');
+        const [status, requirements, privilegedWorkerSupport] = await Promise.all([
+            this.providerService.getStatus(),
+            this.tunnelManagedService.refreshRequirements(),
+            this.platformService.getPrivilegedWorkerSupport(),
+        ]);
+        const data = new status_model_1.RemoteAccessCloudflareTunnelPluginStatusModel();
+        data.type = status.type;
+        data.state = status.state;
+        data.endpoints = (0, transform_utils_1.toInstance)(provider_model_1.RemoteAccessEndpointModel, status.endpoints);
+        data.message = status.message ?? null;
+        data.details = status.details;
+        data.proxyAddresses = status.proxyAddresses;
+        data.advisories = (0, transform_utils_1.toInstance)(provider_model_1.RemoteAccessAdvisoryModel, status.advisories);
+        data.updatedAt = status.updatedAt;
+        data.requirements = (0, transform_utils_1.toInstance)(status_model_1.RemoteAccessCloudflareTunnelPluginRequirementModel, requirements);
+        data.setup = this.buildSetupJobModel();
+        const privilegedSetup = new status_model_1.RemoteAccessCloudflareTunnelPluginPrivilegedSetupModel();
+        privilegedSetup.available = privilegedWorkerSupport.supported;
+        privilegedSetup.reason = privilegedWorkerSupport.reason;
+        data.privilegedSetup = privilegedSetup;
+        const response = new status_model_1.RemoteAccessCloudflareTunnelPluginStatusResponseModel();
+        response.data = data;
+        return response;
+    }
+    buildSetupJobModel() {
+        const lastJob = this.setupService.getLastJob();
+        if (!lastJob) {
+            return null;
+        }
+        const model = new status_model_1.RemoteAccessCloudflareTunnelPluginSetupJobModel();
+        model.jobId = lastJob.id;
+        model.state = lastJob.status.state;
+        model.step = lastJob.status.step ?? null;
+        model.message = lastJob.status.message ?? null;
+        model.updatedAt = lastJob.status.updatedAt;
+        return model;
+    }
+};
+exports.StatusController = StatusController;
+__decorate([
+    (0, swagger_1.ApiOperation)({
+        tags: [remote_access_cloudflare_tunnel_constants_1.REMOTE_ACCESS_CLOUDFLARE_TUNNEL_PLUGIN_API_TAG_NAME],
+        summary: 'Get Cloudflare Tunnel status',
+        description: 'Retrieve the full Cloudflare Tunnel status: connection state, published endpoints, provider-specific details and the setup requirements checklist.',
+        operationId: 'get-remote-access-cloudflare-tunnel-plugin-status',
+    }),
+    (0, api_documentation_decorator_1.ApiSuccessResponse)(status_model_1.RemoteAccessCloudflareTunnelPluginStatusResponseModel, 'Cloudflare Tunnel status retrieved successfully'),
+    (0, common_1.Get)('status'),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], StatusController.prototype, "getStatus", null);
+exports.StatusController = StatusController = __decorate([
+    (0, swagger_1.ApiTags)(remote_access_cloudflare_tunnel_constants_1.REMOTE_ACCESS_CLOUDFLARE_TUNNEL_PLUGIN_API_TAG_NAME),
+    (0, common_1.Controller)(),
+    (0, roles_guard_1.Roles)(users_constants_1.UserRole.ADMIN, users_constants_1.UserRole.OWNER),
+    __metadata("design:paramtypes", [cloudflare_tunnel_provider_service_1.CloudflareTunnelProviderService,
+        cloudflare_tunnel_managed_service_1.CloudflareTunnelManagedService,
+        cloudflare_tunnel_setup_service_1.CloudflareTunnelSetupService,
+        platform_service_1.PlatformService])
+], StatusController);
+//# sourceMappingURL=status.controller.js.map

package/dist/plugins/remote-access-cloudflare-tunnel/controllers/status.controller.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"status.controller.js","sourceRoot":"","sources":["../../../../src/plugins/remote-access-cloudflare-tunnel/controllers/status.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAiD;AACjD,6CAAwD;AAExD,mDAA+D;AAC/D,2EAAmE;AACnE,0FAAsF;AACtF,yFAG8D;AAC9D,iHAAqG;AACrG,2EAAkE;AAClE,4EAAkE;AAClE,yDAMgC;AAChC,4GAGsD;AACtD,qGAA+F;AAC/F,uGAAiG;AACjG,iGAA2F;AAKpF,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAG5B,YACkB,eAAgD,EAChD,oBAAoD,EACpD,YAA0C,EAC1C,eAAgC;QAHhC,oBAAe,GAAf,eAAe,CAAiC;QAChD,yBAAoB,GAApB,oBAAoB,CAAgC;QACpD,iBAAY,GAAZ,YAAY,CAA8B;QAC1C,oBAAe,GAAf,eAAe,CAAiB;QANjC,WAAM,GAAG,IAAA,8BAAqB,EAAC,uFAA2C,EAAE,kBAAkB,CAAC,CAAC;IAO9G,CAAC;IAcE,AAAN,KAAK,CAAC,SAAS;QACd,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAC;QAEvD,MAAM,CAAC,MAAM,EAAE,YAAY,EAAE,uBAAuB,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACzE,IAAI,CAAC,eAAe,CAAC,SAAS,EAAE;YAChC,IAAI,CAAC,oBAAoB,CAAC,mBAAmB,EAAE;YAC/C,IAAI,CAAC,eAAe,CAAC,0BAA0B,EAAE;SACjD,CAAC,CAAC;QAEH,MAAM,IAAI,GAAG,IAAI,4DAA6C,EAAE,CAAC;QACjE,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;QACxB,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;QAC1B,IAAI,CAAC,SAAS,GAAG,IAAA,4BAAU,EAAC,0CAAyB,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC;QACzE,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI,IAAI,CAAC;QACtC,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;QAC9B,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC,cAAc,CAAC;QAC5C,IAAI,CAAC,UAAU,GAAG,IAAA,4BAAU,EAAC,0CAAyB,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;QAC3E,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;QAClC,IAAI,CAAC,YAAY,GAAG,IAAA,4BAAU,EAAC,iEAAkD,EAAE,YAAY,CAAC,CAAC;QACjG,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAEvC,MAAM,eAAe,GAAG,IAAI,qEAAsD,EAAE,CAAC;QACrF,eAAe,CAAC,SAAS,GAAG,uBAAuB,CAAC,SAAS,CAAC;QAC9D,eAAe,CAAC,MAAM,GAAG,uBAAuB,CAAC,MAAM,CAAC;QACxD,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QAEvC,MAAM,QAAQ,GAAG,IAAI,oEAAqD,EAAE,CAAC;QAC7E,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAC;QAErB,OAAO,QAAQ,CAAC;IACjB,CAAC;IAGO,kBAAkB;QACzB,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,CAAC;QAE/C,IAAI,CAAC,OAAO,EAAE,CAAC;YACd,OAAO,IAAI,CAAC;QACb,CAAC;QAED,MAAM,KAAK,GAAG,IAAI,8DAA+C,EAAE,CAAC;QACpE,KAAK,CAAC,KAAK,GAAG,OAAO,CAAC,EAAE,CAAC;QACzB,KAAK,CAAC,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;QACnC,KAAK,CAAC,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,IAAI,IAAI,CAAC;QACzC,KAAK,CAAC,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,IAAI,IAAI,CAAC;QAC/C,KAAK,CAAC,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC;QAE3C,OAAO,KAAK,CAAC;IACd,CAAC;CACD,CAAA;AAvEY,4CAAgB;AAsBtB;IAZL,IAAA,sBAAY,EAAC;QACb,IAAI,EAAE,CAAC,+FAAmD,CAAC;QAC3D,OAAO,EAAE,8BAA8B;QACvC,WAAW,EACV,oJAAoJ;QACrJ,WAAW,EAAE,mDAAmD;KAChE,CAAC;IACD,IAAA,gDAAkB,EAClB,oEAAqD,EACrD,iDAAiD,CACjD;IACA,IAAA,YAAG,EAAC,QAAQ,CAAC;;;;iDA+Bb;2BApDW,gBAAgB;IAH5B,IAAA,iBAAO,EAAC,+FAAmD,CAAC;IAC5D,IAAA,mBAAU,GAAE;IACZ,IAAA,mBAAK,EAAC,0BAAQ,CAAC,KAAK,EAAE,0BAAQ,CAAC,KAAK,CAAC;qCAKF,oEAA+B;QAC1B,kEAA8B;QACtC,8DAA4B;QACzB,kCAAe;GAPtC,gBAAgB,CAuE5B"}

package/dist/plugins/remote-access-cloudflare-tunnel/dto/update-config.dto.d.ts

@@ -0,0 +1,9 @@
+import { UpdatePluginConfigDto } from '../../../modules/config/dto/config.dto';
+import { CloudflareTunnelProtocol } from '../remote-access-cloudflare-tunnel.constants';
+export declare class UpdateRemoteAccessCloudflareTunnelPluginConfigDto extends UpdatePluginConfigDto {
+    type: string;
+    enabled?: boolean;
+    publicHostname?: string | null;
+    protocol?: CloudflareTunnelProtocol;
+    tunnelToken?: string | null;
+}