@column-org/wallet-sdk 1.0.0 → 1.1.1

package/dist/index.mjs

@@ -33,8 +33,210 @@ var ColumnCrypto = class {
       sharedSecret
     );
     if (!decrypted) return null;
-    const jsonString = Buffer.from(decrypted).toString("utf8");
-    return JSON.parse(jsonString);
+    try {
+      const jsonString = Buffer.from(decrypted).toString("utf8");
+      return JSON.parse(jsonString);
+    } catch (e) {
+      console.error("ColumnCrypto: Failed to parse decrypted payload", e);
+      return null;
+    }
+  }
+};
+
+// src/ColumnWalletSDK.ts
+import * as nacl2 from "tweetnacl";
+var ColumnWalletSDK = class {
+  config;
+  sessionKeyPair;
+  walletEncryptionPublicKey = null;
+  constructor(config) {
+    this.config = config;
+    if (config.sessionSecretKey) {
+      try {
+        const secretKey = bs582.decode(config.sessionSecretKey);
+        this.sessionKeyPair = nacl2.box.keyPair.fromSecretKey(secretKey);
+      } catch (e) {
+        console.warn("ColumnWalletSDK: Invalid sessionSecretKey provided, generating new one.");
+        this.sessionKeyPair = ColumnCrypto.generateKeyPair();
+      }
+    } else {
+      this.sessionKeyPair = ColumnCrypto.generateKeyPair();
+    }
+  }
+  /**
+   * Returns the current session's secret key (bs58) so it can be persisted
+   */
+  getSessionSecretKey() {
+    return bs582.encode(this.sessionKeyPair.secretKey);
+  }
+  /**
+   * Internal: Used by Web/Native adapters to get the config
+   */
+  getConfig() {
+    return this.config;
+  }
+  setWalletEncryptionPublicKey(key) {
+    this.walletEncryptionPublicKey = key;
+  }
+  /**
+   * Alias for setWalletEncryptionPublicKey to match docs
+   */
+  importWalletKey(key) {
+    this.setWalletEncryptionPublicKey(key);
+  }
+  /**
+   * Step 1: Connect to the wallet
+   */
+  connect() {
+    const params = new URLSearchParams({
+      request: "connect",
+      app_url: this.config.appUrl || "",
+      app_name: this.config.appName || "",
+      dapp_encryption_public_key: bs582.encode(this.sessionKeyPair.publicKey),
+      redirect_link: this.config.redirectLink || ""
+    });
+    if (this.config.appIcon) {
+      params.append("app_icon", this.config.appIcon);
+    }
+    if (this.config.network) {
+      params.append("network", this.config.network);
+    }
+    if (this.config.appDescription) {
+      params.append("app_description", this.config.appDescription);
+    }
+    const scheme = this.config.walletScheme || "column";
+    const base = scheme.includes("://") ? scheme : `${scheme}://`;
+    return `${base}${base.endsWith("/") ? "" : "/"}?${params.toString()}`;
+  }
+  /**
+   * Step 2: Sign and Submit a transaction
+   */
+  signAndSubmitTransaction(transaction) {
+    if (!this.walletEncryptionPublicKey) {
+      throw new Error("Wallet not connected. Call connect() first and store the wallet_encryption_public_key.");
+    }
+    const payload = {
+      transaction
+    };
+    const encrypted = ColumnCrypto.encryptPayload(
+      payload,
+      this.walletEncryptionPublicKey,
+      this.sessionKeyPair.secretKey
+    );
+    const params = new URLSearchParams({
+      request: "signAndSubmitTransaction",
+      app_url: this.config.appUrl || "",
+      app_name: this.config.appName || "",
+      dapp_encryption_public_key: bs582.encode(this.sessionKeyPair.publicKey),
+      data: encrypted.data,
+      nonce: encrypted.nonce,
+      redirect_link: this.config.redirectLink || ""
+    });
+    if (this.config.appIcon) {
+      params.append("app_icon", this.config.appIcon);
+    }
+    if (this.config.network) {
+      params.append("network", this.config.network);
+    }
+    if (this.config.appDescription) {
+      params.append("app_description", this.config.appDescription);
+    }
+    const scheme = this.config.walletScheme || "column";
+    const base = scheme.includes("://") ? scheme : `${scheme}://`;
+    return `${base}${base.endsWith("/") ? "" : "/"}?${params.toString()}`;
+  }
+  /**
+   * Step 3: Sign a simple message
+   */
+  signMessage(message) {
+    if (!this.walletEncryptionPublicKey) {
+      throw new Error("Wallet not connected.");
+    }
+    const payload = {
+      message
+    };
+    const encrypted = ColumnCrypto.encryptPayload(
+      payload,
+      this.walletEncryptionPublicKey,
+      this.sessionKeyPair.secretKey
+    );
+    const params = new URLSearchParams({
+      request: "signMessage",
+      app_url: this.config.appUrl || "",
+      app_name: this.config.appName || "",
+      dapp_encryption_public_key: bs582.encode(this.sessionKeyPair.publicKey),
+      data: encrypted.data,
+      nonce: encrypted.nonce,
+      redirect_link: this.config.redirectLink || ""
+    });
+    if (this.config.appIcon) {
+      params.append("app_icon", this.config.appIcon);
+    }
+    if (this.config.network) {
+      params.append("network", this.config.network);
+    }
+    if (this.config.appDescription) {
+      params.append("app_description", this.config.appDescription);
+    }
+    const scheme = this.config.walletScheme || "column";
+    const base = scheme.includes("://") ? scheme : `${scheme}://`;
+    return `${base}${base.endsWith("/") ? "" : "/"}?${params.toString()}`;
+  }
+  /**
+   * Utility: Parse the response from Column
+   */
+  handleResponse(url) {
+    let params;
+    try {
+      const urlObj = new URL(url.includes("://") ? url : `http://localhost/${url}`);
+      const hashStr = urlObj.hash.substring(1);
+      const searchStr = urlObj.search.substring(1);
+      if (hashStr) {
+        params = new URLSearchParams(hashStr);
+      } else {
+        params = new URLSearchParams(searchStr);
+      }
+    } catch (e) {
+      const hashMatch = url.match(/#(.*)$/);
+      const queryMatch = url.match(/\?(.*)$/);
+      params = new URLSearchParams(hashMatch ? hashMatch[1] : queryMatch ? queryMatch[1] : url);
+    }
+    const data = params.get("data");
+    const nonce = params.get("nonce");
+    const error = params.get("error");
+    if (error) {
+      throw new Error(`Column Wallet Error: ${error}`);
+    }
+    if (data && nonce && this.walletEncryptionPublicKey) {
+      const decrypted = ColumnCrypto.decryptPayload(
+        data,
+        nonce,
+        this.walletEncryptionPublicKey,
+        this.sessionKeyPair.secretKey
+      );
+      if (!decrypted) {
+        throw new Error("Column Wallet Error: Decryption failed. The response may have been tampered with or keys do not match.");
+      }
+      return {
+        ...decrypted,
+        network: params.get("network")
+        // Always include network from URL
+      };
+    }
+    const response = {};
+    params.forEach((value, key) => {
+      response[key] = value;
+    });
+    if (response.column_encryption_public_key) {
+      this.walletEncryptionPublicKey = response.column_encryption_public_key;
+    }
+    return response;
+  }
+  /**
+   * Sets the wallet's public key if known from a previous session
+   */
+  setWalletPublicKey(publicKeyB58) {
+    this.walletEncryptionPublicKey = publicKeyB58;
   }
 };
 
@@ -173,7 +375,7 @@ var ColumnConnectModal = class {
     document.head.appendChild(styleTag);
   }
   open() {
-    if (typeof document === "undefined") return;
+    if (typeof document === "undefined" || this.overlay) return;
     this.overlay = document.createElement("div");
     this.overlay.className = "column-modal-overlay";
     this.overlay.innerHTML = `
@@ -220,217 +422,30 @@ var ColumnConnectModal = class {
   }
 };
 
-// src/ColumnWalletSDK.ts
-var ColumnWalletSDK = class {
-  config;
-  sessionKeyPair;
-  walletEncryptionPublicKey = null;
+// src/ui/ColumnWalletWeb.ts
+var ColumnWalletWeb = class _ColumnWalletWeb extends ColumnWalletSDK {
   modal;
   constructor(config) {
-    this.config = this.autoDetectMetadata(config);
-    this.sessionKeyPair = ColumnCrypto.generateKeyPair();
+    const detectedConfig = _ColumnWalletWeb.autoDetectMetadata(config);
+    super(detectedConfig);
     this.modal = new ColumnConnectModal(() => {
       window.location.href = this.connect();
     });
   }
-  autoDetectMetadata(config) {
+  static autoDetectMetadata(config) {
     if (typeof document === "undefined") return config;
     const detectedConfig = { ...config };
-    if (!detectedConfig.appUrl) {
-      detectedConfig.appUrl = window.location.origin;
-    }
-    if (!detectedConfig.appName) {
-      detectedConfig.appName = document.title || "Unknown dApp";
-    }
-    if (!detectedConfig.appIcon) {
-      const iconLink = document.querySelector('link[rel~="icon"]') || document.querySelector('link[rel="apple-touch-icon"]');
-      if (iconLink) {
-        try {
-          detectedConfig.appIcon = new URL(iconLink.getAttribute("href") || "", window.location.origin).href;
-        } catch (e) {
-          detectedConfig.appIcon = iconLink.href;
-        }
-      }
-    }
-    if (!detectedConfig.appDescription) {
-      const metaDescription = document.querySelector('meta[name="description"]') || document.querySelector('meta[property="og:description"]');
-      if (metaDescription?.content) {
-        detectedConfig.appDescription = metaDescription.content;
-      }
-    }
-    if (!detectedConfig.redirectLink) {
-      detectedConfig.redirectLink = window.location.href.split("?")[0];
-    }
+    if (!detectedConfig.appUrl) detectedConfig.appUrl = window.location.origin;
+    if (!detectedConfig.appName) detectedConfig.appName = document.title || "Unknown dApp";
+    if (!detectedConfig.redirectLink) detectedConfig.redirectLink = window.location.href.split("?")[0];
     return detectedConfig;
   }
-  /**
-   * Opens the premium Column selection modal
-   */
   openConnectModal() {
     this.modal.open();
   }
-  setWalletEncryptionPublicKey(key) {
-    this.walletEncryptionPublicKey = key;
-  }
-  /**
-   * Alias for setWalletEncryptionPublicKey to match docs
-   */
-  importWalletKey(key) {
-    this.setWalletEncryptionPublicKey(key);
-  }
-  /**
-   * Step 1: Connect to the wallet
-   */
-  connect() {
-    const params = new URLSearchParams({
-      request: "connect",
-      app_url: this.config.appUrl || "",
-      app_name: this.config.appName || "",
-      dapp_encryption_public_key: bs582.encode(this.sessionKeyPair.publicKey),
-      redirect_link: this.config.redirectLink || ""
-    });
-    if (this.config.appIcon) {
-      params.append("app_icon", this.config.appIcon);
-    }
-    if (this.config.network) {
-      params.append("network", this.config.network);
-    }
-    if (this.config.appDescription) {
-      params.append("app_description", this.config.appDescription);
-    }
-    const scheme = this.config.walletScheme || "column";
-    const base = scheme.includes("://") ? scheme : `${scheme}://`;
-    return `${base}${base.endsWith("/") ? "" : "/"}?${params.toString()}`;
-  }
-  /**
-   * Step 2: Sign and Submit a transaction
-   */
-  signAndSubmitTransaction(transaction) {
-    if (!this.walletEncryptionPublicKey) {
-      throw new Error("Wallet not connected. Call connect() first and store the wallet_encryption_public_key.");
-    }
-    const payload = {
-      transaction
-    };
-    const encrypted = ColumnCrypto.encryptPayload(
-      payload,
-      this.walletEncryptionPublicKey,
-      this.sessionKeyPair.secretKey
-    );
-    const params = new URLSearchParams({
-      request: "signAndSubmitTransaction",
-      app_url: this.config.appUrl || "",
-      app_name: this.config.appName || "",
-      dapp_encryption_public_key: bs582.encode(this.sessionKeyPair.publicKey),
-      data: encrypted.data,
-      nonce: encrypted.nonce,
-      redirect_link: this.config.redirectLink || ""
-    });
-    if (this.config.appIcon) {
-      params.append("app_icon", this.config.appIcon);
-    }
-    if (this.config.network) {
-      params.append("network", this.config.network);
-    }
-    if (this.config.appDescription) {
-      params.append("app_description", this.config.appDescription);
-    }
-    const scheme = this.config.walletScheme || "column";
-    const base = scheme.includes("://") ? scheme : `${scheme}://`;
-    return `${base}${base.endsWith("/") ? "" : "/"}?${params.toString()}`;
-  }
-  /**
-   * Step 3: Sign a simple message
-   */
-  signMessage(message) {
-    if (!this.walletEncryptionPublicKey) {
-      throw new Error("Wallet not connected.");
-    }
-    const payload = {
-      message
-    };
-    const encrypted = ColumnCrypto.encryptPayload(
-      payload,
-      this.walletEncryptionPublicKey,
-      this.sessionKeyPair.secretKey
-    );
-    const params = new URLSearchParams({
-      request: "signMessage",
-      app_url: this.config.appUrl || "",
-      app_name: this.config.appName || "",
-      dapp_encryption_public_key: bs582.encode(this.sessionKeyPair.publicKey),
-      data: encrypted.data,
-      nonce: encrypted.nonce,
-      redirect_link: this.config.redirectLink || ""
-    });
-    if (this.config.appIcon) {
-      params.append("app_icon", this.config.appIcon);
-    }
-    if (this.config.network) {
-      params.append("network", this.config.network);
-    }
-    if (this.config.appDescription) {
-      params.append("app_description", this.config.appDescription);
-    }
-    const scheme = this.config.walletScheme || "column";
-    const base = scheme.includes("://") ? scheme : `${scheme}://`;
-    return `${base}${base.endsWith("/") ? "" : "/"}?${params.toString()}`;
-  }
-  /**
-   * Utility: Parse the response from Column
-   */
-  handleResponse(url) {
-    let params;
-    try {
-      const urlObj = new URL(url.includes("://") ? url : `http://localhost/${url}`);
-      const hashStr = urlObj.hash.substring(1);
-      const searchStr = urlObj.search.substring(1);
-      if (hashStr) {
-        params = new URLSearchParams(hashStr);
-      } else {
-        params = new URLSearchParams(searchStr);
-      }
-    } catch (e) {
-      const hashMatch = url.match(/#(.*)$/);
-      const queryMatch = url.match(/\?(.*)$/);
-      params = new URLSearchParams(hashMatch ? hashMatch[1] : queryMatch ? queryMatch[1] : url);
-    }
-    const data = params.get("data");
-    const nonce = params.get("nonce");
-    const error = params.get("error");
-    if (error) {
-      throw new Error(`Column Wallet Error: ${error}`);
-    }
-    if (data && nonce && this.walletEncryptionPublicKey) {
-      const decrypted = ColumnCrypto.decryptPayload(
-        data,
-        nonce,
-        this.walletEncryptionPublicKey,
-        this.sessionKeyPair.secretKey
-      );
-      return {
-        ...decrypted,
-        network: params.get("network")
-        // Always include network from URL
-      };
-    }
-    const response = {};
-    params.forEach((value, key) => {
-      response[key] = value;
-    });
-    if (response.column_encryption_public_key) {
-      this.walletEncryptionPublicKey = response.column_encryption_public_key;
-    }
-    return response;
-  }
-  /**
-   * Sets the wallet's public key if known from a previous session
-   */
-  setWalletPublicKey(publicKeyB58) {
-    this.walletEncryptionPublicKey = publicKeyB58;
-  }
 };
 export {
   ColumnCrypto,
-  ColumnWalletSDK
+  ColumnWalletSDK,
+  ColumnWalletWeb
 };

package/package.json

@@ -1,12 +1,14 @@
 {
     "name": "@column-org/wallet-sdk",
-    "version": "1.0.0",
+    "version": "1.1.1",
     "description": "Column Wallet Mobile Deep-Link SDK for Movement/Aptos ecosystem",
     "main": "dist/index.js",
     "module": "dist/index.mjs",
+    "react-native": "src/index.native.ts",
     "types": "dist/index.d.ts",
     "files": [
-        "dist"
+        "dist",
+        "src"
     ],
     "publishConfig": {
         "access": "public"
@@ -30,6 +32,7 @@
     "dependencies": {
         "bs58": "^6.0.0",
         "buffer": "^6.0.3",
+        "react-native-get-random-values": "^1.11.0",
         "tweetnacl": "^1.0.3"
     },
     "devDependencies": {

package/src/ColumnShared.ts

@@ -0,0 +1,69 @@
+import * as nacl from 'tweetnacl'
+import bs58 from 'bs58'
+import { Buffer } from 'buffer'
+
+export interface ColumnSDKConfig {
+    appUrl?: string
+    appName?: string
+    redirectLink?: string
+    appIcon?: string
+    appDescription?: string
+    walletScheme?: string
+    network?: string
+    sessionSecretKey?: string
+}
+
+export class ColumnCrypto {
+    static generateKeyPair(): nacl.BoxKeyPair {
+        return nacl.box.keyPair()
+    }
+
+    static encryptPayload(
+        payload: any,
+        targetPublicKeyB58: string,
+        mySecretKey: Uint8Array
+    ): { data: string; nonce: string } {
+        const sharedSecret = nacl.box.before(
+            bs58.decode(targetPublicKeyB58),
+            mySecretKey
+        )
+
+        const nonce = nacl.randomBytes(nacl.box.nonceLength)
+        const message = Buffer.from(JSON.stringify(payload), 'utf8')
+
+        const encrypted = nacl.box.after(message, nonce, sharedSecret)
+
+        return {
+            data: bs58.encode(encrypted),
+            nonce: bs58.encode(nonce)
+        }
+    }
+
+    static decryptPayload(
+        encryptedDataB58: string,
+        nonceB58: string,
+        sourcePublicKeyB58: string,
+        mySecretKey: Uint8Array
+    ): any {
+        const sharedSecret = nacl.box.before(
+            bs58.decode(sourcePublicKeyB58),
+            mySecretKey
+        )
+
+        const decrypted = nacl.box.open.after(
+            bs58.decode(encryptedDataB58),
+            bs58.decode(nonceB58),
+            sharedSecret
+        )
+
+        if (!decrypted) return null
+
+        try {
+            const jsonString = Buffer.from(decrypted).toString('utf8')
+            return JSON.parse(jsonString)
+        } catch (e) {
+            console.error('ColumnCrypto: Failed to parse decrypted payload', e)
+            return null
+        }
+    }
+}