Kaynağa Gözat

代理留空则不使用

jack 1 yıl önce
ebeveyn
işleme
3101ef7734

+ 8 - 0
.idea/.gitignore

@@ -0,0 +1,8 @@
+# 默认忽略的文件
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml

+ 8 - 0
.idea/grassio.iml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="PYTHON_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="jdk" jdkName="grass_io" jdkType="Python SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

+ 64 - 0
.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,64 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="DuplicatedCode" enabled="true" level="WEAK WARNING" enabled_by_default="true">
+      <Languages>
+        <language minSize="62" name="Python" />
+      </Languages>
+    </inspection_tool>
+    <inspection_tool class="PyPackageRequirementsInspection" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="ignoredPackages">
+        <value>
+          <list size="44">
+            <item index="0" class="java.lang.String" itemvalue="blinker" />
+            <item index="1" class="java.lang.String" itemvalue="kaitaistruct" />
+            <item index="2" class="java.lang.String" itemvalue="rsa" />
+            <item index="3" class="java.lang.String" itemvalue="selenium-wire" />
+            <item index="4" class="java.lang.String" itemvalue="bs4" />
+            <item index="5" class="java.lang.String" itemvalue="canvas" />
+            <item index="6" class="java.lang.String" itemvalue="jieba" />
+            <item index="7" class="java.lang.String" itemvalue="async-timeout" />
+            <item index="8" class="java.lang.String" itemvalue="Brotli" />
+            <item index="9" class="java.lang.String" itemvalue="cryptography" />
+            <item index="10" class="java.lang.String" itemvalue="h2" />
+            <item index="11" class="java.lang.String" itemvalue="pyasn1" />
+            <item index="12" class="java.lang.String" itemvalue="zstandard" />
+            <item index="13" class="java.lang.String" itemvalue="redis" />
+            <item index="14" class="java.lang.String" itemvalue="pyOpenSSL" />
+            <item index="15" class="java.lang.String" itemvalue="charset-normalizer" />
+            <item index="16" class="java.lang.String" itemvalue="ping3" />
+            <item index="17" class="java.lang.String" itemvalue="yarl" />
+            <item index="18" class="java.lang.String" itemvalue="pycryptodome" />
+            <item index="19" class="java.lang.String" itemvalue="PyExecJS" />
+            <item index="20" class="java.lang.String" itemvalue="pyparsing" />
+            <item index="21" class="java.lang.String" itemvalue="aiosignal" />
+            <item index="22" class="java.lang.String" itemvalue="httpx" />
+            <item index="23" class="java.lang.String" itemvalue="exceptiongroup" />
+            <item index="24" class="java.lang.String" itemvalue="pymongo" />
+            <item index="25" class="java.lang.String" itemvalue="selenium" />
+            <item index="26" class="java.lang.String" itemvalue="anyio" />
+            <item index="27" class="java.lang.String" itemvalue="aiohttp" />
+            <item index="28" class="java.lang.String" itemvalue="importlib-metadata" />
+            <item index="29" class="java.lang.String" itemvalue="httpcore" />
+            <item index="30" class="java.lang.String" itemvalue="idna" />
+            <item index="31" class="java.lang.String" itemvalue="chardet" />
+            <item index="32" class="java.lang.String" itemvalue="python-stdnum" />
+            <item index="33" class="java.lang.String" itemvalue="pydot" />
+            <item index="34" class="java.lang.String" itemvalue="num2words" />
+            <item index="35" class="java.lang.String" itemvalue="python-dateutil" />
+            <item index="36" class="java.lang.String" itemvalue="pyserial" />
+            <item index="37" class="java.lang.String" itemvalue="libsass" />
+            <item index="38" class="java.lang.String" itemvalue="pyopenssl" />
+            <item index="39" class="java.lang.String" itemvalue="passlib" />
+            <item index="40" class="java.lang.String" itemvalue="zeep" />
+            <item index="41" class="java.lang.String" itemvalue="mock" />
+            <item index="42" class="java.lang.String" itemvalue="typing_extensions" />
+            <item index="43" class="java.lang.String" itemvalue="pyee" />
+          </list>
+        </value>
+      </option>
+    </inspection_tool>
+    <inspection_tool class="SqlDialectInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SqlNoDataSourceInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+  </profile>
+</component>

+ 6 - 0
.idea/inspectionProfiles/profiles_settings.xml

@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <settings>
+    <option name="USE_PROJECT_PROFILE" value="false" />
+    <version value="1.0" />
+  </settings>
+</component>

+ 7 - 0
.idea/misc.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Black">
+    <option name="sdkName" value="grass_io" />
+  </component>
+  <component name="ProjectRootManager" version="2" project-jdk-name="grass_io" project-jdk-type="Python SDK" />
+</project>

+ 8 - 0
.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/grassio.iml" filepath="$PROJECT_DIR$/.idea/grassio.iml" />
+    </modules>
+  </component>
+</project>

+ 16 - 0
.idea/vcs.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="IssueNavigationConfiguration">
+    <option name="links">
+      <list>
+        <IssueNavigationLink>
+          <option name="issueRegexp" value="\bodoo/(\w+)#(\d+)" />
+          <option name="linkRegexp" value="https://github.com/odoo/$1/issues/$2" />
+        </IssueNavigationLink>
+      </list>
+    </option>
+  </component>
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

+ 14 - 6
core/grass_sdk/extension.py

@@ -34,12 +34,20 @@ class GrassWs:
             'Sec-WebSocket-Version': '13',
             'Sec-WebSocket-Extensions': 'permessage-deflate; client_max_window_bits',
         }
-        try:
-            self.websocket = await self.session.ws_connect(uri, proxy_headers=headers, proxy=self.proxy)
-        except Exception as e:
-            if 'status' in dir(e) and e.status == 403:
-                raise ProxyForbiddenException(f"Low proxy score. Can't connect. Error: {e}")
-            raise e
+        if self.proxy:
+            try:
+                self.websocket = await self.session.ws_connect(uri, proxy_headers=headers, proxy=self.proxy)
+            except Exception as e:
+                if 'status' in dir(e) and e.status == 403:
+                    raise ProxyForbiddenException(f"Low proxy score. Can't connect. Error: {e}")
+                raise e
+        else:
+            try:
+                self.websocket = await self.session.ws_connect(uri, proxy_headers=headers)
+            except Exception as e:
+                if 'status' in dir(e) and e.status == 403:
+                    raise ProxyForbiddenException(f"Low proxy score. Can't connect. Error: {e}")
+                raise e
 
     async def send_message(self, message):
         # logger.info(f"Sending: {message}")

+ 0 - 10
data/proxies.txt

@@ -1,10 +0,0 @@
-192.168.31.28:7890
-192.168.31.28:7890
-192.168.31.28:7890
-192.168.31.28:7890
-192.168.31.28:7890
-192.168.31.28:7890
-192.168.31.28:7890
-192.168.31.28:7890
-192.168.31.28:7890
-192.168.31.28:7890