ENHANCEMENT: added required header

WIP: Automatically select previous server
2023-03-20 19:14:35 +01:00 · 2023-03-20 17:03:17 +01:00
4 changed files with 143 additions and 20 deletions
--- a/package-lock.json
+++ b/package-lock.json
@ -7,6 +7,9 @@
 		"": {
 			"name": "blackbirdchess-client-web",
 			"version": "0.0.1",
+			"dependencies": {
+				"axios": "^1.3.4"
+			},
 			"devDependencies": {
 				"@playwright/test": "^1.28.1",
 				"@skeletonlabs/skeleton": "^1.0.0",
@ -1036,6 +1039,11 @@
 				"node": "*"
 			}
 		},
+		"node_modules/asynckit": {
+			"version": "0.4.0",
+			"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+			"integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
+		},
 		"node_modules/autoprefixer": {
 			"version": "10.4.14",
 			"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.14.tgz",
@ -1069,6 +1077,16 @@
 				"postcss": "^8.1.0"
 			}
 		},
+		"node_modules/axios": {
+			"version": "1.3.4",
+			"resolved": "https://registry.npmjs.org/axios/-/axios-1.3.4.tgz",
+			"integrity": "sha512-toYm+Bsyl6VC5wSkfkbbNB6ROv7KY93PEBBL6xyDczaIHasAiv4wPqQ/c4RjoQzipxRD2W5g21cOqQulZ7rHwQ==",
+			"dependencies": {
+				"follow-redirects": "^1.15.0",
+				"form-data": "^4.0.0",
+				"proxy-from-env": "^1.1.0"
+			}
+		},
 		"node_modules/balanced-match": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
@ -1289,6 +1307,17 @@
 			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
 			"dev": true
 		},
+		"node_modules/combined-stream": {
+			"version": "1.0.8",
+			"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+			"integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+			"dependencies": {
+				"delayed-stream": "~1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.8"
+			}
+		},
 		"node_modules/concat-map": {
 			"version": "0.0.1",
 			"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@ -1383,6 +1412,14 @@
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
+		"node_modules/delayed-stream": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+			"integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+			"engines": {
+				"node": ">=0.4.0"
+			}
+		},
 		"node_modules/detect-indent": {
 			"version": "6.1.0",
 			"resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.1.0.tgz",
@ -1841,6 +1878,38 @@
 			"integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
 			"dev": true
 		},
+		"node_modules/follow-redirects": {
+			"version": "1.15.2",
+			"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
+			"integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
+			"funding": [
+				{
+					"type": "individual",
+					"url": "https://github.com/sponsors/RubenVerborgh"
+				}
+			],
+			"engines": {
+				"node": ">=4.0"
+			},
+			"peerDependenciesMeta": {
+				"debug": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/form-data": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+			"integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+			"dependencies": {
+				"asynckit": "^0.4.0",
+				"combined-stream": "^1.0.8",
+				"mime-types": "^2.1.12"
+			},
+			"engines": {
+				"node": ">= 6"
+			}
+		},
 		"node_modules/fraction.js": {
 			"version": "4.2.0",
 			"resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz",
@ -2301,6 +2370,25 @@
 				"node": ">=10.0.0"
 			}
 		},
+		"node_modules/mime-db": {
+			"version": "1.52.0",
+			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+			"integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/mime-types": {
+			"version": "2.1.35",
+			"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+			"integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+			"dependencies": {
+				"mime-db": "1.52.0"
+			},
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
 		"node_modules/min-indent": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
@ -2752,6 +2840,11 @@
 				"svelte": "^3.2.0"
 			}
 		},
+		"node_modules/proxy-from-env": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+			"integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
+		},
 		"node_modules/punycode": {
 			"version": "2.3.0",
 			"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
--- a/package.json
+++ b/package.json
@ -26,17 +26,20 @@
 		"eslint-config-prettier": "^8.5.0",
 		"eslint-plugin-svelte3": "^4.0.0",
 		"postcss": "^8.4.14",
+		"postcss-load-config": "^4.0.1",
 		"prettier": "^2.8.0",
 		"prettier-plugin-svelte": "^2.8.1",
 		"svelte": "^3.54.0",
 		"svelte-check": "^3.0.1",
+		"svelte-preprocess": "^4.10.7",
 		"tailwindcss": "^3.1.5",
 		"tslib": "^2.4.1",
 		"typescript": "^4.9.3",
 		"vite": "^4.0.0",
-		"vitest": "^0.25.3",
-		"postcss-load-config": "^4.0.1",
-		"svelte-preprocess": "^4.10.7"
+		"vitest": "^0.25.3"
 	},
-	"type": "module"
+	"type": "module",
+	"dependencies": {
+		"axios": "^1.3.4"
+	}
 }
--- a/src/routes/account/login/Server.svelte
+++ b/src/routes/account/login/Server.svelte
@ -17,13 +17,23 @@

 <script lang="js">
    import { urls } from "../../../stores.js";
-    import { createEventDispatcher } from 'svelte';
+    import {createEventDispatcher, onMount} from 'svelte';
+    import {browser} from "$app/environment";
+    import { requestor, setBaseUrl } from "../../../serverrequest.js";

    export let globals;
-    const dispatch = createEventDispatcher();

    var loginserver;
-    function handleSelectServer() {
+    const dispatch = createEventDispatcher();
+
+    onMount(() => {
+        if(sessionStorage.getItem('serverurl') != undefined) {
+            loginserver = sessionStorage.getItem('serverurl');
+            handleSelectServer();
+        }
+    })
+
+    async function handleSelectServer() {
        if(!isValidHttpUrl(loginserver)) {
            loginserver = 'https://' + loginserver;
            if(!isValidHttpUrl(loginserver)) {
@ -31,19 +41,20 @@
            }
        }
        console.log("Selected server: " + loginserver);
-        fetch(loginserver + urls.capabilities)
-            .then((response) => {
-                if (!response.ok) return dispatch('message', {text: 'This server is not a Blackbird Chess server'})
-                return response.json()
-            })
-            .then((data) => {
-                if(!data.login) return dispatch('message', {text: 'This server is unavailable for login currently'})
-                globals.server.url = loginserver;
-                globals.server.caps = data;
-            })
-            .catch((error) => {
-                return dispatch('message', {text: 'This server is not a Blackbird Chess server'})
-            });
+        setBaseUrl(loginserver);
+
+        try {
+            let response = await requestor.get(urls.capabilities);
+            let data = JSON.parse(response.data);
+            if(!data.login) return dispatch('message', {text: 'This server is unavailable for login currently'})
+            globals.server.url = loginserver;
+            globals.server.caps = data;
+            if(browser) {
+                sessionStorage.setItem('serverurl', loginserver);
+            }
+        } catch (error) {
+            return dispatch('message', {text: 'This server is not a Blackbird Chess server'})
+        }
    }

    function isValidHttpUrl(string) {
--- a/src/serverrequest.js
+++ b/src/serverrequest.js
@ -0,0 +1,16 @@
+import {Axios} from "axios";
+
+var options = {
+    headers: {
+        'X-BlackbirdChessClient': 'webclient'
+    }
+}
+
+/**
+ * @param {string} url
+ */
+export function setBaseUrl(url) {
+    options.baseURL = url;
+    requestor = new Axios(options)
+}
+export let requestor = new Axios(options);
Author	SHA1	Message	Date
Jeroen De Meerleer	307bca7678	ENHANCEMENT: added required header	2023-03-20 19:14:35 +01:00
Jeroen De Meerleer	d43649a4b3	WIP: Automatically select previous server	2023-03-20 17:03:17 +01:00