package be.nikiroo.utils.serial.server;
-import java.io.BufferedReader;
import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
+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.
abstract class ConnectAction {
private Socket s;
private boolean server;
- private Version version;
- private Version clientVersion;
private CryptUtils crypt;
private Object lock = new Object();
- private BufferedReader in;
- private OutputStreamWriter out;
+ private NextableInputStream in;
+ private OutputStream out;
private boolean contentToSend;
private long bytesReceived;
* 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.
- * <p>
- * Thus, it is only called on the server.
- * <p>
- * 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.
*
* @param e
- * the exception that occurred
+ * the exception that occurred, SSLException usually denotes a
+ * crypt error
*/
abstract protected void onError(Exception e);
* @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;
}
/**
*/
public void connect() {
try {
- in = new BufferedReader(new InputStreamReader(s.getInputStream(),
- "UTF-8"));
+ in = new NextableInputStream(s.getInputStream(),
+ new NextableInputStreamStep('\b'));
+
try {
- out = new OutputStreamWriter(s.getOutputStream(), "UTF-8");
+ out = s.getOutputStream();
try {
- if (server) {
- String line = readLine(in);
- 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;
* @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
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;
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;
+ }
- return new Importer().read(str).getValue();
+ if (in.next()) {
+ return new Importer().read(in).getValue();
+ }
+
+ throw new NullPointerException();
+ }
+
+ return null;
+ }
}
/**
*
* @throws IOException
* in case of I/O error
+ * @throws SSLException
+ * in case of crypt error
*/
protected String sendString(String line) throws IOException {
synchronized (lock) {
* <p>
* Will only flush the data if there is contentToSend.
*
- * @return the answer (which can be NULL)
+ * @return the answer (which can be NULL if no more content)
*
* @throws IOException
* in case of I/O error
+ * @throws SSLException
+ * in case of crypt error
*/
protected String recString() throws IOException {
synchronized (lock) {
}
}
- private String readLine(BufferedReader in) throws IOException {
- String line = in.readLine();
- if (line != null) {
+ /**
+ * Read a possibly encrypted line, or NULL if no more content.
+ *
+ * @param in
+ * the stream to read from
+ *
+ * @return the unencrypted line or NULL
+ *
+ *
+ * @throws IOException
+ * in case of I/O error
+ * @throws SSLException
+ * in case of crypt error
+ */
+ private String readLine(NextableInputStream in) throws IOException {
+ if (in.next()) {
+ String line = IOUtils.readSmallStream(in);
bytesReceived += line.length();
if (crypt != null) {
line = crypt.decrypt64s(line, false);
}
+
+ return line;
}
- return line;
+ return null;
}
- private void writeLine(OutputStreamWriter out, String line)
- throws IOException {
+ /**
+ * Write a line, possible encrypted.
+ *
+ * @param out
+ * the stream to write to
+ * @param line
+ * the line to write
+ * @throws IOException
+ * in case of I/O error
+ * @throws SSLException
+ * in case of crypt error
+ */
+ private void writeLine(OutputStream out, String line) throws IOException {
if (crypt == null) {
- out.write(line);
+ 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);
+ out.write(b64.getBytes("UTF-8"));
bytesSent += b64.length();
}
- out.write("\n");
+ out.write('\b');
bytesSent++;
}
}
\ No newline at end of file
git://git.nikiroo.be / nikiroo-utils.git / blobdiff