mezon-js 2.9.94 → 2.9.95

package/client.ts

@@ -160,6 +160,7 @@ import {
 
 import { Session } from "./session";
 import { DefaultSocket, Socket } from "./socket";
+import { safeJSONParse } from "./utils";
 import { WebSocketAdapter, WebSocketAdapterText } from "./web_socket_adapter";
 
 const DEFAULT_HOST = "127.0.0.1";
@@ -1346,7 +1347,7 @@ export class Client {
             timezone: u.timezone,
             update_time: u.update_time,
             username: u.username,
-            metadata: u.metadata ? JSON.parse(u.metadata) : undefined,
+            metadata: u.metadata ? safeJSONParse(u.metadata) : undefined,
           });
         });
         return Promise.resolve(result);
@@ -1434,27 +1435,27 @@ export class Client {
         response.messages!.forEach((m) => {
           var content, reactions, mentions, attachments, references;
           try {
-            content = JSON.parse(m.content);
+            content = safeJSONParse(m.content);
           } catch (e) {
             console.log("error parse content", e);
           }
           try {
-            reactions = JSON.parse(m.reactions || "[]");
+            reactions = safeJSONParse(m.reactions || "[]");
           } catch (e) {
             console.log("error parse reactions", e);
           }
           try {
-            mentions = JSON.parse(m.mentions || "[]");
+            mentions = safeJSONParse(m.mentions || "[]");
           } catch (e) {
             console.log("error parse mentions", e);
           }
           try {
-            attachments = JSON.parse(m.attachments || "[]");
+            attachments = safeJSONParse(m.attachments || "[]");
           } catch (e) {
             console.log("error parse attachments", e);
           }
           try {
-            references = JSON.parse(m.references || "[]");
+            references = safeJSONParse(m.references || "[]");
           } catch (e) {
             console.log("error parse references", e);
           }
@@ -1689,7 +1690,7 @@ export class Client {
               update_time: gu.user!.update_time,
               username: gu.user!.username,
               metadata: gu.user!.metadata
-                ? JSON.parse(gu.user!.metadata!)
+                ? safeJSONParse(gu.user!.metadata!)
                 : undefined,
             },
             role_id: gu!.role_id,
@@ -2208,7 +2209,7 @@ export class Client {
               username: f.user!.username,
               is_mobile: f.user?.is_mobile,
               metadata: f.user!.metadata
-                ? JSON.parse(f.user!.metadata!)
+                ? safeJSONParse(f.user!.metadata!)
                 : undefined,
             },
             state: f.state,
@@ -2253,7 +2254,7 @@ export class Client {
             persistent: n.persistent,
             sender_id: n.sender_id,
             subject: n.subject,
-            content: n.content ? JSON.parse(n.content) : undefined,
+            content: n.content ? safeJSONParse(n.content) : undefined,
           });
         });
         return Promise.resolve(result);
@@ -2287,7 +2288,7 @@ export class Client {
       .then((response: ApiRpc) => {
         return Promise.resolve({
           id: response.id,
-          payload: !response.payload ? undefined : JSON.parse(response.payload),
+          payload: !response.payload ? undefined : safeJSONParse(response.payload),
         });
       });
   }
@@ -2303,7 +2304,7 @@ export class Client {
       .then((response: ApiRpc) => {
         return Promise.resolve({
           id: response.id,
-          payload: !response.payload ? undefined : JSON.parse(response.payload),
+          payload: !response.payload ? undefined : safeJSONParse(response.payload),
         });
       })
       .catch((err: any) => {

package/dist/mezon-js.cjs.js

@@ -680,6 +680,27 @@ function buildFetchOptions(method, options, bodyJson) {
   }
   return fetchOptions;
 }
+function safeJSONParse(jsonString) {
+  try {
+    const unescapedJSON = jsonString.replace(/\\./g, (match) => {
+      switch (match) {
+        case '\\"':
+          return '"';
+        case "\\n":
+          return "\n";
+        case "\\t":
+          return "	";
+        default:
+          return match[1];
+      }
+    });
+    const parsedData = JSON.parse(unescapedJSON);
+    return parsedData;
+  } catch (error) {
+    console.error("Error parsing JSON:", error);
+    return null;
+  }
+}
 
 // api.gen.ts
 var MezonApi = class {
@@ -6883,7 +6904,7 @@ var WebSocketAdapterText = class {
   set onMessage(value) {
     if (value) {
       this._socket.onmessage = (evt) => {
-        const message = JSON.parse(evt.data);
+        const message = safeJSONParse(evt.data);
         if (message.party_data && message.party_data.data) {
           message.party_data.data = new Uint8Array(
             decode2(message.party_data.data)
@@ -6990,7 +7011,7 @@ var _DefaultSocket = class _DefaultSocket {
       if (!message.cid) {
         if (message.notifications) {
           message.notifications.notifications.forEach((n) => {
-            n.content = n.content ? JSON.parse(n.content) : void 0;
+            n.content = n.content ? safeJSONParse(n.content) : void 0;
             this.onnotification(n);
           });
         } else if (message.voice_started_event) {
@@ -7038,27 +7059,27 @@ var _DefaultSocket = class _DefaultSocket {
         } else if (message.channel_message) {
           var content, reactions, mentions, attachments, references;
           try {
-            content = JSON.parse(message.channel_message.content);
+            content = safeJSONParse(message.channel_message.content);
           } catch (e2) {
             console.log("content is invalid", e2);
           }
           try {
-            reactions = JSON.parse(message.channel_message.reactions);
+            reactions = safeJSONParse(message.channel_message.reactions);
           } catch (e2) {
             console.log("reactions is invalid", e2);
           }
           try {
-            mentions = JSON.parse(message.channel_message.mentions);
+            mentions = safeJSONParse(message.channel_message.mentions);
           } catch (e2) {
             console.log("mentions is invalid", e2);
           }
           try {
-            attachments = JSON.parse(message.channel_message.attachments);
+            attachments = safeJSONParse(message.channel_message.attachments);
           } catch (e2) {
             console.log("attachments is invalid", e2);
           }
           try {
-            references = JSON.parse(message.channel_message.references);
+            references = safeJSONParse(message.channel_message.references);
           } catch (e2) {
             console.log("references is invalid", e2);
           }
@@ -8383,7 +8404,7 @@ var Client = class {
             timezone: u.timezone,
             update_time: u.update_time,
             username: u.username,
-            metadata: u.metadata ? JSON.parse(u.metadata) : void 0
+            metadata: u.metadata ? safeJSONParse(u.metadata) : void 0
           });
         });
         return Promise.resolve(result);
@@ -8437,27 +8458,27 @@ var Client = class {
         response.messages.forEach((m) => {
           var content, reactions, mentions, attachments, references;
           try {
-            content = JSON.parse(m.content);
+            content = safeJSONParse(m.content);
           } catch (e) {
             console.log("error parse content", e);
           }
           try {
-            reactions = JSON.parse(m.reactions || "[]");
+            reactions = safeJSONParse(m.reactions || "[]");
           } catch (e) {
             console.log("error parse reactions", e);
           }
           try {
-            mentions = JSON.parse(m.mentions || "[]");
+            mentions = safeJSONParse(m.mentions || "[]");
           } catch (e) {
             console.log("error parse mentions", e);
           }
           try {
-            attachments = JSON.parse(m.attachments || "[]");
+            attachments = safeJSONParse(m.attachments || "[]");
           } catch (e) {
             console.log("error parse attachments", e);
           }
           try {
-            references = JSON.parse(m.references || "[]");
+            references = safeJSONParse(m.references || "[]");
           } catch (e) {
             console.log("error parse references", e);
           }
@@ -8633,7 +8654,7 @@ var Client = class {
               timezone: gu.user.timezone,
               update_time: gu.user.update_time,
               username: gu.user.username,
-              metadata: gu.user.metadata ? JSON.parse(gu.user.metadata) : void 0
+              metadata: gu.user.metadata ? safeJSONParse(gu.user.metadata) : void 0
             },
             role_id: gu.role_id,
             clan_nick: gu.clan_nick,
@@ -8938,7 +8959,7 @@ var Client = class {
               update_time: f.user.update_time,
               username: f.user.username,
               is_mobile: (_a = f.user) == null ? void 0 : _a.is_mobile,
-              metadata: f.user.metadata ? JSON.parse(f.user.metadata) : void 0
+              metadata: f.user.metadata ? safeJSONParse(f.user.metadata) : void 0
             },
             state: f.state
           });
@@ -8969,7 +8990,7 @@ var Client = class {
             persistent: n.persistent,
             sender_id: n.sender_id,
             subject: n.subject,
-            content: n.content ? JSON.parse(n.content) : void 0
+            content: n.content ? safeJSONParse(n.content) : void 0
           });
         });
         return Promise.resolve(result);
@@ -8991,7 +9012,7 @@ var Client = class {
       ).then((response) => {
         return Promise.resolve({
           id: response.id,
-          payload: !response.payload ? void 0 : JSON.parse(response.payload)
+          payload: !response.payload ? void 0 : safeJSONParse(response.payload)
         });
       });
     });
@@ -9002,7 +9023,7 @@ var Client = class {
       return this.apiClient.rpcFunc2("", id, input && JSON.stringify(input) || "", httpKey).then((response) => {
         return Promise.resolve({
           id: response.id,
-          payload: !response.payload ? void 0 : JSON.parse(response.payload)
+          payload: !response.payload ? void 0 : safeJSONParse(response.payload)
         });
       }).catch((err) => {
         throw err;

package/dist/mezon-js.esm.mjs

@@ -650,6 +650,27 @@ function buildFetchOptions(method, options, bodyJson) {
   }
   return fetchOptions;
 }
+function safeJSONParse(jsonString) {
+  try {
+    const unescapedJSON = jsonString.replace(/\\./g, (match) => {
+      switch (match) {
+        case '\\"':
+          return '"';
+        case "\\n":
+          return "\n";
+        case "\\t":
+          return "	";
+        default:
+          return match[1];
+      }
+    });
+    const parsedData = JSON.parse(unescapedJSON);
+    return parsedData;
+  } catch (error) {
+    console.error("Error parsing JSON:", error);
+    return null;
+  }
+}
 
 // api.gen.ts
 var MezonApi = class {
@@ -6853,7 +6874,7 @@ var WebSocketAdapterText = class {
   set onMessage(value) {
     if (value) {
       this._socket.onmessage = (evt) => {
-        const message = JSON.parse(evt.data);
+        const message = safeJSONParse(evt.data);
         if (message.party_data && message.party_data.data) {
           message.party_data.data = new Uint8Array(
             decode2(message.party_data.data)
@@ -6960,7 +6981,7 @@ var _DefaultSocket = class _DefaultSocket {
       if (!message.cid) {
         if (message.notifications) {
           message.notifications.notifications.forEach((n) => {
-            n.content = n.content ? JSON.parse(n.content) : void 0;
+            n.content = n.content ? safeJSONParse(n.content) : void 0;
             this.onnotification(n);
           });
         } else if (message.voice_started_event) {
@@ -7008,27 +7029,27 @@ var _DefaultSocket = class _DefaultSocket {
         } else if (message.channel_message) {
           var content, reactions, mentions, attachments, references;
           try {
-            content = JSON.parse(message.channel_message.content);
+            content = safeJSONParse(message.channel_message.content);
           } catch (e2) {
             console.log("content is invalid", e2);
           }
           try {
-            reactions = JSON.parse(message.channel_message.reactions);
+            reactions = safeJSONParse(message.channel_message.reactions);
           } catch (e2) {
             console.log("reactions is invalid", e2);
           }
           try {
-            mentions = JSON.parse(message.channel_message.mentions);
+            mentions = safeJSONParse(message.channel_message.mentions);
           } catch (e2) {
             console.log("mentions is invalid", e2);
           }
           try {
-            attachments = JSON.parse(message.channel_message.attachments);
+            attachments = safeJSONParse(message.channel_message.attachments);
           } catch (e2) {
             console.log("attachments is invalid", e2);
           }
           try {
-            references = JSON.parse(message.channel_message.references);
+            references = safeJSONParse(message.channel_message.references);
           } catch (e2) {
             console.log("references is invalid", e2);
           }
@@ -8353,7 +8374,7 @@ var Client = class {
             timezone: u.timezone,
             update_time: u.update_time,
             username: u.username,
-            metadata: u.metadata ? JSON.parse(u.metadata) : void 0
+            metadata: u.metadata ? safeJSONParse(u.metadata) : void 0
           });
         });
         return Promise.resolve(result);
@@ -8407,27 +8428,27 @@ var Client = class {
         response.messages.forEach((m) => {
           var content, reactions, mentions, attachments, references;
           try {
-            content = JSON.parse(m.content);
+            content = safeJSONParse(m.content);
           } catch (e) {
             console.log("error parse content", e);
           }
           try {
-            reactions = JSON.parse(m.reactions || "[]");
+            reactions = safeJSONParse(m.reactions || "[]");
           } catch (e) {
             console.log("error parse reactions", e);
           }
           try {
-            mentions = JSON.parse(m.mentions || "[]");
+            mentions = safeJSONParse(m.mentions || "[]");
           } catch (e) {
             console.log("error parse mentions", e);
           }
           try {
-            attachments = JSON.parse(m.attachments || "[]");
+            attachments = safeJSONParse(m.attachments || "[]");
           } catch (e) {
             console.log("error parse attachments", e);
           }
           try {
-            references = JSON.parse(m.references || "[]");
+            references = safeJSONParse(m.references || "[]");
           } catch (e) {
             console.log("error parse references", e);
           }
@@ -8603,7 +8624,7 @@ var Client = class {
               timezone: gu.user.timezone,
               update_time: gu.user.update_time,
               username: gu.user.username,
-              metadata: gu.user.metadata ? JSON.parse(gu.user.metadata) : void 0
+              metadata: gu.user.metadata ? safeJSONParse(gu.user.metadata) : void 0
             },
             role_id: gu.role_id,
             clan_nick: gu.clan_nick,
@@ -8908,7 +8929,7 @@ var Client = class {
               update_time: f.user.update_time,
               username: f.user.username,
               is_mobile: (_a = f.user) == null ? void 0 : _a.is_mobile,
-              metadata: f.user.metadata ? JSON.parse(f.user.metadata) : void 0
+              metadata: f.user.metadata ? safeJSONParse(f.user.metadata) : void 0
             },
             state: f.state
           });
@@ -8939,7 +8960,7 @@ var Client = class {
             persistent: n.persistent,
             sender_id: n.sender_id,
             subject: n.subject,
-            content: n.content ? JSON.parse(n.content) : void 0
+            content: n.content ? safeJSONParse(n.content) : void 0
           });
         });
         return Promise.resolve(result);
@@ -8961,7 +8982,7 @@ var Client = class {
       ).then((response) => {
         return Promise.resolve({
           id: response.id,
-          payload: !response.payload ? void 0 : JSON.parse(response.payload)
+          payload: !response.payload ? void 0 : safeJSONParse(response.payload)
         });
       });
     });
@@ -8972,7 +8993,7 @@ var Client = class {
       return this.apiClient.rpcFunc2("", id, input && JSON.stringify(input) || "", httpKey).then((response) => {
         return Promise.resolve({
           id: response.id,
-          payload: !response.payload ? void 0 : JSON.parse(response.payload)
+          payload: !response.payload ? void 0 : safeJSONParse(response.payload)
         });
       }).catch((err) => {
         throw err;

package/dist/utils.d.ts

@@ -1,3 +1,4 @@
 export declare function buildFetchOptions(method: string, options: any, bodyJson: string): any;
 export declare function b64EncodeUnicode(str: string): string;
 export declare function b64DecodeUnicode(str: string): string;
+export declare function safeJSONParse(jsonString: string): any;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mezon-js",
 
-  "version": "2.9.94",
+  "version": "2.9.95",
 
   "scripts": {
     "build": "npx tsc && npx rollup -c --bundleConfigAsCjs && node build.mjs"

package/socket.ts

@@ -32,6 +32,7 @@ import {
 import { Session } from "./session";
 import { ChannelMessage, Notification } from "./client";
 import { WebSocketAdapter, WebSocketAdapterText } from "./web_socket_adapter";
+import { safeJSONParse } from "./utils";
 
 /** Stores function references for resolve/reject with a DOM Promise. */
 interface PromiseExecutor {
@@ -1364,7 +1365,7 @@ export class DefaultSocket implements Socket {
       if (!message.cid) {
         if (message.notifications) {
           message.notifications.notifications.forEach((n: ApiNotification) => {
-            n.content = n.content ? JSON.parse(n.content) : undefined;
+            n.content = n.content ? safeJSONParse(n.content) : undefined;
             this.onnotification(n);
           });
         } else if (message.voice_started_event) {
@@ -1412,27 +1413,27 @@ export class DefaultSocket implements Socket {
         } else if (message.channel_message) {
           var content, reactions, mentions, attachments, references;
           try {
-            content = JSON.parse(message.channel_message.content);
+            content = safeJSONParse(message.channel_message.content);
           } catch (e) {
             console.log("content is invalid", e);
           }
           try {
-            reactions = JSON.parse(message.channel_message.reactions);
+            reactions = safeJSONParse(message.channel_message.reactions);
           } catch (e) {
             console.log("reactions is invalid", e);
           }
           try {
-            mentions = JSON.parse(message.channel_message.mentions);
+            mentions = safeJSONParse(message.channel_message.mentions);
           } catch (e) {
             console.log("mentions is invalid", e);
           }
           try {
-            attachments = JSON.parse(message.channel_message.attachments);
+            attachments = safeJSONParse(message.channel_message.attachments);
           } catch (e) {
             console.log("attachments is invalid", e);
           }
           try {
-            references = JSON.parse(message.channel_message.references);
+            references = safeJSONParse(message.channel_message.references);
           } catch (e) {
             console.log("references is invalid", e);
           }

package/utils.ts

@@ -47,3 +47,26 @@ export function b64DecodeUnicode(str: string) {
         return '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2);
     }).join(''));
 }
+
+export function safeJSONParse(jsonString: string) {
+    try {
+        // Step 1: Unescape JSON strings to handle double-escaped characters
+        const unescapedJSON = jsonString.replace(/\\./g, (match) => {
+            switch (match) {
+                case '\\"': return '"';
+                case '\\n': return '\n';
+                case '\\t': return '\t';
+                // Add more escape sequences as needed
+                default: return match[1]; // Remove the backslash
+            }
+        });
+  
+      // Step 2: Parse the unescaped JSON
+      const parsedData = JSON.parse(unescapedJSON);
+  
+      return parsedData;
+    } catch (error) {
+        console.error('Error parsing JSON:', error);
+        return null; // Handle the error gracefully or throw an exception if necessary
+    }
+}

package/web_socket_adapter.ts

@@ -16,6 +16,7 @@
 
 import { decode, encode } from "base64-arraybuffer";
 import { btoa } from "js-base64";
+import { safeJSONParse } from "./utils";
 
 /**
  * An interface used by Mezon's web socket to determine the payload protocol.
@@ -114,7 +115,7 @@ export class WebSocketAdapterText implements WebSocketAdapter {
   set onMessage(value: SocketMessageHandler | null) {
     if (value) {
       this._socket!.onmessage = (evt: MessageEvent) => {
-        const message: any = JSON.parse(evt.data);
+        const message: any = safeJSONParse(evt.data);
         if (message.party_data && message.party_data.data) {
           message.party_data.data = new Uint8Array(
             decode(message.party_data.data)