@cartridge/connector 0.13.4 → 0.13.6

package/.turbo/turbo-build$colon$deps.log

@@ -1,5 +1,5 @@
 
-> @cartridge/connector@0.13.4 build:deps /home/runner/work/controller/controller/packages/connector
+> @cartridge/connector@0.13.6 build:deps /home/runner/work/controller/controller/packages/connector
 > tsup --dts-resolve
 
 CLI Building entry: src/controller.ts, src/index.ts, src/session.ts
@@ -9,15 +9,15 @@
 CLI Target: esnext
 CLI Cleaning output folder
 ESM Build start
-ESM dist/controller.js     1.97 KB
-ESM dist/index.js          2.75 KB
-ESM dist/session.js        848.00 B
-ESM dist/controller.js.map 3.54 KB
-ESM dist/index.js.map      5.01 KB
-ESM dist/session.js.map    1.51 KB
-ESM ⚡️ Build success in 65ms
+ESM dist/index.js          2.83 KB
+ESM dist/session.js        916.00 B
+ESM dist/controller.js     1.98 KB
+ESM dist/index.js.map      5.84 KB
+ESM dist/session.js.map    1.73 KB
+ESM dist/controller.js.map 4.15 KB
+ESM ⚡️ Build success in 44ms
 DTS Build start
-DTS ⚡️ Build success in 6146ms
-DTS dist/index.d.ts      354.00 B
-DTS dist/controller.d.ts 1013.00 B
+DTS ⚡️ Build success in 6912ms
+DTS dist/index.d.ts      290.00 B
+DTS dist/controller.d.ts 947.00 B
 DTS dist/session.d.ts    476.00 B

package/dist/controller.d.ts

@@ -1,7 +1,6 @@
-import * as node_modules__starknet_react_core_dist_index_KYmfBIOq from 'node_modules/@starknet-react/core/dist/index-KYmfBIOq';
-import ControllerProvider, { ControllerOptions, AuthOptions } from '@cartridge/controller';
+import * as _starknet_io_get_starknet_wallet_standard_features from '@starknet-io/get-starknet-wallet-standard/features';
+import ControllerProvider, { ControllerOptions, ConnectOptions } from '@cartridge/controller';
 import { InjectedConnector, Connector } from '@starknet-react/core';
-import { WalletWithStarknetFeatures } from '@starknet-io/get-starknet-wallet-standard/features';
 
 declare class ControllerConnector extends InjectedConnector {
     controller: ControllerProvider;
@@ -12,10 +11,12 @@ declare class ControllerConnector extends InjectedConnector {
     delegateAccount(): Promise<string | null>;
     connect(args?: {
         chainIdHint?: bigint;
-        signupOptions?: AuthOptions;
-    }): Promise<node_modules__starknet_react_core_dist_index_KYmfBIOq.c>;
+    } & ConnectOptions): Promise<{
+        account: string;
+        chainId?: bigint;
+    }>;
     static fromConnectors(connectors: Connector[]): ControllerConnector;
-    asWalletStandard(): WalletWithStarknetFeatures;
+    asWalletStandard(): _starknet_io_get_starknet_wallet_standard_features.WalletWithStarknetFeatures;
 }
 
 export { ControllerConnector as default };

package/dist/controller.js

@@ -1,7 +1,6 @@
 // src/controller.ts
 import ControllerProvider from "@cartridge/controller";
 import { InjectedConnector } from "@starknet-react/core";
-import { StarknetInjectedWallet } from "@starknet-io/get-starknet-wallet-standard";
 var ControllerConnector = class extends InjectedConnector {
   controller;
   constructor(options = {}) {
@@ -18,7 +17,11 @@ var ControllerConnector = class extends InjectedConnector {
     this.controller = controller;
   }
   async disconnect() {
-    this.controller.disconnect();
+    await this.controller.disconnect();
+    try {
+      await super.disconnect();
+    } catch {
+    }
   }
   username() {
     return this.controller.username();
@@ -30,11 +33,17 @@ var ControllerConnector = class extends InjectedConnector {
     return await this.controller.delegateAccount();
   }
   async connect(args) {
-    const account = await this.controller.connect(args?.signupOptions);
+    const { chainIdHint, ...connectOptions } = args ?? {};
+    const controllerArgs = args && Object.keys(connectOptions).length > 0 ? connectOptions : void 0;
+    const account = await this.controller.connect(controllerArgs);
     if (!account) {
       throw new Error("Failed to connect controller");
     }
-    return super.connect({ chainIdHint: args?.chainIdHint });
+    if (typeof window !== "undefined") {
+      window.starknet_controller = this.controller;
+    }
+    const data = await super.connect({ chainIdHint });
+    return { ...data, account: account.address };
   }
   static fromConnectors(connectors) {
     const connector = connectors.find((c) => c.id === "controller");
@@ -44,12 +53,7 @@ var ControllerConnector = class extends InjectedConnector {
     return connector;
   }
   asWalletStandard() {
-    if (typeof window !== "undefined") {
-      console.warn(
-        `Casting Controller to WalletWithStarknetFeatures is an experimental feature and may contain bugs. Please report any issues at https://github.com/cartridge-gg/controller/issues`
-      );
-    }
-    return new StarknetInjectedWallet(this.controller);
+    return this.controller.asWalletStandard();
   }
 };
 export {

package/dist/controller.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/controller.ts"],"sourcesContent":["import ControllerProvider, {\n  AuthOptions,\n  ControllerOptions,\n} from \"@cartridge/controller\";\nimport { Connector, InjectedConnector } from \"@starknet-react/core\";\n\nimport { StarknetInjectedWallet } from \"@starknet-io/get-starknet-wallet-standard\";\nimport type { WalletWithStarknetFeatures } from \"@starknet-io/get-starknet-wallet-standard/features\";\n\nexport default class ControllerConnector extends InjectedConnector {\n  public controller: ControllerProvider;\n\n  constructor(options: ControllerOptions = {}) {\n    let controller: ControllerProvider;\n\n    if (typeof window !== \"undefined\" && (window as any).starknet_controller) {\n      console.warn(\n        \"ControllerConnector was instantiated multiple times. \" +\n          \"Reusing existing controller to prevent errors. \" +\n          \"To fix, create the connector at the module level instead of inside a React component.\",\n      );\n      controller = (window as any).starknet_controller;\n    } else {\n      controller = new ControllerProvider(options);\n    }\n\n    super({ options: { id: controller.id, name: controller.name } });\n    this.controller = controller;\n  }\n\n  async disconnect() {\n    this.controller.disconnect();\n  }\n\n  username() {\n    return this.controller.username();\n  }\n\n  isReady(): boolean {\n    return this.controller.isReady();\n  }\n\n  async delegateAccount() {\n    return await this.controller.delegateAccount();\n  }\n\n  async connect(args?: { chainIdHint?: bigint; signupOptions?: AuthOptions }) {\n    const account = await this.controller.connect(args?.signupOptions);\n    if (!account) {\n      throw new Error(\"Failed to connect controller\");\n    }\n    return super.connect({ chainIdHint: args?.chainIdHint });\n  }\n\n  static fromConnectors(connectors: Connector[]): ControllerConnector {\n    const connector = connectors.find((c) => c.id === \"controller\");\n    if (!connector) {\n      throw new Error(\"Controller connector not found\");\n    }\n    return connector as ControllerConnector;\n  }\n\n  asWalletStandard(): WalletWithStarknetFeatures {\n    if (typeof window !== \"undefined\") {\n      console.warn(\n        `Casting Controller to WalletWithStarknetFeatures is an experimental feature and may contain bugs. ` +\n          `Please report any issues at https://github.com/cartridge-gg/controller/issues`,\n      );\n    }\n\n    return new StarknetInjectedWallet(this.controller);\n  }\n}\n"],"mappings":";AAAA,OAAO,wBAGA;AACP,SAAoB,yBAAyB;AAE7C,SAAS,8BAA8B;AAGvC,IAAqB,sBAArB,cAAiD,kBAAkB;AAAA,EAC1D;AAAA,EAEP,YAAY,UAA6B,CAAC,GAAG;AAC3C,QAAI;AAEJ,QAAI,OAAO,WAAW,eAAgB,OAAe,qBAAqB;AACxE,cAAQ;AAAA,QACN;AAAA,MAGF;AACA,mBAAc,OAAe;AAAA,IAC/B,OAAO;AACL,mBAAa,IAAI,mBAAmB,OAAO;AAAA,IAC7C;AAEA,UAAM,EAAE,SAAS,EAAE,IAAI,WAAW,IAAI,MAAM,WAAW,KAAK,EAAE,CAAC;AAC/D,SAAK,aAAa;AAAA,EACpB;AAAA,EAEA,MAAM,aAAa;AACjB,SAAK,WAAW,WAAW;AAAA,EAC7B;AAAA,EAEA,WAAW;AACT,WAAO,KAAK,WAAW,SAAS;AAAA,EAClC;AAAA,EAEA,UAAmB;AACjB,WAAO,KAAK,WAAW,QAAQ;AAAA,EACjC;AAAA,EAEA,MAAM,kBAAkB;AACtB,WAAO,MAAM,KAAK,WAAW,gBAAgB;AAAA,EAC/C;AAAA,EAEA,MAAM,QAAQ,MAA8D;AAC1E,UAAM,UAAU,MAAM,KAAK,WAAW,QAAQ,MAAM,aAAa;AACjE,QAAI,CAAC,SAAS;AACZ,YAAM,IAAI,MAAM,8BAA8B;AAAA,IAChD;AACA,WAAO,MAAM,QAAQ,EAAE,aAAa,MAAM,YAAY,CAAC;AAAA,EACzD;AAAA,EAEA,OAAO,eAAe,YAA8C;AAClE,UAAM,YAAY,WAAW,KAAK,CAAC,MAAM,EAAE,OAAO,YAAY;AAC9D,QAAI,CAAC,WAAW;AACd,YAAM,IAAI,MAAM,gCAAgC;AAAA,IAClD;AACA,WAAO;AAAA,EACT;AAAA,EAEA,mBAA+C;AAC7C,QAAI,OAAO,WAAW,aAAa;AACjC,cAAQ;AAAA,QACN;AAAA,MAEF;AAAA,IACF;AAEA,WAAO,IAAI,uBAAuB,KAAK,UAAU;AAAA,EACnD;AACF;","names":[]}
+{"version":3,"sources":["../src/controller.ts"],"sourcesContent":["import ControllerProvider, {\n  ConnectOptions,\n  ControllerOptions,\n} from \"@cartridge/controller\";\nimport { Connector, InjectedConnector } from \"@starknet-react/core\";\n\nexport default class ControllerConnector extends InjectedConnector {\n  public controller: ControllerProvider;\n\n  constructor(options: ControllerOptions = {}) {\n    let controller: ControllerProvider;\n\n    if (typeof window !== \"undefined\" && (window as any).starknet_controller) {\n      console.warn(\n        \"ControllerConnector was instantiated multiple times. \" +\n          \"Reusing existing controller to prevent errors. \" +\n          \"To fix, create the connector at the module level instead of inside a React component.\",\n      );\n      controller = (window as any).starknet_controller;\n    } else {\n      controller = new ControllerProvider(options);\n    }\n\n    super({ options: { id: controller.id, name: controller.name } });\n    this.controller = controller;\n  }\n\n  async disconnect() {\n    await this.controller.disconnect();\n    try {\n      await super.disconnect();\n    } catch {\n      // Best-effort: starknet-react may call disconnect even when the injected wallet isn't present.\n    }\n  }\n\n  username() {\n    return this.controller.username();\n  }\n\n  isReady(): boolean {\n    return this.controller.isReady();\n  }\n\n  async delegateAccount() {\n    return await this.controller.delegateAccount();\n  }\n\n  async connect(args?: { chainIdHint?: bigint } & ConnectOptions) {\n    const { chainIdHint, ...connectOptions } = args ?? {};\n    const controllerArgs =\n      args && Object.keys(connectOptions).length > 0\n        ? (connectOptions as ConnectOptions)\n        : undefined;\n\n    const account = await this.controller.connect(controllerArgs);\n    if (!account) {\n      throw new Error(\"Failed to connect controller\");\n    }\n\n    // Ensure the injected wallet instance used by starknet-react (window.starknet_controller)\n    // always points at the same ControllerProvider instance this connector wraps.\n    if (typeof window !== \"undefined\") {\n      (window as any).starknet_controller = this.controller;\n    }\n\n    const data = await super.connect({ chainIdHint });\n\n    // `@starknet-react/core` updates its state from the `account` returned here.\n    // Use the authoritative address from `controller.connect()` to avoid edge cases\n    // where the injected wallet request returns an empty/undefined account.\n    return { ...data, account: account.address };\n  }\n\n  static fromConnectors(connectors: Connector[]): ControllerConnector {\n    const connector = connectors.find((c) => c.id === \"controller\");\n    if (!connector) {\n      throw new Error(\"Controller connector not found\");\n    }\n    return connector as ControllerConnector;\n  }\n\n  asWalletStandard() {\n    return this.controller.asWalletStandard();\n  }\n}\n"],"mappings":";AAAA,OAAO,wBAGA;AACP,SAAoB,yBAAyB;AAE7C,IAAqB,sBAArB,cAAiD,kBAAkB;AAAA,EAC1D;AAAA,EAEP,YAAY,UAA6B,CAAC,GAAG;AAC3C,QAAI;AAEJ,QAAI,OAAO,WAAW,eAAgB,OAAe,qBAAqB;AACxE,cAAQ;AAAA,QACN;AAAA,MAGF;AACA,mBAAc,OAAe;AAAA,IAC/B,OAAO;AACL,mBAAa,IAAI,mBAAmB,OAAO;AAAA,IAC7C;AAEA,UAAM,EAAE,SAAS,EAAE,IAAI,WAAW,IAAI,MAAM,WAAW,KAAK,EAAE,CAAC;AAC/D,SAAK,aAAa;AAAA,EACpB;AAAA,EAEA,MAAM,aAAa;AACjB,UAAM,KAAK,WAAW,WAAW;AACjC,QAAI;AACF,YAAM,MAAM,WAAW;AAAA,IACzB,QAAQ;AAAA,IAER;AAAA,EACF;AAAA,EAEA,WAAW;AACT,WAAO,KAAK,WAAW,SAAS;AAAA,EAClC;AAAA,EAEA,UAAmB;AACjB,WAAO,KAAK,WAAW,QAAQ;AAAA,EACjC;AAAA,EAEA,MAAM,kBAAkB;AACtB,WAAO,MAAM,KAAK,WAAW,gBAAgB;AAAA,EAC/C;AAAA,EAEA,MAAM,QAAQ,MAAkD;AAC9D,UAAM,EAAE,aAAa,GAAG,eAAe,IAAI,QAAQ,CAAC;AACpD,UAAM,iBACJ,QAAQ,OAAO,KAAK,cAAc,EAAE,SAAS,IACxC,iBACD;AAEN,UAAM,UAAU,MAAM,KAAK,WAAW,QAAQ,cAAc;AAC5D,QAAI,CAAC,SAAS;AACZ,YAAM,IAAI,MAAM,8BAA8B;AAAA,IAChD;AAIA,QAAI,OAAO,WAAW,aAAa;AACjC,MAAC,OAAe,sBAAsB,KAAK;AAAA,IAC7C;AAEA,UAAM,OAAO,MAAM,MAAM,QAAQ,EAAE,YAAY,CAAC;AAKhD,WAAO,EAAE,GAAG,MAAM,SAAS,QAAQ,QAAQ;AAAA,EAC7C;AAAA,EAEA,OAAO,eAAe,YAA8C;AAClE,UAAM,YAAY,WAAW,KAAK,CAAC,MAAM,EAAE,OAAO,YAAY;AAC9D,QAAI,CAAC,WAAW;AACd,YAAM,IAAI,MAAM,gCAAgC;AAAA,IAClD;AACA,WAAO;AAAA,EACT;AAAA,EAEA,mBAAmB;AACjB,WAAO,KAAK,WAAW,iBAAiB;AAAA,EAC1C;AACF;","names":[]}

package/dist/index.d.ts

@@ -1,7 +1,6 @@
 export { default as ControllerConnector } from './controller.js';
 export { default as SessionConnector } from './session.js';
-import 'node_modules/@starknet-react/core/dist/index-KYmfBIOq';
+import '@starknet-io/get-starknet-wallet-standard/features';
 import '@cartridge/controller';
 import '@starknet-react/core';
-import '@starknet-io/get-starknet-wallet-standard/features';
 import '@cartridge/controller/session';

package/dist/index.js

@@ -1,7 +1,6 @@
 // src/controller.ts
 import ControllerProvider from "@cartridge/controller";
 import { InjectedConnector } from "@starknet-react/core";
-import { StarknetInjectedWallet } from "@starknet-io/get-starknet-wallet-standard";
 var ControllerConnector = class extends InjectedConnector {
   controller;
   constructor(options = {}) {
@@ -18,7 +17,11 @@ var ControllerConnector = class extends InjectedConnector {
     this.controller = controller;
   }
   async disconnect() {
-    this.controller.disconnect();
+    await this.controller.disconnect();
+    try {
+      await super.disconnect();
+    } catch {
+    }
   }
   username() {
     return this.controller.username();
@@ -30,11 +33,17 @@ var ControllerConnector = class extends InjectedConnector {
     return await this.controller.delegateAccount();
   }
   async connect(args) {
-    const account = await this.controller.connect(args?.signupOptions);
+    const { chainIdHint, ...connectOptions } = args ?? {};
+    const controllerArgs = args && Object.keys(connectOptions).length > 0 ? connectOptions : void 0;
+    const account = await this.controller.connect(controllerArgs);
     if (!account) {
       throw new Error("Failed to connect controller");
     }
-    return super.connect({ chainIdHint: args?.chainIdHint });
+    if (typeof window !== "undefined") {
+      window.starknet_controller = this.controller;
+    }
+    const data = await super.connect({ chainIdHint });
+    return { ...data, account: account.address };
   }
   static fromConnectors(connectors) {
     const connector = connectors.find((c) => c.id === "controller");
@@ -44,12 +53,7 @@ var ControllerConnector = class extends InjectedConnector {
     return connector;
   }
   asWalletStandard() {
-    if (typeof window !== "undefined") {
-      console.warn(
-        `Casting Controller to WalletWithStarknetFeatures is an experimental feature and may contain bugs. Please report any issues at https://github.com/cartridge-gg/controller/issues`
-      );
-    }
-    return new StarknetInjectedWallet(this.controller);
+    return this.controller.asWalletStandard();
   }
 };
 
@@ -69,7 +73,11 @@ var SessionConnector = class extends InjectedConnector2 {
     this.controller = controller;
   }
   async disconnect() {
-    this.controller.disconnect();
+    await this.controller.disconnect();
+    try {
+      await super.disconnect();
+    } catch {
+    }
   }
   static fromConnectors(connectors) {
     const connector = connectors.find((c) => c.id === "controller_session");

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/controller.ts","../src/session.ts"],"sourcesContent":["import ControllerProvider, {\n  AuthOptions,\n  ControllerOptions,\n} from \"@cartridge/controller\";\nimport { Connector, InjectedConnector } from \"@starknet-react/core\";\n\nimport { StarknetInjectedWallet } from \"@starknet-io/get-starknet-wallet-standard\";\nimport type { WalletWithStarknetFeatures } from \"@starknet-io/get-starknet-wallet-standard/features\";\n\nexport default class ControllerConnector extends InjectedConnector {\n  public controller: ControllerProvider;\n\n  constructor(options: ControllerOptions = {}) {\n    let controller: ControllerProvider;\n\n    if (typeof window !== \"undefined\" && (window as any).starknet_controller) {\n      console.warn(\n        \"ControllerConnector was instantiated multiple times. \" +\n          \"Reusing existing controller to prevent errors. \" +\n          \"To fix, create the connector at the module level instead of inside a React component.\",\n      );\n      controller = (window as any).starknet_controller;\n    } else {\n      controller = new ControllerProvider(options);\n    }\n\n    super({ options: { id: controller.id, name: controller.name } });\n    this.controller = controller;\n  }\n\n  async disconnect() {\n    this.controller.disconnect();\n  }\n\n  username() {\n    return this.controller.username();\n  }\n\n  isReady(): boolean {\n    return this.controller.isReady();\n  }\n\n  async delegateAccount() {\n    return await this.controller.delegateAccount();\n  }\n\n  async connect(args?: { chainIdHint?: bigint; signupOptions?: AuthOptions }) {\n    const account = await this.controller.connect(args?.signupOptions);\n    if (!account) {\n      throw new Error(\"Failed to connect controller\");\n    }\n    return super.connect({ chainIdHint: args?.chainIdHint });\n  }\n\n  static fromConnectors(connectors: Connector[]): ControllerConnector {\n    const connector = connectors.find((c) => c.id === \"controller\");\n    if (!connector) {\n      throw new Error(\"Controller connector not found\");\n    }\n    return connector as ControllerConnector;\n  }\n\n  asWalletStandard(): WalletWithStarknetFeatures {\n    if (typeof window !== \"undefined\") {\n      console.warn(\n        `Casting Controller to WalletWithStarknetFeatures is an experimental feature and may contain bugs. ` +\n          `Please report any issues at https://github.com/cartridge-gg/controller/issues`,\n      );\n    }\n\n    return new StarknetInjectedWallet(this.controller);\n  }\n}\n","import SessionProvider, { SessionOptions } from \"@cartridge/controller/session\";\nimport { Connector, InjectedConnector } from \"@starknet-react/core\";\n\nexport default class SessionConnector extends InjectedConnector {\n  public controller: SessionProvider;\n\n  constructor(options: SessionOptions) {\n    const controller = new SessionProvider(options);\n\n    super({\n      options: {\n        id: controller.id,\n        name: controller.name,\n      },\n    });\n\n    this.controller = controller;\n  }\n\n  async disconnect() {\n    this.controller.disconnect();\n  }\n\n  static fromConnectors(connectors: Connector[]): SessionConnector {\n    const connector = connectors.find((c) => c.id === \"controller_session\");\n    if (!connector) {\n      throw new Error(\"Session connector not found\");\n    }\n    return connector as SessionConnector;\n  }\n\n  username() {\n    return this.controller.username();\n  }\n}\n"],"mappings":";AAAA,OAAO,wBAGA;AACP,SAAoB,yBAAyB;AAE7C,SAAS,8BAA8B;AAGvC,IAAqB,sBAArB,cAAiD,kBAAkB;AAAA,EAC1D;AAAA,EAEP,YAAY,UAA6B,CAAC,GAAG;AAC3C,QAAI;AAEJ,QAAI,OAAO,WAAW,eAAgB,OAAe,qBAAqB;AACxE,cAAQ;AAAA,QACN;AAAA,MAGF;AACA,mBAAc,OAAe;AAAA,IAC/B,OAAO;AACL,mBAAa,IAAI,mBAAmB,OAAO;AAAA,IAC7C;AAEA,UAAM,EAAE,SAAS,EAAE,IAAI,WAAW,IAAI,MAAM,WAAW,KAAK,EAAE,CAAC;AAC/D,SAAK,aAAa;AAAA,EACpB;AAAA,EAEA,MAAM,aAAa;AACjB,SAAK,WAAW,WAAW;AAAA,EAC7B;AAAA,EAEA,WAAW;AACT,WAAO,KAAK,WAAW,SAAS;AAAA,EAClC;AAAA,EAEA,UAAmB;AACjB,WAAO,KAAK,WAAW,QAAQ;AAAA,EACjC;AAAA,EAEA,MAAM,kBAAkB;AACtB,WAAO,MAAM,KAAK,WAAW,gBAAgB;AAAA,EAC/C;AAAA,EAEA,MAAM,QAAQ,MAA8D;AAC1E,UAAM,UAAU,MAAM,KAAK,WAAW,QAAQ,MAAM,aAAa;AACjE,QAAI,CAAC,SAAS;AACZ,YAAM,IAAI,MAAM,8BAA8B;AAAA,IAChD;AACA,WAAO,MAAM,QAAQ,EAAE,aAAa,MAAM,YAAY,CAAC;AAAA,EACzD;AAAA,EAEA,OAAO,eAAe,YAA8C;AAClE,UAAM,YAAY,WAAW,KAAK,CAAC,MAAM,EAAE,OAAO,YAAY;AAC9D,QAAI,CAAC,WAAW;AACd,YAAM,IAAI,MAAM,gCAAgC;AAAA,IAClD;AACA,WAAO;AAAA,EACT;AAAA,EAEA,mBAA+C;AAC7C,QAAI,OAAO,WAAW,aAAa;AACjC,cAAQ;AAAA,QACN;AAAA,MAEF;AAAA,IACF;AAEA,WAAO,IAAI,uBAAuB,KAAK,UAAU;AAAA,EACnD;AACF;;;ACxEA,OAAO,qBAAyC;AAChD,SAAoB,qBAAAA,0BAAyB;AAE7C,IAAqB,mBAArB,cAA8CA,mBAAkB;AAAA,EACvD;AAAA,EAEP,YAAY,SAAyB;AACnC,UAAM,aAAa,IAAI,gBAAgB,OAAO;AAE9C,UAAM;AAAA,MACJ,SAAS;AAAA,QACP,IAAI,WAAW;AAAA,QACf,MAAM,WAAW;AAAA,MACnB;AAAA,IACF,CAAC;AAED,SAAK,aAAa;AAAA,EACpB;AAAA,EAEA,MAAM,aAAa;AACjB,SAAK,WAAW,WAAW;AAAA,EAC7B;AAAA,EAEA,OAAO,eAAe,YAA2C;AAC/D,UAAM,YAAY,WAAW,KAAK,CAAC,MAAM,EAAE,OAAO,oBAAoB;AACtE,QAAI,CAAC,WAAW;AACd,YAAM,IAAI,MAAM,6BAA6B;AAAA,IAC/C;AACA,WAAO;AAAA,EACT;AAAA,EAEA,WAAW;AACT,WAAO,KAAK,WAAW,SAAS;AAAA,EAClC;AACF;","names":["InjectedConnector"]}
+{"version":3,"sources":["../src/controller.ts","../src/session.ts"],"sourcesContent":["import ControllerProvider, {\n  ConnectOptions,\n  ControllerOptions,\n} from \"@cartridge/controller\";\nimport { Connector, InjectedConnector } from \"@starknet-react/core\";\n\nexport default class ControllerConnector extends InjectedConnector {\n  public controller: ControllerProvider;\n\n  constructor(options: ControllerOptions = {}) {\n    let controller: ControllerProvider;\n\n    if (typeof window !== \"undefined\" && (window as any).starknet_controller) {\n      console.warn(\n        \"ControllerConnector was instantiated multiple times. \" +\n          \"Reusing existing controller to prevent errors. \" +\n          \"To fix, create the connector at the module level instead of inside a React component.\",\n      );\n      controller = (window as any).starknet_controller;\n    } else {\n      controller = new ControllerProvider(options);\n    }\n\n    super({ options: { id: controller.id, name: controller.name } });\n    this.controller = controller;\n  }\n\n  async disconnect() {\n    await this.controller.disconnect();\n    try {\n      await super.disconnect();\n    } catch {\n      // Best-effort: starknet-react may call disconnect even when the injected wallet isn't present.\n    }\n  }\n\n  username() {\n    return this.controller.username();\n  }\n\n  isReady(): boolean {\n    return this.controller.isReady();\n  }\n\n  async delegateAccount() {\n    return await this.controller.delegateAccount();\n  }\n\n  async connect(args?: { chainIdHint?: bigint } & ConnectOptions) {\n    const { chainIdHint, ...connectOptions } = args ?? {};\n    const controllerArgs =\n      args && Object.keys(connectOptions).length > 0\n        ? (connectOptions as ConnectOptions)\n        : undefined;\n\n    const account = await this.controller.connect(controllerArgs);\n    if (!account) {\n      throw new Error(\"Failed to connect controller\");\n    }\n\n    // Ensure the injected wallet instance used by starknet-react (window.starknet_controller)\n    // always points at the same ControllerProvider instance this connector wraps.\n    if (typeof window !== \"undefined\") {\n      (window as any).starknet_controller = this.controller;\n    }\n\n    const data = await super.connect({ chainIdHint });\n\n    // `@starknet-react/core` updates its state from the `account` returned here.\n    // Use the authoritative address from `controller.connect()` to avoid edge cases\n    // where the injected wallet request returns an empty/undefined account.\n    return { ...data, account: account.address };\n  }\n\n  static fromConnectors(connectors: Connector[]): ControllerConnector {\n    const connector = connectors.find((c) => c.id === \"controller\");\n    if (!connector) {\n      throw new Error(\"Controller connector not found\");\n    }\n    return connector as ControllerConnector;\n  }\n\n  asWalletStandard() {\n    return this.controller.asWalletStandard();\n  }\n}\n","import SessionProvider, { SessionOptions } from \"@cartridge/controller/session\";\nimport { Connector, InjectedConnector } from \"@starknet-react/core\";\n\nexport default class SessionConnector extends InjectedConnector {\n  public controller: SessionProvider;\n\n  constructor(options: SessionOptions) {\n    const controller = new SessionProvider(options);\n\n    super({\n      options: {\n        id: controller.id,\n        name: controller.name,\n      },\n    });\n\n    this.controller = controller;\n  }\n\n  async disconnect() {\n    await this.controller.disconnect();\n    try {\n      await super.disconnect();\n    } catch {\n      // Best-effort: disconnect should not throw if the injected wallet isn't available.\n    }\n  }\n\n  static fromConnectors(connectors: Connector[]): SessionConnector {\n    const connector = connectors.find((c) => c.id === \"controller_session\");\n    if (!connector) {\n      throw new Error(\"Session connector not found\");\n    }\n    return connector as SessionConnector;\n  }\n\n  username() {\n    return this.controller.username();\n  }\n}\n"],"mappings":";AAAA,OAAO,wBAGA;AACP,SAAoB,yBAAyB;AAE7C,IAAqB,sBAArB,cAAiD,kBAAkB;AAAA,EAC1D;AAAA,EAEP,YAAY,UAA6B,CAAC,GAAG;AAC3C,QAAI;AAEJ,QAAI,OAAO,WAAW,eAAgB,OAAe,qBAAqB;AACxE,cAAQ;AAAA,QACN;AAAA,MAGF;AACA,mBAAc,OAAe;AAAA,IAC/B,OAAO;AACL,mBAAa,IAAI,mBAAmB,OAAO;AAAA,IAC7C;AAEA,UAAM,EAAE,SAAS,EAAE,IAAI,WAAW,IAAI,MAAM,WAAW,KAAK,EAAE,CAAC;AAC/D,SAAK,aAAa;AAAA,EACpB;AAAA,EAEA,MAAM,aAAa;AACjB,UAAM,KAAK,WAAW,WAAW;AACjC,QAAI;AACF,YAAM,MAAM,WAAW;AAAA,IACzB,QAAQ;AAAA,IAER;AAAA,EACF;AAAA,EAEA,WAAW;AACT,WAAO,KAAK,WAAW,SAAS;AAAA,EAClC;AAAA,EAEA,UAAmB;AACjB,WAAO,KAAK,WAAW,QAAQ;AAAA,EACjC;AAAA,EAEA,MAAM,kBAAkB;AACtB,WAAO,MAAM,KAAK,WAAW,gBAAgB;AAAA,EAC/C;AAAA,EAEA,MAAM,QAAQ,MAAkD;AAC9D,UAAM,EAAE,aAAa,GAAG,eAAe,IAAI,QAAQ,CAAC;AACpD,UAAM,iBACJ,QAAQ,OAAO,KAAK,cAAc,EAAE,SAAS,IACxC,iBACD;AAEN,UAAM,UAAU,MAAM,KAAK,WAAW,QAAQ,cAAc;AAC5D,QAAI,CAAC,SAAS;AACZ,YAAM,IAAI,MAAM,8BAA8B;AAAA,IAChD;AAIA,QAAI,OAAO,WAAW,aAAa;AACjC,MAAC,OAAe,sBAAsB,KAAK;AAAA,IAC7C;AAEA,UAAM,OAAO,MAAM,MAAM,QAAQ,EAAE,YAAY,CAAC;AAKhD,WAAO,EAAE,GAAG,MAAM,SAAS,QAAQ,QAAQ;AAAA,EAC7C;AAAA,EAEA,OAAO,eAAe,YAA8C;AAClE,UAAM,YAAY,WAAW,KAAK,CAAC,MAAM,EAAE,OAAO,YAAY;AAC9D,QAAI,CAAC,WAAW;AACd,YAAM,IAAI,MAAM,gCAAgC;AAAA,IAClD;AACA,WAAO;AAAA,EACT;AAAA,EAEA,mBAAmB;AACjB,WAAO,KAAK,WAAW,iBAAiB;AAAA,EAC1C;AACF;;;ACrFA,OAAO,qBAAyC;AAChD,SAAoB,qBAAAA,0BAAyB;AAE7C,IAAqB,mBAArB,cAA8CA,mBAAkB;AAAA,EACvD;AAAA,EAEP,YAAY,SAAyB;AACnC,UAAM,aAAa,IAAI,gBAAgB,OAAO;AAE9C,UAAM;AAAA,MACJ,SAAS;AAAA,QACP,IAAI,WAAW;AAAA,QACf,MAAM,WAAW;AAAA,MACnB;AAAA,IACF,CAAC;AAED,SAAK,aAAa;AAAA,EACpB;AAAA,EAEA,MAAM,aAAa;AACjB,UAAM,KAAK,WAAW,WAAW;AACjC,QAAI;AACF,YAAM,MAAM,WAAW;AAAA,IACzB,QAAQ;AAAA,IAER;AAAA,EACF;AAAA,EAEA,OAAO,eAAe,YAA2C;AAC/D,UAAM,YAAY,WAAW,KAAK,CAAC,MAAM,EAAE,OAAO,oBAAoB;AACtE,QAAI,CAAC,WAAW;AACd,YAAM,IAAI,MAAM,6BAA6B;AAAA,IAC/C;AACA,WAAO;AAAA,EACT;AAAA,EAEA,WAAW;AACT,WAAO,KAAK,WAAW,SAAS;AAAA,EAClC;AACF;","names":["InjectedConnector"]}

package/dist/session.js

@@ -14,7 +14,11 @@ var SessionConnector = class extends InjectedConnector {
     this.controller = controller;
   }
   async disconnect() {
-    this.controller.disconnect();
+    await this.controller.disconnect();
+    try {
+      await super.disconnect();
+    } catch {
+    }
   }
   static fromConnectors(connectors) {
     const connector = connectors.find((c) => c.id === "controller_session");

package/dist/session.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/session.ts"],"sourcesContent":["import SessionProvider, { SessionOptions } from \"@cartridge/controller/session\";\nimport { Connector, InjectedConnector } from \"@starknet-react/core\";\n\nexport default class SessionConnector extends InjectedConnector {\n  public controller: SessionProvider;\n\n  constructor(options: SessionOptions) {\n    const controller = new SessionProvider(options);\n\n    super({\n      options: {\n        id: controller.id,\n        name: controller.name,\n      },\n    });\n\n    this.controller = controller;\n  }\n\n  async disconnect() {\n    this.controller.disconnect();\n  }\n\n  static fromConnectors(connectors: Connector[]): SessionConnector {\n    const connector = connectors.find((c) => c.id === \"controller_session\");\n    if (!connector) {\n      throw new Error(\"Session connector not found\");\n    }\n    return connector as SessionConnector;\n  }\n\n  username() {\n    return this.controller.username();\n  }\n}\n"],"mappings":";AAAA,OAAO,qBAAyC;AAChD,SAAoB,yBAAyB;AAE7C,IAAqB,mBAArB,cAA8C,kBAAkB;AAAA,EACvD;AAAA,EAEP,YAAY,SAAyB;AACnC,UAAM,aAAa,IAAI,gBAAgB,OAAO;AAE9C,UAAM;AAAA,MACJ,SAAS;AAAA,QACP,IAAI,WAAW;AAAA,QACf,MAAM,WAAW;AAAA,MACnB;AAAA,IACF,CAAC;AAED,SAAK,aAAa;AAAA,EACpB;AAAA,EAEA,MAAM,aAAa;AACjB,SAAK,WAAW,WAAW;AAAA,EAC7B;AAAA,EAEA,OAAO,eAAe,YAA2C;AAC/D,UAAM,YAAY,WAAW,KAAK,CAAC,MAAM,EAAE,OAAO,oBAAoB;AACtE,QAAI,CAAC,WAAW;AACd,YAAM,IAAI,MAAM,6BAA6B;AAAA,IAC/C;AACA,WAAO;AAAA,EACT;AAAA,EAEA,WAAW;AACT,WAAO,KAAK,WAAW,SAAS;AAAA,EAClC;AACF;","names":[]}
+{"version":3,"sources":["../src/session.ts"],"sourcesContent":["import SessionProvider, { SessionOptions } from \"@cartridge/controller/session\";\nimport { Connector, InjectedConnector } from \"@starknet-react/core\";\n\nexport default class SessionConnector extends InjectedConnector {\n  public controller: SessionProvider;\n\n  constructor(options: SessionOptions) {\n    const controller = new SessionProvider(options);\n\n    super({\n      options: {\n        id: controller.id,\n        name: controller.name,\n      },\n    });\n\n    this.controller = controller;\n  }\n\n  async disconnect() {\n    await this.controller.disconnect();\n    try {\n      await super.disconnect();\n    } catch {\n      // Best-effort: disconnect should not throw if the injected wallet isn't available.\n    }\n  }\n\n  static fromConnectors(connectors: Connector[]): SessionConnector {\n    const connector = connectors.find((c) => c.id === \"controller_session\");\n    if (!connector) {\n      throw new Error(\"Session connector not found\");\n    }\n    return connector as SessionConnector;\n  }\n\n  username() {\n    return this.controller.username();\n  }\n}\n"],"mappings":";AAAA,OAAO,qBAAyC;AAChD,SAAoB,yBAAyB;AAE7C,IAAqB,mBAArB,cAA8C,kBAAkB;AAAA,EACvD;AAAA,EAEP,YAAY,SAAyB;AACnC,UAAM,aAAa,IAAI,gBAAgB,OAAO;AAE9C,UAAM;AAAA,MACJ,SAAS;AAAA,QACP,IAAI,WAAW;AAAA,QACf,MAAM,WAAW;AAAA,MACnB;AAAA,IACF,CAAC;AAED,SAAK,aAAa;AAAA,EACpB;AAAA,EAEA,MAAM,aAAa;AACjB,UAAM,KAAK,WAAW,WAAW;AACjC,QAAI;AACF,YAAM,MAAM,WAAW;AAAA,IACzB,QAAQ;AAAA,IAER;AAAA,EACF;AAAA,EAEA,OAAO,eAAe,YAA2C;AAC/D,UAAM,YAAY,WAAW,KAAK,CAAC,MAAM,EAAE,OAAO,oBAAoB;AACtE,QAAI,CAAC,WAAW;AACd,YAAM,IAAI,MAAM,6BAA6B;AAAA,IAC/C;AACA,WAAO;AAAA,EACT;AAAA,EAEA,WAAW;AACT,WAAO,KAAK,WAAW,SAAS;AAAA,EAClC;AACF;","names":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cartridge/connector",
-  "version": "0.13.4",
+  "version": "0.13.6",
   "description": "Cartridge Controller Connector",
   "repository": {
     "type": "git",
@@ -44,17 +44,20 @@
     "@starknet-react/core": "^5.0.1"
   },
   "dependencies": {
-    "@starknet-io/get-starknet-wallet-standard": "5.0.0-beta.0",
-    "@cartridge/controller": "0.13.4"
+    "@cartridge/controller": "0.13.6"
   },
   "devDependencies": {
+    "@vitest/coverage-v8": "2.1.8",
     "prettier": "^3.4.2",
     "tsup": "^8.0.1",
     "typescript": "^5.7.3",
-    "@cartridge/tsconfig": "0.13.4"
+    "vitest": "2.1.8",
+    "@cartridge/tsconfig": "0.13.6"
   },
   "scripts": {
     "build:deps": "tsup --dts-resolve",
+    "test": "vitest",
+    "test:ci": "vitest run",
     "format": "prettier --write \"src/**/*.ts\"",
     "format:check": "prettier --check \"src/**/*.ts\""
   }

package/src/__tests__/controller.test.ts

@@ -0,0 +1,90 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+// Mock starknet-react's InjectedConnector so we can control what super.connect returns.
+vi.mock("@starknet-react/core", () => {
+  type InjectedConnectorOptions = { id: string; name?: string };
+
+  class InjectedConnector {
+    private readonly _options: InjectedConnectorOptions;
+
+    constructor({ options }: { options: InjectedConnectorOptions }) {
+      this._options = options;
+    }
+
+    get id(): string {
+      return this._options.id;
+    }
+
+    get name(): string {
+      return this._options.name ?? this._options.id;
+    }
+
+    // Simulate an edge case where the injected request resolves but returns an
+    // empty/undefined account. Our connector should still return the address
+    // from controller.connect().
+    async connect(): Promise<{ account?: string; chainId?: bigint }> {
+      return { account: undefined, chainId: 1n };
+    }
+
+    async disconnect(): Promise<void> {}
+  }
+
+  // The real module exports both, but ControllerConnector only needs InjectedConnector.
+  class Connector {}
+
+  return { Connector, InjectedConnector };
+});
+
+// Mock controller SDK so ControllerConnector doesn't need a real iframe/keychain.
+vi.mock("@cartridge/controller", () => {
+  class ControllerProvider {
+    id = "controller";
+    name = "Controller";
+    account?: { address: string };
+
+    constructor() {
+      if (typeof window !== "undefined") {
+        (window as any).starknet_controller = this;
+      }
+    }
+
+    async connect(): Promise<{ address: string } | undefined> {
+      this.account = { address: "0xabc" };
+      return this.account;
+    }
+
+    disconnect() {}
+    username() {}
+    isReady() {
+      return true;
+    }
+    delegateAccount() {}
+    asWalletStandard() {}
+  }
+
+  return {
+    __esModule: true,
+    default: ControllerProvider,
+  };
+});
+
+import ControllerConnector from "../controller";
+
+describe("ControllerConnector", () => {
+  beforeEach(() => {
+    (globalThis as any).window = {};
+  });
+
+  afterEach(() => {
+    delete (globalThis as any).window;
+  });
+
+  it("returns the address from controller.connect() even if injected connect has no account", async () => {
+    const connector = new ControllerConnector();
+
+    const result = await connector.connect();
+
+    expect(result.account).toBe("0xabc");
+    expect((window as any).starknet_controller).toBe(connector.controller);
+  });
+});

package/src/controller.ts

@@ -1,12 +1,9 @@
 import ControllerProvider, {
-  AuthOptions,
+  ConnectOptions,
   ControllerOptions,
 } from "@cartridge/controller";
 import { Connector, InjectedConnector } from "@starknet-react/core";
 
-import { StarknetInjectedWallet } from "@starknet-io/get-starknet-wallet-standard";
-import type { WalletWithStarknetFeatures } from "@starknet-io/get-starknet-wallet-standard/features";
-
 export default class ControllerConnector extends InjectedConnector {
   public controller: ControllerProvider;
 
@@ -29,7 +26,12 @@ export default class ControllerConnector extends InjectedConnector {
   }
 
   async disconnect() {
-    this.controller.disconnect();
+    await this.controller.disconnect();
+    try {
+      await super.disconnect();
+    } catch {
+      // Best-effort: starknet-react may call disconnect even when the injected wallet isn't present.
+    }
   }
 
   username() {
@@ -44,12 +46,30 @@ export default class ControllerConnector extends InjectedConnector {
     return await this.controller.delegateAccount();
   }
 
-  async connect(args?: { chainIdHint?: bigint; signupOptions?: AuthOptions }) {
-    const account = await this.controller.connect(args?.signupOptions);
+  async connect(args?: { chainIdHint?: bigint } & ConnectOptions) {
+    const { chainIdHint, ...connectOptions } = args ?? {};
+    const controllerArgs =
+      args && Object.keys(connectOptions).length > 0
+        ? (connectOptions as ConnectOptions)
+        : undefined;
+
+    const account = await this.controller.connect(controllerArgs);
     if (!account) {
       throw new Error("Failed to connect controller");
     }
-    return super.connect({ chainIdHint: args?.chainIdHint });
+
+    // Ensure the injected wallet instance used by starknet-react (window.starknet_controller)
+    // always points at the same ControllerProvider instance this connector wraps.
+    if (typeof window !== "undefined") {
+      (window as any).starknet_controller = this.controller;
+    }
+
+    const data = await super.connect({ chainIdHint });
+
+    // `@starknet-react/core` updates its state from the `account` returned here.
+    // Use the authoritative address from `controller.connect()` to avoid edge cases
+    // where the injected wallet request returns an empty/undefined account.
+    return { ...data, account: account.address };
   }
 
   static fromConnectors(connectors: Connector[]): ControllerConnector {
@@ -60,14 +80,7 @@ export default class ControllerConnector extends InjectedConnector {
     return connector as ControllerConnector;
   }
 
-  asWalletStandard(): WalletWithStarknetFeatures {
-    if (typeof window !== "undefined") {
-      console.warn(
-        `Casting Controller to WalletWithStarknetFeatures is an experimental feature and may contain bugs. ` +
-          `Please report any issues at https://github.com/cartridge-gg/controller/issues`,
-      );
-    }
-
-    return new StarknetInjectedWallet(this.controller);
+  asWalletStandard() {
+    return this.controller.asWalletStandard();
   }
 }

package/src/session.ts

@@ -18,7 +18,12 @@ export default class SessionConnector extends InjectedConnector {
   }
 
   async disconnect() {
-    this.controller.disconnect();
+    await this.controller.disconnect();
+    try {
+      await super.disconnect();
+    } catch {
+      // Best-effort: disconnect should not throw if the injected wallet isn't available.
+    }
   }
 
   static fromConnectors(connectors: Connector[]): SessionConnector {

package/vitest.config.ts

@@ -0,0 +1,9 @@
+import { defineConfig } from "vitest/config";
+
+export default defineConfig({
+  test: {
+    environment: "node",
+    include: ["src/**/*.test.ts"],
+  },
+});
+