fix: replace proxy by getter

PolymeshAssociation · Jun 1, 2020 · 48fab83 · 48fab83
1 parent 2586be8
commit 48fab83
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 64 deletions.
diff --git a/src/Polymesh.ts b/src/Polymesh.ts
@@ -92,7 +92,7 @@ export class Polymesh {
   }): Promise<Polymesh> {
     const { nodeUrl, accountSeed, keyring, accountUri, harvester } = params;
     let polymeshApi: ApiPromise;
-    let harvesterClient: ApolloClient<NormalizedCacheObject>;
+    let harvesterClient: ApolloClient<NormalizedCacheObject> | null = null;
 
     try {
       const { types, rpc } = polymesh;
@@ -103,53 +103,49 @@ export class Polymesh {
         rpc,
       });
 
-      harvesterClient = new ApolloClient({
-        link: setContext((_, { headers }) => {
-          return {
-            headers: {
-              ...headers,
-              'x-api-key': harvester ? harvester.key : '',
-            },
-          };
-        }).concat(
-          ApolloLink.from([
-            new HttpLink({
-              uri: harvester ? harvester.link : '',
-            }),
-          ])
-        ),
-        cache: new InMemoryCache(),
-      });
-
-      const isApolloConfigured = typeof harvester !== 'undefined';
+      if (harvester) {
+        harvesterClient = new ApolloClient({
+          link: setContext((_, { headers }) => {
+            return {
+              headers: {
+                ...headers,
+                'x-api-key': harvester ? harvester.key : '',
+              },
+            };
+          }).concat(
+            ApolloLink.from([
+              new HttpLink({
+                uri: harvester ? harvester.link : '',
+              }),
+            ])
+          ),
+          cache: new InMemoryCache(),
+        });
+      }
 
       let context: Context;
 
       if (accountSeed) {
         context = await Context.create({
           polymeshApi,
-          isApolloConfigured,
           harvesterClient,
           seed: accountSeed,
         });
       } else if (keyring) {
         context = await Context.create({
           polymeshApi,
-          isApolloConfigured,
           harvesterClient,
           keyring,
         });
       } else if (accountUri) {
         context = await Context.create({
           polymeshApi,
-          isApolloConfigured,
           harvesterClient,
           uri: accountUri,
         });
       } else {
         context = await Context.create({
           polymeshApi,
-          isApolloConfigured,
           harvesterClient,
         });
       }

diff --git a/src/context/index.ts b/src/context/index.ts
@@ -25,8 +25,7 @@ interface SignerData {
 
 interface ConstructorParams {
   polymeshApi: ApiPromise;
-  isApolloConfigured: boolean;
-  harvesterClient: ApolloClient<NormalizedCacheObject>;
+  harvesterClient: ApolloClient<NormalizedCacheObject> | null;
   keyring: Keyring;
   pair?: SignerData;
 }
@@ -52,13 +51,17 @@ export class Context {
 
   private currentIdentity?: Identity;
 
-  public harvesterClient: ApolloClient<NormalizedCacheObject>;
+  private _harvesterClient?: ApolloClient<NormalizedCacheObject>;
 
   /**
    * @hidden
    */
   private constructor(params: ConstructorParams) {
-    const { polymeshApi, isApolloConfigured, harvesterClient, keyring, pair } = params;
+    const { polymeshApi, harvesterClient, keyring, pair } = params;
+
+    if (harvesterClient) {
+      this._harvesterClient = harvesterClient;
+    }
 
     this.polymeshApi = new Proxy(polymeshApi, {
       get: (target, prop: keyof ApiPromise): ApiPromise[keyof ApiPromise] => {
@@ -78,70 +81,42 @@ export class Context {
       this.currentPair = pair.currentPair;
       this.currentIdentity = new Identity({ did: pair.did.toString() }, this);
     }
-
-    this.harvesterClient = new Proxy(harvesterClient, {
-      get: (
-        target,
-        prop: keyof ApolloClient<NormalizedCacheObject>
-      ): ApolloClient<NormalizedCacheObject>[keyof ApolloClient<NormalizedCacheObject>] => {
-        if (prop === 'query' && !isApolloConfigured) {
-          throw new PolymeshError({
-            code: ErrorCode.FatalError,
-            message: 'Cannot perform this action without an active harvester connection',
-          });
-        }
-
-        return target[prop];
-      },
-    });
   }
 
   static async create(params: {
     polymeshApi: ApiPromise;
-    isApolloConfigured: boolean;
-    harvesterClient: ApolloClient<NormalizedCacheObject>;
+    harvesterClient: ApolloClient<NormalizedCacheObject> | null;
     seed: string;
   }): Promise<Context>;
 
   static async create(params: {
     polymeshApi: ApiPromise;
-    isApolloConfigured: boolean;
-    harvesterClient: ApolloClient<NormalizedCacheObject>;
+    harvesterClient: ApolloClient<NormalizedCacheObject> | null;
     keyring: Keyring;
   }): Promise<Context>;
 
   static async create(params: {
     polymeshApi: ApiPromise;
-    isApolloConfigured: boolean;
-    harvesterClient: ApolloClient<NormalizedCacheObject>;
+    harvesterClient: ApolloClient<NormalizedCacheObject> | null;
     uri: string;
   }): Promise<Context>;
 
   static async create(params: {
     polymeshApi: ApiPromise;
-    isApolloConfigured: boolean;
-    harvesterClient: ApolloClient<NormalizedCacheObject>;
+    harvesterClient: ApolloClient<NormalizedCacheObject> | null;
   }): Promise<Context>;
 
   /**
    * Create the Context instance
    */
   static async create(params: {
     polymeshApi: ApiPromise;
-    isApolloConfigured: boolean;
-    harvesterClient: ApolloClient<NormalizedCacheObject>;
+    harvesterClient: ApolloClient<NormalizedCacheObject> | null;
     seed?: string;
     keyring?: Keyring;
     uri?: string;
   }): Promise<Context> {
-    const {
-      polymeshApi,
-      isApolloConfigured,
-      harvesterClient,
-      seed,
-      keyring: passedKeyring,
-      uri,
-    } = params;
+    const { polymeshApi, harvesterClient, seed, keyring: passedKeyring, uri } = params;
 
     let keyring = new Keyring({ type: 'sr25519' });
     let currentPair: IKeyringPair | undefined;
@@ -171,7 +146,6 @@ export class Context {
 
         return new Context({
           polymeshApi,
-          isApolloConfigured,
           harvesterClient,
           keyring,
           pair: { currentPair, did },
@@ -184,7 +158,7 @@ export class Context {
       }
     }
 
-    return new Context({ polymeshApi, isApolloConfigured, harvesterClient, keyring });
+    return new Context({ polymeshApi, harvesterClient, keyring });
   }
 
   /**
@@ -340,4 +314,23 @@ export class Context {
 
     return invalidDids;
   }
+
+  /**
+   * Retrieve the harvester client
+   *
+   * @throws if credentials are not set
+   */
+  public get harvesterClient(): ApolloClient<NormalizedCacheObject> {
+    const { _harvesterClient } = this;
+
+    if (!_harvesterClient) {
+      throw new PolymeshError({
+        code: ErrorCode.FatalError,
+        message: 'Cannot perform this action without an active harvester connection',
+      });
+    }
+
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    return _harvesterClient!;
+  }
 }