|
3384 | 3384 | let is_local = false;
|
3385 | 3385 |
|
3386 | 3386 | if (url) {
|
3387 |
| - is_local = (url.toLowerCase().includes("localhost") || |
3388 |
| - url.toLowerCase().includes("127.0.0.1") || |
3389 |
| - url.toLowerCase().includes("192.168.") || |
3390 |
| - !url.toLowerCase().includes(".")); |
| 3387 | + is_local = is_local_url(url); |
3391 | 3388 | }
|
3392 | 3389 |
|
3393 | 3390 | if ((uses_cors_proxy||proxy_by_default) && !is_local) {
|
|
5316 | 5313 | }
|
5317 | 5314 | }
|
5318 | 5315 |
|
| 5316 | + function is_local_url(target_url) |
| 5317 | + { |
| 5318 | + let is_local = (target_url.toLowerCase().includes("localhost") |
| 5319 | + || target_url.toLowerCase().includes("127.0.0.1") |
| 5320 | + || target_url.toLowerCase().includes("192.168.") |
| 5321 | + || target_url.toLowerCase().includes("10.0.0.") |
| 5322 | + || target_url.toLowerCase().includes("://10.0.") |
| 5323 | + || !target_url.toLowerCase().includes(".")); //hostname without dots cannot be wan accessible |
| 5324 | + return is_local; |
| 5325 | + } |
| 5326 | + |
5319 | 5327 | function is_browser_supports_sse()
|
5320 | 5328 | {
|
5321 | 5329 | return (self.TransformStream!=null && self.TextDecoderStream!=null && self.WritableStream!=null);
|
|
8100 | 8108 | {
|
8101 | 8109 | desired_oai_ep = desired_oai_ep.slice(0, -1);
|
8102 | 8110 | }
|
| 8111 | + if(!desired_oai_ep.includes("://")) //user did not add http/https |
| 8112 | + { |
| 8113 | + let is_local = is_local_url(desired_oai_ep); |
| 8114 | + desired_oai_ep = (is_local?"http://":"https://") + desired_oai_ep; |
| 8115 | + } |
8103 | 8116 | if (document.getElementById("oaiaddversion").checked)
|
8104 | 8117 | {
|
8105 | 8118 | if(desired_oai_ep!="" && desired_oai_ep.length > 4 && !desired_oai_ep.slice(-4).toLowerCase().includes("/v") && !desired_oai_ep.toLowerCase().includes("/v1/")) {
|
|
8355 | 8368 | {
|
8356 | 8369 | desiredkoboldendpoint = desiredkoboldendpoint.split("/api")[0];
|
8357 | 8370 | }
|
| 8371 | + if(!desiredkoboldendpoint.includes("://")) //user did not add http/https |
| 8372 | + { |
| 8373 | + let is_local = is_local_url(desiredkoboldendpoint); |
| 8374 | + desiredkoboldendpoint = (is_local?"http://":"https://") + desiredkoboldendpoint; |
| 8375 | + } |
8358 | 8376 |
|
8359 | 8377 | let urls1 = [
|
8360 | 8378 | apply_proxy_url(desiredkoboldendpoint + kobold_custom_mdl_endpoint),
|
|
8575 | 8593 | //if it still fails, then show error
|
8576 | 8594 | console.log("Error: " + error);
|
8577 | 8595 |
|
8578 |
| - let is_local = (custom_kobold_endpoint.toLowerCase().includes("localhost") |
8579 |
| - || custom_kobold_endpoint.toLowerCase().includes("127.0.0.1") |
8580 |
| - || custom_kobold_endpoint.toLowerCase().includes("192.168.") |
8581 |
| - || !custom_kobold_endpoint.toLowerCase().includes(".")); //hostname without dots cannot be wan accessible |
| 8596 | + let is_local = is_local_url(custom_kobold_endpoint); |
8582 | 8597 |
|
8583 | 8598 | if (uses_cors_proxy || is_local) {
|
8584 | 8599 | if(is_local && sublocalpathname!="")
|
|
8625 | 8640 | {
|
8626 | 8641 | desired_oai_ep = desired_oai_ep.slice(0, -1);
|
8627 | 8642 | }
|
| 8643 | + if(!desired_oai_ep.includes("://")) //user did not add http/https |
| 8644 | + { |
| 8645 | + let is_local = is_local_url(desired_oai_ep); |
| 8646 | + desired_oai_ep = (is_local?"http://":"https://") + desired_oai_ep; |
| 8647 | + } |
8628 | 8648 | if (document.getElementById("oaiaddversion").checked)
|
8629 | 8649 | {
|
8630 | 8650 | if(desired_oai_ep!="" && desired_oai_ep.length > 4 && !desired_oai_ep.slice(-4).toLowerCase().includes("/v") && !desired_oai_ep.toLowerCase().includes("/v1/")) {
|
|
0 commit comments