norbipeti/VirtualComputer
1
0
Fork 0
Code Issues 6 Pull requests Projects Releases 4 Packages Wiki Activity

Logging everything, error handling attempt

Browse source 
Also a bunch of TODOs
This commit is contained in:
Norbi Peti 2019-02-26 14:13:32 +01:00
parent 865526f4d0
commit 3ad67c9390
No known key found for this signature in database
GPG key ID: DBA4C4549A927E56
2 changed files with 70 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
VirtualComputer/src/sznp/virtualcomputer/MCFrameBuffer.java
View file

@ -15,7 +15,7 @@ public class MCFrameBuffer implements IFramebuffer {
private IDisplay display; private IDisplay display;
private Holder<IDisplaySourceBitmap> holder = new Holder<>(); private Holder<IDisplaySourceBitmap> holder = new Holder<>();
public MCFrameBuffer(IDisplay display) { public MCFrameBuffer(IDisplay display, boolean VBoxDirect) { //TODO: Implement param
this.display = display; this.display = display;
} }

114
VirtualComputer/src/sznp/virtualcomputer/PluginMain.java
View file

@ -3,6 +3,7 @@ package sznp.virtualcomputer;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import jnr.ffi.LibraryLoader; import jnr.ffi.LibraryLoader;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.command.ConsoleCommandSender; import org.bukkit.command.ConsoleCommandSender;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
@ -117,63 +118,86 @@ public class PluginMain extends JavaPlugin {
public void Start(CommandSender sender) {// TODO: Add touchscreen support (#2) public void Start(CommandSender sender) {// TODO: Add touchscreen support (#2)
Bukkit.getScheduler().runTaskAsynchronously(this, () -> { Bukkit.getScheduler().runTaskAsynchronously(this, () -> {
sender.sendMessage("§eStarting computer..."); try {
if (machine == null) sendMessage(sender, "§eStarting computer...");
machine = vbox.getMachines().get(0); if (machine == null)
session.setName("minecraft"); machine = vbox.getMachines().get(0);
// machine.launchVMProcess(session, "headless", "").waitForCompletion(10000); - This creates a *process*, we don't want that anymore session.setName("minecraft");
machine.lockMachine(session, LockType.VM); // We want the machine inside *our* process <-- Need the VM type to have console access // machine.launchVMProcess(session, "headless", "").waitForCompletion(10000); - This creates a *process*, we don't want that anymore
final Runnable tr = new Runnable() { machine.lockMachine(session, LockType.VM); // We want the machine inside *our* process <-- Need the VM type to have console access
public void run() { final Runnable tr = new Runnable() {
if (session.getState() != SessionState.Locked) { // https://www.virtualbox.org/sdkref/_virtual_box_8idl.html#ac82c179a797c0d7c249d1b98a8e3aa8f public void run() {
Bukkit.getScheduler().runTaskLaterAsynchronously(PluginMain.this, this, 5); if (session.getState() != SessionState.Locked) { // https://www.virtualbox.org/sdkref/_virtual_box_8idl.html#ac82c179a797c0d7c249d1b98a8e3aa8f
return; // "This state also occurs as a short transient state during an IMachine::lockMachine call." Bukkit.getScheduler().runTaskLaterAsynchronously(PluginMain.this, this, 5);
return; // "This state also occurs as a short transient state during an IMachine::lockMachine call."
}
machine = session.getMachine(); // This is the Machine object we can work with
final IConsole console = session.getConsole();
console.powerUp(); // https://marc.info/?l=vbox-dev&m=142780789819967&w=2
console.getDisplay().attachFramebuffer(0L,
new IFramebuffer(new MCFrameBuffer(console.getDisplay(), true)));
startScreenTask(console, sender);
} }
machine = session.getMachine(); // This is the Machine object we can work with };
final IConsole console = session.getConsole(); Bukkit.getScheduler().runTaskLaterAsynchronously(this, tr, 5);
console.powerUp(); // https://marc.info/?l=vbox-dev&m=142780789819967&w=2 } catch (VBoxException e) {
console.getDisplay().attachFramebuffer(0L, if (e.getResultCode() == 0x80070005) { //lockMachine: "The object functionality is limited"
new IFramebuffer(new MCFrameBuffer(console.getDisplay()))); sendMessage(sender, "§6Cannot start computer, the machine may be inaccessible");
if (screenupdatetask == null) return; //TODO: If we have VirtualBox open, it won't close the server's port
screenupdatetask = Bukkit.getScheduler().runTaskTimerAsynchronously(PluginMain.this, () -> { //TODO: Can't detect if machine fails to start because of hardening issues
if (session.getState().equals(SessionState.Locked) // Don't run until the machine is running //TODO: This error also occurs if the machine has failed to start at least once (always reassign the machine?)
&& console.getState().equals(MachineState.Running)) //machine.launchVMProcess(session, "headless", "").waitForCompletion(10000); //No privileges, start the 'old' way
console.getDisplay().invalidateAndUpdateScreen(0L); //session.getConsole().getDisplay().attachFramebuffer(0L, new IFramebuffer(new MCFrameBuffer(session.getConsole().getDisplay(), false)));
if (session.getState().equals(SessionState.Unlocked) // Stop if the machine stopped fully //sendMessage(sender, "§6Computer started with slower screen. Run as root to use a faster method.");
|| console.getState().equals(MachineState.PoweredOff) } else {
|| console.getState().equals(MachineState.Saved)) { sendMessage(sender, "§cFailed to start computer: " + e.getMessage());
if (session.getState().equals(SessionState.Locked)) { return;
session.unlockMachine();
sender.sendMessage("Computer powered off, released it.");
}
screenupdatetask.cancel();
screenupdatetask = null;
}
}, 100, 100); // Do a full update every 5 seconds
sender.sendMessage("§eComputer started.");
} }
}; }
Bukkit.getScheduler().runTaskLaterAsynchronously(this, tr, 5); sendMessage(sender, "§eComputer started.");
}); });
} }
private void startScreenTask(IConsole console, CommandSender sender) {
if (screenupdatetask == null)
screenupdatetask = Bukkit.getScheduler().runTaskTimerAsynchronously(PluginMain.this, () -> {
if (session.getState().equals(SessionState.Locked) // Don't run until the machine is running
&& console.getState().equals(MachineState.Running))
console.getDisplay().invalidateAndUpdateScreen(0L);
if (session.getState().equals(SessionState.Unlocked) // Stop if the machine stopped fully
|| console.getState().equals(MachineState.PoweredOff)
|| console.getState().equals(MachineState.Saved)) {
if (session.getState().equals(SessionState.Locked)) {
session.unlockMachine();
sendMessage(sender, "Computer powered off, released it.");
}
screenupdatetask.cancel();
screenupdatetask = null;
}
}, 100, 100); // Do a full update every 5 seconds
}
private void sendMessage(CommandSender sender, String message) {
sender.sendMessage(message);
getLogger().warning(sender.getName() + ": " + ChatColor.stripColor(message));
}
public void Stop(CommandSender sender) { public void Stop(CommandSender sender) {
if (checkMachineNotRunning(sender)) { if (checkMachineNotRunning(sender)) {
if (session.getState().equals(SessionState.Locked)) { if (session.getState().equals(SessionState.Locked)) {
session.unlockMachine(); session.unlockMachine();
sender.sendMessage("§eComputer powered off, released it."); sendMessage(sender, "§eComputer powered off, released it.");
} }
return; return;
} }
sender.sendMessage("§eStopping computer..."); sendMessage(sender, "§eStopping computer...");
session.getConsole().powerDown().waitForCompletion(2000); session.getConsole().powerDown().waitForCompletion(2000);
session.unlockMachine(); session.unlockMachine();
sender.sendMessage("§eComputer stopped."); sendMessage(sender, "§eComputer stopped.");
} }
public void PowerButton(CommandSender sender) { public void PowerButton(CommandSender sender) {
sender.sendMessage("§ePressing powerbutton..."); sendMessage(sender, "§ePressing powerbutton...");
final CommandSender s = sender;
getServer().getScheduler().runTaskAsynchronously(this, new Runnable() { getServer().getScheduler().runTaskAsynchronously(this, new Runnable() {
@Override @Override
public void run() { public void run() {
@ -181,7 +205,7 @@ public class PluginMain extends JavaPlugin {
Start(sender); Start(sender);
} else { } else {
session.getConsole().powerButton(); session.getConsole().powerButton();
s.sendMessage("§ePowerbutton pressed."); sendMessage(sender, "§ePowerbutton pressed.");
} }
} }
}); });
@ -190,18 +214,18 @@ public class PluginMain extends JavaPlugin {
public void Reset(CommandSender sender) { public void Reset(CommandSender sender) {
if (checkMachineNotRunning(sender)) if (checkMachineNotRunning(sender))
return; return;
sender.sendMessage("§eResetting computer..."); sendMessage(sender, "§eResetting computer...");
session.getConsole().reset(); session.getConsole().reset();
sender.sendMessage("§eComputer reset."); sendMessage(sender, "§eComputer reset.");
} }
public void FixScreen(CommandSender sender) { public void FixScreen(CommandSender sender) {
if (checkMachineNotRunning(sender)) if (checkMachineNotRunning(sender))
return; return;
sender.sendMessage("§eFixing screen..."); sendMessage(sender, "§eFixing screen...");
session.getConsole().getDisplay().setSeamlessMode(false); session.getConsole().getDisplay().setSeamlessMode(false);
session.getConsole().getDisplay().setVideoModeHint(0L, true, false, 0, 0, 640L, 480L, 32L); session.getConsole().getDisplay().setVideoModeHint(0L, true, false, 0, 0, 640L, 480L, 32L);
sender.sendMessage("§eScreen fixed."); sendMessage(sender, "§eScreen fixed.");
} }
public boolean checkMachineNotRunning(@Nullable CommandSender sender) { public boolean checkMachineNotRunning(@Nullable CommandSender sender) {