Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 9f5abefb34 | |||
| f6ac12962d | |||
| 6d176c2020 | |||
| 83c1fba265 | |||
| e46a60f95f | |||
| 6c086b5307 | |||
| 064f1701ee | |||
| df9ad4fc70 |
@@ -74,6 +74,7 @@ jobs:
|
||||
- name: Configure CMake
|
||||
run: |
|
||||
cmake -B build -S . -G Ninja \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_SYSTEM_NAME=Windows \
|
||||
-DCMAKE_C_COMPILER=x86_64-w64-mingw32-gcc \
|
||||
-DCMAKE_CXX_COMPILER=x86_64-w64-mingw32-g++ \
|
||||
|
||||
@@ -147,6 +147,9 @@ set_target_properties(hex-unlocked PROPERTIES OUTPUT_NAME "${RANDOM_EXE_NAME}")
|
||||
# compiler / IDE config
|
||||
if(NOT MSVC)
|
||||
target_link_options(hex-unlocked PRIVATE -static -static-libgcc -static-libstdc++)
|
||||
if(CMAKE_BUILD_TYPE MATCHES "Release|MinSizeRel")
|
||||
target_link_options(hex-unlocked PRIVATE -s)
|
||||
endif()
|
||||
else()
|
||||
set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT hex-unlocked)
|
||||
endif()
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 156 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 607 KiB |
Binary file not shown.
@@ -11,6 +11,9 @@ class ConOutSink : public ILogSink
|
||||
public:
|
||||
virtual void receiveLog(LogType type, std::string_view loggerName, std::string_view msg) override
|
||||
{
|
||||
#ifndef _DEBUG
|
||||
if (type == LogType::VERBOSE) return;
|
||||
#endif
|
||||
std::cout << "[" << loggerName << "] " << seallib::getLogTypeColor(type) << "["
|
||||
<< seallib::getLogTypeName(type) << "]"
|
||||
<< "\x1b[0m " << msg << std::endl;
|
||||
@@ -0,0 +1,48 @@
|
||||
#pragma once
|
||||
|
||||
#include <seallib/log.h>
|
||||
|
||||
#include <fstream>
|
||||
#include <string>
|
||||
#include <mutex>
|
||||
#include <memory>
|
||||
|
||||
#include "utils.h"
|
||||
|
||||
using namespace seallib;
|
||||
|
||||
class FileSink : public ILogSink
|
||||
{
|
||||
public:
|
||||
FileSink(const std::string& filename)
|
||||
{
|
||||
_file.open(utils::getExePath() + filename, std::ios::out | std::ios::app);
|
||||
}
|
||||
|
||||
~FileSink()
|
||||
{
|
||||
if (_file.is_open())
|
||||
_file.close();
|
||||
}
|
||||
|
||||
virtual void receiveLog(LogType type, std::string_view loggerName, std::string_view msg) override
|
||||
{
|
||||
std::lock_guard<std::mutex> lock(_mutex);
|
||||
if (_file.is_open())
|
||||
{
|
||||
_file << "[" << loggerName << "] ["
|
||||
<< seallib::getLogTypeName(type) << "] "
|
||||
<< msg << std::endl;
|
||||
}
|
||||
}
|
||||
|
||||
static std::shared_ptr<FileSink> getSharedInstance()
|
||||
{
|
||||
static std::shared_ptr<FileSink> instance = std::make_shared<FileSink>("hex-unlocked.log");
|
||||
return instance;
|
||||
}
|
||||
|
||||
private:
|
||||
std::ofstream _file;
|
||||
std::mutex _mutex;
|
||||
};
|
||||
@@ -2,7 +2,8 @@
|
||||
#include "tray-icon.h"
|
||||
#include "utils.h"
|
||||
#include "spoofer.h"
|
||||
#include "log-sink.h"
|
||||
#include "log-sink-cout.h"
|
||||
#include "log-sink-file.h"
|
||||
#include "proxy-configurator.h"
|
||||
#include "cache-cleaner.h"
|
||||
|
||||
@@ -16,11 +17,6 @@
|
||||
#include <processthreadsapi.h>
|
||||
#include <handleapi.h>
|
||||
|
||||
#ifndef CREATE_NO_WINDOW
|
||||
// from: WinBase.h
|
||||
#define CREATE_NO_WINDOW 0x08000000
|
||||
#endif
|
||||
|
||||
bool running = true;
|
||||
TinyMITMProxy* proxy = nullptr;
|
||||
ProxyConfigurator* conf = nullptr;
|
||||
@@ -88,6 +84,7 @@ bool run()
|
||||
*/
|
||||
seallib::Logger mainLog("Main");
|
||||
mainLog.addSink(std::make_shared<ConOutSink>());
|
||||
mainLog.addSink(FileSink::getSharedInstance());
|
||||
|
||||
mainLog.info("Init");
|
||||
|
||||
@@ -141,6 +138,7 @@ bool run()
|
||||
}
|
||||
|
||||
mainLog.info("Proxy running, Ctrl+C to stop. Check system tray for options.");
|
||||
mainLog.info("Go to https://dbd.neru.rip/ for settings.");
|
||||
while (running)
|
||||
{
|
||||
tray.processMessages();
|
||||
@@ -166,6 +164,7 @@ bool run()
|
||||
int WINAPI WinMain(HINSTANCE /*hInstance*/, HINSTANCE /*hPrevInstance*/, LPSTR /*lpCmdLine*/, int /*nShowCmd*/)
|
||||
{
|
||||
AllocConsole();
|
||||
SetConsoleTitleA(utils::randomizeString(32).c_str());
|
||||
|
||||
/*
|
||||
ansi seequences
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
#include "proxy-configurator.h"
|
||||
|
||||
#include "win-platform.h"
|
||||
#include "log-sink.h"
|
||||
#include "log-sink-cout.h"
|
||||
#include "log-sink-file.h"
|
||||
|
||||
#include <minwinbase.h>
|
||||
#include <wininet.h>
|
||||
@@ -13,6 +14,7 @@ ProxyConfigurator::ProxyConfigurator()
|
||||
{
|
||||
_log = new seallib::Logger("ProxyConfigurator");
|
||||
_log->addSink(std::make_shared<ConOutSink>());
|
||||
_log->addSink(FileSink::getSharedInstance());
|
||||
|
||||
_log->verbose("ProxyConfigurator instantiated");
|
||||
}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
#include "spoofer.h"
|
||||
#include "utils.h"
|
||||
#include "log-sink.h"
|
||||
#include "log-sink-cout.h"
|
||||
#include "log-sink-file.h"
|
||||
|
||||
#include <regex>
|
||||
#include <map>
|
||||
@@ -35,18 +36,19 @@ Spoofer::Spoofer()
|
||||
{
|
||||
_log = new seallib::Logger("Spoofer");
|
||||
_log->addSink(std::make_shared<ConOutSink>());
|
||||
_log->addSink(FileSink::getSharedInstance());
|
||||
|
||||
_log->info("Spoofer init");
|
||||
_log->verbose("Spoofer init");
|
||||
|
||||
loadConfig();
|
||||
|
||||
_log->info("Starting WebSocket server");
|
||||
_log->verbose("Starting WebSocket server");
|
||||
initServer();
|
||||
}
|
||||
|
||||
Spoofer::~Spoofer()
|
||||
{
|
||||
_log->info("Stopping WebSocket server");
|
||||
_log->verbose("Stopping WebSocket server");
|
||||
stopServer();
|
||||
|
||||
delete _log;
|
||||
@@ -133,6 +135,7 @@ void Spoofer::saveConfig()
|
||||
std::string buffer;
|
||||
auto errCtx = glz::write_file_json(conf, configPath, buffer);
|
||||
if (errCtx.ec != glz::error_code::none) _log->error("Failed to save config to {}", configPath);
|
||||
_log->verbose("Saved config @ config.json");
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -175,7 +178,7 @@ void Spoofer::wsMessageCallback(std::shared_ptr<ix::ConnectionState> /*connectio
|
||||
{
|
||||
case ix::WebSocketMessageType::Open:
|
||||
{
|
||||
_log->verbose("Websocket connection open, URI: {}", msg->openInfo.uri);
|
||||
_log->verbose("WebSocket connection open, URI: {}", msg->openInfo.uri);
|
||||
WSMessages::Init initMsg;
|
||||
initMsg.profile.camperItems = _camperItems;
|
||||
initMsg.profile.camperAddons = _camperAddons;
|
||||
@@ -203,7 +206,7 @@ void Spoofer::wsMessageCallback(std::shared_ptr<ix::ConnectionState> /*connectio
|
||||
break;
|
||||
}
|
||||
case ix::WebSocketMessageType::Close:
|
||||
_log->verbose("Websocket connection close");
|
||||
_log->verbose("WebSocket connection close");
|
||||
break;
|
||||
case ix::WebSocketMessageType::Message:
|
||||
{
|
||||
@@ -211,7 +214,7 @@ void Spoofer::wsMessageCallback(std::shared_ptr<ix::ConnectionState> /*connectio
|
||||
auto err = glz::read_json(req, msg->str);
|
||||
if (err.ec != glz::error_code::none)
|
||||
{
|
||||
_log->error("Failed to parse websocket message");
|
||||
_log->error("Failed to parse WebSocket message");
|
||||
break;
|
||||
}
|
||||
switch (req.action)
|
||||
@@ -330,13 +333,15 @@ void Spoofer::modifyCharacterInventory(glz::generic& js)
|
||||
appendPerks(_slasherPerks);
|
||||
}
|
||||
appendItems(_globalOfferings);
|
||||
|
||||
_log->verbose("Modified inventory for character {}", js["characterName"].get_string());
|
||||
}
|
||||
|
||||
void Spoofer::modifyCharacterData(glz::generic& js)
|
||||
{
|
||||
if (!js.contains("characterName") || !js["characterName"].is_string())
|
||||
{
|
||||
_log->verbose("attempted to modify invalid char");
|
||||
_log->warning("Attempted to modify invalid character");
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -371,6 +376,8 @@ void Spoofer::modifyCharacterData(glz::generic& js)
|
||||
}
|
||||
|
||||
if (_spoofItems || _spoofPerks) modifyCharacterInventory(js);
|
||||
|
||||
_log->verbose("Modified data for character {}", js["characterName"].get_string());
|
||||
}
|
||||
|
||||
void Spoofer::generateBloodweb(glz::generic& js)
|
||||
|
||||
Reference in New Issue
Block a user