argon support wooo!! also ccrendertexture for better performance

Author: FireMario211

CMakeLists.txt

@@ -35,6 +35,7 @@ endif()
 add_subdirectory($ENV{GEODE_SDK} ${CMAKE_CURRENT_BINARY_DIR}/geode)
 
 CPMAddPackage("gh:FireMario211/dashauth#main")
-target_link_libraries(${PROJECT_NAME} DashAuth)
+CPMAddPackage("gh:GlobedGD/[email protected]")
+target_link_libraries(${PROJECT_NAME} DashAuth argon)
 
 setup_geode_mod(${PROJECT_NAME})

changelog.md

@@ -1,3 +1,6 @@
+# v1.4.7
+- Previews now use CCRenderTexture to optimize performance on large amounts of objects. (New setting: Pre-Render Object Capacity & Pre-Render Full View)
+- Replaced GDAuth with argon
 # v1.4.6
 - Sapphire SDK support
 # v1.4.5

mod.json

@@ -1,5 +1,5 @@
 {
-	"geode": "4.4.0",
+	"geode": "4.5.0",
 	"gd": {
 		"win": "2.2074",
 		"android": "2.2074",
@@ -8,7 +8,7 @@
 	},
 	"id": "firee.object-workshop",
 	"name": "Object Workshop",
-	"version": "v1.4.6",
+	"version": "v1.4.7",
 	"developer": "Firee",
 	"description": "Download, upload, or find custom objects made by other creators!",
     "resources": {
@@ -49,6 +49,20 @@
             "default": 0,
             "min": 0,
             "max": 50000
+        },
+        "prerender-objects": {
+            "name": "Pre-Render Object Capacity",
+            "description": "The amount of objects needed before they are \"pre-rendered\" for faster performance. Will cause a stutter upon loading. This <cr>does not</c> count for viewing more information about the object. (0 = Always Enable)",
+            "type": "int",
+            "default": 5000,
+            "min": 0,
+            "max": 50000
+        },
+        "prerender-full": {
+            "name": "Pre-Render Full View",
+            "description": "Whether or not to also pre-render when viewing more information about the object. Do note this will disable particles. (When they get added)",
+            "type": "bool",
+            "default": false
         }
     },
     "dependentold": [

server/src/cache.ts

@@ -12,7 +12,9 @@ export class CacheManager {
         this.cache.set(key, data, ttl * 1000);
     }
     static delete(key: string): boolean {
-        return this.cache.delete(key);
+        //return this.cache.delete(key);
+        this.deletePattern(key);
+        return true;
     }
     static deletePattern(key: string): void {
         this.cache.deleteByPattern(key);

server/src/controllers/objects.ts

@@ -272,6 +272,8 @@ oRouter.post('/objects/:id/overwrite',
                         data,
                         version: objData.version + 1
                     }, ReviewStatus.Updated);
+                    CacheManager.deletePattern(`GET:/user/${objData.account_id}`);
+                    CacheManager.deletePattern(`GET:/objects/${objectID}`);
                 } catch (e) {
                     console.error(e)
                     res.status(500).json({error: "Something went wrong when uploading."})
@@ -720,11 +722,13 @@ oRouter.post('/objects/:id/delete',
                 const accountID = verifyRes.user?.account_id;
                 try {
                     if (verifyRes.user && verifyRes.user.role == 3) {
-                        const objExists = await pool.query("SELECT EXISTS (SELECT 1 FROM objects WHERE id = $1)", [objectID])
-                        if (!objExists.rows[0].exists) return res.status(404).json({error: "Object not found."}); 
+                        const objExists = await pool.query("SELECT account_id FROM objects WHERE id = $1", [objectID])
+                        if (!objExists.rows.length) return res.status(404).json({error: "Object not found."});
+                        CacheManager.deletePattern(`GET:/user/${objExists.rows[0].account_id}`);
                     } else {
                         const objExists = await pool.query("SELECT EXISTS (SELECT 1 FROM objects WHERE id = $1 AND account_id = $2)", [objectID, accountID])
                         if (!objExists.rows[0].exists) return res.status(404).json({error: "Object not found."}); 
+                        CacheManager.deletePattern(`GET:/user/${accountID}`);
                     }
                     await pool.query("DELETE FROM objects WHERE id = $1", [objectID]);
                     res.status(200).json({ message: "Deleted object!" });
@@ -795,6 +799,7 @@ oRouter.post('/objects/:id/update',
                         const objExists = await pool.query("SELECT EXISTS (SELECT 1 FROM objects WHERE id = $1 AND account_id = $2)", [objectID, accountID])
                         if (!objExists.rows[0].exists) return res.status(404).json({error: "Object not found."}); 
                         await pool.query(query, [name, description, tags, objectID]);
+                        CacheManager.deletePattern(`GET:/user/${accountID}`);
                     }
                     CacheManager.delete(`GET:/objects/${objectID}`);
                     return res.status(200).json({message: "Updated object!"});
@@ -852,6 +857,7 @@ oRouter.post('/objects/:id/accept',
                         version: objData.version
                     }, ReviewStatus.Approved, verifyRes.user.name);
                     res.status(200).json({ message: "Accepted!" });
+                    CacheManager.deletePattern(`GET:/user/${objData.account_id}`);
                 } catch (e) {
                     console.error(e);
                     res.status(500).json({ error: 'Internal server error' });
@@ -953,6 +959,7 @@ oRouter.post('/objects/:id/feature',
                     }
                     CacheManager.delete(`GET:/objects/${objectID}`);
                     CacheManager.deletePattern(`GET:/objects`);
+                    CacheManager.deletePattern(`GET:/user/${objData.account_id}`);
                 } catch (e) {
                     console.error(e);
                     res.status(500).json({ error: 'Internal server error' });
@@ -1389,7 +1396,7 @@ oRouter.get('/objects',
     body('tags').optional().isString(),
     cacheMiddleware(60, (req) => {
         const category = parseInt(req.query.category as string) || 0;
-        return !req.query["no-cache"] || category == 4;
+        return !req.query["no-cache"] && category != 4;
     }),
     async (req: Request, res: Response) => {
         const result = validationResult(req);

server/src/controllers/user.ts

@@ -81,6 +81,14 @@ interface DashAuth {
     }
 };
 
+// {"valid":true,"valid_weak":true,"username":"FireeDev"}
+interface Argon {
+    valid: boolean,
+    valid_weak: boolean,
+    cause?: string,
+    username: string
+};
+
 uRouter.post("/user/@me",
     body('token').notEmpty().isString().withMessage("Token is required"),
     async (req: Request, res: Response) => {
@@ -245,6 +253,10 @@ uRouter.post('/gdauth',
                          VALUES ($1, $2, $3);`,
                         [user.account_id, authToken, expiration]
                     );
+                    if (user.name != data.username) {
+                        console.log("[GDAuth] updated username", data.username)
+                        await pool.query(`UPDATE users SET name = $1 WHERE account_id = $2;`, [data.username, user.account_id]);
+                    }
                     res.status(200).json({ token: authToken });
                 }).catch(err => {
                     console.error(err);
@@ -295,6 +307,84 @@ uRouter.post('/dashauth',
                          VALUES ($1, $2, $3);`,
                         [user.account_id, authToken, expiration]
                     );
+                    if (user.name != data.username) {
+                        console.log("[DashAuth] updated username", data.username)
+                        await pool.query(`UPDATE users SET name = $1 WHERE account_id = $2;`, [data.username, user.account_id]);
+                    }
+                    res.status(200).json({ token: authToken });
+                }).catch(err => {
+                    console.error(err);
+                    res.status(500).json({ error: "Something went wrong when trying to create a user." })
+                })
+
+            }).catch(e => {
+                if (e.status != 401) {
+                    console.error(e);
+                    res.status(500).send({error: "Something went wrong when trying to communicate with DashEnd servers."})
+                } else {
+                    console.log("TOKEN NOT RETRIEVED")
+                    res.status(400).json({error: "Token was not retrieved in time. Try again."});
+                }
+            })
+        }).catch(e => {
+            console.error(e);
+            res.sendStatus(500);
+        });
+    }
+);
+
+uRouter.post('/argon',
+    body('account_id').notEmpty().isNumeric(),
+    body('token').notEmpty(),
+    body('username').notEmpty(),
+    async (req: Request, res: Response) => {
+        const result = validationResult(req);
+        if (!result.isEmpty()) return res.status(400).json({ errors: result.array() })
+        const token = req.body.token as string;
+        const usernameCheck = req.body.username as string;
+        const accountID = parseInt(req.body.account_id as string);
+        getCache().then(pool => {
+            axios(`https://argon.globed.dev/v1/validation/check_strong?account_id=${accountID}&username=${encodeURIComponent(usernameCheck)}&authtoken=${encodeURIComponent(token)}`, {
+                headers: {
+                    'User-Agent': 'ow-server/1.0.0'
+                }
+            }).then(async axiosRes => {
+                const data = axiosRes.data as Argon;
+                if (!process.env.PRODUCTION) {
+                    console.log("[Argon]", data);
+                }
+                if (axiosRes.data == "-1") return res.status(403).json({error: "Invalid token."});
+                if (data.cause) return res.status(401).json({error: `Invalid token: ${data.cause}`});
+                if (!data.valid && !data.valid_weak) return res.status(403).json({error: "Invalid token."});
+                const existingUserResult0 = await pool.query(
+                    `SELECT name, account_id FROM users WHERE account_id = $1;`,
+                    [accountID]
+                );
+                if (existingUserResult0.rows.length == 1) {
+                    const user = existingUserResult0.rows[0];
+                    if (user.name != data.username && data.valid) {
+                        await pool.query(`UPDATE users SET name = $1 WHERE account_id = $2;`, [data.username, user.account_id]);
+                    }
+                } else if (!data.valid) {
+                    return res.status(403).json({error: "Username not valid. Refresh your GD login."});
+                }
+                pool.query("INSERT INTO users (auth_method, account_id, name) VALUES ($1, $2, $3) ON CONFLICT (account_id) DO NOTHING RETURNING *;", ["argon", accountID, data.username]).then(async userResult => {
+                    let user = userResult.rows[0];
+                    if (!user) {
+                        const existingUserResult = await pool.query(
+                            `SELECT * FROM users WHERE account_id = $1;`,
+                            [accountID]
+                        );
+                        user = existingUserResult.rows[0];
+                    }
+                    if (!user) return res.status(500).json({ error: "Unable to retrieve or create user." });
+                    const authToken = generateAuthToken(user.account_id);
+                    const expiration = new Date(Date.now() + ((60 * 60 * 1000) * 24) * 14); // 2 weeks
+                    await pool.query(
+                        `INSERT INTO user_tokens (account_id, token, expiration)
+                         VALUES ($1, $2, $3);`,
+                        [user.account_id, authToken, expiration]
+                    );
                     res.status(200).json({ token: authToken });
                 }).catch(err => {
                     console.error(err);

src/config.hpp

@@ -6,7 +6,7 @@
 #define USER_AGENT "ObjectWorkshop/1.4.2"
 
 #define DASHAUTH 1
-#define GDAUTH 1 
+#define ARGON 1 
 
 #define RESULT_LIMIT 9
 #define MAX_ZOOM 10