WIP: Add support for using iSH on Apple Watches

README.md

@@ -35,6 +35,8 @@ You'll need these things to build the project:
 
 Open the project in Xcode, open iSH.xcconfig, and change `ROOT_BUNDLE_IDENTIFIER` to something unique. Then click Run. There are scripts that should do everything else automatically. If you run into any problems, open an issue and I'll try to help.
 
+If you want to deploy the project onto your own devices, you'll need a valid developer account. Sign in to your account via Xcode: Xcode -> Preferences -> Accounts. Now go to the project settings and change the value for Signing > Development Team under Build Settings to your development team. To do this a bit more automatically, change the value for one project and then change all occurances of `CK5SXRTBR7` in `iSH.xcodeproj/project.pbxproj` to your development ID for all `DevelopmentTeam` fields. Your ID will be the one not matching `CK5SXRTBR7`.
+
 ## Build command line tool for testing
 
 To set up your environment, cd to the project and run `meson build` to create a build directory in `build`. Then cd to the build directory and run `ninja`.

app/AppDelegate.m

@@ -19,13 +19,14 @@
 #import "Roots.h"
 #import "TerminalViewController.h"
 #import "UserPreferences.h"
+#import <WatchConnectivity/WatchConnectivity.h>
 #include "kernel/init.h"
 #include "kernel/calls.h"
 #include "fs/dyndev.h"
 #include "fs/devices.h"
 #include "fs/path.h"
 
-@interface AppDelegate ()
+@interface AppDelegate () <WCSessionDelegate>
 
 @property BOOL exiting;
 @property NSString *unameVersion;
@@ -203,6 +204,15 @@ + (int)bootError {
 }
 
 - (BOOL)application:(UIApplication *)application willFinishLaunchingWithOptions:(NSDictionary<UIApplicationLaunchOptionsKey,id> *)launchOptions {
+    if(WCSession.isSupported){
+        WCSession* session = WCSession.defaultSession;
+        session.delegate = self;
+        [session activateSession];
+        NSLog(@"Started watch session");
+    } else {
+        NSLog(@"Watch communication not supported");
+    }
+
     NSUserDefaults *defaults = NSUserDefaults.standardUserDefaults;
     if ([defaults boolForKey:@"hail mary"]) {
         [defaults removeObjectForKey:kPreferenceBootCommandKey];
@@ -289,6 +299,70 @@ - (void)applicationDidEnterBackground:(UIApplication *)application {
         exit(0);
 }
 
+- (void)session:(WCSession *)session didReceiveMessage:(NSDictionary<NSString *, id> *)message replyHandler:(void(^)(NSDictionary<NSString *, id> *replyMessage))replyHandler
+{
+    NSLog(@"Received message from watch");
+
+    if (message) {
+        NSString* command = [message objectForKey:@"command"];
+
+        NSLog(@"Got command: %@", command);
+
+        if (currentTerminalViewController == NULL) {
+            NSLog(@"No terminal view controller available");
+            NSDictionary* response = @{@"error" : @"The terminal view is not available"};
+            replyHandler(response);
+        } else {
+            NSLog(@"Sending command");
+            NSData *input = [command dataUsingEncoding:NSUTF8StringEncoding];
+            dispatch_async(dispatch_get_main_queue(), ^{
+                [currentTerminalViewController.sessionTerminal sendInput:input.bytes length:input.length];
+            });
+            NSDictionary* response = @{@"message" : @". .."};
+            replyHandler(response);
+        }
+    }
+}
+
+-(void)sessionWatchStateDidChange:(nonnull WCSession *)session
+{
+
+    if(WCSession.isSupported){
+        WCSession* session = WCSession.defaultSession;
+        session.delegate = self;
+        [session activateSession];
+
+
+        if(session.reachable){
+            NSLog(@"session.reachable");
+        }
+
+        if(session.paired){
+            NSLog(@"watch is paired");
+            if(session.isWatchAppInstalled){
+                NSLog(@"watch app is installed");
+                if(session.watchDirectoryURL != nil) {
+                    NSLog(@"watch got directory URL %@", session.watchDirectoryURL);
+                }
+            }
+        }
+
+
+    }
+}
+
+- (void)session:(nonnull WCSession *)session activationDidCompleteWithState:(WCSessionActivationState)activationState error:(nullable NSError *)error {
+    NSLog(@"Watch session became active with status: %ld", activationState);
+}
+
+- (void)sessionDidBecomeInactive:(nonnull WCSession *)session {
+    NSLog(@"Watch session became inactive");
+}
+
+- (void)sessionDidDeactivate:(nonnull WCSession *)session {
+    NSLog(@"Watch session became deactivated");
+}
+
 @end
 
 NSString *const ProcessExitedNotification = @"ProcessExitedNotification";

app/FileProvider/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
-	<string>73</string>
+	<string>$(PRODUCT_VERSION)</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionFileProviderDocumentGroup</key>

app/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
-	<string>73</string>
+	<string>$(PRODUCT_VERSION)</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>

app/TerminalViewController.h

@@ -15,6 +15,7 @@
 - (void)startNewSession;
 - (void)reconnectSessionFromTerminalUUID:(NSUUID *)uuid;
 @property (readonly) NSUUID *sessionTerminalUUID; // 0 means invalid
+@property (nonatomic) Terminal *sessionTerminal;
 @property UISceneSession *sceneSession API_AVAILABLE(ios(13.0));
 
 @end

app/TerminalViewController.m

@@ -42,7 +42,6 @@ @interface TerminalViewController () <UIGestureRecognizerDelegate>
 @property (weak, nonatomic) IBOutlet UIButton *hideKeyboardButton;
 
 @property int sessionPid;
-@property (nonatomic) Terminal *sessionTerminal;
 @property int sessionTerminalNumber;
 
 @property BOOL ignoreKeyboardMotion;

iSH.xcconfig

@@ -5,3 +5,6 @@ ROOT_BUNDLE_IDENTIFIER = app.ish.iSH
 ISH_LOG =
 
 PRODUCT_APP_GROUP_IDENTIFIER = group.$(ROOT_BUNDLE_IDENTIFIER)
+
+// Change this to change all versions of the app and watch app
+PRODUCT_VERSION = 73