Socket.IO support

.gitignore

@@ -1,2 +1,5 @@
-gen/
+bin
+gen
+.classpath
+.project
 local.properties

AndroidManifest.xml

@@ -4,4 +4,8 @@
     package="com.codebutler.android_websockets"
     android:versionCode="1"
     android:versionName="0.01">
+
+    <uses-sdk
+        android:minSdkVersion="8"
+        android:targetSdkVersion="8" />
 </manifest>

README.md

@@ -1,16 +1,18 @@
-# WebSocket client for Android
+# WebSocket and Socket.IO client for Android
 
-A very simple bare-minimum WebSocket client for Android.
+A very simple bare-minimum WebSocket and Socket.IO client for Android.
 
 ## Credits
 
 The hybi parser is based on code from the [faye project](https://github.com/faye/faye-websocket-node). Faye is Copyright (c) 2009-2012 James Coglan. Many thanks for the great open-source library!
 
-Ported from JavaScript to Java by [Eric Butler](https://twitter.com/codebutler) <eric@codebutler.com>.
+The hybi parser was ported from JavaScript to Java by [Eric Butler](https://twitter.com/codebutler) <eric@codebutler.com>.
 
-## Usage
+The WebSocket client was written by [Eric Butler](https://twitter.com/codebutler) <eric@codebutler.com>.
 
-Here's the entire API:
+The Socket.IO client was written by [Koushik Dutta](https://twitter.com/koush).
+
+## WebSocket Usage
 
 ```java
 List<BasicNameValuePair> extraHeaders = Arrays.asList(
@@ -52,6 +54,59 @@ client.send(new byte[] { 0xDE, 0xAD, 0xBE, 0xEF });
 client.disconnect();
 ```
 
+## Socket.IO Usage
+
+```java
+SocketIOClient client = new SocketIOClient(URI.create("wss://example.com"), new SocketIOClient.Handler() {
+    @Override
+    public void onConnect() {
+        Log.d(TAG, "Connected!");
+    }
+
+    @Override
+    public void on(String event, JSONArray arguments) {
+        Log.d(TAG, String.format("Got event %s: %s", event, arguments.toString()));
+    }
+
+    @Override
+    public void onJSON(JSONObject json) {
+    	try {
+    		Log.d(TAG, String.format("Got JSON Object: %s", json.toString()));
+    	} catch(JSONException e) {
+    	}
+    }
+
+    @Override
+    public void onMessage(String message) {
+    	Log.d(TAG, String.format("Got message: %s", message));
+    }
+
+    @Override
+    public void onDisconnect(int code, String reason) {
+        Log.d(TAG, String.format("Disconnected! Code: %d Reason: %s", code, reason));
+    }
+
+    @Override
+    public void onError(Exception error) {
+        Log.e(TAG, "Error!", error);
+    }
+});
+
+client.connect();
+
+// Later… 
+client.emit("Message"); //Message
+JSONArray arguments = new JSONArray();
+arguments.put("first argument");
+JSONObject second = new JSONObject();
+second.put("dictionary", true);
+client.emit(second); //JSON Message
+arguments.put(second);
+client.emit("hello", arguments); //Event
+client.disconnect();
+```
+
+
 
 ## TODO
 
@@ -64,6 +119,7 @@ client.disconnect();
 
 	Copyright (c) 2009-2012 James Coglan
 	Copyright (c) 2012 Eric Butler 
+	Copyright (c) 2012 Koushik Dutta 
 
 	Permission is hereby granted, free of charge, to any person obtaining a copy of
 	this software and associated documentation files (the 'Software'), to deal in

build.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="android_websockets" default="help">
+<project name="android-websockets" default="help">
 
     <!-- The local.properties file is created and updated by the 'android' tool.
          It contains the path to the SDK. It should *NOT* be checked into
@@ -28,6 +28,15 @@
          -->
     <property file="ant.properties" />
 
+    <!-- if sdk.dir was not set from one of the property file, then
+         get it from the ANDROID_HOME env var.
+         This must be done before we load project.properties since
+         the proguard config can use sdk.dir -->
+    <property environment="env" />
+    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
+        <isset property="env.ANDROID_HOME" />
+    </condition>
+
     <!-- The project.properties file is created and updated by the 'android'
          tool, as well as ADT.
 
@@ -41,7 +50,7 @@
 
     <!-- quick check on sdk.dir -->
     <fail
-            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through an env var"
+            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
             unless="sdk.dir"
     />
 

proguard-project.txt

@@ -0,0 +1,20 @@
+# To enable ProGuard in your project, edit project.properties
+# to define the proguard.config property as described in that file.
+#
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in ${sdk.dir}/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the ProGuard
+# include property in project.properties.
+#
+# 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 *;
+#}

project.properties

@@ -12,4 +12,4 @@
 
 android.library=true
 # Project target.
-target=android-14
+target=android-8

src/com/codebutler/android_websockets/HybiParser.java

@@ -149,7 +149,7 @@ private void parseOpcode(byte data) throws ProtocolError {
             throw new ProtocolError("Bad opcode");
         }
 
-        if (FRAGMENTED_OPCODES.contains(mOpcode) && !mFinal) {
+        if (!FRAGMENTED_OPCODES.contains(mOpcode) && !mFinal) {
             throw new ProtocolError("Expected non-final packet");
         }
 
@@ -332,9 +332,42 @@ private int getInteger(byte[] bytes) throws ProtocolError {
         }
         return (int) i;
     }
+
+    /**
+     * Copied from AOSP Arrays.java.
+     */
+    /**
+     * Copies elements from {@code original} into a new array, from indexes start (inclusive) to
+     * end (exclusive). The original order of elements is preserved.
+     * If {@code end} is greater than {@code original.length}, the result is padded
+     * with the value {@code (byte) 0}.
+     *
+     * @param original the original array
+     * @param start the start index, inclusive
+     * @param end the end index, exclusive
+     * @return the new array
+     * @throws ArrayIndexOutOfBoundsException if {@code start < 0 || start > original.length}
+     * @throws IllegalArgumentException if {@code start > end}
+     * @throws NullPointerException if {@code original == null}
+     * @since 1.6
+     */
+    private static byte[] copyOfRange(byte[] original, int start, int end) {
+        if (start > end) {
+            throw new IllegalArgumentException();
+        }
+        int originalLength = original.length;
+        if (start < 0 || start > originalLength) {
+            throw new ArrayIndexOutOfBoundsException();
+        }
+        int resultLength = end - start;
+        int copyLength = Math.min(resultLength, originalLength - start);
+        byte[] result = new byte[resultLength];
+        System.arraycopy(original, start, result, 0, copyLength);
+        return result;
+    }
 
     private byte[] slice(byte[] array, int start) {
-        return Arrays.copyOfRange(array, start, array.length);
+        return copyOfRange(array, start, array.length);
     }
 
     public static class ProtocolError extends IOException {
@@ -380,4 +413,4 @@ public byte[] readBytes(int length) throws IOException {
             return buffer;
         }
     }
-}
+}