refactor to use regular es5 js, no need to make socket a component

This commit is contained in:
Mark Vayngrib 2015-05-10 20:41:43 -04:00
parent dea64e5b7a
commit cacff29bab
2 changed files with 161 additions and 179 deletions

View File

@ -13,14 +13,9 @@
'use strict'; 'use strict';
var React = require('react-native') var React = require('react-native')
var {
Component
} = React
var mixInEventEmitter = require('mixInEventEmitter') var mixInEventEmitter = require('mixInEventEmitter')
var DeviceEventEmitter = require('RCTDeviceEventEmitter') var DeviceEventEmitter = require('RCTDeviceEventEmitter')
var NativeModules = require('NativeModules') var Sockets = require('NativeModules').UdpSockets
var sockets = NativeModules.UdpSockets
var noop = function () {} var noop = function () {}
var instances = 0 var instances = 0
var STATE = { var STATE = {
@ -29,35 +24,30 @@ var STATE = {
BOUND: 2 BOUND: 2
} }
class RCTSocket extends Component { function UdpSocket(type) {
id: String; this._id = instances++
_state: Integer; this._state = STATE.UNBOUND
_address: String; this._subscriptiom = DeviceEventEmitter.addListener(
_port: Integer; 'udp-' + this._id + '-data', this._onReceive.bind(this)
constructor(props) {
super(props)
this.id = instances++
this.subscriptiom = DeviceEventEmitter.addListener(
'udp-' + this.id + '-data', this._onReceive.bind(this)
); );
// ensure compatibility with node's EventEmitter // ensure compatibility with node's EventEmitter
if (!this.on) this.on = this.addListener.bind(this) if (!this.on) this.on = this.addListener.bind(this)
this._state = STATE.UNBOUND Sockets.createSocket(this._id, {
sockets.createSocket(this.id, { type: type || 'udp4'
type: props.type || 'udp4'
}) // later }) // later
} }
_debug() { UdpSocket.prototype._debug = function() {
// for now
var args = [].slice.call(arguments) var args = [].slice.call(arguments)
args.unshift(this.id) args.unshift(this._id)
console.log.apply(console, args) console.log.apply(console, args)
} }
bind(port, address, callback) {
UdpSocket.prototype.bind = function(port, address, callback) {
var self = this var self = this
if (this._state !== STATE.UNBOUND) throw new Error('Socket is already bound') if (this._state !== STATE.UNBOUND) throw new Error('Socket is already bound')
@ -75,7 +65,7 @@ class RCTSocket extends Component {
this._state = STATE.BINDING this._state = STATE.BINDING
this._debug('binding, address:', address, 'port:', port) this._debug('binding, address:', address, 'port:', port)
sockets.bind(this.id, port, address, function(err, addr) { Sockets.bind(this._id, port, address, function(err, addr) {
if (err) { if (err) {
// questionable: may want to self-destruct and // questionable: may want to self-destruct and
// force user to create a new socket // force user to create a new socket
@ -90,13 +80,20 @@ class RCTSocket extends Component {
self._state = STATE.BOUND self._state = STATE.BOUND
self.emit('listening') self.emit('listening')
}) })
} }
componentWillUnmount() { UdpSocket.prototype.close = function() {
this.subscription.remove(); if (this._destroyed) return
}
_onReceive(info) { this._destroyed = true
this._debug('closing')
this._subscription.remove();
Sockets.close(this._id, this._debug.bind(this, 'closed'))
this.emit('close')
}
UdpSocket.prototype._onReceive = function(info) {
this._debug('received', info) this._debug('received', info)
var buf = toByteArray(info.data) var buf = toByteArray(info.data)
@ -110,10 +107,9 @@ class RCTSocket extends Component {
if (typeof Buffer !== 'undefined') buf = new Buffer(buf) if (typeof Buffer !== 'undefined') buf = new Buffer(buf)
this.emit('message', buf, rinfo) this.emit('message', buf, rinfo)
} }
/**
/**
* socket.send(buf, offset, length, port, address, [callback]) * socket.send(buf, offset, length, port, address, [callback])
* *
* For UDP sockets, the destination port and IP address must be * For UDP sockets, the destination port and IP address must be
@ -135,8 +131,8 @@ class RCTSocket extends Component {
* @param {function} callback Callback when message is done being delivered. * @param {function} callback Callback when message is done being delivered.
* Optional. * Optional.
*/ */
// Socket.prototype.send = function (buf, host, port, cb) { // UdpSocket.prototype.send = function (buf, host, port, cb) {
send(buffer, offset, length, port, address, callback) { UdpSocket.prototype.send = function(buffer, offset, length, port, address, callback) {
var self = this var self = this
if (offset !== 0) throw new Error('Non-zero offset not supported yet') if (offset !== 0) throw new Error('Non-zero offset not supported yet')
@ -157,7 +153,7 @@ class RCTSocket extends Component {
} }
self._debug('sending', buffer) self._debug('sending', buffer)
sockets.send(this.id, buffer, +port, address, function(err) { Sockets.send(this._id, buffer, +port, address, function(err) {
if (err) { if (err) {
self._debug('send failed', err) self._debug('send failed', err)
return callback(err) return callback(err)
@ -166,9 +162,9 @@ class RCTSocket extends Component {
self._debug('sent') self._debug('sent')
callback() callback()
}) })
} }
address() { UdpSocket.prototype.address = function() {
if (this._state !== STATE.BOUND) { if (this._state !== STATE.BOUND) {
throw new Error('socket is not bound yet') throw new Error('socket is not bound yet')
} }
@ -178,55 +174,41 @@ class RCTSocket extends Component {
port: this._port, port: this._port,
family: 'IPv4' family: 'IPv4'
} }
}
close() {
var self = this
if (this._destroyed) return
this._destroyed = true
this._debug('closing')
sockets.close(this.id, function() {
self._debug('closed')
})
this.emit('close')
}
setBroadcast(flag) {
// nothing yet
}
setTTL(ttl) {
// nothing yet
}
setMulticastTTL(ttl, callback) {
// nothing yet
}
setMulticastLoopback(flag, callback) {
// nothing yet
}
addMembership(multicastAddress, multicastInterface, callback) {
// nothing yet
}
dropMembership(multicastAddress, multicastInterface, callback) {
// nothing yet
}
ref() {
// anything?
}
unref() {
// anything?
}
} }
mixInEventEmitter(RCTSocket, { UdpSocket.prototype.setBroadcast = function(flag) {
// nothing yet
}
UdpSocket.prototype.setTTL = function(ttl) {
// nothing yet
}
UdpSocket.prototype.setMulticastTTL = function(ttl, callback) {
// nothing yet
}
UdpSocket.prototype.setMulticastLoopback = function(flag, callback) {
// nothing yet
}
UdpSocket.prototype.addMembership = function(multicastAddress, multicastInterface, callback) {
// nothing yet
}
UdpSocket.prototype.dropMembership = function(multicastAddress, multicastInterface, callback) {
// nothing yet
}
UdpSocket.prototype.ref = function() {
// anything?
}
UdpSocket.prototype.unref = function() {
// anything?
}
mixInEventEmitter(UdpSocket, {
'listening': true, 'listening': true,
'message': true, 'message': true,
'close': true, 'close': true,
@ -258,4 +240,4 @@ function toByteArray(obj) {
return new Uint8Array(uint); return new Uint8Array(uint);
} }
module.exports = RCTSocket module.exports = UdpSocket

View File

@ -4,7 +4,7 @@
* @flow * @flow
*/ */
var UdpSocket = require('UdpSocket') var UdpSocket = require('./UdpSocket.ios')
module.exports = { module.exports = {
createSocket: function(type) { createSocket: function(type) {