@phonghq/go-chat 1.0.36 → 1.0.38

package/dist/chat/page/home/ChatList.vue.d.ts

@@ -39,6 +39,35 @@ declare const _default: import("vue").DefineComponent<__VLS_PublicProps, {
         color: string;
         is_unknown: number;
     }[]>;
+    listConversationsUnknown: import("vue").Ref<{
+        id: number;
+        receiver_id: number;
+        username: string | null;
+        phone: string;
+        avatar: string | null;
+        last_message: string;
+        last_message_time: string;
+        created_at: string;
+        updated_at: string;
+        unread_count: number;
+        status: number;
+        color: string;
+        is_unknown: number;
+    }[], IConversation[] | {
+        id: number;
+        receiver_id: number;
+        username: string | null;
+        phone: string;
+        avatar: string | null;
+        last_message: string;
+        last_message_time: string;
+        created_at: string;
+        updated_at: string;
+        unread_count: number;
+        status: number;
+        color: string;
+        is_unknown: number;
+    }[]>;
     getCurrentConversation: () => IConversation | undefined;
 }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     "update:receiverId": (value: any) => any;

package/dist/constant/mqtt.d.ts

@@ -1,5 +1,5 @@
 export declare const TOPIC_DETAIL_CHAT = "chat/message/";
 export declare const TOPIC_DETAIL_CALL = "call/message/";
-export declare const TOPIC_HOME: string[];
 export declare const TOPIC_PLIVO_SMS = "sms-inbound/";
 export declare const TOPIC_STATUS_USER: string;
+export declare const TOPIC_HOME: string[];

package/dist/test/chat/App.vue.js

@@ -17,7 +17,6 @@ import MobileFooter from '../components/chat/layout/mobile/Footer.vue';
 import '../style/index.scss';
 import { useDebounce } from '../utils/debounce';
 import { defineRootColor } from '../constant/color';
-import { publicTopicConversationUpdate } from '../utils/chat/conversation';
 import IconCloseCircle from '../assets/icons/IconCloseCircle.vue';
 import Setting from '../chat/page/setting/Setting.vue';
 import SettingSuccess from '../chat/page/setting/SettingSuccess.vue';
@@ -111,8 +110,10 @@ const currentPageConfig = computed(() => {
 const responsiveRender = computed(() => {
     return props.response == 'mobile' ? props.response : responsiveObserver.value;
 });
-const list = computed(() => chatListRef.value?.listConversationsAll ?? []);
-const unreadCount = computed(() => list.value?.reduce((total, cur) => total + (cur?.unread_count ?? 0), 0) ?? 0);
+const unreadCount = computed(() => {
+    return ((chatListRef.value?.listConversationsAll?.reduce((total, cur) => total + (cur?.unread_count ?? 0), 0) ?? 0) +
+        (chatListRef.value?.listConversationsUnknown?.reduce((total, cur) => total + (cur?.unread_count ?? 0), 0) ?? 0));
+});
 const callStatus = computed(() => callingRef.value?.callStatus ?? null);
 const responsiveObserver = ref('tablet');
 const appChatRef = ref();
@@ -161,14 +162,15 @@ const getResponsiveObserverDebounce = useDebounce(() => {
 }, 50);
 const handleInitPage = async () => {
     await initPage({ props: props, response: responsiveRender.value });
+    console.log(dataProfile.value, '55555555555555555');
     if (!dataProfile.value?.tenant_phone && dataProfile.value?.user_type == 'tenant') {
-        if (dataProfile.value?.has_business_tenant_phone) {
-            routerPush(PAGE.REGISTER_SUCCESS);
-        }
-        else {
-            // emit('error:noPhoneTenant')
-            routerPush(PAGE.REGISTER_TENANT);
-        }
+        emit('error:noPhoneTenant');
+        // if (dataProfile.value?.has_business_tenant_phone) {
+        //   routerPush(PAGE.REGISTER_SUCCESS)
+        // } else {
+        //   // emit('error:noPhoneTenant')
+        //   routerPush(PAGE.REGISTER_TENANT)
+        // }
     }
 };
 const handleEndCall = (data, type) => {
@@ -176,10 +178,10 @@ const handleEndCall = (data, type) => {
         if (data?.phone && homeComponentRef.value?.infoUser?.phone == data?.phone) {
             homeComponentRef.value?.handleGetMessage({ resetList: true });
         }
-        publicTopicConversationUpdate({
-            infoUser: homeComponentRef.value?.infoUser ?? null,
-            isCall: type
-        });
+        // publicTopicConversationUpdate({
+        //   infoUser: homeComponentRef.value?.infoUser ?? null,
+        //   isCall: type
+        // })
     }, 2000);
 };
 const openSettings = () => {
@@ -218,6 +220,7 @@ const askMedialPermission = async () => {
     handleMedialPermissionError();
 };
 const reload = () => {
+    ;
     window.location.reload();
 };
 let __VLS_exposed;
@@ -300,7 +303,7 @@ else if (__VLS_ctx.currentPage == __VLS_ctx.PAGE.REGISTER_SUCCESS) {
 }
 else {
     __VLS_asFunctionalElement(__VLS_elements.div, __VLS_elements.div)({
-        ...{ class: "w-full h-full  flex flex-col overflow-hidden relative" },
+        ...{ class: "w-full h-full flex flex-col overflow-hidden relative" },
     });
     if (__VLS_ctx.goChatError) {
         // @ts-ignore
@@ -439,6 +442,9 @@ else {
             // @ts-ignore
             [currentPageConfig,];
         }
+        else {
+            __VLS_asFunctionalElement(__VLS_elements.span, __VLS_elements.span)({});
+        }
         if (props.isLib) {
             __VLS_asFunctionalElement(__VLS_elements.button, __VLS_elements.button)({
                 ...{ onClick: (...[$event]) => {

package/dist/test/chat/page/home/ChatList.vue.js

@@ -61,12 +61,13 @@ const scrollEventRef = ref(null);
 const isLoadingSearch = ref(false);
 const getData = async (data, option) => {
     try {
+        const tab_value = option?.tab ?? activeTabs.value;
         if (!option?.hideLoading)
             isLoadingSearch.value = true;
-        if (activeTabs.value == TAB_VALUE.ALL) {
+        if (tab_value == TAB_VALUE.ALL) {
             await getDataAll(data, option);
         }
-        else if (activeTabs.value == TAB_VALUE.UNKNOWN) {
+        else if (tab_value == TAB_VALUE.UNKNOWN) {
             await getDataUnknown(data, option);
         }
         checkHasReceiveId();
@@ -148,19 +149,19 @@ const getTimeFromNow = (data) => {
 };
 const handleTabChange = async (tab) => {
     if (tab == TAB_VALUE.ALL && !listConversationsAll.value?.length) {
-        await getData({}, { reset: true });
+        await getData({}, { reset: true, tab });
     }
     else if (tab == TAB_VALUE.UNKNOWN && !listConversationsUnknown.value?.length) {
-        await getData({}, { reset: true });
+        await getData({}, { reset: true, tab });
     }
     checkHasReceiveId();
 };
 const getCurrentConversation = () => {
     return listConversations.value?.find(user => user.receiver_id == receiver_id.value);
 };
-// getData({}, { reset: true })
 handleTabChange(TAB_VALUE.ALL);
-const __VLS_exposed = { handleReadMessage, listConversationsAll, getCurrentConversation };
+handleTabChange(TAB_VALUE.UNKNOWN);
+const __VLS_exposed = { handleReadMessage, listConversationsAll, listConversationsUnknown, getCurrentConversation };
 defineExpose(__VLS_exposed);
 debugger; /* PartiallyEnd: #3632/scriptSetup.vue */
 const __VLS_modelEmit = defineEmits();

package/dist/test/chat/page/home/Home.vue.js

@@ -32,8 +32,6 @@ const handleConnectMqtt = async () => {
         topic_plivo_chat = TOPIC_PLIVO_SMS + infoUser.value?.conversation_id;
         subscribeToTopic(topic);
         subscribeToTopic(topic_plivo_chat);
-        // console.log(topic)
-        // console.log(topic_plivo_chat)
         addHandleMqttMessage('chat-home', topic, mqttMessageHandler);
         addHandleMqttMessage('chat-home-1', topic_plivo_chat, mqttMessageHandler);
     }
@@ -48,7 +46,8 @@ const handleDisconnectMqtt = async () => {
     removeHandleMqttMessage('chat-home-1');
 };
 const mqttMessageHandler = (topic, message) => {
-    if ((infoUser.value?.id && message?.sender_id?.toString() == infoUser.value?.id?.toString())) {
+    if ((infoUser.value?.id && message?.sender_id?.toString() == infoUser.value?.id?.toString())
+        || (infoUser.value?.id && message?.receiver_id?.toString() == infoUser.value?.id?.toString())) {
         const index = listMessage.value.findIndex((item) => item.id === message?.id);
         if (index < 0) {
             listMessage.value.unshift(message);

package/dist/test/chat/page/home/HomeHeader.vue.js

@@ -7,6 +7,7 @@ import { user } from '../../../utils/chat/user';
 import { dataProfile } from '../../../utils/chat/auth';
 import { digibotId } from '../../../composable/useDigibot';
 import IconArrowLeft from '../../../assets/icons/IconArrowLeft.vue';
+import { phoneNumberFormat } from '../../../utils/string-helper';
 import IconSms from '../../../assets/icons/IconSms.vue';
 import { activePlivoMode } from '../../..//utils/chat/message';
 import { ref } from 'vue';
@@ -120,9 +121,9 @@ __VLS_asFunctionalElement(__VLS_elements.div, __VLS_elements.div)({
 __VLS_asFunctionalElement(__VLS_elements.p, __VLS_elements.p)({
     ...{ class: "font-semibold truncate" },
 });
-(__VLS_ctx.data?.username ?? 'n/a');
+(__VLS_ctx.data?.username || __VLS_ctx.phoneNumberFormat(__VLS_ctx.data?.phone ?? '') || 'n/a');
 // @ts-ignore
-[data,];
+[data, data, phoneNumberFormat,];
 if (__VLS_ctx.data?.id && __VLS_ctx.data?.id != __VLS_ctx.digibotId.toString() && __VLS_ctx.dataProfile?.user_type == 'tenant') {
     // @ts-ignore
     [dataProfile, data, data, digibotId,];
@@ -155,12 +156,16 @@ if (__VLS_ctx.data?.id && __VLS_ctx.data?.id != __VLS_ctx.digibotId.toString() &
     // @ts-ignore
     const __VLS_18 = __VLS_asFunctionalComponent(IconSms, new IconSms({}));
     const __VLS_19 = __VLS_18({}, ...__VLS_functionalComponentArgsRest(__VLS_18));
-    __VLS_asFunctionalElement(__VLS_elements.span, __VLS_elements.span)({
-        ...{ class: "hidden md:block" },
-    });
-    (__VLS_ctx.activePlivoSms ? 'ON' : 'OFF');
-    // @ts-ignore
-    [activePlivoSms,];
+    if (__VLS_ctx.responsive != 'mobile') {
+        // @ts-ignore
+        [responsive,];
+        __VLS_asFunctionalElement(__VLS_elements.span, __VLS_elements.span)({
+            ...{ class: "hidden md:block" },
+        });
+        (__VLS_ctx.activePlivoSms ? 'ON' : 'OFF');
+        // @ts-ignore
+        [activePlivoSms,];
+    }
     var __VLS_13;
 }
 if (__VLS_ctx.data?.id && __VLS_ctx.data?.id != __VLS_ctx.digibotId.toString() && __VLS_ctx.dataProfile?.user_type == 'tenant') {

package/dist/test/chat/page/home/NewCustomer.vue.js

@@ -1,5 +1,6 @@
 /// <reference types="C:/phonghq/go-chat-v2/node_modules/.vue-global-types/vue_3.5_0.d.ts" />
 import Avatar from '../../../components/chat/customer/Avatar.vue';
+import { phoneNumberFormat } from '../../../utils/string-helper';
 const props = withDefaults(defineProps(), {});
 debugger; /* PartiallyEnd: #3632/scriptSetup.vue */
 const __VLS_defaults = {};
@@ -41,9 +42,9 @@ __VLS_asFunctionalElement(__VLS_elements.div, __VLS_elements.div)({
 __VLS_asFunctionalElement(__VLS_elements.h2, __VLS_elements.h2)({
     ...{ class: "text-2xl font-semibold" },
 });
-(__VLS_ctx.data?.username ?? 'n/a');
+(__VLS_ctx.data?.username || __VLS_ctx.phoneNumberFormat(__VLS_ctx.data?.phone ?? '') || 'n/a');
 // @ts-ignore
-[data,];
+[data, data, phoneNumberFormat,];
 __VLS_asFunctionalElement(__VLS_elements.img)({
     src: "../../../assets/images/icons/new-customer.png",
 });

package/dist/test/components/chat/call/Calling.vue.js

@@ -13,6 +13,7 @@ import { usePlivo } from '../../../composable/usePlivo';
 import { PLIVO_CALL_STATUS } from '../../../types/chat/call';
 import IconMic from '../../../assets/icons/call/IconMic.vue';
 import { useError } from '../../../composable/useError';
+import { useDebounce } from '../../../utils/debounce';
 const props = withDefaults(defineProps(), {});
 const emit = defineEmits();
 // const {
@@ -117,6 +118,9 @@ function endCall(option) {
         drawerVisible.value = false;
         drawerVisibleRef.value?.close();
     }
+    else {
+        handleEmitEndCall(userRemoter.value, callType);
+    }
     plivoEndCall(callStatus.value);
     callStatus.value = PLIVO_CALL_STATUS.CALL_END;
     clearInterval(timer);
@@ -127,9 +131,11 @@ function endCall(option) {
         clearInterval(timer);
     if (timeOut)
         clearTimeout(timeOut);
-    emit('endCall', userRemoter.value, callType);
     callType = '';
 }
+const handleEmitEndCall = useDebounce((data, type) => {
+    emit('endCall', data, type);
+}, 500);
 const refreshToken = async () => {
     try {
         console.log('refreshToken: ');
@@ -147,7 +153,7 @@ const refreshToken = async () => {
         refreshTokenCount = refreshTokenCount + 1;
         console.log(refreshTokenCount);
         if (refreshTokenCount < 3) {
-            setTimeout(() => refreshToken(), 2 * 60 * 1000);
+            setTimeout(() => refreshToken(), 60 * 1000);
         }
         else {
             showError('We’re having trouble connecting the call. Please try again in a moment');

package/dist/test/composable/useListConversations.js

@@ -36,6 +36,7 @@ export const useListConversations = (is_unknown) => {
             if (dataProfile.value) {
                 await connectMqtt();
                 TOPIC_HOME.forEach((item) => {
+                    console.log(item + dataProfile.value?.id);
                     subscribeToTopic(item + dataProfile.value?.id);
                     addHandleMqttMessage('chat-list-' + item + '-' + is_unknown, item + dataProfile.value?.id, mqttMessageHandler);
                 });
@@ -51,7 +52,8 @@ export const useListConversations = (is_unknown) => {
         if ((data.is_unknown ?? 0) != is_unknown)
             return;
         getDataMqtt();
-        if (topic === TOPIC_HOME[0] + dataProfile.value?.id || topic === TOPIC_HOME[3] + dataProfile.value?.id) {
+        if ((topic === TOPIC_HOME[0] + dataProfile.value?.id) || topic === (TOPIC_HOME[3] + dataProfile.value?.id)) {
+            console.log(data);
             const index = listConversations.value.findIndex((item) => item.id === data.id);
             const hasChatBox = listConversations.value.findIndex((item) => item.id === digibotId);
             if (index != -1) {
@@ -79,6 +81,7 @@ export const useListConversations = (is_unknown) => {
                 listConversations.value[index].status = data.is_online ? 1 : 0;
             }
         }
+        console.log(listConversations.value, is_unknown);
     };
     const getDataMqtt = useDebounce(() => {
         getData(undefined, { hideLoading: true, reset: true });

package/dist/test/constant/mqtt.js

@@ -1,13 +1,13 @@
 export const TOPIC_DETAIL_CHAT = 'chat/message/';
 export const TOPIC_DETAIL_CALL = 'call/message/';
+export const TOPIC_PLIVO_SMS = 'sms-inbound/';
+export const TOPIC_STATUS_USER = 'user/status/';
 export const TOPIC_HOME = [
     'chat/conversation/update/',
     'chat/conversation/read_message/',
     'chat/conversation/update_list/',
-    'chat/conversation/update_list/sms-inbound'
+    'chat/conversation/update/sms-inbound/'
 ];
-export const TOPIC_PLIVO_SMS = 'sms-inbound/';
-export const TOPIC_STATUS_USER = 'user/status/';
 // export CALL_STATE = {
 //   Offer: 'offer',
 // }

package/dist/test/utils/chat/auth.js

@@ -41,6 +41,7 @@ export const getProfile = async () => {
 export const checkTenantPhone = async () => {
     const id = localStorage.getItem('chat_id');
     const res = await axios.get(`/api/v1/message/tenant/get-info?tenant_name=${id}`);
+    console.log(res, '5555555555555555');
     if (res.error || !res?.data)
         throw new Error(res.error);
     if (dataProfile.value)
@@ -48,6 +49,10 @@ export const checkTenantPhone = async () => {
     // if(dataProfile.value) dataProfile.value.tenant_phone =  ''
     if (dataProfile.value)
         dataProfile.value.tenant_phone_limit = Number(res?.data?.go_chat_phone_limit ?? 0);
+    if (dataProfile.value?.phone != dataProfile.value?.tenant_phone &&
+        dataProfile.value?.tenant_phone) {
+        updateProfile({ phone: dataProfile.value?.tenant_phone });
+    }
     return res;
 };
 export const submitTenantPhone = async (body) => {
@@ -55,6 +60,12 @@ export const submitTenantPhone = async (body) => {
     dataLoginLink.value = res;
     return res;
 };
+export const updateProfile = async (body) => {
+    const res = await axios.post('/api/v1/message/tenant/update', { ...body, id: dataProfile.value?.id });
+    console.log(res);
+    dataProfile.value = res;
+    return res;
+};
 export const logout = async () => {
     dataLogin = { id: '', token: '', domain: '' };
     dataProfile.value = null;

package/dist/test/utils/chat/conversation.js

@@ -42,7 +42,7 @@ export const publicTopicConversationUpdate = async (data) => {
         status: 1,
         color: dataProfile.value?.color ?? '',
         is_call: dataProfile.value?.color ?? '',
-        is_unknown: 0,
+        is_unknown: data.infoUser?.is_unknown ?? 0,
     };
     publishMessage(`${TOPIC_HOME[0] + Number(data.infoUser?.id)}`, JSON.stringify(dataMessageForReceiver));
     const dataMessageMyself = {

package/dist/utils/chat/auth.d.ts

@@ -54,5 +54,8 @@ export declare const submitTenantPhone: (body: {
     phone: string;
     tenant_id: string;
 }) => Promise<any>;
+export declare const updateProfile: (body: {
+    phone: string;
+}) => Promise<any>;
 export declare const logout: () => Promise<void>;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@phonghq/go-chat",
-  "version": "1.0.36",
+  "version": "1.0.38",
   "private": false,
   "files": [
     "dist"