expo-network 7.0.2 → 7.0.3

package/CHANGELOG.md

@@ -10,6 +10,12 @@
 
 ### 💡 Others
 
+## 7.0.3 — 2024-12-02
+
+### 🐛 Bug fixes
+
+- Fix event emitters not working on web. ([#33327](https://github.com/expo/expo/pull/33327) by [@aleqsio](https://github.com/aleqsio))
+
 ## 7.0.2 — 2024-11-22
 
 _This version does not introduce any user-facing changes._

package/android/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 group = 'host.exp.exponent'
-version = '7.0.2'
+version = '7.0.3'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 apply from: expoModulesCorePlugin
@@ -14,6 +14,6 @@ android {
   namespace "expo.modules.network"
   defaultConfig {
     versionCode 11
-    versionName '7.0.2'
+    versionName '7.0.3'
   }
 }

package/build/ExpoNetwork.web.d.ts

@@ -1,9 +1,14 @@
-import { NetworkState } from './Network.types';
-declare const _default: {
+import { NativeModule } from 'expo-modules-core';
+import { NetworkEvents, NetworkState } from './Network.types';
+declare class ExpoNetworkModule extends NativeModule<NetworkEvents> {
+    eventListener?: () => void;
+    updateNetworkState(): void;
     getIpAddressAsync(): Promise<string>;
     getNetworkStateAsync(): Promise<NetworkState>;
+    isAirplaneModeEnabledAsync(): Promise<boolean>;
     startObserving(): void;
     stopObserving(): void;
-};
+}
+declare const _default: typeof ExpoNetworkModule;
 export default _default;
 //# sourceMappingURL=ExpoNetwork.web.d.ts.map

package/build/ExpoNetwork.web.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ExpoNetwork.web.d.ts","sourceRoot":"","sources":["../src/ExpoNetwork.web.ts"],"names":[],"mappings":"AAEA,OAAO,EAAsB,YAAY,EAAoB,MAAM,iBAAiB,CAAC;;yBAoBxD,QAAQ,MAAM,CAAC;4BASZ,QAAQ,YAAY,CAAC;;;;AAVrD,wBAqBE"}
+{"version":3,"file":"ExpoNetwork.web.d.ts","sourceRoot":"","sources":["../src/ExpoNetwork.web.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAqB,MAAM,mBAAmB,CAAC;AAEpE,OAAO,EAAE,aAAa,EAAE,YAAY,EAAoB,MAAM,iBAAiB,CAAC;AAahF,cAAM,iBAAkB,SAAQ,YAAY,CAAC,aAAa,CAAC;IACzD,aAAa,CAAC,EAAE,MAAM,IAAI,CAAC;IAC3B,kBAAkB;IAKZ,iBAAiB,IAAI,OAAO,CAAC,MAAM,CAAC;IASpC,oBAAoB,IAAI,OAAO,CAAC,YAAY,CAAC;IAG7C,0BAA0B,IAAI,OAAO,CAAC,OAAO,CAAC;IAGpD,cAAc;IAKd,aAAa;CAMd;;AAED,wBAAoD"}

package/build/ExpoNetwork.web.js

@@ -1,6 +1,5 @@
-import { EventEmitter } from 'expo-modules-core';
+import { NativeModule, registerWebModule } from 'expo-modules-core';
 import { NetworkStateType } from './Network.types';
-const emitter = new EventEmitter();
 const onNetworkStateEventName = 'onNetworkStateChanged';
 function getNetworkState() {
     const isOnline = typeof navigator !== 'undefined' && navigator.onLine;
@@ -10,11 +9,12 @@ function getNetworkState() {
         isInternetReachable: isOnline,
     };
 }
-function updateNetworkState() {
-    const state = getNetworkState();
-    emitter.emit(onNetworkStateEventName, state);
-}
-export default {
+class ExpoNetworkModule extends NativeModule {
+    eventListener;
+    updateNetworkState() {
+        const state = getNetworkState();
+        this.emit(onNetworkStateEventName, state);
+    }
     async getIpAddressAsync() {
         try {
             const resp = await fetch('https://api.ipify.org?format=json');
@@ -24,17 +24,24 @@ export default {
         catch (e) {
             throw e;
         }
-    },
+    }
     async getNetworkStateAsync() {
         return getNetworkState();
-    },
+    }
+    async isAirplaneModeEnabledAsync() {
+        return false;
+    }
     startObserving() {
-        window.addEventListener('online', updateNetworkState);
-        window.addEventListener('offline', updateNetworkState);
-    },
+        this.eventListener = () => this.updateNetworkState();
+        window.addEventListener('online', this.eventListener);
+        window.addEventListener('offline', this.eventListener);
+    }
     stopObserving() {
-        window.removeEventListener('online', updateNetworkState);
-        window.removeEventListener('offline', updateNetworkState);
-    },
-};
+        if (this.eventListener) {
+            window.removeEventListener('online', this.eventListener);
+            window.removeEventListener('offline', this.eventListener);
+        }
+    }
+}
+export default registerWebModule(ExpoNetworkModule);
 //# sourceMappingURL=ExpoNetwork.web.js.map

package/build/ExpoNetwork.web.js.map

@@ -1 +1 @@
-{"version":3,"file":"ExpoNetwork.web.js","sourceRoot":"","sources":["../src/ExpoNetwork.web.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,OAAO,EAAoC,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAErF,MAAM,OAAO,GAAG,IAAI,YAAY,EAAiB,CAAC;AAClD,MAAM,uBAAuB,GAAG,uBAAuB,CAAC;AAExD,SAAS,eAAe;IACtB,MAAM,QAAQ,GAAG,OAAO,SAAS,KAAK,WAAW,IAAI,SAAS,CAAC,MAAM,CAAC;IACtE,OAAO;QACL,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,gBAAgB,CAAC,IAAI;QACjE,WAAW,EAAE,QAAQ;QACrB,mBAAmB,EAAE,QAAQ;KAC9B,CAAC;AACJ,CAAC;AAED,SAAS,kBAAkB;IACzB,MAAM,KAAK,GAAG,eAAe,EAAE,CAAC;IAChC,OAAO,CAAC,IAAI,CAAC,uBAAuB,EAAE,KAAK,CAAC,CAAC;AAC/C,CAAC;AAED,eAAe;IACb,KAAK,CAAC,iBAAiB;QACrB,IAAI;YACF,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,mCAAmC,CAAC,CAAC;YAC9D,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;YAC/B,OAAO,IAAI,CAAC,EAAE,CAAC;SAChB;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,CAAC,CAAC;SACT;IACH,CAAC;IACD,KAAK,CAAC,oBAAoB;QACxB,OAAO,eAAe,EAAE,CAAC;IAC3B,CAAC;IACD,cAAc;QACZ,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;QACtD,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,kBAAkB,CAAC,CAAC;IACzD,CAAC;IACD,aAAa;QACX,MAAM,CAAC,mBAAmB,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;QACzD,MAAM,CAAC,mBAAmB,CAAC,SAAS,EAAE,kBAAkB,CAAC,CAAC;IAC5D,CAAC;CACF,CAAC","sourcesContent":["import { EventEmitter } from 'expo-modules-core';\n\nimport { type NetworkEvents, NetworkState, NetworkStateType } from './Network.types';\n\nconst emitter = new EventEmitter<NetworkEvents>();\nconst onNetworkStateEventName = 'onNetworkStateChanged';\n\nfunction getNetworkState(): NetworkState {\n  const isOnline = typeof navigator !== 'undefined' && navigator.onLine;\n  return {\n    type: isOnline ? NetworkStateType.UNKNOWN : NetworkStateType.NONE,\n    isConnected: isOnline,\n    isInternetReachable: isOnline,\n  };\n}\n\nfunction updateNetworkState() {\n  const state = getNetworkState();\n  emitter.emit(onNetworkStateEventName, state);\n}\n\nexport default {\n  async getIpAddressAsync(): Promise<string> {\n    try {\n      const resp = await fetch('https://api.ipify.org?format=json');\n      const data = await resp.json();\n      return data.ip;\n    } catch (e) {\n      throw e;\n    }\n  },\n  async getNetworkStateAsync(): Promise<NetworkState> {\n    return getNetworkState();\n  },\n  startObserving() {\n    window.addEventListener('online', updateNetworkState);\n    window.addEventListener('offline', updateNetworkState);\n  },\n  stopObserving() {\n    window.removeEventListener('online', updateNetworkState);\n    window.removeEventListener('offline', updateNetworkState);\n  },\n};\n"]}
+{"version":3,"file":"ExpoNetwork.web.js","sourceRoot":"","sources":["../src/ExpoNetwork.web.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAEpE,OAAO,EAA+B,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAEhF,MAAM,uBAAuB,GAAG,uBAAuB,CAAC;AAExD,SAAS,eAAe;IACtB,MAAM,QAAQ,GAAG,OAAO,SAAS,KAAK,WAAW,IAAI,SAAS,CAAC,MAAM,CAAC;IACtE,OAAO;QACL,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,gBAAgB,CAAC,IAAI;QACjE,WAAW,EAAE,QAAQ;QACrB,mBAAmB,EAAE,QAAQ;KAC9B,CAAC;AACJ,CAAC;AAED,MAAM,iBAAkB,SAAQ,YAA2B;IACzD,aAAa,CAAc;IAC3B,kBAAkB;QAChB,MAAM,KAAK,GAAG,eAAe,EAAE,CAAC;QAChC,IAAI,CAAC,IAAI,CAAC,uBAAuB,EAAE,KAAK,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,iBAAiB;QACrB,IAAI;YACF,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,mCAAmC,CAAC,CAAC;YAC9D,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;YAC/B,OAAO,IAAI,CAAC,EAAE,CAAC;SAChB;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,CAAC,CAAC;SACT;IACH,CAAC;IACD,KAAK,CAAC,oBAAoB;QACxB,OAAO,eAAe,EAAE,CAAC;IAC3B,CAAC;IACD,KAAK,CAAC,0BAA0B;QAC9B,OAAO,KAAK,CAAC;IACf,CAAC;IACD,cAAc;QACZ,IAAI,CAAC,aAAa,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACrD,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;QACtD,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;IACzD,CAAC;IACD,aAAa;QACX,IAAI,IAAI,CAAC,aAAa,EAAE;YACtB,MAAM,CAAC,mBAAmB,CAAC,QAAQ,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;YACzD,MAAM,CAAC,mBAAmB,CAAC,SAAS,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;SAC3D;IACH,CAAC;CACF;AAED,eAAe,iBAAiB,CAAC,iBAAiB,CAAC,CAAC","sourcesContent":["import { NativeModule, registerWebModule } from 'expo-modules-core';\n\nimport { NetworkEvents, NetworkState, NetworkStateType } from './Network.types';\n\nconst onNetworkStateEventName = 'onNetworkStateChanged';\n\nfunction getNetworkState(): NetworkState {\n  const isOnline = typeof navigator !== 'undefined' && navigator.onLine;\n  return {\n    type: isOnline ? NetworkStateType.UNKNOWN : NetworkStateType.NONE,\n    isConnected: isOnline,\n    isInternetReachable: isOnline,\n  };\n}\n\nclass ExpoNetworkModule extends NativeModule<NetworkEvents> {\n  eventListener?: () => void;\n  updateNetworkState() {\n    const state = getNetworkState();\n    this.emit(onNetworkStateEventName, state);\n  }\n\n  async getIpAddressAsync(): Promise<string> {\n    try {\n      const resp = await fetch('https://api.ipify.org?format=json');\n      const data = await resp.json();\n      return data.ip;\n    } catch (e) {\n      throw e;\n    }\n  }\n  async getNetworkStateAsync(): Promise<NetworkState> {\n    return getNetworkState();\n  }\n  async isAirplaneModeEnabledAsync(): Promise<boolean> {\n    return false;\n  }\n  startObserving() {\n    this.eventListener = () => this.updateNetworkState();\n    window.addEventListener('online', this.eventListener);\n    window.addEventListener('offline', this.eventListener);\n  }\n  stopObserving() {\n    if (this.eventListener) {\n      window.removeEventListener('online', this.eventListener);\n      window.removeEventListener('offline', this.eventListener);\n    }\n  }\n}\n\nexport default registerWebModule(ExpoNetworkModule);\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-network",
-  "version": "7.0.2",
+  "version": "7.0.3",
   "description": "Provides useful information about the device's network such as its IP address, MAC address, and airplane mode status",
   "main": "build/Network.js",
   "types": "build/Network.d.ts",
@@ -37,5 +37,5 @@
     "expo": "*",
     "react": "*"
   },
-  "gitHead": "eb0d9b5b6ba8dd5b64e016e41166e42ced543a69"
+  "gitHead": "bc1fea6bcab47889e2922d543920397691b200f3"
 }

package/src/ExpoNetwork.web.ts

@@ -1,8 +1,7 @@
-import { EventEmitter } from 'expo-modules-core';
+import { NativeModule, registerWebModule } from 'expo-modules-core';
 
-import { type NetworkEvents, NetworkState, NetworkStateType } from './Network.types';
+import { NetworkEvents, NetworkState, NetworkStateType } from './Network.types';
 
-const emitter = new EventEmitter<NetworkEvents>();
 const onNetworkStateEventName = 'onNetworkStateChanged';
 
 function getNetworkState(): NetworkState {
@@ -14,12 +13,13 @@ function getNetworkState(): NetworkState {
   };
 }
 
-function updateNetworkState() {
-  const state = getNetworkState();
-  emitter.emit(onNetworkStateEventName, state);
-}
+class ExpoNetworkModule extends NativeModule<NetworkEvents> {
+  eventListener?: () => void;
+  updateNetworkState() {
+    const state = getNetworkState();
+    this.emit(onNetworkStateEventName, state);
+  }
 
-export default {
   async getIpAddressAsync(): Promise<string> {
     try {
       const resp = await fetch('https://api.ipify.org?format=json');
@@ -28,16 +28,24 @@ export default {
     } catch (e) {
       throw e;
     }
-  },
+  }
   async getNetworkStateAsync(): Promise<NetworkState> {
     return getNetworkState();
-  },
+  }
+  async isAirplaneModeEnabledAsync(): Promise<boolean> {
+    return false;
+  }
   startObserving() {
-    window.addEventListener('online', updateNetworkState);
-    window.addEventListener('offline', updateNetworkState);
-  },
+    this.eventListener = () => this.updateNetworkState();
+    window.addEventListener('online', this.eventListener);
+    window.addEventListener('offline', this.eventListener);
+  }
   stopObserving() {
-    window.removeEventListener('online', updateNetworkState);
-    window.removeEventListener('offline', updateNetworkState);
-  },
-};
+    if (this.eventListener) {
+      window.removeEventListener('online', this.eventListener);
+      window.removeEventListener('offline', this.eventListener);
+    }
+  }
+}
+
+export default registerWebModule(ExpoNetworkModule);