Skip to content
New issue

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

#

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

Already on GitHub? # to your account

feature: add support for conversions to use subscriptions #41

Merged
merged 1 commit into from
Mar 10, 2020
Merged

feature: add support for conversions to use subscriptions #41

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
29 changes: 16 additions & 13 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ module.exports = function(app) {
var sourceTypes = {
'onDelta': mapOnDelta,
'onValueChange': mapBaconjs,
'subscription': mapSubscription,
'timer': mapTimer
}

Expand Down Expand Up @@ -109,15 +110,17 @@ module.exports = function(app) {
}
if ( subConversions != null ) {
subConversions.forEach(subConversion => {
var type = _.isUndefined(subConversion.sourceType) ? 'onValueChange' : subConversion.sourceType
var mapper = sourceTypes[type]
if ( _.isUndefined(mapper) ) {
console.error(`Unknown conversion type: ${type}`)
} else {
if ( _.isUndefined(subConversion.outputType) ) {
subConversion.outputType = 'to-n2k'
if ( !_.isUndefined(subConversion) ) {
var type = _.isUndefined(subConversion.sourceType) ? 'onValueChange' : subConversion.sourceType
var mapper = sourceTypes[type]
if ( _.isUndefined(mapper) ) {
console.error(`Unknown conversion type: ${type}`)
} else {
if ( _.isUndefined(subConversion.outputType) ) {
subConversion.outputType = 'to-n2k'
}
mapper(subConversion, options[conversion.optionKey])
}
mapper(subConversion, options[conversion.optionKey])
}
})
}
Expand Down Expand Up @@ -175,7 +178,7 @@ module.exports = function(app) {
}

function processOutput(conversion, options, output) {
if ( options.resend > 0 ) {
if ( options.resend && options.resend > 0 ) {
if ( conversion.resendTimer ) {
let idx = timers.indexOf(conversion.resendTimer)
if ( idx != -1 ) {
Expand Down Expand Up @@ -217,9 +220,9 @@ module.exports = function(app) {
})
}

function mapTimer(conversion) {
function mapTimer(conversion, options) {
timers.push(setInterval(() => {
processOutput(conversion, conversion.callback(app))
processOutput(conversion, null, conversion.callback(app))
}, conversion.interval));
}

Expand All @@ -234,7 +237,7 @@ module.exports = function(app) {
subscribe: []
}

var keys = _.isFunction(mapping.keys) ? mapping.keys(options) : keys
var keys = _.isFunction(mapping.keys) ? mapping.keys(options) : mapping.keys
keys.forEach(key => {
subscription.subscribe.push({ path: key})
});
Expand All @@ -247,7 +250,7 @@ module.exports = function(app) {
subscription_error,
delta => {
try {
processToPGNs(mapping.callback(delta, options))
processOutput(mapping, options, mapping.callback(delta))
} catch ( err ) {
app.error(err)
}
Expand Down