mezon-js-protobuf 1.8.74 → 1.8.76

package/index.ts

@@ -1 +1,2 @@
 export * from "./web_socket_adapter_pb";
+export * from "./utils"

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mezon-js-protobuf",
-    "version": "1.8.74",
+    "version": "1.8.76",
     "description": "Websocket adapter adding protocol buffer support to the Mezon Javascript client.",
     "main": "dist/mezon-js-protobuf.cjs.js",
     "module": "dist/mezon-js-protobuf.esm.mjs",

package/rtapi/realtime.ts

@@ -794,9 +794,9 @@ export interface ChannelMessageRemove {
   /**  */
   topic_id: string;
   /** Message mention */
-  mentions: string;
+  mentions: Uint8Array;
   /** Message reference */
-  references: string;
+  references: Uint8Array;
 }
 
 /** A set of joins and leaves on a particular channel. */
@@ -6663,8 +6663,8 @@ function createBaseChannelMessageRemove(): ChannelMessageRemove {
     is_public: false,
     has_attachment: false,
     topic_id: "",
-    mentions: "",
-    references: "",
+    mentions: new Uint8Array(0),
+    references: new Uint8Array(0),
   };
 }
 
@@ -6691,11 +6691,11 @@ export const ChannelMessageRemove = {
     if (message.topic_id !== "") {
       writer.uint32(58).string(message.topic_id);
     }
-    if (message.mentions !== "") {
-      writer.uint32(66).string(message.mentions);
+    if (message.mentions.length !== 0) {
+      writer.uint32(66).bytes(message.mentions);
     }
-    if (message.references !== "") {
-      writer.uint32(74).string(message.references);
+    if (message.references.length !== 0) {
+      writer.uint32(74).bytes(message.references);
     }
     return writer;
   },
@@ -6761,14 +6761,14 @@ export const ChannelMessageRemove = {
             break;
           }
 
-          message.mentions = reader.string();
+          message.mentions = reader.bytes();
           continue;
         case 9:
           if (tag !== 74) {
             break;
           }
 
-          message.references = reader.string();
+          message.references = reader.bytes();
           continue;
       }
       if ((tag & 7) === 4 || tag === 0) {
@@ -6788,8 +6788,8 @@ export const ChannelMessageRemove = {
       is_public: isSet(object.is_public) ? globalThis.Boolean(object.is_public) : false,
       has_attachment: isSet(object.has_attachment) ? globalThis.Boolean(object.has_attachment) : false,
       topic_id: isSet(object.topic_id) ? globalThis.String(object.topic_id) : "",
-      mentions: isSet(object.mentions) ? globalThis.String(object.mentions) : "",
-      references: isSet(object.references) ? globalThis.String(object.references) : "",
+      mentions: isSet(object.mentions) ? bytesFromBase64(object.mentions) : new Uint8Array(0),
+      references: isSet(object.references) ? bytesFromBase64(object.references) : new Uint8Array(0),
     };
   },
 
@@ -6816,11 +6816,11 @@ export const ChannelMessageRemove = {
     if (message.topic_id !== "") {
       obj.topic_id = message.topic_id;
     }
-    if (message.mentions !== "") {
-      obj.mentions = message.mentions;
+    if (message.mentions.length !== 0) {
+      obj.mentions = base64FromBytes(message.mentions);
     }
-    if (message.references !== "") {
-      obj.references = message.references;
+    if (message.references.length !== 0) {
+      obj.references = base64FromBytes(message.references);
     }
     return obj;
   },
@@ -6837,8 +6837,8 @@ export const ChannelMessageRemove = {
     message.is_public = object.is_public ?? false;
     message.has_attachment = object.has_attachment ?? false;
     message.topic_id = object.topic_id ?? "";
-    message.mentions = object.mentions ?? "";
-    message.references = object.references ?? "";
+    message.mentions = object.mentions ?? new Uint8Array(0);
+    message.references = object.references ?? new Uint8Array(0);
     return message;
   },
 };
@@ -16583,6 +16583,31 @@ export const FcmDataPayload = {
   },
 };
 
+function bytesFromBase64(b64: string): Uint8Array {
+  if ((globalThis as any).Buffer) {
+    return Uint8Array.from(globalThis.Buffer.from(b64, "base64"));
+  } else {
+    const bin = globalThis.atob(b64);
+    const arr = new Uint8Array(bin.length);
+    for (let i = 0; i < bin.length; ++i) {
+      arr[i] = bin.charCodeAt(i);
+    }
+    return arr;
+  }
+}
+
+function base64FromBytes(arr: Uint8Array): string {
+  if ((globalThis as any).Buffer) {
+    return globalThis.Buffer.from(arr).toString("base64");
+  } else {
+    const bin: string[] = [];
+    arr.forEach((byte) => {
+      bin.push(globalThis.String.fromCharCode(byte));
+    });
+    return globalThis.btoa(bin.join(""));
+  }
+}
+
 type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
 
 export type DeepPartial<T> = T extends Builtin ? T

package/utils.ts

@@ -0,0 +1,33 @@
+import * as tsproto from "./api/api";
+
+export function decodeMentions(data: any) {
+  const buffer: ArrayBuffer = data;
+  const uintBuffer: Uint8Array = new Uint8Array(buffer);
+  const mentions = tsproto.MessageMentionList.decode(uintBuffer);
+
+  return mentions
+}
+
+export function decodeAttachments(data: any) {
+  const buffer: ArrayBuffer = data;
+  const uintBuffer: Uint8Array = new Uint8Array(buffer);
+  const attachments = tsproto.MessageAttachmentList.decode(uintBuffer);
+
+  return attachments
+}
+
+export function decodeRefs(data: any) {
+  const buffer: ArrayBuffer = data;
+  const uintBuffer: Uint8Array = new Uint8Array(buffer);
+  const refs = tsproto.MessageRefList.decode(uintBuffer);
+
+  return refs
+}
+
+export function decodeNotificationFcm(data: any) {
+  const buffer: ArrayBuffer = data;
+  const uintBuffer: Uint8Array = new Uint8Array(buffer);
+  const noti = tsproto.DirectFcmProto.decode(uintBuffer);
+
+  return noti
+}

package/web_socket_adapter_pb.ts

@@ -1,137 +1,123 @@
-/**
- * Copyright 2020 The Mezon Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import {
-  WebSocketAdapter,
-  SocketCloseHandler,
-  SocketErrorHandler,
-  SocketMessageHandler,
-  SocketOpenHandler,
-} from "../mezon-js/web_socket_adapter";
-import * as tsproto from "./rtapi/realtime";
-
-/**
- * A protocol buffer socket adapter that accepts and transmits payloads using the protobuf binary wire format.
- */
-export class WebSocketAdapterPb implements WebSocketAdapter {
-  private _socket?: WebSocket;
-
-  constructor() {
-  }
-
-  get onClose(): SocketCloseHandler | null {
-    return this._socket!.onclose;
-  }
-
-  set onClose(value: SocketCloseHandler | null) {
-    this._socket!.onclose = value;
-  }
-
-  get onError(): SocketErrorHandler | null {
-    return this._socket!.onerror;
-  }
-
-  set onError(value: SocketErrorHandler | null) {
-    this._socket!.onerror = value;
-  }
-
-  get onMessage(): SocketMessageHandler | null {
-    return this._socket!.onmessage;
-  }
-
-  set onMessage(value: SocketMessageHandler | null) {
-    if (value) {
-      this._socket!.onmessage = (evt: MessageEvent) => {
-        const buffer: ArrayBuffer = evt.data;
-        const uintBuffer: Uint8Array = new Uint8Array(buffer);
-        const envelope = tsproto.Envelope.decode(uintBuffer);
-
-        if (envelope.channel_message) {
-          if (envelope.channel_message.code == undefined) {
-            //protobuf plugin does not default-initialize missing Int32Value fields
-            envelope.channel_message.code = 0;
-          }
-        }
-
-        value!(envelope);
-      };
-    }
-    else {
-      value = null;
-    }
-  }
-
-  get onOpen(): SocketOpenHandler | null {
-    return this._socket!.onopen;
-  }
-
-  set onOpen(value: SocketOpenHandler | null) {
-    this._socket!.onopen = value;
-  }
-
-  isOpen(): boolean {
-    return this._socket?.readyState == WebSocket.OPEN;
-  }
-
-  close() {
-    this._socket?.close();
-    this._socket = undefined;
-  }
-
-  connect(
-    scheme: string,
-    host: string,
-    port: string,
-    createStatus: boolean,
-    token: string,
-    platform: string,
-    signal?: AbortSignal
-  ): void {
-    if (signal) {
-      signal.addEventListener("abort", () => {
-        this.close();
-      });
-    }
-    const url = `${scheme}${host}:${port}/ws?lang=en&status=${encodeURIComponent(
-      createStatus.toString()
-    )}&token=${encodeURIComponent(
-      token
-    )}&format=protobuf&platform=${encodeURIComponent(platform)}`;
-    this._socket = new WebSocket(url);
-    this._socket.binaryType = "arraybuffer";
-  }
-
-  send(msg: any): void {
-    if (msg.match_data_send) {
-      let payload = msg.match_data_send.data;
-      // can't send a string over protobuf
-      if (typeof payload == "string") {
-        msg.match_data_send.data = new TextEncoder().encode(payload);
-      }
-    } else if (msg.party_data_send) {
-      let payload = msg.party_data_send.data;
-      // can't send a string over protobuf
-      if (typeof payload == "string") {
-        msg.party_data_send.data = new TextEncoder().encode(payload);
-      }
-    }
-
-    const envelopeWriter = tsproto.Envelope.encode(
-      tsproto.Envelope.fromPartial(msg)
-    );
-    const encodedMsg = envelopeWriter.finish();
-    this._socket!.send(encodedMsg);
-  }
-}
+/**
+ * Copyright 2020 The Mezon Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import {
+  WebSocketAdapter,
+  SocketCloseHandler,
+  SocketErrorHandler,
+  SocketMessageHandler,
+  SocketOpenHandler,
+} from "../mezon-js/web_socket_adapter";
+import * as tsproto from "./rtapi/realtime";
+
+/**
+ * A protocol buffer socket adapter that accepts and transmits payloads using the protobuf binary wire format.
+ */
+export class WebSocketAdapterPb implements WebSocketAdapter {
+  private _socket?: WebSocket;
+
+  constructor() {
+  }
+
+  get onClose(): SocketCloseHandler | null {
+    return this._socket!.onclose;
+  }
+
+  set onClose(value: SocketCloseHandler | null) {
+    this._socket!.onclose = value;
+  }
+
+  get onError(): SocketErrorHandler | null {
+    return this._socket!.onerror;
+  }
+
+  set onError(value: SocketErrorHandler | null) {
+    this._socket!.onerror = value;
+  }
+
+  get onMessage(): SocketMessageHandler | null {
+    return this._socket!.onmessage;
+  }
+
+  set onMessage(value: SocketMessageHandler | null) {
+    if (value) {
+      this._socket!.onmessage = (evt: MessageEvent) => {
+        const buffer: ArrayBuffer = evt.data;
+        const uintBuffer: Uint8Array = new Uint8Array(buffer);
+        const envelope = tsproto.Envelope.decode(uintBuffer);
+
+        if (envelope.channel_message) {
+          if (envelope.channel_message.code == undefined) {
+            //protobuf plugin does not default-initialize missing Int32Value fields
+            envelope.channel_message.code = 0;
+          }
+        }
+
+        value!(envelope);
+      };
+    }
+    else {
+      value = null;
+    }
+  }
+
+  get onOpen(): SocketOpenHandler | null {
+    return this._socket!.onopen;
+  }
+
+  set onOpen(value: SocketOpenHandler | null) {
+    this._socket!.onopen = value;
+  }
+
+  isOpen(): boolean {
+    return this._socket?.readyState == WebSocket.OPEN;
+  }
+
+  close() {
+    this._socket?.close();
+    this._socket = undefined;
+  }
+
+  connect(
+    scheme: string,
+    host: string,
+    port: string,
+    createStatus: boolean,
+    token: string,
+    platform: string,
+    signal?: AbortSignal
+  ): void {
+    if (signal) {
+      signal.addEventListener("abort", () => {
+        this.close();
+      });
+    }
+    const url = `${scheme}${host}:${port}/ws?lang=en&status=${encodeURIComponent(
+      createStatus.toString()
+    )}&token=${encodeURIComponent(
+      token
+    )}&format=protobuf&platform=${encodeURIComponent(platform)}`;
+    this._socket = new WebSocket(url);
+    this._socket.binaryType = "arraybuffer";
+  }
+
+  send(msg: any): void {
+    const envelopeWriter = tsproto.Envelope.encode(
+      tsproto.Envelope.fromPartial(msg)
+    );
+    const encodedMsg = envelopeWriter.finish();
+    this._socket!.send(encodedMsg);
+  }
+}