refactoring for new socket system 'client'=>'test' ready