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

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

@@ -1,16 +1,18 @@
 import { ConfigService } from '../../../modules/config/services/config.service';
+import { PlatformService } from '../../../modules/platform/services/platform.service';
+import { RemoteAccessStatusService } from '../../../modules/remote-access/services/remote-access-status.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 statusService;
     private readonly tunnelManagedService;
     private readonly configService;
+    private readonly platformService;
     private readonly logger;
-    constructor(setupService: CloudflareTunnelSetupService, providerService: CloudflareTunnelProviderService, tunnelManagedService: CloudflareTunnelManagedService, configService: ConfigService);
+    constructor(setupService: CloudflareTunnelSetupService, statusService: RemoteAccessStatusService, tunnelManagedService: CloudflareTunnelManagedService, configService: ConfigService, platformService: PlatformService);
     install(): Promise<RemoteAccessCloudflareTunnelPluginInstallResponseModel>;
     reset(): Promise<RemoteAccessCloudflareTunnelPluginStatusResponseModel>;
     private buildStatusResponse;

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

@@ -15,7 +15,9 @@ 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 platform_service_1 = require("../../../modules/platform/services/platform.service");
 const provider_model_1 = require("../../../modules/remote-access/models/provider.model");
+const remote_access_status_service_1 = require("../../../modules/remote-access/services/remote-access-status.service");
 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");
@@ -25,14 +27,14 @@ 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) {
+    constructor(setupService, statusService, tunnelManagedService, configService, platformService) {
         this.setupService = setupService;
-        this.providerService = providerService;
+        this.statusService = statusService;
         this.tunnelManagedService = tunnelManagedService;
         this.configService = configService;
+        this.platformService = platformService;
         this.logger = (0, logger_1.createExtensionLogger)(remote_access_cloudflare_tunnel_constants_1.REMOTE_ACCESS_CLOUDFLARE_TUNNEL_PLUGIN_NAME, 'SetupController');
     }
     async install() {
@@ -86,11 +88,16 @@ let SetupController = class SetupController {
         return this.buildStatusResponse();
     }
     async buildStatusResponse() {
-        const [status, requirements] = await Promise.all([
-            this.providerService.getStatus(),
-            this.tunnelManagedService.refreshRequirements(),
+        const [observed, privilegedWorkerSupport] = await Promise.all([
+            this.statusService.getProviderSnapshot(remote_access_cloudflare_tunnel_constants_1.REMOTE_ACCESS_CLOUDFLARE_TUNNEL_PLUGIN_NAME, { fresh: true }),
+            this.platformService.getPrivilegedWorkerSupport(),
         ]);
+        const snapshot = this.statusService.getCachedProviderSnapshot(remote_access_cloudflare_tunnel_constants_1.REMOTE_ACCESS_CLOUDFLARE_TUNNEL_PLUGIN_NAME) ?? observed;
+        const { status, metadata } = snapshot;
+        const requirements = metadata?.requirements ?? [];
         const data = new status_model_1.RemoteAccessCloudflareTunnelPluginStatusModel();
+        data.epoch = status.epoch;
+        data.revision = status.revision;
         data.type = status.type;
         data.state = status.state;
         data.endpoints = (0, transform_utils_1.toInstance)(provider_model_1.RemoteAccessEndpointModel, status.endpoints);
@@ -101,6 +108,10 @@ let SetupController = class SetupController {
         data.updatedAt = status.updatedAt;
         data.requirements = (0, transform_utils_1.toInstance)(status_model_1.RemoteAccessCloudflareTunnelPluginRequirementModel, requirements);
         data.setup = null;
+        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;
@@ -140,8 +151,9 @@ exports.SetupController = SetupController = __decorate([
     (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,
+        remote_access_status_service_1.RemoteAccessStatusService,
         cloudflare_tunnel_managed_service_1.CloudflareTunnelManagedService,
-        config_service_1.ConfigService])
+        config_service_1.ConfigService,
+        platform_service_1.PlatformService])
 ], SetupController);
 //# sourceMappingURL=setup.controller.js.map

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

@@ -1 +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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"}
+{"version":3,"file":"setup.controller.js","sourceRoot":"","sources":["../../../../src/plugins/remote-access-cloudflare-tunnel/controllers/setup.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAQwB;AACxB,6CAAwD;AAExD,mDAA+D;AAC/D,2EAAmE;AACnE,oFAAgF;AAChF,0FAAsF;AACtF,yFAG8D;AAC9D,uHAAiH;AACjH,iHAGyE;AACzE,iFAAiG;AACjG,2EAAkE;AAClE,4EAAkE;AAClE,gEAA6F;AAC7F,2DAGiC;AACjC,yDAKgC;AAChC,4GAGsD;AACtD,qGAGuD;AACvD,iGAGqD;AAY9C,IAAM,eAAe,GAArB,MAAM,eAAe;IAG3B,YACkB,YAA0C,EAC1C,aAAwC,EACxC,oBAAoD,EACpD,aAA4B,EAC5B,eAAgC;QAJhC,iBAAY,GAAZ,YAAY,CAA8B;QAC1C,kBAAa,GAAb,aAAa,CAA2B;QACxC,yBAAoB,GAApB,oBAAoB,CAAgC;QACpD,kBAAa,GAAb,aAAa,CAAe;QAC5B,oBAAe,GAAf,eAAe,CAAiB;QAPjC,WAAM,GAAG,IAAA,8BAAqB,EAAC,uFAA2C,EAAE,iBAAiB,CAAC,CAAC;IAQ7G,CAAC;IAeE,AAAN,KAAK,CAAC,OAAO;QACZ,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAC;QAEzD,IAAI,CAAC;YACJ,MAAM,EAAE,EAAE,EAAE,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC;YAEjD,MAAM,IAAI,GAAG,IAAI,8DAA8C,EAAE,CAAC;YAClE,IAAI,CAAC,GAAG,GAAG,EAAE,CAAC;YAEd,MAAM,QAAQ,GAAG,IAAI,sEAAsD,EAAE,CAAC;YAC9E,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAC;YAErB,OAAO,QAAQ,CAAC;QACjB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAMhB,IAAI,KAAK,YAAY,wDAAoC,EAAE,CAAC;gBAC3D,MAAM,IAAI,0BAAiB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAC5C,CAAC;YAED,IAAI,KAAK,YAAY,2EAAyC,EAAE,CAAC;gBAChE,MAAM,IAAI,qCAA4B,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YACtF,CAAC;YAED,MAAM,GAAG,GAAG,KAAc,CAAC;YAE3B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,4CAA4C,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;YAE7E,MAAM,IAAI,qCAA4B,CAAC,yCAAyC,CAAC,CAAC;QACnF,CAAC;IACF,CAAC;IAYK,AAAN,KAAK,CAAC,KAAK;QACV,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAC;QAEvD,IAAI,CAAC;YACJ,MAAM,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,CAAC;QACxC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,8DAA8D,EAAE;gBAChF,OAAO,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;aAC/D,CAAC,CAAC;QACJ,CAAC;QAED,IAAI,CAAC;YACJ,MAAM,KAAK,GAA4B;gBACtC,IAAI,EAAE,uFAA2C;gBACjD,YAAY,EAAE,IAAI;gBAClB,eAAe,EAAE,IAAI;aACrB,CAAC;YAEF,MAAM,GAAG,GAAG,IAAA,4BAAU,EAAC,qEAAiD,EAAE,KAAK,EAAE;gBAChF,uBAAuB,EAAE,KAAK;aAC9B,CAAC,CAAC;YAEH,MAAM,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,uFAA2C,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;QACtG,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,GAAG,GAAG,KAAc,CAAC;YAE3B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,qEAAqE,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;YAEtG,MAAM,IAAI,qCAA4B,CAAC,qDAAqD,CAAC,CAAC;QAC/F,CAAC;QAED,OAAO,IAAI,CAAC,mBAAmB,EAAE,CAAC;IACnC,CAAC;IAGO,KAAK,CAAC,mBAAmB;QAChC,MAAM,CAAC,QAAQ,EAAE,uBAAuB,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAC7D,IAAI,CAAC,aAAa,CAAC,mBAAmB,CACrC,uFAA2C,EAC3C,EAAE,KAAK,EAAE,IAAI,EAAE,CACf;YACD,IAAI,CAAC,eAAe,CAAC,0BAA0B,EAAE;SACjD,CAAC,CAAC;QAEH,MAAM,QAAQ,GACb,IAAI,CAAC,aAAa,CAAC,yBAAyB,CAC3C,uFAA2C,CAC3C,IAAI,QAAQ,CAAC;QACf,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,QAAQ,CAAC;QACtC,MAAM,YAAY,GAAG,QAAQ,EAAE,YAAY,IAAI,EAAE,CAAC;QAElD,MAAM,IAAI,GAAG,IAAI,4DAA6C,EAAE,CAAC;QACjE,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;QAC1B,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;QAChC,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;QAClB,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;CACD,CAAA;AA/IY,0CAAe;AAwBrB;IAbL,IAAA,sBAAY,EAAC;QACb,IAAI,EAAE,CAAC,+FAAmD,CAAC;QAC3D,OAAO,EAAE,qBAAqB;QAC9B,WAAW,EACV,iJAAiJ;QAClJ,WAAW,EAAE,uDAAuD;KACpE,CAAC;IACD,IAAA,wDAA0B,EAC1B,sEAAsD,EACtD,qCAAqC,CACrC;IACA,IAAA,aAAI,EAAC,SAAS,CAAC;IACf,IAAA,iBAAQ,EAAC,mBAAU,CAAC,QAAQ,CAAC;;;;8CAkC7B;AAYK;IAVL,IAAA,sBAAY,EAAC;QACb,IAAI,EAAE,CAAC,+FAAmD,CAAC;QAC3D,OAAO,EAAE,6BAA6B;QACtC,WAAW,EACV,kHAAkH;QACnH,WAAW,EAAE,qDAAqD;KAClE,CAAC;IACD,IAAA,gDAAkB,EAAC,oEAAqD,EAAE,sCAAsC,CAAC;IACjH,IAAA,iBAAQ,EAAC,mBAAU,CAAC,EAAE,CAAC;IACvB,IAAA,aAAI,EAAC,OAAO,CAAC;;;;4CAiCb;0BArGW,eAAe;IAH3B,IAAA,iBAAO,EAAC,+FAAmD,CAAC;IAC5D,IAAA,mBAAU,GAAE;IACZ,IAAA,mBAAK,EAAC,0BAAQ,CAAC,KAAK,CAAC;qCAKW,8DAA4B;QAC3B,wDAAyB;QAClB,kEAA8B;QACrC,8BAAa;QACX,kCAAe;GARtC,eAAe,CA+I3B"}

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

@@ -1,15 +1,13 @@
 import { PlatformService } from '../../../modules/platform/services/platform.service';
+import { RemoteAccessStatusService } from '../../../modules/remote-access/services/remote-access-status.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 statusService;
     private readonly setupService;
     private readonly platformService;
     private readonly logger;
-    constructor(providerService: CloudflareTunnelProviderService, tunnelManagedService: CloudflareTunnelManagedService, setupService: CloudflareTunnelSetupService, platformService: PlatformService);
+    constructor(statusService: RemoteAccessStatusService, setupService: CloudflareTunnelSetupService, platformService: PlatformService);
     getStatus(): Promise<RemoteAccessCloudflareTunnelPluginStatusResponseModel>;
     private buildSetupJobModel;
 }

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

@@ -16,30 +16,32 @@ 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 remote_access_status_service_1 = require("../../../modules/remote-access/services/remote-access-status.service");
 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;
+    constructor(statusService, setupService, platformService) {
+        this.statusService = statusService;
         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(),
+        const [observed, privilegedWorkerSupport] = await Promise.all([
+            this.statusService.getProviderSnapshot(remote_access_cloudflare_tunnel_constants_1.REMOTE_ACCESS_CLOUDFLARE_TUNNEL_PLUGIN_NAME, { fresh: true }),
             this.platformService.getPrivilegedWorkerSupport(),
         ]);
+        const snapshot = this.statusService.getCachedProviderSnapshot(remote_access_cloudflare_tunnel_constants_1.REMOTE_ACCESS_CLOUDFLARE_TUNNEL_PLUGIN_NAME) ?? observed;
+        const { status, metadata } = snapshot;
+        const requirements = metadata?.requirements ?? [];
         const data = new status_model_1.RemoteAccessCloudflareTunnelPluginStatusModel();
+        data.epoch = status.epoch;
+        data.revision = status.revision;
         data.type = status.type;
         data.state = status.state;
         data.endpoints = (0, transform_utils_1.toInstance)(provider_model_1.RemoteAccessEndpointModel, status.endpoints);
@@ -90,8 +92,7 @@ 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,
+    __metadata("design:paramtypes", [remote_access_status_service_1.RemoteAccessStatusService,
         cloudflare_tunnel_setup_service_1.CloudflareTunnelSetupService,
         platform_service_1.PlatformService])
 ], StatusController);

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

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

package/dist/plugins/remote-access-cloudflare-tunnel/models/status.model.d.ts

@@ -25,6 +25,8 @@ export declare class RemoteAccessCloudflareTunnelPluginPrivilegedSetupModel {
     reason: string | null;
 }
 export declare class RemoteAccessCloudflareTunnelPluginStatusModel {
+    epoch: string;
+    revision: number;
     type: string;
     state: RemoteAccessProviderState;
     endpoints: RemoteAccessEndpointModel[];

package/dist/plugins/remote-access-cloudflare-tunnel/models/status.model.js

@@ -206,6 +206,23 @@ exports.RemoteAccessCloudflareTunnelPluginPrivilegedSetupModel = RemoteAccessClo
 let RemoteAccessCloudflareTunnelPluginStatusModel = class RemoteAccessCloudflareTunnelPluginStatusModel {
 };
 exports.RemoteAccessCloudflareTunnelPluginStatusModel = RemoteAccessCloudflareTunnelPluginStatusModel;
+__decorate([
+    (0, swagger_1.ApiProperty)({ description: 'Process epoch; changes after backend restart', type: 'string' }),
+    (0, class_transformer_1.Expose)(),
+    (0, class_validator_1.IsString)(),
+    __metadata("design:type", String)
+], RemoteAccessCloudflareTunnelPluginStatusModel.prototype, "epoch", void 0);
+__decorate([
+    (0, swagger_1.ApiProperty)({
+        description: 'Monotonic accepted publication revision within this epoch',
+        type: 'integer',
+        minimum: 0,
+    }),
+    (0, class_transformer_1.Expose)(),
+    (0, class_validator_1.IsInt)(),
+    (0, class_validator_1.Min)(0),
+    __metadata("design:type", Number)
+], RemoteAccessCloudflareTunnelPluginStatusModel.prototype, "revision", void 0);
 __decorate([
     (0, swagger_1.ApiProperty)({
         description: 'Provider plugin type identifier',

package/dist/plugins/remote-access-cloudflare-tunnel/models/status.model.js.map

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

package/dist/plugins/remote-access-cloudflare-tunnel/services/cloudflare-tunnel-managed.service.d.ts

@@ -9,6 +9,9 @@ import { RemoteAccessCloudflareTunnelPluginConfigModel } from '../models/config.
 import { CloudflaredCliService } from './cloudflared-cli.service';
 import { CloudflaredMetricsService } from './cloudflared-metrics.service';
 import { CloudflaredProcessService } from './cloudflared-process.service';
+export interface CloudflareTunnelObservationMetadata {
+    requirements: CloudflareTunnelRequirement[];
+}
 export type CloudflareTunnelRequirementCode = 'platform-supported' | 'binary-installed' | 'version-supported' | 'token-configured';
 export interface CloudflareTunnelRequirementRemedy {
     commands: string[];
@@ -36,6 +39,9 @@ export declare class CloudflareTunnelManagedService extends BaseManagedExtension
     };
     readonly serviceId = "tunnel";
     readonly activationPolicy: "owner-enabled";
+    private generation;
+    private readonly observations;
+    private readonly requirementObservations;
     private pollTimer;
     private lastStatus;
     private lastError;
@@ -53,7 +59,7 @@ export declare class CloudflareTunnelManagedService extends BaseManagedExtension
         reason?: string;
     }>;
     getRequirements(): CloudflareTunnelRequirement[];
-    refreshRequirements(): Promise<CloudflareTunnelRequirement[]>;
+    refreshRequirements(signal?: AbortSignal): Promise<CloudflareTunnelRequirement[]>;
     private requirementsSatisfied;
     private evaluateRequirementsLive;
     private unevaluatedRequirement;
@@ -67,7 +73,19 @@ export declare class CloudflareTunnelManagedService extends BaseManagedExtension
     private evaluateTokenConfigured;
     private firstBlockingRequirement;
     private stateForRequirementCode;
-    computeStatus(): Promise<RemoteAccessProviderStatus>;
+    computeStatus(options?: {
+        signal?: AbortSignal;
+        fresh?: boolean;
+    }): Promise<RemoteAccessProviderStatus>;
+    awaitObservationIdle(): Promise<void>;
+    getStatusSnapshot(options?: {
+        signal?: AbortSignal;
+        fresh?: boolean;
+    }): Promise<{
+        status: RemoteAccessProviderStatus;
+        metadata: CloudflareTunnelObservationMetadata;
+    }>;
+    private collectStatus;
     private isPollable;
     private schedulePoll;
     private clearPoll;

package/dist/plugins/remote-access-cloudflare-tunnel/services/cloudflare-tunnel-managed.service.js

@@ -11,13 +11,14 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CloudflareTunnelManagedService = void 0;
 exports.compareCloudflaredVersions = compareCloudflaredVersions;
-const node_child_process_1 = require("node:child_process");
 const path_1 = require("path");
 const common_1 = require("@nestjs/common");
 const config_1 = require("@nestjs/config");
 const event_emitter_1 = require("@nestjs/event-emitter");
 const logger_1 = require("../../../common/logger");
+const cancellable_exec_utils_1 = require("../../../common/utils/cancellable-exec.utils");
 const config_utils_1 = require("../../../common/utils/config.utils");
+const remote_access_observation_utils_1 = require("../../../common/utils/remote-access-observation.utils");
 const config_service_1 = require("../../../modules/config/services/config.service");
 const base_managed_extension_service_1 = require("../../../modules/extensions/services/base-managed-extension.service");
 const platform_constants_1 = require("../../../modules/platform/platform.constants");
@@ -62,6 +63,9 @@ let CloudflareTunnelManagedService = class CloudflareTunnelManagedService extend
         this.owner = { kind: 'plugin', type: remote_access_cloudflare_tunnel_constants_1.REMOTE_ACCESS_CLOUDFLARE_TUNNEL_PLUGIN_NAME };
         this.serviceId = 'tunnel';
         this.activationPolicy = 'owner-enabled';
+        this.generation = 0;
+        this.observations = new remote_access_observation_utils_1.RemoteAccessObservation();
+        this.requirementObservations = new remote_access_observation_utils_1.RemoteAccessObservation();
         this.pollTimer = null;
         this.lastStatus = null;
         this.lastError = null;
@@ -74,12 +78,18 @@ let CloudflareTunnelManagedService = class CloudflareTunnelManagedService extend
             if (this.state === 'started') {
                 return;
             }
+            const generation = ++this.generation;
+            this.observations.invalidate();
+            this.requirementObservations.invalidate();
             this.state = 'starting';
             this.pluginConfig = null;
             const config = this.getPluginConfig();
             this.logger.log('Starting Cloudflare Tunnel service');
             try {
                 const requirements = await this.refreshRequirements();
+                if (generation !== this.generation) {
+                    return;
+                }
                 if (this.requirementsSatisfied(requirements)) {
                     this.processService.start({
                         token: config.tunnelToken ?? '',
@@ -99,6 +109,10 @@ let CloudflareTunnelManagedService = class CloudflareTunnelManagedService extend
         });
     }
     async stop() {
+        this.generation++;
+        this.observations.invalidate();
+        this.requirementObservations.invalidate();
+        this.clearPoll();
         await this.withLock(async () => {
             if (this.state === 'stopped') {
                 return;
@@ -122,11 +136,24 @@ let CloudflareTunnelManagedService = class CloudflareTunnelManagedService extend
         });
     }
     async emitStatus() {
-        const status = await this.computeStatus();
+        const generation = this.generation;
+        const snapshot = this.state === 'stopped' || this.state === 'stopping' || this.state === 'error'
+            ? {
+                status: this.buildStatus(this.state === 'error' ? 'error' : 'disconnected', this.lastError ?? 'The tunnel service is stopped.'),
+                metadata: { requirements: this.getRequirements() },
+            }
+            : await this.getStatusSnapshot();
+        if (generation !== this.generation) {
+            return;
+        }
+        const status = snapshot.status;
         this.lastStatus = status;
-        this.eventEmitter.emit(remote_access_constants_1.EventType.PROVIDER_STATUS, status);
+        this.eventEmitter.emit(remote_access_constants_1.EventType.PROVIDER_OBSERVATION, snapshot);
     }
     async onConfigChanged() {
+        this.generation++;
+        this.observations.invalidate();
+        this.requirementObservations.invalidate();
         const previous = this.pluginConfig;
         this.pluginConfig = null;
         const next = this.getPluginConfig();
@@ -144,11 +171,7 @@ let CloudflareTunnelManagedService = class CloudflareTunnelManagedService extend
         return { restartRequired: false };
     }
     async isHealthy() {
-        if (!this.processService.isRunning()) {
-            return false;
-        }
-        const ready = await this.metricsService.fetchReady(this.getMetricsAddress());
-        return ready !== null;
+        return (await this.computeStatus()).state === 'connected';
     }
     async factoryReset() {
         try {
@@ -162,35 +185,40 @@ let CloudflareTunnelManagedService = class CloudflareTunnelManagedService extend
     getRequirements() {
         return this.requirementsCache ?? [];
     }
-    async refreshRequirements() {
-        const requirements = await this.evaluateRequirementsLive();
-        this.requirementsCache = requirements;
+    async refreshRequirements(signal) {
+        const generation = this.generation;
+        const requirements = await this.requirementObservations.run((readSignal) => this.evaluateRequirementsLive(readSignal), signal);
+        signal?.throwIfAborted();
+        if (generation === this.generation) {
+            this.requirementsCache = requirements;
+        }
         return requirements;
     }
     requirementsSatisfied(requirements) {
         return requirements.length > 0 && requirements.every((requirement) => requirement.satisfied);
     }
-    async evaluateRequirementsLive() {
+    async evaluateRequirementsLive(signal) {
         const platform = await this.evaluatePlatformSupported();
+        signal?.throwIfAborted();
         if (!platform.satisfied) {
             return this.attachRemedies([
                 platform,
                 this.unevaluatedRequirement('binary-installed'),
                 this.unevaluatedRequirement('version-supported'),
                 this.unevaluatedRequirement('token-configured'),
-            ]);
+            ], signal);
         }
-        const { binary, version } = await this.evaluateBinaryAndVersion();
+        const { binary, version } = await this.evaluateBinaryAndVersion(signal);
         const token = this.evaluateTokenConfigured();
-        return this.attachRemedies([platform, binary, version, token]);
+        return this.attachRemedies([platform, binary, version, token], signal);
     }
     unevaluatedRequirement(code) {
         return { code, satisfied: false, message: UNEVALUATED_MESSAGE };
     }
-    async attachRemedies(requirements) {
+    async attachRemedies(requirements, signal) {
         let installRemedyPromise = null;
         const getInstallRemedy = () => {
-            installRemedyPromise ??= this.buildInstallRemedy();
+            installRemedyPromise ??= this.buildInstallRemedy(signal);
             return installRemedyPromise;
         };
         return Promise.all(requirements.map((requirement) => this.finalizeRequirement(requirement, getInstallRemedy)));
@@ -213,9 +241,9 @@ let CloudflareTunnelManagedService = class CloudflareTunnelManagedService extend
                 return { commands: [], note: remote_access_cloudflare_tunnel_constants_1.CLOUDFLARE_TUNNEL_DOCUMENTATION_URL };
         }
     }
-    async buildInstallRemedy() {
+    async buildInstallRemedy(signal) {
         try {
-            const stdout = await this.runSetupScriptPrintPlan();
+            const stdout = await this.runSetupScriptPrintPlan(signal);
             const lines = stdout
                 .split('\n')
                 .map((line) => line.trim())
@@ -235,17 +263,9 @@ let CloudflareTunnelManagedService = class CloudflareTunnelManagedService extend
             return { commands: [], note: remote_access_cloudflare_tunnel_constants_1.CLOUDFLARE_TUNNEL_VENDOR_DOWNLOAD_URL };
         }
     }
-    runSetupScriptPrintPlan() {
+    async runSetupScriptPrintPlan(signal) {
         const script = (0, path_1.join)(__dirname, '..', 'scripts', 'cloudflared-setup.sh');
-        return new Promise((resolve, reject) => {
-            (0, node_child_process_1.execFile)('bash', [script, '--print-plan'], { timeout: remote_access_cloudflare_tunnel_constants_1.CLOUDFLARE_TUNNEL_PRINT_PLAN_TIMEOUT_MS }, (error, stdout) => {
-                if (error) {
-                    reject(error);
-                    return;
-                }
-                resolve(stdout ?? '');
-            });
-        });
+        return (await (0, cancellable_exec_utils_1.cancellableExecFile)('bash', [script, '--print-plan'], signal, remote_access_cloudflare_tunnel_constants_1.CLOUDFLARE_TUNNEL_PRINT_PLAN_TIMEOUT_MS)).stdout;
     }
     async evaluatePlatformSupported() {
         const platformType = await this.platformService.getPlatformTypeAsync();
@@ -258,9 +278,10 @@ let CloudflareTunnelManagedService = class CloudflareTunnelManagedService extend
             message: `Cloudflare Tunnel is not supported on the '${platformType}' platform.`,
         };
     }
-    async evaluateBinaryAndVersion() {
+    async evaluateBinaryAndVersion(signal) {
         try {
-            const info = await this.cliService.getVersion();
+            const info = await this.cliService.getVersion(signal);
+            signal?.throwIfAborted();
             this.lastKnownVersion = info.version;
             const supported = compareCloudflaredVersions(info.version, remote_access_cloudflare_tunnel_constants_1.CLOUDFLARED_MIN_VERSION) >= 0;
             return {
@@ -324,14 +345,45 @@ let CloudflareTunnelManagedService = class CloudflareTunnelManagedService extend
                 return 'not-installed';
         }
     }
-    async computeStatus() {
+    async computeStatus(options) {
+        return (await this.getStatusSnapshot(options)).status;
+    }
+    async awaitObservationIdle() {
+        await Promise.all([this.observations.awaitIdle(), this.requirementObservations.awaitIdle()]);
+    }
+    async getStatusSnapshot(options) {
+        const generation = this.generation;
+        try {
+            const snapshot = await this.observations.run(async (signal) => {
+                const requirements = await this.refreshRequirements(signal);
+                const status = await this.collectStatus(requirements, signal);
+                signal.throwIfAborted();
+                return { status, metadata: { requirements } };
+            }, options?.signal);
+            if (generation === this.generation) {
+                return snapshot;
+            }
+        }
+        catch (error) {
+            if (generation === this.generation && this.isPollable()) {
+                return {
+                    status: this.buildStatus('error', error instanceof Error ? error.message : 'The status observation failed.'),
+                    metadata: { requirements: this.getRequirements() },
+                };
+            }
+        }
+        return {
+            status: this.buildStatus(this.state === 'error' ? 'error' : 'disconnected', this.lastError ?? 'The observation was superseded by a lifecycle action.'),
+            metadata: { requirements: this.getRequirements() },
+        };
+    }
+    async collectStatus(requirements, signal) {
         if (this.state === 'stopped' || this.state === 'stopping') {
             return this.buildStatus('disconnected', 'The tunnel service is stopped.');
         }
         if (this.state === 'error') {
             return this.buildStatus('error', this.lastError ?? 'The Cloudflare Tunnel service failed.');
         }
-        const requirements = await this.refreshRequirements();
         const blocking = this.firstBlockingRequirement(requirements);
         if (blocking) {
             return this.buildStatus(this.stateForRequirementCode(blocking.code), blocking.message);
@@ -345,7 +397,7 @@ let CloudflareTunnelManagedService = class CloudflareTunnelManagedService extend
                     : 'cloudflared is not running.');
             return this.buildStatus('error', message);
         }
-        const ready = await this.metricsService.fetchReady(this.getMetricsAddress());
+        const ready = await this.metricsService.fetchReady(this.getMetricsAddress(), signal);
         if (ready) {
             return this.buildStatus('connected', undefined, ready);
         }
@@ -377,32 +429,37 @@ let CloudflareTunnelManagedService = class CloudflareTunnelManagedService extend
         }
     }
     async pollTick() {
+        const generation = this.generation;
         try {
-            if (this.state === 'started' && !this.processService.isRunning()) {
-                const requirements = await this.refreshRequirements();
-                if (this.requirementsSatisfied(requirements) && this.isPollable()) {
-                    const config = this.getPluginConfig();
-                    this.processService.start({
-                        token: config.tunnelToken ?? '',
-                        protocol: config.protocol,
-                        metricsAddress: this.getMetricsAddress(),
-                    });
-                }
+            let snapshot = await this.getStatusSnapshot();
+            if (!this.isPollable() || generation !== this.generation) {
+                return;
+            }
+            if (this.state === 'started' &&
+                !this.processService.isRunning() &&
+                this.requirementsSatisfied(snapshot.metadata.requirements)) {
+                const config = this.getPluginConfig();
+                this.processService.start({
+                    token: config.tunnelToken ?? '',
+                    protocol: config.protocol,
+                    metricsAddress: this.getMetricsAddress(),
+                });
+                snapshot = await this.getStatusSnapshot({ fresh: true });
             }
-            const status = await this.computeStatus();
-            if (!this.isPollable()) {
+            if (!this.isPollable() || generation !== this.generation) {
                 return;
             }
+            const status = snapshot.status;
             if (this.hasStatusChanged(this.lastStatus, status)) {
                 this.lastStatus = status;
-                this.eventEmitter.emit(remote_access_constants_1.EventType.PROVIDER_STATUS, status);
+                this.eventEmitter.emit(remote_access_constants_1.EventType.PROVIDER_OBSERVATION, snapshot);
             }
             this.schedulePoll(status.state === 'connecting'
                 ? remote_access_cloudflare_tunnel_constants_1.CLOUDFLARED_POLL_INTERVAL_TRANSITIONING_MS
                 : remote_access_cloudflare_tunnel_constants_1.CLOUDFLARED_POLL_INTERVAL_STABLE_MS);
         }
         catch (error) {
-            if (!this.isPollable()) {
+            if (!this.isPollable() || generation !== this.generation) {
                 return;
             }
             this.logger.error('Cloudflare Tunnel status poll failed', {