odin-connect 1.1.3 → 1.2.0

package/demo/package-lock.json

@@ -29,7 +29,7 @@
       }
     },
     "..": {
-      "version": "1.1.2",
+      "version": "1.1.3",
       "license": "ISC",
       "dependencies": {
         "@apimatic/json-bigint": "^1.2.0",

package/dist/index.d.ts

@@ -5,4 +5,5 @@ export type { BaseToken as OdinBaseToken, Token as OdinToken, TokenWithBalance a
 export type { Activity as OdinActivity } from "./models/activity";
 export type { Achievement as OdinAchievement, AchievementCategory as OdinAchievementCategory, } from "./models/achievement";
 export * as OdinUtils from "./utils";
+export type { ConnectedUser as OdinConnectedUser } from "./services/connected-user";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAC5D,YAAY,EAAE,IAAI,IAAI,QAAQ,EAAE,MAAM,eAAe,CAAC;AACtD,YAAY,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/D,YAAY,EACV,SAAS,IAAI,aAAa,EAC1B,KAAK,IAAI,SAAS,EAClB,gBAAgB,IAAI,oBAAoB,GACzC,MAAM,gBAAgB,CAAC;AACxB,YAAY,EAAE,QAAQ,IAAI,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAClE,YAAY,EACV,WAAW,IAAI,eAAe,EAC9B,mBAAmB,IAAI,uBAAuB,GAC/C,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,SAAS,MAAM,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAC5D,YAAY,EAAE,IAAI,IAAI,QAAQ,EAAE,MAAM,eAAe,CAAC;AACtD,YAAY,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/D,YAAY,EACV,SAAS,IAAI,aAAa,EAC1B,KAAK,IAAI,SAAS,EAClB,gBAAgB,IAAI,oBAAoB,GACzC,MAAM,gBAAgB,CAAC;AACxB,YAAY,EAAE,QAAQ,IAAI,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAClE,YAAY,EACV,WAAW,IAAI,eAAe,EAC9B,mBAAmB,IAAI,uBAAuB,GAC/C,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,SAAS,MAAM,SAAS,CAAC;AACrC,YAAY,EAAE,aAAa,IAAI,iBAAiB,EAAE,MAAM,2BAA2B,CAAC"}

package/dist/services/api.d.ts

@@ -17,7 +17,7 @@ export type PaginatedResponse<T> = {
     page: number;
     limit: number;
 };
-export declare class OdinApi {
+export declare class OdinApiClient {
     private _apiKey;
     private _httpClient;
     readonly BASE_URL: string;

package/dist/services/api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/services/api.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,KAAK,EAAoB,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAGtC,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAQ5D,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,IAAI,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,KAAK,GAAG,MAAM,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,iBAAiB,CAAC,CAAC,IAAI;IACjC,IAAI,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,qBAAa,OAAO;IAClB,OAAO,CAAC,OAAO,CAAuB;IACtC,OAAO,CAAC,WAAW,CAAa;IAChC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;gBAEd,GAAG,GAAE,MAAM,GAAG,KAAc;IAKxC,OAAO,CAAC,EAAE,EAAE,MAAM;IAIZ,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU;IAW3D,SAAS,CACP,UAAU,EAAE,UAAU,EACtB,IAAI,GAAE,IAAgD;IAaxD,QAAQ,CAAC,EAAE,EAAE,MAAM;IAIb,WAAW,CAAC,KAAK,EAAE,IAAI;IAqC7B,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI;cAKJ,KAAK;;IAsB9C,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU;IAWnD,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU;;;mBAIhD,KAAK;6BACK,MAAM;qCACE,MAAM;;eAlI9B,MAAM;cACP,MAAM;eACL,MAAM;;IAiJP,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU;;;;;eAnJzD,MAAM;cACP,MAAM;eACL,MAAM;;IAmKP,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU;IAWnE,IAAI,MAAM,CAAC,GAAG,EAAE,MAAM,EAErB;IAED,IAAI,MAAM,IAAI,MAAM,GAAG,IAAI,CAE1B;CACF"}
+{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/services/api.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,KAAK,EAAoB,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAGtC,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAQ5D,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,IAAI,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,KAAK,GAAG,MAAM,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,iBAAiB,CAAC,CAAC,IAAI;IACjC,IAAI,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,qBAAa,aAAa;IACxB,OAAO,CAAC,OAAO,CAAuB;IACtC,OAAO,CAAC,WAAW,CAAa;IAChC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;gBAEd,GAAG,GAAE,MAAM,GAAG,KAAc;IAKxC,OAAO,CAAC,EAAE,EAAE,MAAM;IAIZ,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU;IAW3D,SAAS,CACP,UAAU,EAAE,UAAU,EACtB,IAAI,GAAE,IAAgD;IAaxD,QAAQ,CAAC,EAAE,EAAE,MAAM;IAIb,WAAW,CAAC,KAAK,EAAE,IAAI;IAqC7B,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI;cAKJ,KAAK;;IAsB9C,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU;IAWnD,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU;;;mBAIhD,KAAK;6BACK,MAAM;qCACE,MAAM;;eAlI9B,MAAM;cACP,MAAM;eACL,MAAM;;IAiJP,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU;;;;;eAnJzD,MAAM;cACP,MAAM;eACL,MAAM;;IAmKP,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU;IAWnE,IAAI,MAAM,CAAC,GAAG,EAAE,MAAM,EAErB;IAED,IAAI,MAAM,IAAI,MAAM,GAAG,IAAI,CAE1B;CACF"}

package/dist/services/api.js

@@ -5,7 +5,7 @@ const BASE_URL_ENV = {
     prod: "https://api.odin.fun/v1",
     local: "https://api.odin.fun/dev",
 };
-export class OdinApi {
+export class OdinApiClient {
     _apiKey = null;
     _httpClient;
     BASE_URL;

package/dist/services/api.test.js

@@ -1,20 +1,18 @@
 import { beforeAll, describe, expect, it, vi } from "vitest";
-import { OdinApi } from "./api";
+import { OdinApiClient } from "./api";
 describe("ApiClient", () => {
     let api;
     beforeAll(() => {
-        api = new OdinApi("dev");
-        // You can add tests here to verify the functionality of OdinApi methods.
-        // For example, you might want to mock HTTP requests and check responses.
+        api = new OdinApiClient("dev");
     });
-    it("should create an instance of OdinApi", () => {
-        expect(api).toBeInstanceOf(OdinApi);
+    it("should create an instance of OdinApiClient", () => {
+        expect(api).toBeInstanceOf(OdinApiClient);
     });
     it("it should have the correct base URL for dev environment", () => {
         expect(api.BASE_URL).toBe("https://api.odin.fun/dev");
     });
     it("it should have the correct base URL for prod environment", () => {
-        const prodApi = new OdinApi("prod");
+        const prodApi = new OdinApiClient("prod");
         expect(prodApi.BASE_URL).toBe("https://api.odin.fun/v1");
     });
     it("it should get user by ID", async () => {

package/dist/services/canister.d.ts

@@ -0,0 +1,65 @@
+import { OdinApiClient } from "./api";
+import { AppInitOptions } from "./connect";
+import { WindowClient } from "./window";
+export interface SellOptions {
+    principal: string;
+    token: string;
+    tokenAmount: bigint;
+}
+export interface BuyOptions {
+    principal: string;
+    token: string;
+    btcAmount: bigint;
+}
+export interface TransferOptions {
+    principal: string;
+    token: string;
+    amount: bigint;
+    destination: string;
+}
+export interface AddLiquidityOptions {
+    principal: string;
+    btcAmount: bigint;
+    token: string;
+}
+export interface RemoveLiquidityOptions {
+    principal: string;
+    lpAmount: bigint;
+    token: string;
+}
+export interface SwapOptions {
+    principal: string;
+    fromToken: string;
+    toToken: string;
+    fromAmount: bigint;
+}
+export interface CreateTokenParams {
+    principal: string;
+    name: string;
+    ticker: string;
+    image: File;
+    description?: string;
+    website?: string;
+    twitter?: string;
+    telegram?: string;
+    buy?: bigint;
+    discount?: string;
+}
+export declare class OdinCanisterClient {
+    private _window;
+    private _appInfo;
+    private _api;
+    origin: string;
+    constructor(windowClient: WindowClient, apiClient: OdinApiClient, appInfo: AppInitOptions, origin: string);
+    get appInfo(): AppInitOptions;
+    private createUrl;
+    private baseAction;
+    sell({ token, tokenAmount, principal }: SellOptions): Promise<boolean>;
+    buy({ principal, token, btcAmount }: BuyOptions): Promise<boolean>;
+    transfer({ principal, token, amount, destination }: TransferOptions): Promise<boolean>;
+    addLiquidity({ principal, btcAmount, token }: AddLiquidityOptions): Promise<boolean>;
+    removeLiquidity({ principal, lpAmount, token }: RemoveLiquidityOptions): Promise<boolean>;
+    swap({ principal, fromToken: from, toToken: to, fromAmount }: SwapOptions): Promise<boolean>;
+    createToken({ image, ...params }: CreateTokenParams): Promise<boolean>;
+}
+//# sourceMappingURL=canister.d.ts.map

package/dist/services/canister.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"canister.d.ts","sourceRoot":"","sources":["../../src/services/canister.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AACtC,OAAO,EAAE,cAAc,EAAW,MAAM,WAAW,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAExC,MAAM,WAAW,WAAW;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,UAAU;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,mBAAmB;IAClC,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,sBAAsB;IACrC,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,WAAW;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,IAAI,CAAC;IACZ,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,OAAO,CAAe;IAC9B,OAAO,CAAC,QAAQ,CAAiB;IACjC,OAAO,CAAC,IAAI,CAAgB;IAC5B,MAAM,EAAE,MAAM,CAAC;gBAGb,YAAY,EAAE,YAAY,EAC1B,SAAS,EAAE,aAAa,EACxB,OAAO,EAAE,cAAc,EACvB,MAAM,EAAE,MAAM;IAQhB,IAAI,OAAO,mBAEV;IAED,OAAO,CAAC,SAAS;IASjB,OAAO,CAAC,UAAU;IAuDlB,IAAI,CAAC,EAAE,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,EAAE,WAAW;IAiBnD,GAAG,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,UAAU;IAiB/C,QAAQ,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,EAAE,eAAe;IAkBnE,YAAY,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE,mBAAmB;IAiBjE,eAAe,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,sBAAsB;IAiBtE,IAAI,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,WAAW;IAkBnE,WAAW,CAAC,EAAE,KAAK,EAAE,GAAG,MAAM,EAAE,EAAE,iBAAiB;CAyC1D"}

package/dist/services/canister.js

@@ -0,0 +1,191 @@
+import { createTokenValidators } from "../utils";
+export class OdinCanisterClient {
+    _window;
+    _appInfo;
+    _api;
+    origin;
+    constructor(windowClient, apiClient, appInfo, origin) {
+        this._window = windowClient;
+        this._api = apiClient;
+        this._appInfo = appInfo;
+        this.origin = origin;
+    }
+    get appInfo() {
+        return this._appInfo;
+    }
+    createUrl(path) {
+        const url = new URL(`${this.origin}/${path}`);
+        if (this._appInfo?.name) {
+            url.searchParams.append("app_name", this._appInfo.name);
+        }
+        url.searchParams.append("referrer", window.location.origin);
+        return url;
+    }
+    baseAction({ params, odinPath, receivedMessageFromOrigin, resolve: resolveMessages, }) {
+        return new Promise((resolve, reject) => {
+            const handleMessage = async (event) => {
+                if (event.origin === this.origin &&
+                    event.data.path === "/" + odinPath) {
+                    window.removeEventListener("message", handleMessage);
+                    if (typeof receivedMessageFromOrigin === "function"
+                        ? receivedMessageFromOrigin(event.data.message)
+                        : receivedMessageFromOrigin === event.data.message) {
+                        resolve(resolveMessages.success(event.data.message));
+                    }
+                    else {
+                        reject(new Error(resolveMessages.failure));
+                    }
+                }
+            };
+            const url = this.createUrl(odinPath);
+            for (const key in params) {
+                // exclude undefined params
+                if (params[key]) {
+                    url.searchParams.append(key, params[key]);
+                }
+            }
+            const opened = this._window.open(url);
+            if (!opened || opened.closed || typeof opened.closed === "undefined") {
+                reject(new Error(resolveMessages.didnotopen ??
+                    `Failed to open ${odinPath} window, please always allow popups and try again`));
+                return;
+            }
+            window.addEventListener("message", handleMessage);
+        });
+    }
+    sell({ token, tokenAmount, principal }) {
+        return this.baseAction({
+            params: {
+                principal,
+                token,
+                amount: tokenAmount.toString(),
+            },
+            odinPath: "authorize/sell",
+            receivedMessageFromOrigin: "sold",
+            resolve: {
+                success: () => true,
+                failure: "Sell failed or was cancelled",
+                close: "User closed the window",
+            },
+        });
+    }
+    buy({ principal, token, btcAmount }) {
+        return this.baseAction({
+            params: {
+                principal,
+                token,
+                amount: btcAmount.toString(),
+            },
+            odinPath: "authorize/buy",
+            receivedMessageFromOrigin: "purchased",
+            resolve: {
+                success: () => true,
+                failure: "Purchase failed or was cancelled",
+                close: "User closed the window",
+            },
+        });
+    }
+    transfer({ principal, token, amount, destination }) {
+        return this.baseAction({
+            params: {
+                principal,
+                token,
+                amount: amount.toString(),
+                destination,
+            },
+            odinPath: "authorize/transfer",
+            receivedMessageFromOrigin: "transferred",
+            resolve: {
+                success: () => true,
+                failure: "Transfer failed or was cancelled",
+                close: "User closed the window",
+            },
+        });
+    }
+    addLiquidity({ principal, btcAmount, token }) {
+        return this.baseAction({
+            params: {
+                principal,
+                amount: btcAmount.toString(),
+                token,
+            },
+            odinPath: "authorize/add_liquidity",
+            receivedMessageFromOrigin: "addedLiquidity",
+            resolve: {
+                success: () => true,
+                failure: "Add liquidity failed or was cancelled",
+                close: "User closed the window",
+            },
+        });
+    }
+    removeLiquidity({ principal, lpAmount, token }) {
+        return this.baseAction({
+            params: {
+                principal,
+                amount: lpAmount.toString(),
+                token,
+            },
+            odinPath: "authorize/remove_liquidity",
+            receivedMessageFromOrigin: "removedLiquidity",
+            resolve: {
+                success: () => true,
+                failure: "Remove liquidity failed or was cancelled",
+                close: "User closed the window",
+            },
+        });
+    }
+    swap({ principal, fromToken: from, toToken: to, fromAmount }) {
+        return this.baseAction({
+            params: {
+                principal,
+                from,
+                to,
+                amount: fromAmount.toString(),
+            },
+            odinPath: "authorize/swap",
+            receivedMessageFromOrigin: "swapped",
+            resolve: {
+                success: () => true,
+                failure: "Swap failed or was cancelled",
+                close: "User closed the window",
+            },
+        });
+    }
+    async createToken({ image, ...params }) {
+        // check if token field param validators exist and run them
+        for (const key in createTokenValidators) {
+            if (key in params) {
+                const field = key;
+                const errors = createTokenValidators[field]?.(params[key] || null);
+                if (errors) {
+                    throw new Error(errors);
+                }
+            }
+        }
+        // additional validations for discount code
+        if (params.discount) {
+            if (!/^[A-Za-z0-9]{10}$/.test(params.discount)) {
+                throw new Error("Discount code must be alphanumeric and exactly 10 characters long.");
+            }
+        }
+        const imageUrl = await this._api.uploadImage(image);
+        const result = await this.baseAction({
+            params: {
+                ...params,
+                image: imageUrl,
+                buy: params.buy?.toString(),
+            },
+            odinPath: "authorize/create_token",
+            receivedMessageFromOrigin: "tokenCreated",
+            resolve: {
+                success: () => true,
+                failure: "Token creation failed or was cancelled",
+                close: "User closed the window",
+            },
+        });
+        if (!result) {
+            throw new Error("Token creation failed. Please try again.");
+        }
+        return true;
+    }
+}

package/dist/services/connect-user.d.ts

@@ -1,10 +1,12 @@
 import { DelegationIdentity } from "@dfinity/identity";
-import { OdinApi } from "./api";
+import { OdinApiClient } from "./api";
+import { AddLiquidityOptions, BuyOptions, OdinCanisterClient, RemoveLiquidityOptions, SellOptions, TransferOptions } from "./canister";
 export declare class ConnectedUser {
     private _identity;
     private _api;
     private _principal;
-    constructor(principal: string, identity: DelegationIdentity | null, api: OdinApi);
+    private _odin;
+    constructor(principal: string, identity: DelegationIdentity | null, api: OdinApiClient, odin: OdinCanisterClient);
     getIdentity(): DelegationIdentity | null;
     getUser(): Promise<import("..").OdinUser>;
     getBalances(pagination: {
@@ -25,5 +27,10 @@ export declare class ConnectedUser {
         page: number;
         limit: number;
     }>;
+    sell(params: Omit<SellOptions, "principal">): Promise<boolean>;
+    buy(params: Omit<BuyOptions, "principal">): Promise<boolean>;
+    addLiquidity(params: Omit<AddLiquidityOptions, "principal">): Promise<boolean>;
+    removeLiquidity(params: Omit<RemoveLiquidityOptions, "principal">): Promise<boolean>;
+    transfer(params: Omit<TransferOptions, "principal">): Promise<boolean>;
 }
 //# sourceMappingURL=connect-user.d.ts.map

package/dist/services/connect-user.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"connect-user.d.ts","sourceRoot":"","sources":["../../src/services/connect-user.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAGhC,qBAAa,aAAa;IACxB,OAAO,CAAC,SAAS,CAA4B;IAC7C,OAAO,CAAC,IAAI,CAAU;IACtB,OAAO,CAAC,UAAU,CAAS;gBAGzB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,kBAAkB,GAAG,IAAI,EACnC,GAAG,EAAE,OAAO;IAOd,WAAW,IAAI,kBAAkB,GAAG,IAAI;IAIxC,OAAO;IAIP,WAAW,CAAC,UAAU,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE;IAIvD,aAAa,CAAC,UAAU,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE;;;;;;;;;;;CAK1D"}
+{"version":3,"file":"connect-user.d.ts","sourceRoot":"","sources":["../../src/services/connect-user.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AACtC,OAAO,EACL,mBAAmB,EACnB,UAAU,EACV,kBAAkB,EAClB,sBAAsB,EACtB,WAAW,EACX,eAAe,EAChB,MAAM,YAAY,CAAC;AAEpB,qBAAa,aAAa;IACxB,OAAO,CAAC,SAAS,CAA4B;IAC7C,OAAO,CAAC,IAAI,CAAgB;IAC5B,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,KAAK,CAAqB;gBAGhC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,kBAAkB,GAAG,IAAI,EACnC,GAAG,EAAE,aAAa,EAClB,IAAI,EAAE,kBAAkB;IAQ1B,WAAW,IAAI,kBAAkB,GAAG,IAAI;IAIxC,OAAO;IAIP,WAAW,CAAC,UAAU,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE;IAIvD,aAAa,CAAC,UAAU,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE;;;;;;;;;;;IAMzD,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC;IAO3C,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,WAAW,CAAC;IAOzC,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,mBAAmB,EAAE,WAAW,CAAC;IAO3D,eAAe,CAAC,MAAM,EAAE,IAAI,CAAC,sBAAsB,EAAE,WAAW,CAAC;IAOjE,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,eAAe,EAAE,WAAW,CAAC;CAMpD"}

package/dist/services/connect-user.js

@@ -2,10 +2,12 @@ export class ConnectedUser {
     _identity;
     _api;
     _principal;
-    constructor(principal, identity, api) {
+    _odin;
+    constructor(principal, identity, api, odin) {
         this._principal = principal;
         this._identity = identity;
         this._api = api;
+        this._odin = odin;
     }
     getIdentity() {
         return this._identity;
@@ -19,4 +21,35 @@ export class ConnectedUser {
     getUserTokens(pagination) {
         return this._api.getUserTokens(this._principal, pagination);
     }
+    /// others
+    sell(params) {
+        return this._odin.sell({
+            ...params,
+            principal: this._principal,
+        });
+    }
+    buy(params) {
+        return this._odin.buy({
+            ...params,
+            principal: this._principal,
+        });
+    }
+    addLiquidity(params) {
+        return this._odin.addLiquidity({
+            ...params,
+            principal: this._principal,
+        });
+    }
+    removeLiquidity(params) {
+        return this._odin.removeLiquidity({
+            ...params,
+            principal: this._principal,
+        });
+    }
+    transfer(params) {
+        return this._odin.transfer({
+            ...params,
+            principal: this._principal,
+        });
+    }
 }

package/dist/services/connect.d.ts

@@ -1,16 +1,15 @@
-import { OdinApi } from "./api";
-import { ConnectedUser } from "./connect-user";
+import { OdinApiClient } from "./api";
+import { ConnectedUser } from "./connected-user";
 import { Environment } from "../models/environment";
-interface AppInitOptions {
+import { WindowClientSettings } from "./window";
+import { OdinCanisterClient } from "./canister";
+export interface AppInitOptions {
     name: string;
     icon?: string;
     env?: Environment;
 }
 interface BaseConnectOptions {
-    open?: {
-        target: string;
-        settings: string;
-    };
+    open?: WindowClientSettings;
     requires_api?: boolean;
 }
 interface ConnectOptionsWithDelegation extends BaseConnectOptions {
@@ -23,78 +22,20 @@ interface ConnectOptionsWithoutDelegation extends BaseConnectOptions {
     session_key?: never;
 }
 type ConnectOptions = ConnectOptionsWithDelegation | ConnectOptionsWithoutDelegation;
-interface BuyOptions {
-    principal: string;
-    token: string;
-    btcAmount: bigint;
-}
-interface SellOptions {
-    principal: string;
-    token: string;
-    tokenAmount: bigint;
-}
-interface TransferOptions {
-    principal: string;
-    token: string;
-    amount: bigint;
-    destination: string;
-}
-interface GetBalanceOptions {
-    principal: string;
-    pagination: {
-        page: number;
-        limit: number;
-    };
-}
-interface AddLiquidityOptions {
-    principal: string;
-    btcAmount: bigint;
-    token: string;
-}
-interface RemoveLiquidityOptions {
-    principal: string;
-    lpAmount: bigint;
-    token: string;
-}
-interface SwapOptions {
-    principal: string;
-    fromToken: string;
-    toToken: string;
-    fromAmount: bigint;
-}
-interface CreateTokenParams {
-    principal: string;
-    name: string;
-    ticker: string;
-    image: File;
-    description?: string;
-    website?: string;
-    twitter?: string;
-    telegram?: string;
-    buy?: bigint;
-    discount?: string;
-}
 export declare class Connect {
     private _appInfo;
     private _api;
-    private _windowSettings;
+    private _window;
+    private _odin;
     constructor(appInfo?: Partial<AppInitOptions>);
     private createUrl;
-    private openWindow;
     get origin(): string;
-    connect({ open, requires_api, requires_delegation, targets, }: ConnectOptions): Promise<ConnectedUser>;
-    getBalances({ principal, pagination }: GetBalanceOptions): Promise<readonly import("..").OdinBalance[]>;
-    get apiClient(): OdinApi;
+    get appInfo(): AppInitOptions | null;
+    connect({ open, requires_api, requires_delegation, targets, }?: ConnectOptions | undefined): Promise<ConnectedUser>;
+    get api(): OdinApiClient;
+    get odin(): OdinCanisterClient;
     get currentEnv(): "prod" | "dev" | "local";
-    sell({ token, tokenAmount, principal }: SellOptions): Promise<boolean>;
-    buy({ principal, token, btcAmount }: BuyOptions): Promise<boolean>;
-    transfer({ principal, token, amount, destination }: TransferOptions): Promise<boolean>;
-    addLiquidity({ principal, btcAmount, token }: AddLiquidityOptions): Promise<boolean>;
-    removeLiquidity({ principal, lpAmount, token }: RemoveLiquidityOptions): Promise<boolean>;
-    swap({ principal, fromToken: from, toToken: to, fromAmount }: SwapOptions): Promise<boolean>;
-    createToken({ image, ...params }: CreateTokenParams): Promise<boolean>;
     hello(): void;
-    private baseAction;
 }
 export {};
 //# sourceMappingURL=connect.d.ts.map

package/dist/services/connect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"connect.d.ts","sourceRoot":"","sources":["../../src/services/connect.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"connect.d.ts","sourceRoot":"","sources":["../../src/services/connect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAoB,MAAM,OAAO,CAAC;AAOxD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAW,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAgB,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAEhD,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,WAAW,CAAC;CACnB;AACD,UAAU,kBAAkB;IAE1B,IAAI,CAAC,EAAE,oBAAoB,CAAC;IAE5B,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED,UAAU,4BAA6B,SAAQ,kBAAkB;IAE/D,mBAAmB,EAAE,IAAI,CAAC;IAC1B,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;AAED,UAAU,+BAAgC,SAAQ,kBAAkB;IAClE,mBAAmB,CAAC,EAAE,KAAK,CAAC;IAC5B,OAAO,CAAC,EAAE,KAAK,CAAC;IAChB,WAAW,CAAC,EAAE,KAAK,CAAC;CACrB;AAED,KAAK,cAAc,GACf,4BAA4B,GAC5B,+BAA+B,CAAC;AAWpC,qBAAa,OAAO;IAClB,OAAO,CAAC,QAAQ,CAA+B;IAC/C,OAAO,CAAC,IAAI,CAAgB;IAC5B,OAAO,CAAC,OAAO,CAAe;IAC9B,OAAO,CAAC,KAAK,CAAqB;gBAEtB,OAAO,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC;IAkB7C,OAAO,CAAC,SAAS;IASjB,IAAI,MAAM,WAET;IAED,IAAI,OAAO,0BAEV;IAED,OAAO,CACL,EACE,IAAI,EACJ,YAAY,EACZ,mBAAmB,EACnB,OAAO,GACR,GAAE,cAAc,GAAG,SAGnB,GACA,OAAO,CAAC,aAAa,CAAC;IA2EzB,IAAI,GAAG,kBAEN;IAED,IAAI,IAAI,uBAEP;IAED,IAAI,UAAU,6BAEb;IAED,KAAK;CAGN"}

package/dist/services/connect.js

@@ -1,23 +1,23 @@
-import { OdinApi } from "./api";
-import { createTokenValidators } from "../utils";
+import { OdinApiClient } from "./api";
 import { DelegationChain, DelegationIdentity, Ed25519KeyIdentity, } from "@dfinity/identity";
-import { ConnectedUser } from "./connect-user";
+import { ConnectedUser } from "./connected-user";
 import { ORIGINS } from "../models/environment";
+import { WindowClient } from "./window";
+import { OdinCanisterClient } from "./canister";
 export class Connect {
     _appInfo = null;
     _api;
-    _windowSettings;
+    _window;
+    _odin;
     constructor(appInfo) {
         this._appInfo = {
             env: "prod",
             name: "app_name",
             ...appInfo,
         };
-        this._api = new OdinApi(this._appInfo.env === "prod" ? "prod" : "dev");
-        this._windowSettings = {
-            target: "_blank",
-            settings: "",
-        };
+        this._api = new OdinApiClient(this._appInfo.env === "prod" ? "prod" : "dev");
+        this._window = new WindowClient();
+        this._odin = new OdinCanisterClient(this._window, this._api, this._appInfo, ORIGINS[this._appInfo.env || "prod"]);
     }
     createUrl(path) {
         const url = new URL(`${this.origin}/${path}`);
@@ -27,16 +27,19 @@ export class Connect {
         url.searchParams.append("referrer", window.location.origin);
         return url;
     }
-    openWindow(url) {
-        return window.open(url, this._windowSettings?.target || "_blank", this._windowSettings?.settings);
-    }
     get origin() {
         return ORIGINS[this._appInfo?.env || "prod"];
     }
-    connect({ open, requires_api, requires_delegation, targets, }) {
+    get appInfo() {
+        return this._appInfo;
+    }
+    connect({ open, requires_api, requires_delegation, targets, } = {
+        requires_delegation: false,
+        requires_api: false,
+    }) {
         return new Promise((resolve, reject) => {
             if (open) {
-                this._windowSettings = open;
+                this._window.settings = open;
             }
             const sessionKey = Ed25519KeyIdentity.generate();
             const handleMessage = async (event) => {
@@ -59,10 +62,10 @@ export class Connect {
                                     throw new Error("Delegation chain is missing");
                                 }
                                 const identity = DelegationIdentity.fromDelegation(sessionKey, DelegationChain.fromJSON(delegationChain));
-                                connectedUser = new ConnectedUser(principal, identity, this.apiClient);
+                                connectedUser = new ConnectedUser(principal, identity, this.api, this._odin);
                             }
                             else {
-                                connectedUser = new ConnectedUser(principal, null, this.apiClient);
+                                connectedUser = new ConnectedUser(principal, null, this.api, this._odin);
                             }
                             resolve(connectedUser);
                         }
@@ -81,187 +84,22 @@ export class Connect {
                 url.searchParams.append("requires_delegation", "1");
                 const sessionString = btoa(JSON.stringify(sessionKey.toJSON()));
                 url.searchParams.append("session_key", sessionString);
-                url.searchParams.append("targets", targets.join(","));
+                url.searchParams.append("targets", targets?.join(",") || "");
             }
-            this.openWindow(url);
+            this._window.open(url);
             window.addEventListener("message", handleMessage);
         });
     }
-    async getBalances({ principal, pagination }) {
-        if (!principal) {
-            throw new Error("Principal is required to fetch balances");
-        }
-        return this._api.getBalances(principal, pagination);
-    }
-    get apiClient() {
+    get api() {
         return this._api;
     }
+    get odin() {
+        return this._odin;
+    }
     get currentEnv() {
         return this._appInfo?.env || "prod";
     }
-    sell({ token, tokenAmount, principal }) {
-        return this.baseAction({
-            params: {
-                principal,
-                token,
-                amount: tokenAmount.toString(),
-            },
-            odinPath: "authorize/sell",
-            receivedMessageFromOrigin: "sold",
-            resolve: {
-                success: () => true,
-                failure: "Sell failed or was cancelled",
-                close: "User closed the window",
-            },
-        });
-    }
-    buy({ principal, token, btcAmount }) {
-        return this.baseAction({
-            params: {
-                principal,
-                token,
-                amount: btcAmount.toString(),
-            },
-            odinPath: "authorize/buy",
-            receivedMessageFromOrigin: "purchased",
-            resolve: {
-                success: () => true,
-                failure: "Purchase failed or was cancelled",
-                close: "User closed the window",
-            },
-        });
-    }
-    transfer({ principal, token, amount, destination }) {
-        return this.baseAction({
-            params: {
-                principal,
-                token,
-                amount: amount.toString(),
-                destination,
-            },
-            odinPath: "authorize/transfer",
-            receivedMessageFromOrigin: "transferred",
-            resolve: {
-                success: () => true,
-                failure: "Transfer failed or was cancelled",
-                close: "User closed the window",
-            },
-        });
-    }
-    addLiquidity({ principal, btcAmount, token }) {
-        return this.baseAction({
-            params: {
-                principal,
-                amount: btcAmount.toString(),
-                token,
-            },
-            odinPath: "authorize/add_liquidity",
-            receivedMessageFromOrigin: "addedLiquidity",
-            resolve: {
-                success: () => true,
-                failure: "Add liquidity failed or was cancelled",
-                close: "User closed the window",
-            },
-        });
-    }
-    removeLiquidity({ principal, lpAmount, token }) {
-        return this.baseAction({
-            params: {
-                principal,
-                amount: lpAmount.toString(),
-                token,
-            },
-            odinPath: "authorize/remove_liquidity",
-            receivedMessageFromOrigin: "removedLiquidity",
-            resolve: {
-                success: () => true,
-                failure: "Remove liquidity failed or was cancelled",
-                close: "User closed the window",
-            },
-        });
-    }
-    swap({ principal, fromToken: from, toToken: to, fromAmount }) {
-        return this.baseAction({
-            params: {
-                principal,
-                from,
-                to,
-                amount: fromAmount.toString(),
-            },
-            odinPath: "authorize/swap",
-            receivedMessageFromOrigin: "swapped",
-            resolve: {
-                success: () => true,
-                failure: "Swap failed or was cancelled",
-                close: "User closed the window",
-            },
-        });
-    }
-    async createToken({ image, ...params }) {
-        // check if token field param validators exist and run them
-        for (const key in createTokenValidators) {
-            if (key in params) {
-                const field = key;
-                const errors = createTokenValidators[field]?.(params[key] || null);
-                if (errors) {
-                    throw new Error(errors);
-                }
-            }
-        }
-        // additional validations for discount code
-        if (params.discount) {
-            if (!/^[A-Za-z0-9]{10}$/.test(params.discount)) {
-                throw new Error("Discount code must be alphanumeric and exactly 10 characters long.");
-            }
-        }
-        const imageUrl = await this._api.uploadImage(image);
-        const result = await this.baseAction({
-            params: {
-                ...params,
-                image: imageUrl,
-                buy: params.buy?.toString(),
-            },
-            odinPath: "authorize/create_token",
-            receivedMessageFromOrigin: "tokenCreated",
-            resolve: {
-                success: () => true,
-                failure: "Token creation failed or was cancelled",
-                close: "User closed the window",
-            },
-        });
-        if (!result) {
-            throw new Error("Token creation failed. Please try again.");
-        }
-        return true;
-    }
     hello() {
         console.log("Hello from Odin Connect!");
     }
-    baseAction({ params, odinPath, receivedMessageFromOrigin, resolve: resolveMessages, }) {
-        return new Promise((resolve, reject) => {
-            const handleMessage = async (event) => {
-                if (event.origin === this.origin &&
-                    event.data.path === "/" + odinPath) {
-                    window.removeEventListener("message", handleMessage);
-                    if (typeof receivedMessageFromOrigin === "function"
-                        ? receivedMessageFromOrigin(event.data.message)
-                        : receivedMessageFromOrigin === event.data.message) {
-                        resolve(resolveMessages.success(event.data.message));
-                    }
-                    else {
-                        reject(new Error(resolveMessages.failure));
-                    }
-                }
-            };
-            const url = this.createUrl(odinPath);
-            for (const key in params) {
-                // exclude undefined params
-                if (params[key]) {
-                    url.searchParams.append(key, params[key]);
-                }
-            }
-            this.openWindow(url);
-            window.addEventListener("message", handleMessage);
-        });
-    }
 }

package/dist/services/connect.test.js

@@ -101,7 +101,7 @@ describe("Connect", () => {
     });
     it("should open the buy authorization window", () => {
         const openSpy = vi.spyOn(window, "open").mockImplementation(() => null);
-        const result = connect.buy({
+        const result = connect.odin.buy({
             token: "2jjj",
             btcAmount: 20001n,
             principal: "test-principal",
@@ -122,7 +122,7 @@ describe("Connect", () => {
     });
     it("should open the sell authorization window", () => {
         const openSpy = vi.spyOn(window, "open").mockImplementation(() => null);
-        const sellPromise = connect.sell({
+        const sellPromise = connect.odin.sell({
             token: "2jjj",
             tokenAmount: 32000n,
             principal: "test-principal",
@@ -143,7 +143,7 @@ describe("Connect", () => {
     });
     it("should handle rejected sell", () => {
         const openSpy = vi.spyOn(window, "open").mockImplementation(() => null);
-        const sellPromise = connect.sell({
+        const sellPromise = connect.odin.sell({
             token: "2jjj",
             tokenAmount: 32000n,
             principal: "test-principal",
@@ -152,14 +152,14 @@ describe("Connect", () => {
             expect(true).toBe(false); // should not be called
         }, (e) => {
             expect(e).toBeInstanceOf(Error);
-            expect(e.message).toContain("failed");
+            expect(e.message).toContain(/failed/i);
         });
         expect(openSpy).toHaveBeenCalled();
         simulateRejectMessage("authorize/sell");
     });
     it("should open the transfer authorization window", () => {
         const openSpy = vi.spyOn(window, "open").mockImplementation(() => null);
-        const result = connect.transfer({
+        const result = connect.odin.transfer({
             token: "2jjj",
             amount: 45000n,
             destination: "to-principal",
@@ -181,7 +181,7 @@ describe("Connect", () => {
     });
     it("should handle rejected transfer", () => {
         const openSpy = vi.spyOn(window, "open").mockImplementation(() => null);
-        const transferPromise = connect.transfer({
+        const transferPromise = connect.odin.transfer({
             token: "2jjj",
             amount: 45000n,
             destination: "to-principal",
@@ -190,14 +190,14 @@ describe("Connect", () => {
         transferPromise.then(() => expect(true).toBe(false), // should not be called
         (e) => {
             expect(e).toBeInstanceOf(Error);
-            expect(e.message).toContain("failed");
+            expect(e.message).toContain(/failed/i);
         });
         expect(openSpy).toHaveBeenCalled();
         simulateRejectMessage("authorize/transfer");
     });
     it("should open the add liquidity authorization window", () => {
         const openSpy = vi.spyOn(window, "open").mockImplementation(() => null);
-        const addLiquidityPromise = connect.addLiquidity({
+        const addLiquidityPromise = connect.odin.addLiquidity({
             token: "2jjj",
             btcAmount: 10000n,
             principal: "test-principal",
@@ -217,7 +217,7 @@ describe("Connect", () => {
     });
     it("should handle rejected add liquidity", () => {
         const openSpy = vi.spyOn(window, "open").mockImplementation(() => null);
-        const addLiquidityPromise = connect.addLiquidity({
+        const addLiquidityPromise = connect.odin.addLiquidity({
             token: "2jjj",
             btcAmount: 10000n,
             principal: "test-principal",
@@ -225,14 +225,14 @@ describe("Connect", () => {
         addLiquidityPromise.then(() => expect(true).toBe(false), // should not be called
         (e) => {
             expect(e).toBeInstanceOf(Error);
-            expect(e.message).toContain("failed");
+            expect(e.message).toContain(/failed/i);
         });
         expect(openSpy).toHaveBeenCalled();
         simulateRejectMessage("authorize/add_liquidity");
     });
     it("should open the remove liquidity authorization window", () => {
         const openSpy = vi.spyOn(window, "open").mockImplementation(() => null);
-        const removeLiquidityPromise = connect.removeLiquidity({
+        const removeLiquidityPromise = connect.odin.removeLiquidity({
             token: "2jjj",
             lpAmount: 15000n,
             principal: "test-principal",
@@ -252,7 +252,7 @@ describe("Connect", () => {
     });
     it("should handle rejected remove liquidity", () => {
         const openSpy = vi.spyOn(window, "open").mockImplementation(() => null);
-        const removeLiquidityPromise = connect.removeLiquidity({
+        const removeLiquidityPromise = connect.odin.removeLiquidity({
             token: "2jjj",
             lpAmount: 15000n,
             principal: "test-principal",
@@ -260,14 +260,14 @@ describe("Connect", () => {
         removeLiquidityPromise.then(() => expect(true).toBe(false), // should not be called
         (e) => {
             expect(e).toBeInstanceOf(Error);
-            expect(e.message).toContain("failed");
+            expect(e.message).toContain(/failed/i);
         });
         expect(openSpy).toHaveBeenCalled();
         simulateRejectMessage("authorize/remove_liquidity");
     });
     it("should create a base action", async () => {
         const openSpy = vi.spyOn(window, "open").mockImplementation(() => null);
-        const action = () => connect["baseAction"]({
+        const action = () => connect.odin["baseAction"]({
             params: { test: "param" },
             odinPath: "authorize/test_action",
             receivedMessageFromOrigin(message) {
@@ -294,7 +294,7 @@ describe("Connect", () => {
         simulateMessage("authorize/test_action", "OK");
         action().then(() => expect(true).toBe(false), (e) => {
             expect(e).toBeInstanceOf(Error);
-            expect(e.message).toBe("test failed");
+            expect(e.message).toContain(/failed/i);
         });
         simulateRejectMessage("authorize/test_action");
     });

package/dist/services/connected-user.d.ts

@@ -0,0 +1,58 @@
+import { DelegationIdentity } from "@dfinity/identity";
+import { OdinApiClient } from "./api";
+import { AddLiquidityOptions, BuyOptions, CreateTokenParams, OdinCanisterClient, RemoveLiquidityOptions, SellOptions, SwapOptions, TransferOptions } from "./canister";
+export declare class ConnectedUser {
+    private _identity;
+    private _api;
+    private _principal;
+    private _odin;
+    constructor(principal: string, identity: DelegationIdentity | null, api: OdinApiClient, odin: OdinCanisterClient);
+    getIdentity(): DelegationIdentity | null;
+    getUser(): Promise<import("..").OdinUser>;
+    getBalances(pagination: {
+        page: number;
+        limit: number;
+    }): Promise<readonly import("..").OdinBalance[]>;
+    getTokens(pagination: {
+        page: number;
+        limit: number;
+    }): Promise<{
+        data: {
+            balance: bigint;
+            token: import("..").OdinToken;
+            unrealized_pnl?: number;
+            unrealized_pnl_percent?: number;
+        }[];
+        count: number;
+        page: number;
+        limit: number;
+    }>;
+    getActivity(pagination: {
+        page: number;
+        limit: number;
+    }): Promise<import("./api").PaginatedResponse<import("..").OdinActivity>>;
+    getLiquidity(pagination: {
+        page: number;
+        limit: number;
+    }): Promise<{
+        data: {
+            balance: bigint;
+            token: import("..").OdinToken;
+        }[];
+        count: number;
+        page: number;
+        limit: number;
+    }>;
+    getAchievements(pagination: {
+        page: number;
+        limit: number;
+    }): Promise<readonly import("..").OdinAchievementCategory[]>;
+    sell(params: Omit<SellOptions, "principal">): Promise<boolean>;
+    buy(params: Omit<BuyOptions, "principal">): Promise<boolean>;
+    addLiquidity(params: Omit<AddLiquidityOptions, "principal">): Promise<boolean>;
+    removeLiquidity(params: Omit<RemoveLiquidityOptions, "principal">): Promise<boolean>;
+    transfer(params: Omit<TransferOptions, "principal">): Promise<boolean>;
+    createToken(params: Omit<CreateTokenParams, "principal">): Promise<boolean>;
+    swap(params: Omit<SwapOptions, "principal">): Promise<boolean>;
+}
+//# sourceMappingURL=connected-user.d.ts.map

package/dist/services/connected-user.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"connected-user.d.ts","sourceRoot":"","sources":["../../src/services/connected-user.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AACtC,OAAO,EACL,mBAAmB,EACnB,UAAU,EACV,iBAAiB,EACjB,kBAAkB,EAClB,sBAAsB,EACtB,WAAW,EACX,WAAW,EACX,eAAe,EAChB,MAAM,YAAY,CAAC;AAEpB,qBAAa,aAAa;IACxB,OAAO,CAAC,SAAS,CAA4B;IAC7C,OAAO,CAAC,IAAI,CAAgB;IAC5B,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,KAAK,CAAqB;gBAGhC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,kBAAkB,GAAG,IAAI,EACnC,GAAG,EAAE,aAAa,EAClB,IAAI,EAAE,kBAAkB;IAQ1B,WAAW,IAAI,kBAAkB,GAAG,IAAI;IAIxC,OAAO;IAIP,WAAW,CAAC,UAAU,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE;IAIvD,SAAS,CAAC,UAAU,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE;;;;;;;;;;;IAIrD,WAAW,CAAC,UAAU,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE;IAIvD,YAAY,CAAC,UAAU,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE;;;;;;;;;IAIxD,eAAe,CAAC,UAAU,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE;IAM3D,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC;IAO3C,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,WAAW,CAAC;IAOzC,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,mBAAmB,EAAE,WAAW,CAAC;IAO3D,eAAe,CAAC,MAAM,EAAE,IAAI,CAAC,sBAAsB,EAAE,WAAW,CAAC;IAOjE,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,eAAe,EAAE,WAAW,CAAC;IAOnD,WAAW,CAAC,MAAM,EAAE,IAAI,CAAC,iBAAiB,EAAE,WAAW,CAAC;IAOxD,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC;CAM5C"}

package/dist/services/connected-user.js

@@ -0,0 +1,76 @@
+export class ConnectedUser {
+    _identity;
+    _api;
+    _principal;
+    _odin;
+    constructor(principal, identity, api, odin) {
+        this._principal = principal;
+        this._identity = identity;
+        this._api = api;
+        this._odin = odin;
+    }
+    getIdentity() {
+        return this._identity;
+    }
+    getUser() {
+        return this._api.getUser(this._principal);
+    }
+    getBalances(pagination) {
+        return this._api.getBalances(this._principal, pagination);
+    }
+    getTokens(pagination) {
+        return this._api.getUserTokens(this._principal, pagination);
+    }
+    getActivity(pagination) {
+        return this._api.getUserActivity(this._principal, pagination);
+    }
+    getLiquidity(pagination) {
+        return this._api.getUserLiquidity(this._principal, pagination);
+    }
+    getAchievements(pagination) {
+        return this._api.getUserAchievements(this._principal, pagination);
+    }
+    /// others
+    sell(params) {
+        return this._odin.sell({
+            ...params,
+            principal: this._principal,
+        });
+    }
+    buy(params) {
+        return this._odin.buy({
+            ...params,
+            principal: this._principal,
+        });
+    }
+    addLiquidity(params) {
+        return this._odin.addLiquidity({
+            ...params,
+            principal: this._principal,
+        });
+    }
+    removeLiquidity(params) {
+        return this._odin.removeLiquidity({
+            ...params,
+            principal: this._principal,
+        });
+    }
+    transfer(params) {
+        return this._odin.transfer({
+            ...params,
+            principal: this._principal,
+        });
+    }
+    createToken(params) {
+        return this._odin.createToken({
+            ...params,
+            principal: this._principal,
+        });
+    }
+    swap(params) {
+        return this._odin.swap({
+            ...params,
+            principal: this._principal,
+        });
+    }
+}

package/dist/services/window.d.ts

@@ -0,0 +1,12 @@
+export interface WindowClientSettings {
+    target: string;
+    settings: string;
+}
+export declare class WindowClient {
+    private _settings;
+    constructor(options?: Partial<WindowClientSettings>);
+    get settings(): Partial<WindowClientSettings>;
+    set settings(settings: Partial<WindowClientSettings>);
+    open(url: URL): Window | null;
+}
+//# sourceMappingURL=window.d.ts.map

package/dist/services/window.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"window.d.ts","sourceRoot":"","sources":["../../src/services/window.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,qBAAa,YAAY;IACvB,OAAO,CAAC,SAAS,CAAuB;gBAE5B,OAAO,CAAC,EAAE,OAAO,CAAC,oBAAoB,CAAC;IAOnD,IAAI,QAAQ,IAIW,OAAO,CAAC,oBAAoB,CAAC,CAFnD;IAED,IAAI,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,oBAAoB,CAAC,EAKnD;IAED,IAAI,CAAC,GAAG,EAAE,GAAG;CAOd"}

package/dist/services/window.js

@@ -0,0 +1,21 @@
+export class WindowClient {
+    _settings;
+    constructor(options) {
+        this._settings = {
+            target: options?.target || "_blank",
+            settings: options?.settings || "",
+        };
+    }
+    get settings() {
+        return this._settings;
+    }
+    set settings(settings) {
+        this._settings = {
+            ...this._settings,
+            ...settings,
+        };
+    }
+    open(url) {
+        return window.open(url, this._settings?.target || "_blank", this._settings?.settings);
+    }
+}

package/dist/utils/generate-tid.d.ts

@@ -0,0 +1,2 @@
+export declare function generateTid(length?: number): string;
+//# sourceMappingURL=generate-tid.d.ts.map

package/dist/utils/generate-tid.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"generate-tid.d.ts","sourceRoot":"","sources":["../../src/utils/generate-tid.ts"],"names":[],"mappings":"AAAA,wBAAgB,WAAW,CAAC,MAAM,GAAE,MAAU,UAS7C"}

package/dist/utils/generate-tid.js

@@ -0,0 +1,9 @@
+export function generateTid(length = 8) {
+    const characters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+    let result = "";
+    const charactersLength = characters.length;
+    for (let i = 0; i < length; i++) {
+        result += characters.charAt(Math.floor(Math.random() * charactersLength));
+    }
+    return result;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "odin-connect",
-  "version": "1.1.3",
+  "version": "1.2.0",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/readme.md

@@ -6,7 +6,7 @@
 
 ## Demo
 
-This repository includes a demo. See `demo/` folder
+This repository includes a demo. See `/demo` folder
 
 To run it, simply do `npm run demo`
 
@@ -16,8 +16,11 @@ To run it, simply do `npm run demo`
 
 Instantiate the OdinConnect class with some information about your application
 
+- `name` - Name of your app
+- `env` - Odin Environment. Accepted values: `prod`, `dev`, `local`. Default: `prod`.
+
 ```typescript
-const odinConnect = new OdinConnect({ name: "Demo App" });
+const odinConnect = new OdinConnect({ name: "Demo App", env: "prod" });
 ```
 
 ### Request for user connection
@@ -48,13 +51,18 @@ const user = await odinConnect.connect({
 const identity = user.getIdentity();
 ```
 
-### Request for user balances
+### Request for various user data from API
 
 ```typescript
-const balances = await odinConnect.getBalances({
-  principal: "veyov-kjgrf-hke6v-6d63i-sdwae-oldgg-huau6-ke5g3-rllp2-5jhca-uqe",
-  pagination: { page: 1, limit: 20 },
-});
+const user = await odinConnect.connect();
+// get tokens
+const tokens = await user.getTokens({ page: 1, limit: 10 });
+// get liquidity
+const liquidity = await user.getLiquidity({ page: 1, limit: 10 });
+// get activity
+const activity = await user.getActivity({ page: 1, limit: 10 });
+// get achievements
+const achievements = await user.getAchievements({ page: 1, limit: 10 });
 ```
 
 ### Request for token transfer
@@ -72,49 +80,50 @@ await odinConnect.transfer({
 ### Request for buy authorization
 
 ```typescript
-await odinConnect.buy({
-  btcAmount: 20_000_000n,
+const user = await odinConnect.connect();
+await user.buy({
+  btcAmount: 10_000_000n,
   token: "2jjj",
-  principal: "veyov-kjgrf-hke6v-6d63i-sdwae-oldgg-huau6-ke5g3-rllp2-5jhca-uqe",
 });
 ```
 
 ### Request for sell authorization
 
 ```typescript
-await odinConnect.sell({
+const user = await odinConnect.connect();
+await user.sell({
   tokenAmount: 20_000_000n,
   token: "2jjj",
-  principal: "veyov-kjgrf-hke6v-6d63i-sdwae-oldgg-huau6-ke5g3-rllp2-5jhca-uqe",
 });
 ```
 
 ### Request for add liquidity authorization
 
 ```typescript
-await odinConnect.addLiquidity({
+const user = await odinConnect.connect();
+await user.addLiquidity({
   btcAmount: 20_000_000n,
   token: "2jj",
-  principal: "veyov-kjgrf-hke6v-6d63i-sdwae-oldgg-huau6-ke5g3-rllp2-5jhca-uqe",
 });
 ```
 
 ### Request for remove liquidity authorization
 
 ```typescript
-await odinConnect.removeLiquidity({
+const user = await odinConnect.connect();
+await user.removeLiquidity({
   btcAmount: 20_000_000n,
   token: "2jj",
-  principal: "veyov-kjgrf-hke6v-6d63i-sdwae-oldgg-huau6-ke5g3-rllp2-5jhca-uqe",
 });
 ```
 
 ### Request for creating new token
 
-Note: require_api must be set set to true
+Note: `require_api` must be set set to true
 
 ```typescript
-await odinConnect.createToken({
+const user = await odinConnect.connect({ requires_api: true });
+await user.createToken({
   image: file, // instance of a file
   principal: "veyov-kjgrf-hke6v-6d63i-sdwae-oldgg-huau6-ke5g3-rllp2-5jhca-uqe",
   name: "Test Token",
@@ -132,33 +141,37 @@ await odinConnect.createToken({
 
 ```typescript
 // Get tokens
-const tokens = await odinConnect.getTokens({
+const tokens = await odinConnect.api.getTokens({
   pagination: { page: 1, limit: 50 },
   sort: { field: "marketcap", direction: "desc" },
 });
 
-// Get token info
-const token = await odinConnect.getToken("2jjj");
+// Get activities
+const activity = await odinConnect.api.getUserActivity({
+  pagination: { page: 1, limit: 10 },
+});
+
+// Get token by id
+const token = await odinConnect.api.getToken("2jjj");
 
-// Get user info
-const user = await odinConnect.getUser(
+// Get user data by id
+const user = await odinConnect.api.getUser(
   "veyov-kjgrf-hke6v-6d63i-sdwae-oldgg-huau6-ke5g3-rllp2-5jhca-uqe"
 );
 
-// Get user balance
-const balances = await odinConnect.getBalances({
-  principal: user.principal,
+// Get user balance by user id
+const balances = await odinConnect.api.getBalances({
+  principal: "veyov-kjgrf-hke6v-6d63i-sdwae-oldgg-huau6-ke5g3-rllp2-5jhca-uqe",
   pagination: { page: 1, limit: 20 },
 });
 
-// Get user activities
-const activity = await odinConnect.getUserActivity({
+// Get activities by  user id
+const activity = await odinConnect.api.getUserActivity({
   principal: "veyov-kjgrf-hke6v-6d63i-sdwae-oldgg-huau6-ke5g3-rllp2-5jhca-uqe",
   pagination: { page: 1, limit: 10 },
 });
 ```
 
-### Notes
+## General Notes
 
-- The `principal` sent should match the currently logged in user in ODIN.
 - BTC amounts are in millisatoshis