Merge pull request #18 from wharfkit/making-useable-in-ssr

Making the plugin usable in SSR
wharfkit · Sep 17, 2024 · 172c38e · 172c38e
2 parents ef28220 + 89fa050
commit 172c38e
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 30 deletions.
diff --git a/package.json b/package.json
@@ -4,9 +4,9 @@
     "version": "1.3.1",
     "homepage": "https://github.com/wharfkit/wallet-plugin-wombat",
     "license": "BSD-3-Clause",
-    "main": "lib/wallet-plugin-wombat.js",
-    "module": "lib/wallet-plugin-wombat.m.js",
-    "types": "lib/wallet-plugin-wombat.d.ts",
+    "main": "lib/cjs/index.js",
+    "module": "lib/esm/index.js",
+    "types": "lib/types/index.d.ts",
     "sideEffects": false,
     "files": [
         "lib/*",

diff --git a/rollup.config.mjs b/rollup.config.mjs
@@ -30,10 +30,11 @@ export default [
         input: 'src/index.ts',
         output: {
             banner,
-            file: pkg.main,
+            dir: pkg.main.split('/').slice(0, -1).join('/'),
             format: 'cjs',
             sourcemap: true,
             exports: 'named',
+            inlineDynamicImports: true,
         },
         plugins: [
             typescript({target: 'es6'}),
@@ -50,7 +51,7 @@ export default [
         input: 'src/index.ts',
         output: {
             banner,
-            file: pkg.module,
+            dir: pkg.module.split('/').slice(0, -1).join('/'),
             format: 'esm',
             sourcemap: true,
         },
@@ -67,7 +68,7 @@ export default [
     },
     {
         input: 'src/index.ts',
-        output: {banner, file: pkg.types, format: 'esm'},
+        output: {banner, dir: pkg.types, format: 'esm'},
         plugins: [dts()],
     },
 ]
diff --git a/src/index.ts b/src/index.ts
@@ -10,7 +10,6 @@ import {
     WalletPluginMetadata,
     WalletPluginSignResponse,
 } from '@wharfkit/session'
-import {handleLogin, handleLogout, handleSignatureRequest} from '@wharfkit/protocol-scatter'
 
 export class WalletPluginWombat extends AbstractWalletPlugin implements WalletPlugin {
     id = 'wombat'
@@ -42,22 +41,26 @@ export class WalletPluginWombat extends AbstractWalletPlugin implements WalletPl
         homepage: 'https://www.wombat.app/',
         download: 'https://www.wombat.app/the-app',
     })
+
+    private async loadScatterProtocol() {
+        if (typeof window !== 'undefined') {
+            return import('@wharfkit/protocol-scatter')
+        }
+        return null
+    }
+
     /**
      * Performs the wallet logic required to login and return the chain and permission level to use.
      *
      * @param context LoginContext
      * @returns Promise<WalletPluginLoginResponse>
      */
-    login(context: LoginContext): Promise<WalletPluginLoginResponse> {
-        return new Promise((resolve, reject) => {
-            handleLogin(context)
-                .then((response) => {
-                    resolve(response)
-                })
-                .catch((error) => {
-                    reject(error)
-                })
-        })
+    async login(context: LoginContext): Promise<WalletPluginLoginResponse> {
+        const scatterProtocol = await this.loadScatterProtocol()
+        if (!scatterProtocol) {
+            throw new Error('Scatter protocol is not available in this environment')
+        }
+        return scatterProtocol.handleLogin(context)
     }
 
     /**
@@ -66,17 +69,12 @@ export class WalletPluginWombat extends AbstractWalletPlugin implements WalletPl
      * @param context: LogoutContext
      * @returns Promise<void>
      */
-
-    logout(context: LogoutContext): Promise<void> {
-        return new Promise((resolve, reject) => {
-            handleLogout(context)
-                .then(() => {
-                    resolve()
-                })
-                .catch((error) => {
-                    reject(error)
-                })
-        })
+    async logout(context: LogoutContext): Promise<void> {
+        const scatterProtocol = await this.loadScatterProtocol()
+        if (!scatterProtocol) {
+            throw new Error('Scatter protocol is not available in this environment')
+        }
+        return scatterProtocol.handleLogout(context)
     }
 
     /**
@@ -86,10 +84,14 @@ export class WalletPluginWombat extends AbstractWalletPlugin implements WalletPl
      * @param resolved ResolvedSigningRequest
      * @returns Promise<Signature>
      */
-    sign(
+    async sign(
         resolved: ResolvedSigningRequest,
         context: TransactContext
     ): Promise<WalletPluginSignResponse> {
-        return handleSignatureRequest(resolved, context)
+        const scatterProtocol = await this.loadScatterProtocol()
+        if (!scatterProtocol) {
+            throw new Error('Scatter protocol is not available in this environment')
+        }
+        return scatterProtocol.handleSignatureRequest(resolved, context)
     }
 }