signalk-onvif-camera 1.1.0 → 1.1.2

package/README.md

@@ -1,91 +1,93 @@
-# signalk-onvif-camera
-
-ONVIF Camera interface for Signal K. For IP cameras that support ONVIF control, fixed and PTZ.
-
-## Installation
-
-Install via the Signal K Appstore, or manually:
-
-```bash
-npm install signalk-onvif-camera
-```
-
-## Plugin Configuration
-
-![config](doc/config.jpg)
-
-- Enter ONVIF profile username and password
-- Add camera IP addresses to the list
-
-## ONVIF Camera Setup
-
-Example of HikVision IP camera ONVIF configuration:
-
-![onvif](doc/onvif.jpg)
-
-- Add an ONVIF user to your IP camera if applicable
-
-## Webapp
-
-![webapp](doc/webapp.jpg)
-
-Access the webapp from the Signal K Webapps menu by selecting "Signalk-onvif-camera".
-
-## Camera Service
-
-![service](doc/service.jpg)
-
-- ONVIF cameras are discovered on the local network
-- Select a device from the dropdown menu
-- Press "Connect" to connect to the camera
-
-## Camera Controls
-
-![inuse](doc/inuse.jpg)
-
-- PTZ controls: pan, tilt, and home button
-- Zoom in/out
-- Adjustable control speed
-- Disconnect
-- Hide/show controls
-
-## Development
-
-```bash
-npm install
-npm run build       # Build frontend (cleans public/ first)
-npm run dev         # Vite dev server
-npm test            # Run tests with coverage
-npm run lint        # Lint with ESLint
-```
-
-## Version control
-
-- v0.0.1, 1st version for testing
-- v0.0.2, license added
-- v0.1.0, 1st release
-- v0.1.1, ONVIF LAN selection
-- v0.1.2, Webpack bundled
-- v0.1.3, Webapp icon added
-- v0.1.4, updated to npm packages
-- v0.2.0, hide controls
-- v0.2.1, version update
-- v0.3.0, ws error handling
-- v0.3.1, icon loading error
-- v0.4.0, code refactoring
-- v0.5.0, improvements to streaming and viewing
-- v0.6.0, replace devcert with selfsigned
-- v0.6.1, extra console logs removed
-- v0.7.0, certs stored to permanent location
-- v0.7.1, fix WebSocket connection issues
-- v0.8.0, webpack changed to vite
-- v1.0.0: WebSocket noServer mode, build pipeline cleanup
-- v1.1.0: migrated TypeScript, hardened ONVIF discovery, auth, snapshot/MJPEG streaming, reconnect and shutdown behavior
-
-## Credits
-
-https://github.com/futomi/node-onvif
-
-## License
-
-MIT
+# signalk-onvif-camera
+
+ONVIF Camera interface for Signal K. For IP cameras that support ONVIF control, fixed and PTZ.
+
+## Installation
+
+Install via the Signal K Appstore, or manually:
+
+```bash
+npm install signalk-onvif-camera
+```
+
+## Plugin Configuration
+
+![config](doc/config.jpg)
+
+- Enter ONVIF profile username and password
+- Add camera IP addresses to the list
+
+## ONVIF Camera Setup
+
+Example of HikVision IP camera ONVIF configuration:
+
+![onvif](doc/onvif.jpg)
+
+- Add an ONVIF user to your IP camera if applicable
+
+## Webapp
+
+![webapp](doc/webapp.jpg)
+
+Access the webapp from the Signal K Webapps menu by selecting "Signalk-onvif-camera".
+
+## Camera Service
+
+![service](doc/service.jpg)
+
+- ONVIF cameras are discovered on the local network
+- Select a device from the dropdown menu
+- Press "Connect" to connect to the camera
+
+## Camera Controls
+
+![inuse](doc/inuse.jpg)
+
+- PTZ controls: pan, tilt, and home button
+- Zoom in/out
+- Adjustable control speed
+- Disconnect
+- Hide/show controls
+
+## Development
+
+```bash
+npm install
+npm run build       # Build frontend (cleans public/ first)
+npm run dev         # Vite dev server
+npm test            # Run tests with coverage
+npm run lint        # Lint with ESLint
+```
+
+## Version control
+
+- v0.0.1, 1st version for testing
+- v0.0.2, license added
+- v0.1.0, 1st release
+- v0.1.1, ONVIF LAN selection
+- v0.1.2, Webpack bundled
+- v0.1.3, Webapp icon added
+- v0.1.4, updated to npm packages
+- v0.2.0, hide controls
+- v0.2.1, version update
+- v0.3.0, ws error handling
+- v0.3.1, icon loading error
+- v0.4.0, code refactoring
+- v0.5.0, improvements to streaming and viewing
+- v0.6.0, replace devcert with selfsigned
+- v0.6.1, extra console logs removed
+- v0.7.0, certs stored to permanent location
+- v0.7.1, fix WebSocket connection issues
+- v0.8.0, webpack changed to vite
+- v1.0.0: WebSocket noServer mode, build pipeline cleanup
+- v1.1.0: migrated TypeScript, hardened ONVIF discovery, auth, snapshot/MJPEG streaming, reconnect and shutdown behavior
+- v1.1.1: clean-up build output
+- v1.1.2: small fixes
+
+## Credits
+
+https://github.com/futomi/node-onvif
+
+## License
+
+MIT

package/dist/index.js

@@ -28,6 +28,11 @@ const WebSocket = require('ws');
 const fs = require('fs');
 const path = require('path');
 const { validateDeviceAddress, validatePTZCommand } = require('./lib/utils/validation');
+function hasUpgradeListenerServer(server) {
+    return Boolean(server
+        && typeof server.on === 'function'
+        && typeof server.removeListener === 'function');
+}
 function isRecord(value) {
     return typeof value === 'object' && value !== null;
 }
@@ -182,11 +187,11 @@ module.exports = function createPlugin(app) {
             wsServer.close();
             wsServer = null;
         }
-        if (upgradeHandler && app.server) {
+        if (upgradeHandler && hasUpgradeListenerServer(app.server)) {
             app.server.removeListener('upgrade', upgradeHandler);
             upgradeHandler = null;
         }
-        if (app.server) {
+        if (hasUpgradeListenerServer(app.server)) {
             // Use noServer mode so we don't interfere with SignalK's own
             // WebSocket server on the same HTTP server.  With the default
             // { server } option the ws library adds its own 'upgrade'
@@ -410,7 +415,7 @@ module.exports = function createPlugin(app) {
         });
         mjpegStreams.clear();
         closeActiveWsConnections();
-        if (upgradeHandler && app.server) {
+        if (upgradeHandler && hasUpgradeListenerServer(app.server)) {
             app.server.removeListener('upgrade', upgradeHandler);
             upgradeHandler = null;
         }
@@ -1485,4 +1490,3 @@ module.exports = function createPlugin(app) {
     }
     return plugin;
 };
-//# sourceMappingURL=index.js.map

package/dist/lib/config/defaults.js

@@ -33,4 +33,3 @@ module.exports = {
         pongTimeout: 5000 // milliseconds
     }
 };
-//# sourceMappingURL=defaults.js.map

package/dist/lib/modules/device.js

@@ -769,4 +769,3 @@ OnvifDevice.prototype._getSnapshotUri = function (directUri) {
     return rewriteUriHost(this.address, resolvedDirectUri);
 };
 module.exports = OnvifDevice;
-//# sourceMappingURL=device.js.map

package/dist/lib/modules/http-auth.js

@@ -187,4 +187,3 @@ OnvifHttpAuth.prototype._parseAuthHeader = function (h) {
     return o;
 };
 module.exports = new OnvifHttpAuth();
-//# sourceMappingURL=http-auth.js.map

package/dist/lib/modules/service-device.js

@@ -1662,4 +1662,3 @@ OnvifServiceDevice.prototype.getServiceCapabilities = function (callback) {
     }
 };
 module.exports = OnvifServiceDevice;
-//# sourceMappingURL=service-device.js.map

package/dist/lib/modules/service-events.js

@@ -229,4 +229,3 @@ OnvifServiceEvents.prototype.getServiceCapabilities = function (callback) {
     }
 };
 module.exports = OnvifServiceEvents;
-//# sourceMappingURL=service-events.js.map

package/dist/lib/modules/service-media.js

@@ -1556,4 +1556,3 @@ OnvifServiceMedia.prototype.getSnapshotUri = function (params, callback) {
     }
 };
 module.exports = OnvifServiceMedia;
-//# sourceMappingURL=service-media.js.map

package/dist/lib/modules/service-ptz.js

@@ -944,4 +944,3 @@ OnvifServicePtz.prototype.removePreset = function (params, callback) {
     }
 };
 module.exports = OnvifServicePtz;
-//# sourceMappingURL=service-ptz.js.map

package/dist/lib/modules/soap.js

@@ -366,4 +366,3 @@ OnvifSoap.prototype._getTypeOfValue = function (value) {
     }
 };
 module.exports = new OnvifSoap();
-//# sourceMappingURL=soap.js.map

package/dist/lib/node-onvif.js

@@ -319,4 +319,3 @@ class Onvif {
     }
 }
 module.exports = new Onvif();
-//# sourceMappingURL=node-onvif.js.map

package/dist/lib/types.js

@@ -1,3 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=types.js.map

package/dist/lib/utils/validation.js

@@ -134,4 +134,3 @@ module.exports = {
     validatePluginOptions,
     sanitizeString
 };
-//# sourceMappingURL=validation.js.map

package/package.json

@@ -1,59 +1,58 @@
-{
-  "name": "signalk-onvif-camera",
-  "version": "1.1.0",
-  "description": "Signal K Onvif Camera Interface",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "files": [
-    "dist/",
-    "public/",
-    "doc/"
-  ],
-  "engines": {
-    "node": ">=18.0.0"
-  },
-  "scripts": {
-    "test": "jest --coverage",
-    "test:watch": "jest --watch",
-    "lint": "eslint .",
-    "lint:fix": "eslint . --ext .js,.ts --fix",
-    "typecheck": "tsc --noEmit",
-    "prepublishOnly": "npm run lint && npm run typecheck && npm test && npm run build",
-    "clean": "node -e \"require('fs').rmSync('./dist',{recursive:true,force:true});require('fs').rmSync('./public',{recursive:true,force:true})\"",
-    "dev": "vite",
-    "build": "npm run clean && tsc -p tsconfig.build.json && vite build",
-    "preview": "vite preview"
-  },
-  "signalk": {
-    "appIcon": "./icons/icon-72x72.png",
-    "displayName": "Signalk-onvif-camera"
-  },
-  "keywords": [
-    "signalk-node-server-plugin",
-    "signalk-webapp",
-    "signalk-category-utility"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/KEGustafsson/signalk-onvif-camera"
-  },
-  "author": "Karl-Erik Gustafsson",
-  "license": "MIT",
-  "dependencies": {
-    "ws": "^8.0.0",
-    "xml2js": "^0.6.2"
-  },
-  "devDependencies": {
-    "@types/jest": "^30.0.0",
-    "@types/jquery": "^4.0.0",
-    "@types/node": "^25.5.0",
-    "@typescript-eslint/eslint-plugin": "^8.57.1",
-    "@typescript-eslint/parser": "^8.57.1",
-    "bootstrap": "^3.4.1",
-    "eslint": "^8.57.0",
-    "jest": "^29.7.0",
-    "ts-jest": "^29.4.6",
-    "typescript": "^5.9.3",
-    "vite": "^6.0.5"
-  }
-}
+{
+  "name": "signalk-onvif-camera",
+  "version": "1.1.2",
+  "description": "Signal K Onvif Camera Interface",
+  "main": "dist/index.js",
+  "files": [
+    "dist/",
+    "public/",
+    "doc/"
+  ],
+  "engines": {
+    "node": ">=18.0.0"
+  },
+  "scripts": {
+    "test": "jest --coverage",
+    "test:watch": "jest --watch",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --ext .js,.ts --fix",
+    "typecheck": "tsc --noEmit",
+    "prepublishOnly": "npm run lint && npm run typecheck && npm test && npm run build",
+    "clean": "node -e \"require('fs').rmSync('./dist',{recursive:true,force:true});require('fs').rmSync('./public',{recursive:true,force:true})\"",
+    "dev": "vite",
+    "build": "npm run clean && tsc -p tsconfig.build.json && vite build",
+    "preview": "vite preview"
+  },
+  "signalk": {
+    "appIcon": "./icons/icon-72x72.png",
+    "displayName": "Signalk-onvif-camera"
+  },
+  "keywords": [
+    "signalk-node-server-plugin",
+    "signalk-webapp",
+    "signalk-category-utility"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/KEGustafsson/signalk-onvif-camera"
+  },
+  "author": "Karl-Erik Gustafsson",
+  "license": "MIT",
+  "dependencies": {
+    "ws": "^8.0.0",
+    "xml2js": "^0.6.2"
+  },
+  "devDependencies": {
+    "@types/jest": "^30.0.0",
+    "@types/jquery": "^4.0.0",
+    "@types/node": "^25.5.0",
+    "@typescript-eslint/eslint-plugin": "^8.57.1",
+    "@typescript-eslint/parser": "^8.57.1",
+    "bootstrap": "^3.4.1",
+    "eslint": "^8.57.0",
+    "jest": "^29.7.0",
+    "ts-jest": "^29.4.6",
+    "typescript": "^5.9.3",
+    "vite": "^6.0.5"
+  }
+}