@droppii-org/chat-sdk 0.8.1 → 0.8.2

package/dist/utils/messageLog.js

@@ -100,7 +100,7 @@ export const getGroupNotificationText = (contentType, detailJson, t, senderNickn
                     name: opUserName,
                     groupName: ((_b = detail.group) === null || _b === void 0 ? void 0 : _b.groupName) || "",
                 }))
-                : `${opUserName} đã đổi tên nhóm thành "${((_c = detail.group) === null || _c === void 0 ? void 0 : _c.groupName) || ""}"`;
+                : `${opUserName} đã đổi tên nhóm thành ${((_c = detail.group) === null || _c === void 0 ? void 0 : _c.groupName) || ""}`;
         case MessageType.GroupAnnouncementUpdated:
             return t
                 ? String(t("group_notification_announcement_updated", { name: opUserName }))
@@ -117,7 +117,7 @@ export const getGroupNotificationText = (contentType, detailJson, t, senderNickn
                     name: opUserName,
                     newOwner: ((_f = detail.newGroupOwner) === null || _f === void 0 ? void 0 : _f.nickname) || "",
                 }))
-                : `${opUserName} đã chuyển quyền trưởng nhóm cho ${((_g = detail.newGroupOwner) === null || _g === void 0 ? void 0 : _g.nickname) || ""}`;
+                : `${opUserName} đã chuyển quyền chủ nhóm cho ${((_g = detail.newGroupOwner) === null || _g === void 0 ? void 0 : _g.nickname) || ""}`;
         case MessageType.MemberKicked:
             return t
                 ? String(t("group_notification_member_kicked", {
@@ -176,57 +176,146 @@ export const getGroupNotificationText = (contentType, detailJson, t, senderNickn
                     name: opUserName,
                     target: ((_r = detail.changedUser) === null || _r === void 0 ? void 0 : _r.nickname) || "",
                 }))
-                : `${opUserName} đã chỉ định ${((_s = detail.changedUser) === null || _s === void 0 ? void 0 : _s.nickname) || ""} làm quản trị viên`;
+                : `${opUserName} đã đặt ${((_s = detail.changedUser) === null || _s === void 0 ? void 0 : _s.nickname) || ""} làm quản trị viên`;
         default:
             return "";
     }
 };
 export const isSystemLogMessageType = (contentType) => contentType === MessageType.LogTextMessage;
-export const getSystemLogMessageText = (message) => {
+const parseLogPayload = (message) => {
     var _a;
-    if ((_a = message.logTextElem) === null || _a === void 0 ? void 0 : _a.content) {
-        try {
-            const parsed = JSON.parse(message.logTextElem.content);
-            return typeof (parsed === null || parsed === void 0 ? void 0 : parsed.message) === "string"
-                ? parsed.message.trim()
-                : message.logTextElem.content.trim();
-        }
-        catch (_b) {
-            return message.logTextElem.content.trim();
-        }
-    }
-    if (!message.ex)
-        return "";
+    const raw = ((_a = message.logTextElem) === null || _a === void 0 ? void 0 : _a.content) || message.ex;
+    if (!raw)
+        return null;
     try {
-        const parsed = JSON.parse(message.ex);
-        return typeof (parsed === null || parsed === void 0 ? void 0 : parsed.message) === "string" ? parsed.message.trim() : "";
+        const parsed = JSON.parse(raw);
+        return parsed && typeof parsed === "object" ? parsed : null;
     }
-    catch (_c) {
-        return "";
+    catch (_b) {
+        return null;
     }
 };
-export const getSystemLogMessageHtml = (message) => {
-    var _a;
-    if ((_a = message.logTextElem) === null || _a === void 0 ? void 0 : _a.content) {
-        try {
-            const parsed = JSON.parse(message.logTextElem.content);
-            return typeof (parsed === null || parsed === void 0 ? void 0 : parsed.messageHtml) === "string"
-                ? parsed.messageHtml.trim()
-                : "";
-        }
-        catch (_b) {
+// vi defaults mirror locales/vi/common.json so callers without `t` still read right.
+const SESSION_LOG_TEMPLATES = {
+    ACTOR_REASSIGN_SUPPORTER: {
+        key: "system_log_actor_reassign",
+        text: "{{actor}} đã bỏ phân công {{old}} và phân công cho {{new}}",
+    },
+    ACTOR_FIRST_ASSIGN_SUPPORTER: {
+        key: "system_log_actor_first_assign",
+        text: "{{actor}} đã phân công cho {{new}}",
+    },
+    SYSTEM_AUTO_ASSIGN_SESSION: {
+        key: "system_log_auto_assign",
+        text: "Hệ thống đã phân công cho {{new}}",
+    },
+    SUPPORTER_JOIN_SESSION: {
+        key: "system_log_supporter_join",
+        text: "{{new}} đã tham gia nhóm",
+    },
+    SYSTEM_AUTO_REASSIGN_SESSION: {
+        key: "system_log_auto_reassign",
+        text: "Phân công tự động: hệ thống đã bỏ phân công {{old}} và phân công cho {{new}}",
+    },
+    SYSTEM_REMOVE_MEMBER_GROUP: {
+        key: "system_log_remove_member",
+        text: "Hệ thống đã xóa {{old}} khỏi nhóm",
+    },
+    SUPPORTER_LEAVE_GROUP: {
+        key: "system_log_supporter_leave",
+        text: "{{actor}} đã rời khỏi nhóm",
+    },
+};
+const escapeHtml = (value) => value
+    .replace(/&/g, "&")
+    .replace(/</g, "&lt;")
+    .replace(/>/g, "&gt;")
+    .replace(/"/g, "&quot;")
+    .replace(/'/g, "&#39;");
+const asId = (value) => typeof value === "string" && value ? value.toLowerCase() : "";
+// Rebuilds the sentence for the viewer only when the viewer is a party to the
+// event; otherwise (or with old logs lacking the fields) the BE text stays as is.
+const buildViewerSessionLog = (payload, viewerId, t, html) => {
+    const template = typeof payload.type === "string"
+        ? SESSION_LOG_TEMPLATES[payload.type]
+        : undefined;
+    const viewer = asId(viewerId);
+    if (!template || !viewer)
+        return null;
+    const actor = asId(payload.actorId);
+    const oldId = asId(payload.oldSupporterId);
+    const newId = asId(payload.newSupporterId);
+    if (viewer !== actor && viewer !== oldId && viewer !== newId)
+        return null;
+    const names = payload.names && typeof payload.names === "object"
+        ? payload.names
+        : {};
+    const lookupName = (id) => {
+        var _a;
+        const hit = (_a = Object.entries(names).find(([key]) => asId(key) === id)) === null || _a === void 0 ? void 0 : _a[1];
+        return typeof hit === "string" && hit ? hit : "";
+    };
+    const wrap = (value) => html ? `<b>${escapeHtml(value)}</b>` : value;
+    const tr = (key, fallback) => t ? String(t(key)) : fallback;
+    // Self-assignment reads "chính mình" for everyone, matching the BE wording.
+    const resolve = (id, isActorSlot) => {
+        if (!id)
             return "";
+        if (isActorSlot) {
+            return id === viewer
+                ? wrap(tr("system_log_viewer_start", "Bạn"))
+                : wrap(lookupName(id));
         }
+        if (actor && id === actor)
+            return tr("system_log_self", "chính mình");
+        return id === viewer
+            ? wrap(tr("system_log_viewer", "bạn"))
+            : wrap(lookupName(id));
+    };
+    const params = {
+        actor: resolve(actor, true),
+        old: resolve(oldId, false),
+        new: resolve(newId, false),
+    };
+    // A slot the template uses must resolve to a real name.
+    const needs = (slot) => template.text.includes(`{{${slot}}}`);
+    if ((needs("actor") && (!actor || params.actor === wrap(""))) ||
+        (needs("old") && (!oldId || params.old === wrap(""))) ||
+        (needs("new") && (!newId || params.new === wrap("")))) {
+        return null;
     }
-    if (!message.ex)
-        return "";
-    try {
-        const parsed = JSON.parse(message.ex);
-        return typeof (parsed === null || parsed === void 0 ? void 0 : parsed.messageHtml) === "string"
-            ? parsed.messageHtml.trim()
-            : "";
+    // The start-of-sentence "Bạn" applies to the new-member slot of join logs too.
+    if (payload.type === "SUPPORTER_JOIN_SESSION" && newId === viewer) {
+        params.new = wrap(tr("system_log_viewer_start", "Bạn"));
     }
-    catch (_c) {
-        return "";
+    const sentence = t
+        ? String(t(template.key, params))
+        : template.text.replace(/\{\{(actor|old|new)\}\}/g, (_, slot) => { var _a; return (_a = params[slot]) !== null && _a !== void 0 ? _a : ""; });
+    return html ? `<span>${sentence}</span>` : sentence;
+};
+export const getSystemLogMessageText = (message, viewerId, t) => {
+    var _a;
+    const payload = parseLogPayload(message);
+    if (payload) {
+        const rebuilt = buildViewerSessionLog(payload, viewerId, t, false);
+        if (rebuilt)
+            return rebuilt;
+    }
+    if ((_a = message.logTextElem) === null || _a === void 0 ? void 0 : _a.content) {
+        return typeof (payload === null || payload === void 0 ? void 0 : payload.message) === "string"
+            ? payload.message.trim()
+            : message.logTextElem.content.trim();
     }
+    return typeof (payload === null || payload === void 0 ? void 0 : payload.message) === "string" ? payload.message.trim() : "";
+};
+export const getSystemLogMessageHtml = (message, viewerId, t) => {
+    const payload = parseLogPayload(message);
+    if (!payload)
+        return "";
+    const rebuilt = buildViewerSessionLog(payload, viewerId, t, true);
+    if (rebuilt)
+        return rebuilt;
+    return typeof payload.messageHtml === "string"
+        ? payload.messageHtml.trim()
+        : "";
 };

package/dist/utils/notifiableMessage.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Whether a conversation's latest message deserves a browser notification: a real
+ * message from someone else. Own sends, system logs, group notices and session
+ * markers stay silent.
+ */
+export declare const isNotifiableLatestMessage: (latestMsg: string | undefined, selfUserID: string | undefined) => boolean;
+//# sourceMappingURL=notifiableMessage.d.ts.map

package/dist/utils/notifiableMessage.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"notifiableMessage.d.ts","sourceRoot":"","sources":["../../src/utils/notifiableMessage.ts"],"names":[],"mappings":"AAQA;;;;GAIG;AACH,eAAO,MAAM,yBAAyB,GACpC,WAAW,MAAM,GAAG,SAAS,EAC7B,YAAY,MAAM,GAAG,SAAS,KAC7B,OAgBF,CAAC"}

package/dist/utils/notifiableMessage.js

@@ -0,0 +1,26 @@
+import { isEventCustomMessage } from "../utils/customMessage";
+import { isGroupNotificationMessageType, isSessionEventMessage, isSystemLogMessageType, } from "../utils/messageLog";
+/**
+ * Whether a conversation's latest message deserves a browser notification: a real
+ * message from someone else. Own sends, system logs, group notices and session
+ * markers stay silent.
+ */
+export const isNotifiableLatestMessage = (latestMsg, selfUserID) => {
+    if (!latestMsg)
+        return false;
+    let message;
+    try {
+        message = JSON.parse(latestMsg);
+    }
+    catch (_a) {
+        return false;
+    }
+    if (!(message === null || message === void 0 ? void 0 : message.contentType))
+        return false;
+    if (selfUserID && message.sendID === selfUserID)
+        return false;
+    return !(isSystemLogMessageType(message.contentType) ||
+        isGroupNotificationMessageType(message.contentType) ||
+        isSessionEventMessage(message) ||
+        isEventCustomMessage(message));
+};

package/dist/utils/withSdkTimeout.d.ts

@@ -0,0 +1,11 @@
+export declare const SDK_CALL_TIMEOUT_MS = 15000;
+/** Failure of an SDK call, carrying core's error code when it sent one. */
+export declare class SdkCallError extends Error {
+    readonly code?: number;
+    constructor(label: string, cause?: unknown);
+}
+export declare class SdkTimeoutError extends SdkCallError {
+    constructor(label: string, ms: number);
+}
+export declare const withSdkTimeout: <T>(promise: Promise<T>, label: string, ms?: number) => Promise<T>;
+//# sourceMappingURL=withSdkTimeout.d.ts.map

package/dist/utils/withSdkTimeout.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"withSdkTimeout.d.ts","sourceRoot":"","sources":["../../src/utils/withSdkTimeout.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,mBAAmB,QAAS,CAAC;AAE1C,2EAA2E;AAC3E,qBAAa,YAAa,SAAQ,KAAK;IACrC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;gBAEX,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO;CAO3C;AAED,qBAAa,eAAgB,SAAQ,YAAY;gBACnC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM;CAKtC;AAED,eAAO,MAAM,cAAc,GAAI,CAAC,EAC9B,SAAS,OAAO,CAAC,CAAC,CAAC,EACnB,OAAO,MAAM,EACb,WAAwB,KACvB,OAAO,CAAC,CAAC,CAaR,CAAC"}

package/dist/utils/withSdkTimeout.js

@@ -0,0 +1,30 @@
+// A wasm call whose worker or connection stalled never settles (core's own RPC
+// timeout is over an hour), which froze the composer and the group dialog.
+export const SDK_CALL_TIMEOUT_MS = 15000;
+/** Failure of an SDK call, carrying core's error code when it sent one. */
+export class SdkCallError extends Error {
+    constructor(label, cause) {
+        const { errCode, errMsg } = (cause !== null && cause !== void 0 ? cause : {});
+        super(`${label} failed${errMsg ? `: ${errMsg}` : ""}`);
+        this.name = "SdkCallError";
+        this.code = errCode;
+        this.cause = cause;
+    }
+}
+export class SdkTimeoutError extends SdkCallError {
+    constructor(label, ms) {
+        super(label);
+        this.message = `${label} timed out after ${ms}ms`;
+        this.name = "SdkTimeoutError";
+    }
+}
+export const withSdkTimeout = (promise, label, ms = SDK_CALL_TIMEOUT_MS) => new Promise((resolve, reject) => {
+    const timer = setTimeout(() => reject(new SdkTimeoutError(label, ms)), ms);
+    promise.then((value) => {
+        clearTimeout(timer);
+        resolve(value);
+    }, (error) => {
+        clearTimeout(timer);
+        reject(error instanceof SdkCallError ? error : new SdkCallError(label, error));
+    });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@droppii-org/chat-sdk",
-  "version": "0.8.1",
+  "version": "0.8.2",
   "description": "Droppii React Chat SDK",
   "repository": {
     "type": "git",