Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2025-04-04 15:31:53 +03:00
Code Issues Projects Releases Packages Wiki Activity

[ANY] Пересмотр modulesManager.

Browse source
This commit is contained in:
zaxar163 2019-01-16 21:52:54 +03:00
parent ecc39baf5c
commit e463a21f31
No known key found for this signature in database
GPG key ID: E3B309DD3852DE06
6 changed files with 32 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java
View file

@ -38,7 +38,6 @@
import java.io.IOException; import java.io.IOException;
import java.lang.ProcessBuilder.Redirect; import java.lang.ProcessBuilder.Redirect;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.net.MalformedURLException;
import java.net.SocketAddress; import java.net.SocketAddress;
import java.nio.file.*; import java.nio.file.*;
import java.nio.file.attribute.BasicFileAttributes; import java.nio.file.attribute.BasicFileAttributes;

7
Launcher/src/main/java/ru/gravit/launcher/client/ClientModuleManager.java
View file

@ -13,12 +13,7 @@ public ClientModuleManager(LauncherEngine engine) {
} }
@Override @Override
public void loadModule(URL jarpath, boolean preload) { public void loadModule(URL jarpath, String classname) {
throw new SecurityException("Custom JAR's load not allowed here");
}
@Override
public void loadModule(URL jarpath, String classname, boolean preload) {
throw new SecurityException("Custom JAR's load not allowed here"); throw new SecurityException("Custom JAR's load not allowed here");
} }
} }

7
libLauncher/src/main/java/ru/gravit/launcher/Launcher.java
View file

@ -7,7 +7,6 @@
import ru.gravit.launcher.serialize.HInput; import ru.gravit.launcher.serialize.HInput;
import ru.gravit.utils.Version; import ru.gravit.utils.Version;
import ru.gravit.utils.helper.IOHelper; import ru.gravit.utils.helper.IOHelper;
import ru.gravit.utils.helper.JVMHelper;
import ru.gravit.utils.helper.LogHelper; import ru.gravit.utils.helper.LogHelper;
import ru.gravit.utils.helper.SecurityHelper; import ru.gravit.utils.helper.SecurityHelper;
@ -126,12 +125,6 @@ public static Version getVersion() {
return new Version(MAJOR, MINOR, PATCH, BUILD, RELEASE); return new Version(MAJOR, MINOR, PATCH, BUILD, RELEASE);
} }
public static final boolean useAvanguard = true;
public static boolean isUsingAvanguard() {
return JVMHelper.OS_TYPE == JVMHelper.OS.MUSTDIE && useAvanguard;
}
public static void applyLauncherEnv(LauncherConfig.LauncherEnvironment env) public static void applyLauncherEnv(LauncherConfig.LauncherEnvironment env)
{ {
switch (env) switch (env)

4
libLauncher/src/main/java/ru/gravit/launcher/LauncherAgent.java
View file

@ -20,10 +20,6 @@ public boolean isAgentStarted() {
return isAgentStarted; return isAgentStarted;
} }
public static long getObjSize(Object obj) {
return inst.getObjectSize(obj);
}
public static void premain(String agentArgument, Instrumentation instrumentation) { public static void premain(String agentArgument, Instrumentation instrumentation) {
System.out.println("Launcher Agent"); System.out.println("Launcher Agent");
inst = instrumentation; inst = instrumentation;

83
libLauncher/src/main/java/ru/gravit/launcher/managers/SimpleModuleManager.java
View file

@ -14,26 +14,20 @@
import java.nio.file.attribute.BasicFileAttributes; import java.nio.file.attribute.BasicFileAttributes;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.jar.JarFile; import java.util.jar.JarFile;
import java.util.jar.Manifest;
public class SimpleModuleManager implements ModulesManagerInterface, AutoCloseable { public class SimpleModuleManager implements ModulesManagerInterface {
protected final class ModulesVisitor extends SimpleFileVisitor<Path> { protected final class ModulesVisitor extends SimpleFileVisitor<Path> {
private ModulesVisitor() { private ModulesVisitor() {
} }
@Override @Override
public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException { public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
try { if (file.toFile().getName().endsWith(".jar"))
JarFile f = new JarFile(file.toString()); try (JarFile f = new JarFile(file.toFile())) {
Manifest m = f.getManifest(); loadModule(file.toUri().toURL(), f.getManifest().getMainAttributes().getValue("Main-Class"));
String mainclass = m.getMainAttributes().getValue("Main-Class"); } catch (ClassNotFoundException | InstantiationException | IllegalAccessException e) {
loadModule(file.toUri().toURL(), mainclass, true); LogHelper.error(e);
f.close(); }
} catch (ClassNotFoundException | InstantiationException | IllegalAccessException e) {
e.printStackTrace();
}
// Return result
return super.visitFile(file, attrs); return super.visitFile(file, attrs);
} }
} }
@ -72,7 +66,6 @@ public void close() {
} }
@Override @Override
public void initModules() { public void initModules() {
for (Module m : modules) { for (Module m : modules) {
m.init(context); m.init(context);
@ -81,53 +74,34 @@ public void initModules() {
} }
@Override @Override
public void load(Module module) { public void load(Module module) {
modules.add(module); modules.add(module);
} }
@Override
public void load(Module module, boolean preload) {
load(module);
if (!preload) module.init(context);
}
@Override
public void loadModule(URL jarpath, boolean preload) throws ClassNotFoundException, IllegalAccessException, InstantiationException, URISyntaxException, IOException {
JarFile f = new JarFile(Paths.get(jarpath.toURI()).toString());
Manifest m = f.getManifest();
String mainclass = m.getMainAttributes().getValue("Main-Class");
loadModule(jarpath, mainclass, preload);
f.close();
}
public void loadModuleFull(URL jarpath) throws ClassNotFoundException, IllegalAccessException, InstantiationException, URISyntaxException, IOException { public void loadModuleFull(URL jarpath) throws ClassNotFoundException, IllegalAccessException, InstantiationException, URISyntaxException, IOException {
JarFile f = new JarFile(Paths.get(jarpath.toURI()).toString()); try (JarFile f = new JarFile(Paths.get(jarpath.toURI()).toFile())) {
Manifest m = f.getManifest(); classloader.addURL(jarpath);
String mainclass = m.getMainAttributes().getValue("Main-Class"); Module module = (Module) Class.forName(f.getManifest().getMainAttributes().getValue("Main-Class"), true, classloader).newInstance();
classloader.addURL(jarpath); modules.add(module);
Class<?> moduleclass = Class.forName(mainclass, true, classloader); module.preInit(context);
Module module = (Module) moduleclass.newInstance(); module.init(context);
modules.add(module); module.postInit(context);
module.preInit(context); LogHelper.info("Module %s version: %s loaded", module.getName(), module.getVersion());
module.init(context); }
module.postInit(context);
LogHelper.info("Module %s version: %s loaded", module.getName(), module.getVersion());
f.close();
} }
@Override @Override
public void loadModule(URL jarpath) throws Exception {
try (JarFile f = new JarFile(Paths.get(jarpath.toURI()).toFile())) {
loadModule(jarpath, f.getManifest().getMainAttributes().getValue("Main-Class"));
}
}
public void loadModule(URL jarpath, String classname, boolean preload) throws ClassNotFoundException, IllegalAccessException, InstantiationException { @Override
public void loadModule(URL jarpath, String classname) throws ClassNotFoundException, IllegalAccessException, InstantiationException {
classloader.addURL(jarpath); classloader.addURL(jarpath);
Class<?> moduleclass = Class.forName(classname, true, classloader); Module module = (Module) Class.forName(classname, true, classloader).newInstance();
Module module = (Module) moduleclass.newInstance();
modules.add(module); modules.add(module);
module.preInit(context);
if (!preload) module.init(context);
LogHelper.info("Module %s version: %s loaded", module.getName(), module.getVersion()); LogHelper.info("Module %s version: %s loaded", module.getName(), module.getVersion());
} }
@ -141,7 +115,6 @@ public void postInitModules() {
@Override @Override
public void preInitModules() { public void preInitModules() {
for (Module m : modules) { for (Module m : modules) {
m.preInit(context); m.preInit(context);
@ -150,7 +123,6 @@ public void preInitModules() {
} }
@Override @Override
public void printModules() { public void printModules() {
for (Module m : modules) for (Module m : modules)
LogHelper.info("Module %s version: %s", m.getName(), m.getVersion()); LogHelper.info("Module %s version: %s", m.getName(), m.getVersion());
@ -158,9 +130,8 @@ public void printModules() {
} }
@Override @Override
public void registerModule(Module module) {
public void registerModule(Module module, boolean preload) { load(module);
load(module, preload);
LogHelper.info("Module %s version: %s registered", module.getName(), module.getVersion()); LogHelper.info("Module %s version: %s registered", module.getName(), module.getVersion());
} }
} }

10
libLauncher/src/main/java/ru/gravit/launcher/modules/ModulesManagerInterface.java
View file

@ -2,16 +2,14 @@
import java.net.URL; import java.net.URL;
public interface ModulesManagerInterface { public interface ModulesManagerInterface extends AutoCloseable {
void initModules(); void initModules();
void load(Module module); void load(Module module);
void load(Module module, boolean preload); void loadModule(URL jarpath) throws Exception;
void loadModule(URL jarpath, boolean preload) throws Exception; void loadModule(URL jarpath, String classname) throws Exception;
void loadModule(URL jarpath, String classname, boolean preload) throws Exception;
void postInitModules(); void postInitModules();
@ -21,5 +19,5 @@ public interface ModulesManagerInterface {
void sort(); void sort();
void registerModule(Module module, boolean preload); void registerModule(Module module);
} }