Improve spirit agent

Improve spirit agent

Author: und3f

Spirit/Install.HC

@@ -1,8 +1,9 @@
-#define INS_DIR "~/Spirit"
+#define INS_DIR "::/Apps/Spirit"
 
 if (!FileFind(INS_DIR,, FUF_JUST_DIRS))
   DirMk(INS_DIR);
 
+Cd(__DIR__);
 CopyTree("*", INS_DIR, FALSE);
 
 "\n";

Spirit/Spirit.HC

@@ -97,8 +97,12 @@ Bool GrabPutS(U8 *str)
 #define CMD_EXECUTE   "Exec"
 #define CMD_CLIP_SET  "ClipSet"
 #define CMD_CLIP_GET  "ClipGet"
+#define CMD_PING      "Ping"
+
+#define LINE_END "\r\n"
+#define RESP_UNKNOWN_CMD "Unknown command" LINE_END
+#define RESP_PONG "Pong" LINE_END
 
-#define RESP_UNKNOWN_CMD "Unknown command\r\n"
 U8* SpiritDefaultHandler()
 {
   return MStrPrint(RESP_UNKNOWN_CMD);
@@ -156,11 +160,17 @@ U8*SpiritCmdClipGet()
   return clip;
 }
 
-U8* (*handlers)()[4] = {
+U8* SpiritCmdPing()
+{
+  return MStrPrint(RESP_PONG);
+}
+
+U8* (*handlers)()[5] = {
   &SpiritCmdUserTask,
   &SpiritCmdExecute,
   &SpiritCmdClipSet,
-  &SpiritCmdClipGet
+  &SpiritCmdClipGet,
+  &SpiritCmdPing
 };
 
 U0 LoadCommands()
@@ -170,7 +180,9 @@ U0 LoadCommands()
 	CMD_USER_TASK "\0"
         CMD_EXECUTE "\0"
         CMD_CLIP_SET "\0"
-        CMD_CLIP_GET "\0");
+        CMD_CLIP_GET "\0"
+        CMD_PING "\0"
+  );
 }
 
 U0 WaitCommand(){
@@ -211,3 +223,4 @@ U0 StartUpSpirit()
     "Spirit guest agent"
   );
 }
+ 

SpiritApi/C/src/app.c SpiritApi/C/src/cmd.cSpiritApi/C/src/app.c renamed to SpiritApi/C/src/cmd.c

@@ -21,13 +21,14 @@ void usage(int exitCode, const char *errorMsg, ...)
       "Options:\n"
       "  -h\t\t\tPrint usage message.\n"
       "  -c\t\t\tSet connection information, format:\n"
-      "\t\t\t<tcp:host:port>, example -p tcp:localhost:1234\n"
-      "\t\t\t<unix:unix-socket.file>, example -p unix:/tmp/serial.socket\n"
+      "\t\t\t<tcp:host:port>, example -c tcp:localhost:1234\n"
+      "\t\t\t<unix:unix-socket.file>, example -c unix:/tmp/serial.socket\n"
       "Operations:\n"
       "  user <command>\tSpawn a task and execute the command.\n"
       "  exec <command>\tExecute the command silently and return the result.\n"
       "  clip-get\t\tSet host system's clibpoard to the TempleOS clipboard content.\n"
       "  clip-set\t\tSet TempleOS clipboard content to the host system's clipboard.\n"
+      "  ping\t\tPing Spirit agent.\n"
       ,
       program_invocation_short_name);
 

SpiritApi/C/src/spirit.c

@@ -161,7 +161,10 @@ void spiritExec(struct SpiritConnection spirit, int argc, char **argv)
     spiritSendStr(spirit, "clipSet");
     spiritSendStr(spirit, argv[1]);
   } else {
-    usage(EXIT_FAILURE, "Unknown operation `%s`.", op);
+    spiritSendStr(spirit, op);
+    for (int i = 2; i < argc; ++i) {
+      spiritSendStr(spirit, argv[i]);
+    }
   }
 
   char *r = rs232RecvPackage(spirit.socket);