fix: resolve url behind proxy and set timeout on grpc (#8)

* fix: resolve url behind proxy and set timeout on grpc

* chore: update version

Author: TristanSpeakEasy

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@speakeasy-api/speakeasy-typescript-sdk",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/speakeasy-api/speakeasy-typescript-sdk"

src/harbuilder.ts

@@ -15,6 +15,7 @@ import { RequestResponseWriter } from "./requestresponsewriter";
 import Timestamp from "timestamp-nano";
 import cookie from "cookie";
 import { maskBodyRegex } from "./bodymasking";
+import { resolveProxyHeaders } from "./proxy";
 import setCookie from "set-cookie-parser";
 import { speakeasyVersion } from "./speakeasy";
 import url from "url";
@@ -58,9 +59,11 @@ export class HarBuilder {
     port: number,
     masking: Masking
   ): HarBuilder {
-    const host = req.get("host") ?? "";
+    const resolveURLInfo = resolveProxyHeaders(req);
 
-    const fullOriginalURL = `${req.protocol}://${host}${
+    const host = resolveURLInfo.host;
+
+    const fullOriginalURL = `${resolveURLInfo.scheme}://${host}${
       !host.includes(":") && port != 80 && port != 443 ? `:${port}` : ""
     }${req.originalUrl}`;
 

src/proxy.ts

@@ -0,0 +1,36 @@
+import { Request } from "express";
+
+export interface ResolvedURLInfo {
+  scheme: string;
+  host: string;
+}
+
+export function resolveProxyHeaders(req: Request): ResolvedURLInfo {
+  const scheme = getScheme(req);
+
+  return {
+    scheme: scheme != "" ? scheme : req.protocol,
+    host: (req.headers["x-forwarded-host"] as string) ?? req.headers.host,
+  };
+}
+
+function getScheme(req: Request): string {
+  let scheme: string = "";
+
+  if (req.headers["x-forwarded-proto"]) {
+    scheme = (req.headers["x-forwarded-proto"] as string).toLowerCase();
+  } else if (req.headers["x-forwarded-scheme"]) {
+    scheme = (req.headers["x-forwarded-scheme"] as string).toLowerCase();
+  } else if (req.headers["forwarded"]) {
+    const forwarded = req.headers["forwarded"] as string;
+
+    const protoRegex = new RegExp(`(?i)(?:proto=)(https|http)`);
+
+    const matches = protoRegex.exec(forwarded);
+    if (matches.length > 1) {
+      scheme = matches[1].toLowerCase();
+    }
+  }
+
+  return scheme;
+}

src/transport.ts

@@ -14,6 +14,8 @@ import { IngestRequest } from "@speakeasy-api/speakeasy-schemas/registry/ingest/
 import { IngestServiceClient } from "@speakeasy-api/speakeasy-schemas/registry/ingest/ingest_grpc_pb";
 import { Message } from "google-protobuf";
 
+const grpcDeadline = getRPCDeadline(1000); // 1 Second deadline
+
 export class GRPCClient {
   private ingestClient: Promisified<IngestServiceClient>;
   private embedClient: Promisified<EmbedAccessTokenServiceClient>;
@@ -56,11 +58,13 @@ export class GRPCClient {
     request.setPathHint(pathHint);
     request.setCustomerId(customerID);
 
-    this.ingestClient.ingest(request, metadata).catch((err) => {
-      if (err) {
-        console.error(err); // TODO log error with a provided logger?
-      }
-    });
+    this.ingestClient
+      .ingest(request, metadata, { deadline: grpcDeadline })
+      .catch((err) => {
+        if (err) {
+          console.error(err); // TODO log error with a provided logger?
+        }
+      });
   }
 
   public async getEmbedAccessToken(
@@ -74,6 +78,10 @@ export class GRPCClient {
   }
 }
 
+function getRPCDeadline(deadline: number): Date {
+  return new Date(Date.now() + deadline);
+}
+
 type OriginalCall<T, U> = (
   request: T,
   metadata: Metadata,