@phantom/browser-injected-sdk 1.0.2 → 1.0.4

package/dist/solana/index.mjs

@@ -1,11 +1,14 @@
 import "../chunk-WUKYLWAZ.mjs";
 import {
+  PHANTOM_NOT_DETECTED,
+  SOLANA_PROVIDER_NOT_FOUND,
   __privateAdd,
-  __privateMethod
-} from "../chunk-GV6AIHPN.mjs";
+  __privateMethod,
+  isInstalled
+} from "../chunk-RGKAWEP4.mjs";
 
 // src/solana/strategies/injected.ts
-var MAX_RETRIES = 4;
+var MAX_RETRIES = 6;
 var BASE_DELAY = 100;
 var _getProvider, getProvider_fn;
 var InjectedSolanaStrategy = class {
@@ -24,7 +27,11 @@ var InjectedSolanaStrategy = class {
         }
         retryCount++;
         if (retryCount >= MAX_RETRIES) {
-          reject();
+          if (!isInstalled()) {
+            reject(new Error(PHANTOM_NOT_DETECTED));
+          } else {
+            reject(new Error(SOLANA_PROVIDER_NOT_FOUND));
+          }
         } else {
           scheduleRetry(resolve, reject);
         }
@@ -44,7 +51,7 @@ var InjectedSolanaStrategy = class {
   async connect({ onlyIfTrusted }) {
     const provider = __privateMethod(this, _getProvider, getProvider_fn).call(this);
     if (!provider) {
-      throw new Error("Provider not found.");
+      throw new Error(SOLANA_PROVIDER_NOT_FOUND);
     }
     if (provider.isConnected && provider.publicKey) {
       return this.getAccount() ?? void 0;
@@ -59,7 +66,7 @@ var InjectedSolanaStrategy = class {
   async disconnect() {
     const provider = __privateMethod(this, _getProvider, getProvider_fn).call(this);
     if (!provider) {
-      throw new Error("Provider not found.");
+      throw new Error(SOLANA_PROVIDER_NOT_FOUND);
     }
     await provider.disconnect();
   }
@@ -73,7 +80,7 @@ var InjectedSolanaStrategy = class {
   async signMessage(message, display) {
     const provider = __privateMethod(this, _getProvider, getProvider_fn).call(this);
     if (!provider) {
-      throw new Error("Provider not found.");
+      throw new Error(SOLANA_PROVIDER_NOT_FOUND);
     }
     if (!provider.isConnected) {
       throw new Error("Provider is not connected.");
@@ -87,7 +94,7 @@ var InjectedSolanaStrategy = class {
   async signIn(signInData) {
     const provider = __privateMethod(this, _getProvider, getProvider_fn).call(this);
     if (!provider) {
-      throw new Error("Provider not found.");
+      throw new Error(SOLANA_PROVIDER_NOT_FOUND);
     }
     const result = await provider.signIn(signInData);
     return {
@@ -99,7 +106,7 @@ var InjectedSolanaStrategy = class {
   async signAndSendTransaction(transaction) {
     const provider = __privateMethod(this, _getProvider, getProvider_fn).call(this);
     if (!provider) {
-      throw new Error("Provider not found.");
+      throw new Error(SOLANA_PROVIDER_NOT_FOUND);
     }
     if (!provider.isConnected) {
       throw new Error("Provider is not connected.");
@@ -113,7 +120,7 @@ var InjectedSolanaStrategy = class {
   async signAndSendAllTransactions(transactions) {
     const provider = __privateMethod(this, _getProvider, getProvider_fn).call(this);
     if (!provider) {
-      throw new Error("Provider not found.");
+      throw new Error(SOLANA_PROVIDER_NOT_FOUND);
     }
     if (!provider.isConnected) {
       throw new Error("Provider is not connected.");
@@ -130,7 +137,7 @@ var InjectedSolanaStrategy = class {
   async signTransaction(transaction) {
     const provider = __privateMethod(this, _getProvider, getProvider_fn).call(this);
     if (!provider) {
-      throw new Error("Provider not found.");
+      throw new Error(SOLANA_PROVIDER_NOT_FOUND);
     }
     if (!provider.isConnected) {
       throw new Error("Provider is not connected.");
@@ -141,7 +148,7 @@ var InjectedSolanaStrategy = class {
   async signAllTransactions(transactions) {
     const provider = __privateMethod(this, _getProvider, getProvider_fn).call(this);
     if (!provider) {
-      throw new Error("Provider not found.");
+      throw new Error(SOLANA_PROVIDER_NOT_FOUND);
     }
     if (!provider.isConnected) {
       throw new Error("Provider is not connected.");
@@ -152,22 +159,18 @@ var InjectedSolanaStrategy = class {
 };
 _getProvider = new WeakSet();
 getProvider_fn = function() {
-  if (typeof window === "undefined") {
+  if (!isInstalled()) {
     return void 0;
   }
-  return window?.phantom?.solana;
+  return window.phantom.solana;
 };
 
 // src/solana/getProvider.ts
 async function getProvider(strategy = "injected" /* INJECTED */) {
   if (strategy === "injected") {
     const provider = new InjectedSolanaStrategy();
-    try {
-      await provider.load();
-      return provider;
-    } catch (error) {
-      throw new Error("Provider not found.");
-    }
+    await provider.load();
+    return provider;
   } else {
     throw new Error("Invalid provider type.");
   }
@@ -207,9 +210,6 @@ function triggerEvent(event, ...args) {
 // src/solana/connect.ts
 async function connect({ onlyIfTrusted = false } = {}) {
   const provider = await getProvider();
-  if (!provider) {
-    throw new Error("Provider not found.");
-  }
   if (provider.isConnected) {
     return provider.getAccount();
   }
@@ -238,25 +238,13 @@ async function connect({ onlyIfTrusted = false } = {}) {
 // src/solana/disconnect.ts
 async function disconnect() {
   const provider = await getProvider();
-  if (!provider) {
-    throw new Error("Provider not found.");
-  }
   await provider.disconnect();
   triggerEvent("disconnect");
 }
 
-// src/solana/getAccount.ts
-async function getAccount() {
-  const provider = await getProvider();
-  return provider.getAccount();
-}
-
 // src/solana/signAndSendTransaction.ts
 async function signAndSendTransaction(transaction) {
   const provider = await getProvider();
-  if (!provider) {
-    throw new Error("Provider not found.");
-  }
   if (!provider.isConnected) {
     await provider.connect({ onlyIfTrusted: false });
   }
@@ -266,9 +254,6 @@ async function signAndSendTransaction(transaction) {
 // src/solana/signAndSendAllTransactions.ts
 async function signAndSendAllTransactions(transactions) {
   const provider = await getProvider();
-  if (!provider) {
-    throw new Error("Provider not found.");
-  }
   if (!provider.isConnected) {
     await provider.connect({ onlyIfTrusted: false });
   }
@@ -278,9 +263,6 @@ async function signAndSendAllTransactions(transactions) {
 // src/solana/signTransaction.ts
 async function signTransaction(transaction) {
   const provider = await getProvider();
-  if (!provider) {
-    throw new Error("Provider not found.");
-  }
   if (!provider.isConnected) {
     await provider.connect({ onlyIfTrusted: false });
   }
@@ -290,9 +272,6 @@ async function signTransaction(transaction) {
 // src/solana/signAllTransactions.ts
 async function signAllTransactions(transactions) {
   const provider = await getProvider();
-  if (!provider) {
-    throw new Error("Provider not found.");
-  }
   if (!provider.isConnected) {
     await provider.connect({ onlyIfTrusted: false });
   }
@@ -302,9 +281,6 @@ async function signAllTransactions(transactions) {
 // src/solana/signMessage.ts
 async function signMessage(message, display) {
   const provider = await getProvider();
-  if (!provider) {
-    throw new Error("Provider not found.");
-  }
   if (!provider.isConnected) {
     await provider.connect({ onlyIfTrusted: false });
   }
@@ -320,7 +296,7 @@ var Solana = class {
   get publicKey() {
     return this._publicKey;
   }
-  get connected() {
+  get isConnected() {
     return this._publicKey !== null;
   }
   async connect(options) {
@@ -360,21 +336,6 @@ var Solana = class {
   async switchNetwork(_network) {
     return Promise.resolve();
   }
-  async getPublicKey() {
-    if (this._publicKey) {
-      return this._publicKey;
-    }
-    try {
-      const account = await getAccount();
-      this._publicKey = account || null;
-      return this._publicKey;
-    } catch {
-      return null;
-    }
-  }
-  isConnected() {
-    return this._publicKey !== null;
-  }
   on(event, listener) {
     addEventListener(event, listener);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@phantom/browser-injected-sdk",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "repository": {
     "type": "git",
     "url": "https://github.com/phantom/phantom-connect-sdk",
@@ -47,9 +47,9 @@
     "prettier": "prettier --write \"src/**/*.{ts,tsx}\""
   },
   "dependencies": {
-    "@phantom/chain-interfaces": "^1.0.2",
-    "@phantom/constants": "^1.0.2",
-    "@phantom/sdk-types": "^1.0.2"
+    "@phantom/chain-interfaces": "^1.0.4",
+    "@phantom/constants": "^1.0.4",
+    "@phantom/sdk-types": "^1.0.4"
   },
   "devDependencies": {
     "@jest/fake-timers": "^29.7.0",

package/dist/chunk-GV6AIHPN.mjs

@@ -1,18 +0,0 @@
-var __accessCheck = (obj, member, msg) => {
-  if (!member.has(obj))
-    throw TypeError("Cannot " + msg);
-};
-var __privateAdd = (obj, member, value) => {
-  if (member.has(obj))
-    throw TypeError("Cannot add the same private member more than once");
-  member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
-};
-var __privateMethod = (obj, member, method) => {
-  __accessCheck(obj, member, "access private method");
-  return method;
-};
-
-export {
-  __privateAdd,
-  __privateMethod
-};