Skip to content

Commit 5195243

Browse files
author
Taois
committed
feat: py源移除ujson
1 parent 2cee52d commit 5195243

File tree

10 files changed

+318
-140
lines changed

10 files changed

+318
-140
lines changed

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,10 @@ nodejs作为服务端的drpy实现。全面升级异步写法
7070

7171
## 更新记录
7272

73+
### 20260301
74+
75+
更新至V1.3.27
76+
7377
### 20260228
7478

7579
更新至V1.3.26

docs/updateRecord.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# drpyS更新记录
22

3+
### 20260301
4+
5+
更新至V1.3.27
6+
7+
1. 移除py源需要的`ujson`依赖,优化py源`资源管理.py`
8+
39
### 20260228
410

511
更新至V1.3.26

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "drpy-node",
3-
"version": "1.3.26",
3+
"version": "1.3.27",
44
"main": "index.js",
55
"type": "module",
66
"scripts": {

public/index.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@ <h3>免费壳子推荐</h3>
7171
<li><a href="https://github.com/ingriddaleusag-dotcom/PeekPiliRelease">皮卡丘</a></li>
7272
</ul>
7373
<h2>更新记录</h2>
74+
<h3>20260301</h3>
75+
<p>更新至V1.3.27</p>
7476
<h3>20260228</h3>
7577
<p>更新至V1.3.26</p>
7678
<h3>20260225</h3>

spider/py/base/htmlParser.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# upDate : 2024/04/09 取html返回的文本自动解除转义,防止script里取Html的内容被转义无法执行
88
# upDate : 2024/05/16 支持:not,even,odd,has,contans,matches,empty 新特性,pdfh取属性支持||
99

10-
import ujson
10+
import json
1111
from pyquery import PyQuery as pq
1212
from urllib.parse import urljoin
1313
import re
@@ -259,7 +259,7 @@ def pjfh(self, html, parse: str, add_url=False):
259259
if isinstance(html, str):
260260
# print(html)
261261
try:
262-
html = ujson.loads(html)
262+
html = json.loads(html)
263263
# html = eval(html)
264264
except:
265265
print('字符串转json失败')
@@ -288,7 +288,7 @@ def pjfa(self, html, parse: str):
288288
return []
289289
if isinstance(html, str):
290290
try:
291-
html = ujson.loads(html)
291+
html = json.loads(html)
292292
except:
293293
return []
294294
if not parse.startswith('$.'):

spider/py/base/requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
requests
33
lxml
44
pycryptodome
5-
ujson
65
pyquery
76
jsonpath
87
json5

spider/py/base/spider.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ def __init__(self, query_params=None, t4_api=None):
5353
self.extend = ''
5454
self.ENV = _ENV
5555
self._cache = {}
56-
self.log(f'BaseSpider __init__ t4_api:{t4_api}')
56+
# self.log(f'BaseSpider __init__ t4_api:{t4_api}')
57+
print(f'BaseSpider __init__ t4_api:{t4_api}')
5758

5859
def __new__(cls, *args, **kwargs):
5960
if cls._instance:

spider/py/core/t4_daemon.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import hashlib
1212
import importlib
1313
import importlib.util
14-
import ujson
14+
import json
1515
import logging
1616
import os
1717
import pickle
@@ -131,7 +131,7 @@ def recv_packet(rfile) -> dict:
131131
raise ValueError("invalid length")
132132
payload = recv_exact(rfile, length)
133133
try:
134-
return ujson.loads(payload.decode("utf-8"))
134+
return json.loads(payload.decode("utf-8"))
135135
except Exception:
136136
return pickle.loads(payload)
137137

@@ -257,8 +257,8 @@ def _parse_env(env_str):
257257
# 标准化为 dict
258258
if isinstance(env_str, str):
259259
try:
260-
data = ujson.loads(env_str)
261-
except (ujson.JSONDecodeError, TypeError):
260+
data = json.loads(env_str)
261+
except (json.JSONDecodeError, TypeError):
262262
return "", ""
263263
elif isinstance(env_str, dict):
264264
data = env_str
@@ -270,7 +270,7 @@ def _parse_env(env_str):
270270

271271
# 如果 ext 是 dict 或 list,转为 JSON 字符串
272272
if isinstance(ext, (dict, list)):
273-
ext = ujson.dumps(ext, ensure_ascii=False)
273+
ext = json.dumps(ext, ensure_ascii=False)
274274

275275
if proxy_url and not '&extend=' in proxy_url:
276276
proxy_url += f'&extend={quote(ext)}'
@@ -678,7 +678,7 @@ def _invoke(self, inst: SpiderInstance, method_name: str, args_list):
678678
parsed_args.append(a)
679679
elif isinstance(a, str):
680680
try:
681-
parsed_args.append(ujson.loads(a))
681+
parsed_args.append(json.loads(a))
682682
except Exception:
683683
parsed_args.append(a)
684684
else:

spider/py/core/t4_daemon_lite.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import hashlib
55
import importlib
66
import importlib.util
7-
import ujson
7+
import json
88
import logging
99
import os
1010
import pickle
@@ -119,7 +119,7 @@ def recv_packet(rfile) -> dict:
119119
raise ValueError("invalid length")
120120
payload = recv_exact(rfile, length)
121121
try:
122-
return ujson.loads(payload.decode("utf-8"))
122+
return json.loads(payload.decode("utf-8"))
123123
except Exception:
124124
return pickle.loads(payload)
125125

@@ -205,8 +205,8 @@ def _parse_env(env_str):
205205
# 标准化为 dict
206206
if isinstance(env_str, str):
207207
try:
208-
data = ujson.loads(env_str)
209-
except (ujson.JSONDecodeError, TypeError):
208+
data = json.loads(env_str)
209+
except (json.JSONDecodeError, TypeError):
210210
return "", ""
211211
elif isinstance(env_str, dict):
212212
data = env_str
@@ -218,7 +218,7 @@ def _parse_env(env_str):
218218

219219
# 如果 ext 是 dict 或 list,转为 JSON 字符串
220220
if isinstance(ext, (dict, list)):
221-
ext = ujson.dumps(ext, ensure_ascii=False)
221+
ext = json.dumps(ext, ensure_ascii=False)
222222

223223
return proxy_url, str(ext or "")
224224

@@ -422,7 +422,7 @@ def _invoke(self, inst: SpiderInstance, method_name: str, args_list):
422422
parsed_args.append(a)
423423
elif isinstance(a, str):
424424
try:
425-
parsed_args.append(ujson.loads(a))
425+
parsed_args.append(json.loads(a))
426426
except Exception:
427427
parsed_args.append(a)
428428
else:

0 commit comments

Comments
 (0)