fix bug: 1. installation lock; 2. expired state

Author: xchmwang

installer/packages/com.datasafebox.client/meta/installscript.qs

@@ -63,15 +63,32 @@ Component.prototype.createOperations = function() {
         // its QtWebEngineProcess helper keeps e.g. resources/icudtl.dat
         // memory-mapped) or carry a read-only attribute; either aborts
         // extraction with "Can't unlink already-existing object: Permission
-        // denied". Stop processes running from the target dir and clear
-        // attributes before the archives are extracted.
+        // denied". A fixed sleep after Stop-Process is a guess and does not
+        // cover a lock held by something outside the target dir (antivirus
+        // real-time scan, indexer, etc.), so this actually waits for our own
+        // processes to exit and then verifies every existing file can be
+        // opened exclusively before the archives are extracted, retrying
+        // for a few seconds if something still holds a handle.
         var unlockScript =
             "$targetDir = " + psLiteral(toWindowsPath(targetDirRaw)) + "; " +
             "try { " +
             "  if (Test-Path $targetDir) { " +
-            "    Get-Process -ErrorAction SilentlyContinue | Where-Object { $_.Path -and $_.Path.StartsWith(($targetDir.TrimEnd('\\') + '\\'), [StringComparison]::OrdinalIgnoreCase) } | Stop-Process -Force -ErrorAction SilentlyContinue; " +
-            "    Start-Sleep -Milliseconds 800; " +
-            "    attrib.exe -R ($targetDir.TrimEnd('\\') + '\\*') /S /D; " +
+            "    $prefix = $targetDir.TrimEnd('\\') + '\\'; " +
+            "    $procs = Get-Process -ErrorAction SilentlyContinue | Where-Object { $_.Path -and $_.Path.StartsWith($prefix, [StringComparison]::OrdinalIgnoreCase) }; " +
+            "    if ($procs) { " +
+            "      $procs | Stop-Process -Force -ErrorAction SilentlyContinue; " +
+            "      foreach ($p in $procs) { try { if (-not $p.HasExited) { $p.WaitForExit(5000) | Out-Null } } catch {} } " +
+            "    } " +
+            "    attrib.exe -R ($prefix + '*') /S /D; " +
+            "    $deadline = (Get-Date).AddSeconds(6); " +
+            "    do { " +
+            "      $locked = $false; " +
+            "      Get-ChildItem -Path $targetDir -Recurse -File -ErrorAction SilentlyContinue | ForEach-Object { " +
+            "        try { ([System.IO.File]::Open($_.FullName, 'Open', 'ReadWrite', 'None')).Close() } catch { $locked = $true } " +
+            "      }; " +
+            "      if (-not $locked) { break }; " +
+            "      Start-Sleep -Milliseconds 300; " +
+            "    } while ((Get-Date) -lt $deadline); " +
             "  } " +
             "} catch {}; exit 0";
 

qml/Logic/DomainUtils.js

@@ -33,6 +33,7 @@ function normalizeInstanceStatus(statusValue) {
     if (statusText === "2") return "已拒绝"
     if (statusText === "3") return "运行中"
     if (statusText === "4") return "已结束"
+    if (statusText === "6") return "已过期"
     return statusText
 }
 

qml/Theme/Colors.qml

@@ -20,6 +20,7 @@ QtObject {
     readonly property string statusAuthorized: "已授权"
     readonly property string statusRejected: "已拒绝"
     readonly property string statusEnded: "已结束"
+    readonly property string statusExpired: "已过期"
 
     // Status colors
     readonly property var statusColors: ({
@@ -82,6 +83,12 @@ QtObject {
                 border: "#e2e8f0",
                 text: "#314158",
                 dot: "#90A1B9"
+            },
+            "已过期": {
+                bg: "#f1f5f9",
+                border: "#e2e8f0",
+                text: "#314158",
+                dot: "#90A1B9"
             }
         })
     readonly property var defaultStatusColor: ({
@@ -181,6 +188,8 @@ QtObject {
             return qsTr("Rejected");
         if (s === "已结束")
             return qsTr("Ended");
+        if (s === "已过期")
+            return qsTr("Expired");
         return s;
     }
 }