@amazon-devices/expo-network 2.0.9000000000 → 2.0.9000000002

package/CMakeLists.txt

@@ -23,7 +23,7 @@ add_library(${PACKAGE_NAME} STATIC ${SOURCES_KEPLER})
 target_link_libraries(
   ${PACKAGE_NAME}
   PUBLIC
-  keplerui::keplerscript-${KEPLER_REACT_NATIVE_MAJOR_VERSION}
+  turbomoduleAPI::turbomoduleAPI
 )
 
 add_library(${AUTO_LINK_PACKAGE_NAME} SHARED kepler/KeplerInit.cpp)
@@ -33,7 +33,7 @@ set_target_properties(${AUTO_LINK_PACKAGE_NAME} PROPERTIES SOVERSION ${KEPLER_RE
 target_link_libraries(
   ${AUTO_LINK_PACKAGE_NAME}
   PRIVATE
-  keplerui::keplerscript-${KEPLER_REACT_NATIVE_MAJOR_VERSION}
+  turbomoduleAPI::turbomoduleAPI
   ${PACKAGE_NAME}
 )
 
@@ -42,7 +42,7 @@ add_executable(${AUTO_LINK_PACKAGE_NAME}_exe kepler/KeplerInit.cpp)
 target_link_libraries(${AUTO_LINK_PACKAGE_NAME}_exe
   PRIVATE
   ${AUTO_LINK_PACKAGE_NAME}
-  keplerui::keplerscript-${KEPLER_REACT_NATIVE_MAJOR_VERSION}
+  turbomoduleAPI::turbomoduleAPI
 )
 
 install(TARGETS ${AUTO_LINK_PACKAGE_NAME}

package/README.kepler.md

@@ -94,7 +94,6 @@ Check out the dedicated documentation page for info about this library, API refe
 ## Known Issues
 
 * `Network.isAirplaneModeEnabledAsync()` - always returns false
-* `Network.getNetworkStateAsync()` - `isInternetReachable` field is always missing
 * `Network.getNetworkStateAsync()` - `type` field can only be either `NONE` or `WIFI`
 
 ## Supported Versions
@@ -102,3 +101,4 @@ Check out the dedicated documentation page for info about this library, API refe
 | Package version  | Based on | @amazon-devices/react-native-kepler version |
 | ---------------- | -------- | --------------------------------- |
 | 2.0.x    | expo-network v5.7.0   | 2.0.x            |
+| 2.0.x    | expo-network v5.7.0   | 4.0.x+rn0.83.0   |

package/kepler/ExpoNetwork.cpp

@@ -8,23 +8,24 @@
 
 #include "ExpoNetwork.h"
 
-#include <KeplerScript/logger/KPLog.h>
+#include <Kepler/turbomodule/TMLog.h>
+#include <fmt/core.h>
 
 #include "NetworkInterfaces.h"
 
-ExpoNetwork::ExpoNetwork() : volta::react::KeplerTurboModule("ExpoNetwork") {
-    volta::react::KPLog.debug("ExpoNetwork constructor {}", name());
+ExpoNetwork::ExpoNetwork() : tbm::KeplerTurboModule("ExpoNetwork") {
+    TMDEBUG(fmt::format("ExpoNetwork constructor {}", name()));
 }
 
-volta::react::Promise ExpoNetwork::getIpAddressAsync() {
-    return volta::react::Promise([](std::shared_ptr<volta::react::Promise> promise) {
+tbm::Promise ExpoNetwork::getIpAddressAsync() {
+    return tbm::Promise([](std::shared_ptr<tbm::Promise> promise) {
         auto interfaces = NetworkInterfaces();
         promise->resolve(interfaces.wlanInterfaceAddress());
     });
 }
 
-volta::react::Promise ExpoNetwork::getNetworkStateAsync() {
-    return volta::react::Promise([](std::shared_ptr<volta::react::Promise> promise) {
+tbm::Promise ExpoNetwork::getNetworkStateAsync() {
+    return tbm::Promise([](std::shared_ptr<tbm::Promise> promise) {
         try {
             auto interfaces = NetworkInterfaces();
             bool isConnected = interfaces.isNetworkConnected();
@@ -35,19 +36,18 @@ volta::react::Promise ExpoNetwork::getNetworkStateAsync() {
 
             promise->resolve(networkState);
         } catch (std::exception& e) {
-            volta::react::KPLog.debug("Can't get network state: {}", std::string(e.what()));
+            TMDEBUG(fmt::format("Can't get network state: {}", std::string(e.what())));
             promise->reject(std::string{"Can't get network state: " + std::string(e.what())});
         }
     });
 }
 
-volta::react::Promise ExpoNetwork::isAirplaneModeEnabledAsync() {
-    return volta::react::Promise([](std::shared_ptr<volta::react::Promise> promise) { promise->resolve(false); });
+tbm::Promise ExpoNetwork::isAirplaneModeEnabledAsync() {
+    return tbm::Promise([](std::shared_ptr<tbm::Promise> promise) { promise->resolve(false); });
 }
 
-void ExpoNetwork::aggregateMethods(
-        volta::react::MethodAggregator<volta::react::KeplerTurboModule>& methodAggregator) const noexcept {
-    volta::react::KPLog.debug("methodAggregator");
+void ExpoNetwork::aggregateMethods(tbm::MethodAggregator<tbm::KeplerTurboModule>& methodAggregator) const noexcept {
+    TMDEBUG("methodAggregator");
 
     methodAggregator.addMethod("getNetworkStateAsync", 0, &ExpoNetwork::getNetworkStateAsync);
     methodAggregator.addMethod("getIpAddressAsync", 0, &ExpoNetwork::getIpAddressAsync);

package/kepler/ExpoNetwork.h

@@ -6,19 +6,23 @@
  * Use is subject to license terms.
  */
 
-#include <KeplerScript/modules/KeplerTurboModule.h>
+#include <Kepler/turbomodule/KeplerTurboModule.h>
 
-class KEPLERSCRIPT_EXPORT ExpoNetwork : public volta::react::KeplerTurboModule {
+#include "expo-export.h"
+
+namespace tbm = com::amazon::kepler::turbomodule;
+
+class EXPO_EXPORT ExpoNetwork : public tbm::KeplerTurboModule {
 public:
     ExpoNetwork();
+    
+    void aggregateMethods(tbm::MethodAggregator<tbm::KeplerTurboModule>& methodAggregator) const noexcept override;
 
 #ifndef UNIT_TEST
 protected:
 #endif
-    volta::react::Promise getIpAddressAsync();
-    volta::react::Promise getNetworkStateAsync();
-    volta::react::Promise isAirplaneModeEnabledAsync();
+    tbm::Promise getIpAddressAsync();
+    tbm::Promise getNetworkStateAsync();
+    tbm::Promise isAirplaneModeEnabledAsync();
 
-    void aggregateMethods(
-            volta::react::MethodAggregator<volta::react::KeplerTurboModule>& methodAggregator) const noexcept override;
 };

package/kepler/KeplerInit.cpp

@@ -6,20 +6,15 @@
  * Use is subject to license terms.
  */
 
-#include <KeplerScript/logger/KPLog.h>
-#include <KeplerScript/utils/autolink/KeplerAutoLinkInfo.h>
-#include <keplerui-072/keplerscript-export.h>
+ #include <Kepler/turbomodule/KeplerTurboModuleRegistration.h>
+ #include <Kepler/turbomodule/TMLog.h>
 
 #include "ExpoNetwork.h"
-#include "RegisterModule.h"
 
 extern "C" {
-KEPLERSCRIPT_EXPORT void keplerAutoLinkInitV1(const kepler::autolink::v1::KeplerAutoLinkInfo* autoLinkInfo) noexcept {
-    volta::react::KPLog.debug("keplerAutoLinkInitV1 for ExpoNetwork");
-
-    REGISTER_MODULE(autoLinkInfo, ExpoNetwork, "ExpoNetwork");
-
-    volta::react::KPLog.debug("after registering module");
+ __attribute__((visibility("default"))) void autoLinkKeplerTurboModulesV1() noexcept {
+    TMDEBUG("keplerAutoLinkInitV1 for ExpoNetwork");
+    KEPLER_REGISTER_TURBO_MODULE_WITH_NAME("ExpoNetwork", ExpoNetwork);
 }
 }
 

package/kepler/NetworkInterfaces.cpp

@@ -8,8 +8,9 @@
 
 #include "NetworkInterfaces.h"
 
-#include <KeplerScript/logger/KPLog.h>
+#include <Kepler/turbomodule/TMLog.h>
 #include <arpa/inet.h>
+#include <fmt/core.h>
 #include <ifaddrs.h>
 #include <linux/if_link.h>
 #include <netdb.h>
@@ -61,9 +62,9 @@ std::string NetworkInterfaces::wlanInterfaceAddress() {
             }
         }
 
-        volta::react::KPLog.error("No wlan interface found.");
+        TMDEBUG("No wlan interface found.");
     } catch (std::exception& e) {
-        volta::react::KPLog.error("Can't get ip address: {}", std::string(e.what()));
+        TMDEBUG(fmt::format("Can't get ip address: {}", std::string(e.what())));
     }
 
     return unresolvedAddress;

package/kepler-compatibility.json

@@ -0,0 +1,8 @@
+{
+  "versions": {
+    "2.0.0": "/com.amazon.kepler.expo_network_2@IExpoNetwork_0",
+    "2.0.9000000000": "/com.amazon.kepler.expo_network_2@IExpoNetwork_0",
+    "2.0.9000000001": "/com.amazon.kepler.expo_network_2@IExpoNetwork_0",
+    "2.0.9000000002": "/com.amazon.kepler.expo_network_2@IExpoNetwork_0"
+  }
+}

package/package.json

@@ -1 +1 @@
-{"name": "@amazon-devices/expo-network", "version": "2.0.9000000000+5.7.0", "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", "scripts": {"build": "expo-module build", "clean": "expo-module clean", "lint": "expo-module lint", "test": "expo-module test", "prepublishOnly": "expo-module prepublishOnly", "expo-module": "expo-module"}, "kepler": {"temporary-alias-for-package": {"name": "expo-network", "version": "5.7.0"}}, "keywords": ["react-native", "expo", "expo-network"], "repository": {"type": "git", "url": "https://github.com/expo/expo.git", "directory": "packages/expo-network"}, "bugs": {"url": "https://github.com/expo/expo/issues"}, "author": "650 Industries, Inc.", "license": "See license in LICENSE", "homepage": "https://docs.expo.dev/versions/latest/sdk/network/", "dependencies": {"@amazon-devices/keplerscript-turbomodule-api": "^1.0.0"}, "devDependencies": {"expo-module-scripts": "^3.0.0"}, "peerDependencies": {"expo": "*"}, "jest": {"preset": "expo-module-scripts"}}
+{"name": "@amazon-devices/expo-network", "version": "2.0.9000000002+5.7.0", "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", "scripts": {"build": "expo-module build", "clean": "expo-module clean", "lint": "expo-module lint", "test": "expo-module test", "prepublishOnly": "expo-module prepublishOnly", "expo-module": "expo-module"}, "kepler": {"temporary-alias-for-package": {"name": "expo-network", "version": "5.7.0"}}, "keywords": ["react-native", "expo", "expo-network"], "repository": {"type": "git", "url": "https://github.com/expo/expo.git", "directory": "packages/expo-network"}, "bugs": {"url": "https://github.com/expo/expo/issues"}, "author": "650 Industries, Inc.", "license": "See license in LICENSE", "homepage": "https://docs.expo.dev/versions/latest/sdk/network/", "dependencies": {"@amazon-devices/keplerscript-turbomodule-api": "^1.0.0"}, "devDependencies": {"expo-module-scripts": "^3.0.0"}, "peerDependencies": {"expo": "^50.0.0-alpha.1"}, "jest": {"preset": "expo-module-scripts"}}

package/react-native.config.js

@@ -12,6 +12,7 @@ module.exports = {
                 autolink: {
                     ExpoNetworkLib: {
                         provider: 'system',
+                        libraryName: 'libexpo-network-2.so.2',
                         turbomodules: ['ExpoNetwork'],
                     },
                 },