|
@@ -48,7 +48,7 @@ import {
|
|
|
type SIPStatusChangeParams,
|
|
|
type CTIEventParams,
|
|
|
AudioName,
|
|
|
- // TrackSource,
|
|
|
+ TrackSource,
|
|
|
SocketEvent,
|
|
|
ExceptMessage
|
|
|
} from './type'
|
|
@@ -71,12 +71,12 @@ import type {
|
|
|
CTIManualCallOptions,
|
|
|
InitOptions
|
|
|
} from '../api/hs-cti/ctiSdkModel'
|
|
|
-// import { serverTrack } from '../api/fetchApi'
|
|
|
+import { serverTrack } from '../api/fetchApi'
|
|
|
import {
|
|
|
setBaseOption,
|
|
|
resetBaseOption,
|
|
|
- BaseOption
|
|
|
- // getBaseOption
|
|
|
+ BaseOption,
|
|
|
+ getBaseOption
|
|
|
} from './storage'
|
|
|
/**
|
|
|
* 本地提示音
|
|
@@ -324,12 +324,12 @@ export class SdCTI extends EventEmitter {
|
|
|
|
|
|
this._socket.on(SocketEvent.SocketDownEvent, ({ eventData }) => {
|
|
|
const { eventName, ext } = eventData
|
|
|
- // serverTrack({
|
|
|
- // ...getBaseOption(BaseOption.TrackParams),
|
|
|
- // source: TrackSource.FeIMDown,
|
|
|
- // event_name: eventName,
|
|
|
- // ext
|
|
|
- // })
|
|
|
+ serverTrack({
|
|
|
+ ...getBaseOption(BaseOption.TrackParams),
|
|
|
+ source: TrackSource.FeIMDown,
|
|
|
+ event_name: eventName,
|
|
|
+ ext
|
|
|
+ })
|
|
|
this.logger.log(
|
|
|
`socket server down | ${eventName} | ${JSON.stringify(ext)}`
|
|
|
)
|
|
@@ -357,15 +357,15 @@ export class SdCTI extends EventEmitter {
|
|
|
this.logger.error(
|
|
|
`cti_flow_id | 不一致! fe: ${ctiFlowId}, server: ${extCtiFlowId}, eventName: ${eventName}`
|
|
|
)
|
|
|
- // serverTrack({
|
|
|
- // ...getBaseOption(BaseOption.TrackParams),
|
|
|
- // source: TrackSource.FeIMDown,
|
|
|
- // event_name: 'socket_down_cti_flow_id_diff',
|
|
|
- // ext: {
|
|
|
- // server_event_name: upperCamelToLowerSnake(eventName),
|
|
|
- // server_cti_flow_id: extCtiFlowId
|
|
|
- // }
|
|
|
- // })
|
|
|
+ serverTrack({
|
|
|
+ ...getBaseOption(BaseOption.TrackParams),
|
|
|
+ source: TrackSource.FeIMDown,
|
|
|
+ event_name: 'socket_down_cti_flow_id_diff',
|
|
|
+ ext: {
|
|
|
+ server_event_name: upperCamelToLowerSnake(eventName),
|
|
|
+ server_cti_flow_id: extCtiFlowId
|
|
|
+ }
|
|
|
+ })
|
|
|
return
|
|
|
}
|
|
|
|
|
@@ -384,13 +384,13 @@ export class SdCTI extends EventEmitter {
|
|
|
error?: string | object
|
|
|
) {
|
|
|
this.logger.debug(`sdk emit | ${eventName} | ${JSON.stringify(ext)}`)
|
|
|
- // serverTrack({
|
|
|
- // ...getBaseOption(BaseOption.TrackParams),
|
|
|
- // source: TrackSource.FeEmit,
|
|
|
- // event_name: eventName,
|
|
|
- // ext,
|
|
|
- // error
|
|
|
- // })
|
|
|
+ serverTrack({
|
|
|
+ ...getBaseOption(BaseOption.TrackParams),
|
|
|
+ source: TrackSource.FeEmit,
|
|
|
+ event_name: eventName,
|
|
|
+ ext,
|
|
|
+ error
|
|
|
+ })
|
|
|
try {
|
|
|
this.emit(eventName, ext)
|
|
|
console.log(error)
|
|
@@ -579,15 +579,15 @@ export class SdCTI extends EventEmitter {
|
|
|
this._sipUserAgent!.transport.disconnect()
|
|
|
console.log(res)
|
|
|
// 报告链接错误,上报错误
|
|
|
- // serverTrack({
|
|
|
- // ...getBaseOption(BaseOption.TrackParams),
|
|
|
- // source: TrackSource.FeSIP,
|
|
|
- // event_name: CTIEvent.OnCtiError,
|
|
|
- // msg: 'sip_heart_beat_err',
|
|
|
- // method: 'optionsPingRun',
|
|
|
- // code: HskTerminatedCode.SipHeartBeatErr,
|
|
|
- // error: `${JSON.stringify(res)}`
|
|
|
- // })
|
|
|
+ serverTrack({
|
|
|
+ ...getBaseOption(BaseOption.TrackParams),
|
|
|
+ source: TrackSource.FeSIP,
|
|
|
+ event_name: CTIEvent.OnCtiError,
|
|
|
+ msg: 'sip_heart_beat_err',
|
|
|
+ method: 'optionsPingRun',
|
|
|
+ code: HskTerminatedCode.SipHeartBeatErr,
|
|
|
+ error: `${JSON.stringify(res)}`
|
|
|
+ })
|
|
|
// this.logger.error('heartbeat' + res?.message.statusCode)
|
|
|
}
|
|
|
|
|
@@ -652,11 +652,11 @@ export class SdCTI extends EventEmitter {
|
|
|
this._sipRegisterer.stateChange.addListener((newState: RegistererState) => {
|
|
|
const state = `sip_registerer_state_${upperCamelToLowerSnake(newState)}`
|
|
|
this.logger.debug(state)
|
|
|
- // serverTrack({
|
|
|
- // ...getBaseOption(BaseOption.TrackParams),
|
|
|
- // source: TrackSource.FeSIP,
|
|
|
- // event_name: state
|
|
|
- // })
|
|
|
+ serverTrack({
|
|
|
+ ...getBaseOption(BaseOption.TrackParams),
|
|
|
+ source: TrackSource.FeSIP,
|
|
|
+ event_name: state
|
|
|
+ })
|
|
|
switch (newState) {
|
|
|
case RegistererState.Registered:
|
|
|
this.setSipStatus({ status: SIPStatus.Ready })
|
|
@@ -754,11 +754,11 @@ export class SdCTI extends EventEmitter {
|
|
|
})
|
|
|
const trackName = `sip_session_state_${upperCamelToLowerSnake(status)}`
|
|
|
this.logger.log(trackName)
|
|
|
- // serverTrack({
|
|
|
- // ...getBaseOption(BaseOption.TrackParams),
|
|
|
- // source: TrackSource.FeSIP,
|
|
|
- // event_name: trackName
|
|
|
- // })
|
|
|
+ serverTrack({
|
|
|
+ ...getBaseOption(BaseOption.TrackParams),
|
|
|
+ source: TrackSource.FeSIP,
|
|
|
+ event_name: trackName
|
|
|
+ })
|
|
|
}
|
|
|
/**
|
|
|
* @private register的事件接收器,例如register动作是否成功
|
|
@@ -829,15 +829,15 @@ export class SdCTI extends EventEmitter {
|
|
|
self.scene === Scene.Manual &&
|
|
|
ctiFlowId !== self._baseParams.ctiFlowId
|
|
|
) {
|
|
|
- // serverTrack({
|
|
|
- // ...getBaseOption(BaseOption.TrackParams),
|
|
|
- // source: TrackSource.FeSIP,
|
|
|
- // event_name: 'sip_cti_flow_id_diff',
|
|
|
- // ext: {
|
|
|
- // server_cti_flow_id: ctiFlowId,
|
|
|
- // call_id: callId
|
|
|
- // }
|
|
|
- // })
|
|
|
+ serverTrack({
|
|
|
+ ...getBaseOption(BaseOption.TrackParams),
|
|
|
+ source: TrackSource.FeSIP,
|
|
|
+ event_name: 'sip_cti_flow_id_diff',
|
|
|
+ ext: {
|
|
|
+ server_cti_flow_id: ctiFlowId,
|
|
|
+ call_id: callId
|
|
|
+ }
|
|
|
+ })
|
|
|
self.logger.error(
|
|
|
`cti_flow_id 不一致! fe: ${self._baseParams.ctiFlowId} | P-LIBRA-CtiFlowId: ${ctiFlowId}`
|
|
|
)
|
|
@@ -1030,11 +1030,11 @@ export class SdCTI extends EventEmitter {
|
|
|
this.clearSocketAndSip()
|
|
|
}
|
|
|
} else {
|
|
|
- // serverTrack({
|
|
|
- // ...getBaseOption(BaseOption.TrackParams),
|
|
|
- // source: TrackSource.FeStatus,
|
|
|
- // event_name: `socket_status_${upperCamelToLowerSnake(status)}`
|
|
|
- // })
|
|
|
+ serverTrack({
|
|
|
+ ...getBaseOption(BaseOption.TrackParams),
|
|
|
+ source: TrackSource.FeStatus,
|
|
|
+ event_name: `socket_status_${upperCamelToLowerSnake(status)}`
|
|
|
+ })
|
|
|
}
|
|
|
}
|
|
|
/**
|
|
@@ -1072,11 +1072,11 @@ export class SdCTI extends EventEmitter {
|
|
|
)
|
|
|
this.clearSocketAndSip()
|
|
|
} else {
|
|
|
- // serverTrack({
|
|
|
- // ...getBaseOption(BaseOption.TrackParams),
|
|
|
- // source: TrackSource.FeStatus,
|
|
|
- // event_name: `sip_status_${upperCamelToLowerSnake(status)}`
|
|
|
- // })
|
|
|
+ serverTrack({
|
|
|
+ ...getBaseOption(BaseOption.TrackParams),
|
|
|
+ source: TrackSource.FeStatus,
|
|
|
+ event_name: `sip_status_${upperCamelToLowerSnake(status)}`
|
|
|
+ })
|
|
|
}
|
|
|
}
|
|
|
/**
|
|
@@ -1295,11 +1295,11 @@ export class SdCTI extends EventEmitter {
|
|
|
data: 'answer',
|
|
|
msg: 'SIP 接起电话成功'
|
|
|
})
|
|
|
- // serverTrack({
|
|
|
- // ...getBaseOption(BaseOption.TrackParams),
|
|
|
- // source: TrackSource.FeSIP,
|
|
|
- // event_name: 'sip_accept_success'
|
|
|
- // })
|
|
|
+ serverTrack({
|
|
|
+ ...getBaseOption(BaseOption.TrackParams),
|
|
|
+ source: TrackSource.FeSIP,
|
|
|
+ event_name: 'sip_accept_success'
|
|
|
+ })
|
|
|
this.logger.debug('sip_accept_success')
|
|
|
})
|
|
|
.catch(err => {
|
|
@@ -1331,11 +1331,11 @@ export class SdCTI extends EventEmitter {
|
|
|
data: 'bye',
|
|
|
msg: 'SIP 挂断电话成功'
|
|
|
})
|
|
|
- // serverTrack({
|
|
|
- // ...getBaseOption(BaseOption.TrackParams),
|
|
|
- // source: TrackSource.FeSIP,
|
|
|
- // event_name: 'sip_bye_success'
|
|
|
- // })
|
|
|
+ serverTrack({
|
|
|
+ ...getBaseOption(BaseOption.TrackParams),
|
|
|
+ source: TrackSource.FeSIP,
|
|
|
+ event_name: 'sip_bye_success'
|
|
|
+ })
|
|
|
this.logger.debug('sip_bye_success')
|
|
|
})
|
|
|
.catch(err => {
|