tcp修改

This commit is contained in:
lvyuankang 2024-07-30 10:35:41 +08:00
parent 33a719a462
commit 3bbf35a1db
2 changed files with 213 additions and 198 deletions

View File

@ -1,74 +1,76 @@
import TcpClient from './TcpClient'; import TcpClient from './TcpClient';
import { getSyncData} from '../service/initable' import { getSyncData } from '../service/initable';
import hilog from '@ohos.hilog'; import hilog from '@ohos.hilog';
export async function getTCP() { export async function getTCP() {
getSyncData('IpConfigTable').then(async (result:Array<any>)=>{ getSyncData('IpConfigTable').then(async (result: Array<any>) => {
console.log('result222',JSON.stringify(result)) console.log('result222', JSON.stringify(result))
if(result.length){ if (result.length) {
if(globalThis.TcpClient&&globalThis.getCloseTcp){ if (globalThis.TcpClient && globalThis.TcpClient.closeTcp) {
globalThis.TcpClient.closeTcp(async ()=>{ globalThis.TcpClient.closeTcp(async () => {
// const tcpClient: TcpClient =new TcpClient(result[0].tcplocalIp, result[0].tcplocalIpPort,result[0].tcpOppositeIp,result[0].tcpOppositePort) // const tcpClient: TcpClient =new TcpClient(result[0].tcplocalIp, result[0].tcplocalIpPort,result[0].tcpOppositeIp,result[0].tcpOppositePort)
// globalThis.TcpClient = tcpClient // globalThis.TcpClient = tcpClient
setTimeout(async ()=>{ setTimeout(async () => {
await globalThis.TcpClient.rebindTcp(result[0].tcplocalIp, result[0].tcplocalIpPort,result[0].tcpOppositeIp,result[0].tcpOppositePort) await globalThis.TcpClient.rebindTcp(result[0].tcplocalIp, result[0].tcplocalIpPort, result[0].tcpOppositeIp, result[0].tcpOppositePort)
await globalThis.TcpClient.connectTcp() await globalThis.TcpClient.connectTcp()
await globalThis.TcpClient.sendMsg('1002')//1002 await globalThis.TcpClient.sendMsg('1002') //1002
globalThis.TcpClient.onError((val)=>{ globalThis.TcpClient.onError((val) => {
setTimeout(()=>{ setTimeout(() => {
globalThis.TcpClient.sendMsg('1002')//1002 globalThis.TcpClient.sendMsg('1002') //1002
if(val){ if (val) {
// const msg=val.substring(5,val.length-1) // const msg=val.substring(5,val.length-1)
console.log('socketTag[PLC.UdpClient] status:',globalThis.udpClient.getStatus()) console.log('socketTag[PLC.UdpClient] status:', globalThis.udpClient.getStatus())
globalThis.udpClient?.sendMsg(val) globalThis.udpClient?.sendMsg(val)
} }
},1000) }, 1000)
}) })
await globalThis.TcpClient.onMessage((val)=>{ await globalThis.TcpClient.onMessage((val) => {
setTimeout(()=>{ setTimeout(() => {
globalThis.TcpClient.sendMsg('1002')//1002 globalThis.TcpClient.sendMsg('1002') //1002
if(val){ if (val) {
// const msg=val.substring(5,val.length-1) // const msg=val.substring(5,val.length-1)
console.log('socketTag[PLC.UdpClient] status:',globalThis.udpClient.getStatus()) console.log('socketTag[PLC.UdpClient] status:', globalThis.udpClient.getStatus())
globalThis.udpClient?.sendMsg(val) globalThis.udpClient?.sendMsg(val)
} }
},1000) }, 1000)
}) })
},2000) }, 2000)
}) })
}else{ } else {
const tcpClient: TcpClient =new TcpClient(result[0].tcplocalIp, result[0].tcplocalIpPort,result[0].tcpOppositeIp,result[0].tcpOppositePort) const tcpClient: TcpClient = new TcpClient(result[0].tcplocalIp, result[0].tcplocalIpPort, result[0].tcpOppositeIp, result[0].tcpOppositePort)
globalThis.TcpClient = tcpClient globalThis.TcpClient = tcpClient
await globalThis.TcpClient.bindTcp() await globalThis.TcpClient.bindTcp()
await globalThis.TcpClient.connectTcp() await globalThis.TcpClient.connectTcp()
await globalThis.TcpClient.sendMsg('1002')//1002 await globalThis.TcpClient.sendMsg('1002') //1002
globalThis.TcpClient.onError((val)=>{ globalThis.TcpClient.onError((val) => {
hilog.info(0x0000, 'testTag', "valvalval2" + JSON.stringify(val)); hilog.info(0x0000, 'testTag', "valvalval2" + JSON.stringify(val));
setTimeout(()=>{ setTimeout(() => {
globalThis.TcpClient.sendMsg('1002')//1002 globalThis.TcpClient.sendMsg('1002') //1002
if(val&& globalThis.udpClient?.sendMsg){ if (val && globalThis.udpClient?.sendMsg) {
globalThis.udpClient?.sendMsg(val) globalThis.udpClient?.sendMsg(val)
} }
},1000) }, 1000)
}) })
await globalThis.TcpClient.onMessage((val)=>{ await globalThis.TcpClient.onMessage((val) => {
hilog.info(0x0000, 'testTag', "valvalval2" + JSON.stringify(val)); hilog.info(0x0000, 'testTag', "valvalval2" + JSON.stringify(val));
setTimeout(()=>{ setTimeout(() => {
globalThis.TcpClient.sendMsg('1002')//1002 globalThis.TcpClient.sendMsg('1002') //1002
if(val&& globalThis.udpClient?.sendMsg){ if (val && globalThis.udpClient?.sendMsg) {
globalThis.udpClient?.sendMsg(val) globalThis.udpClient?.sendMsg(val)
} }
},1000) }, 1000)
}) })
} }
// globalThis.udpClient = new UdpClient(result[0].localIp, result[0].localIpPort,result[0].oppositeIp,result[0].oppositeIpPort) // globalThis.udpClient = new UdpClient(result[0].localIp, result[0].localIpPort,result[0].oppositeIp,result[0].oppositeIpPort)
}else{ } else {
globalThis.TcpClient={} globalThis.TcpClient = {}
globalThis.TcpClient.onMessage=()=>{} globalThis.TcpClient.onMessage = () => {
}
} }
}) })
} }

View File

@ -1,9 +1,7 @@
import socket from '@ohos.net.socket'; import socket from '@ohos.net.socket';
import buffer from '@ohos.buffer'; import hilog from '@ohos.hilog';
const TAG = 'socketTag[TcpDemo.TcpClient]' const TAG = 'socketTag[TcpDemo.TcpClient]'
import prompt from '@ohos.prompt'
import hilog from '@ohos.hilog';
export default class TcpClient { export default class TcpClient {
private localIp: string = '' private localIp: string = ''
@ -13,42 +11,46 @@ export default class TcpClient {
private tcp: any = null private tcp: any = null
constructor(tcplocalIp: string, tcplocalIpPort:string,tcpOppositeIp: string,tcpOppositePort:string) { constructor(tcplocalIp: string, tcplocalIpPort: string, tcpOppositeIp: string, tcpOppositePort: string) {
this.localIp = tcplocalIp this.localIp = tcplocalIp
this.oppositeIp = tcpOppositeIp this.oppositeIp = tcpOppositeIp
this.localIpPort = tcplocalIpPort this.localIpPort = tcplocalIpPort
this.oppositeIpPort = tcpOppositePort this.oppositeIpPort = tcpOppositePort
console.log(TAG,'new Tcp',this.localIp,this.localIpPort,this.oppositeIp,this.oppositeIpPort) console.log(TAG, 'new Tcp', this.localIp, this.localIpPort, this.oppositeIp, this.oppositeIpPort)
this.tcp = socket.constructTCPSocketInstance(); this.tcp = socket.constructTCPSocketInstance();
} }
onError(callback?){
onError(callback?) {
this.tcp.on('error', err => { this.tcp.on('error', err => {
console.log(TAG,'tcpOnerror', JSON.stringify(err)) console.log(TAG, 'tcpOnerror', JSON.stringify(err))
setTimeout(async ()=>{ setTimeout(async () => {
await this.bindTcp() await this.bindTcp()
await this.connectTcp() await this.connectTcp()
this.onMessage(callback) this.onMessage(callback)
},2000) }, 2000)
// this.closeUdp(()=>{ // this.closeUdp(()=>{
// this.bindUdp() // this.bindUdp()
// }) // })
}); });
} }
rebindTcp(localIp: string, localIpPort:string,oppositeIp: string,oppositeIpPort:string){
return new Promise((resolve, reject)=>{ rebindTcp(localIp: string, localIpPort: string, oppositeIp: string, oppositeIpPort: string) {
return new Promise((resolve, reject) => {
this.localIp = localIp this.localIp = localIp
this.oppositeIp = oppositeIp this.oppositeIp = oppositeIp
this.localIpPort = localIpPort this.localIpPort = localIpPort
this.oppositeIpPort = oppositeIpPort this.oppositeIpPort = oppositeIpPort
console.log(TAG,'tcpreBind', this.localIp,this.localIpPort) console.log(TAG, 'tcpreBind', this.localIp, this.localIpPort)
let promise=this.tcp.bind({ address: this.localIp, port:parseInt(this.localIpPort), family: 1 }, err => { let promise = this.tcp.bind({
address: this.localIp, port: parseInt(this.localIpPort), family: 1
}, err => {
if (err) { if (err) {
globalThis.getCloseTcp=true globalThis.getCloseTcp = true
hilog.info(0x0000, 'testTag', "tcpreBinderror:" + JSON.stringify(err)); hilog.info(0x0000, 'testTag', "tcpreBinderror:" + JSON.stringify(err));
resolve(true) resolve(true)
} }
console.log('testTag,rebindtestTag tcp bind success'); console.log('testTag,rebindtestTag tcp bind success');
globalThis.getCloseTcp=false globalThis.getCloseTcp = false
resolve(false) resolve(false)
}) })
@ -61,24 +63,27 @@ export default class TcpClient {
// }); // });
} }
bindTcp() { bindTcp() {
console.log(TAG,'tcpbind',this.localIp,'localIp',this.localIpPort) console.log(TAG, 'tcpbind', this.localIp, 'localIp', this.localIpPort)
return new Promise((resolve,reject)=>{ return new Promise((resolve, reject) => {
let promise=this.tcp.bind({ address: this.localIp, port:parseInt(this.localIpPort), family: 1 }, err => { let promise = this.tcp.bind({
address: this.localIp, port: parseInt(this.localIpPort), family: 1
}, err => {
if (err) { if (err) {
console.log('testTag tcp bind faile'); console.log('testTag tcp bind faile');
globalThis.getCloseTcp=true globalThis.getCloseTcp = true
hilog.info(0x0000, 'testTag', "tcpBinderror:" + JSON.stringify(err)); hilog.info(0x0000, 'testTag', "tcpBinderror:" + JSON.stringify(err));
resolve(true) resolve(true)
return return
} }
globalThis.getCloseTcp=false globalThis.getCloseTcp = false
console.log('testTag tcp bind success'); console.log('testTag tcp bind success');
resolve(false) resolve(false)
}) })
}) })
console.log('localIp',this.localIp) console.log('localIp', this.localIp)
console.log('localIpPort',this.localIpPort) console.log('localIpPort', this.localIpPort)
// let promise = this.udp.bind({ // let promise = this.udp.bind({
// // address: '192.168.7.170', port: 20122, family: 1 // // address: '192.168.7.170', port: 20122, family: 1
// // address: '192.168.7.170', port: 31013, family: 1 // // address: '192.168.7.170', port: 31013, family: 1
@ -87,10 +92,15 @@ export default class TcpClient {
} }
connectTcp(){
console.log(TAG,'tcpConnect',this.oppositeIp,'localIp',this.oppositeIpPort) connectTcp() {
return new Promise((resolve,reject)=>{ console.log(TAG, 'tcpConnect', this.oppositeIp, 'localIp', this.oppositeIpPort)
let promise = this.tcp.connect({ address: {address: this.oppositeIp, port: parseInt(this.oppositeIpPort), family: 1} , timeout: 6000}); return new Promise((resolve, reject) => {
let promise = this.tcp.connect({
address: {
address: this.oppositeIp, port: parseInt(this.oppositeIpPort), family: 1
}, timeout: 6000
});
promise.then(() => { promise.then(() => {
this.tcp.setExtraOptions({ this.tcp.setExtraOptions({
@ -102,18 +112,19 @@ export default class TcpClient {
// sendBufferSize: 1000, // sendBufferSize: 1000,
// reuseAddress: true, // reuseAddress: true,
// socketTimeout: 3000, // socketTimeout: 3000,
},err => { }, err => {
if (err) { if (err) {
return; return;
} }
}); });
globalThis.getCloseTcp=false globalThis.getCloseTcp = false
resolve(true) resolve(true)
}).catch(err => { }).catch(err => {
globalThis.getCloseTcp=true globalThis.getCloseTcp = true
setTimeout(()=>{ setTimeout(() => {
this.connectTcp() this.connectTcp()
},2000) resolve(false)
}, 2000)
console.log('testTagconnect,error') console.log('testTagconnect,error')
}); });
@ -121,10 +132,10 @@ export default class TcpClient {
} }
sendMsg(msg: string) { sendMsg(msg: string) {
console.log(TAG,'tcpSend',msg.length,msg) console.log(TAG, 'tcpSend', msg.length, msg)
return new Promise((reslove,reject)=>{ return new Promise((reslove, reject) => {
let promise = this.tcp.send({ let promise = this.tcp.send({
data:msg data: msg
}); });
promise.then(() => { promise.then(() => {
reslove(true) reslove(true)
@ -136,7 +147,7 @@ export default class TcpClient {
onMessage(callback?) { onMessage(callback?) {
this.tcp.on('message', value => { this.tcp.on('message', value => {
console.log(TAG,'Tcponmessage',value.length,value) console.log(TAG, 'Tcponmessage', value.length, value)
// console.log('messageLengt',,value.message.length)) // console.log('messageLengt',,value.message.length))
console.log('testTagtcpmsg') console.log('testTagtcpmsg')
@ -144,31 +155,33 @@ export default class TcpClient {
if (value) { if (value) {
let dataView = new DataView(value.message) let dataView = new DataView(value.message)
// const Arraybuffer=buffer.from(value.message, 5, dataView?.byteLength); // const Arraybuffer=buffer.from(value.message, 5, dataView?.byteLength);
const Arraybuffer=value.message.slice(5, dataView?.byteLength); const Arraybuffer = value.message.slice(5, dataView?.byteLength);
callback&&callback(Arraybuffer) callback && callback(Arraybuffer)
}else{ } else {
callback&&callback('') callback && callback('')
} }
// callback(value.message) // callback(value.message)
}); });
} }
offTcp(callback) { offTcp(callback) {
console.log(TAG,'tcpofff') console.log(TAG, 'tcpofff')
this.tcp.off('testTagofmessg', callback); this.tcp.off('testTagofmessg', callback);
} }
closeTcp(callback) { closeTcp(callback) {
return new Promise((reslove,reject)=>{ return new Promise((reslove, reject) => {
console.log(TAG,'tcpClose') console.log(TAG, 'tcpClose')
let promise = this.tcp.close(); let promise = this.tcp.close();
promise.then(() => { promise.then(() => {
globalThis.getCloseTcp=true globalThis.getCloseTcp = true
console.log(TAG,'tcpCloseSuccess') console.log(TAG, 'tcpCloseSuccess')
callback() callback()
reslove(true) reslove(true)
}).catch(err => { }).catch(err => {
console.log(TAG,'tcpClosefailed') console.log(TAG, 'tcpClosefailed')
reslove(false) reslove(false)
}); });
}) })