A few bug fixes
This commit is contained in:
1 parent
f00d62437f
commit
133d9ebc99
2 files changed
+8
-5
No files matched your search
+1
-1
@@ -320,7 +320,7 @@ applyPresets = (currentRequest) ->
|
|||||||
|
|
||||||
if not rpcRequest?
|
if not rpcRequest?
|
||||||
for channel, flags of currentRequest.sessionData.channels
|
for channel, flags of currentRequest.sessionData.channels
|
||||||
if flags and channel of currentRequest.sessionData.faults
|
if channel of currentRequest.sessionData.faults
|
||||||
delete currentRequest.sessionData.faults[channel]
|
delete currentRequest.sessionData.faults[channel]
|
||||||
currentRequest.sessionData.faultsTouched ?= {}
|
currentRequest.sessionData.faultsTouched ?= {}
|
||||||
currentRequest.sessionData.faultsTouched[channel] = true
|
currentRequest.sessionData.faultsTouched[channel] = true
|
||||||
|
|||||||
+7
-4
@@ -283,9 +283,10 @@ addProvisions = (sessionData, channel, provisions) ->
|
|||||||
sessionData.revisions = [0]
|
sessionData.revisions = [0]
|
||||||
sessionData.extensionsCache = {}
|
sessionData.extensionsCache = {}
|
||||||
|
|
||||||
channels = [channel]
|
sessionData.channels[channel] |= 0
|
||||||
|
|
||||||
for provision, i in provisions
|
for provision, i in provisions
|
||||||
|
channels = [channel]
|
||||||
# Remove duplicate provisions
|
# Remove duplicate provisions
|
||||||
provisionStr = JSON.stringify(provision)
|
provisionStr = JSON.stringify(provision)
|
||||||
for p, j in sessionData.provisions
|
for p, j in sessionData.provisions
|
||||||
@@ -535,7 +536,7 @@ rpcRequest = (sessionData, _declarations, callback) ->
|
|||||||
|
|
||||||
if sessionData.virtualParameters.length == 0 and
|
if sessionData.virtualParameters.length == 0 and
|
||||||
sessionData.declarations.length == 0 and
|
sessionData.declarations.length == 0 and
|
||||||
sessionData.doneProvisions
|
(sessionData.doneProvisions or sessionData.provisions.length == 0)
|
||||||
return callback()
|
return callback()
|
||||||
|
|
||||||
if sessionData.declarations.length <= sessionData.virtualParameters.length
|
if sessionData.declarations.length <= sessionData.virtualParameters.length
|
||||||
@@ -600,7 +601,7 @@ rpcRequest = (sessionData, _declarations, callback) ->
|
|||||||
fault = {
|
fault = {
|
||||||
code: 'endless_cycle'
|
code: 'endless_cycle'
|
||||||
message: 'The provision seems to be repeating indefinitely'
|
message: 'The provision seems to be repeating indefinitely'
|
||||||
timestmap: sessionData.timestamp
|
timestamp: sessionData.timestamp
|
||||||
}
|
}
|
||||||
return callback(null, fault)
|
return callback(null, fault)
|
||||||
|
|
||||||
@@ -1372,7 +1373,9 @@ rpcResponse = (sessionData, id, rpcRes, callback) ->
|
|||||||
|
|
||||||
for k, v of missing when v == 0
|
for k, v of missing when v == 0
|
||||||
# TODO consider showing a warning
|
# TODO consider showing a warning
|
||||||
params.push([common.parsePath(k), timestamp, {object: [timestamp, 1], writable: [timestamp, 0]}])
|
path = common.parsePath(k)
|
||||||
|
params.push([path, timestamp, {object: [timestamp, 1], writable: [timestamp, 0]}])
|
||||||
|
params.push([path.concat('*'), timestamp])
|
||||||
|
|
||||||
# Sort such that actual parameters are set before wildcard ones
|
# Sort such that actual parameters are set before wildcard ones
|
||||||
params.sort((a, b) ->
|
params.sort((a, b) ->
|
||||||
|
|||||||
Reference in new issue
Block a user