craft-native 0.0.344 → 0.0.346

package/dist/android/templates/CraftNativeCapabilities.kt.template

@@ -16,6 +16,9 @@ import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import android.os.Build
 import android.net.Uri
+import android.net.ConnectivityManager
+import android.net.Network
+import android.net.NetworkCapabilities
 import android.provider.MediaStore
 import android.util.Base64
 import androidx.core.content.ContextCompat
@@ -111,13 +114,38 @@ internal class CraftNativeCapabilities(
         val videoLimit: Long = 0,
     )
 
+    private val connectivity = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+    private val networkWatch = object : ConnectivityManager.NetworkCallback() {
+        private fun changed() {
+            if (!closed.get()) CraftNativeHub.broadcast("CRAFT_EVENT", JSONObject().put("event", "craftNetworkChange").put("detail", networkStatus()))
+        }
+        override fun onAvailable(network: Network) = changed()
+        override fun onLost(network: Network) = changed()
+        override fun onCapabilitiesChanged(network: Network, capabilities: NetworkCapabilities) = changed()
+    }
+
+    private fun networkStatus(): JSONObject {
+        val capabilities = connectivity.getNetworkCapabilities(connectivity.activeNetwork)
+        val connected = capabilities?.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) == true
+        val type = when {
+            !connected -> "none"
+            capabilities?.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) == true -> "wifi"
+            capabilities?.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) == true -> "cellular"
+            capabilities?.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET) == true -> "ethernet"
+            else -> "unknown"
+        }
+        return JSONObject().put("isConnected", connected).put("type", type)
+    }
+
     init {
+        connectivity.registerDefaultNetworkCallback(networkWatch)
         restoreNotifications()
         sweepFiles()
     }
 
     fun names(): JSONArray = JSONArray().apply {
         listOf("device", "clipboard", "haptics", "storage", "lifecycle", "fetch", "files").forEach(::put)
+        put("network")
         put("storageCompareAndSet")
         put("storageSetIfAbsent")
         put("crypto")
@@ -179,7 +207,9 @@ internal class CraftNativeCapabilities(
             "DeepLinks" -> complete(requestToken, deepLinks(method), completion)
             "Notifications" -> notifications(requestToken, method, args, completion)
             "Network" -> {
-                if (method != "fetch") {
+                if (method == "getStatus") {
+                    complete(requestToken, success(networkStatus()), completion)
+                } else if (method != "fetch") {
                     complete(requestToken, failure("UNKNOWN_ACTION", "Unsupported Network method"), completion)
                 } else networkExecutor.execute {
                     complete(requestToken, fetch(requestToken, args), completion)
@@ -207,6 +237,7 @@ internal class CraftNativeCapabilities(
 
     fun close() {
         if (!closed.compareAndSet(false, true)) return
+        runCatching { connectivity.unregisterNetworkCallback(networkWatch) }
         cancelled.clear()
         if (config.optBoolean("enableBluetooth")) bluetooth.disconnect()
         databaseExecutor.shutdownNow()
@@ -630,7 +661,10 @@ internal class CraftNativeCapabilities(
     private fun sweepFiles() {
         val cutoff = System.currentTimeMillis() - 24L * 60L * 60L * 1000L
         fileRoot.listFiles()?.forEach { file ->
-            if (file.lastModified() < cutoff) file.deleteRecursively()
+            // Voice captures have a separate launch lifetime; sweep only
+            // generic per-file UUID folders here.
+            val owned = runCatching { UUID.fromString(file.name).toString().equals(file.name, ignoreCase = true) }.getOrDefault(false)
+            if (owned && file.lastModified() < cutoff) file.deleteRecursively()
         }
     }
 

package/dist/android/templates/CraftNativeServices.kt.template

@@ -85,6 +85,7 @@ internal class CraftNativeServices(
 {{NATIVE_WALLET_FIELDS}}
 
     init {
+        prepareVoiceFiles(context, config.optBoolean("enableAudioRecording"))
         if (config.optBoolean("enableGeolocation") || config.optBoolean("enableBackgroundLocation")) {
             // Native screens must also hear a recording started by the page.
             // Keep this process sink independent from the page's listener.
@@ -629,7 +630,7 @@ internal class CraftNativeServices(
     private var voiceFile: File? = null
     private var pendingVoicePermission: ((Boolean) -> Unit)? = null
 
-    fun pauseVoice() { if (voiceRecorder != null) cancelVoice() }
+    fun pauseVoice() { if (voiceRecorder != null || voiceFile != null) cancelVoice() }
     private fun cancelVoice() {
         voiceOwner = null
         val recorder = voiceRecorder
@@ -676,7 +677,7 @@ internal class CraftNativeServices(
             if (voiceOwner != key) { done(failure("RECORDING_CANCELLED", "Recording was cancelled")); return@start }
             if (!allowed) { cancelVoice(); done(failure("PERMISSION_DENIED", "Microphone permission was refused")); return@start }
             try {
-                val folder = File(context.cacheDir, "craft-files/" + UUID.randomUUID()).apply { mkdirs() }
+                val folder = File(context.cacheDir, "craft-files/voice-recordings/" + UUID.randomUUID()).apply { mkdirs() }
                 val file = File(folder, "voice-feedback.m4a")
                 voiceFile = file
                 @Suppress("DEPRECATION")
@@ -816,6 +817,38 @@ internal class CraftNativeServices(
     private fun failure(code: String, message: String) = CraftNativeCapabilityResult(code = code, message = message)
 
     companion object {
+        private var voiceFilesPrepared = false
+        private var legacyVoiceFilesPrepared = false
+
+        @Synchronized
+        private fun prepareVoiceFiles(context: Context, includeLegacy: Boolean) {
+            val root = File(context.cacheDir, "craft-files")
+            if (!voiceFilesPrepared) {
+                discardAbandonedVoiceFiles(root, false)
+                voiceFilesPrepared = true
+            }
+            if (includeLegacy && !legacyVoiceFilesPrepared) {
+                discardAbandonedVoiceFiles(root)
+                legacyVoiceFilesPrepared = true
+            }
+        }
+
+        internal fun discardAbandonedVoiceFiles(root: File, includeLegacy: Boolean = true) {
+            val base = root.canonicalFile
+            val voice = File(base, "voice-recordings")
+            for (scope in if (includeLegacy) listOf(base, voice) else listOf(voice)) {
+                if (scope.canonicalFile != scope.absoluteFile) continue
+                for (folder in scope.listFiles().orEmpty()) {
+                    val owned = runCatching { UUID.fromString(folder.name).toString().equals(folder.name, ignoreCase = true) }.getOrDefault(false)
+                    if (!owned || folder.canonicalFile != folder.absoluteFile) continue
+                    val file = File(folder, "voice-feedback.m4a")
+                    if (!file.isFile || file.canonicalFile != file.absoluteFile) continue
+                    file.delete()
+                    if (folder.listFiles()?.isEmpty() == true) folder.delete()
+                }
+            }
+        }
+
         const val PUSH_PERMISSION_REQUEST = 4207
         const val LOCATION_PERMISSION_REQUEST = 4208
     }

package/dist/cli.js

@@ -3022,7 +3022,7 @@ function pinCraftNativeDependency(packagePath, craftVersion) {
 `);
 }
 // package.json
-var version = "0.0.344";
+var version = "0.0.346";
 
 // bin/cli.ts
 var spawnedFrom = process6.env[CRAFT_CLI_SPAWN_MARKER];

package/dist/index.cjs

@@ -375,7 +375,7 @@ function craftBinaryNotFoundMessage(triedPath) {
 `);
 }
 // package.json
-var version = "0.0.344";
+var version = "0.0.346";
 
 // src/sdk-version.ts
 var SDK_VERSION = version;

package/dist/index.js

@@ -117,7 +117,7 @@ function craftBinaryNotFoundMessage(triedPath) {
 `);
 }
 // package.json
-var version = "0.0.344";
+var version = "0.0.346";
 
 // src/sdk-version.ts
 var SDK_VERSION = version;

package/dist/ios/templates/CraftApp.swift

@@ -9676,7 +9676,7 @@ final class CraftZigRuntime: NSObject {
 enum CraftWebServices {
     private static var waiting: [String: (Result<Any, CraftNativeActionError>) -> Void] = [:]
     /// Coordinator events a native screen hears too.
-    static let forwardedEvents: Set<String> = ["craftLocationUpdate", "craftLocationError", "craftHealthHeartRate", "craftHealthWorkout", "craftMusicChange", "craftHeartRate"]
+    static let forwardedEvents: Set<String> = ["craftNetworkChange", "craftLocationUpdate", "craftLocationError", "craftHealthHeartRate", "craftHealthWorkout", "craftMusicChange", "craftHeartRate"]
     static let event = Notification.Name("craftWebServicesEvent")
 
     static var isAvailable: Bool { CraftSwiftShim.coordinator != nil }

package/dist/ios/templates/CraftNativeActions.swift

@@ -43,6 +43,7 @@ enum CraftNativeActions {
         // `speech`, `audio` (background sound) and `eventStream` (a fetch read
         // as it arrives) need nothing the app has to declare.
         var values = ["device", "clipboard", "haptics", "storage", "lifecycle", "fetch", "dialog", "speech", "audio", "eventStream", "linking", "badge", "animation", "viewFocus", "viewMeasure", "viewReparent", "viewNonModalPresentation", "nativePlatformControls"]
+        values.append("network")
         values.append("nativePager")
         values.append("storageCompareAndSet")
         values.append("storageSetIfAbsent")
@@ -245,6 +246,9 @@ enum CraftNativeActions {
             }
             authenticate(requestToken: requestToken, args: args, completion: completion)
             return
+        case ("Network", "getStatus"):
+            CraftWebServices.perform(action: "getNetworkStatus", body: [:]) { complete(requestToken, $0, completion) }
+            return
         case ("Network", "fetch"):
             fetch(requestToken: requestToken, args: args, completion: completion)
             return

package/dist/ios/templates/CraftNativeFiles.swift

@@ -94,6 +94,9 @@ enum CraftNativeFiles {
         let dayAgo = Date().addingTimeInterval(-86_400)
         let folders = (try? fm.contentsOfDirectory(at: root, includingPropertiesForKeys: [.creationDateKey])) ?? []
         for folder in folders {
+            // Only generic per-file folders: private voice captures have their
+            // own launch lifetime and must not be swept during a live recording.
+            guard UUID(uuidString: folder.lastPathComponent) != nil else { continue }
             let created = (try? folder.resourceValues(forKeys: [.creationDateKey]))?.creationDate ?? .distantPast
             if created < dayAgo { try? fm.removeItem(at: folder) }
         }

package/dist/ios/templates/CraftNativeScreen.swift

@@ -5804,6 +5804,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         self.routeProps = routeProps
         self.isAppScript = isAppScript
         super.init(nibName: nil, bundle: nil)
+        CraftVoiceRecording.prepareForLaunch(includeLegacy: config.enableAudioRecording)
     }
 
     required init?(coder: NSCoder) {

package/dist/ios/templates/CraftVoiceRecording.swift

@@ -13,6 +13,54 @@ extension AVAudioRecorder: CraftVoiceRecorder {}
 /// is starting, so a late permission/encoder answer cannot resurrect it.
 final class CraftVoiceRecording {
     static let shared = CraftVoiceRecording()
+    private static let fileQueue = DispatchQueue(label: "craft.voice-recording-files", qos: .utility)
+    private static let launchCleanup: Void = discardAbandonedRecordings(includeLegacy: false)
+    private static let legacyCleanup: Void = discardAbandonedRecordings()
+    private static let folderName = "voice-recordings"
+
+    /// Temporary voice files have a launch lifetime, unlike picked files and
+    /// downloads. Run once across all screens, without touching audio hardware.
+    static func prepareForLaunch(includeLegacy: Bool = true) {
+        _ = launchCleanup
+        if includeLegacy { _ = legacyCleanup }
+    }
+
+    static func discardAbandonedRecordings(in root: URL = CraftNativeFiles.root, includeLegacy: Bool = true) {
+        let fm = FileManager.default
+        // Also migrate the recorder's earlier UUID folders at craft-files' root.
+        let voice = root.appendingPathComponent(folderName, isDirectory: true)
+        for scope in includeLegacy ? [root, voice] : [voice] {
+            guard (try? scope.resourceValues(forKeys: [.isSymbolicLinkKey]))?.isSymbolicLink != true else { continue }
+            let folders = (try? fm.contentsOfDirectory(at: scope, includingPropertiesForKeys: [.isSymbolicLinkKey])) ?? []
+            for folder in folders {
+                guard UUID(uuidString: folder.lastPathComponent) != nil,
+                      (try? folder.resourceValues(forKeys: [.isSymbolicLinkKey]))?.isSymbolicLink != true else { continue }
+                let file = folder.appendingPathComponent("voice-feedback.m4a")
+                let values = try? file.resourceValues(forKeys: [.isSymbolicLinkKey, .isRegularFileKey])
+                guard values?.isRegularFile == true, values?.isSymbolicLink != true else { continue }
+                try? fm.removeItem(at: file)
+                if (try? fm.contentsOfDirectory(atPath: folder.path).isEmpty) == true { try? fm.removeItem(at: folder) }
+            }
+        }
+    }
+
+    private static func newRecordingFile() throws -> URL {
+        prepareForLaunch()
+        let root = CraftNativeFiles.root.appendingPathComponent(folderName, isDirectory: true)
+        guard (try? root.resourceValues(forKeys: [.isSymbolicLinkKey]))?.isSymbolicLink != true else { throw CocoaError(.fileWriteNoPermission) }
+        let folder = root.appendingPathComponent(UUID().uuidString, isDirectory: true)
+        try FileManager.default.createDirectory(at: folder, withIntermediateDirectories: true)
+        let file = folder.appendingPathComponent("voice-feedback.m4a")
+        do {
+            // An owned placeholder lets cancellation erase the path even when
+            // AVFoundation has not finished constructing its recorder yet.
+            try Data().write(to: file)
+            return file
+        } catch {
+            try? FileManager.default.removeItem(at: folder)
+            throw error
+        }
+    }
     private final class Session {
         let key: String
         var file: URL?
@@ -53,6 +101,7 @@ final class CraftVoiceRecording {
              return try AVAudioRecorder(url: file, settings: [AVFormatIDKey: kAudioFormatMPEG4AAC, AVSampleRateKey: 16000, AVNumberOfChannelsKey: 1, AVEncoderBitRateKey: 32000])
          },
          deactivate: @escaping () -> Void = { try? AVAudioSession.sharedInstance().setActive(false, options: .notifyOthersOnDeactivation) }) {
+        Self.prepareForLaunch()
         self.audioQueue = audioQueue
         self.startupTimeout = startupTimeout
         self.permission = permission
@@ -75,6 +124,10 @@ final class CraftVoiceRecording {
         current = nil
         session.invalidate()
         session.finish(.failure(error))
+        if let file = session.file {
+            // A stalled encoder must not hold deletion behind its audio queue.
+            Self.fileQueue.async { CraftNativeFiles.remove(file.path) }
+        }
         audioQueue.async { self.erase(session) }
     }
 
@@ -132,7 +185,7 @@ final class CraftVoiceRecording {
                     return
                 }
                 guard allowed else { self.clear(CraftNativeActionError(code: "PERMISSION_DENIED", message: "Microphone permission was refused")); return }
-                do { session.file = try CraftNativeFiles.newFile(named: "voice-feedback.m4a") }
+                do { session.file = try Self.newRecordingFile() }
                 catch { self.clear(CraftNativeActionError(code: "RECORDING_FAILED", message: "The recording file could not be created")); return }
                 guard let file = session.file else { return }
                 let deadline = DispatchWorkItem { [weak host = self] in

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "craft-native",
-  "version": "0.0.344",
+  "version": "0.0.346",
   "type": "module",
   "description": "Build desktop apps with web languages - TypeScript SDK for Craft",
   "author": "Chris Breuer <chris@stacksjs.org>",