@cartridge/connector 0.4.0 → 0.5.0-alpha.0

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

@@ -1,4 +1,4 @@
 
-> @cartridge/connector@0.4.0 build:deps /home/runner/work/controller/controller/packages/connector
+> @cartridge/connector@0.5.0-alpha.0 build:deps /home/runner/work/controller/controller/packages/connector
 > tsc
 

package/dist/controller.d.ts

@@ -1,29 +1,8 @@
-import { Connector } from "@starknet-react/core";
-import Controller, { ControllerOptions } from "@cartridge/controller";
-import { AccountInterface } from "starknet";
-export default class ControllerConnector extends Connector {
-    controller: Controller;
-    private _account;
-    constructor(options?: ControllerOptions);
-    readonly id = "controller";
-    readonly name = "Controller";
-    readonly icon: {
-        dark: string;
-        light: string;
-    };
-    chainId(): Promise<bigint>;
-    available(): boolean;
-    ready(): Promise<boolean>;
-    connect(): Promise<{
-        account: string;
-        chainId: bigint;
-    }>;
-    disconnect(): Promise<void>;
-    account(): Promise<AccountInterface>;
+import ControllerProvider, { ControllerOptions } from "@cartridge/controller";
+import { InjectedConnector } from "@starknet-react/core";
+export default class ControllerConnector extends InjectedConnector {
+    controller: ControllerProvider;
+    constructor(options: ControllerOptions);
     username(): Promise<string> | undefined;
     delegateAccount(): Promise<string | null>;
-    /**
-     * @deprecated Use controller.openSettings() instead.
-     */
-    openMenu(): Promise<boolean | null>;
 }

package/dist/controller.js

@@ -1,48 +1,15 @@
-import { Connector } from "@starknet-react/core";
-import Controller from "@cartridge/controller";
-import { icon } from "./icon";
-export default class ControllerConnector extends Connector {
+import ControllerProvider from "@cartridge/controller";
+import { InjectedConnector } from "@starknet-react/core";
+export default class ControllerConnector extends InjectedConnector {
     constructor(options) {
-        super();
-        this.id = "controller";
-        this.name = "Controller";
-        this.icon = {
-            dark: icon,
-            light: icon,
-        };
-        this.controller = new Controller(options);
-    }
-    async chainId() {
-        if (!this._account) {
-            return Promise.reject("Account is not connected");
-        }
-        const val = await this._account.getChainId();
-        return Promise.resolve(BigInt(val));
-    }
-    available() {
-        return true;
-    }
-    ready() {
-        return this.controller.ready();
-    }
-    async connect() {
-        this._account = await this.controller.connect();
-        if (!this._account) {
-            return Promise.reject("account not found");
-        }
-        return {
-            account: this._account.address,
-            chainId: await this.chainId(),
-        };
-    }
-    disconnect() {
-        return this.controller.disconnect();
-    }
-    account() {
-        if (!this._account) {
-            return Promise.reject("account not found");
-        }
-        return Promise.resolve(this._account);
+        const controller = new ControllerProvider(options);
+        super({
+            options: {
+                id: controller.id,
+                name: controller.name,
+            },
+        });
+        this.controller = controller;
     }
     username() {
         return this.controller.username();
@@ -50,12 +17,5 @@ export default class ControllerConnector extends Connector {
     async delegateAccount() {
         return await this.controller.delegateAccount();
     }
-    /**
-     * @deprecated Use controller.openSettings() instead.
-     */
-    async openMenu() {
-        console.warn("openMenu() is deprecated. Please use controller.openSettings() instead.");
-        return await this.controller.openSettings();
-    }
 }
 //# sourceMappingURL=controller.js.map

package/dist/controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"controller.js","sourceRoot":"","sources":["../src/controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,UAAiC,MAAM,uBAAuB,CAAC;AAEtE,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAE9B,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,SAAS;IAIxD,YAAY,OAA2B;QACrC,KAAK,EAAE,CAAC;QAID,OAAE,GAAG,YAAY,CAAC;QAElB,SAAI,GAAG,YAAY,CAAC;QAEpB,SAAI,GAAG;YACd,IAAI,EAAE,IAAI;YACV,KAAK,EAAE,IAAI;SACZ,CAAC;QAVA,IAAI,CAAC,UAAU,GAAG,IAAI,UAAU,CAAC,OAAO,CAAC,CAAC;IAC5C,CAAC;IAWD,KAAK,CAAC,OAAO;QACX,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnB,OAAO,OAAO,CAAC,MAAM,CAAC,0BAA0B,CAAC,CAAC;QACpD,CAAC;QACD,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC;QAC7C,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;IACtC,CAAC;IAED,SAAS;QACP,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK;QACH,OAAO,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,OAAO;QACX,IAAI,CAAC,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;QAEhD,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnB,OAAO,OAAO,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;QAC7C,CAAC;QAED,OAAO;YACL,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,OAAO;YAC9B,OAAO,EAAE,MAAM,IAAI,CAAC,OAAO,EAAE;SAC9B,CAAC;IACJ,CAAC;IAED,UAAU;QACR,OAAO,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC;IACtC,CAAC;IAED,OAAO;QACL,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnB,OAAO,OAAO,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;QAC7C,CAAC;QACD,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACxC,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,eAAe;QACnB,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,eAAe,EAAE,CAAC;IACjD,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,QAAQ;QACZ,OAAO,CAAC,IAAI,CACV,yEAAyE,CAC1E,CAAC;QACF,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,YAAY,EAAE,CAAC;IAC9C,CAAC;CACF"}
+{"version":3,"file":"controller.js","sourceRoot":"","sources":["../src/controller.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAyC,MAAM,uBAAuB,CAAC;AAC9E,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,iBAAiB;IAGhE,YAAY,OAA0B;QACpC,MAAM,UAAU,GAAG,IAAI,kBAAkB,CAAC,OAAO,CAAC,CAAC;QAEnD,KAAK,CAAC;YACJ,OAAO,EAAE;gBACP,EAAE,EAAE,UAAU,CAAC,EAAE;gBACjB,IAAI,EAAE,UAAU,CAAC,IAAI;aACtB;SACF,CAAC,CAAC;QAEH,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAC/B,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,eAAe;QACnB,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,eAAe,EAAE,CAAC;IACjD,CAAC;CACF"}

package/dist/index.d.ts

@@ -1,3 +1 @@
 export { default as ControllerConnector } from "./controller";
-export { default as SessionConnector } from "./session";
-export { default as TelegramConnector } from "./telegram";

package/dist/index.js

@@ -1,4 +1,4 @@
 export { default as ControllerConnector } from "./controller";
-export { default as SessionConnector } from "./session";
-export { default as TelegramConnector } from "./telegram";
+// export { default as SessionConnector } from "./session";
+// export { default as TelegramConnector } from "./telegram";
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAC9D,OAAO,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,WAAW,CAAC;AACxD,OAAO,EAAE,OAAO,IAAI,iBAAiB,EAAE,MAAM,YAAY,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAC9D,2DAA2D;AAC3D,6DAA6D"}

package/dist/session.d.ts

@@ -1,66 +1,6 @@
-import { Connector } from "@starknet-react/core";
-import { Policy } from "@cartridge/controller";
-import SessionAccount from "@cartridge/controller/dist/session";
-/**
- * Represents a unified backend for storage operations and link handling.
- */
-interface UnifiedBackend {
-    /**
-     * Retrieves the value associated with the specified key.
-     * @param key - The key to look up in the storage.
-     * @returns A promise that resolves to the stored value as a string, or null if the key doesn't exist.
-     */
-    get: (key: string) => Promise<string | null>;
-    /**
-     * Stores a key-value pair in the storage.
-     * @param key - The key under which to store the value.
-     * @param value - The value to be stored.
-     * @returns A promise that resolves when the value has been successfully stored.
-     */
-    set: (key: string, value: string) => Promise<void>;
-    /**
-     * Removes the key-value pair associated with the specified key from the storage.
-     * @param key - The key of the item to be removed.
-     * @returns A promise that resolves when the item has been successfully removed.
-     */
-    delete: (key: string) => Promise<void>;
-    /**
-     * Opens the specified URL.
-     * @param url - The URL to open.
-     */
-    openLink: (url: string) => void;
+import SessionProvider, { SessionOptions } from "@cartridge/controller/session";
+import { InjectedConnector } from "@starknet-react/core";
+export default class ControllerConnector extends InjectedConnector {
+    controller: SessionProvider;
+    constructor(options: SessionOptions);
 }
-export default class SessionConnector extends Connector {
-    private _chainId;
-    private _backend;
-    private _rpcUrl;
-    private _policies;
-    private _username?;
-    private _redirectUrl;
-    private _account?;
-    constructor({ rpcUrl, chainId, policies, backend, redirectUrl, }: {
-        rpcUrl: string;
-        chainId: string;
-        policies: Policy[];
-        redirectUrl: string;
-        backend: UnifiedBackend;
-    });
-    readonly id = "session";
-    readonly name = "Session";
-    readonly icon: {
-        dark: string;
-        light: string;
-    };
-    chainId(): Promise<bigint>;
-    available(): boolean;
-    ready(): Promise<boolean>;
-    username(): Promise<string | undefined>;
-    connect(): Promise<{
-        account: string;
-        chainId: bigint;
-    }>;
-    disconnect(): Promise<void>;
-    account(): Promise<SessionAccount>;
-    tryRetrieveFromQueryOrStorage(): Promise<SessionAccount | undefined>;
-}
-export {};

package/dist/session.js

@@ -1,110 +1,15 @@
-import { Connector } from "@starknet-react/core";
-import { icon } from "./icon";
-import { ec, stark } from "starknet";
-import SessionAccount from "@cartridge/controller/dist/session";
-import { KEYCHAIN_URL } from "./constants";
-export default class SessionConnector extends Connector {
-    constructor({ rpcUrl, chainId, policies, backend, redirectUrl, }) {
-        super();
-        this.id = "session";
-        this.name = "Session";
-        this.icon = {
-            dark: icon,
-            light: icon,
-        };
-        this._rpcUrl = rpcUrl;
-        this._policies = policies;
-        this._backend = backend;
-        this._chainId = chainId;
-        this._redirectUrl = redirectUrl;
-    }
-    async chainId() {
-        return Promise.resolve(BigInt(this._chainId));
-    }
-    available() {
-        return true;
-    }
-    ready() {
-        return Promise.resolve(true);
-    }
-    async username() {
-        await this.tryRetrieveFromQueryOrStorage();
-        return this._username;
-    }
-    async connect() {
-        await this.tryRetrieveFromQueryOrStorage();
-        if (this._account) {
-            return {
-                account: this._account.address,
-                chainId: await this.chainId(),
-            };
-        }
-        // Generate a random local key pair
-        const pk = stark.randomAddress();
-        const publicKey = ec.starkCurve.getStarkKey(pk);
-        this._backend.set("sessionSigner", JSON.stringify({
-            privKey: pk,
-            pubKey: publicKey,
-        }));
-        const url = `${KEYCHAIN_URL}/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);
-        this._backend.openLink(url);
-        return {
-            account: "",
-            chainId: await this.chainId(),
-        };
-    }
-    disconnect() {
-        this._backend.delete("sessionSigner");
-        this._backend.delete("session");
-        this._account = undefined;
-        this._username = undefined;
-        return Promise.resolve();
-    }
-    async account() {
-        await this.tryRetrieveFromQueryOrStorage();
-        if (!this._account) {
-            return Promise.reject("Session not registered");
-        }
-        return this._account;
-    }
-    async tryRetrieveFromQueryOrStorage() {
-        const signer = JSON.parse((await this._backend.get("sessionSigner")));
-        let sessionRegistration = null;
-        if (window.location.search.includes("startapp")) {
-            const params = new URLSearchParams(window.location.search);
-            const session = params.get("startapp");
-            if (session) {
-                sessionRegistration = JSON.parse(atob(session));
-                this._backend.set("session", JSON.stringify(sessionRegistration));
-                // Remove the session query parameter
-                params.delete("startapp");
-                const newUrl = window.location.pathname +
-                    (params.toString() ? `?${params.toString()}` : "") +
-                    window.location.hash;
-                window.history.replaceState({}, document.title, newUrl);
-            }
-        }
-        if (!sessionRegistration) {
-            const session = await this._backend.get("session");
-            if (session) {
-                sessionRegistration = JSON.parse(session);
-            }
-        }
-        if (!sessionRegistration) {
-            return;
-        }
-        this._username = sessionRegistration.username;
-        this._account = new SessionAccount({
-            rpcUrl: this._rpcUrl,
-            privateKey: signer.privKey,
-            address: sessionRegistration.address,
-            ownerGuid: sessionRegistration.ownerGuid,
-            chainId: this._chainId,
-            expiresAt: parseInt(sessionRegistration.expiresAt),
-            policies: this._policies,
+import SessionProvider from "@cartridge/controller/session";
+import { InjectedConnector } from "@starknet-react/core";
+export default class ControllerConnector extends InjectedConnector {
+    constructor(options) {
+        const controller = new SessionProvider(options);
+        super({
+            options: {
+                id: controller.id,
+                name: controller.name,
+            },
         });
-        return this._account;
+        this.controller = controller;
     }
 }
 //# sourceMappingURL=session.js.map

package/dist/session.js.map

@@ -1 +1 @@
-{"version":3,"file":"session.js","sourceRoot":"","sources":["../src/session.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"session.js","sourceRoot":"","sources":["../src/session.ts"],"names":[],"mappings":"AAAA,OAAO,eAAmC,MAAM,+BAA+B,CAAC;AAChF,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,iBAAiB;IAGhE,YAAY,OAAuB;QACjC,MAAM,UAAU,GAAG,IAAI,eAAe,CAAC,OAAO,CAAC,CAAC;QAEhD,KAAK,CAAC;YACJ,OAAO,EAAE;gBACP,EAAE,EAAE,UAAU,CAAC,EAAE;gBACjB,IAAI,EAAE,UAAU,CAAC,IAAI;aACtB;SACF,CAAC,CAAC;QAEH,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAC/B,CAAC;CACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cartridge/connector",
-  "version": "0.4.0",
+  "version": "0.5.0-alpha.0",
   "description": "Cartridge Controler Connector",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -25,14 +25,13 @@
     }
   },
   "dependencies": {
-    "@starknet-react/core": "^2.1.5",
-    "@telegram-apps/sdk": "^2.4.0",
+    "@starknet-react/core": "^3.0.2",
     "starknet": "^6.11.0",
-    "@cartridge/controller": "^0.4.0"
+    "@cartridge/controller": "^0.5.0-alpha.0"
   },
   "devDependencies": {
     "typescript": "^5.4.5",
-    "@cartridge/tsconfig": "^0.4.0"
+    "@cartridge/tsconfig": "^0.5.0-alpha.0"
   },
   "scripts": {
     "build:deps": "tsc",

package/src/controller.ts

@@ -1,64 +1,20 @@
-import { Connector } from "@starknet-react/core";
-import Controller, { ControllerOptions } from "@cartridge/controller";
-import { AccountInterface } from "starknet";
-import { icon } from "./icon";
+import ControllerProvider, { ControllerOptions } from "@cartridge/controller";
+import { InjectedConnector } from "@starknet-react/core";
 
-export default class ControllerConnector extends Connector {
-  public controller: Controller;
-  private _account: AccountInterface | undefined;
+export default class ControllerConnector extends InjectedConnector {
+  public controller: ControllerProvider;
 
-  constructor(options?: ControllerOptions) {
-    super();
-    this.controller = new Controller(options);
-  }
-
-  readonly id = "controller";
-
-  readonly name = "Controller";
+  constructor(options: ControllerOptions) {
+    const controller = new ControllerProvider(options);
 
-  readonly icon = {
-    dark: icon,
-    light: icon,
-  };
-
-  async chainId() {
-    if (!this._account) {
-      return Promise.reject("Account is not connected");
-    }
-    const val = await this._account.getChainId();
-    return Promise.resolve(BigInt(val));
-  }
+    super({
+      options: {
+        id: controller.id,
+        name: controller.name,
+      },
+    });
 
-  available(): boolean {
-    return true;
-  }
-
-  ready() {
-    return this.controller.ready();
-  }
-
-  async connect() {
-    this._account = await this.controller.connect();
-
-    if (!this._account) {
-      return Promise.reject("account not found");
-    }
-
-    return {
-      account: this._account.address,
-      chainId: await this.chainId(),
-    };
-  }
-
-  disconnect(): Promise<void> {
-    return this.controller.disconnect();
-  }
-
-  account() {
-    if (!this._account) {
-      return Promise.reject("account not found");
-    }
-    return Promise.resolve(this._account);
+    this.controller = controller;
   }
 
   username() {
@@ -68,14 +24,4 @@ export default class ControllerConnector extends Connector {
   async delegateAccount() {
     return await this.controller.delegateAccount();
   }
-
-  /**
-   * @deprecated Use controller.openSettings() instead.
-   */
-  async openMenu() {
-    console.warn(
-      "openMenu() is deprecated. Please use controller.openSettings() instead.",
-    );
-    return await this.controller.openSettings();
-  }
 }

package/src/index.ts

@@ -1,3 +1,3 @@
 export { default as ControllerConnector } from "./controller";
-export { default as SessionConnector } from "./session";
-export { default as TelegramConnector } from "./telegram";
+// export { default as SessionConnector } from "./session";
+// export { default as TelegramConnector } from "./telegram";