odsl-javascript-sdk 1.0.1 → 1.0.3

package/README.md

@@ -4,7 +4,7 @@ The Javascript SDK for the [OpenDataDSL](https://opendatadsl.com) data managemen
 ## Installation
 You can install the ODSL Javascript SDK from [npm](https://www.npmjs.com/package/odsl-javascript-sdk):
 
-    npm i odsl-javascipt-sdk
+    npm i odsl-javascript-sdk
 
 ## About
 This javascript SDK for OpenDataDSL has the following features:
@@ -40,36 +40,35 @@ ODSL.loginWithSecret(config).then(function(odsl) {
 ### Finding master data
 
 ```js
-objects = ODSL.list('object', 'public', 'source=ECB')
-# objects is a JSON object wrapper containing status, statusText and body
-print(objects.body[0])
+objects = ODSL.list('object', 'public', {"source":"ECB"})
+print(objects[0])
 ```
 
 ### Getting master data
 
 ```js
 obj = ODSL.get('object', 'public', '#ECB')
-print(obj.body['description'])
+print(obj['description'])
 ```
 
 ### Getting a timeseries
 ```js
 ts = ODSL.get('data', 'public', '#ABN_FX.EURUSD:SPOT')
-print(ts.body)
+print(ts)
 ```
 
 ### Updating some private master data
 ```js
-var = {
-    '_id': 'AAA.PYTHON',
-    'name': 'Python Example'
+var body = {
+	"_id":"AAA.JS",
+	"name": "Javascript Update Object"
 }
-ODSL.update('object', 'private', var)
+ODSL.update('object', 'private', body)
 ```
 
 ### Reading and updating some private master data
 ```js
 po = ODSL.get('object', 'private', 'AAA.TEST')
-po.body['description'] = 'Updated from Javascript'
-ODSL.update('object', 'private', po.body)
+po['description'] = 'Updated from Javascript'
+ODSL.update('object', 'private', po)
 ```

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "odsl-javascript-sdk",
   "type": "module",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "Javascript SDK for OpenDataDSL",
   "main": "src/sdk.js",
   "scripts": {
     "test": "mocha test/test.js",
+    "testUpdate": "mocha test/testUpdate.js",
     "npm:publish": "npm publish"
   },
   "repository": {
@@ -25,12 +26,11 @@
   },
   "homepage": "https://github.com/OpenDataDSL/odsl-javascript-sdk#readme",
   "dependencies": {
-    "@azure/msal-browser": "^3.11.1",
     "@azure/msal-node": "^2.6.6",
-    "mocha": "^10.4.0",
     "xmlhttprequest": "^1.8.0"
   },
   "devDependencies": {
+    "mocha": "^10.4.0",
     "dotenv": "^16.4.5"
   }
 }

package/src/sdk.js

@@ -42,26 +42,22 @@ export default class ODSL {
 			console.log("Token Acquisition Failed: " + err);
 		}
 	}
+	static async loginWithToken(token) {
+		return new ODSL({accessToken:token});
+	}
 	get(service, source, id) {
 		try {
 			var xhttp = new XMLHttpRequest();
-			var url = this.host + service + "/v1/" + source + "/" + id;
+			id = encodeURIComponent(id);
+			var url = new URL(this.host + service + "/v1/" + source + "/" + id);
 			xhttp.open("GET", url, false);
 			xhttp.setRequestHeader("Authorization", "Bearer " + this.token);
 			xhttp.responseType = "json";
 			xhttp.send();
-			if (xhttp.status != 200) {
-				return {
-					status: xhttp.status,
-					statusText: xhttp.getResponseHeader("x-odsl-error"),
-					body: undefined
-				};	
+			if (xhttp.status < 200 || xhttp.status >= 300) {
+				throw xhttp.getResponseHeader("x-odsl-error");
 			}
-			return {
-				status: xhttp.status,
-				statusText: xhttp.statusText,
-				body: JSON.parse(xhttp.responseText)
-			};
+			return JSON.parse(xhttp.responseText);
 		} catch (err) {
 			console.log("GET request Failed: " + err);			
 		}
@@ -69,28 +65,56 @@ export default class ODSL {
 	getAsync(service, source, id, callback) {
 		try {
 			var xhttp = new XMLHttpRequest();
-			var url = this.host + service + "/v1/" + source + "/" + id;
+			id = encodeURIComponent(id);
+			var url = new URL(this.host + service + "/v1/" + source + "/" + id);
 			xhttp.open("GET", url);
 			xhttp.setRequestHeader("Authorization", "Bearer " + this.token);
 			xhttp.responseType = "json";
 			xhttp.send();
 			xhttp.onload = function() {
-				if (xhttp.status != 200) {
-					callback({
-						status: xhttp.status,
-						statusText: xhttp.getResponseHeader("x-odsl-error"),
-						body: undefined
-					});	
+				if (xhttp.status < 200 || xhttp.status >= 300) {
+					throw xhttp.getResponseHeader("x-odsl-error");
 				} else {
-					callback({
-						status: xhttp.status,
-						statusText: xhttp.statusText,
-						body: JSON.parse(xhttp.responseText)
-					});
+					callback(JSON.parse(xhttp.responseText));
 				}
 			}
 		} catch (err) {
 			console.log("GET request Failed: " + err);			
 		}
 	}
+	list(service, source, filter) {
+		try {
+			var xhttp = new XMLHttpRequest();
+			var url = new URL(this.host + service + "/v1/" + source);
+			if (filter != undefined) {
+				url.searchParams.set("_filter", JSON.stringify(filter));
+			}
+			xhttp.open("GET", url, false);
+			xhttp.setRequestHeader("Authorization", "Bearer " + this.token);
+			xhttp.responseType = "json";
+			xhttp.send();
+			if (xhttp.status < 200 || xhttp.status >= 300) {
+				throw xhttp.getResponseHeader("x-odsl-error");
+			}
+			return JSON.parse(xhttp.responseText);
+		} catch (err) {
+			console.log("GET request Failed: " + err);			
+		}
+	}
+	update(service, source, body) {
+		try {
+			var xhttp = new XMLHttpRequest();
+			var url = new URL(this.host + service + "/v1/" + source);
+			xhttp.open("POST", url, false);
+			xhttp.setRequestHeader("Authorization", "Bearer " + this.token);
+			xhttp.responseType = "json";
+			xhttp.send(JSON.stringify(body));
+			if (xhttp.status < 200 || xhttp.status >= 300) {
+				throw xhttp.getResponseHeader("x-odsl-error");
+			}
+			return JSON.parse(xhttp.responseText);
+		} catch (err) {
+			console.log("GET request Failed: " + err);			
+		}
+	}
 }