fix(skyrim-platform): mirror unhandled errors to cmd (skyrim-multipla…

…yer#1893)

docs/release/dev/sp-cmd-fix.md

@@ -0,0 +1 @@
+[Embedded console](https://github.com/skyrim-multiplayer/skymp/blob/592c6527ed91e6c97a38d143f4ae1cdab9c3268e/docs/release/sp-2.8.md?plain=1#L68) now mirrors unhandled exceptions from the game console properly.

skyrim-platform/src/platform_se/skyrim_platform/ConsoleApi.cpp

@@ -7,10 +7,10 @@
 #include "Validators.h"
 #include "WindowsConsolePrinter.h"
 
-namespace {
-// TODO: Add printers switching
-static std::shared_ptr<IConsolePrinter> g_printer(new InGameConsolePrinter);
+std::shared_ptr<IConsolePrinter> g_printer(new InGameConsolePrinter);
+std::shared_ptr<IConsolePrinter> g_windowsConsolePrinter = nullptr;
 
+namespace {
 struct ConsoleCommand
 {
   std::string longName;
@@ -23,7 +23,6 @@ struct ConsoleCommand
 };
 static std::map<std::string, ConsoleCommand> g_replacedConsoleCmd;
 static bool g_printConsolePrefixesEnabled = true;
-static std::unique_ptr<WindowsConsolePrinter> g_windowsConsolePrinter = NULL;
 
 bool IsNameEqual(const std::string& first, const std::string& second)
 {
@@ -69,7 +68,7 @@ void ConsoleApi::InitCmd(int offsetLeft, int offsetTop, int width, int height,
                          bool isAlwaysOnTop)
 {
 
-  g_windowsConsolePrinter = std::make_unique<WindowsConsolePrinter>(
+  g_windowsConsolePrinter = std::make_shared<WindowsConsolePrinter>(
     offsetLeft, offsetTop, width, height, isAlwaysOnTop);
 }
 

skyrim-platform/src/platform_se/skyrim_platform/ExceptionPrinter.cpp

@@ -1,5 +1,10 @@
 #include "ExceptionPrinter.h"
 #include "ConsoleApi.h"
+#include "IConsolePrinter.h"
+
+// ConsoleApi.cpp
+extern std::shared_ptr<IConsolePrinter> g_printer;
+extern std::shared_ptr<IConsolePrinter> g_windowsConsolePrinter;
 
 const char* ExceptionPrinter::RemoveMultiplePrefixes(const char* str,
                                                      const char* prefix)
@@ -41,7 +46,18 @@ void ExceptionPrinter::PrintException(const char* what)
       msg += '...';
     }
     const char* prefix = ConsoleApi::GetExceptionPrefix();
-    console->Print("%s%s", (i ? "" : prefix), msg.data());
+
+    if (i > 0) {
+      g_printer->PrintRaw(msg.data());
+    } else {
+      msg = std::string(prefix) + msg;
+      g_printer->PrintRaw(msg.data());
+    }
+
+    if (g_windowsConsolePrinter) {
+      g_windowsConsolePrinter->PrintRaw(msg.data());
+    }
+
     ++i;
   };
 

skyrim-platform/src/platform_se/skyrim_platform/IConsolePrinter.h

@@ -8,4 +8,5 @@ class IConsolePrinter
   virtual ~IConsolePrinter() = default;
 
   virtual void Print(const JsFunctionArguments& args) = 0;
+  virtual void PrintRaw(const char* str) = 0;
 };

skyrim-platform/src/platform_se/skyrim_platform/InGameConsolePrinter.cpp

@@ -30,3 +30,12 @@ void InGameConsolePrinter::Print(const JsFunctionArguments& args)
   const char* prefix = ConsoleApi::GetScriptPrefix();
   console->Print("%s%s", prefix, s.data());
 }
+
+void InGameConsolePrinter::PrintRaw(const char* str)
+{
+  auto console = RE::ConsoleLog::GetSingleton();
+  if (!console)
+    throw NullPointerException("console");
+
+  console->Print(str);
+}

skyrim-platform/src/platform_se/skyrim_platform/InGameConsolePrinter.h

@@ -5,4 +5,5 @@ class InGameConsolePrinter : public IConsolePrinter
 {
 public:
   void Print(const JsFunctionArguments& args) override;
+  void PrintRaw(const char* str) override;
 };

skyrim-platform/src/platform_se/skyrim_platform/WindowsConsolePrinter.cpp

@@ -43,3 +43,8 @@ void WindowsConsolePrinter::Print(const JsFunctionArguments& args)
 
   std::cout << s << std::endl;
 }
+
+void WindowsConsolePrinter::PrintRaw(const char* str)
+{
+  std::cout << str << std::endl;
+}

skyrim-platform/src/platform_se/skyrim_platform/WindowsConsolePrinter.h

@@ -9,4 +9,5 @@ class WindowsConsolePrinter : public IConsolePrinter
   ~WindowsConsolePrinter() override;
 
   void Print(const JsFunctionArguments& args) override;
+  void PrintRaw(const char* str) override;
 };