yumoqing/uapi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bugfix

Browse Source
This commit is contained in:
yumoqing 2025-09-02 17:39:33 +08:00
parent 97d6e23f51
commit b6f2607b26
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
uapi/appapi.py
View File

@ -167,6 +167,11 @@ class UAPI:
async for chunk in self.stream_resp(uapi): async for chunk in self.stream_resp(uapi):
yield chunk yield chunk
def filter_nl_cr(self, s):
s = ''.join(s.split('\n'))
s = ''.join(s.split('\r'))
return s
async def stream_linify(self, upappid, apiname, callerid, params={}): async def stream_linify(self, upappid, apiname, callerid, params={}):
gen = liner(self.__call__(upappid, apiname, callerid, params=params)) gen = liner(self.__call__(upappid, apiname, callerid, params=params))
async for line in gen: async for line in gen:
@ -182,11 +187,12 @@ class UAPI:
try: try:
dic = json.loads(line.decode('utf-8')) dic = json.loads(line.decode('utf-8'))
line = self.rendertmpl(self.uapi.response, dic) line = self.rendertmpl(self.uapi.response, dic)
line = self.filter_nl_cr(line)
except Exception as e: except Exception as e:
debug(f'{line=}, {self.uapi.response=} error({e})\n{format_exc()}') debug(f'{line=}, {self.uapi.response=} error({e})\n{format_exc()}')
pass pass
if len(line): if len(line):
yield f'{json.dumps(line)}\n' yield f'{line}\n'
else: else:
debug(f'invalid line:{line}') debug(f'invalid line:{line}')