wip

rpc/js/src/ClientChannel.ts

@@ -1,6 +1,5 @@
 import { AnyMessage, Message, MethodInfo, PartialMessage, ServiceType } from '@bufbuild/protobuf';
 import { ContextValues, StreamResponse, Transport, UnaryResponse } from '@connectrpc/connect';
-import { GrpcWebTransportOptions } from '@connectrpc/connect-web';
 import { BaseChannel } from './BaseChannel';
 import { ClientStream } from './ClientStream';
 import { ConnectionClosedError } from './errors';
@@ -19,11 +18,6 @@ interface activeClienStream {
   cs: ClientStream;
 }
 
-// TODO(erd): cross-platform
-export type TransportFactory = (
-  init: GrpcWebTransportOptions
-) => Transport
-
 export class ClientChannel extends BaseChannel implements Transport {
   private streamIDCounter = 0;
   private readonly streams: Record<number, activeClienStream> = {};

rpc/js/src/dial.ts

@@ -10,7 +10,7 @@ import type {
 
 import type { ContextValues, StreamResponse, Transport, UnaryResponse } from "@connectrpc/connect";
 import { Code, ConnectError, createPromiseClient } from "@connectrpc/connect";
-import { ClientChannel, TransportFactory } from './ClientChannel';
+import { ClientChannel } from './ClientChannel';
 import { ConnectionClosedError } from './errors';
 import { Status } from './gen/google/rpc/status_pb';
 import {
@@ -32,7 +32,7 @@ import {
 } from './gen/proto/rpc/webrtc/v1/signaling_pb';
 import { addSdpFields, newPeerConnectionForClient } from './peer';
 
-import { createGrpcWebTransport, GrpcWebTransportOptions } from "@connectrpc/connect-web";
+import { createGrpcWebTransport } from "@connectrpc/connect-web";
 import { atob, btoa } from './polyfills';
 
 export interface DialOptions {
@@ -94,6 +94,14 @@ export interface Credentials {
   payload: string;
 }
 
+export type TransportFactory = (
+  init: TransportInitOptions
+) => Transport
+
+interface TransportInitOptions {
+  baseUrl: string;
+}
+
 // TODO(erd): correctly get grpc-web/node
 export async function dialDirect(
   address: string,
@@ -180,22 +188,20 @@ async function makeAuthenticatedTransportFactory(
     return headers;
   };
   const extraMd = await getExtraHeaders();
-  return (opts: GrpcWebTransportOptions): Transport => {
+  return (opts: TransportInitOptions): Transport => {
     return new authenticatedTransport(opts, defaultFactory, extraMd);
   };
 }
 
 class authenticatedTransport implements Transport {
-  protected readonly opts: GrpcWebTransportOptions;
   protected readonly transport: Transport;
   protected readonly extraHeaders: Headers;
 
   constructor(
-    opts: GrpcWebTransportOptions,
+    opts: TransportInitOptions,
     defaultFactory: TransportFactory,
     extraHeaders: Headers
   ) {
-    this.opts = opts;
     this.extraHeaders = extraHeaders;
     this.transport = defaultFactory(opts);
   }
@@ -249,8 +255,6 @@ class authenticatedTransport implements Transport {
       input,
       contextValues)
   }
-
-
 }
 
 export interface WebRTCConnection {