Enable web usage without webpack (#153)

microsoft · Jun 6, 2019 · db388ca · db388ca
1 parent 5eb9c90
commit db388ca
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 22 deletions.
diff --git a/lib/HttpClient.ts b/lib/HttpClient.ts
@@ -4,9 +4,9 @@
 import url = require("url");
 import http = require("http");
 import https = require("https");
-import tunnel = require("tunnel");
 import ifm = require('./Interfaces');
-import fs = require('fs');
+let fs: any;
+let tunnel: any;
 
 export enum HttpCodes {
     OK = 200,
@@ -122,17 +122,22 @@ export class HttpClient implements ifm.IHttpClient {
 
             this._certConfig = requestOptions.cert;
 
-            // cache the cert content into memory, so we don't have to read it from disk every time 
-            if (this._certConfig && this._certConfig.caFile && fs.existsSync(this._certConfig.caFile)) {
-                this._ca = fs.readFileSync(this._certConfig.caFile, 'utf8');
-            }
-
-            if (this._certConfig && this._certConfig.certFile && fs.existsSync(this._certConfig.certFile)) {
-                this._cert = fs.readFileSync(this._certConfig.certFile, 'utf8');
-            }
+            if (this._certConfig) {
+                // If using cert, need fs
+                fs = require('fs');
 
-            if (this._certConfig && this._certConfig.keyFile && fs.existsSync(this._certConfig.keyFile)) {
-                this._key = fs.readFileSync(this._certConfig.keyFile, 'utf8');
+                // cache the cert content into memory, so we don't have to read it from disk every time 
+                if (this._certConfig.caFile && fs.existsSync(this._certConfig.caFile)) {
+                    this._ca = fs.readFileSync(this._certConfig.caFile, 'utf8');
+                }
+
+                if (this._certConfig.certFile && fs.existsSync(this._certConfig.certFile)) {
+                    this._cert = fs.readFileSync(this._certConfig.certFile, 'utf8');
+                }
+
+                if (this._certConfig.keyFile && fs.existsSync(this._certConfig.keyFile)) {
+                    this._key = fs.readFileSync(this._certConfig.keyFile, 'utf8');
+                }
             }
 
             if (requestOptions.allowRedirects != null) {
@@ -437,7 +442,12 @@ export class HttpClient implements ifm.IHttpClient {
         }
 
         if (useProxy) {
-            const agentOptions: tunnel.TunnelOptions = {
+            // If using proxy, need tunnel
+            if (!tunnel) {
+                tunnel = require('tunnel');
+            }
+
+            const agentOptions = {
                 maxSockets: maxSockets,
                 keepAlive: this._keepAlive,
                 proxy: {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "typed-rest-client",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "Node Rest and Http Clients for use with TypeScript",
   "main": "./RestClient.js",
   "scripts": {