From 5db598bc6386aaabe69f2eed55b03625c72c236b Mon Sep 17 00:00:00 2001 From: Niki Roo Date: Sun, 12 May 2019 15:12:13 +0200 Subject: [PATCH] remote: exceptions --- .../nikiroo/fanfix/library/RemoteLibrary.java | 394 ++++++++---------- .../library/RemoteLibraryException.java | 27 ++ .../fanfix/library/RemoteLibraryServer.java | 9 +- 3 files changed, 194 insertions(+), 236 deletions(-) create mode 100644 src/be/nikiroo/fanfix/library/RemoteLibraryException.java diff --git a/src/be/nikiroo/fanfix/library/RemoteLibrary.java b/src/be/nikiroo/fanfix/library/RemoteLibrary.java index 653c257..077a857 100644 --- a/src/be/nikiroo/fanfix/library/RemoteLibrary.java +++ b/src/be/nikiroo/fanfix/library/RemoteLibrary.java @@ -25,6 +25,34 @@ import be.nikiroo.utils.serial.server.ConnectActionClientObject; * @author niki */ public class RemoteLibrary extends BasicLibrary { + interface RemoteAction { + public void action(ConnectActionClientObject action) throws Exception; + } + + class RemoteConnectAction extends ConnectActionClientObject { + public RemoteConnectAction() throws IOException { + super(host, port, key); + } + + @Override + public Object send(Object data) throws IOException, + NoSuchFieldException, NoSuchMethodException, + ClassNotFoundException { + Object rep = super.send(data); + if (rep instanceof RemoteLibraryException) { + RemoteLibraryException remoteEx = (RemoteLibraryException) rep; + IOException cause = remoteEx.getCause(); + if (cause == null) { + cause = new IOException("IOException"); + } + + throw cause; + } + + return rep; + } + } + private String host; private int port; private final String key; @@ -115,7 +143,7 @@ public class RemoteLibrary extends BasicLibrary { result[0] = Status.INVALID; try { - new ConnectActionClientObject(host, port, key) { + new RemoteConnectAction() { @Override public void action(Version serverVersion) throws Exception { Object rep = send(new Object[] { subkey, "PING" }); @@ -155,27 +183,15 @@ public class RemoteLibrary extends BasicLibrary { public Image getCover(final String luid) { final Image[] result = new Image[1]; - try { - new ConnectActionClientObject(host, port, key) { - @Override - public void action(Version serverVersion) throws Exception { - Object rep = send(new Object[] { subkey, "GET_COVER", luid }); - result[0] = (Image) rep; - } - - @Override - protected void onError(Exception e) { - if (e instanceof SSLException) { - Instance.getTraceHandler().error( - "Connection refused (bad key)"); - } else { - Instance.getTraceHandler().error(e); - } - } - }.connect(); - } catch (Exception e) { - Instance.getTraceHandler().error(e); - } + connectRemoteAction(new RemoteAction() { + @Override + public void action(ConnectActionClientObject action) + throws Exception { + Object rep = action.send(new Object[] { subkey, "GET_COVER", + luid }); + result[0] = (Image) rep; + } + }); return result[0]; } @@ -194,28 +210,15 @@ public class RemoteLibrary extends BasicLibrary { private Image getCustomCover(final String source, final String type) { final Image[] result = new Image[1]; - try { - new ConnectActionClientObject(host, port, key) { - @Override - public void action(Version serverVersion) throws Exception { - Object rep = send(new Object[] { subkey, - "GET_CUSTOM_COVER", type, source }); - result[0] = (Image) rep; - } - - @Override - protected void onError(Exception e) { - if (e instanceof SSLException) { - Instance.getTraceHandler().error( - "Connection refused (bad key)"); - } else { - Instance.getTraceHandler().error(e); - } - } - }.connect(); - } catch (Exception e) { - Instance.getTraceHandler().error(e); - } + connectRemoteAction(new RemoteAction() { + @Override + public void action(ConnectActionClientObject action) + throws Exception { + Object rep = action.send(new Object[] { subkey, + "GET_CUSTOM_COVER", type, source }); + result[0] = (Image) rep; + } + }); return result[0]; } @@ -225,48 +228,37 @@ public class RemoteLibrary extends BasicLibrary { final Progress pgF = pg; final Story[] result = new Story[1]; - try { - new ConnectActionClientObject(host, port, key) { - @Override - public void action(Version serverVersion) throws Exception { - Progress pg = pgF; - if (pg == null) { - pg = new Progress(); - } - - Object rep = send(new Object[] { subkey, "GET_STORY", luid }); + connectRemoteAction(new RemoteAction() { + @Override + public void action(ConnectActionClientObject action) + throws Exception { + Progress pg = pgF; + if (pg == null) { + pg = new Progress(); + } - MetaData meta = null; - if (rep instanceof MetaData) { - meta = (MetaData) rep; - if (meta.getWords() <= Integer.MAX_VALUE) { - pg.setMinMax(0, (int) meta.getWords()); - } - } + Object rep = action.send(new Object[] { subkey, "GET_STORY", + luid }); - List list = new ArrayList(); - for (Object obj = send(null); obj != null; obj = send(null)) { - list.add(obj); - pg.add(1); + MetaData meta = null; + if (rep instanceof MetaData) { + meta = (MetaData) rep; + if (meta.getWords() <= Integer.MAX_VALUE) { + pg.setMinMax(0, (int) meta.getWords()); } - - result[0] = RemoteLibraryServer.rebuildStory(list); - pg.done(); } - @Override - protected void onError(Exception e) { - if (e instanceof SSLException) { - Instance.getTraceHandler().error( - "Connection refused (bad key)"); - } else { - Instance.getTraceHandler().error(e); - } + List list = new ArrayList(); + for (Object obj = action.send(null); obj != null; obj = action + .send(null)) { + list.add(obj); + pg.add(1); } - }.connect(); - } catch (Exception e) { - Instance.getTraceHandler().error(e); - } + + result[0] = RemoteLibraryServer.rebuildStory(list); + pg.done(); + } + }); return result[0]; } @@ -288,37 +280,28 @@ public class RemoteLibrary extends BasicLibrary { final Progress pgF = pgSave; - new ConnectActionClientObject(host, port, key) { + connectRemoteAction(new RemoteAction() { @Override - public void action(Version serverVersion) throws Exception { + public void action(ConnectActionClientObject action) + throws Exception { Progress pg = pgF; if (story.getMeta().getWords() <= Integer.MAX_VALUE) { pg.setMinMax(0, (int) story.getMeta().getWords()); } - send(new Object[] { subkey, "SAVE_STORY", luid }); + action.send(new Object[] { subkey, "SAVE_STORY", luid }); List list = RemoteLibraryServer.breakStory(story); for (Object obj : list) { - send(obj); + action.send(obj); pg.add(1); } - luidSaved[0] = (String) send(null); + luidSaved[0] = (String) action.send(null); pg.done(); } - - @Override - protected void onError(Exception e) { - if (e instanceof SSLException) { - Instance.getTraceHandler().error( - "Connection refused (bad key)"); - } else { - Instance.getTraceHandler().error(e); - } - } - }.connect(); + }); // because the meta changed: MetaData meta = getInfo(luidSaved[0]); @@ -338,22 +321,13 @@ public class RemoteLibrary extends BasicLibrary { @Override public synchronized void delete(final String luid) throws IOException { - new ConnectActionClientObject(host, port, key) { + connectRemoteAction(new RemoteAction() { @Override - public void action(Version serverVersion) throws Exception { - send(new Object[] { subkey, "DELETE_STORY", luid }); + public void action(ConnectActionClientObject action) + throws Exception { + action.send(new Object[] { subkey, "DELETE_STORY", luid }); } - - @Override - protected void onError(Exception e) { - if (e instanceof SSLException) { - Instance.getTraceHandler().error( - "Connection refused (bad key)"); - } else { - Instance.getTraceHandler().error(e); - } - } - }.connect(); + }); } @Override @@ -369,26 +343,14 @@ public class RemoteLibrary extends BasicLibrary { // type = "SOURCE" | "AUTHOR" private void setCover(final String value, final String luid, final String type) { - try { - new ConnectActionClientObject(host, port, key) { - @Override - public void action(Version serverVersion) throws Exception { - send(new Object[] { subkey, "SET_COVER", type, value, luid }); - } - - @Override - protected void onError(Exception e) { - if (e instanceof SSLException) { - Instance.getTraceHandler().error( - "Connection refused (bad key)"); - } else { - Instance.getTraceHandler().error(e); - } - } - }.connect(); - } catch (IOException e) { - Instance.getTraceHandler().error(e); - } + connectRemoteAction(new RemoteAction() { + @Override + public void action(ConnectActionClientObject action) + throws Exception { + action.send(new Object[] { subkey, "SET_COVER", type, value, + luid }); + } + }); } @Override @@ -414,40 +376,27 @@ public class RemoteLibrary extends BasicLibrary { final Progress pgF = pgImprt; final String[] luid = new String[1]; - try { - new ConnectActionClientObject(host, port, key) { - @Override - public void action(Version serverVersion) throws Exception { - Progress pg = pgF; - - Object rep = send(new Object[] { subkey, "IMPORT", - url.toString() }); + connectRemoteAction(new RemoteAction() { + @Override + public void action(ConnectActionClientObject action) + throws Exception { + Progress pg = pgF; - while (true) { - if (!RemoteLibraryServer.updateProgress(pg, rep)) { - break; - } + Object rep = action.send(new Object[] { subkey, "IMPORT", + url.toString() }); - rep = send(null); + while (true) { + if (!RemoteLibraryServer.updateProgress(pg, rep)) { + break; } - pg.done(); - luid[0] = (String) rep; + rep = action.send(null); } - @Override - protected void onError(Exception e) { - if (e instanceof SSLException) { - Instance.getTraceHandler().error( - "Connection refused (bad key)"); - } else { - Instance.getTraceHandler().error(e); - } - } - }.connect(); - } catch (IOException e) { - Instance.getTraceHandler().error(e); - } + pg.done(); + luid[0] = (String) rep; + } + }); if (luid[0] == null) { throw new IOException("Remote failure"); @@ -468,36 +417,23 @@ public class RemoteLibrary extends BasicLibrary { final Progress pgF = pg == null ? new Progress() : pg; - try { - new ConnectActionClientObject(host, port, key) { - @Override - public void action(Version serverVersion) throws Exception { - Progress pg = pgF; - - Object rep = send(new Object[] { subkey, "CHANGE_STA", - luid, newSource, newTitle, newAuthor }); - while (true) { - if (!RemoteLibraryServer.updateProgress(pg, rep)) { - break; - } + connectRemoteAction(new RemoteAction() { + @Override + public void action(ConnectActionClientObject action) + throws Exception { + Progress pg = pgF; - rep = send(null); + Object rep = action.send(new Object[] { subkey, "CHANGE_STA", + luid, newSource, newTitle, newAuthor }); + while (true) { + if (!RemoteLibraryServer.updateProgress(pg, rep)) { + break; } - } - @Override - protected void onError(Exception e) { - if (e instanceof SSLException) { - Instance.getTraceHandler().error( - "Connection refused (bad key)"); - } else { - Instance.getTraceHandler().error(e); - } + rep = action.send(null); } - }.connect(); - } catch (IOException e) { - Instance.getTraceHandler().error(e); - } + } + }); } @Override @@ -510,26 +446,13 @@ public class RemoteLibrary extends BasicLibrary { * Stop the server. */ public void exit() { - try { - new ConnectActionClientObject(host, port, key) { - @Override - public void action(Version serverVersion) throws Exception { - send(new Object[] { subkey, "EXIT" }); - } - - @Override - protected void onError(Exception e) { - if (e instanceof SSLException) { - Instance.getTraceHandler().error( - "Connection refused (bad key)"); - } else { - Instance.getTraceHandler().error(e); - } - } - }.connect(); - } catch (IOException e) { - Instance.getTraceHandler().error(e); - } + connectRemoteAction(new RemoteAction() { + @Override + public void action(ConnectActionClientObject action) + throws Exception { + action.send(new Object[] { subkey, "EXIT" }); + } + }); } @Override @@ -594,33 +517,46 @@ public class RemoteLibrary extends BasicLibrary { final Progress pgF = pg; final List metas = new ArrayList(); - try { - new ConnectActionClientObject(host, port, key) { - @Override - public void action(Version serverVersion) throws Exception { - Progress pg = pgF; - if (pg == null) { - pg = new Progress(); - } - - Object rep = send(new Object[] { subkey, "GET_METADATA", - luid }); + connectRemoteAction(new RemoteAction() { + @Override + public void action(ConnectActionClientObject action) + throws Exception { + Progress pg = pgF; + if (pg == null) { + pg = new Progress(); + } - while (true) { - if (!RemoteLibraryServer.updateProgress(pg, rep)) { - break; - } + Object rep = action.send(new Object[] { subkey, "GET_METADATA", + luid }); - rep = send(null); + while (true) { + if (!RemoteLibraryServer.updateProgress(pg, rep)) { + break; } - if (rep instanceof MetaData[]) { - for (MetaData meta : (MetaData[]) rep) { - metas.add(meta); - } - } else if (rep != null) { - metas.add((MetaData) rep); + rep = action.send(null); + } + + if (rep instanceof MetaData[]) { + for (MetaData meta : (MetaData[]) rep) { + metas.add(meta); } + } else if (rep != null) { + metas.add((MetaData) rep); + } + } + }); + + return metas; + } + + private void connectRemoteAction(final RemoteAction runAction) { + try { + final RemoteConnectAction[] array = new RemoteConnectAction[1]; + RemoteConnectAction ra = new RemoteConnectAction() { + @Override + public void action(Version serverVersion) throws Exception { + runAction.action(array[0]); } @Override @@ -632,11 +568,11 @@ public class RemoteLibrary extends BasicLibrary { Instance.getTraceHandler().error(e); } } - }.connect(); + }; + array[0] = ra; + ra.connect(); } catch (Exception e) { Instance.getTraceHandler().error(e); } - - return metas; } } diff --git a/src/be/nikiroo/fanfix/library/RemoteLibraryException.java b/src/be/nikiroo/fanfix/library/RemoteLibraryException.java new file mode 100644 index 0000000..fb86787 --- /dev/null +++ b/src/be/nikiroo/fanfix/library/RemoteLibraryException.java @@ -0,0 +1,27 @@ +package be.nikiroo.fanfix.library; + +import java.io.IOException; + +/** + * Exceptions sent from remote to local. + * + * @author niki + */ +public class RemoteLibraryException extends IOException { + private static final long serialVersionUID = 1L; + + /** + * Wrap an {@link IOException} to allow it to pass across the network. + * + * @param cause + * the excption to wrap + */ + public RemoteLibraryException(IOException cause) { + super(cause); + } + + @Override + public synchronized IOException getCause() { + return (IOException) super.getCause(); + } +} diff --git a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java index ada4673..c3933eb 100644 --- a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java +++ b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java @@ -145,11 +145,10 @@ public class RemoteLibraryServer extends ServerObject { System.out.println(trace); Object rep = null; - Exception oops = null; try { rep = doRequest(action, command, args, rw, whitelist); - } catch (Exception e) { - oops = e; + } catch (IOException e) { + rep = new RemoteLibraryException(e); } commands.put(id, command); @@ -157,10 +156,6 @@ public class RemoteLibraryServer extends ServerObject { rws.put(id, rw); times.put(id, (new Date().getTime() - start)); - if (oops != null) { - throw oops; - } - return rep; } -- 2.27.0