diff --git a/.gitignore b/.gitignore index 94fc867..4882d31 100644 --- a/.gitignore +++ b/.gitignore @@ -24,6 +24,7 @@ project.xcworkspace # Android/IJ # +*.iml .idea .gradle local.properties diff --git a/android/android.iml b/android/android.iml deleted file mode 100644 index f87ef38..0000000 --- a/android/android.iml +++ /dev/null @@ -1,115 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/android/build.gradle b/android/build.gradle index f56608f..e59e7e6 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -40,4 +40,5 @@ repositories { dependencies { compile 'com.facebook.react:react-native:0.17.+' + compile 'com.koushikdutta.async:androidasync:2.1.6' } diff --git a/android/src/main/java/com/peel/react/TcpSocketClient.java b/android/src/main/java/com/peel/react/TcpSocketClient.java deleted file mode 100644 index 223d737..0000000 --- a/android/src/main/java/com/peel/react/TcpSocketClient.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.peel.react; - -/** - * Created by aprock on 12/23/15. - */ -public class TcpSocketClient { -} diff --git a/android/src/main/java/com/peel/react/TcpSocketListener.java b/android/src/main/java/com/peel/react/TcpSocketListener.java new file mode 100644 index 0000000..9986fb5 --- /dev/null +++ b/android/src/main/java/com/peel/react/TcpSocketListener.java @@ -0,0 +1,17 @@ +package com.peel.react; + +import java.net.InetSocketAddress; + +/** + * Created by aprock on 12/28/15. + */ +public interface TcpSocketListener { + // server + void onConnection(Integer serverId, Integer clientId, InetSocketAddress socketAddress); + + // client and server + void onConnect(Integer id, InetSocketAddress socketAddress); + void onData(Integer id, byte[] data); + void onClose(Integer id, String error); + void onError(Integer id, String error); +} diff --git a/android/src/main/java/com/peel/react/TcpSocketManager.java b/android/src/main/java/com/peel/react/TcpSocketManager.java new file mode 100644 index 0000000..378485b --- /dev/null +++ b/android/src/main/java/com/peel/react/TcpSocketManager.java @@ -0,0 +1,180 @@ +package com.peel.react; + +import android.support.annotation.Nullable; +import android.util.SparseArray; + +import com.koushikdutta.async.AsyncServer; +import com.koushikdutta.async.AsyncServerSocket; +import com.koushikdutta.async.AsyncSocket; +import com.koushikdutta.async.ByteBufferList; +import com.koushikdutta.async.DataEmitter; +import com.koushikdutta.async.callback.CompletedCallback; +import com.koushikdutta.async.callback.ConnectCallback; +import com.koushikdutta.async.callback.DataCallback; +import com.koushikdutta.async.callback.ListenCallback; + +import java.io.IOException; +import java.lang.ref.WeakReference; +import java.net.InetAddress; +import java.net.InetSocketAddress; +import java.net.UnknownHostException; + +/** + * Created by aprock on 12/29/15. + */ +public class TcpSocketManager { + private SparseArray mClients = new SparseArray(); + + private WeakReference listener; + private AsyncServer server = AsyncServer.getDefault(); + + private int instances = 5000; + + public TcpSocketManager(TcpSocketListener listener) throws IOException { + this.listener = new WeakReference(listener); + } + + private TcpSocketListener getListener() { + if (listener != null) { + return listener.get(); + } + + return null; + } + + private void setSocketCallbacks(final Integer cId, final AsyncSocket socket) { + socket.setClosedCallback(new CompletedCallback() { + @Override + public void onCompleted(Exception ex) { + TcpSocketListener listener = getListener(); + if (listener != null) { + listener.onClose(cId, null); + } + } + }); + + socket.setDataCallback(new DataCallback() { + @Override + public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) { + TcpSocketListener listener = getListener(); + if (listener != null) { + listener.onData(cId, bb.getAllByteArray()); + } + } + }); + + socket.setEndCallback(new CompletedCallback() { + @Override + public void onCompleted(Exception ex) { + if (ex != null) { + TcpSocketListener listener = getListener(); + if (listener != null) { + listener.onError(cId, ex.getMessage()); + } + } + socket.close(); + } + }); + } + + public void listen(final Integer cId, final String host, final Integer port) throws UnknownHostException, IOException { + // resolve the address + final InetSocketAddress socketAddress; + if (host != null) { + socketAddress = new InetSocketAddress(InetAddress.getByName(host), port); + } else { + socketAddress = new InetSocketAddress(port); + } + + server.listen(InetAddress.getByName(host), port, new ListenCallback() { + @Override + public void onListening(AsyncServerSocket socket) { + mClients.put(cId, socket); + + TcpSocketListener listener = getListener(); + if (listener != null) { + listener.onConnect(cId, socketAddress); + } + } + + @Override + public void onAccepted(AsyncSocket socket) { + setSocketCallbacks(instances, socket); + mClients.put(instances, socket); + + TcpSocketListener listener = getListener(); + if (listener != null) { + listener.onConnection(cId, instances, socketAddress); + } + + instances++; + } + + @Override + public void onCompleted(Exception ex) { + TcpSocketListener listener = getListener(); + if (listener != null) { + listener.onClose(cId, ex != null ? ex.getMessage() : null); + } + + mClients.remove(cId); + } + }); + } + + public void connect(final Integer cId, final @Nullable String host, final Integer port) throws UnknownHostException, IOException { + // resolve the address + final InetSocketAddress socketAddress; + if (host != null) { + socketAddress = new InetSocketAddress(InetAddress.getByName(host), port); + } else { + socketAddress = new InetSocketAddress(port); + } + + server.connectSocket(socketAddress, new ConnectCallback() { + @Override + public void onConnectCompleted(Exception ex, AsyncSocket socket) { + if (ex != null) { + TcpSocketListener listener = getListener(); + if (listener != null) { + listener.onError(cId, ex.getMessage()); + } + } else { + mClients.put(cId, socket); + setSocketCallbacks(cId, socket); + + TcpSocketListener listener = getListener(); + if (listener != null) { + listener.onConnect(cId, socketAddress); + } + } + } + }); + } + + public void write(final Integer cId, final byte[] data) { + Object socket = mClients.get(cId); + if (socket != null && socket instanceof AsyncSocket) { + ((AsyncSocket) socket).write(new ByteBufferList(data)); + } + } + + public void close(final Integer cId) { + Object socket = mClients.get(cId); + if (socket == null) { + return; + } + + if (socket instanceof AsyncSocket) { + ((AsyncSocket) socket).close(); + } else if (socket instanceof AsyncServerSocket) { + ((AsyncServerSocket) socket).stop(); + } + } + + public void closeAllSockets() { + for (int i = 0; i < mClients.size(); i++) { + close(mClients.keyAt(i)); + } + mClients.clear(); + }} diff --git a/android/src/main/java/com/peel/react/TcpSockets.java b/android/src/main/java/com/peel/react/TcpSockets.java index acb5660..8e979e7 100644 --- a/android/src/main/java/com/peel/react/TcpSockets.java +++ b/android/src/main/java/com/peel/react/TcpSockets.java @@ -6,7 +6,7 @@ package com.peel.react; import android.support.annotation.Nullable; -import android.util.SparseArray; +import android.util.Base64; import com.facebook.common.logging.FLog; import com.facebook.react.bridge.Arguments; @@ -20,17 +20,29 @@ import com.facebook.react.bridge.ReadableMap; import com.facebook.react.bridge.WritableMap; import com.facebook.react.modules.core.DeviceEventManagerModule; +import java.io.IOException; +import java.net.Inet6Address; +import java.net.InetSocketAddress; +import java.net.UnknownHostException; +import java.util.concurrent.ExecutionException; + /** - * The NativeModule in charge of storing active {@link TcpSocketClient}s, and acting as an api layer. + * The NativeModule acting as an api layer for {@link TcpSocketManager} */ -public final class TcpSockets extends ReactContextBaseJavaModule { +public final class TcpSockets extends ReactContextBaseJavaModule implements TcpSocketListener { private static final String TAG = "TcpSockets"; - private SparseArray mClients = new SparseArray(); private boolean mShuttingDown = false; + private TcpSocketManager socketManager; public TcpSockets(ReactApplicationContext reactContext) { super(reactContext); + + try { + socketManager = new TcpSocketManager(this); + } catch (IOException e) { + e.printStackTrace(); + } } @Override @@ -46,26 +58,35 @@ public final class TcpSockets extends ReactContextBaseJavaModule { @Override public void onCatalystInstanceDestroy() { mShuttingDown = true; + + try { + new GuardedAsyncTask(getReactApplicationContext()) { + @Override + protected void doInBackgroundGuarded(Void... params) { + socketManager.closeAllSockets(); + } + }.execute().get(); + } catch (InterruptedException ioe) { + FLog.e(TAG, "onCatalystInstanceDestroy", ioe); + } catch (ExecutionException ee) { + FLog.e(TAG, "onCatalystInstanceDestroy", ee); + } } - /** - * Creates a {@link TcpSocketClient} with the given ID - */ @ReactMethod - public void createSocket(final Integer cId) { + public void listen(final Integer cId, final String host, final Integer port) { new GuardedAsyncTask(getReactApplicationContext()) { @Override protected void doInBackgroundGuarded(Void... params) { - FLog.e(TAG, "TcpSockets.createSocket unimplemented."); - - WritableMap eventParams = Arguments.createMap(); - eventParams.putString("event", "error"); - eventParams.putString("data", "TcpSockets.createSocket unimplemented"); - - ReactContext reactContext = TcpSockets.this.getReactApplicationContext(); - reactContext - .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class) - .emit("tcp-" + cId + "-event", eventParams); + try { + socketManager.listen(cId, host, port); + } catch (UnknownHostException uhe) { + FLog.e(TAG, "listen", uhe); + onError(cId, uhe.getMessage()); + } catch (IOException ioe) { + FLog.e(TAG, "listen", ioe); + onError(cId, ioe.getMessage()); + } } }.execute(); } @@ -75,27 +96,29 @@ public final class TcpSockets extends ReactContextBaseJavaModule { new GuardedAsyncTask(getReactApplicationContext()) { @Override protected void doInBackgroundGuarded(Void... params) { - FLog.e(TAG, "TcpSockets.connect unimplemented."); - - WritableMap eventParams = Arguments.createMap(); - eventParams.putString("event", "error"); - eventParams.putString("data", "TcpSockets.connect unimplemented"); - - ReactContext reactContext = TcpSockets.this.getReactApplicationContext(); - reactContext - .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class) - .emit("tcp-" + cId + "-event", eventParams); + // NOTE : ignoring options for now, just use the available interface. + try { + socketManager.connect(cId, host, port); + } catch (UnknownHostException uhe) { + FLog.e(TAG, "connect", uhe); + onError(cId, uhe.getMessage()); + } catch (IOException ioe) { + FLog.e(TAG, "connect", ioe); + onError(cId, ioe.getMessage()); + } } }.execute(); } @ReactMethod - public void write(final Integer cId, final String base64String, final boolean encoded, final Callback callback) { + public void write(final Integer cId, final String base64String, final Callback callback) { new GuardedAsyncTask(getReactApplicationContext()) { @Override protected void doInBackgroundGuarded(Void... params) { - FLog.e(TAG, "TcpSockets.write unimplemented."); - callback.invoke("unimplemented." + cId); + socketManager.write(cId, Base64.decode(base64String, Base64.NO_WRAP)); + if (callback != null) { + callback.invoke(); + } } }.execute(); } @@ -105,39 +128,74 @@ public final class TcpSockets extends ReactContextBaseJavaModule { new GuardedAsyncTask(getReactApplicationContext()) { @Override protected void doInBackgroundGuarded(Void... params) { - FLog.e(TAG, "TcpSockets.end unimplemented."); - callback.invoke("unimplemented." + cId); + socketManager.close(cId); } }.execute(); } @ReactMethod public void destroy(final Integer cId, final Callback callback) { - new GuardedAsyncTask(getReactApplicationContext()) { - @Override - protected void doInBackgroundGuarded(Void... params) { - FLog.e(TAG, "TcpSockets.destroy unimplemented."); - callback.invoke("unimplemented." + cId); - } - }.execute(); + end(cId, callback); } - @ReactMethod - public void listen(final Integer cId, final String host, final Integer port) { - new GuardedAsyncTask(getReactApplicationContext()) { - @Override - protected void doInBackgroundGuarded(Void... params) { - FLog.e(TAG, "TcpSockets.listen unimplemented."); + /** TcpSocketListener */ - WritableMap eventParams = Arguments.createMap(); - eventParams.putString("event", "error"); - eventParams.putString("data", "TcpSockets.connect unimplemented"); + @Override + public void onConnection(Integer serverId, Integer clientId, InetSocketAddress socketAddress) { + WritableMap eventParams = Arguments.createMap(); + eventParams.putInt("id", clientId); - ReactContext reactContext = TcpSockets.this.getReactApplicationContext(); - reactContext - .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class) - .emit("tcp-" + cId + "-event", eventParams); - } - }.execute(); + WritableMap addressParams = Arguments.createMap(); + addressParams.putString("address", socketAddress.getHostName()); + addressParams.putInt("port", socketAddress.getPort()); + addressParams.putString("family", socketAddress.getAddress() instanceof Inet6Address ? "IPv6" : "IPv4"); + + eventParams.putMap("address", addressParams); + + ReactContext reactContext = TcpSockets.this.getReactApplicationContext(); + reactContext + .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class) + .emit("tcp-" + serverId + "-connection", eventParams); + } + + @Override + public void onConnect(Integer id, InetSocketAddress address) { + WritableMap eventParams = Arguments.createMap(); + eventParams.putString("address", address.getHostName()); + eventParams.putInt("port", address.getPort()); + eventParams.putString("family", address.getAddress() instanceof Inet6Address ? "IPv6" : "IPv4"); + + ReactContext reactContext = TcpSockets.this.getReactApplicationContext(); + reactContext + .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class) + .emit("tcp-" + id + "-connect", eventParams); + } + + @Override + public void onData(Integer id, byte[] data) { + ReactContext reactContext = TcpSockets.this.getReactApplicationContext(); + reactContext + .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class) + .emit("tcp-" + id + "-data", Base64.encodeToString(data, Base64.NO_WRAP)); + } + + @Override + public void onClose(Integer id, String error) { + if (error != null) { + onError(id, error); + } + + ReactContext reactContext = TcpSockets.this.getReactApplicationContext(); + reactContext + .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class) + .emit("tcp-" + id + "-close", error != null); + } + + @Override + public void onError(Integer id, String error) { + ReactContext reactContext = TcpSockets.this.getReactApplicationContext(); + reactContext + .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class) + .emit("tcp-" + id + "-error", error); } } diff --git a/examples/rctsockets/android/app/build.gradle b/examples/rctsockets/android/app/build.gradle new file mode 100644 index 0000000..8885613 --- /dev/null +++ b/examples/rctsockets/android/app/build.gradle @@ -0,0 +1,53 @@ +apply plugin: "com.android.application" + +/** + * The react.gradle file registers two tasks: bundleDebugJsAndAssets and bundleReleaseJsAndAssets. + * These basically call `react-native bundle` with the correct arguments during the Android build + * cycle. By default, bundleDebugJsAndAssets is skipped, as in debug/dev mode we prefer to load the + * bundle directly from the development server. Below you can see all the possible configurations + * and their defaults. If you decide to add a configuration block, make sure to add it before the + * `apply from: "react.gradle"` line. + */ + + project.ext.react = [ + // the name of the generated asset file containing your JS bundle + bundleAssetName: "index.bundle", + + // the entry file for bundle generation + entryFile: "index.js", +] + +apply from: "react.gradle" + +android { + compileSdkVersion 23 + buildToolsVersion "23.0.1" + + defaultConfig { + applicationId "com.rctsockets" + minSdkVersion 16 + targetSdkVersion 22 + versionCode 1 + versionName "1.0" + ndk { + abiFilters "armeabi-v7a", "x86" + } + } + buildTypes { + release { + minifyEnabled false // Set this to true to enable Proguard + proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" + } + } + // needed for https://github.com/square/okio/issues/58 + lintOptions { + warning 'InvalidPackage' + } +} + +dependencies { + compile fileTree(dir: "libs", include: ["*.jar"]) + compile "com.android.support:appcompat-v7:23.0.1" + compile "com.facebook.react:react-native:0.17.+" + compile project(':react-native-tcp') +} diff --git a/examples/rctsockets/android/app/proguard-rules.pro b/examples/rctsockets/android/app/proguard-rules.pro new file mode 100644 index 0000000..ffa8c9f --- /dev/null +++ b/examples/rctsockets/android/app/proguard-rules.pro @@ -0,0 +1,60 @@ +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in /usr/local/Cellar/android-sdk/24.3.3/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the proguardFiles +# directive in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Disabling obfuscation is useful if you collect stack traces from production crashes +# (unless you are using a system that supports de-obfuscate the stack traces). +-dontobfuscate + +# React Native + +# Keep our interfaces so they can be used by other ProGuard rules. +# See http://sourceforge.net/p/proguard/bugs/466/ +-keep,allowobfuscation @interface com.facebook.proguard.annotations.DoNotStrip +-keep,allowobfuscation @interface com.facebook.proguard.annotations.KeepGettersAndSetters + +# Do not strip any method/class that is annotated with @DoNotStrip +-keep @com.facebook.proguard.annotations.DoNotStrip class * +-keepclassmembers class * { + @com.facebook.proguard.annotations.DoNotStrip *; +} + +-keepclassmembers @com.facebook.proguard.annotations.KeepGettersAndSetters class * { + void set*(***); + *** get*(); +} + +-keep class * extends com.facebook.react.bridge.JavaScriptModule { *; } +-keep class * extends com.facebook.react.bridge.NativeModule { *; } +-keepclassmembers class * { @com.facebook.react.uimanager.UIProp ; } +-keepclassmembers class * { @com.facebook.react.uimanager.ReactProp ; } +-keepclassmembers class * { @com.facebook.react.uimanager.ReactPropGroup ; } + +# okhttp + +-keepattributes Signature +-keepattributes *Annotation* +-keep class com.squareup.okhttp.** { *; } +-keep interface com.squareup.okhttp.** { *; } +-dontwarn com.squareup.okhttp.** + +# okio + +-keep class sun.misc.Unsafe { *; } +-dontwarn java.nio.file.* +-dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement +-dontwarn okio.** diff --git a/examples/rctsockets/android/app/react.gradle b/examples/rctsockets/android/app/react.gradle new file mode 100644 index 0000000..dc18bb9 --- /dev/null +++ b/examples/rctsockets/android/app/react.gradle @@ -0,0 +1,75 @@ +def config = project.hasProperty("react") ? project.react : []; + +def bundleAssetName = config.bundleAssetName ?: "index.android.bundle" +def entryFile = config.entryFile ?: "index.android.js" + +// because elvis operator +def elvisFile(thing) { + return thing ? file(thing) : null; +} + +def reactRoot = elvisFile(config.root) ?: file("../../") +def jsBundleDirDebug = elvisFile(config.jsBundleDirDebug) ?: + file("$buildDir/intermediates/assets/debug") +def jsBundleDirRelease = elvisFile(config.jsBundleDirRelease) ?: + file("$buildDir/intermediates/assets/release") +def resourcesDirDebug = elvisFile(config.resourcesDirDebug) ?: + file("$buildDir/intermediates/res/merged/debug") +def resourcesDirRelease = elvisFile(config.resourcesDirRelease) ?: + file("$buildDir/intermediates/res/merged/release") +def inputExcludes = config.inputExcludes ?: ["android/**", "ios/**"] + +def jsBundleFileDebug = file("$jsBundleDirDebug/$bundleAssetName") +def jsBundleFileRelease = file("$jsBundleDirRelease/$bundleAssetName") + +task bundleDebugJsAndAssets(type: Exec) { + // create dirs if they are not there (e.g. the "clean" task just ran) + doFirst { + jsBundleDirDebug.mkdirs() + resourcesDirDebug.mkdirs() + } + + // set up inputs and outputs so gradle can cache the result + inputs.files fileTree(dir: reactRoot, excludes: inputExcludes) + outputs.dir jsBundleDirDebug + outputs.dir resourcesDirDebug + + // set up the call to the react-native cli + workingDir reactRoot + commandLine "react-native", "bundle", "--platform", "android", "--dev", "true", "--entry-file", + entryFile, "--bundle-output", jsBundleFileDebug, "--assets-dest", resourcesDirDebug + + enabled config.bundleInDebug ?: false +} + +task bundleReleaseJsAndAssets(type: Exec) { + // create dirs if they are not there (e.g. the "clean" task just ran) + doFirst { + jsBundleDirRelease.mkdirs() + resourcesDirRelease.mkdirs() + } + + // set up inputs and outputs so gradle can cache the result + inputs.files fileTree(dir: reactRoot, excludes: inputExcludes) + outputs.dir jsBundleDirRelease + outputs.dir resourcesDirRelease + + // set up the call to the react-native cli + workingDir reactRoot + commandLine "react-native", "bundle", "--platform", "android", "--dev", "false", "--entry-file", + entryFile, "--bundle-output", jsBundleFileRelease, "--assets-dest", resourcesDirRelease + + enabled config.bundleInRelease ?: true +} + +gradle.projectsEvaluated { + // hook bundleDebugJsAndAssets into the android build process + bundleDebugJsAndAssets.dependsOn mergeDebugResources + bundleDebugJsAndAssets.dependsOn mergeDebugAssets + processDebugResources.dependsOn bundleDebugJsAndAssets + + // hook bundleReleaseJsAndAssets into the android build process + bundleReleaseJsAndAssets.dependsOn mergeReleaseResources + bundleReleaseJsAndAssets.dependsOn mergeReleaseAssets + processReleaseResources.dependsOn bundleReleaseJsAndAssets +} diff --git a/examples/rctsockets/android/app/src/main/AndroidManifest.xml b/examples/rctsockets/android/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..ecb025e --- /dev/null +++ b/examples/rctsockets/android/app/src/main/AndroidManifest.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + diff --git a/examples/rctsockets/android/app/src/main/java/com/rctsockets/MainActivity.java b/examples/rctsockets/android/app/src/main/java/com/rctsockets/MainActivity.java new file mode 100644 index 0000000..50bd0f9 --- /dev/null +++ b/examples/rctsockets/android/app/src/main/java/com/rctsockets/MainActivity.java @@ -0,0 +1,81 @@ +package com.rctsockets; + +import android.app.Activity; +import android.os.Bundle; +import android.view.KeyEvent; + +import com.facebook.react.LifecycleState; +import com.facebook.react.ReactInstanceManager; +import com.facebook.react.ReactRootView; +import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler; +import com.facebook.react.shell.MainReactPackage; +import com.facebook.soloader.SoLoader; + +import com.peel.react.*; // <--- import + +public class MainActivity extends Activity implements DefaultHardwareBackBtnHandler { + + private ReactInstanceManager mReactInstanceManager; + private ReactRootView mReactRootView; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + mReactRootView = new ReactRootView(this); + + mReactInstanceManager = ReactInstanceManager.builder() + .setApplication(getApplication()) + .setBundleAssetName("index.bundle") + .setJSMainModuleName("index") + .addPackage(new MainReactPackage()) + .addPackage(new TcpSocketsModule()) // <- add here + .setUseDeveloperSupport(BuildConfig.DEBUG) + .setInitialLifecycleState(LifecycleState.RESUMED) + .build(); + + mReactRootView.startReactApplication(mReactInstanceManager, "rctsockets", null); + + setContentView(mReactRootView); + } + + @Override + public boolean onKeyUp(int keyCode, KeyEvent event) { + if (keyCode == KeyEvent.KEYCODE_MENU && mReactInstanceManager != null) { + mReactInstanceManager.showDevOptionsDialog(); + return true; + } + return super.onKeyUp(keyCode, event); + } + + @Override + public void onBackPressed() { + if (mReactInstanceManager != null) { + mReactInstanceManager.onBackPressed(); + } else { + super.onBackPressed(); + } + } + + @Override + public void invokeDefaultOnBackPressed() { + super.onBackPressed(); + } + + @Override + protected void onPause() { + super.onPause(); + + if (mReactInstanceManager != null) { + mReactInstanceManager.onPause(); + } + } + + @Override + protected void onResume() { + super.onResume(); + + if (mReactInstanceManager != null) { + mReactInstanceManager.onResume(this, this); + } + } +} diff --git a/examples/rctsockets/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/examples/rctsockets/android/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..cde69bc Binary files /dev/null and b/examples/rctsockets/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/examples/rctsockets/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/examples/rctsockets/android/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..c133a0c Binary files /dev/null and b/examples/rctsockets/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/examples/rctsockets/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/examples/rctsockets/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..bfa42f0 Binary files /dev/null and b/examples/rctsockets/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/examples/rctsockets/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/examples/rctsockets/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..324e72c Binary files /dev/null and b/examples/rctsockets/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/examples/rctsockets/android/app/src/main/res/values/strings.xml b/examples/rctsockets/android/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..8409235 --- /dev/null +++ b/examples/rctsockets/android/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + rctsockets + diff --git a/examples/rctsockets/android/app/src/main/res/values/styles.xml b/examples/rctsockets/android/app/src/main/res/values/styles.xml new file mode 100644 index 0000000..319eb0c --- /dev/null +++ b/examples/rctsockets/android/app/src/main/res/values/styles.xml @@ -0,0 +1,8 @@ + + + + + + diff --git a/examples/rctsockets/android/build.gradle b/examples/rctsockets/android/build.gradle new file mode 100644 index 0000000..ccdfc4e --- /dev/null +++ b/examples/rctsockets/android/build.gradle @@ -0,0 +1,20 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. + +buildscript { + repositories { + jcenter() + } + dependencies { + classpath 'com.android.tools.build:gradle:1.3.1' + + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files + } +} + +allprojects { + repositories { + mavenLocal() + jcenter() + } +} diff --git a/examples/rctsockets/android/gradle.properties b/examples/rctsockets/android/gradle.properties new file mode 100644 index 0000000..1fd964e --- /dev/null +++ b/examples/rctsockets/android/gradle.properties @@ -0,0 +1,20 @@ +# Project-wide Gradle settings. + +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. + +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html + +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +# Default value: -Xmx10248m -XX:MaxPermSize=256m +# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 + +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true + +android.useDeprecatedNdk=true diff --git a/examples/rctsockets/android/gradle/wrapper/gradle-wrapper.jar b/examples/rctsockets/android/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..b5166da Binary files /dev/null and b/examples/rctsockets/android/gradle/wrapper/gradle-wrapper.jar differ diff --git a/examples/rctsockets/android/gradle/wrapper/gradle-wrapper.properties b/examples/rctsockets/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..b9fbfab --- /dev/null +++ b/examples/rctsockets/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip diff --git a/examples/rctsockets/android/gradlew b/examples/rctsockets/android/gradlew new file mode 100755 index 0000000..91a7e26 --- /dev/null +++ b/examples/rctsockets/android/gradlew @@ -0,0 +1,164 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# For Cygwin, ensure paths are in UNIX format before anything is touched. +if $cygwin ; then + [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` +fi + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >&- +APP_HOME="`pwd -P`" +cd "$SAVED" >&- + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/examples/rctsockets/android/gradlew.bat b/examples/rctsockets/android/gradlew.bat new file mode 100644 index 0000000..aec9973 --- /dev/null +++ b/examples/rctsockets/android/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/examples/rctsockets/android/settings.gradle b/examples/rctsockets/android/settings.gradle new file mode 100644 index 0000000..511d0ea --- /dev/null +++ b/examples/rctsockets/android/settings.gradle @@ -0,0 +1,5 @@ +rootProject.name = 'rctsockets' + +include ':app' +include ':react-native-tcp' +project(':react-native-tcp').projectDir = new File(settingsDir, '../node_modules/react-native-tcp/android') diff --git a/ios/react-native-tcp.podspec b/ios/react-native-tcp.podspec index 2682e22..ba5db73 100644 --- a/ios/react-native-tcp.podspec +++ b/ios/react-native-tcp.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'react-native-tcp' - s.version = '0.1.1' + s.version = '0.2.0' s.summary = 'node\'s net API in React Native.' s.description = <<-DESC Enables accessing tcp sockets in React Native.