version 1.2.0b3

Author: seratch

setup.py

@@ -33,7 +33,7 @@
         exclude=["examples", "integration_tests", "tests", "tests.*",]
     ),
     include_package_data=True,  # MANIFEST.in
-    install_requires=["slack_sdk>=3.2.0b3,<3.3",],
+    install_requires=["slack_sdk>=3.2.0b5,<3.3",],
     setup_requires=["pytest-runner==5.2"],
     tests_require=test_dependencies,
     test_suite="tests",

slack_bolt/adapter/socket_mode/aiohttp/__init__.py

@@ -1,9 +1,11 @@
 import os
+from logging import Logger
 from time import time
 from typing import Optional
 
 from slack_sdk.socket_mode.aiohttp import SocketModeClient
 from slack_sdk.socket_mode.request import SocketModeRequest
+from slack_sdk.web.async_client import AsyncWebClient
 
 from slack_bolt import App
 from slack_bolt.adapter.socket_mode.async_base_handler import AsyncBaseSocketModeHandler
@@ -25,10 +27,20 @@ def __init__(  # type: ignore
         self,
         app: App,  # type: ignore
         app_token: Optional[str] = None,
+        logger: Optional[Logger] = None,
+        web_client: Optional[AsyncWebClient] = None,
+        proxy: Optional[str] = None,
+        ping_interval: float = 10,
     ):
         self.app = app
         self.app_token = app_token or os.environ["SLACK_APP_TOKEN"]
-        self.client = SocketModeClient(app_token=self.app_token)
+        self.client = SocketModeClient(
+            app_token=self.app_token,
+            logger=logger,
+            web_client=web_client,
+            proxy=proxy,
+            ping_interval=ping_interval,
+        )
         self.client.socket_mode_request_listeners.append(self.handle)
 
     async def handle(self, client: SocketModeClient, req: SocketModeRequest) -> None:

slack_bolt/adapter/socket_mode/builtin/__init__.py

@@ -1,7 +1,9 @@
 import os
+from logging import Logger
 from time import time
 from typing import Optional
 
+from slack_sdk import WebClient
 from slack_sdk.socket_mode.request import SocketModeRequest
 from slack_sdk.socket_mode.builtin import SocketModeClient
 
@@ -20,12 +22,23 @@ def __init__(  # type: ignore
         self,
         app: App,  # type: ignore
         app_token: Optional[str] = None,
+        logger: Optional[Logger] = None,
+        web_client: Optional[WebClient] = None,
+        ping_interval: float = 10,
+        concurrency: int = 10,
+        proxy: Optional[str] = None,
         trace_enabled: bool = False,
     ):
         self.app = app
         self.app_token = app_token or os.environ["SLACK_APP_TOKEN"]
         self.client = SocketModeClient(
-            app_token=self.app_token, trace_enabled=trace_enabled
+            app_token=self.app_token,
+            logger=logger,
+            web_client=web_client,
+            proxy=proxy,
+            ping_interval=ping_interval,
+            concurrency=concurrency,
+            trace_enabled=trace_enabled,
         )
         self.client.socket_mode_request_listeners.append(self.handle)
 

slack_bolt/adapter/socket_mode/websocket_client/__init__.py

@@ -1,7 +1,9 @@
 import os
+from logging import Logger
 from time import time
-from typing import Optional
+from typing import Optional, Tuple
 
+from slack_sdk import WebClient
 from slack_sdk.socket_mode.request import SocketModeRequest
 from slack_sdk.socket_mode.websocket_client import SocketModeClient
 
@@ -20,12 +22,29 @@ def __init__(  # type: ignore
         self,
         app: App,  # type: ignore
         app_token: Optional[str] = None,
+        logger: Optional[Logger] = None,
+        web_client: Optional[WebClient] = None,
+        ping_interval: float = 10,
+        concurrency: int = 10,
+        http_proxy_host: Optional[str] = None,
+        http_proxy_port: Optional[int] = None,
+        http_proxy_auth: Optional[Tuple[str, str]] = None,
+        proxy_type: Optional[str] = None,
         trace_enabled: bool = False,
     ):
         self.app = app
         self.app_token = app_token or os.environ["SLACK_APP_TOKEN"]
         self.client = SocketModeClient(
-            app_token=self.app_token, trace_enabled=trace_enabled
+            app_token=self.app_token,
+            logger=logger,
+            web_client=web_client,
+            ping_interval=ping_interval,
+            concurrency=concurrency,
+            http_proxy_host=http_proxy_host,
+            http_proxy_port=http_proxy_port,
+            http_proxy_auth=http_proxy_auth,
+            proxy_type=proxy_type,
+            trace_enabled=trace_enabled,
         )
         self.client.socket_mode_request_listeners.append(self.handle)
 

slack_bolt/adapter/socket_mode/websockets/__init__.py

@@ -1,9 +1,11 @@
 import os
+from logging import Logger
 from time import time
 from typing import Optional
 
 from slack_sdk.socket_mode.websockets import SocketModeClient
 from slack_sdk.socket_mode.request import SocketModeRequest
+from slack_sdk.web.async_client import AsyncWebClient
 
 from slack_bolt import App
 from slack_bolt.adapter.socket_mode.async_base_handler import AsyncBaseSocketModeHandler
@@ -25,10 +27,18 @@ def __init__(  # type: ignore
         self,
         app: App,  # type: ignore
         app_token: Optional[str] = None,
+        logger: Optional[Logger] = None,
+        web_client: Optional[AsyncWebClient] = None,
+        ping_interval: float = 10,
     ):
         self.app = app
         self.app_token = app_token or os.environ["SLACK_APP_TOKEN"]
-        self.client = SocketModeClient(app_token=self.app_token)
+        self.client = SocketModeClient(
+            app_token=self.app_token,
+            logger=logger,
+            web_client=web_client,
+            ping_interval=ping_interval,
+        )
         self.client.socket_mode_request_listeners.append(self.handle)
 
     async def handle(self, client: SocketModeClient, req: SocketModeRequest) -> None:

slack_bolt/version.py

@@ -1 +1 @@
-__version__ = "1.2.0b2"
+__version__ = "1.2.0b3"