npm - mezon-sdk - Versions diffs - 2.8.14 → 2.8.17 - Mend

mezon-sdk 2.8.14 → 2.8.17

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (28) hide show

package/dist/cjs/mezon-client/structures/User.js CHANGED Viewed

@@ -51,18 +51,19 @@ class User {
         if (!this.clan.mmnClient) {
             throw new Error("MmnClient not initialized");
         }
+        const nonce = await this.getCurrentNonce(this.clan.clientId, "pending");
         try {
             return this.clan.mmnClient.sendTransaction({
                 sender: tokenEvent.sender_id,
-                recipient: tokenEvent.receiver_id,
+                recipient: this.id,
                 amount: this.clan.mmnClient.scaleAmountToDecimals(tokenEvent.amount),
-                nonce: tokenEvent.nonce,
+                nonce: nonce.nonce + 1,
                 textData: tokenEvent.note,
                 extraInfo: tokenEvent.extra_attribute,
-                publicKey: tokenEvent.public_key,
-                privateKey: tokenEvent.private_key,
-                zkProof: tokenEvent.zk_proof,
-                zkPub: tokenEvent.zk_pub,
+                publicKey: this.clan.keyGen.publicKey,
+                privateKey: this.clan.keyGen.privateKey,
+                zkProof: this.clan.zkProofs.proof,
+                zkPub: this.clan.zkProofs.public_input,
             });
         }
         catch (error) {

package/dist/cjs/mezon-client/structures/User.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"User.js","sourceRoot":"","sources":["../../../../src/mezon-client/structures/User.ts"],"names":[],"mappings":";;;AAAA,+CAAoD;AAoBpD,MAAa,IAAI;IAaf,YACE,YAA0B,EAC1B,IAAU,EACV,YAAgC,EAChC,aAA4B,EAC5B,cAA+B;;QAE/B,IAAI,CAAC,EAAE,GAAG,YAAY,CAAC,EAAE,CAAC;QAC1B,IAAI,CAAC,OAAO,GAAG,MAAA,YAAY,CAAC,OAAO,mCAAI,EAAE,CAAC;QAC1C,IAAI,CAAC,WAAW,GAAG,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,WAAW,mCAAI,EAAE,CAAC;QACnD,IAAI,CAAC,QAAQ,GAAG,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,QAAQ,mCAAI,EAAE,CAAC;QAC7C,IAAI,CAAC,SAAS,GAAG,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,SAAS,mCAAI,EAAE,CAAC;QAC/C,IAAI,CAAC,WAAW,GAAG,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,WAAW,mCAAI,EAAE,CAAC;QACnD,IAAI,CAAC,YAAY,GAAG,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,YAAY,mCAAI,EAAE,CAAC;QACrD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,mBAAmB;QACvB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACxB,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;SAC9C;QAED,OAAO,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,wBAAwB,EAAE,CAAC;IACxD,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,OAAe;QAC9B,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACxB,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;SAC9C;QAED,OAAO,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;IAC3D,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,IAA0B;QAC1C,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YACvB,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;SAC7C;QACD,MAAM,GAAG,GAAG;YACV,MAAM,EAAE,IAAI,CAAC,OAAO;YACpB,GAAG,EAAE,IAAI,CAAC,GAAG;YACb,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,kBAAkB,EAAE,IAAI,CAAC,oBAAoB;SAC9C,CAAC;QAEF,OAAO,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IAC7C,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,OAAe,EAAE,GAA0B;QAC/D,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACxB,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;SAC9C;QAED,OAAO,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,OAAO,EAAE,GAAG,IAAI,SAAS,CAAC,CAAC;IACxE,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,~~UAA+B~~;~~QAC7C~~,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACxB,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;SAC9C;QAED,IAAI;YACF,OAAO,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC;gBACzC,MAAM,EAAE,UAAU,CAAC,SAAS;gBAC5B,SAAS,EAAE,~~UAAU~~,CAAC,~~WAAW~~;~~gBACjC~~,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,qBAAqB,CAAC,UAAU,CAAC,MAAM,CAAC;gBACpE,KAAK,EAAE,~~UAAU~~,CAAC,KAAK;~~gBACvB~~,QAAQ,EAAE,UAAU,CAAC,IAAI;gBACzB,SAAS,EAAE,UAAU,CAAC,eAAe;gBACrC,SAAS,EAAE,~~UAAU~~,CAAC,~~UAAU~~;~~gBAChC~~,UAAU,EAAE,~~UAAU~~,CAAC,~~WAAW~~;~~gBAClC~~,OAAO,EAAE,~~UAAU~~,CAAC,QAAQ;~~gBAC5B~~,KAAK,EAAE,~~UAAU~~,CAAC,~~MAAM~~;~~aACzB~~,CAAC,CAAC;SACJ;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;YAC/B,OAAO,IAAI,CAAC;SACb;IACH,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,OAA8B,EAAE,IAAa;QACxD,OAAO,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE;;YAC1C,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;gBACrB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;gBAC/C,IAAI,CAAC,WAAW,GAAG,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,UAAU,mCAAI,EAAE,CAAC;aAChD;YACD,IAAI,CAAC,IAAI,CAAC,WAAW;gBACnB,MAAM,KAAK,CAAC,yCAAyC,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;YACnE,MAAM,UAAU,GAAG;gBACjB,OAAO,EAAE,GAAG;gBACZ,UAAU,EAAE,IAAI,CAAC,WAAW;gBAC5B,IAAI,EAAE,6BAAiB,CAAC,cAAc;gBACtC,SAAS,EAAE,KAAK;gBAChB,OAAO;gBACP,IAAI;aACL,CAAC;YACF,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;QAC/D,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,eAAe;;QACnB,IAAI;YACF,MAAM,SAAS,GAAG,MAAM,CAAA,MAAA,IAAI,CAAC,cAAc,0CAAE,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA,CAAC;YACtE,OAAO,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,EAAE,CAAC;SACxB;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;YAC1C,OAAO,IAAI,CAAC;SACb;IACH,CAAC;IAED,KAAK,CAAC,qBAAqB,CAAC,aAAqB;QAC/C,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC;QACvC,OAAO,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,qBAAqB,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IAC3E,CAAC;CACF;~~AAjID~~,~~oBAiIC~~"}
1	+ {"version":3,"file":"User.js","sourceRoot":"","sources":["../../../../src/mezon-client/structures/User.ts"],"names":[],"mappings":"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"}

package/dist/esm/interfaces/client.d.ts CHANGED Viewed

@@ -483,20 +483,18 @@ export interface ApiGetZkProofRequest {
     jwt: string;
     address: string;
 }
-export interface APISentTokenRequest {
-    sender_id: string;
+export interface BaseSentTokenRequest {
     sender_name?: string;
-    receiver_id: string;
+    sender_id: string;
     amount: number;
     note?: string;
     extra_attribute?: ExtraInfo;
-    nonce: number;
     timestamp?: number;
-    public_key: string;
-    private_key: string;
-    zk_proof: string;
-    zk_pub: string;
 }
+export interface APISentTokenRequest extends BaseSentTokenRequest {
+    receiver_id: string;
+}
+export type APISentTokenRequestUser = BaseSentTokenRequest;
 export interface TokenSentEvent {
     sender_id?: string;
     sender_name?: string;

package/dist/esm/mezon-client/client/MezonClient.d.ts CHANGED Viewed

@@ -7,6 +7,7 @@ import { AddClanUserEvent, ApiGetZkProofRequest, APISentTokenRequest, ChannelCre
 import { MessageButtonClicked, Notifications, RoleAssignedEvent, RoleEvent, WebrtcSignalingFwd } from "../../rtapi/realtime";
 import { CreateEventRequest } from "../../api/api";
 import { Session } from "../../session";
+import { IEphemeralKeyPair, IZkProof, MmnClient, ZkClient } from "mmn-client-js";
 export declare class MezonClient extends EventEmitter {
     readonly timeout: number;
     token: string;
@@ -17,9 +18,12 @@ export declare class MezonClient extends EventEmitter {
     loginBasePath: string | undefined;
     mmnApiUrl: string | undefined;
     zkApiUrl: string | undefined;
+    keyGen: IEphemeralKeyPair;
+    addressMMN: string;
+    zkProofs: IZkProof;
     private apiClient;
-    private mmnClient;
-    private zkClient;
+    private _mmnClient;
+    private _zkClient;
     private socketManager;
     private channelManager;
     private sessionManager;
@@ -29,14 +33,16 @@ export declare class MezonClient extends EventEmitter {
     channels: CacheManager<string, TextChannel>;
     private messageDB;
     constructor(token?: string, host?: string, port?: string, useSSL?: boolean, timeout?: number, mmnApiUrl?: string, zkApiUrl?: string);
+    get mmnClient(): MmnClient;
+    get zkClient(): ZkClient;
     initManager(basePath: string, sessionApi?: Session): void;
     /** Login bot */
     login(): Promise<string>;
     /** Create DM channel */
     createDMchannel(userId: string): Promise<any>;
-    getEphemeralKeyPair(): Promise<import("mmn-client-js").IEphemeralKeyPair>;
+    getEphemeralKeyPair(): Promise<IEphemeralKeyPair>;
     getAddress(user_id: string): Promise<string>;
-    getZkProofs(data: ApiGetZkProofRequest): Promise<import("mmn-client-js").IZkProof>;
+    getZkProofs(data: ApiGetZkProofRequest): Promise<IZkProof>;
     getCurrentNonce(user_id: string, tag?: "latest" | "pending"): Promise<import("mmn-client-js").GetCurrentNonceResponse>;
     sendToken(tokenEvent: APISentTokenRequest): Promise<import("mmn-client-js").AddTxResponse>;
     /** Listen to messages user sends on the  channel, thread */

package/dist/esm/mezon-client/client/MezonClient.js CHANGED Viewed

@@ -16,12 +16,14 @@ import { ChannelManager } from "../manager/channel_manager";
 import { User } from "../structures/User";
 import { AsyncThrottleQueue } from "../utils/AsyncThrottleQueue";
 import { MessageDatabase } from "../../sqlite/MessageDatabase";
-import { MmnClient, ZkClient } from "mmn-client-js";
+import { MmnClient, ZkClient, } from "mmn-client-js";
 const DEFAULT_HOST = "gw.mezon.ai";
 const DEFAULT_PORT = "443";
 const DEFAULT_API_KEY = "";
 const DEFAULT_SSL = true;
 const DEFAULT_TIMEOUT_MS = 7000;
+const DEFAULT_MMN_API = "https://dong.mezon.ai/mmn-api/";
+const DEFAULT_ZK_API = "https://dong.mezon.ai/zk-api/";
 export class MezonClient extends EventEmitter {
     timeout;
     token;
@@ -32,9 +34,12 @@ export class MezonClient extends EventEmitter {
     loginBasePath;
     mmnApiUrl;
     zkApiUrl;
+    keyGen;
+    addressMMN;
+    zkProofs;
     apiClient;
-    mmnClient;
-    zkClient;
+    _mmnClient;
+    _zkClient;
     socketManager;
     channelManager;
     sessionManager;
@@ -43,7 +48,7 @@ export class MezonClient extends EventEmitter {
     clans;
     channels;
     messageDB;
-    constructor(token = DEFAULT_API_KEY, host = DEFAULT_HOST, port = DEFAULT_PORT, useSSL = DEFAULT_SSL, timeout = DEFAULT_TIMEOUT_MS, mmnApiUrl, zkApiUrl) {
+    constructor(token = DEFAULT_API_KEY, host = DEFAULT_HOST, port = DEFAULT_PORT, useSSL = DEFAULT_SSL, timeout = DEFAULT_TIMEOUT_MS, mmnApiUrl = DEFAULT_MMN_API, zkApiUrl = DEFAULT_ZK_API) {
         super();
         this.timeout = timeout;
         const scheme = useSSL ? "https://" : "http://";
@@ -56,6 +61,18 @@ export class MezonClient extends EventEmitter {
         this.zkApiUrl = zkApiUrl;
         this.messageDB = new MessageDatabase();
     }
+    get mmnClient() {
+        if (!this._mmnClient) {
+            throw new Error("MmnClient not initialized");
+        }
+        return this._mmnClient;
+    }
+    get zkClient() {
+        if (!this._zkClient) {
+            throw new Error("ZkClient not initialized");
+        }
+        return this._zkClient;
+    }
     initManager(basePath, sessionApi) {
         this.eventManager = new EventManager();
         this.clans = new CacheManager(this._fetchClanFromAPI.bind(this));
@@ -65,13 +82,13 @@ export class MezonClient extends EventEmitter {
         this.socketManager = new SocketManager(this.host, this.port, this.useSSL, new WebSocketAdapterPb(), this.apiClient, this.eventManager, this.messageQueue, this, this.messageDB);
         this.channelManager = new ChannelManager(this.apiClient, this.socketManager, this.sessionManager);
         if (this.mmnApiUrl) {
-            this.mmnClient = new MmnClient({
+            this._mmnClient = new MmnClient({
                 baseUrl: this.mmnApiUrl,
                 timeout: this.timeout,
             });
         }
         if (this.zkApiUrl) {
-            this.zkClient = new ZkClient({
+            this._zkClient = new ZkClient({
                 endpoint: this.zkApiUrl,
                 timeout: this.timeout,
             });
@@ -79,26 +96,43 @@ export class MezonClient extends EventEmitter {
     }
     /** Login bot */
     async login() {
-        const tempApiClient = new MezonApi(this.token, this.loginBasePath, this.timeout);
-        const tempSessionManager = new SessionManager(tempApiClient);
-        const sessionApi = await tempSessionManager.authenticate(this.token);
-        if (sessionApi?.api_url) {
-            const { host, port, useSSL } = parseUrlToHostAndSSL(sessionApi.api_url);
-            this.host = host;
-            this.port = port || (useSSL ? "443" : "80");
-            this.useSSL = useSSL;
-            const scheme = this.useSSL ? "https://" : "http://";
-            const basePath = `${scheme}${this.host}:${this.port}`;
-            this.initManager(basePath, sessionApi);
+        try {
+            const tempApiClient = new MezonApi(this.token, this.loginBasePath, this.timeout);
+            const tempSessionManager = new SessionManager(tempApiClient);
+            const sessionApi = await tempSessionManager.authenticate(this.token);
+            if (sessionApi?.api_url) {
+                const { host, port, useSSL } = parseUrlToHostAndSSL(sessionApi.api_url);
+                this.host = host;
+                this.port = port || (useSSL ? "443" : "80");
+                this.useSSL = useSSL;
+                const scheme = this.useSSL ? "https://" : "http://";
+                const basePath = `${scheme}${this.host}:${this.port}`;
+                this.initManager(basePath, sessionApi);
+            }
+            this.clientId = sessionApi?.user_id;
+            // init for MMN
+            if (sessionApi?.user_id) {
+                this.keyGen = await this.getEphemeralKeyPair();
+                this.addressMMN = await this.getAddress(sessionApi.user_id);
+                this.zkProofs = await this.getZkProofs({
+                    user_id: sessionApi.user_id,
+                    jwt: sessionApi?.token,
+                    address: this.addressMMN,
+                    ephemeral_public_key: this.keyGen.publicKey,
+                });
+            }
+            const sessionConnected = await this.socketManager.connect(sessionApi);
+            if (sessionConnected?.token) {
+                await this.socketManager.connectSocket(sessionConnected.token);
+                await this.channelManager.initAllDmChannels(sessionConnected.token);
+            }
+            this.emit("ready");
+            return JSON.stringify(sessionApi ?? {});
         }
-        this.clientId = sessionApi?.user_id;
-        const sessionConnected = await this.socketManager.connect(sessionApi);
-        if (sessionConnected?.token) {
-            await this.socketManager.connectSocket(sessionConnected.token);
-            await this.channelManager.initAllDmChannels(sessionConnected.token);
+        catch (error) {
+            this.socketManager?.closeSocket();
+            throw new Error("Some thing went wrong, please reset bot!");
         }
-        this.emit("ready");
-        return JSON.stringify(sessionApi ?? {});
     }
     /** Create DM channel */
     async createDMchannel(userId) {
@@ -141,19 +175,19 @@ export class MezonClient extends EventEmitter {
         }
     }
     async getEphemeralKeyPair() {
-        if (!this.mmnClient) {
+        if (!this._mmnClient) {
             throw new Error("MmnClient not initialized");
         }
-        return this.mmnClient.generateEphemeralKeyPair();
+        return this._mmnClient.generateEphemeralKeyPair();
     }
     async getAddress(user_id) {
-        if (!this.mmnClient) {
+        if (!this._mmnClient) {
             throw new Error("MmnClient not initialized");
         }
-        return this.mmnClient.getAddressFromUserId(user_id);
+        return this._mmnClient.getAddressFromUserId(user_id);
     }
     async getZkProofs(data) {
-        if (!this.zkClient) {
+        if (!this._zkClient) {
             throw new Error("ZkClient not initialized");
         }
         const req = {
@@ -162,29 +196,30 @@ export class MezonClient extends EventEmitter {
             address: data.address,
             ephemeralPublicKey: data.ephemeral_public_key,
         };
-        return this.zkClient.getZkProofs(req);
+        return this._zkClient.getZkProofs(req);
     }
     async getCurrentNonce(user_id, tag) {
-        if (!this.mmnClient) {
+        if (!this._mmnClient) {
             throw new Error("MmnClient not initialized");
         }
-        return this.mmnClient.getCurrentNonce(user_id, tag || "pending");
+        return this._mmnClient.getCurrentNonce(user_id, tag || "pending");
     }
     async sendToken(tokenEvent) {
-        if (!this.mmnClient) {
+        if (!this._mmnClient) {
             throw new Error("MmnClient not initialized");
         }
-        return this.mmnClient.sendTransaction({
+        const nonce = await this.getCurrentNonce(this.clientId, "pending");
+        return this._mmnClient.sendTransaction({
             sender: tokenEvent.sender_id,
             recipient: tokenEvent.receiver_id,
-            amount: this.mmnClient.scaleAmountToDecimals(tokenEvent.amount),
-            nonce: tokenEvent.nonce,
+            amount: this._mmnClient.scaleAmountToDecimals(tokenEvent.amount),
+            nonce: nonce.nonce + 1,
             textData: tokenEvent.note,
             extraInfo: tokenEvent.extra_attribute,
-            publicKey: tokenEvent.public_key,
-            privateKey: tokenEvent.private_key,
-            zkProof: tokenEvent.zk_proof,
-            zkPub: tokenEvent.zk_pub,
+            publicKey: this.keyGen.publicKey,
+            privateKey: this.keyGen.privateKey,
+            zkProof: this.zkProofs.proof,
+            zkPub: this.zkProofs.public_input,
         });
     }
     /** Listen to messages user sends on the  channel, thread */

package/dist/esm/mezon-client/client/MezonClient.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"MezonClient.js","sourceRoot":"","sources":["../../../../src/mezon-client/client/MezonClient.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"MezonClient.js","sourceRoot":"","sources":["../../../../src/mezon-client/client/MezonClient.ts"],"names":[],"mappings":"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"}

package/dist/esm/mezon-client/manager/socket_manager.js CHANGED Viewed

@@ -92,13 +92,13 @@ export class SocketManager {
         }
     }
     async retriesConnect() {
-        if (this.isRetrying)
-            return;
-        this.isRetrying = true;
         let retryInterval = 5000;
         const maxRetryInterval = 60000;
         console.log("Reconnecting...");
         const retry = async () => {
+            if (this.isRetrying || this.isHardDisconnect)
+                return;
+            this.isRetrying = true;
             try {
                 await this.client.login();
                 this.isRetrying = false;

package/dist/esm/mezon-client/manager/socket_manager.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"socket_manager.js","sourceRoot":"","sources":["../../../../src/mezon-client/manager/socket_manager.ts"],"names":[],"mappings":"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~~IAAI,CAAC,UAAU;YAAE,OAAO;QAC5B,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QAEvB,IAAI,~~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"}
1	+ {"version":3,"file":"socket_manager.js","sourceRoot":"","sources":["../../../../src/mezon-client/manager/socket_manager.ts"],"names":[],"mappings":"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"}

package/dist/esm/mezon-client/structures/Clan.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { MmnClient, ZkClient } from "mmn-client-js";
+import { IEphemeralKeyPair, IZkProof, MmnClient, ZkClient } from "mmn-client-js";
 import { MezonApi } from "../../api";
 import { ApiRoleListEventResponse, ApiVoiceChannelUserList, MezonUpdateRoleBody } from "../../interfaces";
 import { MessageDatabase } from "../../sqlite/MessageDatabase";
@@ -21,6 +21,10 @@ export declare class Clan {
     users: CacheManager<string, User>;
     sessionToken: string;
     apiClient: MezonApi;
+    clientId: string;
+    keyGen: IEphemeralKeyPair;
+    addressMMN: string;
+    zkProofs: IZkProof;
     mmnClient: MmnClient;
     zkClient: ZkClient;
     private _channelsLoaded;
@@ -29,7 +33,7 @@ export declare class Clan {
     private readonly socketManager;
     private readonly messageQueue;
     private readonly messageDB;
-    constructor(initClanData: ClanInitData, client: MezonClient, apiClient: MezonApi, socketManager: SocketManager, sessionToken: string, messageQueue: AsyncThrottleQueue, messageDB: MessageDatabase, mmnApiUrl?: string, zkApiUrl?: string);
+    constructor(initClanData: ClanInitData, client: MezonClient, apiClient: MezonApi, socketManager: SocketManager, sessionToken: string, messageQueue: AsyncThrottleQueue, messageDB: MessageDatabase);
     getClientId(): string | undefined;
     loadChannels(): Promise<void>;
     listChannelVoiceUsers(channel_id?: string, channel_type?: number, limit?: number, state?: number, cursor?: string): Promise<ApiVoiceChannelUserList>;

package/dist/esm/mezon-client/structures/Clan.js CHANGED Viewed

@@ -1,4 +1,3 @@
-import { MmnClient, ZkClient } from "mmn-client-js";
 import { ChannelType } from "../../constants";
 import { CacheManager } from "../utils/CacheManager";
 import { TextChannel } from "./TextChannel";
@@ -11,6 +10,10 @@ export class Clan {
     users;
     sessionToken;
     apiClient;
+    clientId;
+    keyGen;
+    addressMMN;
+    zkProofs;
     mmnClient;
     zkClient;
     // cache status load channel
@@ -21,11 +24,17 @@ export class Clan {
     socketManager;
     messageQueue;
     messageDB;
-    constructor(initClanData, client, apiClient, socketManager, sessionToken, messageQueue, messageDB, mmnApiUrl, zkApiUrl) {
+    constructor(initClanData, client, apiClient, socketManager, sessionToken, messageQueue, messageDB) {
         this.id = initClanData.id;
         this.name = initClanData.name;
         this.welcome_channel_id = initClanData.welcome_channel_id;
         this.client = client;
+        this.clientId = client.clientId;
+        this.keyGen = client.keyGen;
+        this.addressMMN = client.addressMMN;
+        this.zkProofs = client.zkProofs;
+        this.mmnClient = client.mmnClient;
+        this.zkClient = client.zkClient;
         this.apiClient = apiClient;
         this.socketManager = socketManager;
         this.messageQueue = messageQueue;
@@ -47,16 +56,6 @@ export class Clan {
             this.users.set(user_id, user);
             return user;
         });
-        if (mmnApiUrl) {
-            this.mmnClient = new MmnClient({
-                baseUrl: mmnApiUrl,
-            });
-        }
-        if (zkApiUrl) {
-            this.zkClient = new ZkClient({
-                endpoint: zkApiUrl,
-            });
-        }
     }
     getClientId() {
         return this.client.clientId;

package/dist/esm/mezon-client/structures/Clan.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"Clan.js","sourceRoot":"","sources":["../../../../src/mezon-client/structures/Clan.ts"],"names":[],"mappings":"~~AAAA~~,OAAO,EAAE,~~SAAS,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEpD,OAAO,EAAE,~~WAAW,EAAE,MAAM,iBAAiB,CAAC;AAU9C,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,IAAI,EAAgB,MAAM,QAAQ,CAAC;AAQ5C,MAAM,OAAO,IAAI;IACR,EAAE,CAAS;IACX,IAAI,CAAS;IACb,kBAAkB,CAAS;IAC3B,QAAQ,CAAoC;IAC5C,KAAK,CAA6B;IAClC,YAAY,CAAS;IACrB,SAAS,CAAW;IACpB,SAAS,CAAa;IACtB,QAAQ,CAAY;IAE3B,4BAA4B;IACpB,eAAe,GAAG,KAAK,CAAC;IAEhC,qCAAqC;IAC7B,eAAe,GAAyB,IAAI,CAAC;IACpC,MAAM,CAAc;IACpB,aAAa,CAAgB;IAC7B,YAAY,CAAqB;IACjC,SAAS,CAAkB;IAE5C,YACE,YAA0B,EAC1B,MAAmB,EACnB,SAAmB,EACnB,aAA4B,EAC5B,YAAoB,EACpB,YAAgC,EAChC,SAA0B~~,EAC1B,SAAkB,EAClB,QAAiB~~;~~QAEjB~~,IAAI,CAAC,EAAE,GAAG,YAAY,CAAC,EAAE,CAAC;QAC1B,IAAI,CAAC,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC;QAC9B,IAAI,CAAC,kBAAkB,GAAG,YAAY,CAAC,kBAAkB,CAAC;QAC1D,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,QAAQ,GAAG,IAAI,YAAY,CAAsB,KAAK,EAAE,SAAS,EAAE,EAAE;YACxE,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAC/C,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,KAAK,GAAG,IAAI,YAAY,CAAe,KAAK,EAAE,OAAO,EAAE,EAAE;YAC5D,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;YAC7D,IAAI,CAAC,SAAS,IAAI,CAAC,SAAS,EAAE,UAAU,EAAE;gBACxC,MAAM,KAAK,CAAC,QAAQ,OAAO,2BAA2B,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;aACnE;YACD,MAAM,OAAO,GAAiB;gBAC5B,EAAE,EAAE,OAAO;gBACX,WAAW,EAAE,SAAS,CAAC,UAAU;aAClC,CAAC;YACF,MAAM,IAAI,GAAG,IAAI,IAAI,CACnB,OAAO,EACP,IAAI,EACJ,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,aAAa,CACnB,CAAC;YACF,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YAC9B,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;~~QAEH~~,~~IAAI,SAAS,EAAE;YACb,IAAI,~~CAAC~~,SAAS,GAAG,IAAI,SAAS,CAAC~~;~~gBAC7B,OAAO,EAAE,SAAS;aACnB,CAAC,CAAC;SACJ;QACD,IAAI,QAAQ,EAAE;YACZ,IAAI,CAAC,QAAQ,GAAG,IAAI,QAAQ,CAAC;gBAC3B,QAAQ,EAAE,QAAQ;aACnB,CAAC,CAAC;SACJ;IACH,CAAC;~~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"}
1	+ {"version":3,"file":"Clan.js","sourceRoot":"","sources":["../../../../src/mezon-client/structures/Clan.ts"],"names":[],"mappings":"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"}

package/dist/esm/mezon-client/structures/User.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { ApiGetZkProofRequest, APISentTokenRequest, ChannelMessageContent } from "../../interfaces";
+import { ApiGetZkProofRequest, APISentTokenRequestUser, ChannelMessageContent } from "../../interfaces";
 import { ChannelManager } from "../manager/channel_manager";
 import { SocketManager } from "../manager/socket_manager";
 import { AsyncThrottleQueue } from "../utils/AsyncThrottleQueue";
@@ -29,7 +29,7 @@ export declare class User {
     getAddress(user_id: string): Promise<string>;
     getZkProofs(data: ApiGetZkProofRequest): Promise<import("mmn-client-js").IZkProof>;
     getCurrentNonce(user_id: string, tag?: "latest" | "pending"): Promise<import("mmn-client-js").GetCurrentNonceResponse>;
-    sendToken(tokenEvent: APISentTokenRequest): Promise<import("mmn-client-js").AddTxResponse | null>;
+    sendToken(tokenEvent: APISentTokenRequestUser): Promise<import("mmn-client-js").AddTxResponse | null>;
     sendDM(content: ChannelMessageContent, code?: number): Promise<import("../../interfaces").ChannelMessageAck>;
     createDmChannel(): Promise<import("../../interfaces").ApiChannelDescription | null>;
     listTransactionDetail(transactionId: string): Promise<any>;

package/dist/esm/mezon-client/structures/User.js CHANGED Viewed

@@ -58,18 +58,19 @@ export class User {
         if (!this.clan.mmnClient) {
             throw new Error("MmnClient not initialized");
         }
+        const nonce = await this.getCurrentNonce(this.clan.clientId, "pending");
         try {
             return this.clan.mmnClient.sendTransaction({
                 sender: tokenEvent.sender_id,
-                recipient: tokenEvent.receiver_id,
+                recipient: this.id,
                 amount: this.clan.mmnClient.scaleAmountToDecimals(tokenEvent.amount),
-                nonce: tokenEvent.nonce,
+                nonce: nonce.nonce + 1,
                 textData: tokenEvent.note,
                 extraInfo: tokenEvent.extra_attribute,
-                publicKey: tokenEvent.public_key,
-                privateKey: tokenEvent.private_key,
-                zkProof: tokenEvent.zk_proof,
-                zkPub: tokenEvent.zk_pub,
+                publicKey: this.clan.keyGen.publicKey,
+                privateKey: this.clan.keyGen.privateKey,
+                zkProof: this.clan.zkProofs.proof,
+                zkPub: this.clan.zkProofs.public_input,
             });
         }
         catch (error) {

package/dist/esm/mezon-client/structures/User.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"User.js","sourceRoot":"","sources":["../../../../src/mezon-client/structures/User.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAoBpD,MAAM,OAAO,IAAI;IACR,EAAE,CAAS;IACX,QAAQ,CAAS;IACjB,SAAS,CAAS;IAClB,WAAW,CAAS;IACpB,YAAY,CAAS;IACrB,OAAO,CAAS;IAChB,WAAW,CAAS;IACnB,IAAI,CAAO;IACF,cAAc,CAA6B;IAC3C,YAAY,CAAqB;IACjC,aAAa,CAAgB;IAE9C,YACE,YAA0B,EAC1B,IAAU,EACV,YAAgC,EAChC,aAA4B,EAC5B,cAA+B;QAE/B,IAAI,CAAC,EAAE,GAAG,YAAY,CAAC,EAAE,CAAC;QAC1B,IAAI,CAAC,OAAO,GAAG,YAAY,CAAC,OAAO,IAAI,EAAE,CAAC;QAC1C,IAAI,CAAC,WAAW,GAAG,YAAY,EAAE,WAAW,IAAI,EAAE,CAAC;QACnD,IAAI,CAAC,QAAQ,GAAG,YAAY,EAAE,QAAQ,IAAI,EAAE,CAAC;QAC7C,IAAI,CAAC,SAAS,GAAG,YAAY,EAAE,SAAS,IAAI,EAAE,CAAC;QAC/C,IAAI,CAAC,WAAW,GAAG,YAAY,EAAE,WAAW,IAAI,EAAE,CAAC;QACnD,IAAI,CAAC,YAAY,GAAG,YAAY,EAAE,YAAY,IAAI,EAAE,CAAC;QACrD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,mBAAmB;QACvB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACxB,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;SAC9C;QAED,OAAO,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,wBAAwB,EAAE,CAAC;IACxD,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,OAAe;QAC9B,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACxB,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;SAC9C;QAED,OAAO,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;IAC3D,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,IAA0B;QAC1C,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YACvB,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;SAC7C;QACD,MAAM,GAAG,GAAG;YACV,MAAM,EAAE,IAAI,CAAC,OAAO;YACpB,GAAG,EAAE,IAAI,CAAC,GAAG;YACb,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,kBAAkB,EAAE,IAAI,CAAC,oBAAoB;SAC9C,CAAC;QAEF,OAAO,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IAC7C,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,OAAe,EAAE,GAA0B;QAC/D,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACxB,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;SAC9C;QAED,OAAO,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,OAAO,EAAE,GAAG,IAAI,SAAS,CAAC,CAAC;IACxE,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,~~UAA+B~~;~~QAC7C~~,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACxB,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;SAC9C;QAED,IAAI;YACF,OAAO,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC;gBACzC,MAAM,EAAE,UAAU,CAAC,SAAS;gBAC5B,SAAS,EAAE,~~UAAU~~,CAAC,~~WAAW~~;~~gBACjC~~,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,qBAAqB,CAAC,UAAU,CAAC,MAAM,CAAC;gBACpE,KAAK,EAAE,~~UAAU~~,CAAC,KAAK;~~gBACvB~~,QAAQ,EAAE,UAAU,CAAC,IAAI;gBACzB,SAAS,EAAE,UAAU,CAAC,eAAe;gBACrC,SAAS,EAAE,~~UAAU~~,CAAC,~~UAAU~~;~~gBAChC~~,UAAU,EAAE,~~UAAU~~,CAAC,~~WAAW~~;~~gBAClC~~,OAAO,EAAE,~~UAAU~~,CAAC,QAAQ;~~gBAC5B~~,KAAK,EAAE,~~UAAU~~,CAAC,~~MAAM~~;~~aACzB~~,CAAC,CAAC;SACJ;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;YAC/B,OAAO,IAAI,CAAC;SACb;IACH,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,OAA8B,EAAE,IAAa;QACxD,OAAO,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE;YAC1C,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;gBACrB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;gBAC/C,IAAI,CAAC,WAAW,GAAG,SAAS,EAAE,UAAU,IAAI,EAAE,CAAC;aAChD;YACD,IAAI,CAAC,IAAI,CAAC,WAAW;gBACnB,MAAM,KAAK,CAAC,yCAAyC,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;YACnE,MAAM,UAAU,GAAG;gBACjB,OAAO,EAAE,GAAG;gBACZ,UAAU,EAAE,IAAI,CAAC,WAAW;gBAC5B,IAAI,EAAE,iBAAiB,CAAC,cAAc;gBACtC,SAAS,EAAE,KAAK;gBAChB,OAAO;gBACP,IAAI;aACL,CAAC;YACF,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;QAC/D,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,eAAe;QACnB,IAAI;YACF,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACtE,OAAO,SAAS,IAAI,EAAE,CAAC;SACxB;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;YAC1C,OAAO,IAAI,CAAC;SACb;IACH,CAAC;IAED,KAAK,CAAC,qBAAqB,CAAC,aAAqB;QAC/C,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC;QACvC,OAAO,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,qBAAqB,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IAC3E,CAAC;CACF"}
1	+ {"version":3,"file":"User.js","sourceRoot":"","sources":["../../../../src/mezon-client/structures/User.ts"],"names":[],"mappings":"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"}