1 files changed, 89 insertions, 53 deletions
diff --git a/sdnr/wt/odlux/framework/src/services/notificationService.ts b/sdnr/wt/odlux/framework/src/services/notificationService.ts
index b12c19985..85d3f716b 100644
--- a/sdnr/wt/odlux/framework/src/services/notificationService.ts
+++ b/sdnr/wt/odlux/framework/src/services/notificationService.ts
@@ -1,24 +1,31 @@
-/**
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt odlux
- * =================================================================================================
- * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. All rights reserved.
- * =================================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- * ============LICENSE_END==========================================================================
- */
+/**
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt odlux
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. All rights reserved.
+ * =================================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ * ============LICENSE_END==========================================================================
+ */
 import * as X2JS from 'x2js';
+import { ApplicationStore } from '../store/applicationStore';
+import { SetWebsocketAction } from '../actions/websocketAction';
 
 const socketUrl = [location.protocol === 'https:' ? 'wss://' : 'ws://', 'admin', ':', 'admin', '@', location.hostname, ':', location.port, '/websocket'].join('');
-const subscriptions: { [scope: string]: SubscriptionCallback[] } = { };
+const subscriptions: { [scope: string]: SubscriptionCallback[] } = {};
+let socketReady: Promise<WebSocket>;
+let userLoggedOut = false;
+let wasWebsocketConnectionEstablished: undefined | boolean;
+let applicationStore: ApplicationStore | null;
+
 
 export interface IFormatedMessage {
   notifType: string | null;
@@ -27,7 +34,7 @@ export interface IFormatedMessage {
 
 export type SubscriptionCallback<TMessage extends IFormatedMessage = IFormatedMessage> = (msg: TMessage) => void;
 
-function formatData(event: MessageEvent) : IFormatedMessage | undefined {
+function formatData(event: MessageEvent): IFormatedMessage | undefined {
 
   var x2js = new X2JS();
   var jsonObj: { [key: string]: IFormatedMessage } = x2js.xml2js(event.data);
@@ -35,7 +42,7 @@ function formatData(event: MessageEvent) : IFormatedMessage | undefined {
 
     const notifType = Object.keys(jsonObj)[0];
     const formated = jsonObj[notifType];
-    formated.notifType = notifType ;
+    formated.notifType = notifType;
     formated.time = new Date().toISOString();
     return formated;
   }
@@ -43,42 +50,31 @@ function formatData(event: MessageEvent) : IFormatedMessage | undefined {
 
 }
 
-export function subscribe<TMessage extends IFormatedMessage = IFormatedMessage>(scope: string | string[], callback: SubscriptionCallback<TMessage>): Promise<boolean> {
-  return socketReady.then((notificationSocket) => {
-    const scopes = scope instanceof Array ? scope : [scope];
+export function subscribe<TMessage extends IFormatedMessage = IFormatedMessage>(scope: string | string[], callback: SubscriptionCallback<TMessage>): boolean {
+  const scopes = scope instanceof Array ? scope : [scope];
 
-    // send all new scopes to subscribe
-    const newScopesToSubscribe: string[] = scopes.reduce((acc: string[], cur: string) => {
-      const currentCallbacks = subscriptions[cur];
-      if (currentCallbacks) {
-        if (!currentCallbacks.some(c => c === callback)) {
-          currentCallbacks.push(callback);
-        }
-      } else {
-        subscriptions[cur] = [callback];
-        acc.push(cur);
+  // send all new scopes to subscribe
+  const newScopesToSubscribe: string[] = scopes.reduce((acc: string[], cur: string) => {
+    const currentCallbacks = subscriptions[cur];
+    if (currentCallbacks) {
+      if (!currentCallbacks.some(c => c === callback)) {
+        currentCallbacks.push(callback);
       }
-      return acc;
-    }, []);
-
-    if (newScopesToSubscribe.length === 0) {
-      return true;
+    } else {
+      subscriptions[cur] = [callback];
+      acc.push(cur);
     }
+    return acc;
+  }, []);
 
-    // send a subscription to all active scopes
-    const scopesToSubscribe = Object.keys(subscriptions);
-    if (notificationSocket.readyState === notificationSocket.OPEN) {
-      const data = {
-        'data': 'scopes',
-        'scopes': scopesToSubscribe
-      };
-      notificationSocket.send(JSON.stringify(data));
-      return true;
-    }
-    return false;
-  });
+  if (newScopesToSubscribe.length === 0) {
+    return true;
+  }
+
+  return true;
 }
 
+
 export function unsubscribe<TMessage extends IFormatedMessage = IFormatedMessage>(scope: string | string[], callback: SubscriptionCallback<TMessage>): Promise<boolean> {
   return socketReady.then((notificationSocket) => {
     const scopes = scope instanceof Array ? scope : [scope];
@@ -107,6 +103,10 @@ export function unsubscribe<TMessage extends IFormatedMessage = IFormatedMessage
   });
 }
 
+export const startNotificationService = (store: ApplicationStore) => {
+  applicationStore = store;
+}
+
 const connect = (): Promise<WebSocket> => {
   return new Promise((resolve, reject) => {
     const notificationSocket = new WebSocket(socketUrl);
@@ -132,22 +132,58 @@ const connect = (): Promise<WebSocket> => {
     };
 
     notificationSocket.onerror = function (error) {
-      console.log("Socket error: " + error);
+      console.log("Socket error:");
+      console.log(error);
       reject("Socket error: " + error);
+      if (applicationStore) {
+        applicationStore.dispatch(new SetWebsocketAction(false));
+      }
     };
 
     notificationSocket.onopen = function (event) {
+      if (applicationStore) {
+        applicationStore.dispatch(new SetWebsocketAction(true));
+      }
       console.log("Socket connection opened.");
       resolve(notificationSocket);
+
+      // send a subscription to all active scopes
+      const scopesToSubscribe = Object.keys(subscriptions);
+      if (notificationSocket.readyState === notificationSocket.OPEN) {
+        const data = {
+          'data': 'scopes',
+          'scopes': scopesToSubscribe
+        };
+        notificationSocket.send(JSON.stringify(data));
+      };
     };
 
     notificationSocket.onclose = function (event) {
-      socketReady = connect();
+      console.log("socket connection closed");
+      if (applicationStore) {
+        applicationStore.dispatch(new SetWebsocketAction(false));
+      }
+      if (!userLoggedOut) {
+        socketReady = connect();
+      }
     };
   });
 }
 
-let socketReady = connect();
+
+
+
+export const startWebsocketSession = () => {
+  socketReady = connect();
+  userLoggedOut = false;
+}
+
+export const endWebsocketSession = () => {
+  socketReady.then(websocket => {
+    websocket.close();
+    userLoggedOut = true;
+  })
+}