Add GUIDetails

Author: LittleYang0531

.gitignore

@@ -28,3 +28,6 @@ plugins
 *.srp
 releases
 .tmp
+api/libsonolus.*
+api/package*
+api/node_modules

config/config.json

@@ -5,7 +5,7 @@
     "mysql.username": "root",
     "mysql.password": "root",
     "mysql.database": "sonolus",
-    "sqlite.dbfile": "sonolus.db",
+    "sqlite.dbfile": ":memory:",
     "sqlite.sqlfile": "sonolus.sql",
     "server.listenHost": "0.0.0.0",
     "server.listenPort": 8080,

config/sonolus_config.json

@@ -6,6 +6,6 @@
     "server.logo": "9d364cdf72de5709f16eae90e1be7f023946f007",
     "server.banner": "0273968035abcd9bfe8f6b8fa913bb356dd202f2",
     "server.rootUrl": "127.0.0.1:8080",
-    "server.data.prefix": "",
+    "server.data.prefix": "https://stellarity.littleyang.me/data/",
     "language.default": "zhs"
 }

emain.cpp

@@ -44,6 +44,7 @@ vector<string> playlistVersionList = {"0.0.0"};
 #include"modules/mysqli.h"
 #include"modules/json.h"
 #include"modules/encrypt.h"
+DB_Controller db;
 #include"items/Items.h"
 #include"web/import.h"
 
@@ -73,6 +74,7 @@ void routerRegister() {
     app.addRoute("/%s/list", GUIList);
     app.addRoute("/%s/search", GUISearch);
     app.addRoute("/%s/jump/%d", GUIJump);
+    app.addRoute("/%s/%s", GUIDetails);
     // app.addRoute("/levels/create", web_levels_create);
     // app.addRoute("/skins/create", web_skins_create);
     // app.addRoute("/backgrounds/create", web_backgrounds_create);
@@ -114,7 +116,7 @@ void routerRegister() {
 }
 
 string cgiRunner(string request) {
-	(new DB_Controller)->query("SELECT COUNT(*) FROM Level");
+	db.query("SELECT COUNT(*) FROM Level");
 
 	// 适配 Resource Version
 	levelVersion = upper_bound(levelVersionList.begin(), levelVersionList.end(), Sonolus_Version) - levelVersionList.begin();
@@ -148,6 +150,7 @@ void preload() {
     appConfig["server.bannerHash"] = appConfig["server.banner"].asString();
     appConfig["server.bannerUrl"] = dataPrefix + appConfig["server.banner"].asString();
     log_init(log_target_type);
+    db = DB_Controller(true);
     http_init();
     loadConfig();
 
@@ -224,4 +227,4 @@ extern "C" EMSCRIPTEN_KEEPALIVE void cgi(char* requestId, int len) {
     ofstream fout("./response_" + data);
     fout.write(res.c_str(), res.size());
     fout.close();
-}
+}

emake

@@ -1,6 +1,7 @@
+sqlite3 sonolus.db .dump > sonolus.sql
 emcc emain.cpp -o api/libsonolus.js -s MODULARIZE -sALLOW_MEMORY_GROWTH\
 	-sDEFAULT_LIBRARY_FUNCS_TO_INCLUDE=['$stringToNewUTF8','$UTF8ToString']\
 	-sEXPORTED_RUNTIME_METHODS=['stringToNewUTF8','UTF8ToString','FS']\
-	-fwasm-exceptions -sASSERTIONS -lidbfs.js\
+	-fwasm-exceptions -sASSERTIONS -lnodefs.js\
 	--preload-file config --preload-file i18n --preload-file web --preload-file sonolus.sql\
 	-L./emsdk/lib -I./emsdk/include -ljsoncpp -lcrypto -lsqlite3 -g

items/BackgroundItem.h

@@ -89,7 +89,7 @@ class BackgroundItem {
 int backgroundsNumber(string filter) {
     string sql = "SELECT COUNT(*) AS sum FROM Background";
     if (filter != "") sql += " WHERE (" + filter + ")";
-    dbres res = (new DB_Controller)->query(sql.c_str());
+    dbres res = db.query(sql.c_str());
     return atoi(res[0]["sum"].c_str());
 }
 
@@ -98,7 +98,7 @@ vector<BackgroundItem> backgroundsList(string filter, string order, int st = 1,
     if (filter != "") sql += " WHERE (" + filter + ")";
     if (order != "") sql += " ORDER BY " + order;
     sql += " LIMIT " + to_string(st - 1) + ", " + to_string(en - st + 1);
-    auto res = (new DB_Controller)->query(sql.c_str());
+    auto res = db.query(sql.c_str());
     vector<BackgroundItem> list = {};
     sort(res.begin(), res.end(), [](argvar a, argvar b){
         if (a["name"] == b["name"]) return (a["localization"] == "default") < (b["localization"] == "default");
@@ -126,21 +126,21 @@ vector<BackgroundItem> backgroundsList(string filter, string order, int st = 1,
 
 int backgroundCreate(BackgroundItem item, string localization = "default") {
     stringstream sqlbuffer;
-    auto res = (new DB_Controller)->query("SELECT id FROM Background WHERE name = \"" + item.name + "\" AND localization = \"" + localization + "\"");
+    auto res = db.query("SELECT id FROM Background WHERE name = \"" + item.name + "\" AND localization = \"" + localization + "\"");
     if (res.size() != 0) {
         int id = atoi(res[0]["id"].c_str());
         sqlbuffer << "UPDATE Background SET name = \"" << item.name << "\", version = " << item.version << ", title = \"" << item.title << "\", ";
         sqlbuffer << "subtitle = \"" << item.subtitle << "\", author = \"" << item.author << "\", thumbnail = \"" << item.thumbnail.hash << "\", ";
         sqlbuffer << "data = \"" << item.data.hash << "\", image = \"" << item.image.hash << "\", configuration = \"" << item.configuration.hash << "\", ";
         sqlbuffer << "description = \"" << str_replace("\n", "\\n", item.description) << "\", localization = \"" << localization << "\" WHERE id = " << id << ";";
     } else {
-        int id = atoi((new DB_Controller)->query("SELECT COUNT(*) AS sum FROM Background;")[0]["sum"].c_str()) + 1;
+        int id = atoi(db.query("SELECT COUNT(*) AS sum FROM Background;")[0]["sum"].c_str()) + 1;
         sqlbuffer << "INSERT INTO Background (id, name, version, title, subtitle, author, thumbnail, data, image, configuration, description, localization) VALUES (";
         sqlbuffer << id << ", \"" << item.name << "\", " << item.version << ", \"" << item.title << "\", ";
         sqlbuffer << "\"" << item.subtitle << "\", \"" << item.author << "\", \"" << item.thumbnail.hash << "\", ";
         sqlbuffer << "\"" << item.data.hash << "\", \"" << item.image.hash << "\", \"" << item.configuration.hash << "\", ";
         sqlbuffer << "\"" << str_replace("\n", "\\n", item.description) << "\", \"" << localization << "\");";
-    } return (new DB_Controller)->execute(sqlbuffer.str());
+    } return db.execute(sqlbuffer.str());
 }
 
 #endif

items/EffectItem.h

@@ -85,7 +85,7 @@ class EffectItem {
 int effectsNumber(string filter) {
     string sql = "SELECT COUNT(*) AS sum FROM Effect";
     if (filter != "") sql += " WHERE (" + filter + ")";
-    dbres res = (new DB_Controller)->query(sql.c_str());
+    dbres res = db.query(sql.c_str());
     return atoi(res[0]["sum"].c_str());
 }
 
@@ -94,7 +94,7 @@ vector<EffectItem> effectsList(string filter, string order, int st = 1, int en =
     if (filter != "") sql += " WHERE (" + filter + ")";
     if (order != "") sql += " ORDER BY " + order;
     sql += " LIMIT " + to_string(st - 1) + ", " + to_string(en - st + 1);
-    dbres res = (new DB_Controller)->query(sql.c_str());
+    dbres res = db.query(sql.c_str());
     vector<EffectItem> list = {};
     sort(res.begin(), res.end(), [](argvar a, argvar b){
         if (a["name"] == b["name"]) return (a["localization"] == "default") < (b["localization"] == "default");
@@ -114,14 +114,14 @@ vector<EffectItem> effectsList(string filter, string order, int st = 1, int en =
             SRL<EffectAudio>(res[i]["audio"], dataPrefix + res[i]["audio"]),
             deserializeTagString(res[i]["tags"]),
             str_replace("\\n", "\n", res[i]["description"]),
-            (appConfig["server.enableSSL"].asBool() ? "https://" : "http://") + appConfig["server.rootUrl"].asString() + "/sonolus/backgrounds/" + res[i]["name"]
+            (appConfig["server.enableSSL"].asBool() ? "https://" : "http://") + appConfig["server.rootUrl"].asString() + "/sonolus/effects/" + res[i]["name"]
         ); list.push_back(data);
     } return list;
 }
 
 int effectCreate(EffectItem item, string localization = "default") {
     stringstream sqlbuffer;
-    auto res = (new DB_Controller)->query("SELECT id FROM Effect WHERE name = \"" + item.name + "\" AND localization = \"" + localization + "\"");
+    auto res = db.query("SELECT id FROM Effect WHERE name = \"" + item.name + "\" AND localization = \"" + localization + "\"");
     if (res.size() != 0) {
         int id = atoi(res[0]["id"].c_str());
         sqlbuffer << "UPDATE Effect SET name = \"" << item.name << "\", version = " << item.version << ", ";
@@ -130,12 +130,12 @@ int effectCreate(EffectItem item, string localization = "default") {
         sqlbuffer << "data = \"" << item.data.hash << "\", audio = \"" << item.audio.hash << "\", ";
         sqlbuffer << "description = \"" << str_replace("\n", "\\n", item.description) << "\", localization = \"" << localization << "\" WHERE id = " << id;
     } else {
-        int id = atoi((new DB_Controller)->query("SELECT COUNT(*) AS sum FROM Effect;")[0]["sum"].c_str()) + 1;
+        int id = atoi(db.query("SELECT COUNT(*) AS sum FROM Effect;")[0]["sum"].c_str()) + 1;
         sqlbuffer << "INSERT INTO Effect (id, name, version, title, subtitle, author, thumbnail, data, audio, description, localization) VALUES (";
         sqlbuffer << id << ", \"" << item.name << "\", " << item.version << ", \"" << item.title << "\", ";
         sqlbuffer << "\"" << item.subtitle << "\", \"" << item.author << "\", \"" << item.thumbnail.hash << "\", ";
         sqlbuffer << "\"" << item.data.hash << "\", \"" << item.audio.hash << "\", \"" << str_replace("\n", "\\n", item.description) << "\", \"" << localization << "\")";
-    } return (new DB_Controller)->execute(sqlbuffer.str());
+    } return db.execute(sqlbuffer.str());
 }
 
 #endif

items/EngineItem.h

@@ -125,7 +125,7 @@ class EngineItem {
 int enginesNumber(string filter) {
     string sql = "SELECT COUNT(*) AS sum FROM Engine";
     if (filter != "") sql += " WHERE (" + filter + ")";
-    dbres res = (new DB_Controller)->query(sql.c_str());
+    dbres res = db.query(sql.c_str());
     return atoi(res[0]["sum"].c_str());
 }
 
@@ -134,7 +134,7 @@ vector<EngineItem> enginesList(string filter, string order, int st = 1, int en =
     if (filter != "") sql += " WHERE (" + filter + ")";
     if (order != "") sql += " ORDER BY " + order;
     sql += " LIMIT " + to_string(st - 1) + ", " + to_string(en - st + 1);
-    dbres res = (new DB_Controller)->query(sql.c_str());
+    dbres res = db.query(sql.c_str());
     vector<EngineItem> list = {};
     sort(res.begin(), res.end(), [](argvar a, argvar b){
         if (a["name"] == b["name"]) return (a["localization"] == "default") < (b["localization"] == "default");
@@ -163,32 +163,32 @@ vector<EngineItem> enginesList(string filter, string order, int st = 1, int en =
             deserializeTagString(res[i]["tags"]),
             SRL<EngineRom>(res[i]["rom"], dataPrefix + res[i]["rom"]),
             str_replace("\\n", "\n", res[i]["description"]),
-            (appConfig["server.enableSSL"].asBool() ? "https://" : "http://") + appConfig["server.rootUrl"].asString() + "/sonolus/backgrounds/" + res[i]["name"]
+            (appConfig["server.enableSSL"].asBool() ? "https://" : "http://") + appConfig["server.rootUrl"].asString() + "/sonolus/engines/" + res[i]["name"]
         ); list.push_back(data);
     } return list;
 }
 
 int engineCreate(EngineItem item, string localization = "default") {
     stringstream sqlbuffer;
-    auto res = (new DB_Controller)->query("SELECT id FROM Engine WHERE name = \"" + item.name + "\" AND localization = \"" + localization + "\"");
-    int skinId = atoi((new DB_Controller)->query("SELECT id FROM Skin WHERE name = \"" + item.skin.name + "\";")[0]["id"].c_str());
-    int backgroundId = atoi((new DB_Controller)->query("SELECT id FROM Background WHERE name = \"" + item.background.name + "\";")[0]["id"].c_str());
-    int effectId = atoi((new DB_Controller)->query("SELECT id FROM Effect WHERE name = \"" + item.effect.name + "\";")[0]["id"].c_str());
-    int particleId = atoi((new DB_Controller)->query("SELECT id FROM Particle WHERE name = \"" + item.particle.name + "\";")[0]["id"].c_str());
+    auto res = db.query("SELECT id FROM Engine WHERE name = \"" + item.name + "\" AND localization = \"" + localization + "\"");
+    int skinId = atoi(db.query("SELECT id FROM Skin WHERE name = \"" + item.skin.name + "\";")[0]["id"].c_str());
+    int backgroundId = atoi(db.query("SELECT id FROM Background WHERE name = \"" + item.background.name + "\";")[0]["id"].c_str());
+    int effectId = atoi(db.query("SELECT id FROM Effect WHERE name = \"" + item.effect.name + "\";")[0]["id"].c_str());
+    int particleId = atoi(db.query("SELECT id FROM Particle WHERE name = \"" + item.particle.name + "\";")[0]["id"].c_str());
     if (res.size() != 0) {
         int id = atoi(res[0]["id"].c_str());
         sqlbuffer << "UPDATE Engine SET name = \"" << item.name << "\", version = " << item.version << ", title = \"" << item.title << "\", ";
         sqlbuffer << "subtitle = \"" << item.subtitle << "\", author = \"" << item.author << "\", skin = " << skinId << ", background = " << backgroundId << ", ";
         sqlbuffer << "effect = " << effectId << ", particle = " << particleId << ", thumbnail = \"" << item.thumbnail.hash << "\", data = \"" << item.data.hash << "\", tutorialData = \"" << item.tutorialData.hash << "\", previewData = \"" << item.previewData.hash << "\", watchData = \"" << item.watchData.hash << "\", ";
         sqlbuffer << "configuration = \"" << item.configuration.hash << "\", rom = \"" << item.rom.hash << "\", description = \"" << str_replace("\n", "\\n", item.description) << "\", localization = \"" << localization << "\" WHERE id = " << id << ";";
     } else {
-        int id = atoi((new DB_Controller)->query("SELECT COUNT(*) AS sum FROM Engine;")[0]["sum"].c_str()) + 1;
+        int id = atoi(db.query("SELECT COUNT(*) AS sum FROM Engine;")[0]["sum"].c_str()) + 1;
         sqlbuffer << "INSERT INTO Engine (id, name, version, title, subtitle, author, skin, background, effect, particle, thumbnail, data, configuration, rom, description, localization, tutorialData, previewData, watchData) VALUES (";
         sqlbuffer << id << ", \"" << item.name << "\", " << item.version << ", \"" << item.title << "\", ";
         sqlbuffer << "\"" << item.subtitle << "\", \"" << item.author << "\", " << skinId << ", " << backgroundId << ", " << effectId << ", " << particleId << ", ";
         sqlbuffer << "\"" << item.thumbnail.hash << "\", \"" << item.data.hash << "\", \"" << item.configuration.hash << "\", ";
         sqlbuffer << "\"" << item.rom.hash << "\", \"" << str_replace("\n", "\\n", item.description) << "\", \"" << localization << "\", \"" << item.tutorialData.hash << "\", \"" << item.previewData.hash << "\", \"" << item.watchData.hash << "\");";
-    } return (new DB_Controller)->execute(sqlbuffer.str());
+    } return db.execute(sqlbuffer.str());
 }
 
 #endif

items/Items.h

@@ -155,6 +155,6 @@ void loadConfig() {
 bool checkLogin(http_request request) {
     string session = request.argv["sonolus-session"];
     if (session == "") session = cookieParam(request)["Sonolus-Session"];
-    auto res = (new DB_Controller)->query("SELECT * FROM UserSession WHERE session=\"" + session + "\" AND time>=" + to_string(time(NULL) - appConfig["session.expireTime"].asInt64() * 24 * 60 * 60) + " AND userId!=0");
+    auto res = db.query("SELECT * FROM UserSession WHERE session=\"" + session + "\" AND time>=" + to_string(time(NULL) - appConfig["session.expireTime"].asInt64() * 24 * 60 * 60) + " AND userId!=0");
     return res.size();
 }