Update interop tests to use modern package lock file (#1615)

Author: JamesNK

src/Grpc.AspNetCore.Server/Internal/HttpContextServerCallContext.cs

@@ -80,33 +80,35 @@ protected override string PeerCore
                 // Follows the standard at https://github.com/grpc/grpc/blob/master/doc/naming.md
                 if (_peer == null)
                 {
-                    var connection = HttpContext.Connection;
-                    if (connection.RemoteIpAddress != null)
-                    {
-                        switch (connection.RemoteIpAddress.AddressFamily)
-                        {
-                            case AddressFamily.InterNetwork:
-                                _peer = "ipv4:" + connection.RemoteIpAddress + ":" + connection.RemotePort;
-                                break;
-                            case AddressFamily.InterNetworkV6:
-                                _peer = "ipv6:[" + connection.RemoteIpAddress + "]:" + connection.RemotePort;
-                                break;
-                            default:
-                                // TODO(JamesNK) - Test what should be output when used with UDS and named pipes
-                                _peer = "unknown:" + connection.RemoteIpAddress + ":" + connection.RemotePort;
-                                break;
-                        }
-                    }
-                    else
-                    {
-                        _peer = "unknown"; // Match Grpc.Core
-                    }
+                    _peer = BuildPeer();
                 }
 
                 return _peer;
             }
         }
 
+        private string BuildPeer()
+        {
+            var connection = HttpContext.Connection;
+            if (connection.RemoteIpAddress != null)
+            {
+                switch (connection.RemoteIpAddress.AddressFamily)
+                {
+                    case AddressFamily.InterNetwork:
+                        return $"ipv4:{connection.RemoteIpAddress}:{connection.RemotePort}";
+                    case AddressFamily.InterNetworkV6:
+                        return $"ipv6:[{connection.RemoteIpAddress}]:{connection.RemotePort}";
+                    default:
+                        // TODO(JamesNK) - Test what should be output when used with UDS and named pipes
+                        return $"unknown:{connection.RemoteIpAddress}:{connection.RemotePort}";
+                }
+            }
+            else
+            {
+                return "unknown"; // Match Grpc.Core
+            }
+        }
+
         protected override DateTime DeadlineCore => DeadlineManager?.Deadline ?? DateTime.MaxValue;
 
         protected override Metadata RequestHeadersCore

testassets/InteropTestsGrpcWebWebsite/Tests/custom-environment.js

@@ -1,6 +1,9 @@
-// custom-environment.js
+// For some reason the expect-puppeteer require is returning a module rather than the function.
+// Helper function unwraps the module and returns the inner function.
+function _interopDefault(ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
+
 const PuppeteerEnvironment = require('jest-environment-puppeteer');
-const expect = require('expect-puppeteer');
+const expect = _interopDefault(require('expect-puppeteer'));
 
 class CustomEnvironment extends PuppeteerEnvironment {
     // Load page and get test names to run