Merge pull request #344 from agsh/remove-lodash

Remove lodash.get dependency, minimal node version is 14
agsh · Oct 28, 2024 · 9c59e9d · 9c59e9d
2 parents a4a7619 + 068cc6f
commit 9c59e9d
Show file tree

Hide file tree

Showing 4 changed files with 269 additions and 173 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -4,6 +4,9 @@
     "node": true,
     "mocha": true
   },
+  "parserOptions": {
+    "ecmaVersion": 12
+  },
   "rules": {
     "node/no-deprecated-api": 0,
     "no-console": 0,

diff --git a/lib/ptz.js b/lib/ptz.js
@@ -7,7 +7,6 @@
 module.exports = function(Cam) {
 
 	const linerase = require('./utils').linerase;
-	const _get = require('lodash.get');
 
 	/**
 	 * Receive cam presets
@@ -176,12 +175,12 @@ module.exports = function(Cam) {
 		}, function(err, data, xml) {
 			if (!err) {
 				// Some cameras have Pan/Tilt but no Zoom
-				var res = linerase(data).getStatusResponse.PTZStatus;
+				const res = linerase(data).getStatusResponse.PTZStatus;
 				var status = {
 					position: {
-						x: _get(res, 'position.panTilt.$.x', 0)
-						, y: _get(res, 'position.panTilt.$.y', 0)
-						, zoom: _get(res, 'position.zoom.$.x', 0)
+						x: res.position?.panTilt?.$?.x ?? 0
+						, y: res.position?.panTilt?.$?.y ?? 0
+						, zoom: res.position?.zoom?.$?.x ?? 0
 					}
 					, moveStatus: res.moveStatus
 					, error: res.error
@@ -601,5 +600,5 @@ module.exports = function(Cam) {
 			}
 		}.bind(this));
 	};
-	
+
 };