diff --git a/Builder/__init__.py b/Builder/__init__.py index 8114f99..a8be8bb 100644 --- a/Builder/__init__.py +++ b/Builder/__init__.py @@ -60,12 +60,12 @@ class Builder(object): self.__process = Process(self.__workDir, taskId = self.id, isStart = isStart, cmd = command, env = envVar, file = fileObject) - def __init__(self, proxy: dict, taskId: str = '', isStart: bool = True, + def __init__(self, proxyType: str, proxyInfo: dict, taskId: str = '', isStart: bool = True, bind: str = default['bindAddr'], workDir: str = default['workDir']) -> None: self.id = genFlag(length = 12) if taskId == '' else taskId self.__workDir = workDir - self.proxyType = proxy['type'] - self.proxyInfo = copy.copy(proxy['info']) + self.proxyType = proxyType + self.proxyInfo = copy.copy(proxyInfo) self.socksAddr = bind self.socksPort = getAvailablePort() self.__loadClient(isStart) diff --git a/demo.py b/demo.py index 7fc994e..b7bc5a8 100755 --- a/demo.py +++ b/demo.py @@ -6,31 +6,26 @@ from Builder import Builder from Basis.Logger import logging proxySS = { - 'type': 'ss', - 'info': { - 'server': '127.0.0.1', - 'port': 12345, - 'passwd': 'dnomd343', - 'method': 'aes-128-ctr', - 'plugin': None - } + 'server': '127.0.0.1', + 'port': 12345, + 'passwd': 'dnomd343', + 'method': 'aes-128-ctr', + 'plugin': None } proxySSR = { - 'type': 'ssr', - 'info': { - 'server': '127.0.0.1', - 'port': 12345, - 'passwd': 'dnomd343', - 'method': 'aes-128-ctr', - 'protocol': 'origin', - 'protocolParam': '', - 'obfs': 'plain', - 'obfsParam': '', - } + 'server': '127.0.0.1', + 'port': 12345, + 'passwd': 'dnomd343', + 'method': 'aes-128-ctr', + 'protocol': 'origin', + 'protocolParam': '', + 'obfs': 'plain', + 'obfsParam': '', } -client = Builder(proxySSR) +# client = Builder('ss', proxySS) +client = Builder('ssr', proxySSR) logging.critical(client.id) logging.critical(client.proxyType) @@ -38,7 +33,7 @@ logging.critical(client.proxyInfo) logging.critical(client.socksAddr) logging.critical(client.socksPort) -time.sleep(20) +time.sleep(15) logging.critical(client.status()) client.destroy()