v 1.2.1 added timeout

default timeout 30 secs
irritanterik · May 27, 2016 · b21bfad · b21bfad
1 parent ea81636
commit b21bfad
Show file tree

Hide file tree

Showing 18 changed files with 365 additions and 130 deletions.
diff --git a/README.md b/README.md
@@ -17,9 +17,9 @@ condition or execute HTTP requests as a flow action with this app.
 ### Action cards
 - HTTP Delete
 - HTTP Get
-- HTTP Get JSON (for query parameters like ?a=1&b=zz use `{"a":1,"b":"zz"}`)
+- DEPRICATED: HTTP Get JSON (for query parameters like ?a=1&b=zz use `{"a":1,"b":"zz"}`, will be removed in a next version. Queryparameters can now be used with the HTTP Get card)
 - HTTP Put JSON
-- HTTP Post Form (content-type 'application/x-www-form-urlencoded')
+- HTTP Post Form (content-type 'application/x-www-form-urlencoded', JSON formatted)
 - HTTP Post JSON (content-type 'application/json')
 - WebSocket Send (message to ws://x.x.x.x:y endpoint)
 - GET variable step 1 (read 'get variable and trigger flow')
@@ -38,6 +38,7 @@ When this cards executes succesfull, it will start flows with the 'GET variable
 
 Happy hacking!
 #### Notes   
+  Requests will time-out after 30 seconds.
   Passing a valid JSON string (at least `{}` ) is obligatory for cards with a JSON parameter.
 
 ###### Advanced HTTP options

diff --git a/app.js b/app.js
@@ -33,6 +33,7 @@ function createUrlOptions (input, mergeOptions) {
     result = {uri: input}
   }
   if (mergeOptions) mergeOptional(result, mergeOptions)
+  mergeOptional(result, {timeout: 30000})
   return result
 } // function createUrlOptions
 

diff --git a/app.json b/app.json
@@ -1,6 +1,6 @@
 {
    "id":"com.internet",
-   "version":"1.2.0",
+   "version":"1.2.1",
    "compatibility":">=0.8.20",
    "name":{
       "en":"HTTP request flow cards",

diff --git a/node_modules/http.min/README.md b/node_modules/http.min/README.md
diff --git a/node_modules/http.min/index.js b/node_modules/http.min/index.js
diff --git a/node_modules/http.min/package.json b/node_modules/http.min/package.json
diff --git a/node_modules/ws/Makefile b/node_modules/ws/Makefile
diff --git a/node_modules/ws/README.md b/node_modules/ws/README.md
diff --git a/node_modules/ws/SECURITY.md b/node_modules/ws/SECURITY.md
diff --git a/node_modules/ws/lib/BufferUtil.fallback.js b/node_modules/ws/lib/BufferUtil.fallback.js
diff --git a/node_modules/ws/lib/PerMessageDeflate.js b/node_modules/ws/lib/PerMessageDeflate.js
diff --git a/node_modules/ws/lib/Receiver.hixie.js b/node_modules/ws/lib/Receiver.hixie.js