Skip to content

Add NAT support #34

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.

Sign up for GitHub

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

Merged
futomi merged 3 commits into from
Aug 13, 2018
Merged

Add NAT support #34

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a4ccf6b
add NAT support
Jun 12, 2018
d7355ed
remove :80 in xaddr, no need
Jun 13, 2018
1492dcf
fix snapshot to use nat address
Jun 13, 2018
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
48 changes: 42 additions & 6 deletions lib/modules/device.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,16 @@ function OnvifDevice(params) {
this.xaddr = '';
this.user = '';
this.pass = '';
this.keepAddr = false;

if(('xaddr' in params) && typeof(params['xaddr']) === 'string') {
this.xaddr = params['xaddr'];
let ourl = mUrl.parse(this.xaddr);
this.address = ourl.hostname;
} else if(('address' in params) && typeof(params['address']) === 'string') {
this.keepAddr = true;
this.address = params['address'];
this.xaddr = 'http://' + this.address +':80/onvif/device_service';
this.xaddr = 'http://' + this.address +'/onvif/device_service';
} else {
throw new Error('The parameter was invalid.');
}
Expand Down Expand Up @@ -400,7 +402,7 @@ OnvifDevice.prototype._getCapabilities = function() {
let events = c['Events'];
if(events && events['XAddr']) {
this.services.events = new mOnvifServiceEvents({
'xaddr' : events['XAddr'],
'xaddr' : this._getXaddr(events['XAddr']),
'time_diff': this.time_diff,
'user' : this.user,
'pass' : this.pass
Expand All @@ -420,7 +422,7 @@ OnvifDevice.prototype._getCapabilities = function() {
let media = c['Media'];
if(media && media['XAddr']) {
this.services.media = new mOnvifServiceMedia({
'xaddr': media['XAddr'],
'xaddr' : this._getXaddr(media['XAddr']),
'time_diff': this.time_diff,
'user' : this.user,
'pass' : this.pass
Expand All @@ -429,7 +431,7 @@ OnvifDevice.prototype._getCapabilities = function() {
let ptz = c['PTZ'];
if(ptz && ptz['XAddr']) {
this.services.ptz = new mOnvifServicePtz({
'xaddr': ptz['XAddr'],
'xaddr' : this._getXaddr(ptz['XAddr']),
'time_diff': this.time_diff,
'user' : this.user,
'pass' : this.pass
Expand Down Expand Up @@ -601,6 +603,7 @@ OnvifDevice.prototype._mediaGetStreamURI = function() {
this.services.media.getStreamUri(params, (error, result) => {
if(!error) {
let uri = result['data']['GetStreamUriResponse']['MediaUri']['Uri'];
uri = this._getUri(uri);
this.profile_list[profile_index]['stream'][protocol.toLowerCase()] = uri;
}
protocol_index ++;
Expand Down Expand Up @@ -632,8 +635,10 @@ OnvifDevice.prototype._mediaGetSnapshotUri = function() {
this.services.media.getSnapshotUri(params, (error, result) => {
if(!error) {
try {
profile['snapshot'] = result['data']['GetSnapshotUriResponse']['MediaUri']['Uri'];
} catch(e) {}
let snapshotUri = result['data']['GetSnapshotUriResponse']['MediaUri']['Uri'];
snapshotUri = this._getSnapshotUri(snapshotUri);
profile['snapshot'] = snapshotUri;
} catch(e) { console.log(e);}
}
profile_index ++;
getSnapshotUri();
Expand All @@ -647,4 +652,35 @@ OnvifDevice.prototype._mediaGetSnapshotUri = function() {
return promise;
};

OnvifDevice.prototype._getXaddr = function(directXaddr) {
if (!this.keepAddr) return directXaddr;
const path = mUrl.parse(directXaddr).path;
return 'http://' + this.address + path;
}

OnvifDevice.prototype._getUri = function(directUri) {
if (!this.keepAddr) return directUri;
const base = mUrl.parse('http://' + this.address);
const parts = mUrl.parse(directUri);
const newParts = {
host: base.host,
pathname: base.pathname + parts.pathname
};
const newUri = mUrl.format(newParts);
return newUri;
}

OnvifDevice.prototype._getSnapshotUri = function(directUri) {
if (!this.keepAddr) return directUri;
const base = mUrl.parse('http://' + this.address);
const parts = mUrl.parse(directUri);
const newParts = {
protocol: parts.protocol,
host: base.host,
pathname: base.pathname + parts.pathname
};
const newUri = mUrl.format(newParts);
return newUri;
}

module.exports = OnvifDevice;