@portal-hq/connect 2.0.3 → 2.0.6

package/lib/commonjs/index.js

@@ -16,6 +16,18 @@ class PortalConnect {
     // Optional
     isSimulator = false, autoApprove = false, version = 'v4', apiHost = 'api.portalhq.io', mpcHost = 'mpc.portalhq.io', webSocketServer = 'connect.portalhq.io', }) {
         this.connectionState = ConnectionStates.DISCONNECTED;
+        this.handleSigningRejected = (data) => {
+            var _a;
+            // Notify the proxy server that the signing request was rejected
+            (_a = this.socket) === null || _a === void 0 ? void 0 : _a.send(JSON.stringify({
+                event: 'portal_signingRejected',
+                data: {
+                    topic: data.topic,
+                    transactionHash: '',
+                    transactionId: data.id,
+                },
+            }));
+        };
         this.apiKey = apiKey;
         this.events = {};
         this.websocketServer = webSocketServer;
@@ -65,22 +77,20 @@ class PortalConnect {
      * @param connectionString The URI to ask the Connect Proxy to create a websocket connection to
      */
     connect(uri) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.socket) {
-                this.socket.close();
-            }
-            const protocol = this.websocketServer.startsWith('localhost') ? 'ws' : 'wss';
-            // @ts-ignore
-            this.socket = new WebSocket(`${protocol}://${this.websocketServer}/`, null, 
-            // @ts-ignore
-            {
-                headers: {
-                    Authorization: `Bearer ${this.apiKey}`,
-                },
-            });
-            this.uri = uri;
-            this.bindToSocketEvents(this.socket, uri);
+        if (this.socket) {
+            this.socket.close();
+        }
+        const protocol = this.websocketServer.startsWith('localhost') ? 'ws' : 'wss';
+        this.socket = new WebSocket(`${protocol}://${this.websocketServer}/`, null, 
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore
+        {
+            headers: {
+                Authorization: `Bearer ${this.apiKey}`,
+            },
         });
+        this.uri = uri;
+        this.bindToSocketEvents(this.socket, uri);
     }
     deinit() {
         this.events = {};
@@ -95,7 +105,7 @@ class PortalConnect {
      */
     setChainId(chainId) {
         return __awaiter(this, void 0, void 0, function* () {
-            this.provider.setChainId(chainId, this);
+            yield this.provider.setChainId(chainId, this);
         });
     }
     /**
@@ -241,7 +251,7 @@ class PortalConnect {
                 },
             }));
         });
-        socket.onerror = (event) => __awaiter(this, void 0, void 0, function* () {
+        socket.onerror = (event) => {
             let errorMessage = 'An unexpected error occurred.';
             if (event instanceof ErrorEvent) {
                 // Check if the event is an ErrorEvent
@@ -253,7 +263,7 @@ class PortalConnect {
                 params: new ConnectError(errorMessage, 500),
             });
             this.connectionState = ConnectionStates.DISCONNECTED;
-        });
+        };
         /**
          * Handles all incoming messages over the websocket connection
          * (inbound messages proxied via the relay)
@@ -277,12 +287,13 @@ class PortalConnect {
                     this.connectionState = ConnectionStates.DISCONNECTED;
                     this.emit('disconnect', message.data);
                     break;
-                case 'session_request':
+                case 'session_request': {
                     const request = message.data;
                     const params = request.params;
                     // Sign the transaction and get back a transaction hash
                     yield this.handleProviderRequest(params.request.method, params.request.params, params.chainId, request);
                     break;
+                }
                 case 'portal_dappSessionRequested':
                 case 'portal_dappSessionRequestedV1':
                     this.handleSessionRequest(message);
@@ -354,45 +365,27 @@ class PortalConnect {
         });
     }
     handleSessionRequest(message) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const request = message.data;
-            // Bind to potential session approval/rejection events
-            this.on('portal_dappSessionApproved', (data) => this.handleSessionApproved(data, request));
-            this.on('portal_dappSessionRejected', (data) => this.handleSessionRejected(data, request));
-            // Emit the session request event
-            this.emit('portal_dappSessionRequested', request.params);
-        });
+        const request = message.data;
+        // Bind to potential session approval/rejection events
+        this.on('portal_dappSessionApproved', (data) => this.handleSessionApproved(data, request));
+        this.on('portal_dappSessionRejected', (data) => this.handleSessionRejected(data, request));
+        // Emit the session request event
+        this.emit('portal_dappSessionRequested', request.params);
     }
     handleSignatureReceived(data, txHash) {
         var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            const { id, topic } = data;
-            // Let the server know the transaction hash
-            (_a = this.socket) === null || _a === void 0 ? void 0 : _a.send(JSON.stringify({
-                event: 'signatureReceived',
-                data: {
-                    topic,
-                    transactionHash: txHash,
-                    transactionId: id,
-                },
-            }));
-            // Let the SDK consumer know the transaction hash
-            this.emit('portal_signgatureReceived', txHash);
-        });
-    }
-    handleSigningRejected(data) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            // Notify the proxy server that the signing request was rejected
-            (_a = this.socket) === null || _a === void 0 ? void 0 : _a.send(JSON.stringify({
-                event: 'portal_signingRejected',
-                data: {
-                    topic: data.topic,
-                    transactionHash: '',
-                    transactionId: data.id,
-                },
-            }));
-        });
+        const { id, topic } = data;
+        // Let the server know the transaction hash
+        (_a = this.socket) === null || _a === void 0 ? void 0 : _a.send(JSON.stringify({
+            event: 'signatureReceived',
+            data: {
+                topic,
+                transactionHash: txHash,
+                transactionId: id,
+            },
+        }));
+        // Let the SDK consumer know the transaction hash
+        this.emit('portal_signatureReceived', txHash);
     }
     sendFinalMessageAndClose() {
         var _a;

package/lib/esm/index.js

@@ -13,6 +13,18 @@ class PortalConnect {
     // Optional
     isSimulator = false, autoApprove = false, version = 'v4', apiHost = 'api.portalhq.io', mpcHost = 'mpc.portalhq.io', webSocketServer = 'connect.portalhq.io', }) {
         this.connectionState = ConnectionStates.DISCONNECTED;
+        this.handleSigningRejected = (data) => {
+            var _a;
+            // Notify the proxy server that the signing request was rejected
+            (_a = this.socket) === null || _a === void 0 ? void 0 : _a.send(JSON.stringify({
+                event: 'portal_signingRejected',
+                data: {
+                    topic: data.topic,
+                    transactionHash: '',
+                    transactionId: data.id,
+                },
+            }));
+        };
         this.apiKey = apiKey;
         this.events = {};
         this.websocketServer = webSocketServer;
@@ -62,22 +74,20 @@ class PortalConnect {
      * @param connectionString The URI to ask the Connect Proxy to create a websocket connection to
      */
     connect(uri) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.socket) {
-                this.socket.close();
-            }
-            const protocol = this.websocketServer.startsWith('localhost') ? 'ws' : 'wss';
-            // @ts-ignore
-            this.socket = new WebSocket(`${protocol}://${this.websocketServer}/`, null, 
-            // @ts-ignore
-            {
-                headers: {
-                    Authorization: `Bearer ${this.apiKey}`,
-                },
-            });
-            this.uri = uri;
-            this.bindToSocketEvents(this.socket, uri);
+        if (this.socket) {
+            this.socket.close();
+        }
+        const protocol = this.websocketServer.startsWith('localhost') ? 'ws' : 'wss';
+        this.socket = new WebSocket(`${protocol}://${this.websocketServer}/`, null, 
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore
+        {
+            headers: {
+                Authorization: `Bearer ${this.apiKey}`,
+            },
         });
+        this.uri = uri;
+        this.bindToSocketEvents(this.socket, uri);
     }
     deinit() {
         this.events = {};
@@ -92,7 +102,7 @@ class PortalConnect {
      */
     setChainId(chainId) {
         return __awaiter(this, void 0, void 0, function* () {
-            this.provider.setChainId(chainId, this);
+            yield this.provider.setChainId(chainId, this);
         });
     }
     /**
@@ -238,7 +248,7 @@ class PortalConnect {
                 },
             }));
         });
-        socket.onerror = (event) => __awaiter(this, void 0, void 0, function* () {
+        socket.onerror = (event) => {
             let errorMessage = 'An unexpected error occurred.';
             if (event instanceof ErrorEvent) {
                 // Check if the event is an ErrorEvent
@@ -250,7 +260,7 @@ class PortalConnect {
                 params: new ConnectError(errorMessage, 500),
             });
             this.connectionState = ConnectionStates.DISCONNECTED;
-        });
+        };
         /**
          * Handles all incoming messages over the websocket connection
          * (inbound messages proxied via the relay)
@@ -274,12 +284,13 @@ class PortalConnect {
                     this.connectionState = ConnectionStates.DISCONNECTED;
                     this.emit('disconnect', message.data);
                     break;
-                case 'session_request':
+                case 'session_request': {
                     const request = message.data;
                     const params = request.params;
                     // Sign the transaction and get back a transaction hash
                     yield this.handleProviderRequest(params.request.method, params.request.params, params.chainId, request);
                     break;
+                }
                 case 'portal_dappSessionRequested':
                 case 'portal_dappSessionRequestedV1':
                     this.handleSessionRequest(message);
@@ -351,45 +362,27 @@ class PortalConnect {
         });
     }
     handleSessionRequest(message) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const request = message.data;
-            // Bind to potential session approval/rejection events
-            this.on('portal_dappSessionApproved', (data) => this.handleSessionApproved(data, request));
-            this.on('portal_dappSessionRejected', (data) => this.handleSessionRejected(data, request));
-            // Emit the session request event
-            this.emit('portal_dappSessionRequested', request.params);
-        });
+        const request = message.data;
+        // Bind to potential session approval/rejection events
+        this.on('portal_dappSessionApproved', (data) => this.handleSessionApproved(data, request));
+        this.on('portal_dappSessionRejected', (data) => this.handleSessionRejected(data, request));
+        // Emit the session request event
+        this.emit('portal_dappSessionRequested', request.params);
     }
     handleSignatureReceived(data, txHash) {
         var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            const { id, topic } = data;
-            // Let the server know the transaction hash
-            (_a = this.socket) === null || _a === void 0 ? void 0 : _a.send(JSON.stringify({
-                event: 'signatureReceived',
-                data: {
-                    topic,
-                    transactionHash: txHash,
-                    transactionId: id,
-                },
-            }));
-            // Let the SDK consumer know the transaction hash
-            this.emit('portal_signgatureReceived', txHash);
-        });
-    }
-    handleSigningRejected(data) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            // Notify the proxy server that the signing request was rejected
-            (_a = this.socket) === null || _a === void 0 ? void 0 : _a.send(JSON.stringify({
-                event: 'portal_signingRejected',
-                data: {
-                    topic: data.topic,
-                    transactionHash: '',
-                    transactionId: data.id,
-                },
-            }));
-        });
+        const { id, topic } = data;
+        // Let the server know the transaction hash
+        (_a = this.socket) === null || _a === void 0 ? void 0 : _a.send(JSON.stringify({
+            event: 'signatureReceived',
+            data: {
+                topic,
+                transactionHash: txHash,
+                transactionId: id,
+            },
+        }));
+        // Let the SDK consumer know the transaction hash
+        this.emit('portal_signatureReceived', txHash);
     }
     sendFinalMessageAndClose() {
         var _a;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@portal-hq/connect",
-  "version": "2.0.3",
+  "version": "2.0.6",
   "main": "lib/commonjs/index",
   "module": "lib/esm/index",
   "source": "src/index",
@@ -32,5 +32,5 @@
     "react": "*",
     "react-native": "*"
   },
-  "gitHead": "c333fe5280f16a5c5f70b7ae768f112baf7156ba"
+  "gitHead": "d933407992d91fd46d22b003233626dcb06dbf5b"
 }

package/src/index.ts

@@ -99,22 +99,22 @@ class PortalConnect {
    *
    * @param connectionString The URI to ask the Connect Proxy to create a websocket connection to
    */
-  public async connect(uri: string): Promise<void> {
+  public connect(uri: string) {
     if (this.socket) {
       this.socket.close()
     }
 
     const protocol = this.websocketServer.startsWith('localhost') ? 'ws' : 'wss'
-    // @ts-ignore
     this.socket = new WebSocket(
       `${protocol}://${this.websocketServer}/`,
       null,
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
       // @ts-ignore
       {
         headers: {
           Authorization: `Bearer ${this.apiKey}`,
         },
-      },
+      }
     )
     this.uri = uri
     this.bindToSocketEvents(this.socket, uri)
@@ -134,7 +134,7 @@ class PortalConnect {
    * @param chainId The number of the chainId to switch to
    */
   public async setChainId(chainId: number): Promise<void> {
-    this.provider.setChainId(chainId, this)
+    await this.provider.setChainId(chainId, this)
   }
 
   /**
@@ -210,7 +210,7 @@ class PortalConnect {
 
   public removeEventListener(
     event: string,
-    listenerToRemove?: EventHandler,
+    listenerToRemove?: EventHandler
   ): void {
     if (!this.events[event]) {
       return
@@ -220,7 +220,7 @@ class PortalConnect {
       this.events[event] = []
     } else {
       const filterEventHandlers = (
-        registeredEventHandler: RegisteredEventHandler,
+        registeredEventHandler: RegisteredEventHandler
       ) => {
         return registeredEventHandler.handler !== listenerToRemove
       }
@@ -235,7 +235,7 @@ class PortalConnect {
    * @returns session proposal with chains from gateway config added
    */
   public addChainsToProposal(
-    proposal: SessionProposalOrMetadata,
+    proposal: SessionProposalOrMetadata
   ): SessionProposalOrMetadata {
     if (!('params' in proposal) || !('requiredNamespaces' in proposal.params)) {
       throw new Error('Invalid proposal structure.')
@@ -292,7 +292,7 @@ class PortalConnect {
             chainId,
             uri,
           },
-        }),
+        })
       )
     }
 
@@ -306,11 +306,11 @@ class PortalConnect {
             uri: this.uri,
             chainId: (data as SwitchEthereumChainParameter).chainId,
           },
-        }),
+        })
       )
     })
 
-    socket.onerror = async (event: Event) => {
+    socket.onerror = (event: Event) => {
       let errorMessage = 'An unexpected error occurred.'
 
       if (event instanceof ErrorEvent) {
@@ -333,7 +333,9 @@ class PortalConnect {
      * @returns
      */
     socket.onmessage = async (messageEvent: WebSocketMessageEvent) => {
-      const message = JSON.parse(messageEvent.data) as WebsocketMessage
+      const message = JSON.parse(
+        messageEvent.data as string
+      ) as WebsocketMessage
 
       switch (message.event) {
         case 'close':
@@ -351,7 +353,7 @@ class PortalConnect {
           this.emit('disconnect', message.data)
 
           break
-        case 'session_request':
+        case 'session_request': {
           const request = message.data as SessionRequest
           const params = request.params as ProviderRequestPayload
           // Sign the transaction and get back a transaction hash
@@ -359,9 +361,10 @@ class PortalConnect {
             params.request.method,
             params.request.params,
             params.chainId,
-            request,
+            request
           )
           break
+        }
         case 'portal_dappSessionRequested':
         case 'portal_dappSessionRequestedV1':
           this.handleSessionRequest(message)
@@ -371,7 +374,7 @@ class PortalConnect {
           break
         default:
           console.log(
-            `Received unsupported event "${message.event}". Ignoring.`,
+            `Received unsupported event "${message.event}". Ignoring.`
           )
           break
       }
@@ -390,7 +393,7 @@ class PortalConnect {
     method: string,
     params: any,
     chainId: string,
-    request: SessionRequest,
+    request: SessionRequest
   ): Promise<void> {
     // Bind to potential signing rejection events
     this.provider.on('portal_signingRejected', this.handleSigningRejected)
@@ -405,7 +408,7 @@ class PortalConnect {
         ) {
           this.handleSignatureReceived(request, signature)
         }
-      },
+      }
     )
 
     // Pass the request along to the provider
@@ -414,7 +417,7 @@ class PortalConnect {
 
   private async handleSessionApproved(
     data: SessionProposalOrMetadata,
-    request: SessionRequest,
+    request: SessionRequest
   ): Promise<void> {
     const address = await this.address
 
@@ -429,13 +432,13 @@ class PortalConnect {
           id: request.id,
           params: data,
         },
-      } as WebsocketMessage),
+      } as WebsocketMessage)
     )
   }
 
   private async handleSessionRejected(
     data: SessionProposalOrMetadata,
-    request: SessionRequest,
+    request: SessionRequest
   ): Promise<void> {
     const address = await this.address
 
@@ -450,31 +453,28 @@ class PortalConnect {
           id: request.id,
           params: data,
         },
-      } as WebsocketMessage),
+      } as WebsocketMessage)
     )
   }
 
-  private async handleSessionRequest(message: WebsocketMessage): Promise<void> {
+  private handleSessionRequest(message: WebsocketMessage) {
     const request = message.data as SessionRequest
     // Bind to potential session approval/rejection events
     this.on('portal_dappSessionApproved', (data) =>
-      this.handleSessionApproved(data, request),
+      this.handleSessionApproved(data as SessionProposalOrMetadata, request)
     )
     this.on('portal_dappSessionRejected', (data) =>
-      this.handleSessionRejected(data, request),
+      this.handleSessionRejected(data as SessionProposalOrMetadata, request)
     )
 
     // Emit the session request event
     this.emit(
       'portal_dappSessionRequested',
-      request.params as SessionProposalOrMetadata,
+      request.params as SessionProposalOrMetadata
     )
   }
 
-  private async handleSignatureReceived(
-    data: SessionRequest,
-    txHash: any,
-  ): Promise<void> {
+  private handleSignatureReceived(data: SessionRequest, txHash: any) {
     const { id, topic } = data
 
     // Let the server know the transaction hash
@@ -486,14 +486,14 @@ class PortalConnect {
           transactionHash: txHash,
           transactionId: id,
         },
-      }),
+      })
     )
 
     // Let the SDK consumer know the transaction hash
-    this.emit('portal_signgatureReceived', txHash)
+    this.emit('portal_signatureReceived', txHash)
   }
 
-  private async handleSigningRejected(data: SessionRequest): Promise<void> {
+  private handleSigningRejected = (data: SessionRequest) => {
     // Notify the proxy server that the signing request was rejected
     this.socket?.send(
       JSON.stringify({
@@ -503,7 +503,7 @@ class PortalConnect {
           transactionHash: '',
           transactionId: data.id,
         },
-      } as WebsocketMessage),
+      } as WebsocketMessage)
     )
   }
 
@@ -517,7 +517,7 @@ class PortalConnect {
             id: '',
             topic: this.topic,
           },
-        } as WebsocketMessage),
+        } as WebsocketMessage)
       )
 
       this.topic = undefined