Merge pull request #262 from adobe/helix-fetch-v2

Migrate to helix-fetch and re-enable HTTP/2

Author: stefan-guggisberg

package-lock.json

@@ -32,27 +32,26 @@
   },
   "homepage": "https://github.com/adobe/helix-data-embed#readme",
   "dependencies": {
-    "@adobe/helix-epsagon": "1.5.6",
-    "@adobe/helix-fetch": "1.9.2",
+    "@adobe/helix-epsagon": "1.5.8",
+    "@adobe/helix-fetch": "2.1.3",
     "@adobe/helix-onedrive-support": "3.1.6",
-    "@adobe/helix-shared": "7.19.1",
-    "@adobe/helix-status": "9.0.0",
+    "@adobe/helix-shared": "7.19.5",
+    "@adobe/helix-status": "9.0.2",
     "@adobe/openwhisk-action-logger": "2.3.1",
     "@adobe/openwhisk-action-utils": "4.4.0",
     "@flighter/a1-notation": "1.0.7",
     "googleapis": "67.0.0",
-    "node-fetch": "2.6.1",
     "rss-parser": "3.11.0"
   },
   "devDependencies": {
     "@adobe/eslint-config-helix": "1.1.3",
-    "@adobe/helix-deploy": "1.18.0",
-    "@adobe/helix-ops": "1.12.3",
+    "@adobe/helix-deploy": "3.0.14",
+    "@adobe/helix-ops": "2.0.10",
     "@adobe/helix-testutils": "0.4.2",
     "@semantic-release/changelog": "5.0.1",
     "@semantic-release/exec": "5.0.0",
     "@semantic-release/git": "9.0.0",
-    "ajv": "7.0.4",
+    "ajv": "7.1.0",
     "chai": "4.3.0",
     "chai-http": "4.3.0",
     "codecov": "3.8.1",
@@ -69,7 +68,7 @@
     "mocha": "8.2.1",
     "nyc": "15.1.0",
     "proxyquire": "2.1.3",
-    "semantic-release": "17.3.7"
+    "semantic-release": "17.3.8"
   },
   "lint-staged": {
     "*.js": "eslint"

package.json

@@ -9,7 +9,7 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-const { Response } = require('node-fetch');
+const { Response } = require('@adobe/helix-fetch');
 const { wrap } = require('@adobe/openwhisk-action-utils');
 const { logger } = require('@adobe/openwhisk-action-logger');
 const { wrap: helixStatus } = require('@adobe/helix-status');

src/index.js

@@ -30,6 +30,7 @@ async function extract(url, params, env, log = console) {
       log,
     });
     let item = await drive.getDriveItemFromShareLink(url);
+    /* istanbul ignore else */
     if (!item.lastModifiedDateTime) {
       item = await drive.getDriveItem(item);
     }

src/matchers/excel.js

@@ -11,15 +11,13 @@
  */
 /* eslint-disable camelcase */
 
-// force HTTP/1 in order to avoid issues with long-lived HTTP/2 sessions
-// on azure/kubernetes based I/O Runtime
-process.env.HELIX_FETCH_FORCE_HTTP1 = true;
-const { fetch } = require('@adobe/helix-fetch').context({
-  httpsProtocols:
-    /* istanbul ignore next */
-    process.env.HELIX_FETCH_FORCE_HTTP1 ? ['http1'] : ['http2', 'http1'],
-});
 const { utils } = require('@adobe/helix-shared');
+const fetchAPI = require('@adobe/helix-fetch');
+
+const { fetch } = process.env.HELIX_FETCH_FORCE_HTTP1
+  ? fetchAPI.context({ alpnProtocols: [fetchAPI.ALPN_HTTP1_1] })
+  /* istanbul ignore next */
+  : fetchAPI;
 
 async function extract(url, params, env, log = console) {
   const host = 'https://adobeioruntime.net';

src/matchers/run-query.js

@@ -28,7 +28,7 @@ async function main(params = {}, env = {}) {
   });
   return {
     statusCode: resp.status,
-    body: JSON.parse(resp.body.toString()),
+    body: await resp.json(),
     headers: [...resp.headers.keys()].reduce((result, key) => {
       // eslint-disable-next-line no-param-reassign
       result[key] = resp.headers.get(key);

test/excel.integration.test.js

@@ -15,42 +15,42 @@ const { main } = require('../src/index');
 
 describe('Feed Tests', () => {
   it('Works for RSS Feeds', async () => {
-    const result = await main({
+    const response = await main({
       url: 'https://www.example.com/data-embed-action',
     }, {
       env: {},
       pathInfo: {
         suffix: '/https://daringfireball.net/feeds/articles',
       },
     });
-    assert.equal(result.status, 200);
-    const body = JSON.parse(result.body);
+    assert.equal(response.status, 200);
+    const body = await response.json();
     assert.ok(body.data.length > 1);
   }).timeout(10000);
 
   it('Works for RSS Feeds with Limits', async () => {
-    const result = await main({
+    const response = await main({
       url: 'https://www.example.com/data-embed-action?hlx_p.limit=1',
     }, {
       env: {},
       pathInfo: {
         suffix: '/https://daringfireball.net/feeds/main',
       },
     });
-    assert.equal(result.status, 200);
-    const body = JSON.parse(result.body);
+    assert.equal(response.status, 200);
+    const body = await response.json();
     assert.equal(body.data.length, 1);
   }).timeout(10000);
 
   it('Rejects invalid RSS Feeds', async () => {
-    const result = await main({
+    const response = await main({
       url: 'https://www.example.com/data-embed-action?feed=atom&foo=bar',
     }, {
       env: {},
       pathInfo: {
         suffix: '/https://example.com',
       },
     });
-    assert.equal(result.status, 500);
+    assert.equal(response.status, 500);
   }).timeout(5000);
 });

test/feed.test.js

@@ -24,20 +24,20 @@ for (let i = 0; i < 10000; i += 1) {
   }
 }
 
-describe('Integration Tests', () => {
+describe('Integration Tests', async () => {
   it('Rejects missing URLs', async () => {
-    const result = await main({
+    const response = await main({
       url: 'https://www.example.com/data-embed-action',
     }, {});
-    assert.equal(result.status, 400);
+    assert.equal(response.status, 400);
   });
 
   it('tests index with absolute run_query url', async () => {
     const EXPECTED_HEADERS = {
-      'Cache-Control': ['max-age=600'],
-      'Content-Type': ['application/json'],
+      'cache-control': 'max-age=600',
+      'content-type': 'application/json',
     };
-    const { body, headers, status } = await main({
+    const response = await main({
       url: 'https://www.example.com/data-embed-action',
     }, {
       env: {},
@@ -46,18 +46,20 @@ describe('Integration Tests', () => {
       },
     });
 
-    assert.ok(Array.isArray(JSON.parse(body).data));
-    assert.deepEqual(headers.raw(), EXPECTED_HEADERS);
+    const { headers, status } = response;
+    const body = await response.json();
+    assert.ok(Array.isArray(body.data));
+    assert.deepEqual(headers.plain(), EXPECTED_HEADERS);
     assert.equal(status, 200);
   })
     .timeout(60000);
 
   it('tests index with relative run_query url', async () => {
     const EXPECTED_HEADERS = {
-      'Cache-Control': ['max-age=600'],
-      'Content-Type': ['application/json'],
+      'cache-control': 'max-age=600',
+      'content-type': 'application/json',
     };
-    const { body, headers, status } = await main({
+    const response = await main({
       url: 'https://www.example.com/data-embed-action?fromMins=1000&toMins=0',
     }, {
       env: {},
@@ -66,21 +68,23 @@ describe('Integration Tests', () => {
       },
     });
 
-    assert.ok(Array.isArray(JSON.parse(body).data));
-    assert.deepEqual(headers.raw(), EXPECTED_HEADERS);
+    const { headers, status } = response;
+    const body = await response.json();
+    assert.ok(Array.isArray(body.data));
+    assert.deepEqual(headers.plain(), EXPECTED_HEADERS);
     assert.equal(status, 200);
   }).timeout(60000);
 
   it('Rejects unknown URLs', async () => {
-    const result = await main({
+    const response = await main({
       url: 'https://www.example.com/data-embed-action?',
     }, {
       env: {},
       pathInfo: {
         suffix: '/https://example.com',
       },
     });
-    assert.equal(result.status, 404);
+    assert.equal(response.status, 404);
   });
 });
 
@@ -91,13 +95,13 @@ describe('Index result Tests', () => {
         body: TEST_DATA,
       }),
     });
-    const result = await customMain({
+    const response = await customMain({
       url: `https://www.example.com/data-embed-action?${querystring.stringify({
         src: 'https://foo.com',
         'hlx_p.limit': 10,
       })}`,
     }, {});
-    assert.deepEqual(JSON.parse(result.body), {
+    assert.deepEqual(await response.json(), {
       data: TEST_DATA.slice(0, 10),
       limit: 10,
       offset: 0,
@@ -111,13 +115,13 @@ describe('Index result Tests', () => {
         body: TEST_DATA,
       }),
     });
-    const result = await customMain({
+    const response = await customMain({
       url: `https://www.example.com/data-embed-action?${querystring.stringify({
         src: 'https://foo.com',
         'hlx_p.offset': 9000,
       })}`,
     }, {});
-    assert.deepEqual(JSON.parse(result.body), {
+    assert.deepEqual(await response.json(), {
       data: TEST_DATA.slice(9000),
       limit: 1000,
       offset: 9000,
@@ -131,14 +135,14 @@ describe('Index result Tests', () => {
         body: TEST_DATA,
       }),
     });
-    const result = await customMain({
+    const response = await customMain({
       url: `https://www.example.com/data-embed-action?${querystring.stringify({
         src: 'https://foo.com',
         'hlx_p.limit': 50,
         'hlx_p.offset': 100,
       })}`,
     }, {});
-    assert.deepEqual(JSON.parse(result.body), {
+    assert.deepEqual(await response.json(), {
       data: TEST_DATA.slice(100, 150),
       limit: 50,
       offset: 100,
@@ -152,12 +156,12 @@ describe('Index result Tests', () => {
         body: TEST_DATA,
       }),
     });
-    const result = await customMain({
+    const response = await customMain({
       url: `https://www.example.com/data-embed-action?${querystring.stringify({
         src: 'https://foo.com',
       })}`,
     }, {});
-    assert.deepEqual(JSON.parse(result.body), {
+    assert.deepEqual(await response.json(), {
       data: TEST_DATA.slice(0, 4970),
       limit: 4970,
       offset: 0,