Update dependencies

package.json

@@ -34,7 +34,7 @@
   "dependencies": {
     "@discordjs/uws": "10.149.0",
     "ammo.js": "kripken/ammo.js#ac08f42d3995cfa2b719aa8a9bb5b766c7f63404",
-    "better-sqlite3": "^6.0.1",
+    "better-sqlite3": "^7.4.3",
     "body-parser": "^1.18.2",
     "colors": "^1.2.1",
     "compression": "^1.7.2",
@@ -44,16 +44,16 @@
     "js-cookie": "^2.2.0",
     "msgpack-lite": "^0.1.26",
     "mustache-express": "^1.2.5",
-    "pako": "^1.0.10",
-    "react": "^16.13.1",
-    "react-dom": "^16.13.1",
+    "pako": "^2.0.4",
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2",
     "reconnecting-websocket": "^4.4.0",
     "request": "^2.88.0",
     "request-promise-native": "^1.0.7",
     "semver": "^7.1.0",
     "stats-js": "^1.0.0",
     "styled-components": "^5.1.0",
-    "three": "^0.123.0",
+    "three": "^0.132.0",
     "uWebSockets.js": "uNetworking/uWebSockets.js#v17.3.0"
   },
   "optionalDependencies": {

src/client/chat/chat.js

@@ -21,6 +21,17 @@ function inIframe() {
 	}
 }
 
+function getParsedUserDataCookie() {
+	try {
+		const cookie = Cookies.get("user_data");
+		if (cookie) {
+			return JSON.parse(cookie);
+		}
+	} catch (err) {
+		console.warn("Could not parse user_data cookie. Will assume it was empty...", err);
+	}
+}
+
 domReady.then(() => {
 	// String formatted timestamp
 	let timestamp = function() {
@@ -45,7 +56,7 @@ domReady.then(() => {
 	let chatMessageTemplate = document.getElementById("messageTemplate");
 
 	// Check for former authentication
-	cookieData = Cookies.getJSON("user_data");
+	cookieData = getParsedUserDataCookie();
 	checkAuthentication();
 
 	let lastMessageSent = Date.now();
@@ -181,7 +192,7 @@ function authenticationWindow() {
 window.addEventListener("message", receiveMessage, false);
 function receiveMessage(event) {
 	if (event.data && event.data.success && event.origin === window.location.origin) {
-		cookieData = Cookies.getJSON("user_data");
+		cookieData = getParsedUserDataCookie();
 		authWindow.close();
 		checkAuthentication();
 
@@ -226,7 +237,8 @@ function checkAuthentication() {
 						expires: days,
 						path: "/",
 						domain: window.location.hostname,
-						secure: config.ssl
+						secure: config.ssl,
+						SameSite: "Strict"
 					});
 					cookieData = response.tokenBody;
 				}

src/client/chat/discord-api-redirect.js

@@ -14,11 +14,12 @@ domReady.then(() => {
 			let user_data = JSON.parse(response);
 
 			let days = (user_data.expires_in / 62400) - 0.1; // seconds to days minus some slack
-			Cookies.set("user_data", user_data, {
+			Cookies.set("user_data", response, {
 				expires: days,
 				path: "/",
 				domain: window.location.hostname,
-				secure: config.ssl
+				secure: config.ssl,
+				sameSite: "strict"
 			});
 
 			window.opener.postMessage({

src/client/editor/log.js

@@ -7,6 +7,11 @@ export function setEditorLogElement(el) {
 }
 
 export function editorLog(message, type = "info") {
+	if (console[type]) {
+		console[type](message);
+	} else {
+		console.info(message);
+	}
 	element.insertAdjacentHTML(
 		"beforeend",
 		`<div class='${type}'>[${currentTimeString()}] ${message}</div>`

src/client/editor/models.js

@@ -1,10 +1,9 @@
 import {
 	Vector3,
 	Matrix4,
-	Geometry,
-	BufferGeometry,
 	Group
 } from "three";
+import * as BufferGeometryUtils from "three/examples/jsm/utils/BufferGeometryUtils.js";
 import { GLTFLoader } from "three/examples/jsm/loaders/GLTFLoader.js";
 import { DRACOLoader } from "three/examples/jsm/loaders/DRACOLoader.js";
 import { ConvexGeometry } from "three/examples/jsm/geometries/ConvexGeometry";
@@ -160,13 +159,10 @@ Model.prototype.getConvexHull = function() {
 			let vertexArray = _getVertices(this.sceneObject);
 			this.convexHull = new ConvexGeometry(vertexArray); // Could throw an error if input is not valid
 			if(this.convexHull) {
-				this.projectData.convexData = [];
-				for(let i = 0; i < this.convexHull.vertices.length; i++) {
-					this.projectData.convexData.push(this.convexHull.vertices[i].x);
-					this.projectData.convexData.push(this.convexHull.vertices[i].y);
-					this.projectData.convexData.push(this.convexHull.vertices[i].z);
-				}
-				this.convexHull = new BufferGeometry().fromGeometry(this.convexHull);
+				// Clone the data
+				this.projectData.convexData = Float32Array.from(
+					this.convexHull.attributes.position.array
+				);
 			} else {
 				this.convexHull = false;
 			}
@@ -178,27 +174,25 @@ Model.prototype.getConvexHull = function() {
 	return this.convexHull;
 };
 
-// Recursive function: Returns one Geometry object of all combined geometries within the passed object
+// Recursive function: Returns one BufferGeometry object of all combined geometries within the passed object
 function _combineGeometry(obj) {
-	let geo = new Geometry();
+	let geo;
 
 	// obj.matrix isn't guaranteed to be up-to-date
 	let matrix = new Matrix4().identity();
 	matrix = matrix.compose(obj.position, obj.quaternion, obj.scale);
 
 	if(obj.type === "Mesh") {
-		let objGeo = obj.geometry;
-		// BufferGeometry needs to be converted before merging
-		if(objGeo.type === "BufferGeometry") {
-			objGeo = new Geometry().fromBufferGeometry(objGeo);
-		}
-		objGeo.mergeVertices(); // Never hurts, right?
-		geo.merge(objGeo, matrix);
+		geo = BufferGeometryUtils.mergeVertices(obj.geometry).applyMatrix4(matrix);
 	}
 
 	for(let c = 0; c < obj.children.length; c++) {
-		let childGeo = _combineGeometry(obj.children[c]);
-		geo.merge(childGeo, matrix);
+		const childGeo = _combineGeometry(obj.children[c]);
+		if (geo) {
+			geo.merge(childGeo);
+		} else {
+			geo = childGeo;
+		}
 	}
 
 	return geo;
@@ -211,20 +205,9 @@ Model.prototype.getConcaveGeometry = function() {
 		this.concaveGeo = _combineGeometry(this.sceneObject);
 		if(this.concaveGeo) {
 			this.projectData.concaveData = {
-				vertices: [],
-				indices: []
+				vertices: Float32Array.from(this.concaveGeo.attributes.position.array),
+				indices: Float32Array.from(this.concaveGeo.index.array)
 			};
-			for(let i = 0; i < this.concaveGeo.vertices.length; i++) {
-				this.projectData.concaveData.vertices.push(this.concaveGeo.vertices[i].x);
-				this.projectData.concaveData.vertices.push(this.concaveGeo.vertices[i].y);
-				this.projectData.concaveData.vertices.push(this.concaveGeo.vertices[i].z);
-			}
-			for(let i = 0; i < this.concaveGeo.faces.length; i++) {
-				this.projectData.concaveData.indices.push(this.concaveGeo.faces[i].a);
-				this.projectData.concaveData.indices.push(this.concaveGeo.faces[i].b);
-				this.projectData.concaveData.indices.push(this.concaveGeo.faces[i].c);
-			}
-			this.concaveGeo = new BufferGeometry().fromGeometry(this.concaveGeo);
 		} else {
 			this.concaveGeo = false;
 		}

src/client/editor/prefabs.js

@@ -2,7 +2,7 @@ import {
 	Group,
 	Vector3,
 	Mesh,
-	Geometry,
+	BufferGeometry,
 	BoxBufferGeometry,
 	SphereBufferGeometry,
 	CylinderBufferGeometry,
@@ -473,7 +473,7 @@ PrefabCollider.prototype.setShape = function(shapeType) {
 			model: null,
 			convex: true
 		};
-		this.sceneObject.geometry = new Geometry();
+		this.sceneObject.geometry = new BufferGeometry();
 		break;
 	default:
 		console.error(`Attempted to set unknown collider shape type ${shapeType}`);
@@ -524,7 +524,7 @@ PrefabCollider.prototype.setModel = function(modelName) {
 	// Remove from references
 	if(this.colliderData.model) {
 		delete modelsTab.models[this.colliderData.model].prefabEntities[this.uuid];
-		this.sceneObject.geometry = new Geometry();
+		this.sceneObject.geometry = new BufferGeometry();
 		this.colliderData.model = null;
 		this.colliderData.convex = true;
 	}
@@ -561,7 +561,7 @@ PrefabCollider.prototype.setConvex = function(isConvex) {
 		editorLog(`Failed to switch collider to ${isConvex ? "convex" : "concave"}.`, "error");
 		// Reset collider data so it stays valid
 		delete modelsTab.models[this.colliderData.model].prefabEntities[this.uuid];
-		this.sceneObject.geometry = new Geometry();
+		this.sceneObject.geometry = new BufferGeometry();
 		this.colliderData.model = null;
 		this.colliderData.convex = true;
 	}

src/client/user-state.js

@@ -1,19 +1,29 @@
-import * as Cookies from "js-cookie";
+import Cookies from "js-cookie";
+
+function getParsedUserDataCookie() {
+	try {
+		const cookie = Cookies.get("user_data");
+		if (cookie) {
+			return JSON.parse(cookie);
+		}
+	} catch (err) {
+		console.warn("Could not parse user_data cookie. Will assume it was empty...", err);
+	}
+}
 
 window.addEventListener("message", function(event) {
 	// Don't parse anything that isn't ours
 	if (event.origin !== window.location.origin) return;
 
 	// If the authorization state has changed, update the user data
 	if (event.data === userState.AUTH_CHANGED) {
-		userState.data = Cookies.getJSON("user_data");
+		userState.data = getParsedUserDataCookie();
 	}
 }, false);
 
-let userState = {
+const userState = {
 	AUTH_CHANGED: 0,
-
-	data: Cookies.getJSON("user_data")
+	data: getParsedUserDataCookie()
 };
 
 export { userState };