@droppii-org/chat-sdk 0.1.67 → 0.1.69

package/dist/types/customMessage.d.ts

@@ -0,0 +1,25 @@
+import type { ReactNode } from "react";
+import type { MessageItem } from "@openim/wasm-client-sdk";
+export declare const CustomMessageType: {
+    readonly Order: "Order";
+    readonly Product: "Product";
+};
+export type CustomMessageType = (typeof CustomMessageType)[keyof typeof CustomMessageType];
+export type CustomElemOrderData = {
+    id: string;
+    orderCode: string;
+    timestamp: number;
+};
+export type CustomMessagePayload = {
+    type: typeof CustomMessageType.Order;
+    data: CustomElemOrderData;
+} | {
+    type: typeof CustomMessageType.Product;
+    data: Record<string, unknown>;
+};
+export interface RenderCustomMessageArgs {
+    message: MessageItem;
+    payload: CustomMessagePayload | null;
+}
+export type RenderCustomMessage = (args: RenderCustomMessageArgs) => ReactNode | null;
+//# sourceMappingURL=customMessage.d.ts.map

package/dist/types/customMessage.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"customMessage.d.ts","sourceRoot":"","sources":["../../src/types/customMessage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE3D,eAAO,MAAM,iBAAiB;;;CAGpB,CAAC;AAEX,MAAM,MAAM,iBAAiB,GAC3B,CAAC,OAAO,iBAAiB,CAAC,CAAC,MAAM,OAAO,iBAAiB,CAAC,CAAC;AAE7D,MAAM,MAAM,mBAAmB,GAAG;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAC5B;IAAE,IAAI,EAAE,OAAO,iBAAiB,CAAC,KAAK,CAAC;IAAC,IAAI,EAAE,mBAAmB,CAAA;CAAE,GACnE;IAAE,IAAI,EAAE,OAAO,iBAAiB,CAAC,OAAO,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,CAAC;AAE9E,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,WAAW,CAAC;IACrB,OAAO,EAAE,oBAAoB,GAAG,IAAI,CAAC;CACtC;AAED,MAAM,MAAM,mBAAmB,GAAG,CAChC,IAAI,EAAE,uBAAuB,KAC1B,SAAS,GAAG,IAAI,CAAC"}

package/dist/types/customMessage.js

@@ -0,0 +1,4 @@
+export const CustomMessageType = {
+    Order: "Order",
+    Product: "Product",
+};

package/dist/utils/common.d.ts

@@ -1,11 +1,15 @@
 import { MessageType } from "@openim/wasm-client-sdk";
 import { TFunction } from "i18next";
 import { UrlMetadataInfo } from "../types/chat";
+import { PeerType } from "../types/conversation";
 export declare const parseUrlMetadata: (ex?: string) => UrlMetadataInfo | undefined;
 export declare function formatDuration(seconds: number): string;
 export declare function renderFileSize(bytes: number): string;
 export declare const generateContentBasedOnMessageType: (contentType: MessageType, plainText?: string, t?: TFunction) => string;
-export declare const parseLatestMessage: (latestMsg: string, currentUserId?: string, t?: TFunction) => string;
+export declare const parseLatestMessage: (latestMsg: string, currentUserId?: string, t?: TFunction, conversation?: {
+    peerType?: PeerType | string;
+    showName?: string;
+}) => string;
 export declare const highlightSearch: (text: string, keyword: string, maxLength?: number) => string;
 interface FormatOptions {
     hasTime?: boolean;

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

@@ -1 +1 @@
-{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../src/utils/common.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAGnE,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,EAAqB,eAAe,EAAE,MAAM,cAAc,CAAC;AAGlE,eAAO,MAAM,gBAAgB,GAAI,KAAK,MAAM,KAAG,eAAe,GAAG,SAQhE,CAAC;AAiBF,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAItD;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAapD;AAED,eAAO,MAAM,iCAAiC,GAC5C,aAAa,WAAW,EACxB,YAAY,MAAM,EAClB,IAAI,SAAS,WAsBd,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAC7B,WAAW,MAAM,EACjB,gBAAgB,MAAM,EACtB,IAAI,SAAS,WAuDd,CAAC;AAEF,eAAO,MAAM,eAAe,GAC1B,MAAM,MAAM,EACZ,SAAS,MAAM,EACf,kBAAc,WA2Cf,CAAC;AAEF,UAAU,aAAa;IACrB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAgB,eAAe,CAC7B,SAAS,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE,aAAa,GACtB,MAAM,CAqBR;AAED,eAAO,MAAM,QAAQ,QAAkD,CAAC;AAExE,wBAAgB,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAqC3D;AAED,eAAO,MAAM,cAAc,GAAI,KAAK,MAAM,KAAG,MAAM,GAAG,IAOrD,CAAC;AAKF,eAAO,MAAM,iBAAiB,GAAI,MAAM,MAAM,KAAG,OACf,CAAC;AAEnC,eAAO,MAAM,SAAS,GAAI,MAAM,MAAM,KAAG,MAO9B,CAAC;AAEZ;;;;;;;;;;;GAWG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAgEjD"}
+{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../src/utils/common.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAGnE,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,EAAqB,eAAe,EAAE,MAAM,cAAc,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAGhD,eAAO,MAAM,gBAAgB,GAAI,KAAK,MAAM,KAAG,eAAe,GAAG,SAQhE,CAAC;AAwBF,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAItD;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAapD;AAED,eAAO,MAAM,iCAAiC,GAC5C,aAAa,WAAW,EACxB,YAAY,MAAM,EAClB,IAAI,SAAS,WAsBd,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAC7B,WAAW,MAAM,EACjB,gBAAgB,MAAM,EACtB,IAAI,SAAS,EACb,eAAe;IAAE,QAAQ,CAAC,EAAE,QAAQ,GAAG,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,WAkEnE,CAAC;AAEF,eAAO,MAAM,eAAe,GAC1B,MAAM,MAAM,EACZ,SAAS,MAAM,EACf,kBAAc,WA2Cf,CAAC;AAEF,UAAU,aAAa;IACrB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAgB,eAAe,CAC7B,SAAS,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE,aAAa,GACtB,MAAM,CAqBR;AAED,eAAO,MAAM,QAAQ,QAAkD,CAAC;AAExE,wBAAgB,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAqC3D;AAED,eAAO,MAAM,cAAc,GAAI,KAAK,MAAM,KAAG,MAAM,GAAG,IAOrD,CAAC;AAKF,eAAO,MAAM,iBAAiB,GAAI,MAAM,MAAM,KAAG,OACf,CAAC;AAEnC,eAAO,MAAM,SAAS,GAAI,MAAM,MAAM,KAAG,MAO9B,CAAC;AAEZ;;;;;;;;;;;GAWG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAgEjD"}

package/dist/utils/common.js

@@ -1,6 +1,7 @@
 import { MessageType } from "@openim/wasm-client-sdk";
 import dayjs from "dayjs";
 import DOMPurify from "dompurify";
+import { PeerType } from "../types/conversation";
 import { getSystemLogMessageText } from "./messageLog";
 export const parseUrlMetadata = (ex) => {
     if (!ex)
@@ -13,17 +14,21 @@ export const parseUrlMetadata = (ex) => {
         return undefined;
     }
 };
-const getSenderLabelForLatestPreview = (msgData, currentUserId, t) => {
-    var _a;
+const getSenderLabelForLatestPreview = (msgData, currentUserId, t, conversation) => {
+    var _a, _b;
     if (currentUserId && msgData.sendID === currentUserId) {
         return String(t("you"));
     }
-    const name = (_a = msgData.senderNickname) === null || _a === void 0 ? void 0 : _a.trim();
-    if (name) {
-        return name;
+    const senderNickname = (_a = msgData.senderNickname) === null || _a === void 0 ? void 0 : _a.trim();
+    if (senderNickname) {
+        return senderNickname;
+    }
+    if ((conversation === null || conversation === void 0 ? void 0 : conversation.peerType) === PeerType.BOT) {
+        return ((_b = conversation.showName) === null || _b === void 0 ? void 0 : _b.trim()) || undefined;
     }
-    return String(t("message_sender_unnamed"));
+    return undefined;
 };
+const formatWithSender = (sender, content) => sender ? `${sender}: ${content}` : content;
 export function formatDuration(seconds) {
     const minutes = Math.floor(seconds / 60);
     const secs = Math.floor(seconds % 60);
@@ -63,32 +68,32 @@ export const generateContentBasedOnMessageType = (contentType, plainText, t) =>
             return "";
     }
 };
-export const parseLatestMessage = (latestMsg, currentUserId, t) => {
+export const parseLatestMessage = (latestMsg, currentUserId, t, conversation) => {
     var _a, _b, _c, _d;
     if (!latestMsg || !t)
         return "";
     try {
         const msgData = JSON.parse(latestMsg);
         const contentType = msgData === null || msgData === void 0 ? void 0 : msgData.contentType;
-        const sender = getSenderLabelForLatestPreview(msgData, currentUserId, t);
+        const sender = getSenderLabelForLatestPreview(msgData, currentUserId, t, conversation);
         switch (contentType) {
             case MessageType.LogTextMessage:
                 return getSystemLogMessageText(msgData);
             case MessageType.TextMessage:
             case MessageType.QuoteMessage:
             case MessageType.UrlTextMessage:
-                return `${sender}: ${generateContentBasedOnMessageType(contentType, ((_a = msgData === null || msgData === void 0 ? void 0 : msgData.textElem) === null || _a === void 0 ? void 0 : _a.content) ||
+                return formatWithSender(sender, generateContentBasedOnMessageType(contentType, ((_a = msgData === null || msgData === void 0 ? void 0 : msgData.textElem) === null || _a === void 0 ? void 0 : _a.content) ||
                     ((_b = msgData === null || msgData === void 0 ? void 0 : msgData.quoteElem) === null || _b === void 0 ? void 0 : _b.text) ||
                     ((_c = msgData === null || msgData === void 0 ? void 0 : msgData.urlTextElem) === null || _c === void 0 ? void 0 : _c.content) ||
-                    "")}`;
+                    ""));
             case MessageType.PictureMessage:
             case MessageType.MergeMessage:
             case MessageType.VoiceMessage:
             case MessageType.VideoMessage:
             case MessageType.FileMessage:
-                return `${sender}: ${generateContentBasedOnMessageType(contentType)}`;
+                return formatWithSender(sender, generateContentBasedOnMessageType(contentType));
             case MessageType.RevokeMessage:
-                return t("revoked_with_sender", { name: sender });
+                return sender ? t("revoked_with_sender", { name: sender }) : t("revoked");
             case MessageType.CustomMessage: {
                 const customData = (_d = msgData.customElem) === null || _d === void 0 ? void 0 : _d.data;
                 if (customData === "#SESSION - START") {

package/dist/utils/customMessage.d.ts

@@ -0,0 +1,5 @@
+import type { MessageItem } from "@openim/wasm-client-sdk";
+import { type CustomMessagePayload } from "../types/customMessage";
+export declare const isRenderableCustomMessage: (message: MessageItem) => boolean;
+export declare const parseCustomMessagePayload: (message: MessageItem) => CustomMessagePayload | null;
+//# sourceMappingURL=customMessage.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"customMessage.d.ts","sourceRoot":"","sources":["../../src/utils/customMessage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAGL,KAAK,oBAAoB,EAC1B,MAAM,uBAAuB,CAAC;AAY/B,eAAO,MAAM,yBAAyB,GAAI,SAAS,WAAW,KAAG,OAGhE,CAAC;AAEF,eAAO,MAAM,yBAAyB,GACpC,SAAS,WAAW,KACnB,oBAAoB,GAAG,IAuBzB,CAAC"}

package/dist/utils/customMessage.js

@@ -0,0 +1,36 @@
+import { CustomMessageType, } from "../types/customMessage";
+const KNOWN_CUSTOM_MESSAGE_TYPES = Object.values(CustomMessageType);
+const isCustomElemOrderData = (data) => {
+    if (typeof data !== "object" || data === null)
+        return false;
+    const orderData = data;
+    return (typeof orderData.id === "string" && typeof orderData.orderCode === "string");
+};
+export const isRenderableCustomMessage = (message) => {
+    var _a;
+    const extension = (_a = message === null || message === void 0 ? void 0 : message.customElem) === null || _a === void 0 ? void 0 : _a.extension;
+    return !!extension && KNOWN_CUSTOM_MESSAGE_TYPES.includes(extension);
+};
+export const parseCustomMessagePayload = (message) => {
+    const customElem = message === null || message === void 0 ? void 0 : message.customElem;
+    if (!customElem || !isRenderableCustomMessage(message))
+        return null;
+    let parsedData = null;
+    try {
+        parsedData = JSON.parse(customElem.data || "");
+    }
+    catch (_a) {
+        return null;
+    }
+    if (typeof parsedData !== "object" || parsedData === null)
+        return null;
+    if (customElem.extension === CustomMessageType.Order) {
+        return isCustomElemOrderData(parsedData)
+            ? { type: CustomMessageType.Order, data: parsedData }
+            : null;
+    }
+    return {
+        type: CustomMessageType.Product,
+        data: parsedData,
+    };
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@droppii-org/chat-sdk",
-  "version": "0.1.67",
+  "version": "0.1.69",
   "description": "Droppii React Chat SDK",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -59,6 +59,10 @@
     "build": "pnpm build:css && tsc -p tsconfig.build.json && tsc-alias -p tsconfig.build.json && pnpm copy-assets",
     "build:css": "tailwindcss -i ./src/styles/global.css -o ./dist/styles/global.css --minify",
     "dev": "tsc --noEmit --watch",
+    "dev:link": "pnpm copy-assets && concurrently -k -n css,js,alias -c magenta,cyan,yellow \"pnpm:dev:link:css\" \"pnpm:dev:link:js\" \"pnpm:dev:link:alias\"",
+    "dev:link:css": "tailwindcss -i ./src/styles/global.css -o ./dist/styles/global.css --watch",
+    "dev:link:js": "tsc --watch -p tsconfig.build.json",
+    "dev:link:alias": "tsc-alias -p tsconfig.build.json --watch",
     "lint": "eslint src/",
     "type-check": "tsc --noEmit",
     "prepublishOnly": "pnpm build",
@@ -120,6 +124,7 @@
     "@types/node": "^20.0.0",
     "@types/react": "^18.2.37",
     "@types/react-dom": "^18.2.15",
+    "concurrently": "^9.1.0",
     "shx": "^0.4.0",
     "tsc-alias": "^1.8.17",
     "typescript": "^5.2.2"