Chore: Migrate to built-in brotli implementation

Fix webhintio#1604
molant · Oct 18, 2019 · 6fb69a2 · 6fb69a2
1 parent 81d5f84
commit 6fb69a2
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 16 deletions.
diff --git a/packages/hint-http-compression/package.json b/packages/hint-http-compression/package.json
@@ -7,13 +7,11 @@
     "timeout": "1m"
   },
   "dependencies": {
-    "@hint/utils": "^6.0.0",
-    "iltorb": "^2.4.3"
+    "@hint/utils": "^6.0.0"
   },
   "description": "hint for HTTP compression related best practices",
   "devDependencies": {
     "@hint/utils-tests-helpers": "^5.0.11",
-    "@types/iltorb": "^2.3.0",
     "@types/mock-require": "^2.0.0",
     "@types/node": "^12.7.5",
     "@typescript-eslint/eslint-plugin": "^1.13.0",
@@ -29,9 +27,6 @@
     "rimraf": "^3.0.0",
     "typescript": "^3.6.3"
   },
-  "engines": {
-    "node": ">=8.0.0"
-  },
   "files": [
     "dist/src"
   ],

diff --git a/packages/hint-http-compression/src/hint.ts b/packages/hint-http-compression/src/hint.ts
@@ -9,7 +9,7 @@
  */
 import { promisify } from 'util';
 
-import * as brotli from 'iltorb';
+import * as zlib from 'zlib';
 
 import { asyncTry, contentType, HTMLElement, HttpHeaders, misc, network } from '@hint/utils';
 import { FetchEnd, HintContext, IHint, NetworkData, Response } from 'hint';
@@ -22,7 +22,7 @@ import { getMessage } from './i18n.import';
 const { getFileExtension, isTextMediaType } = contentType;
 const { isHTTP, isRegularProtocol, normalizeHeaderValue } = network;
 const { normalizeString } = misc;
-const decompressBrotli = promisify(brotli.decompress) as (buffer: Buffer) => Promise<Buffer>;
+const decompressBrotli = promisify(zlib.brotliDecompress) as (buffer: Buffer) => Promise<Buffer>;
 const uaString = 'Mozilla/5.0 Gecko';
 
 /*

diff --git a/packages/hint-http-compression/tests/fixtures/script-small.br b/packages/hint-http-compression/tests/fixtures/script-small.br
diff --git a/packages/utils-connector-tools/package.json b/packages/utils-connector-tools/package.json
@@ -10,7 +10,6 @@
     "@hint/utils": "^6.0.0",
     "data-urls": "^1.1.0",
     "iconv-lite": "^0.5.0",
-    "iltorb": "^2.4.3",
     "request": "^2.88.0"
   },
   "description": "hint tools for connectors",
@@ -29,9 +28,6 @@
     "rimraf": "^3.0.0",
     "typescript": "^3.6.3"
   },
-  "engines": {
-    "node": ">=8.0.0"
-  },
   "files": [
     "dist/src"
   ],

diff --git a/packages/utils-connector-tools/src/requester.ts b/packages/utils-connector-tools/src/requester.ts
@@ -11,7 +11,6 @@ import * as url from 'url';
 import { promisify } from 'util';
 import * as zlib from 'zlib';
 
-import * as brotli from 'iltorb';
 import * as request from 'request';
 import * as iconv from 'iconv-lite';
 import parseDataURL = require('data-urls'); // Using `require` as `data-urls` exports a function.
@@ -27,7 +26,7 @@ const { getContentTypeData } = contentType;
 const { normalizeHeaderValue } = network;
 const { toLowerCaseKeys } = misc;
 const debug = d(__filename);
-const decompressBrotli = promisify(brotli.decompress);
+const decompressBrotli = promisify(zlib.brotliDecompress);
 const decompressGzip = promisify(zlib.gunzip);
 const inflateAsync = promisify(zlib.inflate);
 const inflateRawAsync = promisify(zlib.inflateRaw);

diff --git a/packages/utils-connector-tools/tests/requester.ts b/packages/utils-connector-tools/tests/requester.ts
@@ -2,7 +2,6 @@ import { promisify } from 'util';
 import * as zlib from 'zlib';
 
 import * as iconv from 'iconv-lite';
-import * as brotli from 'iltorb';
 import anyTest, { TestInterface, ExecutionContext } from 'ava';
 import { Server } from '@hint/utils-create-server';
 import { NetworkData } from 'hint';
@@ -16,7 +15,7 @@ type RequesterContext = {
 const test = anyTest as TestInterface<RequesterContext>;
 
 const compressGzip: Function = promisify(zlib.gzip) as any;
-const compressBrotli: Function = promisify(brotli.compress) as any;
+const compressBrotli: Function = promisify(zlib.brotliCompress) as any;
 const compress = {
     br: compressBrotli,
     gzip: compressGzip