Update Mockttp for WebSockets (!), private network CORS & raw headers

Note the '.mjs' addition. After updating GraphQL, this is required.
Without this, Webpack finds both js & mjs imports, uses both,
effectively bundles GraphQL twice, and then the two don't play nicely
(e.g. because of instanceof checks across the two).

Author: pimterry

package-lock.json

@@ -58,14 +58,14 @@
     "event-stream": "^4.0.1",
     "express": "^4.17.1",
     "express-graphql": "^0.11.0",
-    "graphql": "^14.7.0",
+    "graphql": "^15.8.0",
     "gunzip-maybe": "^1.4.2",
     "iconv-lite": "^0.4.24",
     "lodash": "^4.17.21",
     "lookpath": "^1.2.1",
     "mime-types": "^2.1.27",
     "mobx": "^6.3.5",
-    "mockttp": "^2.7.0",
+    "mockttp": "^3.2.0",
     "node-abort-controller": "^3.0.1",
     "node-fetch": "^2.6.1",
     "node-forge": "^1.3.0",

package.json

@@ -110,14 +110,14 @@ describe('Integration test', function () {
 
     it('starts a Mockttp server', async () => {
         const mockttp = getRemote({
-            standaloneServerUrl: 'http://localhost:45456',
+            adminServerUrl: 'http://localhost:45456',
             client: {
                 // Pretend to be a browser on the real site:
                 headers: { origin: 'https://app.httptoolkit.tech' }
             }
         });
         await mockttp.start();
-        await mockttp.get('https://google.com').thenReply(200, 'Mock response');
+        await mockttp.forGet('https://google.com').thenReply(200, 'Mock response');
 
         process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
         const response = await request.get('https://google.com', { proxy: mockttp.url });

test/integration-test.spec.ts

@@ -106,7 +106,7 @@ describe('Docker single-container interceptor', function () {
         it(`should intercept external ${target} requests`, async function () {
             this.timeout(60000);
             const { interceptor, server } = await interceptorSetup;
-            const mainRule = await server.get('https://example.com').thenReply(404);
+            const mainRule = await server.forGet('https://example.com').thenReply(404);
 
             const containerId = await buildAndRun(target.toLowerCase(), 'https://example.com');
 

test/interceptors/docker-attachment.spec.ts

@@ -23,7 +23,7 @@ describe('Electron interception', function () {
     beforeEach(async () => {
         const { server } = await interceptorSetup;
         await server.start();
-        await server.anyRequest().thenPassThrough();
+        await server.forAnyRequest().thenPassThrough();
     });
 
     afterEach(async () => {

test/interceptors/electron.spec.ts

@@ -10,7 +10,7 @@ describe('Chrome interceptor', function () {
     beforeEach(async () => {
         const { server } = await interceptorSetup;
         await server.start();
-        await server.anyRequest().thenPassThrough();
+        await server.forAnyRequest().thenPassThrough();
     });
 
     afterEach(async () => {

test/interceptors/fresh-chrome.spec.ts

@@ -10,7 +10,7 @@ describe('Firefox interceptor', function () {
     beforeEach(async () => {
         const { server } = await interceptorSetup;
         await server.start();
-        await server.anyRequest().thenPassThrough();
+        await server.forAnyRequest().thenPassThrough();
     });
 
     afterEach(async () => {

test/interceptors/fresh-firefox.spec.ts

@@ -25,7 +25,7 @@ describe('Fresh terminal interceptor', function () {
 
         beforeEach(async () => {
             const { server } = await interceptorSetup;
-            await server.anyRequest().thenPassThrough();
+            await server.forAnyRequest().thenPassThrough();
         });
 
         afterEach(async () => {
@@ -44,8 +44,8 @@ describe('Fresh terminal interceptor', function () {
 
             const { server, httpsConfig } = await interceptorSetup;
 
-            const mainRule = await server.get(/https?:\/\/example.test\/js\/.*/).thenReply(200);
-            const stripeRule = await server.get('https://api.stripe.com/v1/customers').thenJson(200, {});
+            const mainRule = await server.forGet(/https?:\/\/example.test\/js\/.*/).thenReply(200);
+            const stripeRule = await server.forGet('https://api.stripe.com/v1/customers').thenJson(200, {});
 
             // Spawn node, as if it was run inside an intercepted terminal
             const terminalEnvOverrides = getTerminalEnvVars(server.port, httpsConfig, process.env);

test/interceptors/fresh-terminal.spec.ts

@@ -106,6 +106,6 @@ module.exports = {
         new webpack.EnvironmentPlugin({ HTK_IS_BUNDLED: true })
     ],
     resolve: {
-        extensions: [ '.tsx', '.ts', '.js' ]
+        extensions: [ '.tsx', '.ts', '.mjs', '.js' ]
     }
 };