Use pako for compressing payloads (#487)

* Use pako for compressing payloads

zlib is a node specific library, using pako offers some chances to be
more cross platform.

* Add licenses

Author: therve

.generator/templates/http/isomorphic-fetch.mustache

@@ -8,7 +8,8 @@ import fetch from "node-fetch";
 import "whatwg-fetch";
 {{/browser}}
 {{/platforms}}
-import * as zlib from "zlib";
+import pako from "pako";
+import bufferFrom from "buffer-from";
 
 export class IsomorphicFetchHttpLibrary implements HttpLibrary {
 
@@ -24,9 +25,9 @@ export class IsomorphicFetchHttpLibrary implements HttpLibrary {
         let headers = request.getHeaders();
         if (typeof body === "string") {
             if (headers["Content-Encoding"] == "gzip") {
-                body = zlib.gzipSync(body);
+                body = bufferFrom(pako.gzip(body).buffer);
             } else if (headers["Content-Encoding"] == "deflate") {
-                body = zlib.deflateSync(body);
+                body = bufferFrom(pako.deflate(body).buffer);
             }
         }
 

LICENSE-3rdparty.csv

@@ -4,11 +4,13 @@ Component,Licence,Copyright
 @pollyjs/adapter-node-http,Apache-2.0,
 @pollyjs/core,Apache-2.0,
 @pollyjs/persister-fs,Apache-2.0,
+@types/buffer-from,MIT,Copyright Nat Burns
 @types/chai,MIT,Copyright Microsoft Corporation
 @types/jest,MIT,Copyright Microsoft Corporation
 @types/lodash,MIT,Copyright Microsoft Corporation
 @types/node-fetch,MIT,Copyright Microsoft Corporation
 @types/node,MIT,Copyright Microsoft Corporation
+@types/pako,MIT,Copyright Caleb Eggensperger Muhammet Öztürk
 @types/pollyjs__adapter-node-http,MIT,Copyright Microsoft Corporation
 @types/pollyjs__core,MIT,Copyright Microsoft Corporation
 @types/pollyjs__persister-fs,MIT,Copyright Microsoft Corporation
@@ -18,6 +20,7 @@ Component,Licence,Copyright
 @typescript-eslint/eslint-plugin,MIT,Copyright (c) 2019 TypeScript ESLint and other contributors
 @typescript-eslint/parser,BSD-2-Clause,
 btoa,(MIT OR Apache-2.0),
+buffer-from,MIT,Copyright (c) 2016, 2018 Linus Unnebäck
 chai,MIT,Copyright (c) 2017 Chai.js Assertion Library
 jest,MIT,Copyright (c) Facebook, Inc. and its affiliates.
 ts-jest,MIT,Copyright (c) 2016-2018
@@ -30,6 +33,7 @@ eslint-plugin-unused-imports,MIT,Copyright (c) 2021 Mikkel Holmer
 eslint,MIT,Copyright JS Foundation and other contributors, https://js.foundation
 form-data,MIT,Copyright (c) 2012 Felix Geisendörfer ([email protected]) and contributors
 node-fetch,MIT,Copyright (c) 2016 David Frank
+pako,MIT,Copyright (C) 2014-2017 Vitaly Puzrin and Andrei Tuputcyn
 prettier,MIT,Copyright © James Long and contributors
 ts-node,MIT,Copyright (c) 2014 Blake Embrey ([email protected])
 typescript,Apache-2.0,Copyright (c) Microsoft Corporation.

package.json

@@ -60,14 +60,18 @@
     "jest-coverage": "jest --no-cache --coverage"
   },
   "dependencies": {
+    "@types/buffer-from": "^1.1.0",
     "@types/node": "*",
     "@types/node-fetch": "^2.5.7",
+    "@types/pako": "^1.0.3",
     "btoa": "^1.2.1",
+    "buffer-from": "^1.1.2",
     "durations": "^3.4.2",
     "es6-promise": "^4.2.4",
     "form-data": "^3.0.0",
     "loglevel": "^1.7.1",
     "node-fetch": "^2.6.0",
+    "pako": "^2.0.4",
     "url-parse": "^1.4.3"
   },
   "resolutions": {

packages/datadog-api-client-v1/http/isomorphic-fetch.ts

@@ -1,7 +1,8 @@
 import { HttpLibrary, RequestContext, ResponseContext } from "./http";
 import { from, Observable } from "../rxjsStub";
 import fetch from "node-fetch";
-import * as zlib from "zlib";
+import pako from "pako";
+import bufferFrom from "buffer-from";
 
 export class IsomorphicFetchHttpLibrary implements HttpLibrary {
   public send(request: RequestContext): Observable<ResponseContext> {
@@ -16,9 +17,9 @@ export class IsomorphicFetchHttpLibrary implements HttpLibrary {
     const headers = request.getHeaders();
     if (typeof body === "string") {
       if (headers["Content-Encoding"] == "gzip") {
-        body = zlib.gzipSync(body);
+        body = bufferFrom(pako.gzip(body).buffer);
       } else if (headers["Content-Encoding"] == "deflate") {
-        body = zlib.deflateSync(body);
+        body = bufferFrom(pako.deflate(body).buffer);
       }
     }
 

packages/datadog-api-client-v2/http/isomorphic-fetch.ts

@@ -1,7 +1,8 @@
 import { HttpLibrary, RequestContext, ResponseContext } from "./http";
 import { from, Observable } from "../rxjsStub";
 import fetch from "node-fetch";
-import * as zlib from "zlib";
+import pako from "pako";
+import bufferFrom from "buffer-from";
 
 export class IsomorphicFetchHttpLibrary implements HttpLibrary {
   public send(request: RequestContext): Observable<ResponseContext> {
@@ -16,9 +17,9 @@ export class IsomorphicFetchHttpLibrary implements HttpLibrary {
     const headers = request.getHeaders();
     if (typeof body === "string") {
       if (headers["Content-Encoding"] == "gzip") {
-        body = zlib.gzipSync(body);
+        body = bufferFrom(pako.gzip(body).buffer);
       } else if (headers["Content-Encoding"] == "deflate") {
-        body = zlib.deflateSync(body);
+        body = bufferFrom(pako.deflate(body).buffer);
       }
     }
 

yarn.lock

@@ -868,6 +868,13 @@
   dependencies:
     "@babel/types" "^7.3.0"
 
+"@types/buffer-from@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@types/buffer-from/-/buffer-from-1.1.0.tgz#fed6287e90fe524dc2b412e0fbc2222c1889c21f"
+  integrity sha512-BLFpLBcN+RPKUsFxqRkMiwqTOOdi+TrKr5OpLJ9qCnUdSxS6S80+QRX/mIhfR66u0Ykc4QTkReaejOM2ILh+9Q==
+  dependencies:
+    "@types/node" "*"
+
 "@types/chai@^4.2.14":
   version "4.2.15"
   resolved "https://registry.npmjs.org/@types/chai/-/chai-4.2.15.tgz"
@@ -945,6 +952,11 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.0.tgz#62797cee3b8b497f6547503b2312254d4fe3c2bb"
   integrity sha512-eMhwJXc931Ihh4tkU+Y7GiLzT/y/DBNpNtr4yU9O2w3SYBsr9NaOPhQlLKRmoWtI54uNwuo0IOUFQjVOTZYRvw==
 
+"@types/pako@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@types/pako/-/pako-1.0.3.tgz#2e61c2b02020b5f44e2e5e946dfac74f4ec33c58"
+  integrity sha512-EDxOsHAD5dqjbjEUM1xwa7rpKPFb8ECBE5irONTQU7/OsO3thI5YrNEWSPNMvYmvFM0l/OLQJ6Mgw7PEdXSjhg==
+
 "@types/pollyjs__adapter-node-http@^2.0.1":
   version "2.0.1"
   resolved "https://registry.npmjs.org/@types/pollyjs__adapter-node-http/-/pollyjs__adapter-node-http-2.0.1.tgz"
@@ -1468,6 +1480,11 @@ buffer-from@^1.0.0:
   resolved "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz"
   integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
 
+buffer-from@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
+  integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
+
 busboy@^0.2.11:
   version "0.2.14"
   resolved "https://registry.npmjs.org/busboy/-/busboy-0.2.14.tgz"
@@ -3986,6 +4003,11 @@ pad-right@^0.2.2:
   dependencies:
     repeat-string "^1.5.2"
 
+pako@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/pako/-/pako-2.0.4.tgz#6cebc4bbb0b6c73b0d5b8d7e8476e2b2fbea576d"
+  integrity sha512-v8tweI900AUkZN6heMU/4Uy4cXRc2AYNRggVmTR+dEncawDJgCdLMximOVA2p4qO57WMynangsfGRb5WD6L1Bg==
+
 parent-module@^1.0.0:
   version "1.0.1"
   resolved "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz"