Fix remove/add datasource from/to timeSync causing start/end timestamp which were not updated correctly

demos/sweapi/webpack.config.js

@@ -37,7 +37,7 @@ const config = {
     toUrlUndefined: true
   },
   devServer: {
-    https: true,
+    https: false,
     compress: false,
     hot: true,
   },

source/core/datasource/TimeSeries.replay.datasource.js

@@ -24,18 +24,19 @@ import {Mode} from './Mode';
  *
  */
 class TimeSeriesReplayDatasource extends DataSource {
-    constructor(name, properties) {
+    constructor(name = 'DataSource', properties) {
         super(name, properties);
-
         this.setMinTime(properties.startTime);
         this.setMaxTime(properties.endTime);
+
         this.properties.startTimestamp = new Date(properties.startTime).getTime();
         this.properties.endTimestamp = new Date(properties.endTime).getTime();
 
         assertDefined(properties, 'Some properties must be defined');
         this.dataSynchronizer = undefined;
 
         this.properties.version = 0;
+
     }
 
     getTimeTopicId() {

source/core/timesync/replay/DataSynchronizer.replay.js

@@ -117,6 +117,13 @@ class DataSynchronizerReplay {
             this.properties.minTimestamp = this.properties.startTimestamp = st;
             this.properties.maxTimestamp = this.properties.endTimestamp = end;
         }
+
+        if(this.properties.startTimestamp < this.properties.minTimestamp || this.properties.startTimestamp > this.properties.maxTimestamp) {
+            this.properties.startTimestamp = this.properties.minTimestamp;
+        }
+        if(this.properties.endTimestamp > this.properties.maxTimestamp || this.properties.endTimestamp < this.properties.minTimestamp) {
+            this.properties.endTimestamp = this.properties.maxTimestamp;
+        }
     }
 
     /**
@@ -324,7 +331,9 @@ class DataSynchronizerReplay {
             // add dataSource to synchronizer algorithm
             return this.synchronizerWorker.postMessageWithAck({
                 message: 'add',
-                dataSources: [dataSourceForWorker]
+                dataSources: [dataSourceForWorker],
+                startTimestamp: this.getStartTimeAsTimestamp(),
+                endTimestamp: this.getEndTimeAsTimestamp()
             }).then(async () => {
                 if (await this.isConnected()) {
                     await dataSource.connect()
@@ -362,7 +371,8 @@ class DataSynchronizerReplay {
                 dataSourceIds: [dataSource.getId()],
                 startTimestamp: this.getStartTimeAsTimestamp(),
                 endTimestamp: this.getEndTimeAsTimestamp()
-            }).then(() => {
+            }).then(async () => {
+                await this.disconnect();
                 this.timeChanged();
                 this.onRemovedDataSource(dataSource.id);
             });

source/core/timesync/replay/DataSynchronizer.replay.worker.js

@@ -63,6 +63,11 @@ async function handleMessage(event) {
         } else if (event.data.message === 'add' && event.data.dataSources) {
             console.log('Add datasource to synchronizer..')
             addDataSources(event.data.dataSources);
+            if (dataSynchronizerAlgo instanceof DataSynchronizerAlgoReplay) {
+                dataSynchronizerAlgo.startTimestamp = event.data.startTimestamp;
+                dataSynchronizerAlgo.endTimestamp = event.data.endTimestamp;
+            }
+            reset();
         } else if (event.data.message === 'connect') {
             startMasterTimeInterval(masterTimeRefreshRate);
             dataSynchronizerAlgo.checkStart();
@@ -73,8 +78,10 @@ async function handleMessage(event) {
             console.log('Remove datasource from synchronizer algorithm..')
             await removeDataSources(event.data.dataSourceIds);
             if (dataSynchronizerAlgo instanceof DataSynchronizerAlgoReplay) {
+                dataSynchronizerAlgo.startTimestamp = event.data.startTimestamp;
                 dataSynchronizerAlgo.endTimestamp = event.data.endTimestamp;
             }
+            reset();
         } else if (event.data.message === 'current-time') {
             data = dataSynchronizerAlgo.getCurrentTimestamp();
         } else if (event.data.message === 'reset') {
@@ -191,14 +198,14 @@ function addDataSource(dataSource) {
  *
  * @param dataSourceIds
  */
-async function removeDataSources(dataSourceIds) {
+function removeDataSources(dataSourceIds) {
     for(let dataSourceId of dataSourceIds) {
-        await removeDataSource(dataSourceId);
+        removeDataSource(dataSourceId);
     }
 }
 
-async function removeDataSource(dataSourceId) {
-    await dataSynchronizerAlgo.removeDataSource(dataSourceId);
+function removeDataSource(dataSourceId) {
+    dataSynchronizerAlgo.removeDataSource(dataSourceId);
     // create a BC to push back the synchronized data into the DATA Stream.
     console.log('deleting BC for datasource '+dataSourceId);
     delete bcChannels[dataSourceId];

source/vue/components/RangeSlider.replay.vue

@@ -81,7 +81,6 @@ export default {
       }.bind(this);
 
       this.dataSynchronizer.onAddedDataSource = function (dataSourceId) {
-        console.log('onAdded')
         if (this.dataSynchronizer.getDataSources().length > 0 && isDefined(this.rangeSlider)) {
           // To disable
           this.rangeSlider.enable();

source/vue/components/TimeController.replay.vue

@@ -161,7 +161,7 @@ export default {
       return this.endTimestamp;
     },
     htmlCurrentTime() {
-      return this.parseTime(this.startTimestamp);
+       return this.parseTime(this.startTimestamp);
     },
     htmlEndTime() {
       return this.parseTime(this.endTimestamp);
@@ -178,9 +178,9 @@ export default {
     this.initComp();
   },
   methods: {
-    async initComp() {
+    initComp() {
       assertDefined(this.getDataSourceObject(), 'either dataSource properties or dataSynchronizer must be defined');
-      await this.checkInit();
+      this.checkInit();
       this.createTimeBc();
 
       // listen for datasource status
@@ -196,12 +196,12 @@ export default {
 
       if(isDefined(this.dataSynchronizer)) {
         this.dataSynchronizer.onAddedDataSource = async () => {
-          await this.checkInit();
+          this.checkInit();
         };
       }
 
     },
-    async checkInit() {
+    checkInit() {
       if (!this.init && this.dataSourceObject.getDataSources().length > 0) {
         try {
           this.dataSourceObject.isConnected().then(value => this.connected = value);
@@ -304,8 +304,7 @@ export default {
         this.rangeSliderInit = true;
         // HAS BEEN REPLACED
       }
-    }
-    ,
+    },
     doBackward() {
       if (!this.interval) {
         this.interval = setInterval(() => {