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

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

@@ -9,37 +9,39 @@ 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;
+exports.CloudflareTunnelStatusController = 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 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;
+let CloudflareTunnelStatusController = class CloudflareTunnelStatusController {
+    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');
+        this.logger = (0, logger_1.createExtensionLogger)(remote_access_cloudflare_tunnel_constants_1.REMOTE_ACCESS_CLOUDFLARE_TUNNEL_PLUGIN_NAME, 'CloudflareTunnelStatusController');
     }
     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);
@@ -72,7 +74,7 @@ let StatusController = class StatusController {
         return model;
     }
 };
-exports.StatusController = StatusController;
+exports.CloudflareTunnelStatusController = CloudflareTunnelStatusController;
 __decorate([
     (0, swagger_1.ApiOperation)({
         tags: [remote_access_cloudflare_tunnel_constants_1.REMOTE_ACCESS_CLOUDFLARE_TUNNEL_PLUGIN_API_TAG_NAME],
@@ -85,14 +87,13 @@ __decorate([
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
-], StatusController.prototype, "getStatus", null);
-exports.StatusController = StatusController = __decorate([
+], CloudflareTunnelStatusController.prototype, "getStatus", null);
+exports.CloudflareTunnelStatusController = CloudflareTunnelStatusController = __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);
+], CloudflareTunnelStatusController);
 //# sourceMappingURL=status.controller.js.map

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":";;;;;;;;;;;;AAAA,2CAAiD;AACjD,6CAAwD;AAExD,mDAA+D;AAC/D,2EAAmE;AACnE,0FAAsF;AACtF,yFAG8D;AAC9D,uHAAiH;AACjH,iHAAqG;AACrG,2EAAkE;AAClE,4EAAkE;AAClE,yDAMgC;AAChC,4GAGsD;AAEtD,iGAA2F;AAKpF,IAAM,gCAAgC,GAAtC,MAAM,gCAAgC;IAM5C,YACkB,aAAwC,EACxC,YAA0C,EAC1C,eAAgC;QAFhC,kBAAa,GAAb,aAAa,CAA2B;QACxC,iBAAY,GAAZ,YAAY,CAA8B;QAC1C,oBAAe,GAAf,eAAe,CAAiB;QARjC,WAAM,GAAG,IAAA,8BAAqB,EAC9C,uFAA2C,EAC3C,kCAAkC,CAClC,CAAC;IAMC,CAAC;IAcE,AAAN,KAAK,CAAC,SAAS;QACd,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAC;QAEvD,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,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;AApFY,4EAAgC;AAwBtC;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;;;;iEA0Cb;2CAjEW,gCAAgC;IAH5C,IAAA,iBAAO,EAAC,+FAAmD,CAAC;IAC5D,IAAA,mBAAU,GAAE;IACZ,IAAA,mBAAK,EAAC,0BAAQ,CAAC,KAAK,EAAE,0BAAQ,CAAC,KAAK,CAAC;qCAQJ,wDAAyB;QAC1B,8DAA4B;QACzB,kCAAe;GATtC,gCAAgC,CAoF5C"}

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":";;;;;;;;;;;;AAAA,yDAAiD;AACjD,qDAA+G;AAE/G,6CAA6F;AAE7F,uFAA0F;AAC1F,yFAG8D;AAG9D,4GAA2G;AAG3G,MAAM,6BAA6B,GAAgC;IAClE,aAAa;IACb,eAAe;IACf,gBAAgB;IAChB,cAAc;IACd,kBAAkB;IAClB,YAAY;IACZ,WAAW;IACX,cAAc;IACd,OAAO;CACP,CAAC;AAEF,MAAM,mCAAmC,GAAsC;IAC9E,oBAAoB;IACpB,kBAAkB;IAClB,mBAAmB;IACnB,kBAAkB;CAClB,CAAC;AAEF,MAAM,kCAAkC,GAAmC,CAAC,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;AAQjH,IAAM,wDAAwD,GAA9D,MAAM,wDAAwD;CAsBpE,CAAA;AAtBY,4HAAwD;AAUpE;IATC,IAAA,qBAAW,EAAC;QACZ,WAAW,EAAE,6EAA6E;QAC1F,IAAI,EAAE,OAAO;QACb,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QACzB,OAAO,EAAE,CAAC,qCAAqC,CAAC;KAChD,CAAC;IACD,IAAA,0BAAM,GAAE;IACR,IAAA,yBAAO,GAAE;IACT,IAAA,0BAAQ,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;;0FACN;AAWnB;IATC,IAAA,6BAAmB,EAAC;QACpB,WAAW,EAAE,yFAAyF;QACtG,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,IAAI;KACb,CAAC;IACD,IAAA,0BAAM,GAAE;IACR,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAQ,GAAE;;sFACS;mEArBR,wDAAwD;IADpE,IAAA,mBAAS,EAAC,EAAE,IAAI,EAAE,yDAAyD,EAAE,CAAC;GAClE,wDAAwD,CAsBpE;AAQM,IAAM,kDAAkD,GAAxD,MAAM,kDAAkD;CAsC9D,CAAA;AAtCY,gHAAkD;AAQ9D;IAPC,IAAA,qBAAW,EAAC;QACZ,WAAW,EAAE,0CAA0C;QACvD,IAAI,EAAE,mCAAmC;QACzC,OAAO,EAAE,kBAAkB;KAC3B,CAAC;IACD,IAAA,0BAAM,GAAE;IACR,IAAA,wBAAM,EAAC,mCAAmC,CAAC;;gFACN;AAStC;IAPC,IAAA,qBAAW,EAAC;QACZ,WAAW,EAAE,iDAAiD;QAC9D,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,IAAI;KACb,CAAC;IACD,IAAA,0BAAM,GAAE;IACR,IAAA,2BAAS,GAAE;;qFACO;AASnB;IAPC,IAAA,qBAAW,EAAC;QACZ,WAAW,EAAE,4BAA4B;QACzC,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,oCAAoC;KAC7C,CAAC;IACD,IAAA,0BAAM,GAAE;IACR,IAAA,0BAAQ,GAAE;;mFACK;AAWhB;IATC,IAAA,6BAAmB,EAAC;QACpB,WAAW,EAAE,iFAAiF;QAC9F,IAAI,EAAE,GAAG,EAAE,CAAC,wDAAwD;QACpE,QAAQ,EAAE,IAAI;KACd,CAAC;IACD,IAAA,0BAAM,GAAE;IACR,IAAA,4BAAU,GAAE;IACZ,IAAA,gCAAc,GAAE;IAChB,IAAA,wBAAI,EAAC,GAAG,EAAE,CAAC,wDAAwD,CAAC;8BAC7D,wDAAwD;kFAAQ;6DArC5D,kDAAkD;IAD9D,IAAA,mBAAS,EAAC,EAAE,IAAI,EAAE,mDAAmD,EAAE,CAAC;GAC5D,kDAAkD,CAsC9D;AAQM,IAAM,+CAA+C,GAArD,MAAM,+CAA+C;CAoD3D,CAAA;AApDY,0GAA+C;AAS3D;IARC,IAAA,qBAAW,EAAC;QACZ,IAAI,EAAE,QAAQ;QACd,WAAW,EAAE,6DAA6D;QAC1E,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,sCAAsC;KAC/C,CAAC;IACD,IAAA,0BAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;IAC1B,IAAA,0BAAQ,GAAE;;8EACG;AASd;IAPC,IAAA,qBAAW,EAAC;QACZ,WAAW,EAAE,0CAA0C;QACvD,IAAI,EAAE,kCAAkC;QACxC,OAAO,EAAE,SAAS;KAClB,CAAC;IACD,IAAA,0BAAM,GAAE;IACR,IAAA,wBAAM,EAAC,kCAAkC,CAAC;;8EACP;AAWpC;IATC,IAAA,qBAAW,EAAC;QACZ,WAAW,EAAE,oFAAoF;QACjG,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,SAAS;KAClB,CAAC;IACD,IAAA,0BAAM,GAAE;IACR,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAQ,GAAE;;6EACS;AAWpB;IATC,IAAA,qBAAW,EAAC;QACZ,WAAW,EAAE,oFAAoF;QACjG,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,IAAI;KACb,CAAC;IACD,IAAA,0BAAM,GAAE;IACR,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAQ,GAAE;;gFACY;AAWvB;IATC,IAAA,qBAAW,EAAC;QACZ,IAAI,EAAE,YAAY;QAClB,WAAW,EAAE,yDAAyD;QACtE,IAAI,EAAE,QAAQ;QACd,MAAM,EAAE,WAAW;QACnB,OAAO,EAAE,sBAAsB;KAC/B,CAAC;IACD,IAAA,0BAAM,EAAC,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC;IAC9B,IAAA,0BAAQ,GAAE;;kFACO;0DAnDN,+CAA+C;IAD3D,IAAA,mBAAS,EAAC,EAAE,IAAI,EAAE,gDAAgD,EAAE,CAAC;GACzD,+CAA+C,CAoD3D;AAQM,IAAM,sDAAsD,GAA5D,MAAM,sDAAsD;CAoBlE,CAAA;AApBY,wHAAsD;AAQlE;IAPC,IAAA,qBAAW,EAAC;QACZ,WAAW,EAAE,uEAAuE;QACpF,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,IAAI;KACb,CAAC;IACD,IAAA,0BAAM,GAAE;IACR,IAAA,2BAAS,GAAE;;yFACO;AAWnB;IATC,IAAA,qBAAW,EAAC;QACZ,WAAW,EAAE,gEAAgE;QAC7E,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,IAAI;KACb,CAAC;IACD,IAAA,0BAAM,GAAE;IACR,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAQ,GAAE;;sFACW;iEAnBV,sDAAsD;IADlE,IAAA,mBAAS,EAAC,EAAE,IAAI,EAAE,uDAAuD,EAAE,CAAC;GAChE,sDAAsD,CAoBlE;AAOM,IAAM,6CAA6C,GAAnD,MAAM,6CAA6C;CAkIzD,CAAA;AAlIY,sGAA6C;AAIzD;IAHC,IAAA,qBAAW,EAAC,EAAE,WAAW,EAAE,8CAA8C,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;IAC5F,IAAA,0BAAM,GAAE;IACR,IAAA,0BAAQ,GAAE;;4EACG;AAUd;IARC,IAAA,qBAAW,EAAC;QACZ,WAAW,EAAE,2DAA2D;QACxE,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,CAAC;KACV,CAAC;IACD,IAAA,0BAAM,GAAE;IACR,IAAA,uBAAK,GAAE;IACP,IAAA,qBAAG,EAAC,CAAC,CAAC;;+EACU;AASjB;IAPC,IAAA,qBAAW,EAAC;QACZ,WAAW,EAAE,iCAAiC;QAC9C,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,uFAA2C;KACpD,CAAC;IACD,IAAA,0BAAM,GAAE;IACR,IAAA,0BAAQ,GAAE;;2EACE;AASb;IAPC,IAAA,qBAAW,EAAC;QACZ,WAAW,EAAE,wBAAwB;QACrC,IAAI,EAAE,6BAA6B;QACnC,OAAO,EAAE,WAAW;KACpB,CAAC;IACD,IAAA,0BAAM,GAAE;IACR,IAAA,wBAAM,EAAC,6BAA6B,CAAC;;4EACL;AAWjC;IATC,IAAA,qBAAW,EAAC;QACZ,WAAW,EAAE,2CAA2C;QACxD,IAAI,EAAE,OAAO;QACb,KAAK,EAAE,EAAE,IAAI,EAAE,IAAA,uBAAa,EAAC,0CAAyB,CAAC,EAAE;KACzD,CAAC;IACD,IAAA,0BAAM,GAAE;IACR,IAAA,yBAAO,GAAE;IACT,IAAA,gCAAc,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IAC9B,IAAA,wBAAI,EAAC,GAAG,EAAE,CAAC,0CAAyB,CAAC;;gFACC;AAWvC;IATC,IAAA,6BAAmB,EAAC;QACpB,WAAW,EAAE,yDAAyD;QACtE,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,IAAI;KACb,CAAC;IACD,IAAA,0BAAM,GAAE;IACR,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAQ,GAAE;;8EACa;AASxB;IAPC,IAAA,qBAAW,EAAC;QACZ,WAAW,EAAE,oDAAoD;QACjE,IAAI,EAAE,QAAQ;QACd,oBAAoB,EAAE,IAAI;QAC1B,OAAO,EAAE,EAAE,QAAQ,EAAE,mBAAmB,EAAE,YAAY,EAAE,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE;KAC5G,CAAC;IACD,IAAA,0BAAM,GAAE;;8EACiD;AAY1D;IAVC,IAAA,qBAAW,EAAC;QACZ,IAAI,EAAE,iBAAiB;QACvB,WAAW,EAAE,4DAA4D;QACzE,IAAI,EAAE,OAAO;QACb,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QACzB,OAAO,EAAE,EAAE;KACX,CAAC;IACD,IAAA,0BAAM,EAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAC;IACnC,IAAA,yBAAO,GAAE;IACT,IAAA,0BAAQ,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;;qFACA;AAWzB;IATC,IAAA,qBAAW,EAAC;QACZ,WAAW,EAAE,oCAAoC;QACjD,IAAI,EAAE,OAAO;QACb,KAAK,EAAE,EAAE,IAAI,EAAE,IAAA,uBAAa,EAAC,0CAAyB,CAAC,EAAE;KACzD,CAAC;IACD,IAAA,0BAAM,GAAE;IACR,IAAA,yBAAO,GAAE;IACT,IAAA,gCAAc,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IAC9B,IAAA,wBAAI,EAAC,GAAG,EAAE,CAAC,0CAAyB,CAAC;;iFACE;AAWxC;IATC,IAAA,qBAAW,EAAC;QACZ,IAAI,EAAE,YAAY;QAClB,WAAW,EAAE,qDAAqD;QAClE,IAAI,EAAE,QAAQ;QACd,MAAM,EAAE,WAAW;QACnB,OAAO,EAAE,sBAAsB;KAC/B,CAAC;IACD,IAAA,0BAAM,EAAC,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC;IAC9B,IAAA,0BAAQ,GAAE;;gFACO;AAWlB;IATC,IAAA,qBAAW,EAAC;QACZ,WAAW,EAAE,wEAAwE;QACrF,IAAI,EAAE,OAAO;QACb,KAAK,EAAE,EAAE,IAAI,EAAE,IAAA,uBAAa,EAAC,kDAAkD,CAAC,EAAE;KAClF,CAAC;IACD,IAAA,0BAAM,GAAE;IACR,IAAA,yBAAO,GAAE;IACT,IAAA,gCAAc,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IAC9B,IAAA,wBAAI,EAAC,GAAG,EAAE,CAAC,kDAAkD,CAAC;;mFACI;AAWnE;IATC,IAAA,6BAAmB,EAAC;QACpB,WAAW,EAAE,oFAAoF;QACjG,QAAQ,EAAE,IAAI;QACd,IAAI,EAAE,GAAG,EAAE,CAAC,+CAA+C;KAC3D,CAAC;IACD,IAAA,0BAAM,GAAE;IACR,IAAA,4BAAU,GAAE;IACZ,IAAA,gCAAc,GAAE;IAChB,IAAA,wBAAI,EAAC,GAAG,EAAE,CAAC,+CAA+C,CAAC;8BACrD,+CAA+C;4EAAQ;AAU9D;IARC,IAAA,qBAAW,EAAC;QACZ,IAAI,EAAE,kBAAkB;QACxB,WAAW,EAAE,uEAAuE;QACpF,IAAI,EAAE,GAAG,EAAE,CAAC,sDAAsD;KAClE,CAAC;IACD,IAAA,0BAAM,EAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,CAAC;IACpC,IAAA,gCAAc,GAAE;IAChB,IAAA,wBAAI,EAAC,GAAG,EAAE,CAAC,sDAAsD,CAAC;8BAClD,sDAAsD;sFAAC;wDAjI5D,6CAA6C;IADzD,IAAA,mBAAS,EAAC,EAAE,IAAI,EAAE,8CAA8C,EAAE,CAAC;GACvD,6CAA6C,CAkIzD;AAMM,IAAM,qDAAqD,GAA3D,MAAM,qDAAsD,SAAQ,6CAAuE;CAOjJ,CAAA;AAPY,sHAAqD;AAMzD;IALP,IAAA,qBAAW,EAAC;QACZ,WAAW,EAAE,6CAA6C;QAC1D,IAAI,EAAE,GAAG,EAAE,CAAC,6CAA6C;KACzD,CAAC;IACD,IAAA,0BAAM,GAAE;8BACK,6CAA6C;mFAAC;gEANhD,qDAAqD;IADjE,IAAA,mBAAS,EAAC,EAAE,IAAI,EAAE,6CAA6C,EAAE,CAAC;GACtD,qDAAqD,CAOjE"}

package/dist/plugins/remote-access-cloudflare-tunnel/remote-access-cloudflare-tunnel.constants.d.ts

@@ -12,6 +12,7 @@ export declare const CLOUDFLARED_POLL_INTERVAL_TRANSITIONING_MS = 5000;
 export declare const CLOUDFLARED_POLL_INTERVAL_STABLE_MS = 30000;
 export declare const CLOUDFLARED_READY_GRACE_MS = 60000;
 export declare const CLOUDFLARED_STOP_GRACE_MS = 10000;
+export declare const CLOUDFLARED_STOP_KILL_TIMEOUT_MS = 2000;
 export declare const CLOUDFLARED_STDERR_RING_SIZE = 64;
 export declare const CLOUDFLARE_TUNNEL_SETUP_WORKER_UNIT = "smart-panel-remote-access-cloudflare";
 export declare const CLOUDFLARE_TUNNEL_SETUP_STATUS_FILENAME = "cloudflare-tunnel-setup-status.json";

package/dist/plugins/remote-access-cloudflare-tunnel/remote-access-cloudflare-tunnel.constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CLOUDFLARE_TUNNEL_DEFAULT_PROTOCOL = exports.CLOUDFLARE_TUNNEL_PROTOCOLS = exports.CLOUDFLARE_TUNNEL_VENDOR_DOWNLOAD_URL = exports.CLOUDFLARE_TUNNEL_DOCUMENTATION_URL = exports.CLOUDFLARE_TUNNEL_PRINT_PLAN_TIMEOUT_MS = exports.CLOUDFLARE_TUNNEL_DATA_SUBDIR = exports.CLOUDFLARE_TUNNEL_SETUP_STATUS_FILENAME = exports.CLOUDFLARE_TUNNEL_SETUP_WORKER_UNIT = exports.CLOUDFLARED_STDERR_RING_SIZE = exports.CLOUDFLARED_STOP_GRACE_MS = exports.CLOUDFLARED_READY_GRACE_MS = exports.CLOUDFLARED_POLL_INTERVAL_STABLE_MS = exports.CLOUDFLARED_POLL_INTERVAL_TRANSITIONING_MS = exports.CLOUDFLARED_METRICS_TIMEOUT_MS = exports.REMOTE_ACCESS_CLOUDFLARE_METRICS_ADDRESS_ENV = exports.CLOUDFLARED_METRICS_ADDRESS = exports.CLOUDFLARED_CLI_DEFAULT_TIMEOUT_MS = exports.CLOUDFLARED_BINARY = exports.CLOUDFLARED_MIN_VERSION = exports.REMOTE_ACCESS_CLOUDFLARE_TUNNEL_PLUGIN_API_TAG_DESCRIPTION = exports.REMOTE_ACCESS_CLOUDFLARE_TUNNEL_PLUGIN_API_TAG_NAME = exports.REMOTE_ACCESS_CLOUDFLARE_TUNNEL_PLUGIN_NAME = exports.REMOTE_ACCESS_CLOUDFLARE_TUNNEL_PLUGIN_PREFIX = void 0;
+exports.CLOUDFLARE_TUNNEL_DEFAULT_PROTOCOL = exports.CLOUDFLARE_TUNNEL_PROTOCOLS = exports.CLOUDFLARE_TUNNEL_VENDOR_DOWNLOAD_URL = exports.CLOUDFLARE_TUNNEL_DOCUMENTATION_URL = exports.CLOUDFLARE_TUNNEL_PRINT_PLAN_TIMEOUT_MS = exports.CLOUDFLARE_TUNNEL_DATA_SUBDIR = exports.CLOUDFLARE_TUNNEL_SETUP_STATUS_FILENAME = exports.CLOUDFLARE_TUNNEL_SETUP_WORKER_UNIT = exports.CLOUDFLARED_STDERR_RING_SIZE = exports.CLOUDFLARED_STOP_KILL_TIMEOUT_MS = exports.CLOUDFLARED_STOP_GRACE_MS = exports.CLOUDFLARED_READY_GRACE_MS = exports.CLOUDFLARED_POLL_INTERVAL_STABLE_MS = exports.CLOUDFLARED_POLL_INTERVAL_TRANSITIONING_MS = exports.CLOUDFLARED_METRICS_TIMEOUT_MS = exports.REMOTE_ACCESS_CLOUDFLARE_METRICS_ADDRESS_ENV = exports.CLOUDFLARED_METRICS_ADDRESS = exports.CLOUDFLARED_CLI_DEFAULT_TIMEOUT_MS = exports.CLOUDFLARED_BINARY = exports.CLOUDFLARED_MIN_VERSION = exports.REMOTE_ACCESS_CLOUDFLARE_TUNNEL_PLUGIN_API_TAG_DESCRIPTION = exports.REMOTE_ACCESS_CLOUDFLARE_TUNNEL_PLUGIN_API_TAG_NAME = exports.REMOTE_ACCESS_CLOUDFLARE_TUNNEL_PLUGIN_NAME = exports.REMOTE_ACCESS_CLOUDFLARE_TUNNEL_PLUGIN_PREFIX = void 0;
 exports.REMOTE_ACCESS_CLOUDFLARE_TUNNEL_PLUGIN_PREFIX = 'remote-access-cloudflare-tunnel';
 exports.REMOTE_ACCESS_CLOUDFLARE_TUNNEL_PLUGIN_NAME = 'remote-access-cloudflare-tunnel-plugin';
 exports.REMOTE_ACCESS_CLOUDFLARE_TUNNEL_PLUGIN_API_TAG_NAME = 'Remote access Cloudflare Tunnel plugin';
@@ -15,6 +15,7 @@ exports.CLOUDFLARED_POLL_INTERVAL_TRANSITIONING_MS = 5_000;
 exports.CLOUDFLARED_POLL_INTERVAL_STABLE_MS = 30_000;
 exports.CLOUDFLARED_READY_GRACE_MS = 60_000;
 exports.CLOUDFLARED_STOP_GRACE_MS = 10_000;
+exports.CLOUDFLARED_STOP_KILL_TIMEOUT_MS = 2_000;
 exports.CLOUDFLARED_STDERR_RING_SIZE = 64;
 exports.CLOUDFLARE_TUNNEL_SETUP_WORKER_UNIT = 'smart-panel-remote-access-cloudflare';
 exports.CLOUDFLARE_TUNNEL_SETUP_STATUS_FILENAME = 'cloudflare-tunnel-setup-status.json';

package/dist/plugins/remote-access-cloudflare-tunnel/remote-access-cloudflare-tunnel.constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"remote-access-cloudflare-tunnel.constants.js","sourceRoot":"","sources":["../../../src/plugins/remote-access-cloudflare-tunnel/remote-access-cloudflare-tunnel.constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,6CAA6C,GAAG,iCAAiC,CAAC;AAElF,QAAA,2CAA2C,GAAG,wCAAwC,CAAC;AAEvF,QAAA,mDAAmD,GAAG,wCAAwC,CAAC;AAE/F,QAAA,0DAA0D,GACtE,sHAAsH,CAAC;AAO3G,QAAA,uBAAuB,GAAG,UAAU,CAAC;AAGrC,QAAA,kBAAkB,GAAG,aAAa,CAAC;AAGnC,QAAA,kCAAkC,GAAG,MAAM,CAAC;AAU5C,QAAA,2BAA2B,GAAG,iBAAiB,CAAC;AAGhD,QAAA,4CAA4C,GAAG,6CAA6C,CAAC;AAG7F,QAAA,8BAA8B,GAAG,KAAK,CAAC;AAGvC,QAAA,0CAA0C,GAAG,KAAK,CAAC;AAGnD,QAAA,mCAAmC,GAAG,MAAM,CAAC;AAQ7C,QAAA,0BAA0B,GAAG,MAAM,CAAC;AAGpC,QAAA,yBAAyB,GAAG,MAAM,CAAC;AAGnC,QAAA,4BAA4B,GAAG,EAAE,CAAC;AAGlC,QAAA,mCAAmC,GAAG,sCAAsC,CAAC;AAG7E,QAAA,uCAAuC,GAAG,qCAAqC,CAAC;AAGhF,QAAA,6BAA6B,GAAG,iCAAiC,CAAC;AAGlE,QAAA,uCAAuC,GAAG,KAAK,CAAC;AAGhD,QAAA,mCAAmC,GAAG,wCAAwC,CAAC;AAG/E,QAAA,qCAAqC,GAAG,uCAAuC,CAAC;AAKhF,QAAA,2BAA2B,GAA+B,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;AAEpF,QAAA,kCAAkC,GAA6B,MAAM,CAAC"}
+{"version":3,"file":"remote-access-cloudflare-tunnel.constants.js","sourceRoot":"","sources":["../../../src/plugins/remote-access-cloudflare-tunnel/remote-access-cloudflare-tunnel.constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,6CAA6C,GAAG,iCAAiC,CAAC;AAElF,QAAA,2CAA2C,GAAG,wCAAwC,CAAC;AAEvF,QAAA,mDAAmD,GAAG,wCAAwC,CAAC;AAE/F,QAAA,0DAA0D,GACtE,sHAAsH,CAAC;AAO3G,QAAA,uBAAuB,GAAG,UAAU,CAAC;AAGrC,QAAA,kBAAkB,GAAG,aAAa,CAAC;AAGnC,QAAA,kCAAkC,GAAG,MAAM,CAAC;AAU5C,QAAA,2BAA2B,GAAG,iBAAiB,CAAC;AAGhD,QAAA,4CAA4C,GAAG,6CAA6C,CAAC;AAG7F,QAAA,8BAA8B,GAAG,KAAK,CAAC;AAGvC,QAAA,0CAA0C,GAAG,KAAK,CAAC;AAGnD,QAAA,mCAAmC,GAAG,MAAM,CAAC;AAQ7C,QAAA,0BAA0B,GAAG,MAAM,CAAC;AAGpC,QAAA,yBAAyB,GAAG,MAAM,CAAC;AAGnC,QAAA,gCAAgC,GAAG,KAAK,CAAC;AAGzC,QAAA,4BAA4B,GAAG,EAAE,CAAC;AAGlC,QAAA,mCAAmC,GAAG,sCAAsC,CAAC;AAG7E,QAAA,uCAAuC,GAAG,qCAAqC,CAAC;AAGhF,QAAA,6BAA6B,GAAG,iCAAiC,CAAC;AAGlE,QAAA,uCAAuC,GAAG,KAAK,CAAC;AAGhD,QAAA,mCAAmC,GAAG,wCAAwC,CAAC;AAG/E,QAAA,qCAAqC,GAAG,uCAAuC,CAAC;AAKhF,QAAA,2BAA2B,GAA+B,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;AAEpF,QAAA,kCAAkC,GAA6B,MAAM,CAAC"}

package/dist/plugins/remote-access-cloudflare-tunnel/remote-access-cloudflare-tunnel.plugin.js

@@ -113,7 +113,7 @@ exports.RemoteAccessCloudflareTunnelPlugin = RemoteAccessCloudflareTunnelPlugin
     }),
     (0, common_1.Module)({
         imports: [remote_access_module_1.RemoteAccessModule, platform_module_1.PlatformModule, config_1.ConfigModule],
-        controllers: [status_controller_1.StatusController, setup_controller_1.SetupController],
+        controllers: [status_controller_1.CloudflareTunnelStatusController, setup_controller_1.CloudflareTunnelSetupController],
         providers: [
             cloudflared_cli_service_1.CloudflaredCliService,
             cloudflared_process_service_1.CloudflaredProcessService,

package/dist/plugins/remote-access-cloudflare-tunnel/remote-access-cloudflare-tunnel.plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"remote-access-cloudflare-tunnel.plugin.js","sourceRoot":"","sources":["../../../src/plugins/remote-access-cloudflare-tunnel/remote-access-cloudflare-tunnel.plugin.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"remote-access-cloudflare-tunnel.plugin.js","sourceRoot":"","sources":["../../../src/plugins/remote-access-cloudflare-tunnel/remote-access-cloudflare-tunnel.plugin.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAsD;AACtD,2CAAkE;AAElE,2GAAqG;AACrG,6FAAyF;AACzF,uHAAiH;AACjH,4EAAwE;AACxE,2FAAsF;AACtF,0IAAmI;AACnI,0FAA4E;AAC5E,oHAA8G;AAC9G,iHAA2G;AAE3G,qEAAiF;AACjF,uEAAmF;AACnF,+DAA4F;AAC5F,wDAAsF;AACtF,2GAIqD;AACrD,uGAAwH;AACxH,oGAA8F;AAC9F,sGAAgG;AAChG,gGAA0F;AAC1F,gFAA2E;AAC3E,wFAAmF;AACnF,wFAAmF;AAmB5E,IAAM,kCAAkC,GAAxC,MAAM,kCAAkC;IAC9C,YACkB,oBAA8C,EAC9C,eAA6C,EAC7C,iBAAoC,EACpC,qBAAmD,EACnD,gBAAqD,EACrD,oBAAiD,EACjD,oBAAoD,EACpD,eAAgD;QAPhD,yBAAoB,GAApB,oBAAoB,CAA0B;QAC9C,oBAAe,GAAf,eAAe,CAA8B;QAC7C,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,0BAAqB,GAArB,qBAAqB,CAA8B;QACnD,qBAAgB,GAAhB,gBAAgB,CAAqC;QACrD,yBAAoB,GAApB,oBAAoB,CAA6B;QACjD,yBAAoB,GAApB,oBAAoB,CAAgC;QACpD,oBAAe,GAAf,eAAe,CAAiC;IAC/D,CAAC;IAEJ,YAAY;QACX,IAAI,CAAC,oBAAoB,CAAC,eAAe,CAGvC;YACD,IAAI,EAAE,uFAA2C;YACjD,KAAK,EAAE,4DAA6C;YACpD,SAAS,EAAE,qEAAiD;YAC5D,YAAY,EAAE;gBACb;oBACC,IAAI,EAAE,cAAc;oBACpB,cAAc,EAAE,yBAAyB;oBACzC,UAAU,EAAE,CAAC,aAAa,CAAC;iBAC3B;aACD;SACD,CAAC,CAAC;QAEH,KAAK,MAAM,KAAK,IAAI,qGAA2D,EAAE,CAAC;YACjF,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACtC,CAAC;QAED,IAAI,CAAC,iBAAiB,CAAC,sBAAsB,CAAC;YAC7C,IAAI,EAAE,uFAA2C;YACjD,IAAI,EAAE,mBAAmB;YACzB,WAAW,EAAE,gGAAgG;YAC7G,MAAM,EAAE,WAAW;YACnB,cAAc,EAAE,KAAK;YACrB,MAAM,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;iFA2BsE;YAC9E,KAAK,EAAE;gBACN,aAAa,EAAE,wCAAwC;gBACvD,UAAU,EAAE,0CAA0C;aACtD;SACD,CAAC,CAAC;QAEH,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAErD,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QAE/D,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CACjC,uFAA2C,EAC3C,GAAmD,EAAE,CAAC,IAAI,CAAC,oBAAoB,CAAC,YAAY,EAAE,EAC9F,EAAE,CACF,CAAC;IACH,CAAC;CACD,CAAA;AAnFY,gFAAkC;6CAAlC,kCAAkC;IAjB9C,IAAA,0BAAM,EAAC;QACP,OAAO,EAAE,uFAA2C;QACpD,WAAW,EAAE,+FAAmD;QAChE,WAAW,EAAE,sGAA0D;KACvE,CAAC;IACD,IAAA,eAAM,EAAC;QACP,OAAO,EAAE,CAAC,yCAAkB,EAAE,gCAAc,EAAE,qBAAgB,CAAC;QAC/D,WAAW,EAAE,CAAC,oDAAgC,EAAE,kDAA+B,CAAC;QAChF,SAAS,EAAE;YACV,+CAAqB;YACrB,uDAAyB;YACzB,uDAAyB;YACzB,kEAA8B;YAC9B,oEAA+B;YAC/B,8DAA4B;SAC5B;KACD,CAAC;qCAGuC,sDAAwB;QAC7B,8DAA4B;QAC1B,sCAAiB;QACb,8DAA4B;QACjC,6EAAmC;QAC/B,4DAA2B;QAC3B,kEAA8B;QACnC,oEAA+B;GATtD,kCAAkC,CAmF9C"}

package/dist/plugins/remote-access-cloudflare-tunnel/scripts/cloudflared-setup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 # Privileged Cloudflare Tunnel setup job, run by PrivilegedWorkerService as
-# `sudo -n systemd-run --scope --unit=smart-panel-remote-access-cloudflare
+# `sudo -n systemd-run --collect --service-type=exec --unit=smart-panel-remote-access-cloudflare
 # bash cloudflared-setup.sh` (see CloudflareTunnelSetupService.install()).
 # Idempotent: re-running is harmless once the package is already installed.
 #

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,20 @@ 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 buildProcessUnavailableStatus;
     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,21 @@ let CloudflareTunnelManagedService = class CloudflareTunnelManagedService extend
             if (this.state === 'started') {
                 return;
             }
+            if (this.state === 'error' && this.processService.isRunning()) {
+                throw new remote_access_cloudflare_tunnel_exceptions_1.CloudflareTunnelStopFailedException(this.lastError ?? 'The previous cloudflared process has not terminated.');
+            }
+            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 +112,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 +139,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() {
+        const generation = ++this.generation;
+        this.observations.invalidate();
+        this.requirementObservations.invalidate();
         const previous = this.pluginConfig;
         this.pluginConfig = null;
         const next = this.getPluginConfig();
@@ -136,19 +166,21 @@ let CloudflareTunnelManagedService = class CloudflareTunnelManagedService extend
             this.logger.log('Cloudflare Tunnel token or protocol changed, restart required');
             return { restartRequired: true };
         }
+        this.clearPoll();
         await this.emitStatus().catch((error) => {
             this.logger.debug('Failed to emit status after a Cloudflare Tunnel config change', {
                 message: error instanceof Error ? error.message : String(error),
             });
         });
+        if (generation === this.generation) {
+            this.schedulePoll(this.lastStatus?.state === 'connecting'
+                ? remote_access_cloudflare_tunnel_constants_1.CLOUDFLARED_POLL_INTERVAL_TRANSITIONING_MS
+                : remote_access_cloudflare_tunnel_constants_1.CLOUDFLARED_POLL_INTERVAL_STABLE_MS);
+        }
         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 +194,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 +250,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 +272,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 +287,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,28 +354,60 @@ 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);
         }
         if (!this.processService.isRunning()) {
-            const lastLine = this.processService.getLastStderrLine();
-            const exit = this.processService.getLastExit();
-            const message = lastLine ??
-                (exit
-                    ? `cloudflared exited unexpectedly${exit.code !== null ? ` (code ${exit.code})` : ''}.`
-                    : 'cloudflared is not running.');
-            return this.buildStatus('error', message);
-        }
-        const ready = await this.metricsService.fetchReady(this.getMetricsAddress());
+            return this.buildProcessUnavailableStatus();
+        }
+        const processIdentity = this.processService.getProcessIdentity();
+        const ready = await this.metricsService.fetchReady(this.getMetricsAddress(), signal);
+        if (!this.processService.isRunning()) {
+            return this.buildProcessUnavailableStatus();
+        }
+        if (processIdentity !== this.processService.getProcessIdentity()) {
+            return this.buildStatus('connecting', 'Waiting for the replacement tunnel process to become ready.');
+        }
         if (ready) {
             return this.buildStatus('connected', undefined, ready);
         }
@@ -357,6 +419,15 @@ let CloudflareTunnelManagedService = class CloudflareTunnelManagedService extend
         const message = this.processService.getLastStderrLine() ?? 'Cloudflared did not become ready in time.';
         return this.buildStatus('error', message);
     }
+    buildProcessUnavailableStatus() {
+        const lastLine = this.processService.getLastStderrLine();
+        const exit = this.processService.getLastExit();
+        const message = lastLine ??
+            (exit
+                ? `cloudflared exited unexpectedly${exit.code !== null ? ` (code ${exit.code})` : ''}.`
+                : 'cloudflared is not running.');
+        return this.buildStatus('error', message);
+    }
     isPollable() {
         return this.state === 'starting' || this.state === 'started';
     }
@@ -377,32 +448,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', {