Changeset 6d0f80f

Timestamp:

Jul 13, 2018 6:30:16 AM (3 years ago)

Author:

meeh <meeh@…>

Branches:

master

Children:

818e70d

Parents:

21b3864

Message:

Fixed a load of issues related to my "sync" approach, and Mac OSX's "async" API.

Location:

launchers

Files:

• browserbundle/src/main/scala/net/i2p/RouterLauncherApp.scala (modified) (2 diffs)
• build.sbt (modified) (1 diff)
• macosx/build.sbt (modified) (2 diffs)
• macosx/obj-cpp/AppDelegate.h (modified) (2 diffs)
• macosx/obj-cpp/Info.plist (modified) (1 diff)
• macosx/obj-cpp/JavaHelper.h (modified) (4 diffs)
• macosx/obj-cpp/JavaRunner.cpp (deleted)
• macosx/obj-cpp/JavaRunner.h (deleted)
• macosx/obj-cpp/RouterTask.h (added)
• macosx/obj-cpp/RouterTask.mm (added)
• macosx/obj-cpp/build.ninja (modified) (4 diffs)
• macosx/obj-cpp/include/strutil.hpp (modified) (1 diff)
• macosx/obj-cpp/main.mm (modified) (10 diffs)
• macosx/src/main/java/net/i2p/launchers/BaseExtractor.java (modified) (3 diffs)

launchers/browserbundle/src/main/scala/net/i2p/RouterLauncherApp.scala

@@ -63 +63 @@
 
   println(s"basePath => ${basePath}\nconfigPath => ${configPath}")
-
+/*
   object ErrorUtils {
     def errorMessageInJson(message: String, solution: String) : JObject = JObject(
@@ -92 +92 @@
   if (!new File(configPath).exists()) ErrorUtils.printErrorAndExit("I2P Config path don't exist", "Delete your config directory for the Browser Bundle")
 
-
+*/
   val deployer = new DeployProfile(configPath,basePath)
   deployer.verifyExistenceOfConfig()

launchers/build.sbt

@@ -41 +41 @@
   .settings(
     commonSettings,
-    name         := "RouterPack.jar",
-    mainClass in assembly := Some("net.i2p.launchers.osx.LauncherAppMain")
+    name         := "routerLauncher",
+    mainClass in assembly := Some("net.i2p.launchers.SimpleOSXLauncher")
   ).dependsOn(common)
 

launchers/macosx/build.sbt

@@ -22 +22 @@
 unmanagedBase in Compile := baseDirectory.value / ".." / ".." / "pkg-temp" / "lib"
 
+
 // Unmanaged classpath will be available at compile time
 unmanagedClasspath in Compile ++= Seq(
-  baseDirectory.value / ".." / ".." / "pkg-temp" / "lib" / "*.jar"
+    baseDirectory.value / ".." / ".." / "pkg-temp" / "lib" / "*.jar"
 )
 
 assemblyOption in assembly := (assemblyOption in assembly).value.copy(includeScala = false, includeDependency = false)
 
+assemblyExcludedJars in assembly := {
+    val cp = (fullClasspath in assembly).value
+    cp filter { c => jarsForCopy.toList.contains(c.data.getName) }
+}
 
-assemblyJarName in assembly := s"launcher.jar"
+/*
 
-assemblyExcludedJars in assembly := {
-  val cp = (fullClasspath in assembly).value
-  cp filter { c => jarsForCopy.toList.contains(c.data.getName) }
-}
+assemblyJarName in assembly := s"package.jar"
 
 // TODO: MEEH: Add assemblyExcludedJars and load the router from own jar files, to handle upgrades better.
@@ -105 +107 @@
 
 }
+*/

launchers/macosx/obj-cpp/AppDelegate.h

@@ -10 +10 @@
 #include "StatusItemButton.h"
 #include "JavaHelper.h"
+#include "RouterTask.h"
+#include "neither/maybe.hpp"
+#include "optional.hpp"
+#include "subprocess.hpp"
+#include <glob.h>
+#include <vector>
+
+using namespace neither;
 
 extern JvmListSharedPtr gRawJvmList;
+
+// DO NOT ACCESS THIS GLOBAL VARIABLE DIRECTLY.
+maybeAnRouterRunner globalRouterStatus = maybeAnRouterRunner{};
+
+maybeAnRouterRunner getGlobalRouterObject()
+{
+    std::lock_guard<std::mutex> lock(globalRouterStatusMutex);
+    return globalRouterStatus;
+}
+
+void setGlobalRouterObject(RouterTask* newRouter)
+{
+    std::lock_guard<std::mutex> lock(globalRouterStatusMutex);
+    globalRouterStatus.emplace(newRouter);
+}
+
+
+
+std::vector<std::string> globVector(const std::string& pattern){
+    glob_t glob_result;
+    glob(pattern.c_str(),GLOB_TILDE,NULL,&glob_result);
+    std::vector<std::string> files;
+    for(unsigned int i=0;i<glob_result.gl_pathc;++i){
+        files.push_back(std::string(glob_result.gl_pathv[i]));
+    }
+    globfree(&glob_result);
+    return files;
+}
 
 @interface MenuBarCtrl : NSObject <StatusItemButtonDelegate, NSMenuDelegate>
@@ -56 +92 @@
 - (AppDelegate *)initWithArgc:(int)argc argv:(const char **)argv;
 - (NSString *)userSelectJavaHome:(JvmListPtr)rawJvmList;
+- (BOOL)userNotificationCenter:(NSUserNotificationCenter *)center
+                               shouldPresentNotification:(NSUserNotification *)notification;
 @end
 

launchers/macosx/obj-cpp/Info.plist

@@ -27 +27 @@
         <key>CFBundleVersion</key>
         <string>0.0.1</string>
+    <key>NSUserNotificationAlertStyle</key>
+    <string>alert</string>
         <key>NSAppleScriptEnabled</key>
         <true/>

launchers/macosx/obj-cpp/JavaHelper.h

@@ -8 +8 @@
 #include <sstream>
 #include <list>
-#include <experimental/optional>
 #include <stdlib.h>
 
@@ -19 +18 @@
 #include <CoreFoundation/CFString.h>
 
+#include "optional.hpp"
 #include "strutil.hpp"
 #include "subprocess.hpp"
+#include "neither/maybe.hpp"
+#include "RouterTask.h"
 
 using namespace subprocess;
+using namespace neither;
+
+using maybeAnRouterRunner = std::experimental::optional<RouterTask*>;
+
+extern std::mutex globalRouterStatusMutex;
+extern maybeAnRouterRunner globalRouterStatus;
 
 
@@ -134 +142 @@
         currentJvm->JVMPlatformVersion = trim_copy(d);
       }
-      
+
     }
   };
@@ -151 +159 @@
   auto javaHomeRes = check_output({"/usr/libexec/java_home","-v",DEF_MIN_JVM_VER,"-X"});
   CFDataRef javaHomes = CFDataCreate(NULL, (const UInt8 *)javaHomeRes.buf.data(), strlen(javaHomeRes.buf.data()));
-  
+
   //CFErrorRef err;
   CFPropertyListRef propertyList = CFPropertyListCreateWithData(kCFAllocatorDefault, javaHomes, kCFPropertyListImmutable, NULL, NULL);

launchers/macosx/obj-cpp/build.ninja

@@ -1 +1 @@
 cxx = clang++
-cflags = -std=c++14 -g -Wall -I./include -I/usr/local/include -I/usr/include -Wno-unused-variable -mmacosx-version-min=10.10
+cflags = -std=c++14 -g -Wall -I./include -I./include/neither -I/usr/local/include -I/usr/include -Wno-unused-variable -mmacosx-version-min=10.10
 ldflags = -framework CoreFoundation -framework Foundation -framework Cocoa -g -rdynamic
 
@@ -27 +27 @@
   command = mkdir -p I2PLauncher.app/Contents/{MacOS,Resources,Frameworks} $
     && cp Info.plist I2PLauncher.app/Contents/Info.plist $
-    && cp base.zip I2PLauncher.app/Contents/Resources/base.zip
+    && cp base.zip I2PLauncher.app/Contents/Resources/base.zip $
+    && cp ../target/scala-2.11/routerLauncher-assembly-0.1.0-SNAPSHOT.jar I2PLauncher.app/Contents/Resources/launcher.jar
 
 rule copytobundledir
@@ -40 +41 @@
 build main.o: cxx main.mm
 build StatusItemButton.o: cxx StatusItemButton.mm
-build JavaRunner.o: cxx JavaRunner.cpp
+build RouterTask.o: cxx RouterTask.mm
 
 build clean: cleanup
@@ -47 +48 @@
 build copytobundle: copytobundledir | bundle clauncher
 
-build clauncher: link main.o StatusItemButton.o JavaRunner.o
+build clauncher: link main.o StatusItemButton.o RouterTask.o
 
 build appbundle: copyimgtobundle | clauncher bundle copytobundle

launchers/macosx/obj-cpp/include/strutil.hpp

@@ -9 +9 @@
 #include <cctype>
 #include <locale>
-#include <experimental/optional>
+#include "optional.hpp"
 
 #include <CoreFoundation/CoreFoundation.h>

launchers/macosx/obj-cpp/main.mm

@@ -5 +5 @@
 #include <string>
 #include <list>
-#include <experimental/optional>
+#include <sys/stat.h>
+#include <stdlib.h>
+#include <future>
+#include <vector>
 
 #import <Foundation/Foundation.h>
@@ -24 +27 @@
 #include "AppDelegate.h"
 #include "StatusItemButton.h"
-#include "JavaRunner.h"
+#include "RouterTask.h"
 #include "JavaHelper.h"
+#include "fn.h"
+#include "optional.hpp"
 
 #define DEF_I2P_VERSION "0.9.35"
@@ -44 +49 @@
 
 
+std::future<int> startupRouter(NSString* javaBin, NSArray<NSString*>* arguments, NSString* i2pBaseDir) {
+/*
+  NSLog(@"Arguments: %@", [NSString stringWithUTF8String:arguments.c_str()]);
+  auto launchLambda = [](JavaRunner *javaRun) {
+    javaRun->javaProcess->start_process();
+    auto pid = javaRun->javaProcess->pid();
+    std::cout << "I2P Router process id = " << pid << std::endl;
+
+    // Blocking
+    javaRun->javaProcess->wait();
+  };
+  auto callbackAfterExit = [](){
+    printf("Callback after exit\n");
+  };
+  NSLog(@"Still fine!");
+
+  setGlobalRouterObject(new JavaRunner{ javaBin, arguments, i2pBaseDir, std::move(launchLambda), std::move(callbackAfterExit) });
+
+  NSLog(@"Still fine!");
+  return std::async(std::launch::async, [&]{
+      getGlobalRouterObject().value()->execute();
+      return 0;
+    });
+*/
+    CFShow(arguments);
+
+    @try {
+        RTaskOptions* options = [RTaskOptions alloc];
+        options.binPath = javaBin;
+        options.arguments = arguments;
+        options.i2pBaseDir = i2pBaseDir;
+        auto instance = [[[RouterTask alloc] initWithOptions: options] autorelease];
+        //auto pid = [instance execute];
+        //NSThread *thr = [[NSThread alloc] initWithTarget:instance selector:@selector(execute) object:nil];
+        [instance execute];
+        return std::async(std::launch::async, [&instance]{
+          return 1;//[instance getPID];
+        });
+    }
+    @catch (NSException *e)
+        {
+                NSLog(@"Expection occurred %@", [e reason]);
+        return std::async(std::launch::async, [&]{
+          return 0;
+        });
+        }
+}
+
+
 @implementation MenuBarCtrl
 
@@ -83 +137 @@
 {
   NSLog(@"Clicked stopJavaRouterBtnHandler");
+  if (getGlobalRouterObject().has_value())
+  {
+      //getGlobalRouterObject().value()->requestRouterShutdown();
+      NSLog(@"Requested shutdown");
+  }
 }
 
@@ -172 +231 @@
 
 @implementation AppDelegate
+
+- (BOOL)userNotificationCenter:(NSUserNotificationCenter *)center
+                               shouldPresentNotification:(NSUserNotification *)notification {
+    return YES;
+}
 
 - (NSString *)userSelectJavaHome:(JvmListPtr)rawJvmList
@@ -225 +289 @@
   CFPreferencesAppSynchronize(kCFPreferencesCurrentApplication);
   //CFPreferencesSetAppValue(@"javaHome", (CFPropertyListRef)cfDefaultHome, kCFPreferencesCurrentUser, kCFPreferencesCurrentHost);
-  
+
   if (self.enableVerboseLogging) NSLog(@"Default preferences stored!");
 }
@@ -232 +296 @@
 - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
   // Init application here
+  [[NSUserNotificationCenter defaultUserNotificationCenter] setDelegate:self];
   // Start with user preferences
   self.userPreferences = [NSUserDefaults standardUserDefaults];
@@ -247 +312 @@
   if (self.enableVerboseLogging) NSLog(@"Java home from preferences: %@", javaHomePref);
 
-  [[NSUserNotificationCenter defaultUserNotificationCenter] setDelegate:self];
 
   // This is the only GUI the user experience on a regular basis.
@@ -256 +320 @@
 
   NSLog(@"We should have started the statusbar object by now...");
+
+  // Figure out base directory
+  const char* pathFromHome = "/Users/%s/Library/I2P";
+  auto username = getenv("USER");
+  char buffer[strlen(pathFromHome)+strlen(username)];
+  sprintf(buffer, pathFromHome, username);
+  std::string i2pBaseDir(buffer);
+  if (self.enableVerboseLogging) printf("Home directory is: %s\n", buffer);
+
+
   //[statusBarButton setAction:@selector(itemClicked:)];
   //dispatch_async(dispatch_get_main_queue(), ^{
@@ -274 +348 @@
   };
 
-
-  auto launchLambda = [&pref](JavaRunner *javaRun) {
-    javaRun->javaProcess->start_process();
-    auto pid = javaRun->javaProcess->pid();
-    std::cout << "I2P Router process id = " << pid << std::endl;
-
-    // Blocking
-    javaRun->javaProcess->wait();
-  };
-  auto callbackAfterExit = [=](){
-    printf("Callback after exit\n");
-  };
-
-  try {
-
-    // Get Java home
+  auto getJavaBin = [&getJavaHomeLambda]() -> std::string {
+      // Get Java home
     auto javaHome = getJavaHomeLambda();
     trim(javaHome); // Trim to remove endline
     auto javaBin = std::string(javaHome);
     javaBin += "/bin/java"; // Append java binary to path.
-    //printf("hello world: %s\n", javaBin.c_str());
-    if (self.enableVerboseLogging) NSLog(@"Defaults: %@", [pref dictionaryRepresentation]);
-
-    auto r = new JavaRunner{ javaBin, launchLambda, callbackAfterExit };
-    r->execute();
+    return javaBin;
+  };
+
+  auto buildClassPath = [](std::string basePath) -> std::vector<std::string> {
+      return globVector(basePath+std::string("/lib/*.jar"));
+  };
+
+  auto sendUserNotification = [&](NSString* title, NSString* informativeText) -> void {
+    NSUserNotification *userNotification = [[[NSUserNotification alloc] init] autorelease];
+
+    userNotification.title = title;
+    userNotification.informativeText = informativeText;
+    userNotification.soundName = NSUserNotificationDefaultSoundName;
+
+    [[NSUserNotificationCenter defaultUserNotificationCenter] scheduleNotification:userNotification];
+  };
+
+
+  // Get paths
+  NSBundle *launcherBundle = [NSBundle mainBundle];
+
+  std::string basearg("-Di2p.dir.base=");
+  basearg += i2pBaseDir;
+
+  std::string zippath("-Di2p.base.zip=");
+  zippath += [[launcherBundle pathForResource:@"base" ofType:@"zip"] UTF8String];
+
+  std::string jarfile("-cp ");
+  jarfile += [[launcherBundle pathForResource:@"launcher" ofType:@"jar"] UTF8String];
+
+  struct stat sb;
+  if ( !(stat(buffer, &sb) == 0 && S_ISDIR(sb.st_mode)) )
+  {
+    // I2P is not extracted.
+    if (self.enableVerboseLogging) printf("I2P Directory don't exists!\n");
+
+    // Create directory
+    mkdir(buffer, S_IRUSR | S_IWUSR | S_IXUSR);
+
+    auto cli = JavaRunner::defaultFlagsForExtractorJob;
+    setenv("I2PBASE", buffer, true);
+    setenv("ZIPPATH", zippath.c_str(), true);
+    //setenv("DYLD_LIBRARY_PATH",".:/usr/lib:/lib:/usr/local/lib", true);
+
+    cli.push_back(basearg);
+    cli.push_back(zippath);
+    cli.push_back(jarfile);
+    cli.push_back("net.i2p.launchers.BaseExtractor");
+
+    //auto charCli = map(cli, [](std::string str){ return str.c_str(); });
+    std::string execStr = getJavaBin();
+    for_each(cli, [&execStr](std::string str){ execStr += std::string(" ") + str; });
+
+    printf("\n\nTrying cmd: %s\n\n", execStr.c_str());
+    try {
+        sendUserNotification((NSString*)CFSTR("I2P Extraction"), (NSString*)CFSTR("Please hold on while we extract I2P. You'll get a new message once done!"));
+        int extractStatus = Popen(execStr.c_str(), environment{{
+            {"ZIPPATH", zippath.c_str()},
+            {"I2PBASE", buffer}
+        }}).wait();
+        printf("Extraction exit code %d\n",extractStatus);
+        sendUserNotification((NSString*)CFSTR("I2P Extraction"), (NSString*)CFSTR("Extraction complete!"));
+    } catch (subprocess::OSError &err) {
+        printf("Something bad happened: %s\n", err.what());
+    }
+
+  } else {
+      if (self.enableVerboseLogging) printf("I2P directory found!\n");
+  }
+
+  // Expect base to be extracted by now.
+
+  auto jarList = buildClassPath(std::string(buffer));
+  std::string classpathStrHead = "-classpath";
+  std::string classpathStr = "";
+  classpathStr += [[launcherBundle pathForResource:@"launcher" ofType:@"jar"] UTF8String];
+  std::string prefix(i2pBaseDir);
+  prefix += "/lib/";
+  for_each(jarList, [&classpathStr](std::string str){ classpathStr += std::string(":") + str; });
+  //if (self.enableVerboseLogging) NSLog(@"Classpath: %@\n",[NSString stringWithUTF8String:classpathStr.c_str()]);
+
+
+
+  try {
+    auto argList = JavaRunner::defaultStartupFlags;
+
+    std::string baseDirArg("-Di2p.dir.base=");
+    baseDirArg += i2pBaseDir;
+    std::string javaLibArg("-Djava.library.path=");
+    javaLibArg += i2pBaseDir;
+    // TODO: pass this to JVM
+    auto java_opts = getenv("JAVA_OPTS");
+
+    argList.push_back([NSString stringWithUTF8String:baseDirArg.c_str()]);
+    argList.push_back([NSString stringWithUTF8String:javaLibArg.c_str()]);
+    argList.push_back([NSString stringWithUTF8String:classpathStrHead.c_str()]);
+    argList.push_back([NSString stringWithUTF8String:classpathStr.c_str()]);
+    argList.push_back(@"net.i2p.router.Router");
+    auto javaBin = getJavaBin();
+
+
+    sendUserNotification(@"I2P Launcher", @"I2P Router is starting up!");
+    auto nsJavaBin = [NSString stringWithUTF8String:javaBin.c_str()];
+    auto nsBasePath = [NSString stringWithUTF8String:i2pBaseDir.c_str()];
+    NSArray* arrArguments = [NSArray arrayWithObjects:&argList[0] count:argList.size()];
+    startupRouter(nsJavaBin, arrArguments, nsBasePath);
+    //if (self.enableVerboseLogging) NSLog(@"Defaults: %@", [pref dictionaryRepresentation]);
   } catch (std::exception &err) {
-    std::cerr << "Exception: " << err.what() << std::endl; 
+    std::cerr << "Exception: " << err.what() << std::endl;
   }
 }

launchers/macosx/src/main/java/net/i2p/launchers/BaseExtractor.java

@@ -22 +22 @@
 public class BaseExtractor extends EnvCheck {
 
-    private void runExtract(String zipFilename, String destinationPath) {
+    public boolean printDebug = false;
+
+    public void runExtract(String zipFilename) {
+        String destinationPath = this.baseDirPath;
         try(ZipFile file = new ZipFile(zipFilename)) {
             FileSystem fileSystem = FileSystems.getDefault();
             Enumeration<? extends ZipEntry> entries = file.entries();
-            Files.createDirectory(fileSystem.getPath(destinationPath));
+
+            try {
+                Files.createDirectory(fileSystem.getPath(destinationPath));
+            } catch (IOException e) {
+                // It's OK to fail here.
+            }
+
             while (entries.hasMoreElements()) {
                 ZipEntry entry = entries.nextElement();
+                if (printDebug) System.out.println("Found entry: "+entry.toString());
                 if (entry.isDirectory()) {
-                    System.out.println("Creating Directory:" + destinationPath + entry.getName());
-                    Files.createDirectories(fileSystem.getPath(destinationPath + entry.getName()));
+                    if (printDebug) System.out.println("Creating Directory:" + destinationPath + "/" + entry.getName());
+                    Files.createDirectories(fileSystem.getPath(destinationPath + "/" + entry.getName()));
                 } else {
                     InputStream is = file.getInputStream(entry);
                     BufferedInputStream bis = new BufferedInputStream(is);
-                    String uncompressedFileName = destinationPath + entry.getName();
+                    String uncompressedFileName = destinationPath + "/" + entry.getName();
                     Path uncompressedFilePath = fileSystem.getPath(uncompressedFileName);
                     Files.createFile(uncompressedFilePath);
@@ -41 +51 @@
                     while (bis.available() > 0) fileOutput.write(bis.read());
                     fileOutput.close();
-                    System.out.println("Written :" + entry.getName());
+                    if (printDebug) System.out.println("Written :" + entry.getName());
                 }
             }
         } catch (IOException e) {
             //
+            System.err.println("Exception in extractor!");
+            System.err.println(e.toString());
         }
     }
@@ -51 +63 @@
     public BaseExtractor(String[] args) {
         super(args);
-
-        if (args.length == 2) {
-            if ("extract".equals(args[0])) {
-                // Start extract
-
-            }this.runExtract(System.getProperty("i2p.base.zip"),this.baseDirPath);
-        }
     }
 
     public static void main(String[] args) {
-        new BaseExtractor(args);
+        System.out.println("Starting extraction");
+        BaseExtractor be = new BaseExtractor(args);
+        String debug = System.getProperty("print.debug");
+        if (debug != null) {
+            be.printDebug = true;
+        }
+        be.runExtract(System.getProperty("i2p.base.zip"));
     }
 }