diff --git a/README.md b/README.md index ef81a92e..eda608a3 100644 --- a/README.md +++ b/README.md @@ -5,4 +5,4 @@ A AIChat Client, but better. Msi version: https://github.com/kwaroran/RisuAI-release/releases -Web version: http://risu.pages.dev/ +Web version: http://risuai.xyz/ diff --git a/functions/drive.js b/functions/drive.js index 90a38030..5575e51b 100644 --- a/functions/drive.js +++ b/functions/drive.js @@ -3,16 +3,13 @@ export function onRequest(context) { return drive(request, context.env); } -const encodedRedirectUri = encodeURIComponent("https://risu.pages.dev/") async function drive(request, env){ const url = new URL(request.url); + const encodedRedirectUri = url.host.includes('dev') ? encodeURIComponent("https://risu.pages.dev/") : encodeURIComponent("https://risuai.xyz/") - const headerE = { - "Access-Control-Allow-Origin": "https://risu.pages.dev", - "Access-Control-Allow-Headers": "*" - } + const headerE = {} const params = url.searchParams const code = params.get('code') diff --git a/functions/proxy.js b/functions/proxy.js index 6fe72cb9..9605df29 100644 --- a/functions/proxy.js +++ b/functions/proxy.js @@ -38,7 +38,7 @@ async function fetchProxy(request) { const status = originalResponse.status; let newResponseHeaders = new Headers(responseHeaders); - newResponseHeaders.set('access-control-allow-origin', 'https://risu.pages.dev/'); + newResponseHeaders.set('access-control-allow-origin', 'https://risuai.xyz/'); newResponseHeaders.set('access-control-allow-credentials', "true"); newResponseHeaders.delete('content-security-policy'); newResponseHeaders.delete('content-security-policy-report-only'); diff --git a/server/proxy/package.json b/server/proxy/package.json new file mode 100644 index 00000000..13178bec --- /dev/null +++ b/server/proxy/package.json @@ -0,0 +1,5 @@ +{ + "dependencies": { + "cors-anywhere": "^0.4.4" + } +} diff --git a/server/proxy/pnpm-lock.yaml b/server/proxy/pnpm-lock.yaml new file mode 100644 index 00000000..af5d30ec --- /dev/null +++ b/server/proxy/pnpm-lock.yaml @@ -0,0 +1,68 @@ +lockfileVersion: 5.4 + +specifiers: + cors-anywhere: ^0.4.4 + http-proxy: ^1.18.1 + +dependencies: + cors-anywhere: 0.4.4 + http-proxy: 1.18.1 + +packages: + + /cors-anywhere/0.4.4: + resolution: {integrity: sha512-8OBFwnzMgR4mNrAeAyOLB2EruS2z7u02of2bOu7i9kKYlZG+niS7CTHLPgEXKWW2NAOJWRry9RRCaL9lJRjNqg==} + engines: {node: '>=0.10.0'} + dependencies: + http-proxy: 1.11.1 + proxy-from-env: 0.0.1 + dev: false + + /eventemitter3/1.2.0: + resolution: {integrity: sha512-DOFqA1MF46fmZl2xtzXR3MPCRsXqgoFqdXcrCVYM3JNnfUeHTm/fh/v/iU7gBFpwkuBmoJPAm5GuhdDfSEJMJA==} + dev: false + + /eventemitter3/4.0.7: + resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==} + dev: false + + /follow-redirects/1.15.2: + resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==} + engines: {node: '>=4.0'} + peerDependencies: + debug: '*' + peerDependenciesMeta: + debug: + optional: true + dev: false + + /http-proxy/1.11.1: + resolution: {integrity: sha512-qz7jZarkVG3G6GMq+4VRJPSN4NkIjL4VMTNhKGd8jc25BumeJjWWvnY3A7OkCGa8W1TTxbaK3dcE0ijFalITVA==} + engines: {node: '>=0.10.0'} + dependencies: + eventemitter3: 1.2.0 + requires-port: 0.0.1 + dev: false + + /http-proxy/1.18.1: + resolution: {integrity: sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==} + engines: {node: '>=8.0.0'} + dependencies: + eventemitter3: 4.0.7 + follow-redirects: 1.15.2 + requires-port: 1.0.0 + transitivePeerDependencies: + - debug + dev: false + + /proxy-from-env/0.0.1: + resolution: {integrity: sha512-B9Hnta3CATuMS0q6kt5hEezOPM+V3dgaRewkFtFoaRQYTVNsHqUvFXmndH06z3QO1ZdDnRELv5vfY6zAj/gG7A==} + dev: false + + /requires-port/0.0.1: + resolution: {integrity: sha512-AzPDCliPoWDSvEVYRQmpzuPhGGEnPrQz9YiOEvn+UdB9ixBpw+4IOZWtwctmpzySLZTy7ynpn47V14H4yaowtA==} + dev: false + + /requires-port/1.0.0: + resolution: {integrity: sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==} + dev: false diff --git a/server/proxy/server.js b/server/proxy/server.js new file mode 100644 index 00000000..9a73322d --- /dev/null +++ b/server/proxy/server.js @@ -0,0 +1,6 @@ +const cors_proxy = require('cors-anywhere'); + +const host = process.env.HOST || 'localhost'; +const port = process.env.PORT || 8080; + +cors_proxy.createServer({originWhitelist: []}).listen(port, host, function() {console.log('Running Proxy on ' + host + ':' + port);}); \ No newline at end of file diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 1dc31c78..9f737d91 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -8,7 +8,7 @@ }, "package": { "productName": "RisuAI", - "version": "0.8.0" + "version": "0.7.9" }, "tauri": { "allowlist": { diff --git a/src/lib/Others/WelcomeRisu.svelte b/src/lib/Others/WelcomeRisu.svelte index 57d36a4a..cdf64e16 100644 --- a/src/lib/Others/WelcomeRisu.svelte +++ b/src/lib/Others/WelcomeRisu.svelte @@ -1,8 +1,10 @@