-
Notifications
You must be signed in to change notification settings - Fork 18
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.
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
Filter duplicate interfaces from incoming #67
Open
christianbundy
wants to merge
1
commit into
master
Choose a base branch
from
filter-incoming
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -25,11 +25,10 @@ module.exports = function (config) { | |
return defaultPort | ||
} | ||
|
||
|
||
//legacy configuration didn't have a scopes concept, | ||
//so interpret that as every scope at once. | ||
//I think there is probably a better way to do this, | ||
//but am fairly sure this will probably work. | ||
// legacy configuration didn't have a scopes concept, | ||
// so interpret that as every scope at once. | ||
// I think there is probably a better way to do this, | ||
// but am fairly sure this will probably work. | ||
const allScopes = ['device', 'local', 'public'] | ||
|
||
// If `config.host` is defined then we don't need to enumerate interfaces. | ||
|
@@ -68,35 +67,52 @@ module.exports = function (config) { | |
incoming = Object.keys(defaultPorts).map((service) => { | ||
return { | ||
service, | ||
interfaces: Object.values(interfaces).reduce((acc, val) => { | ||
// Future TODO: replace with shiny new `Array.prototype.flat()`. | ||
return acc.concat(val) | ||
}, []).filter(item => { | ||
// We want to avoid scoped IPv6 addresses since they don't seem to | ||
// play nicely with the Node.js networking stack. These addresses | ||
// often start with `fe80` and throw EINVAL when we try to bind to | ||
// them. | ||
return item.scopeid == null || item.scopeid === 0 | ||
}).map(item => { | ||
interfaces: Object.values(interfaces) | ||
.reduce((acc, val) => { | ||
// Future TODO: replace with shiny new `Array.prototype.flat()`. | ||
return acc.concat(val) | ||
}, []) | ||
.filter(item => { | ||
// We want to avoid scoped IPv6 addresses since they don't seem to | ||
// play nicely with the Node.js networking stack. These addresses | ||
// often start with `fe80` and throw EINVAL when we try to bind to | ||
// them. | ||
return item.scopeid == null || item.scopeid === 0 | ||
}) | ||
.reduce((acc, cur) => { | ||
// It's possible to have two interfaces with the same IP address, | ||
// but we don't want to try to listen on both of them. This only | ||
// adds the interface to the list if it hasn't already been added. | ||
const found = acc.find((item) => | ||
item.address === cur.address | ||
) | ||
|
||
if (found == null) { | ||
acc.push(cur) | ||
} | ||
|
||
return acc | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. To simplify this code, I would probably refactor this arrow function to be a named function |
||
}, []) | ||
.map(item => { | ||
// This bit is simple because the ssb-config options for `incoming` | ||
// can either be hardcoded or directly inferred from `interfaces`. | ||
|
||
//if an interface is internal, it can only be accessed from the device. | ||
//if it's got a private ip address it can only be accessed from some network. | ||
//otherwise, it's presumably a publically accessable address. | ||
var scope = ( | ||
item.internal ? 'device' | ||
: ip.isPrivate(item.address) ? 'local' | ||
: 'public' | ||
) | ||
// if an interface is internal, it can only be accessed from the device. | ||
// if it's got a private ip address it can only be accessed from some network. | ||
// otherwise, it's presumably a publically accessable address. | ||
var scope = ( | ||
item.internal ? 'device' | ||
: ip.isPrivate(item.address) ? 'local' | ||
: 'public' | ||
) | ||
|
||
return { | ||
host: item.address, | ||
port: getPort(service), | ||
scope: [scope], | ||
transform: 'shs' | ||
} | ||
}) | ||
return { | ||
host: item.address, | ||
port: getPort(service), | ||
scope: [scope], | ||
transform: 'shs' | ||
} | ||
}) | ||
} | ||
}).reduce((result, obj) => { | ||
// This `reduce()` step is necessary because we need to return an object | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Code style changes are best done in their own commit, it makes it significantly easier to review (I can browse the commits and focus my attention only on the non-style commits), and makes the git blame process easier too.