test: fix webpack config and tests

Author: d-goog

gax/test/browser-test/package.json

@@ -28,7 +28,9 @@
     "@types/node": "^20.5.0",
     "@types/sinon": "^10.0.13",
     "assert": "^2.1.0",
+    "browserify-zlib": "^0.2.0",
     "core-js": "^3.40.0",
+    "crypto-browserify": "^3.12.1",
     "google-gax": "./google-gax.tgz",
     "https-browserify": "^1.0.0",
     "is-docker": "^2.2.1",
@@ -39,6 +41,8 @@
     "karma-sourcemap-loader": "^0.4.0",
     "karma-webpack": "^5.0.1",
     "mocha": "^10.0.0",
+    "os-browserify": "^0.3.0",
+    "path-browserify": "^1.0.1",
     "process": "^0.11.10",
     "puppeteer": "^16.0.0",
     "querystring-es3": "^0.2.1",

gax/test/browser-test/test/test.endtoend.ts

@@ -28,12 +28,17 @@ function sleep(timeout: number) {
 
 describe('Run tests against gRPC server', async function () {
   const authStub = {
+    getRequestHeaders: async () => {
+      return new Headers({
+        Authorization: 'Bearer zzzz',
+      });
+    },
     getClient: async () => {
       return {
         getRequestHeaders: async () => {
-          return {
+          return new Headers({
             Authorization: 'Bearer zzzz',
-          };
+          });
         },
       };
     },
@@ -71,7 +76,7 @@ describe('Run tests against gRPC server', async function () {
     }
     if (retryCount === MAX_RETRIES) {
       throw new Error(
-        `gapic-showcase server did not respond after ${MAX_RETRIES} attempts, aborting end-to-end browser tests`
+        `gapic-showcase server did not respond after ${MAX_RETRIES} attempts, aborting end-to-end browser tests`,
       );
     }
   });

gax/test/browser-test/test/test.grpc-fallback.ts

@@ -24,21 +24,13 @@ import {EchoClient} from 'showcase-echo-client';
 import 'core-js/stable';
 
 import echoProtoJson = require('showcase-echo-client/build/protos/protos.json');
+import {PassThroughClient} from 'google-auth-library';
 
-const authStub = {
-  getClient: async () => {
-    return {
-      getRequestHeaders: async () => {
-        return {
-          Authorization: 'Bearer zzzz',
-        };
-      },
-    };
-  },
-};
+const authClient = new PassThroughClient();
+const auth = new GoogleAuth({authClient});
 
 const opts = {
-  auth: authStub as unknown as GoogleAuth,
+  auth,
 };
 
 describe('loadProto', () => {
@@ -128,20 +120,10 @@ describe('grpc-fallback', () => {
   // eslint-disable-next-line no-undef
   const savedAbortController = window.AbortController;
 
-  const authStub = {
-    getClient: async () => {
-      return {
-        getRequestHeaders: async () => {
-          return {
-            Authorization: 'Bearer zzzz',
-          };
-        },
-      };
-    },
-  };
-
+  const authClient = new PassThroughClient();
+  const auth = new GoogleAuth({authClient});
   const opts = {
-    auth: authStub as unknown as GoogleAuth,
+    auth,
     protocol: 'http',
     port: 1337,
   };
@@ -198,7 +180,7 @@ describe('grpc-fallback', () => {
       ok: true,
       arrayBuffer: () => {
         return Promise.resolve(
-          new TextEncoder().encode(JSON.stringify(response))
+          new TextEncoder().encode(JSON.stringify(response)),
         );
       },
     });
@@ -238,12 +220,12 @@ describe('grpc-fallback', () => {
     // eslint-disable-next-line no-undef
     window.fetch = (url, options) => {
       // @ts-ignore
-      assert.strictEqual(options.headers['x-test-header'], 'value');
+      assert.strictEqual(options.headers.get('x-test-header'), 'value');
       return Promise.resolve({
         ok: true,
         arrayBuffer: () => {
           return Promise.resolve(
-            new TextEncoder().encode(JSON.stringify(response))
+            new TextEncoder().encode(JSON.stringify(response)),
           );
         },
       });
@@ -265,7 +247,7 @@ describe('grpc-fallback', () => {
       ok: false,
       arrayBuffer: () => {
         return Promise.resolve(
-          new TextEncoder().encode(JSON.stringify(expectedError))
+          new TextEncoder().encode(JSON.stringify(expectedError)),
         );
       },
     });

gax/test/browser-test/webpack.config.js

@@ -18,7 +18,30 @@
 const webpack = require('webpack');
 module.exports = {
   entry: './build/src/index.js',
+  externals: {
+    crypto: '{}',
+    'node:buffer': '{}',
+    'node:fs': '{}',
+    'node:http': '{}',
+    'node:https': '{}',
+    'node:net': '{}',
+    'node:path': '{}',
+    'node:process': '{}',
+    'node:stream': '{}',
+    'node:stream/web': '{}',
+    'node:url': '{}',
+    'node:util': '{}',
+    'node:zlib': '{}',
+    worker_threads: '{}',
+    fs: '{}',
+    child_process: '{}',
+    tls: '{}',
+    net: '{}',
+  },
   resolve: {
+    alias: {
+      process: 'process/browser',
+    },
     extensions: ['.ts', '.js', '.json'],
     fallback: {
       fs: 'empty',
@@ -31,9 +54,9 @@ module.exports = {
       https: require.resolve('https-browserify'),
       querystring: require.resolve('querystring-es3'),
       url: require.resolve('url/'),
-      worker_threads: 'empty',
       crypto: require.resolve('crypto'),
-      'process/browser': 'empty',
+      os: require.resolve('os-browserify/browser'),
+      path: require.resolve('path-browserify'),
     },
   },
   plugins: [
@@ -44,7 +67,7 @@ module.exports = {
       Buffer: ['buffer', 'Buffer'],
     }),
     new webpack.ProvidePlugin({
-      'node:buffer': ['buffer', 'Buffer'],
+      'node-fetch': ['fetch'],
     }),
   ],
   module: {
@@ -59,7 +82,7 @@ module.exports = {
         use: 'null-loader',
       },
       {
-        test: /node_modules[\\/]google-auth-library/,
+        test: /node_modules[\\/]gcp-metadata/,
         use: 'null-loader',
       },
       {
@@ -70,6 +93,12 @@ module.exports = {
         test: /build[\\/]src[\\/]grpc\.js$/,
         use: 'null-loader',
       },
+      {
+        test: /\.m?js$/,
+        resolve: {
+          fullySpecified: false,
+        },
+      },
     ],
   },
   cache: false,