signalk-onvif-camera 1.1.1 → 1.1.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/README.md CHANGED
@@ -82,6 +82,7 @@ npm run lint # Lint with ESLint
82
82
  - v1.0.0: WebSocket noServer mode, build pipeline cleanup
83
83
  - v1.1.0: migrated TypeScript, hardened ONVIF discovery, auth, snapshot/MJPEG streaming, reconnect and shutdown behavior
84
84
  - v1.1.1: clean-up build output
85
+ - v1.1.2: small fixes
85
86
 
86
87
  ## Credits
87
88
 
package/dist/index.js CHANGED
@@ -28,6 +28,11 @@ const WebSocket = require('ws');
28
28
  const fs = require('fs');
29
29
  const path = require('path');
30
30
  const { validateDeviceAddress, validatePTZCommand } = require('./lib/utils/validation');
31
+ function hasUpgradeListenerServer(server) {
32
+ return Boolean(server
33
+ && typeof server.on === 'function'
34
+ && typeof server.removeListener === 'function');
35
+ }
31
36
  function isRecord(value) {
32
37
  return typeof value === 'object' && value !== null;
33
38
  }
@@ -182,11 +187,11 @@ module.exports = function createPlugin(app) {
182
187
  wsServer.close();
183
188
  wsServer = null;
184
189
  }
185
- if (upgradeHandler && app.server) {
190
+ if (upgradeHandler && hasUpgradeListenerServer(app.server)) {
186
191
  app.server.removeListener('upgrade', upgradeHandler);
187
192
  upgradeHandler = null;
188
193
  }
189
- if (app.server) {
194
+ if (hasUpgradeListenerServer(app.server)) {
190
195
  // Use noServer mode so we don't interfere with SignalK's own
191
196
  // WebSocket server on the same HTTP server. With the default
192
197
  // { server } option the ws library adds its own 'upgrade'
@@ -410,7 +415,7 @@ module.exports = function createPlugin(app) {
410
415
  });
411
416
  mjpegStreams.clear();
412
417
  closeActiveWsConnections();
413
- if (upgradeHandler && app.server) {
418
+ if (upgradeHandler && hasUpgradeListenerServer(app.server)) {
414
419
  app.server.removeListener('upgrade', upgradeHandler);
415
420
  upgradeHandler = null;
416
421
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "signalk-onvif-camera",
3
- "version": "1.1.1",
3
+ "version": "1.1.2",
4
4
  "description": "Signal K Onvif Camera Interface",
5
5
  "main": "dist/index.js",
6
6
  "files": [