"help list-commands and "history" working

Blink/Commands/clear.m

@@ -31,8 +31,11 @@
 
 #include <stdio.h>
 #include "ios_system/ios_system.h"
+#include "ios_error.h"
 #include "MCPSession.h"
 
 int clear_main(int argc, char *argv[]) {
-  return [[(__bridge MCPSession *)thread_context repl] clear_main:argc argv:argv];
+//  return [[(__bridge MCPSession *)thread_context repl] clear_main:argc argv:argv];
+  puts("\033c\033[H\033[2J\033[0m");
+  return 0;
 }

Blink/Commands/help.m

@@ -34,6 +34,8 @@
 
 #include "ios_system/ios_system.h"
 #include "ios_error.h"
+#include <Blink-Swift.h>
+#include "MCPSession.h"
 
 NSString *__shortVersionString()
 {
@@ -48,9 +50,23 @@
           appDisplayName, majorVersion, minorVersion, compileDate];
 }
 
+void __print_commands() {
+  MCPSession *session = (__bridge MCPSession *)thread_context;
+  if (!session) {
+    return;
+  }
+
+  NSString *formattedCommands = [CompleteClass formattedCommandsWithWidth: session.device.cols];
+  puts(formattedCommands.UTF8String);
+}
+
 
 int help_main(int argc, char *argv[]) {
 
+  if (argc == 2 && [@"list-commands" isEqual: @(argv[1])]) {
+    __print_commands();
+    return 0;
+  }
   NSString *help = [@[
     @"",
     __shortVersionString(),

Blink/Commands/history.m

@@ -30,9 +30,48 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <stdio.h>
+#include "BlinkPaths.h"
 #include "ios_system/ios_system.h"
+#include "ios_error.h"
 #include "MCPSession.h"
+#include <Blink-Swift.h>
 
 int history_main(int argc, char *argv[]) {
-  return [[(__bridge MCPSession *)thread_context repl] history_main:argc argv:argv];
+  NSString *args = @"";
+  if (argc == 2) {
+    args = [NSString stringWithUTF8String:argv[1]];
+  }
+  NSInteger number = [args integerValue];
+  if (number != 0) {
+    NSString *history = [NSString stringWithContentsOfFile:[BlinkPaths historyFile]
+                                                  encoding:NSUTF8StringEncoding error:nil];
+    NSArray *lines = [history componentsSeparatedByString:@"\n"];
+    if (!lines) {
+      return 1;
+    }
+    lines = [lines filteredArrayUsingPredicate:[NSPredicate predicateWithFormat:@"self != ''"]];
+
+    NSInteger len = lines.count;
+    NSInteger start = 0;
+    if (number > 0) {
+      len = MIN(len, number);
+    } else {
+      start = MAX(len + number , 0);
+    }
+
+    for (NSInteger i = start; i < len; i++) {
+      puts([NSString stringWithFormat:@"% 4li %@", i + 1, lines[i]].UTF8String);
+    }
+  } else if ([args isEqualToString:@"-c"]) {
+    [HistoryObj clear];
+  } else {
+    NSString *usage = [@[
+                         @"history usage:",
+                         @"history <number> - Show history (can be negative)",
+                         @"history -c       - Clear history",
+                         @""
+                         ] componentsJoinedByString:@"\n"];
+    puts(usage.UTF8String);
+  }
+  return 1;
 }

Blink/Complete.swift

@@ -398,3 +398,25 @@ struct Complete {
   }
 
 }
+
+@objc class CompleteClass: NSObject {
+  @objc static func formattedCommands(width: Int) -> String {
+    let commands = Complete._allCommands().sorted()
+    let count = commands.count
+    guard let maxStr = commands.max(by: {$0.count < $1.count}) else {
+      return ""
+    }
+
+    let columns = max(width / (maxStr.count + 2), 1)
+
+    var lines:[String] = []
+    for i in stride(from: 0, to: count, by: columns) {
+      var line = ""
+      for cmd in commands[i..<min(i + columns, count)] {
+        line += cmd.padding(toLength: maxStr.count + 2, withPad: " ", startingAt: 0)
+      }
+      lines.append(line)
+    }
+    return lines.joined(separator: "\n")
+  }
+}

Blink/History.swift

@@ -101,6 +101,12 @@ struct History {
     _lines = lines
   }
 
+  static func clear() {
+    _historyQueue.async {
+      self._saveLines([])
+    }
+  }
+
   private static func _getLines() -> [String] {
     if let lines = _lines {
       // Keep history for more time
@@ -201,4 +207,8 @@ struct History {
   @objc static func appendIfNeeded(command: String) {
     History.appendIfNeeded(command: command + "") // mosh overwrites internals of the string!
   }
+
+  @objc static func clear() {
+    History.clear()
+  }
 }

Resources/blinkCommandsDictionary.plist

@@ -55,7 +55,7 @@
 	<array>
 		<string>MAIN</string>
 		<string>history_main</string>
-		<string></string>
+		<string>c</string>
 		<string>no</string>
 	</array>
 	<key>geo</key>

Sessions/MCPSession.h

@@ -31,7 +31,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "Repl.h"
+
 #import "Session.h"
 #import "SSHClient.h"
 
@@ -40,7 +40,6 @@
 @interface MCPSession : Session
 
 @property (strong) MCPParams *sessionParams;
-@property (strong, readonly) Repl *repl;
 
 - (void)registerSSHClient:(SSHClient *)sshClient;
 - (void)unregisterSSHClient:(SSHClient *)sshClient;

Sessions/MCPSession.m

@@ -270,7 +270,6 @@ - (void)_runSSHWithArgs:(NSString *)args
 
 - (void)sigwinch
 {
-  [_repl sigwinch];
   [_childSession sigwinch];
   for (WeakSSHClient *client in _sshClients) {
     [client.value sigwinch];
@@ -279,8 +278,6 @@ - (void)sigwinch
 
 - (void)kill
 {
-  [_repl forceExit];
-
   if (_sshClients.count > 0) {
     for (WeakSSHClient *client in _sshClients) {
       [client.value kill];