@cartridge/controller 0.10.4 → 0.10.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cartridge/controller",
-  "version": "0.10.4",
+  "version": "0.10.6",
   "description": "Cartridge Controller",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -50,7 +50,7 @@
     "vite-plugin-node-polyfills": "^0.23.0",
     "vite-plugin-top-level-await": "^1.4.4",
     "vite-plugin-wasm": "^3.4.1",
-    "@cartridge/tsconfig": "0.10.4"
+    "@cartridge/tsconfig": "0.10.6"
   },
   "scripts": {
     "build:deps": "pnpm build",

package/src/node/provider.ts

@@ -1,6 +1,7 @@
-import { ec, stark, WalletAccount } from "starknet";
+import { ec, encode, stark, WalletAccount } from "starknet";
 import { SessionPolicies } from "@cartridge/presets";
 import { AddStarknetChainParameters } from "@starknet-io/types-js";
+import { signerToGuid } from "@cartridge/controller-wasm";
 
 import SessionAccount from "./account";
 import { KEYCHAIN_URL } from "../constants";
@@ -153,10 +154,16 @@ export default class SessionProvider extends BaseProvider {
     const sessionData = await this._backend.waitForCallback();
     if (sessionData) {
       const sessionRegistration = JSON.parse(atob(sessionData));
+      const formattedPk = encode.addHexPrefix(publicKey);
       // Ensure addresses are properly formatted
       sessionRegistration.address = sessionRegistration.address.toLowerCase();
       sessionRegistration.ownerGuid =
         sessionRegistration.ownerGuid.toLowerCase();
+      sessionRegistration.guardianKeyGuid = "0x0";
+      sessionRegistration.metadataHash = "0x0";
+      sessionRegistration.sessionKeyGuid = signerToGuid({
+        starknet: { privateKey: formattedPk },
+      });
       await this._backend.set("session", JSON.stringify(sessionRegistration));
       return this.probe();
     }

package/src/session/provider.ts

@@ -7,7 +7,7 @@ import {
 import { SessionPolicies } from "@cartridge/presets";
 import { AddStarknetChainParameters } from "@starknet-io/types-js";
 import { encode } from "starknet";
-import { KEYCHAIN_URL } from "../constants";
+import { API_URL, KEYCHAIN_URL } from "../constants";
 import { ParsedSessionPolicies } from "../policies";
 import BaseProvider from "../provider";
 import { toWasmPolicies } from "../utils";
@@ -43,7 +43,10 @@ export default class SessionProvider extends BaseProvider {
   protected _redirectUrl: string;
   protected _policies: ParsedSessionPolicies;
   protected _keychainUrl: string;
-  protected _apiUrl?: string;
+  protected _apiUrl: string;
+  protected _publicKey: string;
+  protected _sessionKeyGuid: string;
+  public reopenBrowser: boolean = true;
 
   constructor({
     rpc,
@@ -81,7 +84,37 @@ export default class SessionProvider extends BaseProvider {
     this._chainId = chainId;
     this._redirectUrl = redirectUrl;
     this._keychainUrl = keychainUrl || KEYCHAIN_URL;
-    this._apiUrl = apiUrl;
+    this._apiUrl = apiUrl ?? API_URL;
+
+    const account = this.tryRetrieveFromQueryOrStorage();
+    if (!account) {
+      const pk = stark.randomAddress();
+      this._publicKey = ec.starkCurve.getStarkKey(pk);
+
+      localStorage.setItem(
+        "sessionSigner",
+        JSON.stringify({
+          privKey: pk,
+          pubKey: this._publicKey,
+        }),
+      );
+      this._sessionKeyGuid = signerToGuid({
+        starknet: { privateKey: encode.addHexPrefix(pk) },
+      });
+    } else {
+      const pk = localStorage.getItem("sessionSigner");
+      if (!pk) throw new Error("failed to get sessionSigner");
+
+      const jsonPk: {
+        privKey: string;
+        pubKey: string;
+      } = JSON.parse(pk);
+
+      this._publicKey = jsonPk.pubKey;
+      this._sessionKeyGuid = signerToGuid({
+        starknet: { privateKey: encode.addHexPrefix(jsonPk.privKey) },
+      });
+    }
 
     if (typeof window !== "undefined") {
       (window as any).starknet_controller_session = this;
@@ -134,7 +167,7 @@ export default class SessionProvider extends BaseProvider {
       return this.account;
     }
 
-    this.account = await this.tryRetrieveFromQueryOrStorage();
+    this.account = this.tryRetrieveFromQueryOrStorage();
     return this.account;
   }
 
@@ -143,46 +176,43 @@ export default class SessionProvider extends BaseProvider {
       return this.account;
     }
 
-    this.account = await this.tryRetrieveFromQueryOrStorage();
+    this.account = this.tryRetrieveFromQueryOrStorage();
     if (this.account) {
       return this.account;
     }
 
-    const pk = stark.randomAddress();
-    const publicKey = ec.starkCurve.getStarkKey(pk);
-
-    localStorage.setItem(
-      "sessionSigner",
-      JSON.stringify({
-        privKey: pk,
-        pubKey: publicKey,
-      }),
-    );
-
     localStorage.setItem("sessionPolicies", JSON.stringify(this._policies));
-
-    const url = `${
-      this._keychainUrl
-    }/session?public_key=${publicKey}&redirect_uri=${
-      this._redirectUrl
-    }&redirect_query_name=startapp&policies=${JSON.stringify(
-      this._policies,
-    )}&rpc_url=${this._rpcUrl}`;
-
     localStorage.setItem("lastUsedConnector", this.id);
-    const openedWindow = window.open(url, "_blank");
 
     try {
-      const formattedPk = encode.addHexPrefix(pk);
-
-      const sessionKeyGuid = signerToGuid({
-        starknet: { privateKey: formattedPk },
-      });
+      if (this.reopenBrowser) {
+        const pk = stark.randomAddress();
+        this._publicKey = ec.starkCurve.getStarkKey(pk);
+
+        localStorage.setItem(
+          "sessionSigner",
+          JSON.stringify({
+            privKey: pk,
+            pubKey: this._publicKey,
+          }),
+        );
+        this._sessionKeyGuid = signerToGuid({
+          starknet: { privateKey: encode.addHexPrefix(pk) },
+        });
+        const url = `${
+          this._keychainUrl
+        }/session?public_key=${this._publicKey}&redirect_uri=${
+          this._redirectUrl
+        }&redirect_query_name=startapp&policies=${JSON.stringify(
+          this._policies,
+        )}&rpc_url=${this._rpcUrl}`;
+
+        window.open(url, "_blank");
+      }
 
-      const cartridgeApiUrl = this._apiUrl ?? "https://api.cartridge.gg";
       const sessionResult = await subscribeCreateSession(
-        sessionKeyGuid,
-        cartridgeApiUrl,
+        this._sessionKeyGuid,
+        this._apiUrl,
       );
 
       // auth is: [shortstring!('authorization-by-registered'), owner_guid]
@@ -194,17 +224,16 @@ export default class SessionProvider extends BaseProvider {
         expiresAt: sessionResult.expiresAt,
         guardianKeyGuid: "0x0",
         metadataHash: "0x0",
-        sessionKeyGuid,
+        sessionKeyGuid: this._sessionKeyGuid,
       };
       localStorage.setItem("session", JSON.stringify(session));
 
       this.tryRetrieveFromQueryOrStorage();
 
-      openedWindow?.close();
-
       return this.account;
     } catch (e) {
       console.log(e);
+      throw e;
     }
   }
 
@@ -222,10 +251,21 @@ export default class SessionProvider extends BaseProvider {
     localStorage.removeItem("sessionPolicies");
     this.account = undefined;
     this._username = undefined;
-    return Promise.resolve();
+    const openedWindow = window.open(`${this._keychainUrl}/disconnect`);
+    if (openedWindow === null) return Promise.resolve();
+
+    const { resolve, promise } = Promise.withResolvers<void>();
+    function onWindowClose() {
+      if (openedWindow?.closed) {
+        resolve();
+        clearInterval(checkInterval);
+      }
+    }
+    const checkInterval = setInterval(onWindowClose, 500);
+    return promise;
   }
 
-  async tryRetrieveFromQueryOrStorage() {
+  tryRetrieveFromQueryOrStorage() {
     if (this.account) {
       return this.account;
     }