Fix region being used as options object, closes #14

Thanks to @shiroh for noticing this and providing a PR!

README.md

@@ -72,11 +72,13 @@ Returns a readable and writable Node.js stream for the given Kinesis stream
 
 `options` include:
 
-  - `region`: a string, or object with AWS credentials, host, port, etc (`us-east-1` by default)
+  - `region`: a string, or (deprecated) object with AWS credentials, host, port, etc (resolved from env or file by default)
+  - `credentials`: an object with `accessKeyId`/`secretAccessKey` properties (resolved from env, file or IAM by default)
   - `shards`: an array of shard IDs, or shard objects. If not provided, these will be fetched and cached.
   - `oldest`: if truthy, then will start at the oldest records (using `TRIM_HORIZON`) instead of the latest
   - `writeConcurrency`: how many parallel writes to allow (`1` by default)
   - `cacheSize`: number of PartitionKey-to-SequenceNumber mappings to cache (`1000` by default)
+  - `agent`: HTTP agent used (uses Node.js defaults otherwise)
   - `timeout`: HTTP request timeout (uses Node.js defaults otherwise)
   - `initialRetryMs`: first pause before retrying under the default policy (`50` by default)
   - `maxRetries`: max number of retries under the default policy (`10` by default)
@@ -96,6 +98,14 @@ Makes a generic Kinesis request with the given action (eg, `ListStreams`) and da
 
 `options` include:
 
-  - `region`: a string, or object with AWS credentials, host, port, etc (`us-east-1` by default)
-
-
+  - `region`: a string, or (deprecated) object with AWS credentials, host, port, etc (resolved from env or file by default)
+  - `credentials`: an object with `accessKeyId`/`secretAccessKey` properties (resolved from env, file or IAM by default)
+  - `agent`: HTTP agent used (uses Node.js defaults otherwise)
+  - `timeout`: HTTP request timeout (uses Node.js defaults otherwise)
+  - `initialRetryMs`: first pause before retrying under the default policy (`50` by default)
+  - `maxRetries`: max number of retries under the default policy (`10` by default)
+  - `errorCodes`: array of Node.js error codes to retry on (`['EADDRINFO',
+    'ETIMEDOUT', 'ECONNRESET', 'ESOCKETTIMEDOUT', 'ENOTFOUND', 'EMFILE']` by default)
+  - `errorNames`: array of Kinesis exceptions to retry on
+    (`['ProvisionedThroughputExceededException', 'ThrottlingException']` by default)
+  - `retryPolicy`: a function to implement a retry policy different from the default one

index.js

@@ -220,6 +220,10 @@ KinesisStream.prototype._write = function(data, encoding, cb) {
       self.sequenceCache.set(data.PartitionKey, sequenceNumber)
 
     self.resolveShards(function(err, shards) {
+      if (err) {
+        self.emit('putRecord')
+        return self.emit('error', err)
+      }
       for (var i = 0; i < shards.length; i++) {
         if (shards[i].id != responseData.ShardId) continue
 
@@ -259,6 +263,8 @@ function request(action, data, options, cb) {
 
   cb = once(cb)
 
+  options = resolveOptions(options)
+
   function loadCreds(cb) {
     var needRegion = !options.region
     var needCreds = !options.credentials || !options.credentials.accessKeyId || !options.credentials.secretAccessKey
@@ -286,7 +292,8 @@ function request(action, data, options, cb) {
       }
     }
 
-    options = resolveOptions(options)
+    if (!options.region) options.region = (options.host || '').split('.', 2)[1] || 'us-east-1'
+    if (!options.host) options.host = 'kinesis.' + options.region + '.amazonaws.com'
 
     var httpOptions = {},
         body = JSON.stringify(data),
@@ -323,7 +330,7 @@ function request(action, data, options, cb) {
         res.setEncoding('utf8')
 
         res.on('error', cb)
-        res.on('data', function(chunk){ json += chunk })
+        res.on('data', function(chunk) { json += chunk })
         res.on('end', function() {
           var response, parseError
 
@@ -410,27 +417,22 @@ function resolveOptions(options) {
     return clone
   }, {})
 
-  if (typeof region === 'object') {
-    options.host = region.host
-    options.port = region.port
-    options.region = region.region
-    options.version = region.version
-    options.agent = region.agent
-    options.https = region.https
-    options.credentials = region.credentials
-  } else {
-    if (/^[a-z]{2}\-[a-z]+\-\d$/.test(region))
-      options.region = region
-    else if (!options.host)
-      // Backwards compatibility for when 1st param was host
-      options.host = region
+  if (typeof region === 'object' && region != null) {
+    options.host = options.host || region.host
+    options.port = options.port || region.port
+    options.region = options.region || region.region
+    options.version = options.version || region.version
+    options.agent = options.agent || region.agent
+    options.https = options.https || region.https
+    options.credentials = options.credentials || region.credentials
+  } else if (/^[a-z]{2}\-[a-z]+\-\d$/.test(region)) {
+    options.region = region
+  } else if (!options.host) {
+    // Backwards compatibility for when 1st param was host
+    options.host = region
   }
-  if (!options.region) options.region = (options.host || '').split('.', 2)[1] || 'us-east-1'
-  if (!options.host) options.host = 'kinesis.' + options.region + '.amazonaws.com'
   if (!options.version) options.version = '20131202'
 
-  if (!options.credentials) options.credentials = options.credentials
-
   return options
 }