@fastybird/smart-panel-backend 0.1.0-alpha.7 → 0.1.0-alpha.9

package/dist/modules/system/scripts/update-worker.sh

@@ -0,0 +1,290 @@
+#!/bin/bash
+set -e
+
+VERSION="${1:-${UPDATE_VERSION:-latest}}"
+STATUS_FILE="${STATUS_FILE:-/var/lib/smart-panel/update-status.json}"
+INSTALL_TYPE="${INSTALL_TYPE:-npm}"
+IMAGE_BASE_DIR="${IMAGE_BASE_DIR:-/opt/smart-panel}"
+DOWNLOAD_URL="${DOWNLOAD_URL:-}"
+
+# Capture once — used for all status writes so timeout detection works correctly
+STARTED_AT="$(date -Iseconds)"
+
+update_status() {
+	local status="$1"
+	local phase="$2"
+	local error="${3:-}"
+	local completed_at=""
+
+	if [ "$status" = "complete" ] || [ "$status" = "failed" ]; then
+		completed_at=$(date -Iseconds)
+	fi
+
+	local tmp_file="${STATUS_FILE}.tmp"
+
+	# Use printf with %s to prevent injection in JSON values.
+	# Escape double-quotes and backslashes in the error message.
+	local safe_error=""
+	if [ -n "$error" ]; then
+		safe_error=$(printf '%s' "$error" | sed 's/\\/\\\\/g; s/"/\\"/g')
+	fi
+
+	printf '{\n\t"status": "%s",\n\t"phase": "%s",\n\t"targetVersion": "%s",\n\t"startedAt": "%s"' \
+		"$status" "$phase" "$VERSION" "$STARTED_AT" > "$tmp_file"
+
+	if [ -n "$completed_at" ]; then
+		printf ',\n\t"completedAt": "%s"' "$completed_at" >> "$tmp_file"
+	fi
+
+	printf ',\n\t"error": "%s"' "$safe_error" >> "$tmp_file"
+	printf '\n}\n' >> "$tmp_file"
+
+	mv "$tmp_file" "$STATUS_FILE"
+}
+
+cleanup() {
+	local exit_code=$?
+
+	if [ $exit_code -ne 0 ]; then
+		# Only write a generic failure if a specific error wasn't already recorded
+		if [ -f "$STATUS_FILE" ] && grep -q '"status": "failed"' "$STATUS_FILE" 2>/dev/null; then
+			return
+		fi
+		update_status "failed" "failed" "Update process exited with code $exit_code"
+	fi
+}
+
+trap cleanup EXIT
+
+# ──────────────────────────────────────────────────────────────
+# Image-based update (Raspbian image installs)
+# ──────────────────────────────────────────────────────────────
+if [ "$INSTALL_TYPE" = "image" ]; then
+	# Verify passwordless sudo is available (required for systemctl, chown, ln)
+	if ! sudo -n true 2>/dev/null; then
+		update_status "failed" "failed" "Passwordless sudo is not available for this user"
+		exit 1
+	fi
+	# Strip leading 'v' prefix if present to avoid double-prefixed dirs like vv1.0.0
+	CLEAN_VERSION="${VERSION#v}"
+	NEW_VERSION_DIR="${IMAGE_BASE_DIR}/v${CLEAN_VERSION}"
+	CURRENT_LINK="${IMAGE_BASE_DIR}/current"
+	PREVIOUS_TARGET=""
+
+	# Save the current version for rollback
+	if [ -L "$CURRENT_LINK" ]; then
+		PREVIOUS_TARGET=$(readlink "$CURRENT_LINK")
+	fi
+
+	# Guard: refuse to overwrite the currently running version
+	# Resolve relative to IMAGE_BASE_DIR since PREVIOUS_TARGET may be relative
+	RESOLVED_PREV=$(cd "$IMAGE_BASE_DIR" && realpath "$PREVIOUS_TARGET" 2>/dev/null || true)
+	RESOLVED_NEW=$(cd "$IMAGE_BASE_DIR" && realpath "$NEW_VERSION_DIR" 2>/dev/null || true)
+
+	if [ -n "$PREVIOUS_TARGET" ] && [ -n "$RESOLVED_PREV" ] && [ -n "$RESOLVED_NEW" ] && [ "$RESOLVED_PREV" = "$RESOLVED_NEW" ]; then
+		update_status "failed" "failed" "Target version v${CLEAN_VERSION} is already the active version"
+		exit 1
+	fi
+
+	# ── Download ──
+	update_status "downloading" "downloading"
+
+	if [ -z "$DOWNLOAD_URL" ]; then
+		update_status "failed" "failed" "No download URL provided for image update"
+		exit 1
+	fi
+
+	TMP_TARBALL="/tmp/smart-panel-backend-v${CLEAN_VERSION}.tar.gz"
+
+	curl -fSL -o "$TMP_TARBALL" "$DOWNLOAD_URL" 2>&1 || {
+		update_status "failed" "failed" "Download failed from ${DOWNLOAD_URL}"
+		exit 1
+	}
+
+	# ── Extract ──
+	update_status "installing" "installing"
+
+	mkdir -p "$NEW_VERSION_DIR"
+
+	tar -xzf "$TMP_TARBALL" -C "$NEW_VERSION_DIR" 2>&1 || {
+		rm -rf "$NEW_VERSION_DIR"
+		rm -f "$TMP_TARBALL"
+		update_status "failed" "failed" "Failed to extract update archive"
+		exit 1
+	}
+
+	rm -f "$TMP_TARBALL"
+
+	# Create the image-install marker in the new version
+	touch "${NEW_VERSION_DIR}/.image-install" || {
+		rm -rf "$NEW_VERSION_DIR"
+		update_status "failed" "failed" "Failed to create image-install marker"
+		exit 1
+	}
+
+	# ── Verify dependencies ──
+	cd "$NEW_VERSION_DIR"
+
+	# The release tarball includes pre-built node_modules with native modules
+	# compiled for ARM64 by the CI arm-runner. Only install as fallback if
+	# node_modules is missing (e.g. manually extracted tarball without deps).
+	if [ ! -d "node_modules" ]; then
+		npm install --omit=dev 2>&1 || {
+			rm -rf "$NEW_VERSION_DIR"
+			update_status "failed" "failed" "npm install failed"
+			exit 1
+		}
+	fi
+
+	# Set ownership
+	sudo chown -R smart-panel:smart-panel "$NEW_VERSION_DIR" || {
+		rm -rf "$NEW_VERSION_DIR"
+		update_status "failed" "failed" "Failed to set ownership on ${NEW_VERSION_DIR}"
+		exit 1
+	}
+
+	# ── Stop service ──
+	update_status "stopping" "stopping"
+	sudo systemctl stop smart-panel 2>/dev/null || true
+
+	# ── Switch symlink (atomic on same filesystem) ──
+	sudo ln -sfn "$NEW_VERSION_DIR" "$CURRENT_LINK" || {
+		# Revert on failure
+		if [ -n "$PREVIOUS_TARGET" ]; then
+			sudo ln -sfn "$PREVIOUS_TARGET" "$CURRENT_LINK"
+		fi
+		sudo systemctl start smart-panel 2>/dev/null || true
+		update_status "failed" "failed" "Failed to switch version symlink"
+		exit 1
+	}
+
+	# ── Run database migrations ──
+	update_status "migrating" "migrating"
+
+	ENV_FILE="/etc/smart-panel/environment"
+
+	if [ -f "${NEW_VERSION_DIR}/dist/dataSource.js" ]; then
+		(
+			set -a
+			# shellcheck source=/dev/null
+			[ -f "$ENV_FILE" ] && . "$ENV_FILE"
+			set +a
+			cd "$NEW_VERSION_DIR"
+			node node_modules/typeorm/cli.js migration:run -d dist/dataSource.js
+		) 2>&1 || {
+			# Migration failed — revert symlink if possible
+			update_status "stopping" "stopping"
+			sudo systemctl stop smart-panel 2>/dev/null || true
+
+			if [ -n "$PREVIOUS_TARGET" ]; then
+				if sudo ln -sfn "$PREVIOUS_TARGET" "$CURRENT_LINK"; then
+					rm -rf "$NEW_VERSION_DIR"
+					update_status "failed" "failed" "Database migration failed — reverted to previous version"
+				else
+					# Symlink revert failed — keep new version so system stays bootable
+					update_status "failed" "failed" "Database migration failed — symlink revert also failed"
+				fi
+			else
+				# No previous version — keep current in place so system stays bootable
+				update_status "failed" "failed" "Database migration failed — no previous version to revert to"
+			fi
+
+			sudo systemctl start smart-panel 2>/dev/null || true
+			exit 1
+		}
+	fi
+
+	# ── Start service ──
+	update_status "starting" "starting"
+	sudo systemctl start smart-panel 2>&1 || {
+		# Try to revert if start fails
+		if [ -n "$PREVIOUS_TARGET" ]; then
+			sudo ln -sfn "$PREVIOUS_TARGET" "$CURRENT_LINK"
+			sudo systemctl start smart-panel 2>/dev/null || true
+		fi
+		update_status "failed" "failed" "Failed to start service after update"
+		exit 1
+	}
+
+	# ── Cleanup old versions (keep max 2 previous) ──
+	cd "$IMAGE_BASE_DIR"
+
+	# Use the known current version rather than re-reading the symlink,
+	# so cleanup is safe even if readlink fails unexpectedly
+	CURRENT_BASENAME="v${CLEAN_VERSION}"
+
+	if [ -n "$CURRENT_BASENAME" ]; then
+		# Only match semver-versioned directories (v<digits>.<digits>.<digits>*)
+		# to avoid accidentally deleting unrelated v-prefixed directories
+		# shellcheck disable=SC2010
+		OLD_VERSIONS=$(ls -d v[0-9]*.[0-9]*.[0-9]*/ 2>/dev/null | grep -v "^${CURRENT_BASENAME}/" | sort -V | head -n -2 || true)
+
+		for old_dir in $OLD_VERSIONS; do
+			rm -rf "${IMAGE_BASE_DIR}/${old_dir}"
+		done
+	fi
+
+	# ── Mark complete ──
+	update_status "complete" "complete"
+	trap - EXIT
+	exit 0
+fi
+
+# ──────────────────────────────────────────────────────────────
+# NPM-based update (global npm installs)
+# ──────────────────────────────────────────────────────────────
+
+# Downloading / preparing
+update_status "downloading" "downloading"
+
+# Stop the service
+update_status "stopping" "stopping"
+sudo systemctl stop smart-panel 2>/dev/null || true
+
+# Install the update
+update_status "installing" "installing"
+
+if [ "$VERSION" = "latest" ]; then
+	npm update -g @fastybird/smart-panel 2>&1 || {
+		update_status "failed" "failed" "npm update failed"
+		sudo systemctl start smart-panel 2>/dev/null || true
+		exit 1
+	}
+else
+	npm install -g "@fastybird/smart-panel@$VERSION" 2>&1 || {
+		update_status "failed" "failed" "npm install failed for version $VERSION"
+		sudo systemctl start smart-panel 2>/dev/null || true
+		exit 1
+	}
+fi
+
+# Run database migrations
+update_status "migrating" "migrating"
+
+DATA_DIR="${FB_DATA_DIR:-/var/lib/smart-panel}"
+DB_PATH="${FB_DB_PATH:-${DATA_DIR}/data}"
+
+if [ -f "$(npm root -g)/@fastybird/smart-panel/dataSource.js" ]; then
+	node "$(npm root -g)/@fastybird/smart-panel/node_modules/typeorm/cli.js" \
+		migration:run \
+		-d "$(npm root -g)/@fastybird/smart-panel/dataSource.js" 2>&1 || {
+		update_status "failed" "failed" "Database migration failed"
+		sudo systemctl start smart-panel 2>/dev/null || true
+		exit 1
+	}
+fi
+
+# Start the service
+update_status "starting" "starting"
+sudo systemctl start smart-panel 2>&1 || {
+	update_status "failed" "failed" "Failed to start service after update"
+	exit 1
+}
+
+# Mark as complete
+update_status "complete" "complete"
+
+# Remove the exit trap since we completed successfully
+trap - EXIT
+
+exit 0

package/dist/modules/system/services/system.service.js

@@ -26,7 +26,10 @@ let SystemService = class SystemService {
     }
     async getSystemInfo() {
         const rawInfo = await this.platformService.getSystemInfo();
-        return (0, transform_utils_1.toInstance)(system_model_1.SystemInfoModel, rawInfo);
+        return (0, transform_utils_1.toInstance)(system_model_1.SystemInfoModel, {
+            ...rawInfo,
+            platform: this.platformService.getPlatformType(),
+        });
     }
     async getThrottleStatus() {
         const rawStatus = await this.platformService.getThrottleStatus();

package/dist/modules/system/services/system.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"system.service.js","sourceRoot":"","sources":["../../../../src/modules/system/services/system.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,yDAAsD;AACtD,+CAAwD;AAExD,mDAA+D;AAC/D,2EAAmE;AACnE,+EAA2E;AAC3E,yDAAuH;AACvH,0DAAoE;AAG7D,IAAM,aAAa,GAAnB,MAAM,aAAa;IAGzB,YACkB,eAAgC,EAChC,YAA2B;QAD3B,oBAAe,GAAf,eAAe,CAAiB;QAChC,iBAAY,GAAZ,YAAY,CAAe;QAJ5B,WAAM,GAAG,IAAA,8BAAqB,EAAC,qCAAkB,EAAE,eAAe,CAAC,CAAC;IAKlF,CAAC;IAEJ,KAAK,CAAC,aAAa;QAClB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,aAAa,EAAE,CAAC;QAE3D,OAAO,IAAA,4BAAU,EAAC,8BAAe,EAAE,OAAO,CAAC,CAAC;IAC7C,CAAC;IAED,KAAK,CAAC,iBAAiB;QACtB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,iBAAiB,EAAE,CAAC;QAEjE,OAAO,IAAA,4BAAU,EAAC,kCAAmB,EAAE,SAAS,CAAC,CAAC;IACnD,CAAC;IAED,KAAK,CAAC,cAAc;QACnB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,cAAc,EAAE,CAAC;QAE9D,OAAO,IAAA,4BAAU,EAAC,mCAAoB,EAAE,SAAS,CAAC,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,eAAe;QACpB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,eAAe,EAAE,CAAC;QAE/D,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,4BAAU,EAAC,gCAAiB,EAAE,IAAI,CAAC,CAAC,CAAC;IACrE,CAAC;IAGK,AAAN,KAAK,CAAC,mBAAmB;QACxB,IAAI,CAAC;YACJ,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;YAE9C,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,4BAAS,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;YAE1D,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAC;QAC3D,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,GAAG,GAAG,KAAc,CAAC;YAE3B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iCAAiC,EAAE,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC;QAClG,CAAC;IACF,CAAC;CACD,CAAA;AA9CY,sCAAa;AAiCnB;IADL,IAAA,eAAI,EAAC,yBAAc,CAAC,eAAe,CAAC;;;;wDAapC;wBA7CW,aAAa;IADzB,IAAA,mBAAU,GAAE;qCAKuB,kCAAe;QAClB,6BAAa;GALjC,aAAa,CA8CzB"}
+{"version":3,"file":"system.service.js","sourceRoot":"","sources":["../../../../src/modules/system/services/system.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,yDAAsD;AACtD,+CAAwD;AAExD,mDAA+D;AAC/D,2EAAmE;AACnE,+EAA2E;AAC3E,yDAAuH;AACvH,0DAAoE;AAG7D,IAAM,aAAa,GAAnB,MAAM,aAAa;IAGzB,YACkB,eAAgC,EAChC,YAA2B;QAD3B,oBAAe,GAAf,eAAe,CAAiB;QAChC,iBAAY,GAAZ,YAAY,CAAe;QAJ5B,WAAM,GAAG,IAAA,8BAAqB,EAAC,qCAAkB,EAAE,eAAe,CAAC,CAAC;IAKlF,CAAC;IAEJ,KAAK,CAAC,aAAa;QAClB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,aAAa,EAAE,CAAC;QAE3D,OAAO,IAAA,4BAAU,EAAC,8BAAe,EAAE;YAClC,GAAG,OAAO;YACV,QAAQ,EAAE,IAAI,CAAC,eAAe,CAAC,eAAe,EAAE;SAChD,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,iBAAiB;QACtB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,iBAAiB,EAAE,CAAC;QAEjE,OAAO,IAAA,4BAAU,EAAC,kCAAmB,EAAE,SAAS,CAAC,CAAC;IACnD,CAAC;IAED,KAAK,CAAC,cAAc;QACnB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,cAAc,EAAE,CAAC;QAE9D,OAAO,IAAA,4BAAU,EAAC,mCAAoB,EAAE,SAAS,CAAC,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,eAAe;QACpB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,eAAe,EAAE,CAAC;QAE/D,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,4BAAU,EAAC,gCAAiB,EAAE,IAAI,CAAC,CAAC,CAAC;IACrE,CAAC;IAGK,AAAN,KAAK,CAAC,mBAAmB;QACxB,IAAI,CAAC;YACJ,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;YAE9C,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,4BAAS,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;YAE1D,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAC;QAC3D,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,GAAG,GAAG,KAAc,CAAC;YAE3B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iCAAiC,EAAE,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC;QAClG,CAAC;IACF,CAAC;CACD,CAAA;AAjDY,sCAAa;AAoCnB;IADL,IAAA,eAAI,EAAC,yBAAc,CAAC,eAAe,CAAC;;;;wDAapC;wBAhDW,aAAa;IADzB,IAAA,mBAAU,GAAE;qCAKuB,kCAAe;QAClB,6BAAa;GALjC,aAAa,CAiDzB"}

package/dist/modules/system/services/update-executor.service.d.ts

@@ -12,9 +12,13 @@ export interface UpdateProgressFile {
 export declare class UpdateExecutorService implements OnModuleInit {
     private readonly updateService;
     private readonly logger;
+    private statusPollTimer;
+    private progressHighWaterMark;
     constructor(updateService: UpdateService);
     onModuleInit(): void;
     private checkPendingUpdateStatus;
     startUpdate(targetVersion: string): Promise<void>;
+    private startStatusPolling;
+    private stopStatusPolling;
     private writeStatusFile;
 }

package/dist/modules/system/services/update-executor.service.js

@@ -51,10 +51,22 @@ const system_constants_1 = require("../system.constants");
 const update_service_1 = require("./update.service");
 const STATUS_FILE = '/var/lib/smart-panel/update-status.json';
 const UPDATE_TIMEOUT_MS = 10 * 60 * 1000;
+const STATUS_POLL_INTERVAL_MS = 3_000;
+const STATUS_POLL_MAX_MS = UPDATE_TIMEOUT_MS + 30_000;
+const PHASE_PROGRESS = {
+    downloading: 20,
+    installing: 45,
+    stopping: 45,
+    migrating: 65,
+    starting: 85,
+    complete: 100,
+};
 let UpdateExecutorService = class UpdateExecutorService {
     constructor(updateService) {
         this.updateService = updateService;
         this.logger = (0, logger_1.createExtensionLogger)(system_constants_1.SYSTEM_MODULE_NAME, 'UpdateExecutorService');
+        this.statusPollTimer = null;
+        this.progressHighWaterMark = 0;
     }
     onModuleInit() {
         this.checkPendingUpdateStatus();
@@ -158,7 +170,27 @@ let UpdateExecutorService = class UpdateExecutorService {
             error: null,
             startedAt: new Date(),
         });
-        const updateScript = (0, path_1.join)(__dirname, '..', '..', '..', '..', '..', 'build', 'scripts', 'update-worker.sh');
+        const updateScript = (0, path_1.join)(__dirname, '..', 'scripts', 'update-worker.sh');
+        if (!(0, fs_1.existsSync)(updateScript)) {
+            this.updateService.releaseUpdateLock();
+            const errorMsg = `Update worker script not found at ${updateScript}`;
+            this.logger.error(errorMsg);
+            this.updateService.setStatus({
+                status: system_constants_1.UpdateStatusType.FAILED,
+                phase: system_constants_1.UpdatePhase.FAILED,
+                progressPercent: null,
+                message: null,
+                error: errorMsg,
+            });
+            this.writeStatusFile({
+                status: system_constants_1.UpdateStatusType.FAILED,
+                phase: system_constants_1.UpdatePhase.FAILED,
+                targetVersion,
+                startedAt: new Date().toISOString(),
+                error: errorMsg,
+            });
+            throw new Error(errorMsg);
+        }
         try {
             const { spawn } = await Promise.resolve().then(() => __importStar(require('child_process')));
             const child = spawn('bash', [updateScript, targetVersion], {
@@ -175,6 +207,7 @@ let UpdateExecutorService = class UpdateExecutorService {
             });
             child.unref();
             this.logger.log(`Update worker spawned for version ${targetVersion} (PID: ${child.pid}, type: ${installType})`);
+            this.startStatusPolling();
         }
         catch (error) {
             const err = error;
@@ -196,6 +229,76 @@ let UpdateExecutorService = class UpdateExecutorService {
             throw error;
         }
     }
+    startStatusPolling() {
+        this.stopStatusPolling();
+        this.progressHighWaterMark = 10;
+        const startedAt = Date.now();
+        this.statusPollTimer = setInterval(() => {
+            if (Date.now() - startedAt > STATUS_POLL_MAX_MS) {
+                this.logger.error('Update status polling timed out');
+                this.updateService.setStatus({
+                    status: system_constants_1.UpdateStatusType.FAILED,
+                    phase: system_constants_1.UpdatePhase.FAILED,
+                    progressPercent: null,
+                    message: null,
+                    error: 'Update timed out — no completion signal received',
+                });
+                this.updateService.releaseUpdateLock();
+                this.stopStatusPolling();
+                return;
+            }
+            if (!(0, fs_1.existsSync)(STATUS_FILE)) {
+                return;
+            }
+            try {
+                const raw = (0, fs_1.readFileSync)(STATUS_FILE, 'utf-8');
+                const fileStatus = JSON.parse(raw);
+                if (fileStatus.status === system_constants_1.UpdateStatusType.FAILED) {
+                    this.logger.error(`Update worker failed: ${fileStatus.error ?? 'unknown error'}`);
+                    this.updateService.setStatus({
+                        status: system_constants_1.UpdateStatusType.FAILED,
+                        phase: system_constants_1.UpdatePhase.FAILED,
+                        progressPercent: null,
+                        message: null,
+                        error: fileStatus.error ?? 'Update failed with unknown error',
+                    });
+                    this.updateService.releaseUpdateLock();
+                    this.stopStatusPolling();
+                }
+                else if (fileStatus.status === system_constants_1.UpdateStatusType.COMPLETE) {
+                    this.updateService.setStatus({
+                        status: system_constants_1.UpdateStatusType.COMPLETE,
+                        phase: system_constants_1.UpdatePhase.COMPLETE,
+                        progressPercent: 100,
+                        message: `Successfully updated to ${fileStatus.targetVersion}`,
+                        error: null,
+                    });
+                    this.updateService.releaseUpdateLock();
+                    this.stopStatusPolling();
+                }
+                else {
+                    const rawProgress = PHASE_PROGRESS[fileStatus.phase] ?? 10;
+                    const progress = Math.max(this.progressHighWaterMark, rawProgress);
+                    this.progressHighWaterMark = progress;
+                    this.updateService.setStatus({
+                        status: fileStatus.status ?? system_constants_1.UpdateStatusType.DOWNLOADING,
+                        phase: fileStatus.phase ?? system_constants_1.UpdatePhase.DOWNLOADING,
+                        progressPercent: progress,
+                        message: `Update in progress: ${fileStatus.phase}...`,
+                        error: null,
+                    });
+                }
+            }
+            catch {
+            }
+        }, STATUS_POLL_INTERVAL_MS);
+    }
+    stopStatusPolling() {
+        if (this.statusPollTimer) {
+            clearInterval(this.statusPollTimer);
+            this.statusPollTimer = null;
+        }
+    }
     writeStatusFile(status) {
         try {
             const dir = (0, path_1.dirname)(STATUS_FILE);

package/dist/modules/system/services/update-executor.service.js.map

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

package/dist/plugins/devices-home-assistant/services/home-assistant.http.service.d.ts

@@ -34,6 +34,8 @@ export declare class HomeAssistantHttpService {
     private get apiKey();
     private get hostname();
     private get baseUrl();
+    private readonly HTTP_TIMEOUT_MS;
+    private fetchWithTimeout;
     private ensureApiKey;
     private toDiscoveredDeviceModel;
     private toStateModel;

package/dist/plugins/devices-home-assistant/services/home-assistant.http.service.js

@@ -48,6 +48,7 @@ let HomeAssistantHttpService = class HomeAssistantHttpService {
         this.supervisorService = supervisorService;
         this.logger = (0, extension_logger_service_1.createExtensionLogger)(devices_home_assistant_constants_1.DEVICES_HOME_ASSISTANT_PLUGIN_NAME, 'HomeAssistantHttpService');
         this.pluginConfig = null;
+        this.HTTP_TIMEOUT_MS = 15_000;
     }
     async getDiscoveredDevice(id) {
         this.ensureApiKey();
@@ -492,6 +493,16 @@ let HomeAssistantHttpService = class HomeAssistantHttpService {
         }
         return `http://${this.hostname}`;
     }
+    async fetchWithTimeout(url, init) {
+        const controller = new AbortController();
+        const timeoutId = setTimeout(() => controller.abort(), this.HTTP_TIMEOUT_MS);
+        try {
+            return await fetch(url, { ...init, signal: controller.signal });
+        }
+        finally {
+            clearTimeout(timeoutId);
+        }
+    }
     ensureApiKey() {
         if (this.apiKey === null) {
             this.logger.warn('Missing API key for Home Assistant HTTP service');
@@ -524,7 +535,7 @@ let HomeAssistantHttpService = class HomeAssistantHttpService {
     async fetchSingleHaDevice(id) {
         try {
             const url = new URL(`${this.baseUrl}/api/template`);
-            const response = await fetch(url, {
+            const response = await this.fetchWithTimeout(url, {
                 method: 'POST',
                 headers: {
                     Authorization: `Bearer ${this.apiKey}`,
@@ -567,7 +578,7 @@ let HomeAssistantHttpService = class HomeAssistantHttpService {
     async fetchListHaDevices() {
         try {
             const url = new URL(`${this.baseUrl}/api/template`);
-            const response = await fetch(url, {
+            const response = await this.fetchWithTimeout(url, {
                 method: 'POST',
                 headers: {
                     Authorization: `Bearer ${this.apiKey}`,
@@ -604,7 +615,7 @@ let HomeAssistantHttpService = class HomeAssistantHttpService {
     async fetchSingleHaState(entityId) {
         try {
             const url = new URL(`${this.baseUrl}/api/states/${entityId}`);
-            const response = await fetch(url, {
+            const response = await this.fetchWithTimeout(url, {
                 method: 'GET',
                 headers: {
                     Authorization: `Bearer ${this.apiKey}`,
@@ -638,7 +649,7 @@ let HomeAssistantHttpService = class HomeAssistantHttpService {
     async fetchListHaStates() {
         try {
             const url = new URL(`${this.baseUrl}/api/states`);
-            const response = await fetch(url, {
+            const response = await this.fetchWithTimeout(url, {
                 method: 'GET',
                 headers: {
                     Authorization: `Bearer ${this.apiKey}`,
@@ -672,7 +683,7 @@ let HomeAssistantHttpService = class HomeAssistantHttpService {
     async fetchListHaHelpers() {
         try {
             const url = new URL(`${this.baseUrl}/api/template`);
-            const response = await fetch(url, {
+            const response = await this.fetchWithTimeout(url, {
                 method: 'POST',
                 headers: {
                     Authorization: `Bearer ${this.apiKey}`,