[CLIENT] Fix apollo bad extraction

Author: Sytten

packages/apollo/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphmetrics/apollo",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "repository": "[email protected]:graphmetrics/graphmetrics-js.git",
@@ -18,7 +18,7 @@
     "dist"
   ],
   "dependencies": {
-    "@graphmetrics/core": "workspace:0.2.2",
+    "@graphmetrics/core": "workspace:0.2.3",
     "apollo-server-plugin-base": "0.10.4"
   },
   "peerDependencies": {

packages/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphmetrics/client",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "repository": "[email protected]:graphmetrics/graphmetrics-js.git",

packages/client/src/apollo.ts

@@ -3,8 +3,15 @@ import { IncomingHttpHeaders } from 'http';
 import { Context } from './context';
 import { Details } from './interface';
 
+const CLIENT_NAME_HEADER = 'apollographql-client-name';
+const CLIENT_VERSION_HEADER = 'apollographql-client-version';
+
+interface Headers {
+  get(name: string): string | null;
+}
+
 type Request = {
-  headers: IncomingHttpHeaders;
+  headers: IncomingHttpHeaders | Headers;
 };
 
 export function apolloContext<BaseContext>(
@@ -18,8 +25,15 @@ export function apolloContext<BaseContext>(
 }
 
 export function apolloHeaders(req: Request): Details {
+  // Extract name
   let name = '';
-  const rawName = req.headers['apollographql-client-name'];
+  let rawName: string | string[] | null = '';
+  if (typeof req.headers.get === 'function') {
+    rawName = req.headers.get(CLIENT_NAME_HEADER);
+  } else {
+    rawName = req.headers[CLIENT_NAME_HEADER];
+  }
+
   if (rawName) {
     if (Array.isArray(rawName)) {
       name = rawName[0];
@@ -28,8 +42,15 @@ export function apolloHeaders(req: Request): Details {
     }
   }
 
+  // Extract version
   let version = '';
-  const rawVersion = req.headers['apollographql-client-version'];
+  let rawVersion: string | string[] | null = '';
+  if (typeof req.headers.get === 'function') {
+    rawVersion = req.headers.get(CLIENT_VERSION_HEADER);
+  } else {
+    rawName = req.headers[CLIENT_VERSION_HEADER];
+  }
+
   if (rawVersion) {
     if (Array.isArray(rawVersion)) {
       version = rawVersion[0];

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphmetrics/core",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "repository": "[email protected]:graphmetrics/graphmetrics-js.git",
@@ -18,7 +18,7 @@
     "dist"
   ],
   "dependencies": {
-    "@graphmetrics/client": "workspace:0.1.0",
+    "@graphmetrics/client": "workspace:0.1.1",
     "@graphmetrics/logger": "workspace:0.1.0",
     "@graphmetrics/sketches-js": "0.3.0",
     "denque": "1.5.0",