dbm 1.0.1 → 1.0.2

package/graphapi/webclient/ApiConnection.js

@@ -0,0 +1,110 @@
+import Dbm from "../../index.js";
+
+export default class ApiConnection extends Dbm.core.BaseObject {
+    _construct() {
+        super._construct();
+
+        this._url = null;
+		this._setupItemResponseBound = this._setupItemResponse.bind(this);
+    }
+
+    setup(aUrl) {
+		
+        this._url = aUrl;
+		
+		return this;
+    }
+
+    _getRequestItem() {
+
+        let request = new Dbm.graphapi.webclient.ApiRequest();
+        request.item.setValue("status", Dbm.loading.LoadingStatus.NOT_STARTED);
+        request.item.setValue("connection", this.item); 
+
+        return request.item;
+    }
+
+    requestRange(aSelect, aEncode) {
+        let item = this._getRequestItem();
+        
+        
+        return item;
+    }
+
+    requestItem(aId, aEncode) {
+        let item = this._getRequestItem();
+        
+        
+        return item;
+    }
+
+    requestData(aFunctionName, aData) {
+        let item = this._getRequestItem();
+        
+        
+        return item;
+    }
+
+    createItem(aTypes, aVisibility = "draft", aChanges = [], aEncode = []) {
+        let item = this._getRequestItem();
+        
+
+        return item;
+    }
+
+    editItem(aId, aChanges, aEncode = []) {
+        let item = this._getRequestItem();
+        
+
+        return item;
+    }
+	
+	_updateObjects(aObjects) {
+		let repository = Dbm.getInstance().repository;
+		
+		let currentArray = aObjects;
+		let currentArrayLength = currentArray.length;
+		for(let i = 0; i < currentArrayLength; i++) {
+			let data = currentArray[i];
+            let item = repository.getItem(data["id"]);
+            let decoder = repository.getItemIfExists("graphApi/decode/" + data["encoding"]);
+            if(decoder) {
+                decoder.controller.updateItemWithEncoding(item, data["data"]);
+            }
+            else {
+                console.warn("No decoder for " + data["encoding"]);
+            }
+		}
+	}
+	
+	_setupItemResponse(aRequestItem, aData) {
+		this._updateObjects(aData.objects);
+		
+		let repository = Dbm.getInstance().repository;
+		
+		let id = aData.data.id;
+		if(id) {
+			aRequestItem.setValue("item", repository.getItem(id));
+		}
+		else {
+			aRequestItem.setValue("item", null);
+		}
+		
+		aRequestItem.status = 1;
+	}
+
+    requestUrl(aUrl) {
+		
+        let item = this._getRequestItem();
+        
+		let fullUrl = this._url + "url?url=" + encodeURIComponent(aUrl);
+		fetch(fullUrl).then((aRequest) => {
+			return aRequest.json();
+		}).then((aData) => {
+			this._setupItemResponseBound(item, aData);
+		});
+        
+        return item;
+    }
+
+}

package/graphapi/webclient/ApiRequest.js

@@ -0,0 +1,30 @@
+import Dbm from "../../index.js";
+
+export default class ApiRequest extends Dbm.core.BaseObject {
+    _construct() {
+        super._construct();
+
+    }
+
+    get processPromise() {
+        if(this.item.status === Dbm.loading.LoadingStatus.LOADED) {
+            return Promise.resolve(this.item);
+        }
+        if(this.item.status === Dbm.loading.LoadingStatus.LOADING || this.item.status === Dbm.loading.LoadingStatus.NOT_STARTED) {
+            if(!this.item.processPromise) {
+                let resolveCommand = Dbm.commands.resolvePromise(this.item);
+                this.item.setValue("doneCommands", [resolveCommand]);
+                let rejectCommand = Dbm.commands.callFunction(resolveCommand.item.reject, []);
+                this.item.setValue("errorCommands", [rejectCommand]);
+    
+                //METODO: change these to addToArray
+
+                this.item.setValue("processPromise", resolveCommand.item.promise);
+            }
+            
+            return this.item.processPromise;
+        }
+        
+        return Promise.reject();
+    }
+}

package/graphapi/webclient/GraphApi.js

@@ -0,0 +1,61 @@
+import Dbm from "../../index.js";
+
+export default class GraphApi extends Dbm.core.BaseObject {
+    _construct() {
+        super._construct();
+
+		this._websocketConnection = null;
+		this._apiConnection = null;
+    }
+	
+	setWebsocketConnection(aConnection) {
+		this._websocketConnection = aConnection;
+		
+		return this;
+	}
+	
+	setApiConnection(aConnection) {
+		this._apiConnection = aConnection;
+		
+		return this;
+	}
+	
+    requestRange(aSelect, aEncode) {
+        return this._websocketConnection.requestRange(aSelect, aEncode);
+    }
+
+    requestItem(aId, aEncode) {
+        return this._websocketConnection.requestItem(aId, aEncode);
+    }
+
+    requestData(aFunctionName, aData) {
+        return this._websocketConnection.requestData(aFunctionName, aData);
+    }
+
+    createItem(aTypes, aVisibility = "draft", aChanges = [], aEncode = []) {
+        return this._websocketConnection.createItem(aTypes, aVisibility, aChanges, aEncode);
+    }
+
+    editItem(aId, aChanges, aEncode = []) {
+        return this._websocketConnection.editItem(aId, aChanges, aEncode);
+    }
+
+	requestUrl(aUrl) {
+		//console.log("requestUrl");
+		//console.log(aUrl);
+		
+		if(this._websocketConnection && this._websocketConnection.item.status === 1) {
+			return this._websocketConnection.requestUrl(aUrl);
+		}
+		
+		return this._apiConnection.requestUrl(aUrl);
+	}
+	
+    signIn(aToken) {
+        return this._websocketConnection.signIn(aToken);
+    }
+
+    signOut() {
+        return this._websocketConnection.signOut();
+    }
+}

package/graphapi/webclient/WebSocketConnection.js

@@ -60,7 +60,7 @@ export default class WebSocketConnection extends Dbm.core.BaseObject {
     }
 
     requestData(aFunctionName, aData) {
-        console.log("requestData");
+        //console.log("requestData");
         let item = this._getRequestItem();
         item.setValue("requestData", {"type": "data", "functionName": aFunctionName, "data": aData, "requestId": item.id});
         this._runRequest(item);
@@ -85,6 +85,7 @@ export default class WebSocketConnection extends Dbm.core.BaseObject {
     }
 
     requestUrl(aUrl) {
+		
         let item = this._getRequestItem();
         item.setValue("requestData", {"type": "url", "url": aUrl, "requestId": item.id});
         this._runRequest(item);

package/graphapi/webclient/index.js

@@ -1,4 +1,7 @@
 export {default as WebSocketConnection} from "./WebSocketConnection.js";
 export {default as WebSocketRequest} from "./WebSocketRequest.js";
+export {default as GraphApi} from "./GraphApi.js";
+export {default as ApiConnection} from "./ApiConnection.js";
+export {default as ApiRequest} from "./ApiRequest.js";
 
 export * as decode from "./decode/index.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dbm",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "main": "index.js",
   "type": "module",
   "scripts": {},