Fixed optional auth + added http for raw IP

README.md

@@ -17,6 +17,14 @@ Steps to regenerate:
 ### Geyser
 Please request access to geyser by emailing [email protected]
 
+If you want to use geyser without access token on your instance of JITO Geyser, set second option to null:
+
+```
+import { geyserClient as jitoGeyserClient } from 'jito-ts';
+const client = jitoSearcherClient(url, null, gRPCOptions);
+```
+https and http now work with geyser for direct IP connection
+
 **Note:** Mac users may run into an error to the effect of "protoc-gen-js: program not found or is not executable";
 if this is thrown, run:
 * `brew install protobuf@3`

src/sdk/geyser/geyser.ts

@@ -4,9 +4,9 @@ import {
   ClientReadableStream,
   ServiceError,
 } from '@grpc/grpc-js';
-import {PublicKey} from '@solana/web3.js';
+import { PublicKey } from '@solana/web3.js';
 
-import {authInterceptor} from './auth';
+import { authInterceptor } from './auth';
 import {
   GetHeartbeatIntervalResponse,
   GeyserClient as GeyserClientStub,
@@ -58,7 +58,7 @@ export class GeyserClient {
   ): () => void {
     const accounts = accountsOfInterest.map(a => a.toBytes());
     const stream: ClientReadableStream<TimestampedAccountUpdate> =
-      this.client.subscribeAccountUpdates({accounts});
+      this.client.subscribeAccountUpdates({ accounts });
 
     stream.on('readable', () => {
       const msg = stream.read(1);
@@ -71,7 +71,7 @@ export class GeyserClient {
       errorCallback(new Error(`Stream error: ${e.message}`))
     );
 
-    return () => stream.cancel();
+    return stream.cancel;
   }
 
   /**
@@ -89,7 +89,7 @@ export class GeyserClient {
   ): () => void {
     const programs = programsOfInterest.map(a => a.toBytes());
     const stream: ClientReadableStream<TimestampedAccountUpdate> =
-      this.client.subscribeProgramUpdates({programs});
+      this.client.subscribeProgramUpdates({ programs });
 
     stream.on('readable', () => {
       const msg = stream.read(1);
@@ -102,7 +102,7 @@ export class GeyserClient {
       errorCallback(new Error(`Stream error: ${e.message}`))
     );
 
-    return () => stream.cancel();
+    return stream.cancel;
   }
 
   /**
@@ -130,7 +130,7 @@ export class GeyserClient {
       errorCallback(new Error(`Stream error: ${e.message}`))
     );
 
-    return () => stream.cancel();
+    return stream.cancel;
   }
 }
 
@@ -144,13 +144,20 @@ export class GeyserClient {
  */
 export const geyserClient = (
   url: string,
-  accessToken: string,
+  accessToken?: string,
   grpcOptions?: Partial<ChannelOptions>
 ): GeyserClient => {
-  const client = new GeyserClientStub(url, ChannelCredentials.createSsl(), {
-    interceptors: [authInterceptor(accessToken)],
-    ...grpcOptions,
-  });
+  const options: Partial<ChannelOptions> = { ...grpcOptions };
+
+  if (accessToken) {
+    options.interceptors = [authInterceptor(accessToken)];
+  }
+
+  const credentials = url.startsWith('https')
+    ? ChannelCredentials.createSsl()
+    : ChannelCredentials.createInsecure();
+
+  const client = new GeyserClientStub(url, credentials, options);
 
   return new GeyserClient(client);
 };