Merge branch 'release' into staging

612fda4cfc1e09fa94a3fb2d7496594e9d0141db

Cohee <18619528+Cohee1207@users.noreply.github.com>

1 files changed, +10 -5Ignore whitespace
src/endpoints/stable-diffusion.js+10 -5
@@ -106,8 +106,10 @@ router.post('/upscalers', jsonParser, async (request, response) => {
106106
107107router.post('/vaes', jsonParser, async (request, response) => {
108108 try {
109109 const autoUrl = urlJoinnew URL(request.body.url, '/sdapi/v1/sd-vae');
110110 const forgeUrlautoUrl.pathname = urlJoin(request.body.url, '/sdapi/v1/sd-modulesvae');
111+ const forgeUrl = new URL(request.body.url);
112+ forgeUrl.pathname = '/sdapi/v1/sd-modules';
111113
112114 const requestInit = {
113115 method: 'GET',
@@ -295,7 +297,8 @@ router.post('/set-model', jsonParser, async (request, response) => {
295297router.post('/generate', jsonParser, async (request, response) => {
296298 try {
297299 try {
298300 const optionsUrl = urlJoinnew URL(request.body.url, '/sdapi/v1/options');
301+ optionsUrl.pathname = '/sdapi/v1/options';
299302 const optionsResult = await fetch(optionsUrl, { headers: { 'Authorization': getBasicAuthHeader(request.body.auth) } });
300303 if (optionsResult.ok) {
301304 const optionsData = /** @type {any} */ (await optionsResult.json());
@@ -313,14 +316,16 @@ router.post('/generate', jsonParser, async (request, response) => {
313316 request.socket.removeAllListeners('close');
314317 request.socket.on('close', function () {
315318 if (!response.writableEnded) {
316319 const interruptUrl = urlJoinnew URL(request.body.url, '/sdapi/v1/interrupt');
320+ interruptUrl.pathname = '/sdapi/v1/interrupt';
317321 fetch(interruptUrl, { method: 'POST', headers: { 'Authorization': getBasicAuthHeader(request.body.auth) } });
318322 }
319323 controller.abort();
320324 });
321325
322326 console.log('SD WebUI request:', request.body);
323327 const txt2imgUrl = urlJoinnew URL(request.body.url, '/sdapi/v1/txt2img');
328+ txt2imgUrl.pathname = '/sdapi/v1/txt2img';
324329 const result = await fetch(txt2imgUrl, {
325330 method: 'POST',
326331 body: JSON.stringify(request.body),