Optimize, response version number from extension

WE2-563

Signed-off-by: Raul Metsma <[email protected]>

Author: metsma

src/mac/safari-extension.mm

@@ -41,11 +41,13 @@ - (id)init {
     return self;
 }
 
-- (void)dealloc {
+- (void)dealloc
+{
     [NSDistributedNotificationCenter.defaultCenter removeObserver:self name:WebEidExtension object:nil];
 }
 
-- (void)notificationEvent:(NSNotification *)notification {
+- (void)notificationEvent:(NSNotification*)notification
+{
     // Received notification from App
     NSString *nonce = notification.object;
     NSDictionary *resp = takeValue(nonce);
@@ -54,6 +56,11 @@ - (void)notificationEvent:(NSNotification *)notification {
         return;
     }
 
+    for (int i = 0; i < 20 && [NSRunningApplication runningApplicationsWithBundleIdentifier:WebEidApp].count > 0; ++i) {
+        [NSThread sleepForTimeInterval:0.5];
+        NSLog(@"web-eid-safari-extension: web-eid-safari is still running");
+    }
+
     // Forward to background script
     NSExtensionContext *context = contexts[nonce];
     [contexts removeObjectForKey:nonce];
@@ -62,11 +69,8 @@ - (void)notificationEvent:(NSNotification *)notification {
     [context completeRequestReturningItems:@[ response ] completionHandler:nil];
 }
 
-- (BOOL)execNativeApp {
-    if ([NSRunningApplication runningApplicationsWithBundleIdentifier:WebEidApp].count > 0) {
-        NSLog(@"web-eid-safari-extension: web-eid-safari is running");
-        return YES;
-    }
+- (BOOL)execNativeApp
+{
     NSURL *appURL = [NSWorkspace.sharedWorkspace URLForApplicationWithBundleIdentifier:WebEidApp];
     if (appURL == nil) {
         NSLog(@"web-eid-safari-extension: failed to get app url");
@@ -90,11 +94,21 @@ - (BOOL)execNativeApp {
     return YES;
 }
 
-- (void)beginRequestWithExtensionContext:(NSExtensionContext *)context
+- (void)beginRequestWithExtensionContext:(NSExtensionContext*)context
 {
     id message = [context.inputItems.firstObject userInfo][SFExtensionMessageKey];
     NSLog(@"web-eid-safari-extension: msg from background.js %@", message);
 
+    if ([@"status" isEqualToString:message[@"command"]]) {
+        NSString *version = [NSString stringWithFormat:@"%@.%@",
+                             NSBundle.mainBundle.infoDictionary[@"CFBundleShortVersionString"],
+                             NSBundle.mainBundle.infoDictionary[@"CFBundleVersion"]];
+        NSExtensionItem *response = [[NSExtensionItem alloc] init];
+        response.userInfo = @{ SFExtensionMessageKey: @{@"version": version} };
+        [context completeRequestReturningItems:@[ response ] completionHandler:nil];
+        return;
+    }
+
     if (![self execNativeApp]) {
         NSDictionary *resp = @{@"code": @"ERR_WEBEID_NATIVE_FATAL", @"message": @"Failed to start app"};
         NSExtensionItem *response = [[NSExtensionItem alloc] init];