Skip to content

Add ability to choose connection protocol (TCP/UDP) #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pouyahasanamreji wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add ability to choose connection protocol (TCP/UDP) #51

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 31 additions & 50 deletions zklib.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@ const ZKLibUDP = require('./zklibudp')
const { ZKError , ERROR_TYPES } = require('./zkerror')

class ZKLib {
constructor(ip, port, timeout , inport){
constructor(ip, port, timeout, inport, protocol = 'auto') {
this.connectionType = null
this.preferredProtocol = protocol.toLowerCase()

this.zklibTcp = new ZKLibTCP(ip,port,timeout)
this.zklibUdp = new ZKLibUDP(ip,port,timeout , inport)
this.zklibUdp = new ZKLibUDP(ip,port,timeout,inport)
this.interval = null
this.timer = null
this.isBusy = false
Expand Down Expand Up @@ -65,67 +66,47 @@ class ZKLib {
}
}

async createSocket(cbErr, cbClose){
try{
if(!this.zklibTcp.socket){
try{
await this.zklibTcp.createSocket(cbErr,cbClose)

setProtocol(protocol) {
if (['tcp', 'udp', 'auto'].includes(protocol.toLowerCase())) {
this.preferredProtocol = protocol.toLowerCase()
return true
}
return false
}

}catch(err){
throw err;
async createSocket(cbErr, cbClose) {
if (this.preferredProtocol === 'tcp' || this.preferredProtocol === 'auto') {
try {
if (!this.zklibTcp.socket) {
await this.zklibTcp.createSocket(cbErr, cbClose)
await this.zklibTcp.connect()
}

try{
await this.zklibTcp.connect();
console.log('ok tcp')
}catch(err){
throw err;
this.connectionType = 'tcp'
console.log('Connected via TCP')
return
} catch (err) {
if (this.preferredProtocol === 'tcp') {
throw new ZKError(err, 'TCP CONNECT', this.ip)
}
}

this.connectionType = 'tcp'

}catch(err){
try{
await this.zklibTcp.disconnect()
}catch(err){}

if(err.code !== ERROR_TYPES.ECONNREFUSED){
return Promise.reject(new ZKError(err, 'TCP CONNECT' , this.ip))
// If auto, continue to try UDP
}
}

if (this.preferredProtocol === 'udp' || this.preferredProtocol === 'auto') {
try {
if(!this.zklibUdp.socket){
if (!this.zklibUdp.socket) {
await this.zklibUdp.createSocket(cbErr, cbClose)
await this.zklibUdp.connect()
}

console.log('ok udp')
this.connectionType = 'udp'
}catch(err){



if(err.code !== 'EADDRINUSE'){
this.connectionType = null
try{
await this.zklibUdp.disconnect()
this.zklibUdp.socket = null
this.zklibTcp.socket = null
}catch(err){}


return Promise.reject(new ZKError(err, 'UDP CONNECT' , this.ip))
}else{
this.connectionType = 'udp'

}

this.connectionType = 'udp'
console.log('Connected via UDP')
} catch (err) {
throw new ZKError(err, 'UDP CONNECT', this.ip)
}
}
}


async getUsers(){
return await this.functionWrapper(
()=> this.zklibTcp.getUsers(),
Expand Down