@@ -22,146 +22,156 @@ func (result ActionResult) Json() ([]byte, error) {
2222 return data , err
2323}
2424
25- func (action Action ) wrapMessage (data interface {}) []byte {
26- sendAction := ActionResult {
25+ func (action Action ) getResult (data interface {}) []byte {
26+ resultAction := ActionResult {
2727 Id : action .Id ,
2828 Method : action .Method ,
2929 Data : data ,
3030 }
31- res , _ := sendAction .Json ()
31+ res , _ := resultAction .Json ()
3232 return res
3333}
3434
35- func handleAction (action * Action , send func ([] byte )) {
35+ func handleAction (action * Action , result func (data interface {} )) {
3636 switch action .Method {
3737 case initClashMethod :
3838 data := action .Data .(string )
39- send ( action . wrapMessage ( handleInitClash (data ) ))
39+ result ( handleInitClash (data ))
4040 return
4141 case getIsInitMethod :
42- send ( action . wrapMessage ( handleGetIsInit () ))
42+ result ( handleGetIsInit ())
4343 return
4444 case forceGcMethod :
4545 handleForceGc ()
46- send ( action . wrapMessage ( true ) )
46+ result ( true )
4747 return
4848 case shutdownMethod :
49- send ( action . wrapMessage ( handleShutdown () ))
49+ result ( handleShutdown ())
5050 return
5151 case validateConfigMethod :
5252 data := []byte (action .Data .(string ))
53- send ( action . wrapMessage ( handleValidateConfig (data ) ))
53+ result ( handleValidateConfig (data ))
5454 return
5555 case updateConfigMethod :
5656 data := []byte (action .Data .(string ))
57- send ( action . wrapMessage ( handleUpdateConfig (data ) ))
57+ result ( handleUpdateConfig (data ))
5858 return
5959 case getProxiesMethod :
60- send ( action . wrapMessage ( handleGetProxies () ))
60+ result ( handleGetProxies ())
6161 return
6262 case changeProxyMethod :
6363 data := action .Data .(string )
6464 handleChangeProxy (data , func (value string ) {
65- send ( action . wrapMessage ( value ) )
65+ result ( value )
6666 })
6767 return
6868 case getTrafficMethod :
69- send ( action . wrapMessage ( handleGetTraffic () ))
69+ result ( handleGetTraffic ())
7070 return
7171 case getTotalTrafficMethod :
72- send ( action . wrapMessage ( handleGetTotalTraffic () ))
72+ result ( handleGetTotalTraffic ())
7373 return
7474 case resetTrafficMethod :
7575 handleResetTraffic ()
76- send ( action . wrapMessage ( true ) )
76+ result ( true )
7777 return
7878 case asyncTestDelayMethod :
7979 data := action .Data .(string )
8080 handleAsyncTestDelay (data , func (value string ) {
81- send ( action . wrapMessage ( value ) )
81+ result ( value )
8282 })
8383 return
8484 case getConnectionsMethod :
85- send ( action . wrapMessage ( handleGetConnections () ))
85+ result ( handleGetConnections ())
8686 return
8787 case closeConnectionsMethod :
88- send ( action . wrapMessage ( handleCloseConnections () ))
88+ result ( handleCloseConnections ())
8989 return
9090 case closeConnectionMethod :
9191 id := action .Data .(string )
92- send ( action . wrapMessage ( handleCloseConnection (id ) ))
92+ result ( handleCloseConnection (id ))
9393 return
9494 case getExternalProvidersMethod :
95- send ( action . wrapMessage ( handleGetExternalProviders () ))
95+ result ( handleGetExternalProviders ())
9696 return
9797 case getExternalProviderMethod :
9898 externalProviderName := action .Data .(string )
99- send ( action . wrapMessage ( handleGetExternalProvider (externalProviderName ) ))
99+ result ( handleGetExternalProvider (externalProviderName ))
100100 case updateGeoDataMethod :
101101 paramsString := action .Data .(string )
102102 var params = map [string ]string {}
103103 err := json .Unmarshal ([]byte (paramsString ), & params )
104104 if err != nil {
105- send ( action . wrapMessage ( err .Error () ))
105+ result ( err .Error ())
106106 return
107107 }
108108 geoType := params ["geo-type" ]
109109 geoName := params ["geo-name" ]
110110 handleUpdateGeoData (geoType , geoName , func (value string ) {
111- send ( action . wrapMessage ( value ) )
111+ result ( value )
112112 })
113113 return
114114 case updateExternalProviderMethod :
115115 providerName := action .Data .(string )
116116 handleUpdateExternalProvider (providerName , func (value string ) {
117- send ( action . wrapMessage ( value ) )
117+ result ( value )
118118 })
119119 return
120120 case sideLoadExternalProviderMethod :
121121 paramsString := action .Data .(string )
122122 var params = map [string ]string {}
123123 err := json .Unmarshal ([]byte (paramsString ), & params )
124124 if err != nil {
125- send ( action . wrapMessage ( err .Error () ))
125+ result ( err .Error ())
126126 return
127127 }
128128 providerName := params ["providerName" ]
129129 data := params ["data" ]
130130 handleSideLoadExternalProvider (providerName , []byte (data ), func (value string ) {
131- send ( action . wrapMessage ( value ) )
131+ result ( value )
132132 })
133133 return
134134 case startLogMethod :
135135 handleStartLog ()
136- send ( action . wrapMessage ( true ) )
136+ result ( true )
137137 return
138138 case stopLogMethod :
139139 handleStopLog ()
140- send ( action . wrapMessage ( true ) )
140+ result ( true )
141141 return
142142 case startListenerMethod :
143- send ( action . wrapMessage ( handleStartListener () ))
143+ result ( handleStartListener ())
144144 return
145145 case stopListenerMethod :
146- send ( action . wrapMessage ( handleStopListener () ))
146+ result ( handleStopListener ())
147147 return
148148 case getCountryCodeMethod :
149149 ip := action .Data .(string )
150150 handleGetCountryCode (ip , func (value string ) {
151- send ( action . wrapMessage ( value ) )
151+ result ( value )
152152 })
153153 return
154154 case getMemoryMethod :
155155 handleGetMemory (func (value string ) {
156- send ( action . wrapMessage ( value ) )
156+ result ( value )
157157 })
158158 return
159+ case getProfileMethod :
160+ profileId := action .Data .(string )
161+ handleGetMemory (func (value string ) {
162+ result (handleGetProfile (profileId ))
163+ })
164+ return
165+ case setStateMethod :
166+ data := action .Data .(string )
167+ handleSetState (data )
168+ result (true )
159169 default :
160- handle := nextHandle (action , send )
170+ handle := nextHandle (action , result )
161171 if handle {
162172 return
163173 } else {
164- send (action .wrapMessage ( action . DefaultValue ) )
174+ result (action .DefaultValue )
165175 }
166176 }
167177}
0 commit comments