Use WebSocketCloseUserTransient and Uset WebSocketCloseUserPermanent

* Used WebSocketCloseUserTransient and WebSocketCloseUserPermanent error codes to represent recoverable and non-recoverable MessagingError.

* Updated LiteCore

Author: pasin

libs/couchbase-lite-core

@@ -50,7 +50,7 @@
 import static com.couchbase.litecore.C4ReplicatorStatus.C4ReplicatorActivityLevel.kC4Connecting;
 import static com.couchbase.litecore.C4ReplicatorStatus.C4ReplicatorActivityLevel.kC4Offline;
 import static com.couchbase.litecore.C4ReplicatorStatus.C4ReplicatorActivityLevel.kC4Stopped;
-import static com.couchbase.litecore.C4WebSocketCloseCode.kWebSocketCloseCustomTransient;
+import static com.couchbase.litecore.C4WebSocketCloseCode.kWebSocketCloseUserTransient;
 import static java.util.Collections.synchronizedSet;
 
 /**
@@ -620,7 +620,7 @@ private boolean handleError(C4Error c4err) {
         // in network (i.e. network down, hostname unknown), then go offline and retry later.
         boolean bTransient = C4Replicator.mayBeTransient(c4err) ||
                 (c4err.getDomain() == WebSocketDomain &&
-                        c4err.getCode() == kWebSocketCloseCustomTransient);
+                        c4err.getCode() == kWebSocketCloseUserTransient);
 
         boolean bNetworkDependent = C4Replicator.mayBeNetworkDependent(c4err);
         if (!bTransient && !(config.isContinuous() && bNetworkDependent))

shared/src/main/java/com/couchbase/lite/AbstractReplicator.java

@@ -88,15 +88,17 @@ interface Code {
         int CBLErrorHTTPNotImplemented = 10501;         // Unimplemented server functionality
         int CBLErrorHTTPServiceUnavailable = 10503;     // Service is down temporarily(?)
 
-        int CBLErrorWebSocketBase = 11000;              // ---- WebSocket status codes start here
-        int CBLErrorWebSocketGoingAway = 11001;         // Peer has to close, e.g. because host app is quitting
-        int CBLErrorWebSocketProtocolError = 11002;     // Protocol violation: invalid framing data
-        int CBLErrorWebSocketDataError = 11003;         // Message payload cannot be handled
-        int CBLErrorWebSocketAbnormalClose = 11006;     // TCP socket closed unexpectedly
-        int CBLErrorWebSocketBadMessageFormat = 11007;  // Unparseable WebSocket message
-        int CBLErrorWebSocketPolicyError = 11008;       // Message violated unspecified policy
-        int CBLErrorWebSocketMessageTooBig = 11009;     // Message is too large for peer to handle
-        int CBLErrorWebSocketMissingExtension = 11010;  // Peer doesn't provide a necessary extension
-        int CBLErrorWebSocketCantFulfill = 11011;       // Can't fulfill request due to "unexpected condition"
+        int CBLErrorWebSocketBase = 11000;                  // ---- WebSocket status codes start here
+        int CBLErrorWebSocketGoingAway = 11001;             // Peer has to close, e.g. because host app is quitting
+        int CBLErrorWebSocketProtocolError = 11002;         // Protocol violation: invalid framing data
+        int CBLErrorWebSocketDataError = 11003;             // Message payload cannot be handled
+        int CBLErrorWebSocketAbnormalClose = 11006;         // TCP socket closed unexpectedly
+        int CBLErrorWebSocketBadMessageFormat = 11007;      // Unparseable WebSocket message
+        int CBLErrorWebSocketPolicyError = 11008;           // Message violated unspecified policy
+        int CBLErrorWebSocketMessageTooBig = 11009;         // Message is too large for peer to handle
+        int CBLErrorWebSocketMissingExtension = 11010;      // Peer doesn't provide a necessary extension
+        int CBLErrorWebSocketCantFulfill = 11011;           // Can't fulfill request due to "unexpected condition"
+        int CBLErrorWebSocketCloseUserTransient = 14001;    // Recoverable messaging error
+        int CBLErrorWebSocketCloseUserPermanent = 14002;    // Non-recoverable messaging error
     }
 }