update readme, update default url

Author: hpihkala

README.md

@@ -41,9 +41,9 @@ var sub = client.subscribe(
 Option | Default value | Description
 ------ | ------------- | -----------
 url | ws://www.streamr.com/api/v1/ws | Address of the Streamr websocket endpoint to connect to.
+authKey | null | Define default authKey to use when none is specified in the call to `client.subscribe`.
 autoConnect | true | If set to `true`, the client connects automatically on the first call to `subscribe()`. Otherwise an explicit call to `connect()` is required.
 autoDisconnect | true  | If set to `true`, the client automatically disconnects when the last stream is unsubscribed. Otherwise the connection is left open and can be disconnected explicitly by calling `disconnect()`.
-authKey | null | Define default authKey to use when none is specified in the call to `client.subscribe`.
 
 ### Message handler callback
 
@@ -54,32 +54,35 @@ Argument | Description
 message  | A javascript object containing the message itself
 metadata | Metadata for the message, for example `metadata.timestamp` etc.
 
-### Resend options
-
-Note that only one of the resend options can be used for a particular subscription. The default functionality is to resend nothing, only subscribe to messages from the subscription moment onwards.
-
-Option | Default value | Description
------- | ------------- | -----------
-resend_all | undefined | Set to `true` if you want all the messages for the stream resent from the earliest available message.
-resend_last | undefined | Resend the previous `N` messages.
-resend_from | undefined | Resend from a specific message number.
-resend_from_time | undefined | Resend from a specific Date (or millisecond timestamp).
-resend_to | undefined | Can be used in conjunction with `resend_from` to limit the end of the resend. By default it is the newest message.
-
 ### Methods
 
 Name | Description
 ---- | -----------
 connect() | Connects to the server, and also subscribes to any streams for which `subscribe()` has been called before calling `connect()`.
 disconnect() | Disconnects from the server, clearing all subscriptions.
 pause() | Disconnects from the server without clearing subscriptions.
-subscribe(streamId, authId, callback, resendOptions) | Subscribes to a stream identified by the string `streamId`. Authentication key `authId` is used. Messages in this stream are passed to the `callback` function. See the above table for `resendOptions`. Returns a `Subscription` object.
+subscribe(options, callback) | Subscribes to a stream. Messages in this stream are passed to the `callback` function. See below for subscription options. Returns a `Subscription` object.
 unsubscribe(Subscription) | Unsubscribes the given `Subscription`.
 unsubscribeAll(`streamId`) | Unsubscribes all `Subscriptions` for `streamId`.
 getSubscriptions(`streamId`) | Returns a list of `Subscriptions` for `streamId`.
 bind(eventName, function) | Binds a `function` to an event called `eventName`
 unbind(eventName, function) | Unbinds the `function` from events called `eventName`
 
+### Subscription options
+
+Note that only one of the resend options can be used for a particular subscription. The default functionality is to resend nothing, only subscribe to messages from the subscription moment onwards.
+
+Name | Description
+---- | -----------
+stream    | Stream id to subscribe to
+authKey   | User key or stream key that authorizes the subscription. If defined, overrides the client's `authKey`.
+partition | Partition number to subscribe to. Defaults to the default partition (0).
+resend_all | Set to `true` if you want all the messages for the stream resent from the earliest available message.
+resend_last | Resend the previous `N` messages.
+resend_from | Resend from a specific message number.
+resend_from_time | Resend from a specific Date (or millisecond timestamp).
+resend_to | Can be used in conjunction with `resend_from` to limit the end of the resend. By default it is the newest message.
+
 ### Binding to events
 
 The client and the subscriptions can fire events as detailed below. You can bind to them using `bind`:

package.json

@@ -1,6 +1,6 @@
 {
   "name": "streamr-client",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "description": "JS client for subscribing to Streamr streams",
   "repository": {
     "type": "git",

streamr-client.js

@@ -676,8 +676,7 @@
 		// Default options
 		this.options = {
 			// The server to connect to
-			url: "wss://data.streamr.com/api/v1/ws",
-			path: "/api/v1/ws",
+			url: "wss://www.streamr.com/api/v1/ws",
 			// Automatically connect on first subscribe
 			autoConnect: true,
 			// Automatically disconnect on last unsubscribe