wk repl

Blink/TermController.swift

@@ -210,6 +210,10 @@ extension TermController: SessionDelegate {
 }
 
 extension TermController: TermDeviceDelegate {
+  func runCommand(_ cmd: String!) {
+
+  }
+
   public func deviceIsReady() {
     startSession()
   }
@@ -239,6 +243,10 @@ extension TermController: TermDeviceDelegate {
   public func viewController() -> UIViewController! {
     return self
   }
+
+  public func lineSubmitted(_ line: String!) {
+    _session?.enqueueCommand(line)
+  }
 }
 
 extension TermController: SuspendableSession {

Blink/TermDevice.h

@@ -41,6 +41,7 @@
 - (void)deviceSizeChanged;
 - (void)viewFontSizeChanged:(NSInteger)size;
 - (BOOL)handleControl:(NSString *)control;
+- (void)lineSubmitted:(NSString *)line;
 - (void)deviceFocused;
 - (UIViewController *)viewController;
 
@@ -63,6 +64,8 @@
 - (void)attachInput:(TermInput *)termInput;
 - (void)attachView:(TermView *)termView;
 
+- (void)onSubmit:(NSString *)line;
+
 - (void)focus;
 - (void)blur;
 

Blink/TermDevice.m

@@ -197,6 +197,10 @@ - (id)init
 
 - (void)write:(NSString *)input
 {
+  if (!_rawMode) {
+    [self.view processKB:input];
+    return;
+  }
   NSUInteger len = [input lengthOfBytesUsingEncoding:NSUTF8StringEncoding];
   write(_pinput[1], input.UTF8String, len);
   if (_echoMode) {
@@ -352,11 +356,19 @@ - (void)viewWinSizeChanged:(struct winsize)newWinSize
   [_delegate deviceSizeChanged];
 }
 
+- (void)onSubmit:(NSString *)line {
+  [_delegate lineSubmitted:line];
+}
+
 - (void)viewSendString:(NSString *)data
 {
   [self write:data];
 }
 
+- (void)viewSubmitLine:(NSString *)line {
+  [_delegate lineSubmitted:line];
+}
+
 - (void)viewCopyString:(NSString *)text
 {
   [[UIPasteboard generalPasteboard] setString:text];

Blink/TermJS.h

@@ -176,6 +176,10 @@ NSString *term_setAutoCarriageReturn(BOOL state)
   return [NSString stringWithFormat:@"term_setAutoCarriageReturn(%@);", state ? @"true" : @"false"];
 }
 
+NSString *term_processKB(NSString *str) {
+  return  [NSString stringWithFormat:@"term_processKB(%@[0])", _encodeString(str)];
+}
+
 NSString *term_restore() {
   return @"term_restore()";
 }

Blink/TermView.h

@@ -49,6 +49,7 @@
 - (void)viewSendString:(NSString *)data;
 - (void)viewCopyString:(NSString *)text;
 - (void)viewShowAlert:(NSString *)title andMessage:(NSString *)message;
+- (void)viewSubmitLine:(NSString *)line;
 
 @end
 
@@ -76,6 +77,7 @@
 - (void)setWidth:(NSInteger)count;
 - (void)setFontSize:(NSNumber *)newSize;
 - (void)write:(NSString *)data;
+- (void)processKB:(NSString *)str;
 - (void)setCursorBlink:(BOOL)state;
 - (void)setBoldAsBright:(BOOL)state;
 - (void)setBoldEnabled:(NSUInteger)state;

Blink/TermView.m

@@ -291,6 +291,10 @@ - (void)blur
   [_webView evaluateJavaScript:term_blur() completionHandler:nil];
 }
 
+- (void)processKB:(NSString *)str {
+  [self _evalJSScript: term_processKB(str)];
+}
+
 // Write data to terminal control
 - (void)write:(NSString *)data
 {
@@ -377,6 +381,8 @@ - (void)userContentController:(WKUserContentController *)userContentController
     [_device viewShowAlert:data[@"title"] andMessage:data[@"message"]];
   } else if ([operation isEqualToString:@"sendString"]) {
     [_device viewSendString:data[@"string"]];
+  } else if ([operation isEqualToString:@"line"]) {
+    [_device viewSubmitLine:data[@"text"]];
   }
 }
 

Resources/term.js

@@ -60,6 +60,14 @@ function term_setupDefaults() {
   term_set('allow-images-inline', true); // need to make it work
 }
 
+var _kb;
+
+function term_processKB(str) {
+  if (_kb && str) {
+    _kb.processInput(str);
+  }
+}
+
 function term_setup() {
   t = new hterm.Terminal('blink');
 
@@ -77,6 +85,8 @@ function term_setup() {
     document.body.style.backgroundColor =
       t.scrollPort_.screen_.style.backgroundColor;
     var bgColor = _colorComponents(t.scrollPort_.screen_.style.backgroundColor);
+
+    _kb = new TermPrompt("", t);
     _postMessage('terminalReady', {size, bgColor});
 
     t.keyboard.characterEncoding = 'raw'; // we are UTF8. Fix for #507

Sessions/MCPSession.h

@@ -45,6 +45,7 @@
 - (void)registerSSHClient:(SSHClient *)sshClient;
 - (void)unregisterSSHClient:(SSHClient *)sshClient;
 
+- (void)enqueueCommand:(NSString *)cmd;
 - (bool)isRunningCmd;
 
 - (void)updateAllowedPaths;

Sessions/MCPSession.m

@@ -62,6 +62,7 @@ @implementation MCPSession {
   Session *_childSession;
   NSString *_currentCmd;
   NSMutableArray<WeakSSHClient *> *_sshClients;
+  dispatch_queue_t _cmdQueue;
 }
 
 @dynamic sessionParams;
@@ -70,20 +71,72 @@ - (id)initWithDevice:(TermDevice *)device andParams:(MCPParams *)params {
   if (self = [super initWithDevice:device andParams:params]) {
     _sshClients = [[NSMutableArray alloc] init];
     _sessionUUID = [[NSProcessInfo processInfo] globallyUniqueString];
+    _cmdQueue = dispatch_queue_create("mcp.command.queue", DISPATCH_QUEUE_SERIAL);
   }
 
   return self;
 }
 
-- (int)main:(int)argc argv:(char **)argv
-{
+- (void)executeWithArgs:(NSString *)args {
+
+}
+
+- (void)enqueueCommand:(NSString *)cmd {
+  if (_currentCmd) {
+    [_device writeIn:cmd];
+    return;
+  }
+  dispatch_async(_cmdQueue, ^{
+//    [_device writeIn:@"\n"];
+    [self _runCommand:cmd];
+  });
+}
+
+- (BOOL)_runCommand:(NSString *)cmdline {
   [self setActiveSession];
   ios_setMiniRoot([BlinkPaths documents]);
   ios_setStreams(_stream.in, _stream.out, _stream.err);
   ios_setContext((__bridge void*)self);
   [self updateAllowedPaths];
   [[NSFileManager defaultManager] changeCurrentDirectoryPath:[BlinkPaths documents]];
+
 
+  NSArray *arr = [cmdline componentsSeparatedByString:@" "];
+  NSString *cmd = arr[0];
+
+  if ([cmd isEqualToString:@"exit"]) {
+    return NO;
+  } else if ([cmd isEqualToString:@"mosh"]) {
+    [self _runMoshWithArgs:cmdline];
+    if (self.sessionParams.hasEncodedState) {
+      return NO;
+    }
+  } else if ([cmd isEqualToString:@"ssh2"]) {
+    [self _runSSHWithArgs:cmdline];
+  } else if ([cmd isEqualToString:@"ssh-copy-id"]) {
+    [self _runSSHCopyIDWithArgs:cmdline];
+  } else {
+    [self.delegate indexCommand:cmdline];
+    _currentCmd = cmdline;
+    thread_stdout = nil;
+    thread_stdin = nil;
+    thread_stderr = nil;
+
+    // Re-evalute column number before each command
+    setenv("COLUMNS", [@(_device->win.ws_col) stringValue].UTF8String, 1); // force rewrite of value
+    ios_system(cmdline.UTF8String);
+    _currentCmd = nil;
+    _sshClients = [[NSMutableArray alloc] init];
+  }
+
+  [_device setRawMode:NO];
+
+  return YES;
+}
+
+- (int)main:(int)argc argv:(char **)argv
+{
+
   // We are restoring mosh session if possible first.
   if ([@"mosh" isEqualToString:self.sessionParams.childSessionType] && self.sessionParams.hasEncodedState) {
     _childSession = [[MoshSession alloc] initWithDevice:_device andParams:self.sessionParams.childSessionParams];
@@ -94,41 +147,6 @@ - (int)main:(int)argc argv:(char **)argv
     }
   }
 
-  // Running repl loop
-  _repl = [[Repl alloc] initWithDevice:_device andStream: _stream];
-  [_repl loopWithCallback:^BOOL(NSString *cmdline) {
-
-    NSArray *arr = [cmdline componentsSeparatedByString:@" "];
-    NSString *cmd = arr[0];
-
-    if ([cmd isEqualToString:@"exit"]) {
-      return NO;
-    } else if ([cmd isEqualToString:@"mosh"]) {
-      [self _runMoshWithArgs:cmdline];
-      if (self.sessionParams.hasEncodedState) {
-        return NO;
-      }
-    } else if ([cmd isEqualToString:@"ssh2"]) {
-      [self _runSSHWithArgs:cmdline];
-    } else if ([cmd isEqualToString:@"ssh-copy-id"]) {
-      [self _runSSHCopyIDWithArgs:cmdline];
-    } else {
-      [self.delegate indexCommand:cmdline];
-      _currentCmd = cmdline;
-      thread_stdout = nil;
-      thread_stdin = nil;
-      thread_stderr = nil;
-
-      // Re-evalute column number before each command
-      setenv("COLUMNS", [@(_device->win.ws_col) stringValue].UTF8String, 1); // force rewrite of value
-      ios_system(cmdline.UTF8String);
-      _currentCmd = nil;
-      _sshClients = [[NSMutableArray alloc] init];
-    }
-
-    return YES;
-  }];
-
   return 0;
 }
 
@@ -278,6 +296,11 @@ - (BOOL)handleControl:(NSString *)control
         ios_kill();
       }
       return YES;
+    } else {
+      if ([_device rawMode]) {
+        return YES;
+      }
+      return NO;
     }
     return YES;
   }