X-Git-Url: https://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Fserial%2Fserver%2FConnectAction.java;h=aafad62facfa5a3a3433df3a7aa54de8f23806b4;hb=f743f2ca02a518a7e91ee6376bff28c68977f8da;hp=a377ced597f2a6bd84d01fd008f7f5099b9409a3;hpb=9af739b58e2cd5357a21d6fd0410049ab2a2bff3;p=nikiroo-utils.git diff --git a/src/be/nikiroo/utils/serial/server/ConnectAction.java b/src/be/nikiroo/utils/serial/server/ConnectAction.java index a377ced..aafad62 100644 --- a/src/be/nikiroo/utils/serial/server/ConnectAction.java +++ b/src/be/nikiroo/utils/serial/server/ConnectAction.java @@ -1,18 +1,17 @@ package be.nikiroo.utils.serial.server; -import java.io.BufferedReader; import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; import java.io.OutputStream; import java.net.Socket; import javax.net.ssl.SSLException; import be.nikiroo.utils.CryptUtils; -import be.nikiroo.utils.Version; +import be.nikiroo.utils.IOUtils; import be.nikiroo.utils.serial.Exporter; import be.nikiroo.utils.serial.Importer; +import be.nikiroo.utils.streams.NextableInputStream; +import be.nikiroo.utils.streams.NextableInputStreamStep; /** * Base class used for the client/server basic handling. @@ -26,13 +25,11 @@ import be.nikiroo.utils.serial.Importer; abstract class ConnectAction { private Socket s; private boolean server; - private Version version; - private Version clientVersion; private CryptUtils crypt; private Object lock = new Object(); - private InputStream in; + private NextableInputStream in; private OutputStream out; private boolean contentToSend; @@ -43,27 +40,10 @@ abstract class ConnectAction { * Method that will be called when an action is performed on either the * client or server this {@link ConnectAction} represent. * - * @param version - * the counter part version - * * @throws Exception * in case of I/O error */ - abstract protected void action(Version version) throws Exception; - - /** - * Method called when we negotiate the version with the client. - *

- * Thus, it is only called on the server. - *

- * Will return the actual server version by default. - * - * @param clientVersion - * the client version - * - * @return the version to send to the client - */ - abstract protected Version negotiateVersion(Version clientVersion); + abstract protected void action() throws Exception; /** * Handler called when an unexpected error occurs in the code. @@ -85,33 +65,13 @@ abstract class ConnectAction { * @param key * an optional key to encrypt all the communications (if NULL, * everything will be sent in clear text) - * @param version - * the version of this client-or-server */ - protected ConnectAction(Socket s, boolean server, String key, - Version version) { + protected ConnectAction(Socket s, boolean server, String key) { this.s = s; this.server = server; if (key != null) { crypt = new CryptUtils(key); } - - if (version == null) { - this.version = new Version(); - } else { - this.version = version; - } - - clientVersion = new Version(); - } - - /** - * The version of this client-or-server. - * - * @return the version - */ - public Version getVersion() { - return version; } /** @@ -137,41 +97,13 @@ abstract class ConnectAction { */ public void connect() { try { - in = s.getInputStream(); + in = new NextableInputStream(s.getInputStream(), + new NextableInputStreamStep('\b')); + try { out = s.getOutputStream(); try { - if (server) { - String line; - try { - line = readLine(in); - } catch (SSLException e) { - out.write("Unauthorized\n".getBytes()); - throw e; - } - - if (line != null && line.startsWith("VERSION ")) { - // "VERSION client-version" (VERSION 1.0.0) - Version clientVersion = new Version( - line.substring("VERSION ".length())); - this.clientVersion = clientVersion; - Version v = negotiateVersion(clientVersion); - if (v == null) { - v = new Version(); - } - - sendString("VERSION " + v.toString()); - } - - action(clientVersion); - } else { - String v = sendString("VERSION " + version.toString()); - if (v != null && v.startsWith("VERSION ")) { - v = v.substring("VERSION ".length()); - } - - action(new Version(v)); - } + action(); } finally { out.close(); out = null; @@ -199,8 +131,9 @@ abstract class ConnectAction { * @param data * the data to send * - * @return the answer (which can be NULL) if this action is a client, always - * NULL if it is a server + * @return the answer (which can be NULL if no answer, or NULL for an answer + * which is NULL) if this action is a client, always NULL if it is a + * server * * @throws IOException * in case of I/O error @@ -216,10 +149,20 @@ abstract class ConnectAction { protected Object sendObject(Object data) throws IOException, NoSuchFieldException, NoSuchMethodException, ClassNotFoundException { synchronized (lock) { - String rep = sendString(new Exporter().append(data).toString(true, - true)); - if (rep != null) { - return new Importer().read(rep).getValue(); + + new Exporter(out).append(data); + out.write('\b'); + + if (server) { + out.flush(); + return null; + } + + contentToSend = true; + try { + return recObject(); + } catch (NullPointerException e) { + // We accept no data here } return null; @@ -253,12 +196,22 @@ abstract class ConnectAction { protected Object recObject() throws IOException, NoSuchFieldException, NoSuchMethodException, ClassNotFoundException, java.lang.NullPointerException { - String str = recString(); - if (str == null) { - throw new NullPointerException("No more data available"); - } + synchronized (lock) { + if (server || contentToSend) { + if (contentToSend) { + out.flush(); + contentToSend = false; + } + + if (in.next()) { + return new Importer().read(in).getValue(); + } + + throw new NullPointerException(); + } - return new Importer().read(str).getValue(); + return null; + } } /** @@ -334,11 +287,12 @@ abstract class ConnectAction { * @throws SSLException * in case of crypt error */ - private String readLine(InputStream in) throws IOException { - if (inReader == null) { - inReader = new BufferedReader(new InputStreamReader(in)); + private String readLine(NextableInputStream in) throws IOException { + String line = null; + if (in.next()) { + line = IOUtils.readSmallStream(in); } - String line = inReader.readLine(); + if (line != null) { bytesReceived += line.length(); if (crypt != null) { @@ -349,8 +303,6 @@ abstract class ConnectAction { return line; } - private BufferedReader inReader; - /** * Write a line, possible encrypted. * @@ -365,15 +317,15 @@ abstract class ConnectAction { */ private void writeLine(OutputStream out, String line) throws IOException { if (crypt == null) { - out.write(line.getBytes()); + out.write(line.getBytes("UTF-8")); bytesSent += line.length(); } else { // TODO: how NOT to create so many big Strings? String b64 = crypt.encrypt64(line, false); - out.write(b64.getBytes()); + out.write(b64.getBytes("UTF-8")); bytesSent += b64.length(); } - out.write("\n".getBytes()); + out.write('\b'); bytesSent++; } } \ No newline at end of file