happyz
/
llama.cpp
mirror of https://github.com/ggerganov/llama.cpp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SimpleChatTC:WebFetch:Trap Non Ok status and raise error 

So that the same error path is used for logical error wrt http req
also, without needing a different path for it.

Dont forget to return the resp text/json/..., so that the contents
are passed along the promise then chain
This commit is contained in:
hanishkvc 2025-10-17 22:46:08 +05:30
parent d04c8cd38d
commit 42f91df261
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/server/public_simplechat/tooljs.mjs
View File

@ -116,7 +116,12 @@ let fetchweburlraw_meta = {
function fetchweburlraw_run(toolcallid, toolname, obj) { function fetchweburlraw_run(toolcallid, toolname, obj) {
if (gToolsWorker.onmessage != null) { if (gToolsWorker.onmessage != null) {
let newUrl = `http://127.0.0.1:3128/urlraw?url=${encodeURIComponent(obj.url)}` let newUrl = `http://127.0.0.1:3128/urlraw?url=${encodeURIComponent(obj.url)}`
fetch(newUrl).then(resp=>resp.text()).then(data => { fetch(newUrl).then(resp => {
if (!resp.ok) {
throw new Error(`${resp.status}:${resp.statusText}`);
}
return resp.text()
}).then(data => {
message_toolsworker(new MessageEvent('message', {data: {id: toolcallid, name: toolname, data: data}})) message_toolsworker(new MessageEvent('message', {data: {id: toolcallid, name: toolname, data: data}}))
}).catch((err)=>{ }).catch((err)=>{
message_toolsworker(new MessageEvent('message', {data: {id: toolcallid, name: toolname, data: `Error:${err}`}})) message_toolsworker(new MessageEvent('message', {data: {id: toolcallid, name: toolname, data: `Error:${err}`}}))
@ -161,7 +166,12 @@ let fetchweburltext_meta = {
function fetchweburltext_run(toolcallid, toolname, obj) { function fetchweburltext_run(toolcallid, toolname, obj) {
if (gToolsWorker.onmessage != null) { if (gToolsWorker.onmessage != null) {
let newUrl = `http://127.0.0.1:3128/urltext?url=${encodeURIComponent(obj.url)}` let newUrl = `http://127.0.0.1:3128/urltext?url=${encodeURIComponent(obj.url)}`
fetch(newUrl).then(resp=>resp.text()).then(data => { fetch(newUrl).then(resp => {
if (!resp.ok) {
throw new Error(`${resp.status}:${resp.statusText}`);
}
return resp.text()
}).then(data => {
message_toolsworker(new MessageEvent('message', {data: {id: toolcallid, name: toolname, data: data}})) message_toolsworker(new MessageEvent('message', {data: {id: toolcallid, name: toolname, data: data}}))
}).catch((err)=>{ }).catch((err)=>{
message_toolsworker(new MessageEvent('message', {data: {id: toolcallid, name: toolname, data: `Error:${err}`}})) message_toolsworker(new MessageEvent('message', {data: {id: toolcallid, name: toolname, data: `Error:${err}`}}))