From 5d4bd8c3a9e52888e5532f05b8ec41ba84b4d8cf Mon Sep 17 00:00:00 2001
From: Micooz <micooz@hotmail.com>
Date: Thu, 10 Aug 2017 22:09:00 +0800
Subject: [PATCH] core,presets: switch to use SOCKET_CONNECT_TO_REMOTE

---
 src/core/socket.js                    | 8 +++-----
 src/presets/__tests__/ss-base.test.js | 4 ++--
 src/presets/defs.js                   | 3 +--
 src/presets/exp-base-auth-stream.js   | 6 +++---
 src/presets/exp-base-with-padding.js  | 6 +++---
 src/presets/ss-base.js                | 6 +++---
 6 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/core/socket.js b/src/core/socket.js
index 3f3be5d..4c3d873 100755
--- a/src/core/socket.js
+++ b/src/core/socket.js
@@ -13,9 +13,8 @@ import {
 } from './middleware';
 
 import {
-  SOCKET_CONNECT_TO_DST,
-  PROCESSING_FAILED,
-  PROXY_HANDSHAKE_DONE
+  SOCKET_CONNECT_TO_REMOTE,
+  PROCESSING_FAILED
 } from '../presets/defs';
 
 const TRACK_CHAR_UPLOAD = '↑';
@@ -382,8 +381,7 @@ export class Socket extends EventEmitter {
    */
   onPipeNotified(action) {
     switch (action.type) {
-      case PROXY_HANDSHAKE_DONE:
-      case SOCKET_CONNECT_TO_DST: {
+      case SOCKET_CONNECT_TO_REMOTE: {
         const {targetAddress, onConnected} = action.payload;
         if (__IS_SERVER__) {
           // connect to destination
diff --git a/src/presets/__tests__/ss-base.test.js b/src/presets/__tests__/ss-base.test.js
index 4a82560..2bca107 100755
--- a/src/presets/__tests__/ss-base.test.js
+++ b/src/presets/__tests__/ss-base.test.js
@@ -1,4 +1,4 @@
-import {PROXY_HANDSHAKE_DONE} from '../defs';
+import {SOCKET_CONNECT_TO_REMOTE} from '../defs';
 import SsBasePreset from '../ss-base';
 
 describe('SsBasePreset#clientOut', function () {
@@ -6,7 +6,7 @@ describe('SsBasePreset#clientOut', function () {
   const preset = new SsBasePreset();
 
   preset.onNotified({
-    type: PROXY_HANDSHAKE_DONE,
+    type: SOCKET_CONNECT_TO_REMOTE,
     payload: {
       targetAddress: {
         type: 3,
diff --git a/src/presets/defs.js b/src/presets/defs.js
index 54349ea..5c77058 100644
--- a/src/presets/defs.js
+++ b/src/presets/defs.js
@@ -1,5 +1,4 @@
-export const SOCKET_CONNECT_TO_DST = 'socket/connect/to/dst';
-export const PROXY_HANDSHAKE_DONE = 'socket/handshake/done';
+export const SOCKET_CONNECT_TO_REMOTE = 'socket/connect/to/remote';
 export const PROCESSING_FAILED = 'processing/failed';
 
 export class IPreset {
diff --git a/src/presets/exp-base-auth-stream.js b/src/presets/exp-base-auth-stream.js
index 3fd9dbc..d141bbc 100644
--- a/src/presets/exp-base-auth-stream.js
+++ b/src/presets/exp-base-auth-stream.js
@@ -1,6 +1,6 @@
 import crypto from 'crypto';
 import {EVP_BytesToKey, numberToBuffer, hmac, Xor} from '../utils';
-import {IPreset, SOCKET_CONNECT_TO_DST, PROXY_HANDSHAKE_DONE} from './defs';
+import {IPreset, SOCKET_CONNECT_TO_REMOTE} from './defs';
 
 const IV_LEN = 16;
 const HMAC_LEN = 16;
@@ -76,7 +76,7 @@ export default class ExpBaseAuthStreamPreset extends IPreset {
   }
 
   onNotified(action) {
-    if (__IS_CLIENT__ && action.type === PROXY_HANDSHAKE_DONE) {
+    if (__IS_CLIENT__ && action.type === SOCKET_CONNECT_TO_REMOTE) {
       const {host, port} = action.payload.targetAddress;
       this._host = Buffer.from(host);
       this._port = numberToBuffer(port);
@@ -145,7 +145,7 @@ export default class ExpBaseAuthStreamPreset extends IPreset {
 
       // notify to connect to the real server
       broadcast({
-        type: SOCKET_CONNECT_TO_DST,
+        type: SOCKET_CONNECT_TO_REMOTE,
         payload: {
           targetAddress: {
             host: addr,
diff --git a/src/presets/exp-base-with-padding.js b/src/presets/exp-base-with-padding.js
index ed8a30c..b7bac24 100755
--- a/src/presets/exp-base-with-padding.js
+++ b/src/presets/exp-base-with-padding.js
@@ -1,7 +1,7 @@
 import net from 'net';
 import ip from 'ip';
 import {isValidHostname, numberToBuffer, hash} from '../utils';
-import {IPreset, SOCKET_CONNECT_TO_DST, PROXY_HANDSHAKE_DONE} from './defs';
+import {IPreset, SOCKET_CONNECT_TO_REMOTE} from './defs';
 
 /**
  * @description
@@ -65,7 +65,7 @@ export default class ExpBaseWithPaddingPreset extends IPreset {
   }
 
   onNotified(action) {
-    if (__IS_CLIENT__ && action.type === PROXY_HANDSHAKE_DONE) {
+    if (__IS_CLIENT__ && action.type === SOCKET_CONNECT_TO_REMOTE) {
       const {host, port} = action.payload.targetAddress;
       this._host = Buffer.from(host);
       this._port = numberToBuffer(port);
@@ -127,7 +127,7 @@ export default class ExpBaseWithPaddingPreset extends IPreset {
 
       // notify to connect to the real server
       broadcast({
-        type: SOCKET_CONNECT_TO_DST,
+        type: SOCKET_CONNECT_TO_REMOTE,
         payload: {
           targetAddress: {
             host: addr,
diff --git a/src/presets/ss-base.js b/src/presets/ss-base.js
index 644f5e7..f8c109c 100755
--- a/src/presets/ss-base.js
+++ b/src/presets/ss-base.js
@@ -1,6 +1,6 @@
 import ip from 'ip';
 import {isValidHostname, numberToBuffer} from '../utils';
-import {IPreset, SOCKET_CONNECT_TO_DST, PROXY_HANDSHAKE_DONE} from './defs';
+import {IPreset, SOCKET_CONNECT_TO_REMOTE} from './defs';
 
 const ATYP_V4 = 0x01;
 const ATYP_V6 = 0x04;
@@ -55,7 +55,7 @@ export default class SsBasePreset extends IPreset {
   _staging = Buffer.alloc(0);
 
   onNotified(action) {
-    if (__IS_CLIENT__ && action.type === PROXY_HANDSHAKE_DONE) {
+    if (__IS_CLIENT__ && action.type === SOCKET_CONNECT_TO_REMOTE) {
       const {type, host, port} = action.payload.targetAddress;
       this._atyp = type;
       this._port = numberToBuffer(port);
@@ -137,7 +137,7 @@ export default class SsBasePreset extends IPreset {
 
       // notify to connect to the real server
       broadcast({
-        type: SOCKET_CONNECT_TO_DST,
+        type: SOCKET_CONNECT_TO_REMOTE,
         payload: {
           targetAddress: {
             type: atyp,