Skip to content

Commit 546b229

Browse files
ShrBoxShrBox
committed
feat: support LeviLamina 0.5.1
feat: add ParticleAPI
1 parent c445d93 commit 546b229

18 files changed

+845
-392
lines changed

‎src/api/APIHelp.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include "utils/JsonHelper.h"
1313
#include "utils/UsingScriptX.inc"
1414

15-
#include "ll/api/base/ErrorInfo.h"
15+
#include "ll/api/utils/ErrorUtils.h"
1616

1717
// 输出异常信息
1818
inline void PrintException(const script::Exception &e) {
@@ -76,7 +76,7 @@ std::string ValueKindToString(const ValueKind &kind);
7676
// 截获引擎异常
7777
#define CATCH(LOG) \
7878
catch (...) { \
79-
ll::error_info::printCurrentException(logger); \
79+
ll::error_utils::printCurrentException(logger); \
8080
LOG_ERROR_WITH_SCRIPT_INFO(); \
8181
return Local<Value>(); \
8282
}
@@ -105,23 +105,23 @@ std::string ValueKindToString(const ValueKind &kind);
105105
// 截获引擎异常_Constructor
106106
#define CATCH_C(LOG) \
107107
catch (...) { \
108-
ll::error_info::printCurrentException(logger); \
108+
ll::error_utils::printCurrentException(logger); \
109109
LOG_ERROR_WITH_SCRIPT_INFO(); \
110110
return nullptr; \
111111
}
112112

113113
// 截获引擎异常_Setter
114114
#define CATCH_S(LOG) \
115115
catch (...) { \
116-
ll::error_info::printCurrentException(logger); \
116+
ll::error_utils::printCurrentException(logger); \
117117
LOG_ERROR_WITH_SCRIPT_INFO(); \
118118
return; \
119119
}
120120

121121
// 截获引擎异常_Constructor
122122
#define CATCH_WITHOUT_RETURN(LOG) \
123123
catch (...) { \
124-
ll::error_info::printCurrentException(logger); \
124+
ll::error_utils::printCurrentException(logger); \
125125
LOG_ERROR_WITH_SCRIPT_INFO(); \
126126
}
127127

‎src/api/DatabaseAPI.h‎

Lines changed: 41 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,75 @@
11
#pragma once
22
#include "api/APIHelp.h"
33
#include "legacyapi/db/Session.h"
4-
#include "ll/api/base/KeyValueDB.h"
4+
#include "ll/api/data/KeyValueDB.h"
55

66
//////////////////// Classes ////////////////////
77

88
//// KVDB
99
class KVDBClass : public ScriptClass {
1010
private:
11-
std::unique_ptr<ll::KeyValueDB> kvdb;
12-
int unloadCallbackIndex = -1;
11+
std::unique_ptr<ll::KeyValueDB> kvdb;
12+
int unloadCallbackIndex = -1;
1313

1414
public:
15-
explicit KVDBClass(const Local<Object>& scriptObj, const string& dir);
16-
explicit KVDBClass(const string& dir);
17-
~KVDBClass();
18-
static KVDBClass* constructor(const Arguments& args);
15+
explicit KVDBClass(const Local<Object> &scriptObj, const string &dir);
16+
explicit KVDBClass(const string &dir);
17+
~KVDBClass();
18+
static KVDBClass *constructor(const Arguments &args);
1919

20-
bool isValid() { return kvdb.get(); }
20+
bool isValid() { return kvdb.get(); }
2121

22-
Local<Value> get(const Arguments& args);
23-
Local<Value> set(const Arguments& args);
24-
Local<Value> del(const Arguments& args);
25-
Local<Value> close(const Arguments& args);
26-
Local<Value> listKey(const Arguments& args);
22+
Local<Value> get(const Arguments &args);
23+
Local<Value> set(const Arguments &args);
24+
Local<Value> del(const Arguments &args);
25+
Local<Value> close(const Arguments &args);
26+
Local<Value> listKey(const Arguments &args);
2727

28-
// For Compatibility
29-
static Local<Value> newDb(const string& dir);
28+
// For Compatibility
29+
static Local<Value> newDb(const string &dir);
3030
};
3131
extern ClassDefine<KVDBClass> KVDBClassBuilder;
3232

33-
3433
//// SQLDB
3534
class DBSessionClass : public ScriptClass {
3635
private:
37-
DB::SharedPointer<DB::Session> session;
36+
DB::SharedPointer<DB::Session> session;
3837

3938
public:
40-
explicit DBSessionClass(const Local<Object>& scriptObj, const DB::ConnParams& params);
41-
explicit DBSessionClass(const DB::ConnParams& params);
42-
~DBSessionClass();
43-
static DBSessionClass* constructor(const Arguments& args);
39+
explicit DBSessionClass(const Local<Object> &scriptObj,
40+
const DB::ConnParams &params);
41+
explicit DBSessionClass(const DB::ConnParams &params);
42+
~DBSessionClass();
43+
static DBSessionClass *constructor(const Arguments &args);
4444

45-
Local<Value> query(const Arguments& args);
46-
Local<Value> exec(const Arguments& args);
47-
Local<Value> prepare(const Arguments& args);
48-
Local<Value> close(const Arguments& args);
49-
Local<Value> isOpen(const Arguments& args);
45+
Local<Value> query(const Arguments &args);
46+
Local<Value> exec(const Arguments &args);
47+
Local<Value> prepare(const Arguments &args);
48+
Local<Value> close(const Arguments &args);
49+
Local<Value> isOpen(const Arguments &args);
5050
};
5151
extern ClassDefine<DBSessionClass> DBSessionClassBuilder;
5252

5353
class DBStmtClass : public ScriptClass {
5454
private:
55-
DB::SharedPointer<DB::Stmt> stmt;
55+
DB::SharedPointer<DB::Stmt> stmt;
5656

5757
public:
58-
explicit DBStmtClass(const Local<Object>& scriptObj, const DB::SharedPointer<DB::Stmt>& stmt);
59-
explicit DBStmtClass(const DB::SharedPointer<DB::Stmt>& stmt);
60-
~DBStmtClass();
58+
explicit DBStmtClass(const Local<Object> &scriptObj,
59+
const DB::SharedPointer<DB::Stmt> &stmt);
60+
explicit DBStmtClass(const DB::SharedPointer<DB::Stmt> &stmt);
61+
~DBStmtClass();
6162

62-
Local<Value> getAffectedRows();
63-
Local<Value> getInsertId();
63+
Local<Value> getAffectedRows();
64+
Local<Value> getInsertId();
6465

65-
Local<Value> bind(const Arguments& args);
66-
Local<Value> execute(const Arguments& args);
67-
Local<Value> step(const Arguments& args);
68-
Local<Value> fetch(const Arguments& args);
69-
Local<Value> fetchAll(const Arguments& args);
70-
Local<Value> reset(const Arguments& args);
71-
Local<Value> reexec(const Arguments& args);
72-
Local<Value> clear(const Arguments& args);
66+
Local<Value> bind(const Arguments &args);
67+
Local<Value> execute(const Arguments &args);
68+
Local<Value> step(const Arguments &args);
69+
Local<Value> fetch(const Arguments &args);
70+
Local<Value> fetchAll(const Arguments &args);
71+
Local<Value> reset(const Arguments &args);
72+
Local<Value> reexec(const Arguments &args);
73+
Local<Value> clear(const Arguments &args);
7374
};
7475
extern ClassDefine<DBStmtClass> DBStmtClassBuilder;

‎src/api/FileSystemAPI.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include "engine/EngineManager.h"
44
#include "engine/LocalShareData.h"
55
#include "engine/TimeTaskSystem.h"
6-
#include "ll/api/ServerInfo.h"
6+
#include "ll/api/service/ServerInfo.h"
77
#include <corecrt_io.h>
88
#include <filesystem>
99
#include <fstream>
@@ -802,4 +802,4 @@ Local<Object> FileClass::newFile(std::fstream &&f, const std::string &path,
802802
bool isBinary) {
803803
auto newp = new FileClass(std::move(f), path, isBinary);
804804
return newp->getScriptObject();
805-
}
805+
}

0 commit comments

Comments
 (0)