craft-native 0.0.345 → 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()

package/dist/cli.js

@@ -3022,7 +3022,7 @@ function pinCraftNativeDependency(packagePath, craftVersion) {
 `);
 }
 // package.json
-var version = "0.0.345";
+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.345";
+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.345";
+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/package.json

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