dbm-graph-api 1.0.3 → 1.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dbm-graph-api",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "main": "index.js",
   "type": "module",
   "scripts": {
@@ -13,7 +13,10 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.693.0",
     "@aws-sdk/s3-request-presigner": "^3.693.0",
-    "dbm": "^1.0.3",
+    "dbm": "^1.0.4",
     "ws": "^8.18.0"
+  },
+  "optionalDependencies": {
+    "bufferutil": "^4.0.8"
   }
 }

package/src/dbm-graph-api/Api.js

@@ -49,7 +49,7 @@ export default class Api extends Dbm.core.BaseObject {
                     let user = Dbm.getInstance().repository.getItem("graphDatabase").controller.getUser(userId);
     
                     user.verifySession(value).then(function(aIsValidSession) {
-                        console.log("verifySession", aIsValidSession);
+                        //console.log("verifySession", aIsValidSession);
     
                         if(aIsValidSession) {
                             newWebSocketConnection.setInitialUser(userId);
@@ -69,4 +69,15 @@ export default class Api extends Dbm.core.BaseObject {
             newWebSocketConnection.setInitialUser(0);
         }
     }
+	
+	connectionClosed(aConnection) {
+		//console.log("connectionClosed");
+		let connections = [].concat(this.item.connections);
+		let index = connections.indexOf(aConnection.item);
+		if(index >= 0) {
+			connections.splice(index, 1);
+		}
+		
+		this.item.setValue("connections", connections);
+	}
 }

package/src/dbm-graph-api/UrlRequest.js

@@ -42,7 +42,7 @@ export default class UrlRequest extends Dbm.core.BaseObject {
 	}
 	
     outputEncodedData(aId, aData, aEncoding) {
-        console.log("UrlRequest::outputEncodedData");
+        //console.log("UrlRequest::outputEncodedData");
 		
 		this._encodedObjects.push({"id": aId, "data": aData, "encoding": aEncoding});
 		

package/src/dbm-graph-api/WebSocketConnection.js

@@ -8,6 +8,7 @@ export default class WebSocketConnection extends Dbm.core.BaseObject {
 
         this._callback_errorBound = this._callback_error.bind(this);
         this._callback_messageBound = this._callback_message.bind(this);
+		this._callback_closeBound = this._callback_close.bind(this);
     }
 
     setWebSocket(aWebSocket) {
@@ -32,7 +33,7 @@ export default class WebSocketConnection extends Dbm.core.BaseObject {
     }
 
     async _callback_message(aDataString) {
-        console.log('received: %s', aDataString);
+        //console.log('received: %s', aDataString);
     
         let data;
 
@@ -225,25 +226,52 @@ export default class WebSocketConnection extends Dbm.core.BaseObject {
 
                     this._webSocket.send(JSON.stringify({"type": "currentUser/response", "id": userId, "requestId": data["requestId"]}));
                     
+                }
+                break;
+            case "heartbeat":
+                {
+                    this._webSocket.send(JSON.stringify({"type": "heartbeat/response"}));
+                    
                 }
                 break;
         }	
     }
 
     _callback_error(aMessage) {
+		console.log("_callback_error");
         console.error(aMessage);
     }
+	
+    _callback_close() {
+		//console.log("_callback_close");
+		
+		if(this._webSocket) {
+			this._webSocket.off('error', this._callback_error);
+			this._webSocket.off('message', this._callback_messageBound);
+			this._webSocket.off('close', this._callback_closeBound);
+			this._webSocket = null;
+		}
+		
+		this._callback_errorBound = null;
+		this._callback_messageBound = null;
+		this._callback_closeBound = null;
+		
+		this.item.api.controller.connectionClosed(this);
+		this.item.setValue("api", null);
+		this.item.setValue("controller", null);
+	}
 
     addListeners() {
 
         this._webSocket.on('error', this._callback_error);
         this._webSocket.on('message', this._callback_messageBound);
+		this._webSocket.on('close', this._callback_closeBound);
 
         return this;
     }
 
     outputEncodedData(aId, aData, aEncoding) {
-        console.log("WebSocketConnection::outputEncodedData");
+        //console.log("WebSocketConnection::outputEncodedData");
 
         this._webSocket.send(JSON.stringify({"type": "updateEncodedObject", "id": aId, "data": aData, "encoding": aEncoding}));