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

[FEATURE] Modules этап finish. + [FIX] Правки LauncherEngine.

Browse source
This commit is contained in:
zaxar163 2019-01-17 19:38:27 +03:00
parent bb317432d0
commit 2d06628a74
No known key found for this signature in database
GPG key ID: E3B309DD3852DE06
17 changed files with 53 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -16,7 +16,6 @@ public StdCommandHandler(LaunchServer server, boolean readCommands) {
@Override
public void bell() {
// Do nothing, unsupported
}
@Override

6
LaunchServer/src/main/java/ru/gravit/launchserver/manangers/ModulesManager.java
View file

@ -1,6 +1,6 @@
package ru.gravit.launchserver.manangers;
import ru.gravit.launcher.managers.ModulesConfigManager;
import ru.gravit.launcher.managers.SimpleModulesConfigManager;
import ru.gravit.launcher.managers.SimpleModuleManager;
import ru.gravit.launchserver.LaunchServer;
import ru.gravit.launchserver.modules.CoreModule;
@ -11,11 +11,11 @@
import java.util.ArrayList;
public class ModulesManager extends SimpleModuleManager {
public ModulesConfigManager configManager;
public SimpleModulesConfigManager configManager;
public ModulesManager(LaunchServer lsrv) {
modules = new ArrayList<>(1);
configManager = new ModulesConfigManager(lsrv.dir.resolve("config"));
configManager = new SimpleModulesConfigManager(lsrv.dir.resolve("config"));
classloader = new PublicURLClassLoader(new URL[0], ClassLoader.getSystemClassLoader());
context = new LaunchServerModuleContext(lsrv, classloader, configManager);
registerCoreModule();

2
LaunchServer/src/main/java/ru/gravit/launchserver/manangers/hook/BuildHookManager.java
View file

@ -1,7 +1,6 @@
package ru.gravit.launchserver.manangers.hook;
import ru.gravit.launcher.AutogenConfig;
import ru.gravit.launcher.modules.TestClientModule;
import ru.gravit.launchserver.binary.BuildContext;
import ru.gravit.launchserver.binary.JAConfigurator;
import ru.gravit.launchserver.binary.tasks.MainBuildTask;
@ -41,7 +40,6 @@ public BuildHookManager() {
registerIgnoredClass("META-INF/DEPENDENCIES");
registerIgnoredClass("META-INF/LICENSE");
registerIgnoredClass("META-INF/NOTICE");
registerClientModuleClass(TestClientModule.class.getName());
}
public void autoRegisterIgnoredClass(String clazz) {

14
LaunchServer/src/main/java/ru/gravit/launchserver/modules/LaunchServerModuleContext.java
View file

@ -1,18 +1,18 @@
package ru.gravit.launchserver.modules;
import ru.gravit.launcher.managers.ModulesConfigManager;
import ru.gravit.launcher.managers.SimpleModulesConfigManager;
import ru.gravit.launcher.modules.ModuleContext;
import ru.gravit.launcher.modules.ModulesConfigManagerInterface;
import ru.gravit.launcher.modules.ModulesManagerInterface;
import ru.gravit.launcher.modules.ModulesConfigManager;
import ru.gravit.launcher.modules.ModulesManager;
import ru.gravit.launchserver.LaunchServer;
import ru.gravit.utils.PublicURLClassLoader;
public class LaunchServerModuleContext implements ModuleContext {
public final LaunchServer launchServer;
public final PublicURLClassLoader classloader;
public final ModulesConfigManager modulesConfigManager;
public final SimpleModulesConfigManager modulesConfigManager;
public LaunchServerModuleContext(LaunchServer server, PublicURLClassLoader classloader, ModulesConfigManager modulesConfigManager) {
public LaunchServerModuleContext(LaunchServer server, PublicURLClassLoader classloader, SimpleModulesConfigManager modulesConfigManager) {
launchServer = server;
this.classloader = classloader;
this.modulesConfigManager = modulesConfigManager;
@ -24,12 +24,12 @@ public Type getType() {
}
@Override
public ModulesManagerInterface getModulesManager() {
public ModulesManager getModulesManager() {
return launchServer.modulesManager;
}
@Override
public ModulesConfigManagerInterface getModulesConfigManager() {
public ModulesConfigManager getModulesConfigManager() {
return modulesConfigManager;
}
}

5
Launcher/src/main/java/ru/gravit/launcher/LauncherEngine.java
View file

@ -59,7 +59,7 @@ private LauncherEngine() {
public void start(String... args) throws Throwable {
LogHelper.debug("%d", LauncherSettings.settingsMagic);
Launcher.modulesManager = new ClientModuleManager(this);
LauncherConfig.getAutogenConfig().initModules(); //INIT
LauncherConfig.getAutogenConfig().initModules();
Launcher.modulesManager.preInitModules();
if (runtimeProvider == null) runtimeProvider = new JSRuntimeProvider();
runtimeProvider.init(false);
@ -67,10 +67,9 @@ public void start(String... args) throws Throwable {
if (started.getAndSet(true))
throw new IllegalStateException("Launcher has been already started");
Launcher.modulesManager.initModules();
// Load init.js script
runtimeProvider.preLoad();
FunctionalBridge.worker = new RequestWorker();
CommonHelper.newThread("FX Task Worker", true, FunctionalBridge.worker).start();
CommonHelper.newThread("Task Worker", true, FunctionalBridge.worker).start();
FunctionalBridge.getHWID = CommonHelper.newThread("GetHWID Thread", true, FunctionalBridge::getHWID);
FunctionalBridge.getHWID.start();
LogHelper.debug("Dir: %s", DirBridge.dir);

8
Launcher/src/main/java/ru/gravit/launcher/client/ClientModuleContext.java
View file

@ -3,8 +3,8 @@
import ru.gravit.launcher.Launcher;
import ru.gravit.launcher.LauncherEngine;
import ru.gravit.launcher.modules.ModuleContext;
import ru.gravit.launcher.modules.ModulesConfigManagerInterface;
import ru.gravit.launcher.modules.ModulesManagerInterface;
import ru.gravit.launcher.modules.ModulesConfigManager;
import ru.gravit.launcher.modules.ModulesManager;
public class ClientModuleContext implements ModuleContext {
public final LauncherEngine engine;
@ -19,12 +19,12 @@ public Type getType() {
}
@Override
public ModulesManagerInterface getModulesManager() {
public ModulesManager getModulesManager() {
return Launcher.modulesManager;
}
@Override
public ModulesConfigManagerInterface getModulesConfigManager() {
public ModulesConfigManager getModulesConfigManager() {
return null; // ClientModuleContext не поддерживает modulesConfigManager
}
}

4
Launcher/src/main/java/ru/gravit/launcher/gui/JSRuntimeProvider.java
View file

@ -147,9 +147,9 @@ private void setScriptBindings() {
public void run(String[] args) throws ScriptException, NoSuchMethodException, IOException {
loadScript(Launcher.INIT_SCRIPT_FILE);
LogHelper.info("Invoking start() function");
Invocable invoker = (Invocable) engine;
Launcher.modulesManager.postInitModules();
invoker.invokeFunction("start", (Object) args);
((Invocable) engine).invokeFunction("start", (Object) args);
Launcher.modulesManager.finishModules();
}
@Override

6
ServerWrapper/src/main/java/ru/gravit/launcher/server/ModulesManager.java
View file

@ -1,6 +1,6 @@
package ru.gravit.launcher.server;
import ru.gravit.launcher.managers.ModulesConfigManager;
import ru.gravit.launcher.managers.SimpleModulesConfigManager;
import ru.gravit.launcher.managers.SimpleModuleManager;
import ru.gravit.utils.PublicURLClassLoader;
@ -9,11 +9,11 @@
import java.util.ArrayList;
public class ModulesManager extends SimpleModuleManager {
public ModulesConfigManager modulesConfigManager;
public SimpleModulesConfigManager modulesConfigManager;
public ModulesManager(ServerWrapper wrapper) {
modules = new ArrayList<>();
modulesConfigManager = new ModulesConfigManager(Paths.get("modules-config"));
modulesConfigManager = new SimpleModulesConfigManager(Paths.get("modules-config"));
classloader = new PublicURLClassLoader(new URL[0], ClassLoader.getSystemClassLoader());
context = new ServerModuleContext(wrapper, classloader, modulesConfigManager);
}

14
ServerWrapper/src/main/java/ru/gravit/launcher/server/ServerModuleContext.java
View file

@ -1,18 +1,18 @@
package ru.gravit.launcher.server;
import ru.gravit.launcher.Launcher;
import ru.gravit.launcher.managers.ModulesConfigManager;
import ru.gravit.launcher.managers.SimpleModulesConfigManager;
import ru.gravit.launcher.modules.ModuleContext;
import ru.gravit.launcher.modules.ModulesConfigManagerInterface;
import ru.gravit.launcher.modules.ModulesManagerInterface;
import ru.gravit.launcher.modules.ModulesConfigManager;
import ru.gravit.launcher.modules.ModulesManager;
import ru.gravit.utils.PublicURLClassLoader;
public class ServerModuleContext implements ModuleContext {
public final PublicURLClassLoader classLoader;
public final ServerWrapper wrapper;
public final ModulesConfigManager modulesConfigManager;
public final SimpleModulesConfigManager modulesConfigManager;
public ServerModuleContext(ServerWrapper wrapper, PublicURLClassLoader classLoader, ModulesConfigManager modulesConfigManager) {
public ServerModuleContext(ServerWrapper wrapper, PublicURLClassLoader classLoader, SimpleModulesConfigManager modulesConfigManager) {
this.classLoader = classLoader;
this.wrapper = wrapper;
this.modulesConfigManager = modulesConfigManager;
@ -24,12 +24,12 @@ public Type getType() {
}
@Override
public ModulesManagerInterface getModulesManager() {
public ModulesManager getModulesManager() {
return Launcher.modulesManager;
}
@Override
public ModulesConfigManagerInterface getModulesConfigManager() {
public ModulesConfigManager getModulesConfigManager() {
return modulesConfigManager;
}
}

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

@ -2,7 +2,7 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import ru.gravit.launcher.modules.ModulesManagerInterface;
import ru.gravit.launcher.modules.ModulesManager;
import ru.gravit.launcher.profiles.ClientProfile;
import ru.gravit.launcher.serialize.HInput;
import ru.gravit.utils.Version;
@ -36,7 +36,7 @@ public final class Launcher {
private static final AtomicReference<LauncherConfig> CONFIG = new AtomicReference<>();
@LauncherAPI
public static ModulesManagerInterface modulesManager = null;
public static ModulesManager modulesManager = null;
@LauncherAPI
public static final int PROTOCOL_MAGIC_LEGACY = 0x724724_00 + 24;
@LauncherAPI

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

@ -2,7 +2,7 @@
import ru.gravit.launcher.modules.Module;
import ru.gravit.launcher.modules.ModuleContext;
import ru.gravit.launcher.modules.ModulesManagerInterface;
import ru.gravit.launcher.modules.ModulesManager;
import ru.gravit.utils.PublicURLClassLoader;
import ru.gravit.utils.helper.IOHelper;
import ru.gravit.utils.helper.LogHelper;
@ -15,7 +15,7 @@
import java.util.ArrayList;
import java.util.jar.JarFile;
public class SimpleModuleManager implements ModulesManagerInterface {
public class SimpleModuleManager implements ModulesManager {
protected final class ModulesVisitor extends SimpleFileVisitor<Path> {
private ModulesVisitor() {
}
@ -134,4 +134,12 @@ public void registerModule(Module module) {
load(module);
LogHelper.info("Module %s version: %s registered", module.getName(), module.getVersion());
}
@Override
public void finishModules() {
for (Module m : modules) {
m.finish(context);
LogHelper.info("Module %s version: %s finished initialization", m.getName(), m.getVersion());
}
}
}

6
libLauncher/src/main/java/ru/gravit/launcher/managers/ModulesConfigManager.java → libLauncher/src/main/java/ru/gravit/launcher/managers/SimpleModulesConfigManager.java
View file

@ -1,6 +1,6 @@
package ru.gravit.launcher.managers;
import ru.gravit.launcher.modules.ModulesConfigManagerInterface;
import ru.gravit.launcher.modules.ModulesConfigManager;
import ru.gravit.utils.helper.IOHelper;
import ru.gravit.utils.helper.LogHelper;
@ -8,10 +8,10 @@
import java.nio.file.Files;
import java.nio.file.Path;
public class ModulesConfigManager implements ModulesConfigManagerInterface {
public class SimpleModulesConfigManager implements ModulesConfigManager {
public Path configDir;
public ModulesConfigManager(Path configDir) {
public SimpleModulesConfigManager(Path configDir) {
this.configDir = configDir;
}

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

@ -15,4 +15,8 @@ public interface Module extends AutoCloseable {
void postInit(ModuleContext context);
void preInit(ModuleContext context);
default void finish(ModuleContext context) {
// NOP
};
}

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

@ -7,7 +7,7 @@ enum Type {
Type getType();
ModulesManagerInterface getModulesManager();
ModulesManager getModulesManager();
ModulesConfigManagerInterface getModulesConfigManager();
ModulesConfigManager getModulesConfigManager();
}

2
libLauncher/src/main/java/ru/gravit/launcher/modules/ModulesConfigManagerInterface.java → libLauncher/src/main/java/ru/gravit/launcher/modules/ModulesConfigManager.java
View file

@ -2,7 +2,7 @@
import java.nio.file.Path;
public interface ModulesConfigManagerInterface {
public interface ModulesConfigManager {
Path getModuleConfig(String moduleName);
Path getModuleConfigDir(String moduleName);

4
libLauncher/src/main/java/ru/gravit/launcher/modules/ModulesManagerInterface.java → libLauncher/src/main/java/ru/gravit/launcher/modules/ModulesManager.java
View file

@ -2,7 +2,7 @@
import java.net.URL;
public interface ModulesManagerInterface extends AutoCloseable {
public interface ModulesManager extends AutoCloseable {
void initModules();
void load(Module module);
@ -15,6 +15,8 @@ public interface ModulesManagerInterface extends AutoCloseable {
void preInitModules();
void finishModules();
void printModules();
void sort();

42
libLauncher/src/main/java/ru/gravit/launcher/modules/TestClientModule.java
View file

@ -1,42 +0,0 @@
package ru.gravit.launcher.modules;
import ru.gravit.launcher.Launcher;
import ru.gravit.utils.Version;
public class TestClientModule implements Module {
@Override
public void close() {
}
@Override
public String getName() {
return "TestClientModule";
}
@Override
public Version getVersion() {
return Launcher.getVersion();
}
@Override
public int getPriority() {
return 0;
}
@Override
public void init(ModuleContext context) {
}
@Override
public void postInit(ModuleContext context) {
}
@Override
public void preInit(ModuleContext context) {
}
}