Release DiskMount 0.2.9

Author: samni728

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.2.9 - 2026-08-04
+
+- Supports Chinese and other non-ASCII NTFS volume names by assigning an ASCII-only custom NFS mount point while preserving the original display name in DiskMount.
+- Verifies that an exact device-backed NFS mount actually appears after anylinuxfs exits instead of treating its process exit code as proof of success.
+- Waits up to five seconds for the postcondition, reports a real failure when the mount is absent, and restores the native macOS read-only NTFS mount.
+- Saves Auto Read/Write only after the verified NFS mount succeeds, preventing failed mounts from being remembered as successful.
+- Adds regression coverage using the reported `大白菜U盘` name, safe-path sanitization, mount verification, and fallback restoration.
+
 ## 0.2.8 - 2026-08-04
 
 - Keeps a successfully ejected physical disk hidden across periodic refreshes while it remains connected, preventing the same unmounted device from reappearing in the panel.

DiskMount/DiskMount.xcodeproj/project.pbxproj

@@ -324,7 +324,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development: samni728@gmail.com (4BVG532TG3)";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 13;
+				CURRENT_PROJECT_VERSION = 14;
 				DEVELOPMENT_TEAM = YU9NH29226;
 				ENABLE_APP_SANDBOX = NO;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -334,7 +334,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 0.2.8;
+				MARKETING_VERSION = 0.2.9;
 				PRODUCT_BUNDLE_IDENTIFIER = com.samni.DiskMount;
 				PRODUCT_NAME = DiskMount;
 				SDKROOT = macosx;
@@ -413,7 +413,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development: samni728@gmail.com (4BVG532TG3)";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 13;
+				CURRENT_PROJECT_VERSION = 14;
 				DEVELOPMENT_TEAM = YU9NH29226;
 				ENABLE_APP_SANDBOX = NO;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -423,7 +423,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 0.2.8;
+				MARKETING_VERSION = 0.2.9;
 				PRODUCT_BUNDLE_IDENTIFIER = com.samni.DiskMount;
 				PRODUCT_NAME = DiskMount;
 				SDKROOT = macosx;

DiskMount/Resources/index.html

@@ -14,7 +14,7 @@
         <img class="brand-icon" src="logo.png" alt="">
         <div>
           <div class="eyebrow" data-i18n="eyebrow">DISK CONTROL</div>
-          <h1>DiskMount <button id="version-button" class="version-button" data-action="openUpdate" type="button" disabled><span id="version">0.2.8</span><span id="update-indicator" class="update-indicator hidden" aria-hidden="true"></span></button></h1>
+          <h1>DiskMount <button id="version-button" class="version-button" data-action="openUpdate" type="button" disabled><span id="version">0.2.9</span><span id="update-indicator" class="update-indicator hidden" aria-hidden="true"></span></button></h1>
         </div>
       </div>
       <div class="toolbar">

DiskMount/Services/AnyLinuxFSService.swift

@@ -25,20 +25,49 @@ final class AnyLinuxFSService {
         return DependencyState(available: true, path: path, version: rawVersion ?? "anylinuxfs", bundled: bundled)
     }
 
-    func mountReadWrite(devicePath: String) throws {
+    func mountReadWrite(
+        devicePath: String,
+        deviceIdentifier: String,
+        volumeName: String
+    ) throws {
         guard let path = executablePath else {
             throw AnyLinuxFSError.notInstalled
         }
+        let arguments = Self.mountArguments(
+            devicePath: devicePath,
+            deviceIdentifier: deviceIdentifier,
+            volumeName: volumeName
+        )
         do {
             _ = try CommandRunner.runNTFSMountAsAdministrator(
                 path,
                 devicePath: devicePath,
-                arguments: ["mount", devicePath, "--remount", "--ignore-permissions", "--window", "false"]
+                arguments: arguments
             )
+            let mounts = DiskService().activeAnyLinuxFSMounts()
+            guard Self.hasVerifiedWritableMount(
+                deviceIdentifier: deviceIdentifier,
+                mounts: mounts
+            ) else {
+                if mounts[deviceIdentifier] != nil {
+                    _ = try? CommandRunner.runAnyLinuxFSUnmountAsAdministrator(
+                        path,
+                        devicePath: devicePath
+                    )
+                }
+                _ = try? CommandRunner.run(
+                    "/usr/sbin/diskutil",
+                    arguments: ["mount", devicePath]
+                )
+                throw AnyLinuxFSError.mountVerificationFailed
+            }
         } catch {
             if Self.isRawDiskPermissionError(error) {
                 throw AnyLinuxFSError.fullDiskAccessRequired
             }
+            if Self.isMissingMountVerificationError(error) {
+                throw AnyLinuxFSError.mountVerificationFailed
+            }
             throw error
         }
     }
@@ -57,18 +86,59 @@ final class AnyLinuxFSService {
             || message.contains("operation not permitted")
             || message.contains("file-read-data")
     }
+
+    static func mountArguments(
+        devicePath: String,
+        deviceIdentifier: String,
+        volumeName: String
+    ) -> [String] {
+        var arguments = ["mount", devicePath]
+        if requiresASCIIMountPoint(volumeName) {
+            arguments.append(safeMountPoint(deviceIdentifier: deviceIdentifier))
+        }
+        arguments.append(contentsOf: ["--remount", "--ignore-permissions", "--window", "false"])
+        return arguments
+    }
+
+    static func requiresASCIIMountPoint(_ volumeName: String) -> Bool {
+        let forbidden = CharacterSet(charactersIn: "/:").union(.controlCharacters)
+        return volumeName.isEmpty
+            || volumeName.data(using: .ascii, allowLossyConversion: false) == nil
+            || volumeName.rangeOfCharacter(from: forbidden) != nil
+    }
+
+    static func safeMountPoint(deviceIdentifier: String) -> String {
+        let allowed = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_"
+        let safeIdentifier = deviceIdentifier.filter { allowed.contains($0) }
+        let suffix = safeIdentifier.isEmpty ? "External" : safeIdentifier
+        return "/Volumes/DiskMount-\(suffix)"
+    }
+
+    static func isMissingMountVerificationError(_ error: Error) -> Bool {
+        error.localizedDescription.contains(CommandRunner.ntfsMountVerificationMarker)
+    }
+
+    static func hasVerifiedWritableMount(
+        deviceIdentifier: String,
+        mounts: [String: DiskService.AnyLinuxFSMount]
+    ) -> Bool {
+        mounts[deviceIdentifier]?.writable == true
+    }
 }
 
 enum AnyLinuxFSError: LocalizedError {
     case notInstalled
     case fullDiskAccessRequired
+    case mountVerificationFailed
 
     var errorDescription: String? {
         switch self {
         case .notInstalled:
             return "未检测到 anylinuxfs。请先执行：brew tap nohajc/anylinuxfs && brew install anylinuxfs"
         case .fullDiskAccessRequired:
             return "macOS 阻止了 NTFS 引擎读取原始磁盘。"
+        case .mountVerificationFailed:
+            return "NTFS 引擎未能建立可用的 NFS 挂载。"
         }
     }
 }

DiskMount/Services/CommandRunner.swift

@@ -38,6 +38,7 @@ enum CommandError: LocalizedError {
 
 enum CommandRunner {
     private static let sudoSession = SudoSession()
+    static let ntfsMountVerificationMarker = "DiskMount: NTFS engine exited without creating an NFS mount."
 
     static func run(
         _ executable: String,
@@ -133,6 +134,18 @@ enum CommandRunner {
         devicePath: String,
         arguments: [String]
     ) throws -> CommandResult {
+        return try sudoSession.run(ntfsMountShellCommand(
+            executable,
+            devicePath: devicePath,
+            arguments: arguments
+        ))
+    }
+
+    static func ntfsMountShellCommand(
+        _ executable: String,
+        devicePath: String,
+        arguments: [String]
+    ) -> String {
         let privilegedMount = ([executable] + arguments).map(shellQuote).joined(separator: " ")
         let fallbackMount = ["/usr/sbin/diskutil", "mount", devicePath]
             .map(shellQuote).joined(separator: " ")
@@ -144,11 +157,16 @@ enum CommandRunner {
         // unmounting the read-only volume, restore the normal macOS mount before returning.
         // Never create a duplicate read-only mount if a surviving anylinuxfs NFS mount still
         // owns this device after system wake.
-        let command = "status=0; \(privilegedMount) || status=$?; "
+        return "status=0; \(privilegedMount) || status=$?; "
+            + "if [ \"$status\" -eq 0 ]; then mounted=0; attempts=0; "
+            + "while [ \"$attempts\" -lt 20 ]; do "
+            + "if \(activeAnyLinuxFSMount); then mounted=1; break; fi; "
+            + "attempts=$((attempts + 1)); /bin/sleep 0.25; done; "
+            + "if [ \"$mounted\" -ne 1 ]; then "
+            + "/bin/echo \(shellQuote(ntfsMountVerificationMarker)) >&2; status=70; fi; fi; "
             + "if [ \"$status\" -ne 0 ] && ! \(activeAnyLinuxFSMount); then "
             + "\(fallbackMount) >/dev/null 2>&1 || true; fi; "
             + "(exit \"$status\")"
-        return try sudoSession.run(command)
     }
 
     static func runAnyLinuxFSUnmountAsAdministrator(

DiskMount/Tests/CommandRunnerTests.swift

@@ -66,6 +66,94 @@ final class CommandRunnerTests: XCTestCase {
         XCTAssertFalse(AnyLinuxFSService.isRawDiskPermissionError(error))
     }
 
+    func testChineseVolumeNameUsesASCIICustomMountPoint() {
+        XCTAssertEqual(
+            AnyLinuxFSService.mountArguments(
+                devicePath: "/dev/disk35s1",
+                deviceIdentifier: "disk35s1",
+                volumeName: "大白菜U盘"
+            ),
+            [
+                "mount", "/dev/disk35s1", "/Volumes/DiskMount-disk35s1",
+                "--remount", "--ignore-permissions", "--window", "false"
+            ]
+        )
+    }
+
+    func testASCIINameKeepsAnyLinuxFSDefaultMountPoint() {
+        XCTAssertEqual(
+            AnyLinuxFSService.mountArguments(
+                devicePath: "/dev/disk66s1",
+                deviceIdentifier: "disk66s1",
+                volumeName: "SYSDISK"
+            ),
+            [
+                "mount", "/dev/disk66s1",
+                "--remount", "--ignore-permissions", "--window", "false"
+            ]
+        )
+    }
+
+    func testUnsafeDeviceIdentifierIsSanitizedForMountPoint() {
+        XCTAssertEqual(
+            AnyLinuxFSService.safeMountPoint(deviceIdentifier: "磁盘 disk 35/s1;$()"),
+            "/Volumes/DiskMount-disk35s1"
+        )
+    }
+
+    func testNTFSMountCommandVerifiesNFSPostconditionAndRestoresNativeMount() {
+        let command = CommandRunner.ntfsMountShellCommand(
+            "/Applications/Disk Mount/anylinuxfs",
+            devicePath: "/dev/disk35s1",
+            arguments: [
+                "mount", "/dev/disk35s1", "/Volumes/DiskMount-disk35s1",
+                "--remount", "--ignore-permissions", "--window", "false"
+            ]
+        )
+
+        XCTAssertTrue(command.contains("'disk35s1.local:'"))
+        XCTAssertTrue(command.contains("/bin/sleep 0.25"))
+        XCTAssertTrue(command.contains(CommandRunner.ntfsMountVerificationMarker))
+        XCTAssertTrue(command.contains("'/usr/sbin/diskutil' 'mount' '/dev/disk35s1'"))
+        XCTAssertTrue(command.contains("'/Volumes/DiskMount-disk35s1'"))
+    }
+
+    func testMissingMountVerificationErrorIsRecognized() {
+        let error = CommandError.failed(
+            executable: "/usr/bin/sudo",
+            exitCode: 70,
+            message: CommandRunner.ntfsMountVerificationMarker
+        )
+
+        XCTAssertTrue(AnyLinuxFSService.isMissingMountVerificationError(error))
+    }
+
+    func testNTFSSuccessRequiresExactWritableMount() {
+        let writable = DiskService.AnyLinuxFSMount(
+            deviceIdentifier: "disk35s1",
+            mountPoint: "/Volumes/DiskMount-disk35s1",
+            writable: true
+        )
+        let readOnly = DiskService.AnyLinuxFSMount(
+            deviceIdentifier: "disk35s1",
+            mountPoint: "/Volumes/DiskMount-disk35s1",
+            writable: false
+        )
+
+        XCTAssertTrue(AnyLinuxFSService.hasVerifiedWritableMount(
+            deviceIdentifier: "disk35s1",
+            mounts: ["disk35s1": writable]
+        ))
+        XCTAssertFalse(AnyLinuxFSService.hasVerifiedWritableMount(
+            deviceIdentifier: "disk35s1",
+            mounts: ["disk35s1": readOnly]
+        ))
+        XCTAssertFalse(AnyLinuxFSService.hasVerifiedWritableMount(
+            deviceIdentifier: "disk35s1",
+            mounts: ["disk66s1": writable]
+        ))
+    }
+
     func testParsesAnyLinuxFSMountByDeviceIdentifier() {
         let output = """
         /dev/disk3s1 on /System/Volumes/Data (apfs, local, journaled)

DiskMount/Web/WebPanelController.swift

@@ -401,7 +401,11 @@ final class WebPanelController: NSViewController, WKScriptMessageHandler {
                 case "mountNTFS":
                     guard device.isNTFS else { throw PanelError.notNTFS }
                     if !self.diskService.isMountedByAnyLinuxFS(deviceIdentifier: device.id) {
-                        try self.anyLinuxFS.mountReadWrite(devicePath: device.devicePath)
+                        try self.anyLinuxFS.mountReadWrite(
+                            devicePath: device.devicePath,
+                            deviceIdentifier: device.id,
+                            volumeName: device.name
+                        )
                     }
                     successMessage = self.localized(
                         zh: "已将 \(device.name) 以 NTFS 读写模式加载",
@@ -568,6 +572,11 @@ final class WebPanelController: NSViewController, WKScriptMessageHandler {
                     zh: "macOS 已阻止 NTFS 引擎读取原始磁盘。DiskMount 已尝试恢复普通只读挂载；请确认已为 DiskMount 开启“完全磁盘访问权限”和“可移动卷”权限，完全退出并重新打开 App 后再试。",
                     en: "macOS blocked the NTFS engine from reading the raw disk. DiskMount attempted to restore the normal read-only mount. Enable Full Disk Access and Removable Volumes access for DiskMount, fully quit and reopen the app, then try again."
                 )
+            case .mountVerificationFailed:
+                return localized(
+                    zh: "NTFS 引擎已经退出，但没有建立可用的 NFS 读写挂载。DiskMount 已尝试恢复 macOS 原生只读挂载；请刷新后重试。",
+                    en: "The NTFS engine exited without creating a usable NFS read/write mount. DiskMount attempted to restore the native macOS read-only mount; refresh and try again."
+                )
             }
         }
         if let diskServiceError = error as? DiskServiceError {
@@ -599,7 +608,7 @@ final class WebPanelController: NSViewController, WKScriptMessageHandler {
 
     private func publish() {
         let state = PanelState(
-            version: Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString") as? String ?? "0.2.8",
+            version: Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString") as? String ?? "0.2.9",
             devices: devices,
             dependency: anyLinuxFS.dependencyState(),
             proMode: proMode,

DiskMount/project.yml

@@ -24,8 +24,8 @@ targets:
         PRODUCT_BUNDLE_IDENTIFIER: com.samni.DiskMount
         PRODUCT_NAME: DiskMount
         ARCHS: arm64
-        MARKETING_VERSION: 0.2.8
-        CURRENT_PROJECT_VERSION: 13
+        MARKETING_VERSION: 0.2.9
+        CURRENT_PROJECT_VERSION: 14
         INFOPLIST_FILE: Info.plist
         GENERATE_INFOPLIST_FILE: NO
         CODE_SIGN_STYLE: Manual

INSTALLATION.md

@@ -4,18 +4,18 @@
 
 ## Before you install
 
-Download DiskMount only from the official [GitHub Releases page](https://github.com/samni728/diskmount/releases). Version 0.2.8 is self-contained and does not require Homebrew, Xcode, or a separate anylinuxfs installation.
+Download DiskMount only from the official [GitHub Releases page](https://github.com/samni728/diskmount/releases). Version 0.2.9 is self-contained and does not require Homebrew, Xcode, or a separate anylinuxfs installation.
 
 The current package is signed with the developer's Apple Development certificate, but it is not signed with a Developer ID Application certificate and is not Apple-notarized. A Mac that downloads the DMG from the internet may therefore block the first launch. This Gatekeeper approval is separate from the disk permissions requested after DiskMount starts.
 
 ## Normal installation
 
-1. Download `DiskMount-0.2.8-macOS26.dmg` and its `.sha256` file.
+1. Download `DiskMount-0.2.9-macOS26.dmg` and its `.sha256` file.
 2. Optionally verify the download in Terminal:
 
    ```bash
    cd ~/Downloads
-   shasum -a 256 -c DiskMount-0.2.8-macOS26.dmg.sha256
+   shasum -a 256 -c DiskMount-0.2.9-macOS26.dmg.sha256
    ```
 
 3. Open the DMG and drag `DiskMount.app` to `Applications`.
@@ -50,4 +50,4 @@ DiskMount contacts GitHub's public latest-Release API when it starts and when th
 
 ## Commercial distribution status
 
-Version 0.2.8 is a development-signed community release. Warning-free public distribution requires a Developer ID Application certificate, hardened-runtime signing of the app and all bundled helpers, Apple notarization, and a stapled notarization ticket.
+Version 0.2.9 is a development-signed community release. Warning-free public distribution requires a Developer ID Application certificate, hardened-runtime signing of the app and all bundled helpers, Apple notarization, and a stapled notarization ticket.