@vgroup/dialbox 0.0.76 → 0.0.78
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm2020/lib/dialbox.component.mjs +181 -7
- package/esm2020/lib/service/twilio.service.mjs +32 -2
- package/fesm2015/vgroup-dialbox.mjs +204 -7
- package/fesm2015/vgroup-dialbox.mjs.map +1 -1
- package/fesm2020/vgroup-dialbox.mjs +211 -7
- package/fesm2020/vgroup-dialbox.mjs.map +1 -1
- package/lib/dialbox.component.d.ts +1 -0
- package/lib/service/twilio.service.d.ts +10 -1
- package/package.json +1 -1
|
@@ -15,7 +15,8 @@ export class TwilioService {
|
|
|
15
15
|
this.notificationSerivce = notificationSerivce;
|
|
16
16
|
this.openInProgressDialpad = new BehaviorSubject(false);
|
|
17
17
|
this.currentCall = new BehaviorSubject(null);
|
|
18
|
-
this.currentCallState = new BehaviorSubject('none'); //in-progress, out-progress, none
|
|
18
|
+
this.currentCallState = new BehaviorSubject('none'); // 'incoming', 'in-progress', 'out-progress', 'none'
|
|
19
|
+
this._currentCall = null;
|
|
19
20
|
this.callType = new BehaviorSubject('NIL');
|
|
20
21
|
this.isIncomingCallPicked = new BehaviorSubject(false); // for both incoming and outgoing
|
|
21
22
|
this.token = localStorage.getItem('ext_token');
|
|
@@ -43,10 +44,27 @@ export class TwilioService {
|
|
|
43
44
|
});
|
|
44
45
|
this.device.register();
|
|
45
46
|
this.device.on('incoming', (call) => {
|
|
47
|
+
this._currentCall = call;
|
|
46
48
|
this.currentCall.next(call);
|
|
47
49
|
this.callType.next('INCOMING');
|
|
48
50
|
this.currentCallState.next('incoming');
|
|
49
51
|
this.notificationSerivce.showNotification(call);
|
|
52
|
+
// Set up call event handlers
|
|
53
|
+
call.on('accept', () => {
|
|
54
|
+
this.currentCallState.next('in-progress');
|
|
55
|
+
});
|
|
56
|
+
call.on('disconnect', () => {
|
|
57
|
+
this._currentCall = null;
|
|
58
|
+
this.currentCall.next(null);
|
|
59
|
+
this.currentCallState.next('none');
|
|
60
|
+
this.callType.next('NIL');
|
|
61
|
+
});
|
|
62
|
+
call.on('cancel', () => {
|
|
63
|
+
this._currentCall = null;
|
|
64
|
+
this.currentCall.next(null);
|
|
65
|
+
this.currentCallState.next('none');
|
|
66
|
+
this.callType.next('NIL');
|
|
67
|
+
});
|
|
50
68
|
});
|
|
51
69
|
this.device.on('error', (error) => {
|
|
52
70
|
console.error('Twilio Device Error:', error);
|
|
@@ -146,6 +164,18 @@ export class TwilioService {
|
|
|
146
164
|
const params = new HttpParams().set('isoCode', isoCode);
|
|
147
165
|
return this.http.get(environment.apiUrl + '/utilities/softphone/check/countryCode/' + dialledNo, httpOptions);
|
|
148
166
|
}
|
|
167
|
+
/**
|
|
168
|
+
* Get the current active call
|
|
169
|
+
*/
|
|
170
|
+
getCurrentCall() {
|
|
171
|
+
return this._currentCall;
|
|
172
|
+
}
|
|
173
|
+
/**
|
|
174
|
+
* Check if there's an active call
|
|
175
|
+
*/
|
|
176
|
+
hasActiveCall() {
|
|
177
|
+
return this._currentCall !== null;
|
|
178
|
+
}
|
|
149
179
|
}
|
|
150
180
|
TwilioService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: TwilioService, deps: [{ token: i1.HttpClient }, { token: i2.ExtensionService }, { token: i3.NotificationService }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
151
181
|
TwilioService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: TwilioService, providedIn: 'root' });
|
|
@@ -155,4 +185,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImpo
|
|
|
155
185
|
providedIn: 'root'
|
|
156
186
|
}]
|
|
157
187
|
}], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: i2.ExtensionService }, { type: i3.NotificationService }]; } });
|
|
158
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"twilio.service.js","sourceRoot":"","sources":["../../../../../projects/dialbox/src/lib/service/twilio.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { HttpClient, HttpParams } from '@angular/common/http';\nimport { HttpHeaders } from \"@angular/common/http\";\nimport { Injectable } from '@angular/core';\nimport { Call, Device } from '@twilio/voice-sdk';\nimport { BehaviorSubject, Observable } from 'rxjs';\nimport { environment } from \"../environments/environments\"\nimport { ExtensionService } from './extension.service';\nimport { NotificationService } from './Notification.service';\n\nexport interface DialPayload {\n  number: string;\n  name: string;\n  img: string;\n  callerId:string;\n  isDialFromHistory:boolean;\n  from:string;\n}\n\n@Injectable({\n  providedIn: 'root'\n})\nexport class TwilioService {\n  \n  openInProgressDialpad = new BehaviorSubject<boolean>(false);\n  currentCall = new BehaviorSubject<Call | null>(null);\n  currentCallState = new BehaviorSubject<any>('none'); //in-progress, out-progress, none\n  device:any;\n  incomingCallToken?:string;\n  outgoingCallToken?:string;\n  callType = new BehaviorSubject<string>('NIL');\n  isIncomingCallPicked = new BehaviorSubject<boolean>(false); // for both incoming and outgoing\n  token:any = localStorage.getItem('ext_token');\n  isNewContactAdded = new BehaviorSubject<boolean>(false);\n  updateRecentCall = new BehaviorSubject<boolean>(false);\n  callhandleFromNotification = new BehaviorSubject<any>({});\n\n  endCall = new BehaviorSubject<boolean>(false);\n  dialNumberFromOtherModule = new BehaviorSubject<DialPayload>({ number: '', name: '', img: '', callerId: '', isDialFromHistory: false, from: '' });\n\n  toggleCallerIdAlert = new BehaviorSubject<boolean>(true);\n  isTrialOver = new BehaviorSubject<boolean>(false);\n  isPaymentDue = new BehaviorSubject<boolean>(false);\n  isAvailableNumber = new BehaviorSubject<boolean>(false);\n  callerIdList = new BehaviorSubject<any[]>([]);\n  triggerSMSReload = new BehaviorSubject<boolean>(false);\n\n  constructor(private http: HttpClient, private extensionService: ExtensionService,\n      private notificationSerivce: NotificationService\n  ) {\n    this.initializeTwilioDevice();\n   }\n\n   public initializeTwilioDevice() {\n    if (this.token) {\n      this.extensionService.getIncomingCallToken().subscribe((data: any) => {\n        this.incomingCallToken = data.token;\n        localStorage.setItem('in-token', data.token);\n        this.device = new Device(this.incomingCallToken!, { \n          allowIncomingWhileBusy: true,\n          // Add any other necessary options\n        });\n        \n        this.device.register();\n\n        this.device.on('incoming', (call: Call) => {\n          this.currentCall.next(call);\n          this.callType.next('INCOMING');\n          this.currentCallState.next('incoming');\n          this.notificationSerivce.showNotification(call);\n        });\n\n        this.device.on('error', (error: any) => {\n          console.error('Twilio Device Error:', error);\n          // Add error handling and reconnection logic\n        });\n      });\n    }\n  }\n\n  // onIncomingCall(){\n  //   this.device.on('incoming', (call:any) => {\n  //     console.log(call);\n     \n  //     //call.accept();\n  //   });\n  // }\n  saveContact(payload: any): Observable<[]> {\n    const httpOptions = { headers: new HttpHeaders({ 'Content-Type': 'application/json', 'Auth-Key': \"Bearer \" + localStorage.getItem('ext_token')}) };\n    return this.http.post<[]>(environment.apiUrl + '/utilities/phonebook/add/contacts/manually', payload, httpOptions);\n  }\n  updateContact(payload:any){\n    const httpOptions = { headers: new HttpHeaders({ 'Content-Type': 'application/json', 'Auth-Key': \"Bearer \" + this.token}) };\n    return this.http.post<[]>(environment.apiUrl + '/utilities/phonebook/update/contact', payload, httpOptions);\n  }\n  \n  deleteContact(id:string){\n    let payload = {\n      phonebookid: id\n    }\n    const httpOptions = { headers: new HttpHeaders({ 'Content-Type': 'application/json', 'Auth-Key': \"Bearer \" + localStorage.getItem('ext_token') }) };\n    return this.http.post<[]>(environment.apiUrl + '/utilities/phonebook/delete/contact/'+id,payload, httpOptions);\n  }\n  getContactList(){\n    const httpOptions = { headers: new HttpHeaders({ 'Content-Type': 'application/json', 'Auth-Key': \"Bearer \" + localStorage.getItem('ext_token') }) };\n    return this.http.get<[]>(environment.apiUrl + '/utilities/phonebook/read/contacts', httpOptions);\n  }\n\n  addContactToFavourite(payload: any){\n    const httpOptions = { headers: new HttpHeaders({ 'Content-Type': 'application/json', 'Auth-Key': \"Bearer \" + localStorage.getItem('ext_token') }) };\n    return this.http.post<[]>(environment.apiUrl + '/utilities/phonebook/update/favourite', payload, httpOptions);\n  }\n\n  getFavouritContacts(){\n    const httpOptions = { headers: new HttpHeaders({ 'Content-Type': 'application/json', 'Auth-Key': \"Bearer \" + localStorage.getItem('ext_token') }) };\n    return this.http.get<[]>(environment.apiUrl + '/utilities/phonebook/favourite/contacts', httpOptions);\n  }\n\n  getRecentCalls(pageIndex?: string, pageSize?: string,){\n    // let params = new HttpParams();\n    // params = params.set('size', pageSize);\n    // params = params.set('page', pageIndex);\n    const headers =  { 'Content-Type': 'application/json', 'Auth-Key': \"Bearer \" + localStorage.getItem('ext_token') };\n    const httpOptions ={headers}\n    return this.http.get<[]>(environment.apiUrl + '/utilities/phonebook/recent/calls', httpOptions);\n  }\n  deleteRecentCallLog(id:string| string[]){\n    let payload = {\n      recordId: id\n    }\n    const httpOptions = { headers: new HttpHeaders({ 'Content-Type': 'application/json', 'Auth-Key': \"Bearer \" + localStorage.getItem('ext_token') }) };\n    return this.http.post<[]>(environment.apiUrl + '/utilities/phonebook/delete/calls/'+id,payload, httpOptions);\n  }\n\n  uploadPhoto(payload: any){\n    let httpOptions = {\n      headers: new HttpHeaders({\n        'Auth-Key': \"Bearer \" + localStorage.getItem('ext_token')\n      })\n    };\n    return this.http.post<[]>(environment.apiUrl + '/utilities/phonebook/upload/photo',payload, httpOptions);\n  }\n\n  deletePhoto(id:string){\n    let payload = {\n      phonebookid: id\n    }\n    let httpOptions = {\n      headers: new HttpHeaders({\n        'Auth-Key': \"Bearer \" + localStorage.getItem('ext_token')\n      })\n    };\n    return this.http.post<[]>(environment.apiUrl + '/utilities/phonebook/delete/photo/'+id,payload, httpOptions);\n  }\n\n  // toggleCallerIdAlertFn(val: any) {\n  //   let httpOptions = {\n  //     headers: new HttpHeaders({\n  //       'Auth-Key': \"Bearer \" + localStorage.getItem('ext_token')\n  //     })\n  //   };\n  //   return this.http.put<[]>(environment.apiUrl + '/utilities/softphone/callerid/alert/' + val, {}, httpOptions);\n  // }\n\n  toggleCoutryCodeToast(val:any){\n    let httpOptions = {\n      headers: new HttpHeaders({\n        'Auth-Key': \"Bearer \" + localStorage.getItem('ext_token')\n      })\n    };\n    return this.http.put<[]>(environment.apiUrl + '/utilities/softphone/countrycode/alert/' + val, {}, httpOptions);\n  }\n  getToNumber(dialledNo: string, isoCode: string) {\n    const httpOptions = {\n      headers: new HttpHeaders({ 'Content-Type': 'application/json', 'Auth-Key': \"Bearer \" + localStorage.getItem('ext_token') }),\n      params: new HttpParams().set('isoCode', isoCode)\n    };\n    const params = new HttpParams().set('isoCode', isoCode)\n    return this.http.get<[]>(environment.apiUrl + '/utilities/softphone/check/countryCode/' + dialledNo, httpOptions);\n  } \n\n}\n"]}
|
|
188
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"twilio.service.js","sourceRoot":"","sources":["../../../../../projects/dialbox/src/lib/service/twilio.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { HttpClient, HttpParams } from '@angular/common/http';\nimport { HttpHeaders } from \"@angular/common/http\";\nimport { Injectable } from '@angular/core';\nimport { Call, Device } from '@twilio/voice-sdk';\nimport { BehaviorSubject, Observable } from 'rxjs';\nimport { environment } from \"../environments/environments\"\nimport { ExtensionService } from './extension.service';\nimport { NotificationService } from './Notification.service';\n\nexport interface DialPayload {\n  number: string;\n  name: string;\n  img: string;\n  callerId:string;\n  isDialFromHistory:boolean;\n  from:string;\n}\n\n@Injectable({\n  providedIn: 'root'\n})\nexport class TwilioService {\n  \n  openInProgressDialpad = new BehaviorSubject<boolean>(false);\n  currentCall = new BehaviorSubject<Call | null>(null);\n  currentCallState = new BehaviorSubject<string>('none'); // 'incoming', 'in-progress', 'out-progress', 'none'\n  device: any;\n  private _currentCall: Call | null = null;\n  incomingCallToken?:string;\n  outgoingCallToken?:string;\n  callType = new BehaviorSubject<string>('NIL');\n  isIncomingCallPicked = new BehaviorSubject<boolean>(false); // for both incoming and outgoing\n  token:any = localStorage.getItem('ext_token');\n  isNewContactAdded = new BehaviorSubject<boolean>(false);\n  updateRecentCall = new BehaviorSubject<boolean>(false);\n  callhandleFromNotification = new BehaviorSubject<any>({});\n\n  endCall = new BehaviorSubject<boolean>(false);\n  dialNumberFromOtherModule = new BehaviorSubject<DialPayload>({ number: '', name: '', img: '', callerId: '', isDialFromHistory: false, from: '' });\n\n  toggleCallerIdAlert = new BehaviorSubject<boolean>(true);\n  isTrialOver = new BehaviorSubject<boolean>(false);\n  isPaymentDue = new BehaviorSubject<boolean>(false);\n  isAvailableNumber = new BehaviorSubject<boolean>(false);\n  callerIdList = new BehaviorSubject<any[]>([]);\n  triggerSMSReload = new BehaviorSubject<boolean>(false);\n\n  constructor(private http: HttpClient, private extensionService: ExtensionService,\n      private notificationSerivce: NotificationService\n  ) {\n    this.initializeTwilioDevice();\n   }\n\n   public initializeTwilioDevice() {\n    if (this.token) {\n      this.extensionService.getIncomingCallToken().subscribe((data: any) => {\n        this.incomingCallToken = data.token;\n        localStorage.setItem('in-token', data.token);\n        this.device = new Device(this.incomingCallToken!, { \n          allowIncomingWhileBusy: true,\n          // Add any other necessary options\n        });\n        \n        this.device.register();\n\n        this.device.on('incoming', (call: Call) => {\n          this._currentCall = call;\n          this.currentCall.next(call);\n          this.callType.next('INCOMING');\n          this.currentCallState.next('incoming');\n          this.notificationSerivce.showNotification(call);\n          \n          // Set up call event handlers\n          call.on('accept', () => {\n            this.currentCallState.next('in-progress');\n          });\n          \n          call.on('disconnect', () => {\n            this._currentCall = null;\n            this.currentCall.next(null);\n            this.currentCallState.next('none');\n            this.callType.next('NIL');\n          });\n          \n          call.on('cancel', () => {\n            this._currentCall = null;\n            this.currentCall.next(null);\n            this.currentCallState.next('none');\n            this.callType.next('NIL');\n          });\n        });\n\n        this.device.on('error', (error: any) => {\n          console.error('Twilio Device Error:', error);\n          // Add error handling and reconnection logic\n        });\n      });\n    }\n  }\n\n  // onIncomingCall(){\n  //   this.device.on('incoming', (call:any) => {\n  //     console.log(call);\n     \n  //     //call.accept();\n  //   });\n  // }\n  saveContact(payload: any): Observable<[]> {\n    const httpOptions = { headers: new HttpHeaders({ 'Content-Type': 'application/json', 'Auth-Key': \"Bearer \" + localStorage.getItem('ext_token')}) };\n    return this.http.post<[]>(environment.apiUrl + '/utilities/phonebook/add/contacts/manually', payload, httpOptions);\n  }\n  updateContact(payload:any){\n    const httpOptions = { headers: new HttpHeaders({ 'Content-Type': 'application/json', 'Auth-Key': \"Bearer \" + this.token}) };\n    return this.http.post<[]>(environment.apiUrl + '/utilities/phonebook/update/contact', payload, httpOptions);\n  }\n  \n  deleteContact(id:string){\n    let payload = {\n      phonebookid: id\n    }\n    const httpOptions = { headers: new HttpHeaders({ 'Content-Type': 'application/json', 'Auth-Key': \"Bearer \" + localStorage.getItem('ext_token') }) };\n    return this.http.post<[]>(environment.apiUrl + '/utilities/phonebook/delete/contact/'+id,payload, httpOptions);\n  }\n  getContactList(){\n    const httpOptions = { headers: new HttpHeaders({ 'Content-Type': 'application/json', 'Auth-Key': \"Bearer \" + localStorage.getItem('ext_token') }) };\n    return this.http.get<[]>(environment.apiUrl + '/utilities/phonebook/read/contacts', httpOptions);\n  }\n\n  addContactToFavourite(payload: any){\n    const httpOptions = { headers: new HttpHeaders({ 'Content-Type': 'application/json', 'Auth-Key': \"Bearer \" + localStorage.getItem('ext_token') }) };\n    return this.http.post<[]>(environment.apiUrl + '/utilities/phonebook/update/favourite', payload, httpOptions);\n  }\n\n  getFavouritContacts(){\n    const httpOptions = { headers: new HttpHeaders({ 'Content-Type': 'application/json', 'Auth-Key': \"Bearer \" + localStorage.getItem('ext_token') }) };\n    return this.http.get<[]>(environment.apiUrl + '/utilities/phonebook/favourite/contacts', httpOptions);\n  }\n\n  getRecentCalls(pageIndex?: string, pageSize?: string,){\n    // let params = new HttpParams();\n    // params = params.set('size', pageSize);\n    // params = params.set('page', pageIndex);\n    const headers =  { 'Content-Type': 'application/json', 'Auth-Key': \"Bearer \" + localStorage.getItem('ext_token') };\n    const httpOptions ={headers}\n    return this.http.get<[]>(environment.apiUrl + '/utilities/phonebook/recent/calls', httpOptions);\n  }\n  deleteRecentCallLog(id:string| string[]){\n    let payload = {\n      recordId: id\n    }\n    const httpOptions = { headers: new HttpHeaders({ 'Content-Type': 'application/json', 'Auth-Key': \"Bearer \" + localStorage.getItem('ext_token') }) };\n    return this.http.post<[]>(environment.apiUrl + '/utilities/phonebook/delete/calls/'+id,payload, httpOptions);\n  }\n\n  uploadPhoto(payload: any){\n    let httpOptions = {\n      headers: new HttpHeaders({\n        'Auth-Key': \"Bearer \" + localStorage.getItem('ext_token')\n      })\n    };\n    return this.http.post<[]>(environment.apiUrl + '/utilities/phonebook/upload/photo',payload, httpOptions);\n  }\n\n  deletePhoto(id:string){\n    let payload = {\n      phonebookid: id\n    }\n    let httpOptions = {\n      headers: new HttpHeaders({\n        'Auth-Key': \"Bearer \" + localStorage.getItem('ext_token')\n      })\n    };\n    return this.http.post<[]>(environment.apiUrl + '/utilities/phonebook/delete/photo/'+id,payload, httpOptions);\n  }\n\n  // toggleCallerIdAlertFn(val: any) {\n  //   let httpOptions = {\n  //     headers: new HttpHeaders({\n  //       'Auth-Key': \"Bearer \" + localStorage.getItem('ext_token')\n  //     })\n  //   };\n  //   return this.http.put<[]>(environment.apiUrl + '/utilities/softphone/callerid/alert/' + val, {}, httpOptions);\n  // }\n\n  toggleCoutryCodeToast(val:any){\n    let httpOptions = {\n      headers: new HttpHeaders({\n        'Auth-Key': \"Bearer \" + localStorage.getItem('ext_token')\n      })\n    };\n    return this.http.put<[]>(environment.apiUrl + '/utilities/softphone/countrycode/alert/' + val, {}, httpOptions);\n  }\n  getToNumber(dialledNo: string, isoCode: string) {\n    const httpOptions = {\n      headers: new HttpHeaders({ 'Content-Type': 'application/json', 'Auth-Key': \"Bearer \" + localStorage.getItem('ext_token') }),\n      params: new HttpParams().set('isoCode', isoCode)\n    };\n    const params = new HttpParams().set('isoCode', isoCode)\n    return this.http.get<[]>(environment.apiUrl + '/utilities/softphone/check/countryCode/' + dialledNo, httpOptions);\n  }\n\n  /**\n   * Get the current active call\n   */\n  getCurrentCall(): Call | null {\n    return this._currentCall;\n  }\n\n  /**\n   * Check if there's an active call\n   */\n  hasActiveCall(): boolean {\n    return this._currentCall !== null;\n  }\n}\n"]}
|
|
@@ -1373,7 +1373,8 @@ class TwilioService {
|
|
|
1373
1373
|
this.notificationSerivce = notificationSerivce;
|
|
1374
1374
|
this.openInProgressDialpad = new BehaviorSubject(false);
|
|
1375
1375
|
this.currentCall = new BehaviorSubject(null);
|
|
1376
|
-
this.currentCallState = new BehaviorSubject('none'); //in-progress, out-progress, none
|
|
1376
|
+
this.currentCallState = new BehaviorSubject('none'); // 'incoming', 'in-progress', 'out-progress', 'none'
|
|
1377
|
+
this._currentCall = null;
|
|
1377
1378
|
this.callType = new BehaviorSubject('NIL');
|
|
1378
1379
|
this.isIncomingCallPicked = new BehaviorSubject(false); // for both incoming and outgoing
|
|
1379
1380
|
this.token = localStorage.getItem('ext_token');
|
|
@@ -1401,10 +1402,27 @@ class TwilioService {
|
|
|
1401
1402
|
});
|
|
1402
1403
|
this.device.register();
|
|
1403
1404
|
this.device.on('incoming', (call) => {
|
|
1405
|
+
this._currentCall = call;
|
|
1404
1406
|
this.currentCall.next(call);
|
|
1405
1407
|
this.callType.next('INCOMING');
|
|
1406
1408
|
this.currentCallState.next('incoming');
|
|
1407
1409
|
this.notificationSerivce.showNotification(call);
|
|
1410
|
+
// Set up call event handlers
|
|
1411
|
+
call.on('accept', () => {
|
|
1412
|
+
this.currentCallState.next('in-progress');
|
|
1413
|
+
});
|
|
1414
|
+
call.on('disconnect', () => {
|
|
1415
|
+
this._currentCall = null;
|
|
1416
|
+
this.currentCall.next(null);
|
|
1417
|
+
this.currentCallState.next('none');
|
|
1418
|
+
this.callType.next('NIL');
|
|
1419
|
+
});
|
|
1420
|
+
call.on('cancel', () => {
|
|
1421
|
+
this._currentCall = null;
|
|
1422
|
+
this.currentCall.next(null);
|
|
1423
|
+
this.currentCallState.next('none');
|
|
1424
|
+
this.callType.next('NIL');
|
|
1425
|
+
});
|
|
1408
1426
|
});
|
|
1409
1427
|
this.device.on('error', (error) => {
|
|
1410
1428
|
console.error('Twilio Device Error:', error);
|
|
@@ -1504,6 +1522,18 @@ class TwilioService {
|
|
|
1504
1522
|
const params = new HttpParams().set('isoCode', isoCode);
|
|
1505
1523
|
return this.http.get(environment.apiUrl + '/utilities/softphone/check/countryCode/' + dialledNo, httpOptions);
|
|
1506
1524
|
}
|
|
1525
|
+
/**
|
|
1526
|
+
* Get the current active call
|
|
1527
|
+
*/
|
|
1528
|
+
getCurrentCall() {
|
|
1529
|
+
return this._currentCall;
|
|
1530
|
+
}
|
|
1531
|
+
/**
|
|
1532
|
+
* Check if there's an active call
|
|
1533
|
+
*/
|
|
1534
|
+
hasActiveCall() {
|
|
1535
|
+
return this._currentCall !== null;
|
|
1536
|
+
}
|
|
1507
1537
|
}
|
|
1508
1538
|
TwilioService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: TwilioService, deps: [{ token: i1.HttpClient }, { token: ExtensionService }, { token: NotificationService }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
1509
1539
|
TwilioService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: TwilioService, providedIn: 'root' });
|
|
@@ -2228,24 +2258,191 @@ class DialboxComponent {
|
|
|
2228
2258
|
this.isInitialized = true;
|
|
2229
2259
|
// Initialize Twilio service
|
|
2230
2260
|
this.twilioService.initializeTwilioDevice();
|
|
2261
|
+
// Check for any existing call first
|
|
2262
|
+
const currentCall = this.twilioService.getCurrentCall();
|
|
2263
|
+
if (currentCall) {
|
|
2264
|
+
this.handleIncomingCall(currentCall);
|
|
2265
|
+
}
|
|
2231
2266
|
// Subscribe to incoming calls to show dialpad when call comes in
|
|
2232
2267
|
const callSub = this.twilioService.currentCall.subscribe(call => {
|
|
2233
2268
|
if (call) {
|
|
2234
|
-
console.log('Incoming call received:', call);
|
|
2269
|
+
console.log('Incoming call received in component:', call);
|
|
2270
|
+
this.handleIncomingCall(call);
|
|
2271
|
+
}
|
|
2272
|
+
});
|
|
2273
|
+
// Subscribe to call state changes
|
|
2274
|
+
const callStateSub = this.twilioService.currentCallState.subscribe(state => {
|
|
2275
|
+
console.log('Call state changed to:', state);
|
|
2276
|
+
if (state === 'incoming' || state === 'in-progress') {
|
|
2235
2277
|
this.isCallInProgress = true;
|
|
2236
|
-
this.
|
|
2278
|
+
this._isDialpadHidden = false; // Force show the dialpad for incoming/active calls
|
|
2279
|
+
}
|
|
2280
|
+
else if (state === 'none') {
|
|
2281
|
+
this.isCallInProgress = false;
|
|
2237
2282
|
}
|
|
2238
2283
|
});
|
|
2239
2284
|
this.subscriptions.add(callSub);
|
|
2285
|
+
this.subscriptions.add(callStateSub);
|
|
2286
|
+
}
|
|
2287
|
+
handleIncomingCall(call) {
|
|
2288
|
+
console.log('Handling incoming call:', call);
|
|
2289
|
+
// Update call state
|
|
2290
|
+
this.isCallInProgress = true;
|
|
2291
|
+
// Force show the dialpad by directly setting the private field
|
|
2292
|
+
// to bypass any setter logic that might prevent showing it
|
|
2293
|
+
this._isDialpadHidden = false;
|
|
2294
|
+
// Update call data
|
|
2295
|
+
const callerNumber = call.parameters['From'] || 'Unknown';
|
|
2296
|
+
const callerName = call.parameters['CallerName'] || 'Unknown Caller';
|
|
2297
|
+
this.callData = Object.assign(Object.assign({}, this.callData), { phone: callerNumber, name: callerName, img: 'assets/images/user.jpg', isIncomingCall: true, dial: true });
|
|
2298
|
+
// Add to incoming calls list if not already present
|
|
2299
|
+
const callExists = this.newIncomingCalls.some((c) => c.parameters['CallSid'] === call.parameters['CallSid']);
|
|
2300
|
+
if (!callExists) {
|
|
2301
|
+
this.newIncomingCalls = [...this.newIncomingCalls, call];
|
|
2302
|
+
this.incomingCallsList = [...this.newIncomingCalls];
|
|
2303
|
+
}
|
|
2304
|
+
// Emit event to notify parent components
|
|
2305
|
+
this.incomingCallInitiated.emit();
|
|
2306
|
+
// Set up call event handlers if not already set
|
|
2307
|
+
if (!call.listenerCount('accept')) {
|
|
2308
|
+
call.on('accept', () => {
|
|
2309
|
+
console.log('Call accepted:', call.parameters['CallSid']);
|
|
2310
|
+
this.isCallInProgress = true;
|
|
2311
|
+
this._isDialpadHidden = false; // Ensure dialpad stays open
|
|
2312
|
+
});
|
|
2313
|
+
}
|
|
2314
|
+
if (!call.listenerCount('disconnect')) {
|
|
2315
|
+
call.on('disconnect', () => {
|
|
2316
|
+
console.log('Call disconnected:', call.parameters['CallSid']);
|
|
2317
|
+
this.isCallInProgress = false;
|
|
2318
|
+
// Remove from incoming calls list
|
|
2319
|
+
this.incomingCallsList = this.incomingCallsList.filter((item) => item.parameters['CallSid'] !== call.parameters['CallSid']);
|
|
2320
|
+
this.newIncomingCalls = this.newIncomingCalls.filter((item) => item.parameters['CallSid'] !== call.parameters['CallSid']);
|
|
2321
|
+
// If no more calls, reset the state
|
|
2322
|
+
if (this.incomingCallsList.length === 0) {
|
|
2323
|
+
this.isCallInProgress = false;
|
|
2324
|
+
// Don't hide the dialpad if there are no more calls
|
|
2325
|
+
// Let the user decide when to close it
|
|
2326
|
+
}
|
|
2327
|
+
});
|
|
2328
|
+
}
|
|
2329
|
+
if (!call.listenerCount('cancel')) {
|
|
2330
|
+
call.on('cancel', () => {
|
|
2331
|
+
console.log('Call cancelled by caller:', call.parameters['CallSid']);
|
|
2332
|
+
this.isCallInProgress = false;
|
|
2333
|
+
// Remove from incoming calls list
|
|
2334
|
+
this.incomingCallsList = this.incomingCallsList.filter((item) => item.parameters['CallSid'] !== call.parameters['CallSid']);
|
|
2335
|
+
this.newIncomingCalls = this.newIncomingCalls.filter((item) => item.parameters['CallSid'] !== call.parameters['CallSid']);
|
|
2336
|
+
});
|
|
2337
|
+
}
|
|
2240
2338
|
}
|
|
2241
2339
|
// ngOnChange() {
|
|
2242
2340
|
// this.initializeTwilio();
|
|
2243
2341
|
// }
|
|
2342
|
+
// ngOnInit() {
|
|
2343
|
+
// try {
|
|
2344
|
+
// this.getContactList();
|
|
2345
|
+
// this.getUserCallSetting();
|
|
2346
|
+
// // Subscribe to dial number events
|
|
2347
|
+
// const sub1 = this.twilioService.dialNumberFromOtherModule.subscribe((contact: any) => {
|
|
2348
|
+
// if (contact.number) {
|
|
2349
|
+
// this.isSmartDialCall = false;
|
|
2350
|
+
// if (contact.isDialFromHistory) {
|
|
2351
|
+
// //handle dialing from history page
|
|
2352
|
+
// if(contact.callerId == 'smartDialing'){
|
|
2353
|
+
// this.selectedCallerId = { number: contact.from };
|
|
2354
|
+
// this.isSmartDialCall = true;
|
|
2355
|
+
// setTimeout(() => {
|
|
2356
|
+
// this.isDialpadHidden = false;
|
|
2357
|
+
// }, 2000);
|
|
2358
|
+
// this.callData.phone = contact.number;
|
|
2359
|
+
// this.callData.name = contact.name;
|
|
2360
|
+
// this.callData.img = contact.img;
|
|
2361
|
+
// this.callData.from = contact.from;
|
|
2362
|
+
// this.sanitizedNum = contact.number;
|
|
2363
|
+
// this.getUserInformation(contact);
|
|
2364
|
+
// // this.incomingCallsList.push(contact)
|
|
2365
|
+
// this.initiateCall();
|
|
2366
|
+
// }else{
|
|
2367
|
+
// this.getUserCallSetting();
|
|
2368
|
+
// setTimeout(() => {
|
|
2369
|
+
// this.isDialpadHidden = false;
|
|
2370
|
+
// }, 1000);
|
|
2371
|
+
// this.getUserInformation(contact);
|
|
2372
|
+
// // this.incomingCallsList.push(contact)
|
|
2373
|
+
// this.dialedNumber = contact.number;
|
|
2374
|
+
// this.sanitizedNum = contact.number;
|
|
2375
|
+
// }
|
|
2376
|
+
// } else {
|
|
2377
|
+
// if (contact.callerId == 'alwaysAsk' || contact.callerId == 'smartDialing') {
|
|
2378
|
+
// this.getUserCallSetting();
|
|
2379
|
+
// setTimeout(() => {
|
|
2380
|
+
// this.isDialpadHidden = false;
|
|
2381
|
+
// }, 1000);
|
|
2382
|
+
// this.dialedNumber = contact.number;
|
|
2383
|
+
// this.sanitizedNum = contact.number;
|
|
2384
|
+
// } else {
|
|
2385
|
+
// setTimeout(() => {
|
|
2386
|
+
// this.isDialpadHidden = false;
|
|
2387
|
+
// }, 2000);
|
|
2388
|
+
// this.callData.phone = contact.number;
|
|
2389
|
+
// this.callData.name = contact.name;
|
|
2390
|
+
// this.callData.img = contact.img;
|
|
2391
|
+
// this.sanitizedNum = contact.number;
|
|
2392
|
+
// this.initiateCall();
|
|
2393
|
+
// }
|
|
2394
|
+
// }
|
|
2395
|
+
// }
|
|
2396
|
+
// })
|
|
2397
|
+
// // handle incoming call
|
|
2398
|
+
// const sub2 = this.twilioService.currentCall.subscribe(incomingCallData => {
|
|
2399
|
+
// // if (incomingCallData) {
|
|
2400
|
+
// // this.isCallInProgress = true;
|
|
2401
|
+
// // this.isDialpadHidden = false;
|
|
2402
|
+
// // this.callData.phone = incomingCallData.parameters.From;
|
|
2403
|
+
// // this.callData.name = incomingCallData.customParameters.get('name');
|
|
2404
|
+
// // this.callData.img = incomingCallData.customParameters.get('image');
|
|
2405
|
+
// // this.callData.isIncomingCall = true;
|
|
2406
|
+
// // }
|
|
2407
|
+
// if (incomingCallData) {
|
|
2408
|
+
// if (this.isCallInProgress) {
|
|
2409
|
+
// this.newIncomingCalls.push(incomingCallData);
|
|
2410
|
+
// this.getUserInformation(incomingCallData);
|
|
2411
|
+
// } else {
|
|
2412
|
+
// this.isCallInProgress = true;
|
|
2413
|
+
// this.isDialpadHidden = false;
|
|
2414
|
+
// this.callData.phone = incomingCallData.parameters['From'];
|
|
2415
|
+
// this.getUserInformation(incomingCallData);
|
|
2416
|
+
// this.callData.name = incomingCallData.customParameters.get('name');
|
|
2417
|
+
// this.callData.img = incomingCallData.customParameters.get('image') || 'assets/images/user.jpg';
|
|
2418
|
+
// this.callData.isIncomingCall = true;
|
|
2419
|
+
// }
|
|
2420
|
+
// incomingCallData.on('cancel', () => {
|
|
2421
|
+
// this.incomingCallsList = this.incomingCallsList.filter((item: any) => item.parameters.CallSid !== incomingCallData.parameters['CallSid']);
|
|
2422
|
+
// if(this.incomingCallsList.length == 0){
|
|
2423
|
+
// this.isCallInProgress = false;
|
|
2424
|
+
// }
|
|
2425
|
+
// });
|
|
2426
|
+
// incomingCallData.on('disconnect', () => {
|
|
2427
|
+
// this.incomingCallsList = this.incomingCallsList.filter((item: any) => item.parameters.CallSid !== incomingCallData.parameters['CallSid']);
|
|
2428
|
+
// if(this.incomingCallsList.length == 0){
|
|
2429
|
+
// this.isCallInProgress = false;
|
|
2430
|
+
// }
|
|
2431
|
+
// });
|
|
2432
|
+
// }
|
|
2433
|
+
// });
|
|
2434
|
+
// this.subscriptions.add(sub1);
|
|
2435
|
+
// this.subscriptions.add(sub2);
|
|
2436
|
+
// }catch(e){
|
|
2437
|
+
// console.log(e)
|
|
2438
|
+
// }
|
|
2439
|
+
// }
|
|
2244
2440
|
ngOnInit() {
|
|
2245
2441
|
try {
|
|
2442
|
+
this.token = localStorage.getItem('ext_token') || '';
|
|
2443
|
+
//this.isCallInProgress = true;
|
|
2246
2444
|
this.getContactList();
|
|
2247
2445
|
this.getUserCallSetting();
|
|
2248
|
-
// Subscribe to dial number events
|
|
2249
2446
|
const sub1 = this.twilioService.dialNumberFromOtherModule.subscribe((contact) => {
|
|
2250
2447
|
if (contact.number) {
|
|
2251
2448
|
this.isSmartDialCall = false;
|
|
@@ -2316,7 +2513,7 @@ class DialboxComponent {
|
|
|
2316
2513
|
}
|
|
2317
2514
|
else {
|
|
2318
2515
|
this.isCallInProgress = true;
|
|
2319
|
-
this.isDialpadHidden =
|
|
2516
|
+
this.isDialpadHidden = false;
|
|
2320
2517
|
this.callData.phone = incomingCallData.parameters['From'];
|
|
2321
2518
|
this.getUserInformation(incomingCallData);
|
|
2322
2519
|
this.callData.name = incomingCallData.customParameters.get('name');
|
|
@@ -2324,13 +2521,13 @@ class DialboxComponent {
|
|
|
2324
2521
|
this.callData.isIncomingCall = true;
|
|
2325
2522
|
}
|
|
2326
2523
|
incomingCallData.on('cancel', () => {
|
|
2327
|
-
this.incomingCallsList = this.incomingCallsList.filter((item) => item.parameters
|
|
2524
|
+
this.incomingCallsList = this.incomingCallsList.filter((item) => item.parameters['CallSid'] !== incomingCallData.parameters['CallSid']);
|
|
2328
2525
|
if (this.incomingCallsList.length == 0) {
|
|
2329
2526
|
this.isCallInProgress = false;
|
|
2330
2527
|
}
|
|
2331
2528
|
});
|
|
2332
2529
|
incomingCallData.on('disconnect', () => {
|
|
2333
|
-
this.incomingCallsList = this.incomingCallsList.filter((item) => item.parameters
|
|
2530
|
+
this.incomingCallsList = this.incomingCallsList.filter((item) => item.parameters['CallSid'] !== incomingCallData.parameters['CallSid']);
|
|
2334
2531
|
if (this.incomingCallsList.length == 0) {
|
|
2335
2532
|
this.isCallInProgress = false;
|
|
2336
2533
|
}
|