rodrigo/genieacs
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some variable name refactoring

Browse Source
This commit is contained in:
Zaid Abdulla committed 2013-01-21 12:04:02 +03:00
1 parent 6fb27bea51
commit 3ce097359c
3 files changed
+90 -90
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

acs.coffee
+40 -40
View File
@@ -32,8 +32,8 @@ writeResponse = (currentRequest, res) ->
throw new Error(err) if err throw new Error(err) if err
) )
currentRequest.response.writeHead(res.code, res.headers) currentRequest.httpResponse.writeHead(res.code, res.headers)
currentRequest.response.end(res.data) currentRequest.httpResponse.end(res.data)
updateDevice = (currentRequest, actions, callback) -> updateDevice = (currentRequest, actions, callback) ->
@@ -91,14 +91,14 @@ updateDevice = (currentRequest, actions, callback) ->
callback() if callback? callback() if callback?
runTask = (currentRequest, task, reqParams) -> runTask = (currentRequest, task, cwmpRequest) ->
resParams = {} cwmpResponse = {}
actions = tasks.task(task, reqParams, resParams) actions = tasks.task(task, cwmpRequest, cwmpResponse)
updateDevice(currentRequest, actions) updateDevice(currentRequest, actions)
if Object.keys(resParams).length > 0 if Object.keys(cwmpResponse).length > 0
db.updateTask(task, (err) -> db.updateTask(task, (err) ->
res = tr069.response(currentRequest.sessionId, resParams, {task : String(task._id)}) res = tr069.response(currentRequest.sessionId, cwmpResponse, {task : String(task._id)})
writeResponse(currentRequest, res) writeResponse(currentRequest, res)
) )
return return
@@ -115,8 +115,8 @@ runTask = (currentRequest, task, reqParams) ->
nextTask = (currentRequest, cookies) -> nextTask = (currentRequest, cookies) ->
cur = db.tasksCollection.find({'device' : currentRequest.deviceId}).sort(['timestamp']).limit(1) cur = db.tasksCollection.find({'device' : currentRequest.deviceId}).sort(['timestamp']).limit(1)
cur.nextObject( (err, task) -> cur.nextObject( (err, task) ->
reqParams = {} cwmpRequest = {}
resParams = {} cwmpResponse = {}
if not task if not task
# no more tasks, check presets discrepancy # no more tasks, check presets discrepancy
@@ -136,22 +136,22 @@ nextTask = (currentRequest, cookies) ->
) )
else else
# no discrepancy, return empty response # no discrepancy, return empty response
res = tr069.response(currentRequest.sessionId, resParams, cookies) res = tr069.response(currentRequest.sessionId, cwmpResponse, cookies)
writeResponse(currentRequest, res) writeResponse(currentRequest, res)
) )
else else
# no discrepancy, return empty response # no discrepancy, return empty response
res = tr069.response(currentRequest.sessionId, resParams, cookies) res = tr069.response(currentRequest.sessionId, cwmpResponse, cookies)
writeResponse(currentRequest, res) writeResponse(currentRequest, res)
) )
return return
else if task.fault? else if task.fault?
# last task was faulty. Do nothing until until task is deleted # last task was faulty. Do nothing until until task is deleted
res = tr069.response(currentRequest.sessionId, resParams, cookies) res = tr069.response(currentRequest.sessionId, cwmpResponse, cookies)
writeResponse(currentRequest, res) writeResponse(currentRequest, res)
else else
util.log("#{currentRequest.deviceId}: Started task #{task.name}(#{task._id})") util.log("#{currentRequest.deviceId}: Started task #{task.name}(#{task._id})")
runTask(currentRequest, task, reqParams) runTask(currentRequest, task, cwmpRequest)
) )
@@ -173,22 +173,22 @@ if cluster.isMaster
for i in [1 .. numCPUs] for i in [1 .. numCPUs]
cluster.fork() cluster.fork()
else else
server = http.createServer (request, response) -> server = http.createServer (httpRequest, httpResponse) ->
if request.method != 'POST' if httpRequest.method != 'POST'
#console.log '>>> 405 Method Not Allowed' #console.log '>>> 405 Method Not Allowed'
response.writeHead 405, {'Allow': 'POST'} httpResponse.writeHead 405, {'Allow': 'POST'}
response.end('405 Method Not Allowed') httpResponse.end('405 Method Not Allowed')
return return
chunks = [] chunks = []
bytes = 0 bytes = 0
cookies = {} cookies = {}
request.addListener 'data', (chunk) -> httpRequest.addListener 'data', (chunk) ->
chunks.push(chunk) chunks.push(chunk)
bytes += chunk.length bytes += chunk.length
request.getBody = (encoding) -> httpRequest.getBody = (encoding) ->
# Write all chunks into a Buffer # Write all chunks into a Buffer
body = new Buffer(bytes) body = new Buffer(bytes)
offset = 0 offset = 0
@@ -200,42 +200,42 @@ else
#Return encoded (default to UTF8) string #Return encoded (default to UTF8) string
return body.toString(encoding || 'utf8', 0, body.byteLength) return body.toString(encoding || 'utf8', 0, body.byteLength)
request.addListener 'end', () -> httpRequest.addListener 'end', () ->
currentRequest = {} currentRequest = {}
currentRequest.request = request currentRequest.httpRequest = httpRequest
currentRequest.response = response currentRequest.httpResponse = httpResponse
resParams = {} cwmpResponse = {}
reqParams = tr069.request(request) cwmpRequest = tr069.request(httpRequest)
# get deviceId either from inform xml or cookie # get deviceId either from inform xml or cookie
if reqParams.deviceId? if cwmpRequest.deviceId?
currentRequest.deviceId = common.getDeviceId(reqParams.deviceId) currentRequest.deviceId = common.getDeviceId(cwmpRequest.deviceId)
cookies.DeviceId = currentRequest.deviceId cookies.DeviceId = currentRequest.deviceId
else else
currentRequest.deviceId = reqParams.cookies.DeviceId currentRequest.deviceId = cwmpRequest.cookies.DeviceId
if config.DEBUG_DEVICES[currentRequest.deviceId] if config.DEBUG_DEVICES[currentRequest.deviceId]
dump = "# REQUEST #{new Date(Date.now())}\n" + JSON.stringify(request.headers) + "\n#{request.getBody()}\n\n" dump = "# REQUEST #{new Date(Date.now())}\n" + JSON.stringify(httpRequest.headers) + "\n#{httpRequest.getBody()}\n\n"
require('fs').appendFile("debug/#{currentRequest.deviceId}.dump", dump, (err) -> require('fs').appendFile("debug/#{currentRequest.deviceId}.dump", dump, (err) ->
throw new Error(err) if err throw new Error(err) if err
) )
if reqParams.inform if cwmpRequest.inform
resParams.inform = true cwmpResponse.inform = true
cookies.ID = currentRequest.sessionId = reqParams.sessionId cookies.ID = currentRequest.sessionId = cwmpRequest.sessionId
if config.LOG_INFORMS if config.LOG_INFORMS
util.log("#{currentRequest.deviceId}: Inform (#{reqParams.eventCodes}); retry count #{reqParams.retryCount}") util.log("#{currentRequest.deviceId}: Inform (#{cwmpRequest.eventCodes}); retry count #{cwmpRequest.retryCount}")
updateDevice(currentRequest, {'inform' : true, 'parameterValues' : reqParams.informParameterValues}, (err) -> updateDevice(currentRequest, {'inform' : true, 'parameterValues' : cwmpRequest.informParameterValues}, (err) ->
res = tr069.response(currentRequest.sessionId, resParams, cookies) res = tr069.response(currentRequest.sessionId, cwmpResponse, cookies)
writeResponse(currentRequest, res) writeResponse(currentRequest, res)
) )
return return
currentRequest.sessionId = reqParams.cookies.ID currentRequest.sessionId = cwmpRequest.cookies.ID
taskId = reqParams.cookies.task taskId = cwmpRequest.cookies.task
if not taskId if not taskId
nextTask(currentRequest, cookies) nextTask(currentRequest, cookies)
@@ -243,15 +243,15 @@ else
db.getTask(taskId, (task) -> db.getTask(taskId, (task) ->
if not task if not task
nextTask(currentRequest, cookies) nextTask(currentRequest, cookies)
else if reqParams.fault? else if cwmpRequest.fault?
util.log("#{currentRequest.deviceId}: Fault response for task #{task._id}") util.log("#{currentRequest.deviceId}: Fault response for task #{task._id}")
db.tasksCollection.update({_id : mongodb.ObjectID(String(task._id))}, {$set : {fault : reqParams.fault}}, (err) -> db.tasksCollection.update({_id : mongodb.ObjectID(String(task._id))}, {$set : {fault : cwmpRequest.fault}}, (err) ->
# Faulty task. No more work to do until task is deleted. # Faulty task. No more work to do until task is deleted.
res = tr069.response(currentRequest.sessionId, resParams, cookies) res = tr069.response(currentRequest.sessionId, cwmpResponse, cookies)
writeResponse(currentRequest, res) writeResponse(currentRequest, res)
) )
else else
runTask(currentRequest, task, reqParams) runTask(currentRequest, task, cwmpRequest)
) )
server.listen config.ACS_PORT, config.ACS_INTERFACE server.listen config.ACS_PORT, config.ACS_INTERFACE
tasks.coffee
+20 -20
View File
@@ -1,13 +1,13 @@
common = require './common' common = require './common'
BATCH_SIZE = 16 BATCH_SIZE = 16
this.init = (task, request, response) -> this.init = (task, cwmpRequest, cwmpResponse) ->
ret = {} ret = {}
if not task.subtask? if not task.subtask?
task.subtask = {'name' : 'getParameterNames', 'parameterPath' : '', 'nextLevel' : false} task.subtask = {'name' : 'getParameterNames', 'parameterPath' : '', 'nextLevel' : false}
if task.subtask.name == 'getParameterNames' if task.subtask.name == 'getParameterNames'
common.extend(ret, this.getParameterNames(task.subtask, request, response)) common.extend(ret, this.getParameterNames(task.subtask, cwmpRequest, cwmpResponse))
if ret.parameterNames? # task finished if ret.parameterNames? # task finished
parameterNames = [] parameterNames = []
for p in ret.parameterNames for p in ret.parameterNames
@@ -16,37 +16,37 @@ this.init = (task, request, response) ->
task.subtask = {'name' : 'getParameterValues', 'parameterNames' : parameterNames} task.subtask = {'name' : 'getParameterValues', 'parameterNames' : parameterNames}
if task.subtask.name == 'getParameterValues' if task.subtask.name == 'getParameterValues'
common.extend(ret, this.getParameterValues(task.subtask, request, response)) common.extend(ret, this.getParameterValues(task.subtask, cwmpRequest, cwmpResponse))
ret ret
this.getParameterNames = (task, request, response) -> this.getParameterNames = (task, cwmpRequest, cwmpResponse) ->
if request.getParameterNamesResponse? if cwmpRequest.getParameterNamesResponse?
return {'parameterNames' : request.getParameterNamesResponse} return {'parameterNames' : cwmpRequest.getParameterNamesResponse}
else else
response.getParameterNames = [task.parameterPath, if task.nextLevel? task.nextLevel else false] cwmpResponse.getParameterNames = [task.parameterPath, if task.nextLevel? task.nextLevel else false]
return return
this.getParameterValues = (task, request, response) -> this.getParameterValues = (task, cwmpRequest, cwmpResponse) ->
if not task.currentIndex? if not task.currentIndex?
task.currentIndex = 0 task.currentIndex = 0
else if request.getParameterValuesResponse? else if cwmpRequest.getParameterValuesResponse?
task.currentIndex = task.nextIndex task.currentIndex = task.nextIndex
task.nextIndex = Math.min(task.currentIndex + BATCH_SIZE, task.parameterNames.length) task.nextIndex = Math.min(task.currentIndex + BATCH_SIZE, task.parameterNames.length)
names = task.parameterNames.slice(task.currentIndex, task.nextIndex) names = task.parameterNames.slice(task.currentIndex, task.nextIndex)
if names.length > 0 if names.length > 0
response.getParameterValues = names cwmpResponse.getParameterValues = names
if request.getParameterValuesResponse if cwmpRequest.getParameterValuesResponse
return {'parameterValues' : request.getParameterValuesResponse} return {'parameterValues' : cwmpRequest.getParameterValuesResponse}
return return
this.setParameterValues = (task, request, response) -> this.setParameterValues = (task, cwmpRequest, cwmpResponse) ->
if not task.currentIndex? if not task.currentIndex?
task.currentIndex = 0 task.currentIndex = 0
else if request.setParameterValuesResponse? else if cwmpRequest.setParameterValuesResponse?
prevValues = task.parameterValues.slice(task.currentIndex, task.nextIndex) prevValues = task.parameterValues.slice(task.currentIndex, task.nextIndex)
task.currentIndex = task.nextIndex task.currentIndex = task.nextIndex
@@ -54,15 +54,15 @@ this.setParameterValues = (task, request, response) ->
values = task.parameterValues.slice(task.currentIndex, task.nextIndex) values = task.parameterValues.slice(task.currentIndex, task.nextIndex)
if values.length > 0 if values.length > 0
response.setParameterValues = values cwmpResponse.setParameterValues = values
if prevValues? if prevValues?
return {'parameterValues' : prevValues} return {'parameterValues' : prevValues}
return return
this.reboot = (task, request, response) -> this.reboot = (task, cwmpRequest, cwmpResponse) ->
if not request.reboot if not cwmpRequest.reboot
response.reboot = 'reboot' cwmpResponse.reboot = 'reboot'
exports.task = (task, request, response) -> exports.task = (task, cwmpRequest, cwmpResponse) ->
return this[task.name](task, request, response) return this[task.name](task, cwmpRequest, cwmpResponse)
tr-069.coffee
+30 -30
View File
@@ -134,34 +134,34 @@ fault = (xml) ->
return undefined return undefined
exports.request = (request) -> exports.request = (httpRequest) ->
req = {cookies: {}} cwmpRequest = {cookies: {}}
req.cookies = cookiesToObj(request.headers.cookie) if request.headers.cookie cwmpRequest.cookies = cookiesToObj(httpRequest.headers.cookie) if httpRequest.headers.cookie
data = request.getBody() data = httpRequest.getBody()
if +request.headers['Content-Length'] > 0 || data.length > 0 if +httpRequest.headers['Content-Length'] > 0 || data.length > 0
try try
xml = libxmljs.parseXml data xml = libxmljs.parseXml data
catch err catch err
# some devices send invalid utf8 characters # some devices send invalid utf8 characters
xml = libxmljs.parseXml request.getBody('binary') xml = libxmljs.parseXml httpRequest.getBody('binary')
req.sessionId = sessionId xml cwmpRequest.sessionId = sessionId xml
req.inform = true if xml.get('//soap-env:Envelope/soap-env:Body/cwmp:Inform', NAMESPACES) cwmpRequest.inform = true if xml.get('//soap-env:Envelope/soap-env:Body/cwmp:Inform', NAMESPACES)
req.informParameterValues = informParameterValues xml cwmpRequest.informParameterValues = informParameterValues xml
req.reboot = true if xml.get('//soap-env:Envelope/soap-env:Body/cwmp:RebootResponse', NAMESPACES) cwmpRequest.reboot = true if xml.get('//soap-env:Envelope/soap-env:Body/cwmp:RebootResponse', NAMESPACES)
req.deviceId = deviceId xml cwmpRequest.deviceId = deviceId xml
req.eventCodes = eventCodes xml cwmpRequest.eventCodes = eventCodes xml
req.retryCount = retryCount xml cwmpRequest.retryCount = retryCount xml
req.getParameterNamesResponse = getParameterNamesResponse xml cwmpRequest.getParameterNamesResponse = getParameterNamesResponse xml
req.getParameterValuesResponse = getParameterValuesResponse xml cwmpRequest.getParameterValuesResponse = getParameterValuesResponse xml
req.setParameterValuesResponse = setParameterValuesResponse xml cwmpRequest.setParameterValuesResponse = setParameterValuesResponse xml
req.fault = fault xml cwmpRequest.fault = fault xml
return req return cwmpRequest
exports.response = (sessionId, params, cookies = null) -> exports.response = (sessionId, cwmpResponse, cookies = null) ->
headers = { headers = {
'Content-Type' : 'text/xml; charset="utf-8"', 'Content-Type' : 'text/xml; charset="utf-8"',
'Server' : SERVER_NAME, 'Server' : SERVER_NAME,
@@ -171,7 +171,7 @@ exports.response = (sessionId, params, cookies = null) ->
if cookies? and Object.keys(cookies).length > 0 if cookies? and Object.keys(cookies).length > 0
headers['Set-Cookie'] = cookiesToStr(cookies) headers['Set-Cookie'] = cookiesToStr(cookies)
if params is null or Object.keys(params).length == 0 if cwmpResponse is null or Object.keys(cwmpResponse).length == 0
#console.log '>>> EMPTY RESPONSE' #console.log '>>> EMPTY RESPONSE'
# send empty response # send empty response
headers['Content-Length'] = 0 headers['Content-Length'] = 0
@@ -187,30 +187,30 @@ exports.response = (sessionId, params, cookies = null) ->
#header.node('cwmp:NoMoreRequests').text(0) # depracated #header.node('cwmp:NoMoreRequests').text(0) # depracated
body = env.node('soap-env:Body') body = env.node('soap-env:Body')
if params.inform if cwmpResponse.inform
body.node('cwmp:InformResponse').node('MaxEnvelopes').text(1) body.node('cwmp:InformResponse').node('MaxEnvelopes').text(1)
if params.getParameterNames? if cwmpResponse.getParameterNames?
getParameterNames = body.node('cwmp:GetParameterNames') getParameterNames = body.node('cwmp:GetParameterNames')
getParameterNames.node('cwmp:ParameterPath').text(params.getParameterNames[0]) getParameterNames.node('cwmp:ParameterPath').text(cwmpResponse.getParameterNames[0])
getParameterNames.node('cwmp:NextLevel').text(+params.getParameterNames[1]) getParameterNames.node('cwmp:NextLevel').text(+cwmpResponse.getParameterNames[1])
if params.getParameterValues? if cwmpResponse.getParameterValues?
parameterNames = body.node('cwmp:GetParameterValues').node('cwmp:ParameterNames') parameterNames = body.node('cwmp:GetParameterValues').node('cwmp:ParameterNames')
for p in params.getParameterValues for p in cwmpResponse.getParameterValues
parameterNames.node('xsd:string').text(p) parameterNames.node('xsd:string').text(p)
if params.setParameterValues? if cwmpResponse.setParameterValues?
setParameterValuesNode = body.node('cwmp:SetParameterValues') setParameterValuesNode = body.node('cwmp:SetParameterValues')
parameterList = setParameterValuesNode.node('ParameterList') parameterList = setParameterValuesNode.node('ParameterList')
for i in params.setParameterValues for i in cwmpResponse.setParameterValues
pvs = parameterList.node('ParameterValueStruct') pvs = parameterList.node('ParameterValueStruct')
pvs.node('Name').text(i[0]) pvs.node('Name').text(i[0])
pvs.node('Value').text(i[1]) pvs.node('Value').text(i[1])
setParameterValuesNode.node('ParameterKey') setParameterValuesNode.node('ParameterKey')
if params.reboot? if cwmpResponse.reboot?
body.node('cwmp:Reboot').node('CommandKey').text(params.reboot) body.node('cwmp:Reboot').node('CommandKey').text(cwmpResponse.reboot)
data = xml.toString() data = xml.toString()