fixbugs

plugin/shadowsocks/index.coffee

@@ -72,7 +72,7 @@ exports.registerServiceHook 'disable',
 
 app.express.use '/plugin/shadowsocks', require './router'
 
-if config.plugins.shadowsocks.monitor_cycle
+if config.plugins.shadowsocks?.monitor_cycle
   exports.registerHook 'app.started',
     action: ->
       setInterval shadowsocks.monitoring, config.plugins.shadowsocks.monitor_cycle

plugin/shadowsocks/shadowsocks.coffee

@@ -6,7 +6,7 @@ supervisor = require '../supervisor/supervisor'
 
 ShadowsocksPlugin = require './index'
 
-BILLING_BUCKET = config.plugins.shadowsocks.billing_bucket
+BILLING_BUCKET = config.plugins.shadowsocks?.billing_bucket ? 100 * 1024 * 1024
 
 exports.initSupervisor = (callback) ->
   supervisor.programsStatus (program_status) ->

plugin/shadowsocks/test/shadowsocks.test.coffee

@@ -41,6 +41,7 @@
             done err
 
     it 'POST join_plan', (done) ->
+      @timeout 10000
       agent.post '/billing/join_plan'
       .send
         csrf_token: csrf_token

plugin/shadowsocks/view/widget.jade

@@ -17,7 +17,10 @@
           span.input-group-addon= t('method')
           select.input-method.form-control(style='-webkit-appearance: none;')
             for method in config.plugins.shadowsocks.available_ciphers
-              option= method
+              if account.pluggable.shadowsocks.method == method
+                option(selected='selected')= method
+              else
+                option= method
           span.input-group-btn
             button.btn.btn-default.action-switch-method(type='button')= t('common.change')