Auto-merge for PR #551 via VersionBot

Update resumable-request to v2.0

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file
 automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## v6.6.3 - 2018-02-06
+
+* Update resumable-request to v2.0 #551 [Akis Kesoglou]
+
 ## v6.6.2 - 2018-01-24
 
 * Use i386-nlp for supervisor releases for quark boards #549 [Pablo Carranza Velez]

package.json

@@ -1,7 +1,7 @@
 {
   "name": "resin-supervisor",
   "description": "This is resin.io's Supervisor, a program that runs on IoT devices and has the task of running user Apps (which are Docker containers), and updating them as Resin's API informs it to.",
-  "version": "6.6.2",
+  "version": "6.6.3",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
@@ -50,7 +50,7 @@
     "resin-lint": "^1.3.1",
     "resin-register-device": "^3.0.0",
     "resin-sync": "^9.3.0",
-    "resumable-request": "^1.0.1",
+    "resumable-request": "^2.0.0",
     "rimraf": "^2.5.4",
     "rwlock": "^5.0.0",
     "semver": "^5.3.0",

src/docker-utils.coffee

@@ -23,9 +23,9 @@ getRepoAndTag = (image) ->
 			registry = ''
 		return { repo: "#{registry}#{imageName}", tag: tagName }
 
-applyDelta = (imgSrc, deltaUrl, { requestTimeout, applyTimeout, resumeOpts }, onProgress) ->
+applyDelta = (imgSrc, deltaUrl, applyTimeout, opts, onProgress) ->
 	new Promise (resolve, reject) ->
-		req = resumable(request, { url: deltaUrl, timeout: requestTimeout }, resumeOpts)
+		req = resumable(Object.assign({ url: deltaUrl }, opts))
 		.on('progress', onProgress)
 		.on('retry', onProgress)
 		.on('error', reject)
@@ -38,7 +38,7 @@ applyDelta = (imgSrc, deltaUrl, { requestTimeout, applyTimeout, resumeOpts }, on
 				deltaStream = dockerDelta.applyDelta(imgSrc, timeout: applyTimeout)
 				res.pipe(deltaStream)
 				.on('id', resolve)
-				.on('error', req.destroy.bind(req))
+				.on('error', req.abort.bind(req))
 
 do ->
 	_lock = new Lock()
@@ -103,8 +103,8 @@ do ->
 										deltaSrc = null
 									else
 										deltaSrc = imgSrc
-									resumeOpts = { maxRetries: retryCount, retryInterval }
-									resolve(applyDelta(deltaSrc, deltaUrl, { requestTimeout, applyTimeout, resumeOpts }, onProgress))
+									resumeOpts = { timeout: requestTimeout, maxRetries: retryCount, retryInterval }
+									resolve(applyDelta(deltaSrc, deltaUrl, applyTimeout, resumeOpts, onProgress))
 							.on 'error', reject
 			.then (id) ->
 				getRepoAndTag(imgDest)

src/request.coffee

@@ -31,6 +31,7 @@ requestOpts =
 		'User-Agent': userAgent
 
 resumableOpts =
+	timeout: DEFAULT_REQUEST_TIMEOUT
 	maxRetries: DEFAULT_REQUEST_RETRY_COUNT
 	retryInterval: DEFAULT_REQUEST_RETRY_INTERVAL