aboutsummaryrefslogtreecommitdiff
path: root/ShiftOS_TheReturn
diff options
context:
space:
mode:
Diffstat (limited to 'ShiftOS_TheReturn')
-rw-r--r--ShiftOS_TheReturn/CommandParser.cs366
-rw-r--r--ShiftOS_TheReturn/Commands.cs1
-rw-r--r--ShiftOS_TheReturn/ShiftOS.Engine.csproj1
-rw-r--r--ShiftOS_TheReturn/TerminalBackend.cs135
4 files changed, 445 insertions, 58 deletions
diff --git a/ShiftOS_TheReturn/CommandParser.cs b/ShiftOS_TheReturn/CommandParser.cs
new file mode 100644
index 0000000..182ff53
--- /dev/null
+++ b/ShiftOS_TheReturn/CommandParser.cs
@@ -0,0 +1,366 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace ShiftOS.Engine {
+ public static class CurrentCommandParser {
+ public static CommandParser parser;
+ }
+
+ public class CommandParser {
+ public IList<CommandFormat> parts = new List<CommandFormat>();
+
+ public void AddPart(CommandFormat part) {
+ parts.Add(part);
+ }
+
+ public void ImportPart(IList<CommandFormat> parts) {
+ this.parts = parts;
+ }
+
+ public string Save() {
+ JArray data = new JArray();
+ foreach(CommandFormat part in parts) {
+ CFValue val = new CFValue(part);
+ JObject obj = new JObject();
+ obj["type"] = new JValue(val.type);
+ obj["text"] = new JValue(val.text);
+ data.Add(obj);
+ }
+
+ return data.ToString();
+ }
+
+ public static CommandParser Load(string val) {
+ CommandParser parser = new CommandParser();
+ JArray data = JArray.Parse(val);
+
+ IList<CFValue> values = data.Select(obj => new CFValue (
+ (string)obj["type"],
+ (string)obj["text"]
+ )).ToList();
+
+ foreach(CFValue value in values) {
+ parser.AddPart(value.GetCommandFormat());
+ }
+
+ return parser;
+ }
+
+ public KeyValuePair<KeyValuePair<string, string>, Dictionary<string, string>> ParseCommand(string cdd) {
+ string command = "";
+ string ns = "";
+ Dictionary<string, string> arguments = new Dictionary<string, string>();
+
+ string text = cdd;
+ int position = 0;
+
+ int commandPos;
+ int firstValuePos = -1;
+ int lastValuePos = -1;
+
+ string syntaxError = "";
+
+ for (int ii = 0; ii < parts.Count; ii++) {
+ CommandFormat part = parts[ii];
+ if (part is CommandFormatMarker) {
+ if (part is CommandFormatCommand) {
+ commandPos = ii;
+ } else if (part is CommandFormatValue) {
+ if (firstValuePos > -1)
+ lastValuePos = ii;
+ else
+ firstValuePos = ii;
+ }
+ }
+ }
+
+ int i = 0;
+ string currentArgument = "";
+ int help = -1;
+
+ while (position < text.Length) {
+
+ if (i >= parts.Count) {
+ position = text.Length;
+ command = "+FALSE+";
+ i = 0;
+ }
+
+ CommandFormat part = parts[i];
+ string res = part.CheckValidity(text.Substring(position));
+
+ // ok so:
+
+ // example
+ // COMMAND text[ --] ARGUMENT VALUE text[ --] ARGUMENT VALUE
+ // COMMAND text[{] ARGUMENT text[=] VALUE text[, ] ARGUMENT text[=] VALUE text[}]
+
+ if (part is CommandFormatMarker) {
+ if (part is CommandFormatNamespace) {
+ ns = res;
+ help = -1;
+ }else if (part is CommandFormatCommand) {
+ command = res;
+ help = -1;
+ } else if (part is CommandFormatArgument) {
+ currentArgument = res;
+ help = -1;
+ } else if (part is CommandFormatValue) {
+ arguments[currentArgument] = string.Join("", res.Split('"'));
+
+ if (i == firstValuePos)
+ help = lastValuePos;
+ if (i == lastValuePos)
+ help = firstValuePos;
+ }
+ }
+
+ if (res == "+FALSE+") {
+ if (help > -1) {
+ i = help;
+ if (i >= parts.Count) {
+ position = text.Length;
+ command = "+FALSE+";
+ }
+ } else {
+ position = text.Length;
+ syntaxError = "Syntax Error";
+ command = "+FALSE+";
+ }
+ help = -1;
+ } else {
+ position += res.Length;
+ }
+
+ i++;
+ }
+
+ if (command == "+FALSE+") {
+ //lblExampleCommand.Text = "Syntax Error";
+ return new KeyValuePair<KeyValuePair<string, string>, Dictionary<string, string>>();
+ } else {
+ /*string argvs = "{";
+
+ foreach (KeyValuePair<string, string> entry in arguments) {
+ argvs += entry.Key + "=" + entry.Value + ", ";
+ }
+
+ argvs += "}";
+
+ lblExampleCommand.Text = command + argvs;*/
+ return new KeyValuePair<KeyValuePair<string, string>, Dictionary<string, string>> (new KeyValuePair<string, string>(ns, command), arguments);
+ }
+ }
+ }
+
+ public class CFValue {
+ public string type { get; set; }
+ public string text { get; set; }
+
+ public CFValue(string type, string text) {
+ this.type = type;
+ this.text = text;
+ }
+
+ public CFValue(CommandFormat format) {
+ type = "";
+ text = "";
+ if(format is CommandFormatText) {
+ text = ((CommandFormatText) format).str;
+ if(format is CommandFormatOptionalText) {
+ type = "optionalText";
+ }else if (format is CommandFormatRegex) {
+ type = "regexText";
+ }else {
+ type = "text";
+ }
+ }else if (format is CommandFormatMarker) {
+ if (format is CommandFormatNamespace) {
+ type = "namespace";
+ } else if (format is CommandFormatCommand) {
+ type = "command";
+ } else if (format is CommandFormatArgument) {
+ type = "argument";
+ } else if (format is CommandFormatValue) {
+ type = "value";
+ }
+ }
+ }
+
+ public CommandFormat GetCommandFormat() { // TODO update with better code
+ switch (type) {
+ case "text":
+ return new CommandFormatText(text);
+ case "optionalText":
+ return new CommandFormatOptionalText(text);
+ case "regexText":
+ return new CommandFormatRegex(text);
+ case "namespace":
+ return new CommandFormatNamespace();
+ case "command":
+ return new CommandFormatCommand();
+ case "argument":
+ return new CommandFormatArgument();
+ case "value":
+ return new CommandFormatValue();
+ case "color":
+ throw new NotImplementedException(); // fix this (make it not a notimplementedexception)
+ }
+ return new CommandFormatMarker();
+ }
+ }
+
+
+ public interface CommandFormat {
+ string CheckValidity(string check);
+ Control Draw();
+ }
+ public class CommandFormatText : CommandFormat {
+ public string str = "";
+ TextBox textBox;
+
+ public CommandFormatText() {
+
+ }
+
+ public CommandFormatText(string str) {
+ this.str = str;
+ }
+
+ public virtual string CheckValidity(string check) {
+ return check.StartsWith(str) ? str : "+FALSE+";
+ }
+
+ public Control Draw() {
+ textBox = new TextBox();
+ textBox.TextChanged += new EventHandler(TextChanged);
+ textBox.Location = new Point(0, 0);
+ textBox.Text = str;
+
+ return textBox;
+ }
+
+ void TextChanged(object sender, EventArgs e) {
+ str = textBox.Text;
+ }
+ }
+
+ public class CommandFormatOptionalText : CommandFormatText {
+ public CommandFormatOptionalText() : base() {
+ }
+ public CommandFormatOptionalText(string str) : base(str) {
+ }
+
+ public override string CheckValidity(string check) {
+ return check.StartsWith(str) ? str : "";
+ }
+ }
+
+ public class CommandFormatRegex : CommandFormatText {
+ public CommandFormatRegex() : base() {
+ }
+ public CommandFormatRegex(string str) : base(str) {
+ }
+
+ public override string CheckValidity(string check) {
+ Match match = (new Regex("^" + str)).Match(check);
+ return match.Success ? match.Value : "+FALSE+";
+ }
+ }
+
+ public class CommandFormatMarker : CommandFormat {
+ protected string str;
+ Button button;
+
+ public CommandFormatMarker() {
+ }
+
+ public virtual string CheckValidity(string check) {
+ string res = string.Empty;
+ string alphanumeric = "QWERTYUIOPASDFGHJKLZXCVBNMqwertyuiopasdfghjklzxcvbnm"; // not using regex for performance reasons
+
+ foreach (char c in check) {
+ if (alphanumeric.IndexOf(c) > -1) {
+ res += c;
+ } else {
+ break;
+ }
+ }
+
+ return res;
+ }
+
+ public virtual Control Draw() {
+ button = new Button();
+ button.Location = new Point(0, 0);
+ button.Text = "Marker";
+
+ return button;
+ }
+ }
+
+ public class CommandFormatCommand : CommandFormatMarker {
+ public override Control Draw() {
+ Button draw = (Button)base.Draw();
+ draw.Text = "Command";
+ return draw;
+ }
+ }
+
+ public class CommandFormatNamespace : CommandFormatMarker {
+ public override Control Draw() {
+ Button draw = (Button)base.Draw();
+ draw.Text = "Namespace";
+ return draw;
+ }
+ }
+
+ public class CommandFormatArgument : CommandFormatMarker {
+ public override Control Draw() {
+ Button draw = (Button)base.Draw();
+ draw.Text = "Argument";
+ return draw;
+ }
+ }
+
+ public class CommandFormatValue : CommandFormatMarker {
+ public override string CheckValidity(string cd) {
+ string res = string.Empty;
+ var check = "";
+ bool done = false;
+
+ if (cd.StartsWith("\"")) {
+ check = cd.Substring(1);
+
+ foreach (char c in check) {
+ if (c != '"') {
+ res += c;
+ } else {
+ done = true;
+ res = "\"" + res + "\"";
+ break;
+ }
+ }
+ } else{
+ res = base.CheckValidity(cd);
+ done = true;
+ }
+ return done ? res : "+FALSE+";
+ }
+
+ public override Control Draw() {
+ Button draw = (Button)base.Draw();
+ draw.Text = "\"Value\"";
+ return draw;
+ }
+ }
+}
diff --git a/ShiftOS_TheReturn/Commands.cs b/ShiftOS_TheReturn/Commands.cs
index 7e517c1..73a7e2d 100644
--- a/ShiftOS_TheReturn/Commands.cs
+++ b/ShiftOS_TheReturn/Commands.cs
@@ -269,6 +269,7 @@ namespace ShiftOS.Engine
[RequiresArgument("type")]
public static bool MultArg(Dictionary<string, object> args)
{
+ Console.WriteLine("Success! "+args.ToString());
return true;
}
diff --git a/ShiftOS_TheReturn/ShiftOS.Engine.csproj b/ShiftOS_TheReturn/ShiftOS.Engine.csproj
index 00d828f..b6ff903 100644
--- a/ShiftOS_TheReturn/ShiftOS.Engine.csproj
+++ b/ShiftOS_TheReturn/ShiftOS.Engine.csproj
@@ -97,6 +97,7 @@
<Compile Include="AppearanceManager.cs" />
<Compile Include="AppLauncherDaemon.cs" />
<Compile Include="AudioManager.cs" />
+ <Compile Include="CommandParser.cs" />
<Compile Include="Commands.cs" />
<Compile Include="Command.cs" />
<Compile Include="ConsoleEx.cs" />
diff --git a/ShiftOS_TheReturn/TerminalBackend.cs b/ShiftOS_TheReturn/TerminalBackend.cs
index e4bad33..318c818 100644
--- a/ShiftOS_TheReturn/TerminalBackend.cs
+++ b/ShiftOS_TheReturn/TerminalBackend.cs
@@ -32,26 +32,21 @@ using System.Threading.Tasks;
using Newtonsoft.Json;
using static ShiftOS.Engine.SaveSystem;
-namespace ShiftOS.Engine
-{
- public static class TerminalBackend
- {
+namespace ShiftOS.Engine {
+ public static class TerminalBackend {
public static event Action<string, string> CommandProcessed;
public static bool Elevated { get; set; }
- public static Dictionary<string, object> GetArgs(ref string text)
- {
+ public static Dictionary<string, string> GetArgs(ref string text) {
bool shouldParse = false;
int argStart = 0;
- if (text.Contains("{"))
- {
+ if (text.Contains("{")) {
shouldParse = true;
argStart = text.IndexOf('{');
}
- if (shouldParse == false)
- {
+ if (shouldParse == false) {
string replacement = Regex.Replace(text, @"\t|\n|\r", "");
text = replacement + "{}";
shouldParse = true;
@@ -61,15 +56,47 @@ namespace ShiftOS.Engine
string args = text.Substring(argStart, text.Length - argStart);
text = text.Remove(argStart, text.Length - argStart).Replace(" ", "");
- return JsonConvert.DeserializeObject<Dictionary<string, object>>(args);
+ return JsonConvert.DeserializeObject<Dictionary<string, string>>(args);
}
public static string LastCommand = "";
- public static void InvokeCommand(string text, bool isRemote = false)
- {
- try
- {
+ public static void InvokeCommand(string ns, string command, Dictionary<string, string> arguments, bool isRemote = false) {
+ try {
+ if (string.IsNullOrWhiteSpace(ns))
+ return;
+
+
+ bool commandWasClient = RunClient(ns, command, arguments, isRemote);
+
+ if (!commandWasClient && !string.IsNullOrWhiteSpace(ns)) {
+ PrefixEnabled = false;
+
+ ServerManager.SendMessage("script", $@"{{
+ user: ""{ns}"",
+ script: ""{command}"",
+ args: ""{GetSentArgs(arguments)}""
+}}");
+ }
+
+ CommandProcessed?.Invoke(ns + "." + command, JsonConvert.SerializeObject(arguments));
+ } catch (Exception ex) {
+ Console.WriteLine($"Command parse error: {ex.Message}"); // This shouldn't ever be called now
+ PrefixEnabled = true;
+
+ }
+ }
+
+ public static string GetSentArgs(Dictionary<string, string> argss) {
+ Dictionary<string, object> args = new Dictionary<string, object>();
+ foreach (KeyValuePair<string, string> arg in argss) {
+ args[arg.Key] = arg.Value;
+ }
+ return JsonConvert.SerializeObject(args);
+ }
+
+ public static void InvokeCommand(string text, bool isRemote = false) {
+ try {
if (string.IsNullOrWhiteSpace(text))
return;
@@ -77,19 +104,17 @@ namespace ShiftOS.Engine
bool commandWasClient = RunClient(text, args, isRemote);
- if (!commandWasClient && !string.IsNullOrWhiteSpace(text))
- {
+ if (!commandWasClient) {
PrefixEnabled = false;
+
ServerManager.SendMessage("script", $@"{{
user: ""{text.Split('.')[0]}"",
script: ""{text.Split('.')[1]}"",
- args: ""{JsonConvert.SerializeObject(args)}""
+ args: ""{GetSentArgs(args)}""
}}");
}
- CommandProcessed?.Invoke(text, JsonConvert.SerializeObject(args));
- }
- catch (Exception ex)
- {
+ CommandProcessed?.Invoke(text, GetSentArgs(args));
+ } catch (Exception ex) {
Console.WriteLine($"Command parse error: {ex.Message}");
PrefixEnabled = true;
@@ -104,18 +129,15 @@ namespace ShiftOS.Engine
public static event EmptyEventHandler TerminalRequested;
- internal static void OpenTerminal()
- {
+ internal static void OpenTerminal() {
TerminalRequested?.Invoke();
}
- public static bool CanRunRemotely(MethodInfo mth, bool isRemote)
- {
+ public static bool CanRunRemotely(MethodInfo mth, bool isRemote) {
if (!isRemote)
return true;
- foreach(var attr in mth.GetCustomAttributes(false))
- {
+ foreach (var attr in mth.GetCustomAttributes(false)) {
if (attr is RemoteLockAttribute)
return false;
}
@@ -123,18 +145,29 @@ namespace ShiftOS.Engine
return true;
}
- public static bool RunClient(string text, Dictionary<string, object> args, bool isRemote = false)
- {
+ public static bool RunClient(string ns, string cmd, Dictionary<string, string> args, bool isRemote = false) {
+ return RunClient(ns + "." + cmd, args, isRemote);
+ }
+
+
+ public static bool RunClient(string text, Dictionary<string, string> argss, bool isRemote = false) {
+ Dictionary<string, object> args = new Dictionary<string, object>();
+ foreach (KeyValuePair<string, string> arg in argss) {
+ args[arg.Key] = arg.Value;
+ }
+ return RunClient(text, args, isRemote);
+ }
+
+ public static bool RunClient(string text, Dictionary<string, object> args, bool isRemote = false) {
latestCommmand = text;
- foreach (var asmExec in System.IO.Directory.GetFiles(Environment.CurrentDirectory))
- {
- try
- {
+ //Console.WriteLine(text + " " + "{" + string.Join(",", args.Select(kv => kv.Key + "=" + kv.Value).ToArray()) + "}" + " " + isRemote);
+
+ foreach (var asmExec in System.IO.Directory.GetFiles(Environment.CurrentDirectory)) {
+ try {
var asm = Assembly.LoadFile(asmExec);
var types = asm.GetTypes();
-
foreach (var type in types)
{
if (Shiftorium.UpgradeAttributesUnlocked(type))
@@ -187,7 +220,6 @@ namespace ShiftOS.Engine
}
var requiresArgs = method.GetCustomAttributes<RequiresArgument>();
-
bool error = false;
bool providedusage = false;
@@ -211,7 +243,6 @@ namespace ShiftOS.Engine
providedusage = true;
}
-
if (Shiftorium.UpgradeInstalled("help_usage"))
{
Console.WriteLine(Localization.Parse("{ERROR_ARGUMENT_REQUIRED}", new Dictionary<string, string>() {
@@ -284,9 +315,7 @@ namespace ShiftOS.Engine
}
}
- }
- else
- {
+ } else {
Console.WriteLine(text + " cannot be ran in a remote session");
return true;
}
@@ -331,12 +360,10 @@ namespace ShiftOS.Engine
}
}
}
- }
- catch { }
+ } catch { }
}
return false;
}
-
public static void PrintPrompt()
{
if (SaveSystem.CurrentSave != null)
@@ -383,34 +410,26 @@ namespace ShiftOS.Engine
string text3 = "";
string text4 = msg.Contents;
- if (TerminalBackend.PrefixEnabled)
- {
+ if (TerminalBackend.PrefixEnabled) {
text3 = text4.Remove(0, $"{SaveSystem.CurrentSave.Username}@{SaveSystem.CurrentSave.SystemName}:~$ ".Length);
}
IsForwardingConsoleWrites = true;
- if (TerminalBackend.InStory == false)
- {
+ if (TerminalBackend.InStory == false) {
TerminalBackend.InvokeCommand(text3, true);
}
- if (TerminalBackend.PrefixEnabled)
- {
+ if (TerminalBackend.PrefixEnabled) {
Console.Write($"{SaveSystem.CurrentSave.Username}@{SaveSystem.CurrentSave.SystemName}:~$ ");
}
IsForwardingConsoleWrites = false;
- }
- else if (msg.Name == "pleasewrite")
- {
+ } else if (msg.Name == "pleasewrite") {
Console.Write(msg.Contents);
- }
- else if(msg.Name == "handshake_from")
- {
+ } else if (msg.Name == "handshake_from") {
var a = JsonConvert.DeserializeObject<Dictionary<string, object>>(msg.Contents);
string uName = a["username"] as string;
string pass = a["password"] as string;
string sys = a["sysname"] as string;
string guid = msg.GUID;
- if(SaveSystem.CurrentSave.Username == uName && SaveSystem.CurrentSave.Password == pass && CurrentSave.SystemName == sys)
- {
+ if (SaveSystem.CurrentSave.Username == uName && SaveSystem.CurrentSave.Password == pass && CurrentSave.SystemName == sys) {
ForwardGUID = guid;
ServerManager.SendMessage("trm_handshake_accept", $@"{{
guid: ""{ServerManager.thisGuid}"",
@@ -430,6 +449,6 @@ namespace ShiftOS.Engine
public static bool IsForwardingConsoleWrites { get; internal set; }
public static string ForwardGUID { get; internal set; }
-
+
}
}
generated by cgit v1.2.3 (git 2.46.0) at 2026-06-23 12:07:05 +0000