@rn-bridge-tools/expo 0.0.10 → 0.0.11

package/dist/handlers/device.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"device.d.ts","sourceRoot":"","sources":["../../src/handlers/device.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAY7D,eAAO,MAAM,cAAc;iCAEb,eAAe,CAAC,gBAAgB,CAAC,CAAC,SAAS,CAAC,KACrD,OAAO,CAAC,eAAe,CAAC,gBAAgB,CAAC,CAAC,UAAU,CAAC,CAAC;oCAkB7C,eAAe,CAAC,mBAAmB,CAAC,CAAC,SAAS,CAAC,KACxD,OAAO,CAAC,eAAe,CAAC,mBAAmB,CAAC,CAAC,UAAU,CAAC,CAAC;oCAmBhD,eAAe,CAAC,mBAAmB,CAAC,CAAC,SAAS,CAAC,KACxD,OAAO,CAAC,eAAe,CAAC,mBAAmB,CAAC,CAAC,UAAU,CAAC,CAAC;CAgB7D,CAAC"}
+{"version":3,"file":"device.d.ts","sourceRoot":"","sources":["../../src/handlers/device.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AA0B7D,eAAO,MAAM,cAAc;iCAEb,eAAe,CAAC,gBAAgB,CAAC,CAAC,SAAS,CAAC,KACrD,OAAO,CAAC,eAAe,CAAC,gBAAgB,CAAC,CAAC,UAAU,CAAC,CAAC;oCAsB7C,eAAe,CAAC,mBAAmB,CAAC,CAAC,SAAS,CAAC,KACxD,OAAO,CAAC,eAAe,CAAC,mBAAmB,CAAC,CAAC,UAAU,CAAC,CAAC;oCAkBhD,eAAe,CAAC,mBAAmB,CAAC,CAAC,SAAS,CAAC,KACxD,OAAO,CAAC,eAAe,CAAC,mBAAmB,CAAC,CAAC,UAAU,CAAC,CAAC;CAoB7D,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rn-bridge-tools/expo",
-  "version": "0.0.10",
+  "version": "0.0.11",
   "description": "Expo/React Native WebView bridge component and handlers for bridge-tools",
   "main": "./src/index.ts",
   "types": "./dist/index.d.ts",
@@ -15,11 +15,11 @@
     "dist"
   ],
   "dependencies": {
-    "@rn-bridge-tools/core": "0.0.10"
+    "@rn-bridge-tools/core": "0.0.11"
   },
   "peerDependencies": {
     "@react-native-async-storage/async-storage": "*",
-    "@react-native-community/netinfo": "*",
+    "expo-network": "*",
     "@webview-bridge/react-native": ">=1.0.0",
     "expo-battery": "*",
     "expo-camera": "*",
@@ -82,7 +82,7 @@
     "@react-native-async-storage/async-storage": {
       "optional": true
     },
-    "@react-native-community/netinfo": {
+    "expo-network": {
       "optional": true
     },
     "expo-battery": {

package/src/handlers/device.ts

@@ -10,6 +10,20 @@ interface DeviceModule {
   DeviceType: { TABLET: number };
 }
 
+interface BatteryModule {
+  getBatteryLevelAsync: () => Promise<number>;
+  getBatteryStateAsync: () => Promise<number>;
+  BatteryState: { CHARGING: number };
+}
+
+interface NetworkModule {
+  getNetworkStateAsync: () => Promise<{
+    type: string;
+    isConnected: boolean;
+    isInternetReachable: boolean;
+  }>;
+}
+
 export const deviceHandlers = {
   'device.getInfo': async (
     _payload: DeviceNamespace['device.getInfo']['request'],
@@ -18,54 +32,61 @@ export const deviceHandlers = {
     try { Device = require('expo-device') as DeviceModule; } catch {}
     if (!Device) return { success: false, error: 'MODULE_NOT_INSTALLED: expo-device' } as never;
 
-    return {
-      os: Platform.OS as 'ios' | 'android',
-      osVersion: Platform.Version?.toString() ?? '',
-      model: Device.modelName ?? '',
-      brand: Device.brand ?? '',
-      isTablet: Device.deviceType === Device.DeviceType.TABLET,
-      appVersion: '1.0.0',
-      buildNumber: '1',
-      bundleId: '',
-    };
+    try {
+      return {
+        os: Platform.OS as 'ios' | 'android',
+        osVersion: Platform.Version?.toString() ?? '',
+        model: Device.modelName ?? '',
+        brand: Device.brand ?? '',
+        isTablet: Device.deviceType === Device.DeviceType.TABLET,
+        appVersion: '1.0.0',
+        buildNumber: '1',
+        bundleId: '',
+      };
+    } catch (e) {
+      return { success: false, error: String(e) } as never;
+    }
   },
 
   'device.getBattery': async (
     _payload: DeviceNamespace['device.getBattery']['request'],
   ): Promise<DeviceNamespace['device.getBattery']['response']> => {
+    let Battery: BatteryModule | null = null;
+    try { Battery = require('expo-battery') as BatteryModule; } catch {}
+    if (!Battery) return { success: false, error: 'MODULE_NOT_INSTALLED: expo-battery' } as never;
+
     try {
-      let Battery: { getBatteryLevelAsync: () => Promise<number>; getBatteryStateAsync: () => Promise<number>; BatteryState: { CHARGING: number } } | null = null;
-      try { Battery = require('expo-battery') as { getBatteryLevelAsync: () => Promise<number>; getBatteryStateAsync: () => Promise<number>; BatteryState: { CHARGING: number } }; } catch {}
-      if (!Battery) {
-        return { level: -1, isCharging: false };
-      }
       const level = await Battery.getBatteryLevelAsync();
       const state = await Battery.getBatteryStateAsync();
       return {
         level,
         isCharging: state === Battery.BatteryState.CHARGING,
       };
-    } catch {
-      return { level: -1, isCharging: false };
+    } catch (e) {
+      return { success: false, error: String(e) } as never;
     }
   },
 
   'device.getNetwork': async (
     _payload: DeviceNamespace['device.getNetwork']['request'],
   ): Promise<DeviceNamespace['device.getNetwork']['response']> => {
+    let Network: NetworkModule | null = null;
+    try { Network = require('expo-network') as NetworkModule; } catch {}
+    if (!Network) return { success: false, error: 'MODULE_NOT_INSTALLED: expo-network' } as never;
+
     try {
-      let NetInfo: { fetch: () => Promise<{ type: string; isConnected: boolean | null }> } | null = null;
-      try { NetInfo = require('@react-native-community/netinfo') as { fetch: () => Promise<{ type: string; isConnected: boolean | null }> }; } catch {}
-      if (!NetInfo) {
-        return { type: 'unknown', isConnected: true };
-      }
-      const state = await NetInfo.fetch();
+      const state = await Network.getNetworkStateAsync();
+      const typeMap: Record<string, 'wifi' | 'cellular' | 'none' | 'unknown'> = {
+        WIFI: 'wifi',
+        CELLULAR: 'cellular',
+        NONE: 'none',
+      };
       return {
-        type: (state.type as 'wifi' | 'cellular' | 'none' | 'unknown') ?? 'unknown',
+        type: typeMap[state.type] ?? 'unknown',
         isConnected: state.isConnected ?? false,
       };
-    } catch {
-      return { type: 'unknown', isConnected: true };
+    } catch (e) {
+      return { success: false, error: String(e) } as never;
     }
   },
 };