@phonghq/go-chat 1.0.35 → 1.0.38

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

@@ -12,6 +12,8 @@ import IconClose from '../../../assets/icons/call/IconClose.vue';
 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 {
@@ -49,6 +51,7 @@ const handlePlivoCallBack = (status, data) => {
     }
 };
 const { plivoLogin, plivoCallAnswer, plivoCall, plivoEndCall, plivoCallSwishMute } = usePlivo(handlePlivoCallBack);
+const { showError } = useError();
 const STATUS_LABEL = computed(() => {
     return {
         [PLIVO_CALL_STATUS.CONNECTING]: 'Connecting...',
@@ -76,13 +79,20 @@ const userRemoter = ref(null);
 const isMute = ref(false);
 let timer = null;
 let timeOut = null;
+let refreshTokenTimeOut = null;
+let refreshTokenCount = null;
 let callType = 'call';
 let uuidEnd = '';
 onMounted(async () => {
-    if (dataProfile.value?.tenant_phone) {
-        const token = await getPlivoAccessToken();
-        // const token = ''
-        await plivoLogin(token);
+    try {
+        if (dataProfile.value?.tenant_phone) {
+            const token = await getPlivoAccessToken();
+            await plivoLogin({ token });
+            setTimeout(refreshToken, 1000);
+        }
+    }
+    catch {
+        showError('We’re having trouble connecting the call. Please try again in a moment');
     }
 });
 onUnmounted(() => {
@@ -108,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);
@@ -118,9 +131,36 @@ 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: ');
+        if (refreshTokenTimeOut) {
+            clearTimeout(refreshTokenTimeOut);
+            refreshTokenTimeOut = null;
+        }
+        const token = await getPlivoAccessToken();
+        await plivoLogin({ token, isRefresh: true });
+        setTimeout(() => refreshToken(), 15 * 60 * 1000);
+        refreshTokenCount = 0;
+    }
+    catch (e) {
+        console.log(e);
+        refreshTokenCount = refreshTokenCount + 1;
+        console.log(refreshTokenCount);
+        if (refreshTokenCount < 3) {
+            setTimeout(() => refreshToken(), 60 * 1000);
+        }
+        else {
+            showError('We’re having trouble connecting the call. Please try again in a moment');
+        }
+        console.log(e);
+    }
+};
 const open = () => {
     drawerVisible.value = true;
     disable.value = true;
@@ -159,7 +199,7 @@ const answer = async () => {
 const getUserOffer = async (phone) => {
     let res = null;
     try {
-        userRemoter.value = null;
+        userRemoter.value = { phone, username: '' };
         let data = {
             phone: formatPhone10number(phone, '1'),
             client_id: dataProfile.value?.tenant_id ?? ''

package/dist/test/composable/useError.js

@@ -0,0 +1,10 @@
+import { ref } from 'vue';
+export const goChatError = ref('');
+export function useError() {
+    const showError = (error) => {
+        goChatError.value = error;
+    };
+    return {
+        showError
+    };
+}

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) {
+        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/composable/usePlivo.js

@@ -1,4 +1,6 @@
 import { PLIVO_CALL_STATUS } from '../types/chat/call';
+import { createSipAccount } from '../utils/chat/call';
+import { dataProfile } from '../utils/chat/auth';
 export function usePlivo(callback) {
     var options = {
         debug: 'ALL',
@@ -12,36 +14,41 @@ export function usePlivo(callback) {
     let CallUuid = '';
     let custom_resolve = null;
     let custom_reject = null;
-    const plivoLogin = async (token) => {
+    const plivoLogin = async (data) => {
         // token =
         //   'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCIsImN0eSI6InBsaXZvO3Y9MSJ9.eyJqdGkiOiJ0ZXN0MSIsImlzcyI6IlNBTjJZMFpERTRNSkFUTVpZNU5DIiwic3ViIjoid2ViY2FsbDAwMzA3OTY3MzQ1NDg5MTgyNyIsIm5iZiI6MTc2MzY5MzUyNSwiZXhwIjoxNzYzNzc5OTI1LCJncmFudHMiOnsidm9pY2UiOnsiaW5jb21pbmdfYWxsb3ciOnRydWUsIm91dGdvaW5nX2FsbG93Ijp0cnVlfX19.9p4O_xTb4kNhKyDVfK3EemSKBQiHtbKNUZ5iwnSdX1I'
         try {
-            if (!plivoBrowserSdk)
+            if (!plivoBrowserSdk) {
                 plivoBrowserSdk = new window.Plivo(options);
-            plivoBrowserSdk?.client?.on?.('onCallAnswered', (callInfo) => {
-                handleCallAnswered(callInfo);
-            });
-            plivoBrowserSdk?.client?.on?.('onCallTerminated', (hangupInfo, callInfo) => handleCallTerminated(hangupInfo, callInfo));
-            plivoBrowserSdk.client.on('onCallFailed', (data, callInfo) => {
-                handleCallFailed(data, callInfo);
-            });
-            plivoBrowserSdk.client.on('onIncomingCallCanceled', (callInfo) => {
-                handleIncomingCallCanceled(callInfo);
-            });
-            // plivoBrowserSdk.client.on('onCalling', (data: any) => console.log('onCallFailed', data))
-            plivoBrowserSdk?.client?.on?.('onIncomingCall', (callerID, extraHeaders, callInfo) => {
-                handleIncomingCall(callInfo);
-            });
-            plivoBrowserSdk.client.on('onCallRemoteRinging', (data) => handleCallRemoteRinging(data));
-            plivoBrowserSdk.client.on('onMediaPermission', (e) => handleMediaPermission(e));
-            plivoBrowserSdk?.client?.on?.('onLoginFailed', (e) => handleLoginFailed(e));
-            // plivoBrowserSdk?.client?.on?.('remoteAudioStatus', () => console.log('remoteAudioStatus'))
-            const payload = JSON.parse(atob(token.split('.')[1]));
-            // console.log(payload)
+                plivoBrowserSdk?.client?.on?.('onCallAnswered', (callInfo) => {
+                    handleCallAnswered(callInfo);
+                });
+                plivoBrowserSdk?.client?.on?.('onCallTerminated', (hangupInfo, callInfo) => handleCallTerminated(hangupInfo, callInfo));
+                plivoBrowserSdk.client.on('onCallFailed', (data, callInfo) => {
+                    handleCallFailed(data, callInfo);
+                });
+                plivoBrowserSdk.client.on('onIncomingCallCanceled', (callInfo) => {
+                    handleIncomingCallCanceled(callInfo);
+                });
+                // plivoBrowserSdk.client.on('onCalling', (data: any) => console.log('onCallFailed', data))
+                plivoBrowserSdk?.client?.on?.('onIncomingCall', (callerID, extraHeaders, callInfo) => {
+                    handleIncomingCall(callInfo);
+                });
+                plivoBrowserSdk.client.on('onCallRemoteRinging', (data) => handleCallRemoteRinging(data));
+                plivoBrowserSdk.client.on('onMediaPermission', (e) => handleMediaPermission(e));
+                plivoBrowserSdk?.client?.on?.('onLoginFailed', (e) => handleLoginFailed(e));
+            }
+            if (!data.isRefresh) {
+                const payload = JSON.parse(atob(data.token.split('.')[1]));
+                await createSipAccount({
+                    sip_username: `${payload.sub}_${payload.iss}`,
+                    did_number: dataProfile.value?.tenant_phone ?? ''
+                });
+            }
             // await plivoBrowserSdk?.client?.tokenLogin(payload.sub ?? '', token)
             // await plivoBrowserSdk?.client?.login('webcall003079673454891827', '123456abcA!')
             // await plivoBrowserSdk?.client?.login(payload.sub , null, token)
-            await plivoBrowserSdk?.client?.loginWithAccessToken(token);
+            await plivoBrowserSdk?.client?.loginWithAccessToken(data.token);
             // await plivoBrowserSdk?.client?.on?.(payload)
             // console.log('Registered with token')
         }

package/dist/test/constant/mqtt.js

@@ -1,12 +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/',
+    'chat/conversation/update/sms-inbound/'
 ];
-export const TOPIC_PLIVO_SMS = 'sms-outbound/';
-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/call.js

@@ -137,3 +137,19 @@ export const getPlivoAccessToken = async () => {
     const result = await response.json();
     return result?.accessToken;
 };
+export const createSipAccount = async (data) => {
+    const url = BARE_WEBSOCKET_URL + '/ws/create-sip-account';
+    const response = await fetch(url, {
+        method: 'POST',
+        body: JSON.stringify(data),
+        headers: {
+            ['Content-Type']: 'application/json'
+        }
+    });
+    if (!response.ok) {
+        throw new Error(`Response status: ${response.status}`);
+    }
+    const result = await response.json();
+    console.log(result);
+    return result;
+};

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

@@ -30,7 +30,7 @@ export const publicTopicConversationUpdate = async (data) => {
     const current = dayjs().tz(TIME_ZONE_UTC).format(DATE_FORMATS['DATE_FORMAT_FULL']);
     const dataMessageForReceiver = {
         id: data.infoUser?.conversation_id ?? 0,
-        receiver_id: Number(dataProfile.value?.id ?? 0),
+        receiver_id: Number(data.infoUser?.id ?? 0),
         username: dataProfile.value?.username ?? '',
         phone: dataProfile.value?.phone ?? '',
         avatar: dataProfile.value?.avatar ?? '',
@@ -42,12 +42,12 @@ 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 = {
         id: data.infoUser?.conversation_id ?? 0,
-        receiver_id: Number(dataProfile.value?.id ?? 0),
+        receiver_id: Number(data.infoUser?.id ?? 0),
         username: data.infoUser?.username ?? '',
         phone: data.infoUser?.phone ?? '',
         avatar: data.infoUser?.avatar ?? '',

package/dist/test/utils/string-helper.js

@@ -4,7 +4,7 @@ export const phoneNumberFormat = (phone, halfShowType = 1) => {
         number = number.substring(number.length - 10);
     }
     if (number.length == 10) {
-        if (true) {
+        if (false) {
             if (halfShowType == 4) {
                 number = (number || '').replace(/(\d{3})(\d{3})(\d{4})/, "*** $3");
             }

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

@@ -26,6 +26,7 @@ interface IResProfile {
     user_type: 'customer' | 'tenant';
     has_business_tenant_phone?: boolean;
     color: string;
+    is_sms_active: number;
 }
 interface IPramsLoginLink {
     tenant_id: string;

package/dist/types/message.d.ts

@@ -20,6 +20,7 @@ export type IResMessage = {
     message_uuid?: string | null;
     is_call?: number | null;
     duration?: number | null;
+    is_sms: number;
     record_url?: string | null;
     call_status?: string | null;
     created_at: string;

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

@@ -20,6 +20,7 @@ export declare const dataProfile: import("vue").Ref<{
     user_type: "customer" | "tenant";
     has_business_tenant_phone?: boolean | undefined;
     color: string;
+    is_sms_active: number;
 } | null, IResProfile | {
     id: number;
     username: string;
@@ -31,6 +32,7 @@ export declare const dataProfile: import("vue").Ref<{
     user_type: "customer" | "tenant";
     has_business_tenant_phone?: boolean | undefined;
     color: string;
+    is_sms_active: number;
 } | null>;
 export declare const dataLoginLink: import("vue").Ref<{
     token: string;
@@ -52,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/dist/utils/chat/call.d.ts

@@ -9,3 +9,7 @@ export declare const plivoCall: (user: IResUser) => Promise<any>;
 export declare const plivoEndCall: (uuid: string) => Promise<void>;
 export declare const downloadRecord: (url_pub: string) => Promise<void>;
 export declare const getPlivoAccessToken: () => Promise<any>;
+export declare const createSipAccount: (data: {
+    did_number: string;
+    sip_username: string;
+}) => Promise<any>;

package/package.json

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