Improved WS reconnect closures and increased connection batching interval (#296)

Author: jvigliotta

package.json

@@ -32,7 +32,7 @@
     "mini-css-extract-plugin": "2.7.6",
     "moment": "2.30.1",
     "node-bourbon": "^4.2.3",
-    "openmct": "nasa/openmct#omm-r5.3.0-rc3",
+    "openmct": "nasa/openmct#omm-r5.3.1",
     "printj": "1.3.1",
     "raw-loader": "^0.5.1",
     "resolve-url-loader": "5.0.0",

src/AMMOSPlugins.js

@@ -96,7 +96,7 @@ define([
             openmct.install(RealtimeSessions.default());
 
             openmct.install(new HistoricalTelemetryPlugin(options));
-            openmct.install(new RealtimeTelemetryPlugin(vistaTime, options));
+            openmct.install(new RealtimeTelemetryPlugin.default(vistaTime, options));
             openmct.install(new TypePlugin.default());
             openmct.install(new TaxonomyPlugin(options.taxonomy));
             openmct.install(new LinkPlugin(options));

src/realtime/MCWSAlarmMessageStreamProvider.js

@@ -1,41 +1,23 @@
-/*global define*/
+import MCWSStreamProvider from './MCWSStreamProvider';
 
-define([
-    './MCWSStreamProvider'
-], function (
-    MCWSStreamProvider
-) {
-    'use strict';
-
-    /**
-     * Provides real-time streaming DataProduct data.
-     * @constructor
-     * @augments {MCWSStreamProvider}
-     * @memberof {vista/telemetry}
-     */
-    var MCWSAlarmMessageStreamProvider = MCWSStreamProvider.extend({
-        constructor: function (openmct, vistaTime) {
-            MCWSStreamProvider.call(this, openmct, vistaTime);
-        }
-    });
-
-    MCWSAlarmMessageStreamProvider.prototype.getUrl = function (domainObject) {
-        return domainObject.telemetry && domainObject.telemetry.alarmMessageStreamUrl;
-    };
+/**
+ * Provides real-time streaming DataProduct data.
+ * @memberof {vista/telemetry}
+ */
+class MCWSAlarmMessageStreamProvider extends MCWSStreamProvider {
+    getUrl(domainObject) {
+        return domainObject.telemetry?.alarmMessageStreamUrl;
+    }
 
-    MCWSAlarmMessageStreamProvider.prototype.getKey = function (domainObject) {
+    getKey(domainObject) {
         return domainObject.telemetry.key;
-    };
+    }
 
-    MCWSAlarmMessageStreamProvider.prototype.getProperty = function (domainObject) {
+    getProperty(domainObject) {
         return domainObject.telemetry.property;
-    };
-
-    MCWSAlarmMessageStreamProvider.prototype.notifyWorker = function (key, value) {
-        MCWSStreamProvider.prototype.notifyWorker.call(this, key, value);
-    };
+    }
 
-    MCWSAlarmMessageStreamProvider.prototype.subscribe = function (domainObject, callback, options) {
+    subscribe(domainObject, callback, options) {
         let { telemetry: { alarmLevel = 'any'} = {}} = domainObject;
         alarmLevel = alarmLevel.toUpperCase();
         let objects = [
@@ -74,13 +56,12 @@ define([
             object.telemetry.values = domainObject.telemetry.values;
         });
 
-        let unsubscribers = objects.map(object => MCWSStreamProvider.prototype.subscribe.call(this, object, callback, options));
+        let unsubscribers = objects.map(object => super.subscribe(object, callback, options));
 
         return () => {
             unsubscribers.forEach(unsubscribe => unsubscribe());
         };
-
     }
+}
 
-    return MCWSAlarmMessageStreamProvider;
-});
+export default MCWSAlarmMessageStreamProvider;

src/realtime/MCWSChannelStreamProvider.js

@@ -1,31 +1,21 @@
-/*global define*/
+import MCWSStreamProvider from './MCWSStreamProvider';
 
-define([
-    './MCWSStreamProvider'
-], function (
-    MCWSStreamProvider
-) {
-    'use strict';
+/**
+ * Provides real-time streaming channel data.
+ * @memberof {vista/telemetry}
+ */
+class MCWSChannelStreamProvider extends MCWSStreamProvider {
+    getUrl(domainObject) {
+        return domainObject.telemetry?.channelStreamUrl;
+    }
 
-    /**
-     * Provides real-time streaming channel data.
-     * @constructor
-     * @augments {MCWSStreamProvider}
-     * @memberof {vista/telemetry}
-     */
-    var MCWSChannelStreamProvider = MCWSStreamProvider.extend({});
-
-    MCWSChannelStreamProvider.prototype.getUrl = function (domainObject) {
-        return domainObject.telemetry && domainObject.telemetry.channelStreamUrl;
-    };
-
-    MCWSChannelStreamProvider.prototype.getKey = function (domainObject) {
+    getKey(domainObject) {
         return domainObject.telemetry.channel_id;
-    };
+    }
 
-    MCWSChannelStreamProvider.prototype.getProperty = function () {
+    getProperty() {
         return 'channel_id';
-    };
+    }
+}
 
-    return MCWSChannelStreamProvider;
-});
+export default MCWSChannelStreamProvider;

src/realtime/MCWSCommandStreamProvider.js

@@ -1,34 +1,24 @@
-/*global define*/
+import MCWSStreamProvider from './MCWSStreamProvider';
 
-define([
-    './MCWSStreamProvider'
-], function (
-    MCWSStreamProvider
-) {
-    'use strict';
+/**
+ * Provides real-time streaming CommandEvent data.
+ * @memberof {vista/telemetry}
+ */
+class MCWSCommandStreamProvider extends MCWSStreamProvider {
+    getUrl(domainObject) {
+        return domainObject.telemetry?.commandEventStreamUrl;
+    }
 
-    /**
-     * Provides real-time streaming CommandEvent data.
-     * @constructor
-     * @augments {MCWSStreamProvider}
-     * @memberof {vista/telemetry}
-     */
-    var MCWSCommandStreamProvider = MCWSStreamProvider.extend({});
-
-    MCWSCommandStreamProvider.prototype.getUrl = function (domainObject) {
-        return domainObject.telemetry && domainObject.telemetry.commandEventStreamUrl;
-    };
-
-    MCWSCommandStreamProvider.prototype.getKey = function (domainObject) {
+    getKey() {
         // We return undefined so that we can match on undefined properties.
         return undefined;
-    };
+    }
 
-    MCWSCommandStreamProvider.prototype.getProperty = function () {
+    getProperty() {
         // We just want something that returns undefined so it matches the
         // key above.  Hacky.
         return 'some_undefined_property';
-    };
+    }
+}
 
-    return MCWSCommandStreamProvider;
-});
+export default MCWSCommandStreamProvider;

src/realtime/MCWSDataProductStreamProvider.js

@@ -1,41 +1,31 @@
-/*global define*/
-
-define([
-    './MCWSStreamProvider'
-], function (
-    MCWSStreamProvider
-) {
-    'use strict';
-
-    /**
-     * Provides real-time streaming DataProduct data.
-     * @constructor
-     * @augments {MCWSStreamProvider}
-     * @memberof {vista/telemetry}
-     */
-    var MCWSDataProductStreamProvider = MCWSStreamProvider.extend({
-        constructor: function (openmct, vistaTime, options) {
-            this.options = options;
-            MCWSStreamProvider.call(this, openmct, vistaTime);
-        }
-    });
+import MCWSStreamProvider from './MCWSStreamProvider';
+
+/**
+ * Provides real-time streaming DataProduct data.
+ * @memberof {vista/telemetry}
+ */
+class MCWSDataProductStreamProvider extends MCWSStreamProvider {
+    constructor(openmct, vistaTime, options) {
+        super(openmct, vistaTime);
+        this.options = options;
+    }
 
-    MCWSDataProductStreamProvider.prototype.getUrl = function (domainObject) {
-        return domainObject.telemetry && domainObject.telemetry.dataProductStreamUrl;
-    };
+    getUrl(domainObject) {
+        return domainObject.telemetry?.dataProductStreamUrl;
+    }
 
-    MCWSDataProductStreamProvider.prototype.getKey = function (domainObject) {
+    getKey() {
         // We return undefined so that we can match on undefined properties.
         return undefined;
-    };
+    }
 
-    MCWSDataProductStreamProvider.prototype.getProperty = function () {
+    getProperty() {
         // We just want something that returns undefined so it matches the
         // key above.  Hacky.
         return 'some_undefined_property';
-    };
+    }
 
-    MCWSDataProductStreamProvider.prototype.subscribe = function (domainObject, callback, options) {
+    subscribe(domainObject, callback, options) {
         function wrappedCallback(datum) {
             let sessionId = datum.session_id;
 
@@ -53,18 +43,18 @@ define([
             callback(datum);
         }
 
-        return MCWSStreamProvider.prototype.subscribe.call(this, domainObject, wrappedCallback, options);   
+        return super.subscribe(domainObject, wrappedCallback, options);   
     }
 
-    MCWSDataProductStreamProvider.prototype.notifyWorker = function (key, value) {
+    notifyWorker(key, value) {
         if (key === 'subscribe' && this.options.realtimeProductAPIDs
             && value.mcwsVersion === 3.2) {
             value.extraFilterTerms = {
                 apid: '(' + this.options.realtimeProductAPIDs.join(',') + ')'
             };
         }
-        MCWSStreamProvider.prototype.notifyWorker.call(this, key, value);
-    };
+        super.notifyWorker(key, value);
+    }
+}
 
-    return MCWSDataProductStreamProvider;
-});
+export default MCWSDataProductStreamProvider;

src/realtime/MCWSEVRLevelStreamProvider.js

@@ -1,35 +1,38 @@
-/*global define*/
-
-define([
-    './MCWSStreamProvider',
-    'lodash'
-], function (
-    MCWSStreamProvider,
-    _
-) {
-    'use strict';
+import MCWSStreamProvider from './MCWSStreamProvider';
 
+/**
+ * Provides real-time streaming EVR data by level.
+ * @memberof {vista/telemetry}
+ */
+class MCWSEVRLevelStreamProvider extends MCWSStreamProvider {
     /**
-     * Provides real-time streaming EVR data by level.
-     * @constructor
-     * @augments {MCWSStreamProvider}
-     * @memberof {vista/telemetry}
+     * Get the URL for streaming data for this domain object
+     * @param {Object} domainObject The domain object
+     * @returns {String} The URL to use for streaming
      */
-    var MCWSEVRLevelStreamProvider = MCWSStreamProvider.extend({});
-
-    MCWSEVRLevelStreamProvider.prototype.getUrl = function (domainObject) {
-        if (domainObject.telemetry && domainObject.telemetry.level) {
+    getUrl(domainObject) {
+        if (domainObject.telemetry?.evrStreamUrl) {
             return domainObject.telemetry.evrStreamUrl;
         }
-    };
+    }
 
-    MCWSEVRLevelStreamProvider.prototype.getProperty = function (domainObject) {
+    /**
+     * Get the property to use for this stream
+     * @param {Object} domainObject The domain object
+     * @returns {String} The property name
+     */
+    getProperty() {
         return 'level';
-    };
+    }
 
-    MCWSEVRLevelStreamProvider.prototype.getKey = function (domainObject) {
+    /**
+     * Get the key to use for this stream
+     * @param {Object} domainObject The domain object
+     * @returns {String} The key
+     */
+    getKey(domainObject) {
         return domainObject.telemetry.level;
-    };
+    }
+}
 
-    return MCWSEVRLevelStreamProvider;
-});
+export default MCWSEVRLevelStreamProvider;