Upgrade xml2js package

.gitignore

@@ -48,3 +48,4 @@ Temporary Items
 
 test
 node_modules
+package-lock.json

README.md

@@ -54,6 +54,8 @@ This package includes a sample application "[ONVIF Network Camera Manager](https
     * [`getCurrentProfile()` method](#OnvifDevice-getCurrentProfile-method)
     * [`getProfileList()` method](#OnvifDevice-getProfileList-method)
     * [`changeProfile(index|token)` method](#OnvifDevice-changeProfile-method)
+    * [`addVideoSourceConfiguration(index|token)` method](#OnvifDevice-addVideoSource-method)
+    * [`addVideoEncoderConfiguration(index|token)` method](#OnvifDevice-addVideoEncoder-method)
     * [`getUdpStreamUrl()` method](#OnvifDevice-getUdpStreamUrl-method)
     * [`fetchSnapshot(callback)` method](#OnvifDevice-fetchSnapshot-method)
     * [`ptzMove(params[, callback])` method](#OnvifDevice-ptzMove-method)
@@ -63,6 +65,7 @@ This package includes a sample application "[ONVIF Network Camera Manager](https
   * [`getCapabilities([callback])` method](#OnvifServiceDevice-getCapabilities-method)
   * [`getWsdlUrl([callback])` method](#OnvifServiceDevice-getWsdlUrl-method)
   * [`getDiscoveryMode([callback])` method](#OnvifServiceDevice-getDiscoveryMode-method)
+  * [`setDiscoveryMode(mode,[callback])` method](#OnvifServiceDevice-setDiscoveryMode-method)
   * [`getScopes([callback])` method](#OnvifServiceDevice-getScopes-method)
   * [`setScopes(params[, callback])` method](#OnvifServiceDevice-setScopes-method)
   * [`addScopes(params[, callback])` method](#OnvifServiceDevice-addScopes-method)
@@ -137,6 +140,7 @@ This package includes a sample application "[ONVIF Network Camera Manager](https
   * [`getPresets(params[, callback])` method](#OnvifServicePtz-getPresets-method)
   * [`gotoPreset(params[, callback])` method](#OnvifServicePtz-gotoPreset-method)
   * [`removePreset(params[, callback])` method](#OnvifServicePtz-removePreset-method)
+* [`OnvifServiceImaging` object](#OnvifServiceImaging-object)
 * [References](#References)
 * [Release Note](#Release-Note)
 * [License](#License)
@@ -600,6 +604,7 @@ Property   |          | Type   | Description
 `services` |          | Object |
 +-         | `device` | Object | [`OnvifServiceDevice`](#OnvifServiceDevice-object) object
 +-         | `media`  | Object | [`OnvifServiceMedia`](#OnvifServiceMedia-object) object
++-         | `imaging`| Object | [`OnvifServiceImaging`](#OnvifServiceImaging-object) object
 +-         | `ptz`    | Object | [`OnvifServicePtz`](#OnvifServicePtz-object) object
 
 These objects will be set when the initialization process is completed calling the [`init()`](#OnvifDevice-init-method) method. See the section "[ONVIF commands](#ONVIF-commands)" for details.
@@ -812,7 +817,13 @@ This sample code will output the result like this:
 - Before: 1280 x 720
 - After: 320 x 180
 ```
+#### <a id="OnvifDevice-addVideoSource-method">addVideoSourceConfiguration(*index|token*)</a>
 
+TBD
+
+#### <a id="OnvifDevice-addVideoEncoder-method">addVideoEncoderConfiguration(*index|token*)</a>
+
+TBD
 #### <a id="OnvifDevice-getUdpStreamUrl-method">getUdpStreamUrl()</a>
 
 This method returns the UDP Stream URL. Though the URL can be obtained from the result of the [`getCurrentProfile()`](#OnvifDevice-getCurrentProfile-method) method as well, this method makes that easy.
@@ -1052,6 +1063,10 @@ This method sends a `GetWsdlUrl` command.
 
 This method sends a `GetDiscoveryMode` command.
 
+### <a id="OnvifServiceDevice-setDiscoveryMode-method">setDiscoveryMode(*[callback]*) method</a>
+
+This method sends a `setDiscoveryMode` command.  The 1st argument `mode` MUST be either 'Discoverable' or 'NonDiscoverable'
+
 ### <a id="OnvifServiceDevice-getScopes-method">getScopes(*[callback]*) method</a>
 
 This method sends a `GetScopes` command.
@@ -1201,6 +1216,10 @@ return device.services.device.setDNS(params).then((result) => {
 
 This method sends a `GetNetworkProtocols` command.
 
+### <a id="OnvifServiceDevice-setNetworkInterfaces-method">setNetworkInterfaces(*params[,callback]*) method</a>
+
+This method sends a `GetNetworkProtocols` command.
+
 ### <a id="OnvifServiceDevice-getNetworkProtocols-method">getNetworkProtocols(*[callback]*) method</a>
 
 This method sends a `GetNetworkProtocols` command.

lib/modules/device.js

@@ -14,6 +14,7 @@ const mEventEmitter = require('events').EventEmitter;
 const mOnvifServiceDevice = require('./service-device.js');
 const mOnvifServiceMedia = require('./service-media.js');
 const mOnvifServicePtz = require('./service-ptz.js');
+const mOnvifServiceImaging = require('./service-imaging.js');
 const mOnvifServiceEvents = require('./service-events.js');
 const mOnvifHttpAuth = require('./http-auth.js');
 
@@ -38,7 +39,10 @@ function OnvifDevice(params) {
 	this.user = '';
 	this.pass = '';
 	this.keepAddr = false;
+	this.onvifCompliant = 'no';
+	this.isAddressable = true;
 	this.lastResponse = null; // for debug
+	this.lastError = null;
 
 	if (('xaddr' in params) && typeof (params['xaddr']) === 'string') {
 		this.xaddr = params['xaddr'];
@@ -348,7 +352,16 @@ OnvifDevice.prototype.init = function (callback) {
 		}).then(() => {
 			return this._getDeviceInformation();
 		}).then(() => {
-			return this._mediaGetProfiles();
+			return this._getVideoSources();
+		}).then(() => {
+			if (!Array.isArray(this.video_sources))
+				return this.getProfiles();
+			else {
+				this.isMultiCameraDevice = true
+				return(new Promise((res,rej) => {
+					res(null)
+				}))
+			}
 		}).then(() => {
 			return this._mediaGetStreamURI();
 		}).then(() => {
@@ -357,6 +370,38 @@ OnvifDevice.prototype.init = function (callback) {
 			let info = this.getInformation();
 			resolve(info);
 		}).catch((error) => {
+
+			//  If we can't even talk to this guy, then abort - but mark the guy as unaddressable
+			if (this.lastError.toString().search(/Network Error/i) >= 0){
+				this.isAddressable = false;
+			}
+			reject(error);
+		});
+	});
+	if (this._isValidCallback(callback)) {
+		promise.then((info) => {
+			callback(null, info);
+		}).catch((error) => {
+			callback(error);
+		});
+	} else {
+		return promise;
+	}
+};
+
+/* ------------------------------------------------------------------
+* Method: isONVIF([callback])
+* ---------------------------------------------------------------- */
+OnvifDevice.prototype.isONVIF = function (callback) {
+	let promise = new Promise((resolve, reject) => {
+		this._getSystemDateAndTime().then(() => {
+			resolve(null)
+		}).catch((error) => {
+
+			//  If we can't even talk to this guy, then abort - but mark the guy as unaddressable
+			if (this.lastError.toString().search(/Network Error/i) >= 0){
+				this.isAddressable = false;
+			}
 			reject(error);
 		});
 	});
@@ -375,13 +420,19 @@ OnvifDevice.prototype.init = function (callback) {
 OnvifDevice.prototype._getSystemDateAndTime = function () {
 	let promise = new Promise((resolve, reject) => {
 		this.services.device.getSystemDateAndTime((error, result) => {
-			// Ignore the error becase some devices do not support
-			// the GetSystemDateAndTime command and the error does
-			// not cause any trouble.
-			if (!error) {
+			this.lastError = error;
+			this.lastResponse = result;
+
+			//  If no error, then use result to calculate the time difference between us
+			//  That delta will be used in NONCE creation for subsequent authorized calls
+			if (!error){
 				this.time_diff = this.services.device.getTimeDiff();
-			}
-			resolve();
+				this.date_time = this.services.device.getDateTime()
+				this.date_time_unparsed = result.converted.Body.GetSystemDateAndTimeResponse.SystemDateAndTime
+				this.onvifCompliant = 'yes'
+				resolve()
+			} else
+				reject(error)
 		});
 	});
 	return promise;
@@ -391,11 +442,13 @@ OnvifDevice.prototype._getSystemDateAndTime = function () {
 OnvifDevice.prototype._getCapabilities = function () {
 	let promise = new Promise((resolve, reject) => {
 		this.services.device.getCapabilities((error, result) => {
+			this.lastError = error;
 			this.lastResponse = result;
 			if (error) {
 				reject(new Error('Failed to initialize the device: ' + error.toString()));
 				return;
 			}
+			this.onvifCompliant = 'yes'
 			let c = result['data']['GetCapabilitiesResponse']['Capabilities'];
 			if (!c) {
 				reject(new Error('Failed to initialize the device: No capabilities were found.'));
@@ -412,14 +465,12 @@ OnvifDevice.prototype._getCapabilities = function () {
 			}
 			let imaging = c['Imaging'];
 			if (imaging && imaging['XAddr']) {
-				/*
 				this.services.imaging = new mOnvifServiceImaging({
 					'xaddr'    : imaging['XAddr'],
 					'time_diff': this.time_diff,
 					'user'     : this.user,
 					'pass'     : this.pass
 				});
-				*/
 			}
 			let media = c['Media'];
 			if (media && media['XAddr']) {
@@ -445,10 +496,28 @@ OnvifDevice.prototype._getCapabilities = function () {
 	return promise;
 };
 
+// GetVideoSources (Access Class: READ_SYSTEM)
+OnvifDevice.prototype._getVideoSources = function () {
+	let promise = new Promise((resolve, reject) => {
+		this.services.media.getVideoSources((error, result) => {
+			this.lastError = error;
+			this.lastResponse = result;
+			if (error) {
+				reject(new Error('Failed to initialize the device: ' + error.toString()));
+			} else {
+				this.video_sources = result['data']['GetVideoSourcesResponse']['VideoSources'];
+				resolve();
+			}
+		});
+	});
+	return promise;
+};
 // GetDeviceInformation (Access Class: READ_SYSTEM)
 OnvifDevice.prototype._getDeviceInformation = function () {
 	let promise = new Promise((resolve, reject) => {
 		this.services.device.getDeviceInformation((error, result) => {
+			this.lastError = error;
+			this.lastResponse = result;
 			if (error) {
 				reject(new Error('Failed to initialize the device: ' + error.toString()));
 			} else {
@@ -461,9 +530,10 @@ OnvifDevice.prototype._getDeviceInformation = function () {
 };
 
 // Media::GetProfiles (Access Class: READ_MEDIA)
-OnvifDevice.prototype._mediaGetProfiles = function () {
+OnvifDevice.prototype.getProfiles = function () {
 	let promise = new Promise((resolve, reject) => {
 		this.services.media.getProfiles((error, result) => {
+			this.lastError = error;
 			this.lastResponse = result;
 			if (error) {
 				reject(new Error('Failed to initialize the device: ' + error.toString()));
@@ -478,6 +548,7 @@ OnvifDevice.prototype._mediaGetProfiles = function () {
 			profiles.forEach((p) => {
 				let profile = {
 					'token': p['$']['token'],
+					'fixed': p['$']['fixed'].toLowerCase() == 'true',
 					'name': p['Name'],
 					'snapshot': '',
 					'stream': {
@@ -525,6 +596,7 @@ OnvifDevice.prototype._mediaGetProfiles = function () {
 				}
 				if (p['VideoEncoderConfiguration']) {
 					profile['video']['encoder'] = {
+						'encoding': p['VideoEncoderConfiguration']['Encoding'],
 						'token': p['VideoEncoderConfiguration']['$']['token'],
 						'name': p['VideoEncoderConfiguration']['Name'],
 						'resolution': {
@@ -534,7 +606,9 @@ OnvifDevice.prototype._mediaGetProfiles = function () {
 						'quality': parseInt(p['VideoEncoderConfiguration']['Quality'], 10),
 						'framerate': parseInt(p['VideoEncoderConfiguration']['RateControl']['FrameRateLimit'], 10),
 						'bitrate': parseInt(p['VideoEncoderConfiguration']['RateControl']['BitrateLimit'], 10),
-						'encoding': p['VideoEncoderConfiguration']['Encoding']
+						'encodinginterval': parseInt(p['VideoEncoderConfiguration']['RateControl']['EncodingInterval'], 10),
+						'encoding': p['VideoEncoderConfiguration']['Encoding'],
+						'govlength': p['VideoEncoderConfiguration']['H264'] ? parseInt(p['VideoEncoderConfiguration']['H264']['GovLength'],10) : null
 					};
 				}
 				if (p['AudioSourceConfiguration']) {
@@ -604,6 +678,7 @@ OnvifDevice.prototype._mediaGetStreamURI = function () {
 						'Protocol': protocol
 					};
 					this.services.media.getStreamUri(params, (error, result) => {
+						this.lastError = error;
 						this.lastResponse = result;
 						if (!error) {
 							let uri = result['data']['GetStreamUriResponse']['MediaUri']['Uri'];
@@ -637,6 +712,7 @@ OnvifDevice.prototype._mediaGetSnapshotUri = function () {
 			if (profile) {
 				let params = { 'ProfileToken': profile['token'] };
 				this.services.media.getSnapshotUri(params, (error, result) => {
+					this.lastError = error;
 					this.lastResponse = result;
 					if (!error) {
 						try {

lib/modules/http-auth.js

@@ -90,7 +90,7 @@ OnvifHttpAuth.prototype._createAuthReqHeaderValue = function(o) {
 };
 
 OnvifHttpAuth.prototype._createCnonce = function(digit) {
-	let nonce = new Buffer(digit);
+	let nonce = Buffer.alloc(digit);
 	for(let i=0; i<digit; i++){
 		nonce.writeUInt8(Math.floor(Math.random() * 256), i);
 	}