Bitl
/
Novetus_src
1
0
Fork 0
Code Issues 17 Pull Requests Packages Projects Releases Wiki Activity

functional scripts!!!

This commit is contained in:
Bitl 2023-01-05 11:02:55 -07:00
parent f46b7d9a9c
commit 39f99b1470
2 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Novetus/NovetusCore/Classes/Script.cs
View File

@ -81,7 +81,7 @@ error:
foreach (CompilerError error in result.Errors) foreach (CompilerError error in result.Errors)
{ {
ErrorHandler(error, filePath, error.IsWarning, false); ErrorHandler(error, filePath, error.IsWarning);
} }
if (result.Errors.HasErrors) if (result.Errors.HasErrors)
@ -92,17 +92,17 @@ error:
return result.CompiledAssembly; return result.CompiledAssembly;
} }
public static void ErrorHandler(string error, bool finalError = false) public static void ErrorHandler(string error)
{ {
ErrorHandler(error, false, finalError); ErrorHandler(error, false);
} }
private static void ErrorHandler(string error, bool warning, bool finalError) private static void ErrorHandler(string error, bool warning)
{ {
Util.ConsolePrint(warning ? "[SCRIPT WARNING] - " : "[SCRIPT ERROR] - " + error, warning ? 5 : 2); Util.ConsolePrint(warning ? "[SCRIPT WARNING] - " : "[SCRIPT ERROR] - " + error, warning ? 5 : 2);
} }
private static void ErrorHandler(CompilerError error, string fileName, bool warning, bool finalError) private static void ErrorHandler(CompilerError error, string fileName, bool warning)
{ {
Util.ConsolePrint(warning ? "[SCRIPT WARNING] - " : "[SCRIPT ERROR] - " + fileName + " (" + error.Line + "," + error.Column + "): " + error.ErrorText, warning ? 5 : 2); Util.ConsolePrint(warning ? "[SCRIPT WARNING] - " : "[SCRIPT ERROR] - " + fileName + " (" + error.Line + "," + error.Column + "): " + error.ErrorText, warning ? 5 : 2);
} }

39
Novetus/NovetusCore/Classes/WebProxy.cs
View File

@ -16,7 +16,7 @@ namespace Novetus.Core
{ {
public class IWebProxyExtension public class IWebProxyExtension
{ {
public virtual string Name { get; set; } = "Unnamed Web Proxy Extension"; public virtual string Name() { return "Unnamed Web Proxy Extension"; }
public virtual void OnExtensionLoad() { } public virtual void OnExtensionLoad() { }
public virtual void OnProxyStart() { } public virtual void OnProxyStart() { }
public virtual void OnProxyStopped() { } public virtual void OnProxyStopped() { }
@ -24,9 +24,7 @@ namespace Novetus.Core
public virtual bool IsValidURL(string absolutePath, string host) { return false; } public virtual bool IsValidURL(string absolutePath, string host) { return false; }
public virtual Task OnBeforeTunnelConnectRequest(object sender, TunnelConnectSessionEventArgs e) { return Task.CompletedTask; } public virtual Task OnBeforeTunnelConnectRequest(object sender, TunnelConnectSessionEventArgs e) { return Task.CompletedTask; }
#pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously public virtual Task OnRequest(object sender, SessionEventArgs e) { return Task.CompletedTask; }
public virtual async Task OnRequest(object sender, SessionEventArgs e) { }
#pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously
} }
public class WebProxy public class WebProxy
@ -60,12 +58,12 @@ namespace Novetus.Core
{ {
IWebProxyExtension newExt = (IWebProxyExtension)Script.LoadScriptFromContent(file); IWebProxyExtension newExt = (IWebProxyExtension)Script.LoadScriptFromContent(file);
ExtensionList.Add(newExt); ExtensionList.Add(newExt);
Util.ConsolePrint("Web Proxy: Loaded extension " + newExt.Name + " from " + Path.GetFileName(file), 3); Util.ConsolePrint("Web Proxy: Loaded extension " + newExt.Name() + " from " + Path.GetFileName(file), 3);
newExt.OnExtensionLoad(); newExt.OnExtensionLoad();
} }
catch (Exception e) catch (Exception)
{ {
Util.LogExceptions(e); Util.ConsolePrint("Web Proxy: Failed to load script " + Path.GetFileName(file), 2);
} }
} }
} }
@ -121,9 +119,16 @@ namespace Novetus.Core
Server.BeforeRequest += new AsyncEventHandler<SessionEventArgs>(OnRequest); Server.BeforeRequest += new AsyncEventHandler<SessionEventArgs>(OnRequest);
UpdateEndPoint(true); UpdateEndPoint(true);
Util.ConsolePrint("Web Proxy started on port " + GlobalVars.WebProxyPort, 3); Util.ConsolePrint("Web Proxy started on port " + GlobalVars.WebProxyPort, 3);
foreach (IWebProxyExtension extension in ExtensionList.ToArray()) try
{ {
extension.OnProxyStart(); foreach (IWebProxyExtension extension in ExtensionList.ToArray())
{
extension.OnProxyStart();
}
}
catch (Exception ex)
{
Script.ErrorHandler(ex.Message);
} }
} }
catch (Exception e) catch (Exception e)
@ -193,7 +198,7 @@ namespace Novetus.Core
return (ua.Contains("mozilla/4.0") || ua.Contains("roblox")); return (ua.Contains("mozilla/4.0") || ua.Contains("roblox"));
} }
private Task OnBeforeTunnelConnectRequest(object sender, TunnelConnectSessionEventArgs e) private async Task OnBeforeTunnelConnectRequest(object sender, TunnelConnectSessionEventArgs e)
{ {
if (!IsValidURL(e.HttpClient)) if (!IsValidURL(e.HttpClient))
{ {
@ -208,11 +213,11 @@ namespace Novetus.Core
{ {
try try
{ {
extension.OnBeforeTunnelConnectRequest(sender, e); await extension.OnBeforeTunnelConnectRequest(sender, e);
} }
catch (Exception ex) catch (Exception ex)
{ {
Util.LogExceptions(ex); Script.ErrorHandler(ex.Message);
} }
} }
else else
@ -220,8 +225,6 @@ namespace Novetus.Core
e.DecryptSsl = false; e.DecryptSsl = false;
} }
} }
return Task.CompletedTask;
} }
#pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously #pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously
@ -246,7 +249,7 @@ namespace Novetus.Core
} }
catch (Exception ex) catch (Exception ex)
{ {
Util.LogExceptions(ex); Script.ErrorHandler(ex.Message);
e.GenericResponse("", HttpStatusCode.InternalServerError); e.GenericResponse("", HttpStatusCode.InternalServerError);
return; return;
} }
@ -268,11 +271,13 @@ namespace Novetus.Core
{ {
extension.OnProxyStopped(); extension.OnProxyStopped();
} }
catch (Exception e) catch (Exception ex)
{ {
Util.LogExceptions(e); Script.ErrorHandler(ex.Message);
} }
} }
ExtensionList.Clear();
} }
} }
} }