From 67fffbb3957d92e05817ffe3abf6fd05ab972711 Mon Sep 17 00:00:00 2001 From: emilymcafee Date: Tue, 11 Jul 2017 18:05:59 -0400 Subject: [PATCH 1/5] upgrade requestretry --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index dc7045c..65b7310 100644 --- a/package.json +++ b/package.json @@ -8,9 +8,9 @@ "Konstantin Käfer " ], "dependencies": { + "@mapbox/tiletype": "~0.3.1", "agentkeepalive": "2.0.2", - "requestretry": "1.4.0", - "@mapbox/tiletype": "~0.3.1" + "requestretry": "^1.12.0" }, "devDependencies": { "eslint": "^0.24.0", From 4093654a0c240b3db9fd65078c726331da6f6b3e Mon Sep 17 00:00:00 2001 From: emilymcafee Date: Tue, 11 Jul 2017 18:17:31 -0400 Subject: [PATCH 2/5] test failures --- test/tilejson.test.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/tilejson.test.js b/test/tilejson.test.js index 3febda7..e8c9dc1 100644 --- a/test/tilejson.test.js +++ b/test/tilejson.test.js @@ -381,7 +381,7 @@ tape('findID', function(assert) { tape('should abort when the server takes too long', function(assert) { tilejson.getTile(1, 0, 0, function(err, data, headers) { assert.ok(err); - assert.equal(err.message, 'ETIMEDOUT'); + assert.equal(err.message, 'ESOCKETTIMEDOUT'); assert.end(); }); }); @@ -419,7 +419,7 @@ tape('findID', function(assert) { (setupServer(function() { tilejson.getTile(2, 2, 2, function(err, data, headers) { assert.equal(err.code, 'ECONNRESET'); - assert.equal(connectionCount, 2); + assert.equal(connectionCount, 1); server.close(assert.end); }); })); @@ -442,7 +442,7 @@ tape('findID', function(assert) { setupServer(function() { tilejson.getTile(5, 0, 0, function(err, data, headers) { assert.equal(err.statusCode, 500); - assert.equal(connectionCount, 2); + assert.equal(connectionCount, 1); server.close(assert.end); }); }); From aa63d58b64621a0c1f455a947ec9c19bc7692a67 Mon Sep 17 00:00:00 2001 From: emilymcafee Date: Sun, 16 Jul 2017 16:13:03 +0530 Subject: [PATCH 3/5] adjust maxAttempts + restore tests --- lib/tilejson.js | 2 +- test/tilejson.test.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/tilejson.js b/lib/tilejson.js index 2f07ad0..fd36353 100644 --- a/lib/tilejson.js +++ b/lib/tilejson.js @@ -216,7 +216,7 @@ TileJSON.prototype.get = function(url, callback) { timeout: this.timeout, headers: {Connection: 'Keep-Alive'}, agent: url.indexOf('https:') === 0 ? httpsagent : agent, - maxAttempts: 1, + maxAttempts: 2, retryDelay: 0 }, function (err, res, buffer) { if (!err && res.statusCode !== 200) { diff --git a/test/tilejson.test.js b/test/tilejson.test.js index e8c9dc1..bef233b 100644 --- a/test/tilejson.test.js +++ b/test/tilejson.test.js @@ -419,7 +419,7 @@ tape('findID', function(assert) { (setupServer(function() { tilejson.getTile(2, 2, 2, function(err, data, headers) { assert.equal(err.code, 'ECONNRESET'); - assert.equal(connectionCount, 1); + assert.equal(connectionCount, 2); server.close(assert.end); }); })); @@ -442,7 +442,7 @@ tape('findID', function(assert) { setupServer(function() { tilejson.getTile(5, 0, 0, function(err, data, headers) { assert.equal(err.statusCode, 500); - assert.equal(connectionCount, 1); + assert.equal(connectionCount, 2); server.close(assert.end); }); }); From 492f10f7f9524b75cbe4ccc60404bf8db4c74422 Mon Sep 17 00:00:00 2001 From: emilymcafee Date: Sun, 16 Jul 2017 16:24:53 +0530 Subject: [PATCH 4/5] version bump + changelog --- CHANGELOG.md | 6 +++++- package.json | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 14ee2f5..4ae535e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # CHANGELOG -# v1.0.4 +### v1.1.0 + +* Upgraded requestretry dependency, which fixed a bug in retry attempts + +### v1.0.4 * Updated dependencies to tiletype diff --git a/package.json b/package.json index 65b7310..d0db6ba 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@mapbox/tilejson", "description": "Tile source backend for online tile sources", - "version": "1.0.4", + "version": "1.1.0", "author": "Mapbox (https://www.mapbox.com)", "license": "BSD-2-Clause", "contributors": [ From fc22ce2542ed734e3c6e1a8d9c99f82e2e0e4c56 Mon Sep 17 00:00:00 2001 From: AutoCodeowners Date: Wed, 17 Jun 2026 20:48:04 +0000 Subject: [PATCH 5/5] Add CODEOWNERS file --- CODEOWNERS | 1 + 1 file changed, 1 insertion(+) create mode 100644 CODEOWNERS diff --git a/CODEOWNERS b/CODEOWNERS new file mode 100644 index 0000000..1c3c506 --- /dev/null +++ b/CODEOWNERS @@ -0,0 +1 @@ +* @mapbox/maps-api