develop(livesync): update error handling

Author: Plamen5kov

test-app/app/src/debug/java/com/tns/NativeScriptSyncService.java

@@ -127,6 +127,7 @@ public void run() {
                         createOrOverrideFile(fileName, content);
 
                     } else if (operation == DEFAULT_OPERATION) {
+                        logger.write("LiveSync: input stream is empty!");
                         break;
                     } else {
                         throw new IllegalArgumentException(String.format("\nLiveSync: Operation not recognised. %s", LIVESYNC_ERROR_SUGGESTION));
@@ -135,7 +136,7 @@ public void run() {
                 } while (this.input.available() > 0);
 
             } catch (Exception e) {
-                logger.write("Error while LiveSyncing: " + e.toString());
+                logger.write(String.format("Error while LiveSyncing: %s", e.toString()));
                 e.printStackTrace();
                 exceptionWhileLivesyncing = true;
             } finally {
@@ -160,60 +161,86 @@ private int getOperation() {
             try {
 
                 byte[] operationBuff = readNextBytes(OPERATION_BYTE_SIZE);
-                String operationAsString = new String(operationBuff);
-                boolean noOperationRead = operationAsString.trim().isEmpty();
-                if (noOperationRead) {
+                if (operationBuff == null) {
                     return DEFAULT_OPERATION;
                 }
-                operation = Integer.parseInt(operationAsString);
+                operation = Integer.parseInt(new String(operationBuff));
 
+            } catch (NumberFormatException e) {
+                throw new IllegalStateException(String.format("\nLiveSync: failed to parse %s. %s\noriginal exception: %s", OPERATION, LIVESYNC_ERROR_SUGGESTION, e.toString()));
             } catch (Exception e) {
-                throw new IllegalStateException(String.format("\nLiveSync: failed to parse " + OPERATION + ". %s", LIVESYNC_ERROR_SUGGESTION));
+                throw new IllegalStateException(String.format("\nLiveSync: failed to parse %s. %s\noriginal exception: %s", OPERATION, LIVESYNC_ERROR_SUGGESTION, e.toString()));
             }
             return operation;
         }
 
         private String getFileName() {
             byte[] fileNameBuffer;
             int fileNameLenth = -1;
+            byte[] fileNameLengthBuffer;
+
             try {
 
-                byte[] fileNameLengthBuffer = readNextBytes(FILE_NAME_LENGTH_BYTE_SIZE);
-                fileNameLenth = Integer.valueOf(new String(fileNameLengthBuffer));
+                fileNameLengthBuffer = readNextBytes(FILE_NAME_LENGTH_BYTE_SIZE);
 
             } catch (Exception e) {
-                throw new IllegalStateException(String.format("\nLiveSync: failed to parse %s. %s", FILE_NAME_LENGTH, LIVESYNC_ERROR_SUGGESTION));
+                throw new IllegalStateException(String.format("\nLiveSync: failed to parse %s. %s\noriginal exception: %s", FILE_NAME_LENGTH, LIVESYNC_ERROR_SUGGESTION, e.toString()));
             }
 
-            try {
+            if (fileNameLengthBuffer == null) {
+                throw new IllegalStateException(String.format("\nLiveSync: Missing %s bytes. %s", FILE_NAME_LENGTH, LIVESYNC_ERROR_SUGGESTION));
+            }
 
+            try {
+                fileNameLenth = Integer.valueOf(new String(fileNameLengthBuffer));
                 fileNameBuffer = readNextBytes(fileNameLenth);
 
+            } catch (NumberFormatException e) {
+                throw new IllegalStateException(String.format("\nLiveSync: failed to parse %s. %s\noriginal exception: %s", FILE_NAME, LIVESYNC_ERROR_SUGGESTION, e.toString()));
             } catch (Exception e) {
-                throw new IllegalStateException(String.format("\nLiveSync: failed to parse %s. %s", FILE_NAME, LIVESYNC_ERROR_SUGGESTION));
+                throw new IllegalStateException(String.format("\nLiveSync: failed to parse %s. %s\noriginal exception: %s", FILE_NAME, LIVESYNC_ERROR_SUGGESTION, e.toString()));
             }
-            return new String(fileNameBuffer);
+
+            if (fileNameBuffer == null) {
+                throw new IllegalStateException(String.format("\nLiveSync: Missing %s bytes. %s", FILE_NAME, LIVESYNC_ERROR_SUGGESTION));
+            }
+
+            String fileName = new String(fileNameBuffer);
+            if (fileName.trim().length() < fileNameLenth) {
+                logger.write(String.format("WARNING: %s parsed length is less than %s. We read less information than you specified!", FILE_NAME, FILE_NAME_LENGTH));
+            }
+
+            return fileName.trim();
         }
 
         private byte[] getFileContent() throws IOException {
             byte[] contentBuff;
             int contentL = -1;
+            byte[] contentLength;
             try {
-
-                byte[] contentLength = readNextBytes(CONTENT_LENGTH_BYTE_SIZE);
-                contentL = Integer.parseInt(new String(contentLength));
-
+                contentLength = readNextBytes(CONTENT_LENGTH_BYTE_SIZE);
             } catch (Exception e) {
-                throw new IllegalStateException(String.format("\nLiveSync: failed to parse %s. %s", FILE_CONTENT_LENGTH, LIVESYNC_ERROR_SUGGESTION));
+                throw new IllegalStateException(String.format("\nLiveSync: failed to parse %s. %s\noriginal exception: %s", FILE_CONTENT_LENGTH, LIVESYNC_ERROR_SUGGESTION, e.toString()));
             }
 
-            try {
+            if (contentLength == null) {
+                throw new IllegalStateException(String.format("\nLiveSync: Missing %s bytes. %s", FILE_CONTENT_LENGTH, LIVESYNC_ERROR_SUGGESTION));
+            }
 
+            try {
+                contentL = Integer.parseInt(new String(contentLength));
                 contentBuff = readNextBytes(contentL);
 
+            } catch (NumberFormatException e) {
+                throw new IllegalStateException(String.format("\nLiveSync: failed to parse %s. %s\noriginal exception: %s", FILE_CONTENT_LENGTH, LIVESYNC_ERROR_SUGGESTION, e.toString()));
             } catch (Exception e) {
-                throw new IllegalStateException(String.format("\nLiveSync: failed to parse %s. %s", FILE_CONTENT, LIVESYNC_ERROR_SUGGESTION));
+                throw new IllegalStateException(String.format("\nLiveSync: failed to parse %s. %s\noriginal exception: %s", FILE_CONTENT, LIVESYNC_ERROR_SUGGESTION, e.toString()));
+            }
+
+            if (contentBuff == null) {
+                throw new IllegalStateException(String.format("\nLiveSync: Missing %s bytes. %s", FILE_CONTENT, LIVESYNC_ERROR_SUGGESTION));
             }
+
             return contentBuff;
         }
 
@@ -227,7 +254,7 @@ private void createOrOverrideFile(String fileName, byte[] content) throws IOExce
                 fos.close();
 
             } catch (Exception e) {
-                throw new IOException(String.format("\nLiveSync: failed to write file: %s", fileName));
+                throw new IOException(String.format("\nLiveSync: failed to write file: %s\noriginal exception: %s", fileName, e.toString()));
             }
         }
 
@@ -260,6 +287,9 @@ private byte[] readNextBytes(int size) throws IOException {
 
                 bytesRead = this.input.read(buffer, bufferWriteOffset, size);
                 if (bytesRead == -1) {
+                    if (bufferWriteOffset == 0) {
+                        return null;
+                    }
                     break;
                 }
                 size -= bytesRead;