mezon-js 2.13.84 → 2.13.86

package/client.ts

@@ -316,10 +316,16 @@ import {
   ApiListClanDiscover,
   ApiLoginIDResponse,
   ApiLoginRequest,
+  ApiMessageRef,
 } from "./types";
 import { GatewayMezonApi } from "./gateway.api";
 import { safeJSONParse } from "./utils";
 import { EmptySchema } from "./proto/gen/google/protobuf/empty_pb";
+import {
+  decodeMentions,
+  decodeAttachments,
+  decodeRefs,
+} from "mezon-js-protobuf";
 
 const DEFAULT_HOST = "127.0.0.1";
 const DEFAULT_PORT = "7350";
@@ -367,8 +373,8 @@ export enum WebrtcSignalingType {
 export class Client {
   /** The low level API client for Mezon server. */
   private readonly gatewayClient: GatewayMezonApi;
-  private grpcTransport: Transport;
-  private mezonClient: RPCClient<typeof MezonService>;
+  private readonly grpcTransport: Transport;
+  private readonly mezonClient: RPCClient<typeof MezonService>;
 
   /** thre refreshTokenPromise */
   private refreshTokenPromise: Promise<Session> | null = null;
@@ -390,16 +396,16 @@ export class Client {
     const scheme = useSSL ? "https://" : "http://";
     const basePath = `${scheme}${host}:${port}`;
 
-    this.grpcTransport = createGrpcWebTransport({
-      baseUrl: basePath,
-      useBinaryFormat: true,
-    });
-
     this.gatewayClient = new GatewayMezonApi(
       DEFAULT_SERVER_KEY,
       DEFAULT_TIMEOUT_MS,
       basePath
     );
+
+    this.grpcTransport = createGrpcWebTransport({
+      baseUrl: basePath,
+      useBinaryFormat: true,
+    });
     this.mezonClient = createClient(MezonService, this.grpcTransport);
   }
 
@@ -425,10 +431,7 @@ export class Client {
 
     const scheme = useSSL ? "https://" : "http://";
     const basePath = `${scheme}${host}:${port}`;
-    this.grpcTransport = createGrpcWebTransport({
-      baseUrl: basePath,
-    });
-    this.mezonClient = createClient(MezonService, this.grpcTransport);
+    return this.gatewayClient.setBasePath(basePath);
   }
 
   //#region Mezon Gateway APIs
@@ -1494,17 +1497,23 @@ export class Client {
         console.log("error parse reactions", e);
       }
       try {
-        mentions = safeJSONParse(m.mentions || "[]");
+        mentions =
+          decodeMentions(m.mentions)?.mentions ||
+          safeJSONParse(m.mentions || "[]");
       } catch (e) {
         console.log("error parse mentions", e);
       }
       try {
-        attachments = safeJSONParse(m.attachments || "[]");
+        attachments =
+          decodeAttachments(m.attachments)?.attachments ||
+          safeJSONParse(m.attachments || "[]");
       } catch (e) {
         console.log("error parse attachments", e);
       }
       try {
-        references = safeJSONParse(m.references || "[]");
+        references =
+          (decodeRefs(m.references)?.refs as unknown as ApiMessageRef[]) ||
+          safeJSONParse(m.references || "[]");
       } catch (e) {
         console.log("error parse references", e);
       }
@@ -1535,7 +1544,7 @@ export class Client {
         hideEditted: m.hideEditted,
       });
     });
-    
+
     return response;
   }
 
@@ -2307,6 +2316,7 @@ export class Client {
     this.refreshTokenPromise = new Promise<Session>(async (resolve, reject) => {
       try {
         const sessionRefreshRequest = create(SessionRefreshRequestSchema, {
+          //token: session.refreshToken,
           vars: vars,
           isRemember: session.isRemember,
         });

package/dist/client.d.ts

@@ -59,8 +59,8 @@ export declare class Client {
     readonly autoRefreshSession: boolean;
     /** The low level API client for Mezon server. */
     private readonly gatewayClient;
-    private grpcTransport;
-    private mezonClient;
+    private readonly grpcTransport;
+    private readonly mezonClient;
     /** thre refreshTokenPromise */
     private refreshTokenPromise;
     host: string;

package/dist/mezon-js/client.d.ts

@@ -59,8 +59,8 @@ export declare class Client {
     readonly autoRefreshSession: boolean;
     /** The low level API client for Mezon server. */
     private readonly gatewayClient;
-    private grpcTransport;
-    private mezonClient;
+    private readonly grpcTransport;
+    private readonly mezonClient;
     /** thre refreshTokenPromise */
     private refreshTokenPromise;
     host: string;