takotako

takoserver · Jun 19, 2024 · 5823a44 · 5823a44
1 parent c65b7a6
commit 5823a44
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 11 deletions.
diff --git a/.env.example b/.env.example
@@ -1,7 +1,3 @@
-hostname=
-username=
-db=
-password=
 MONGO_URL=mongodb://localhost:27017/takos
 recaptcha_site_key=6LewIZspAAAAAEwZ8YaDMe8dxxs6F_N8KtSsukQY
 rechapcha_seecret_key=6LewIZspAAAAAGJE3RjUqM4dn8jgBCx_zdcXwkwx
@@ -13,4 +9,5 @@ origin="http://localhost:8000,https://takos.jp,"
 REACT_APP_RECAPTCHA_KEY=
 mailDomain=http://localhost:8000
 friendOrigin=http://localhost:8000?key=
-REDIS_URL=redis://localhost:6379
+REDIS_URL=redis://localhost:6379
+wsSSL=true
diff --git a/islands/Chats/Chat.tsx b/islands/Chats/Chat.tsx
@@ -93,8 +93,10 @@ export default function Home(
     }, [talkData])
     useEffect(() => {
         const createWebSocket = () => {
+            const wssprotocol = props.wsSSL ? "wss://" : "ws://"
+            const wsurl = wssprotocol + "/api/v1/main"
             const socket = new WebSocket(
-                "/api/v1/main",
+                wsurl
             )
             socket.onopen = () => {
                 socket.send(

diff --git a/routes/addFriend/[roomid].tsx b/routes/addFriend/[roomid].tsx
@@ -6,6 +6,7 @@ import { useSignal } from "@preact/signals"
 import User from "../../components/Chats/ChatUserList.jsx"
 const env = await load()
 const sitekey = env["recaptcha_site_key"]
+const wsSSL = env["wsSSL"]
 const url = `https://www.google.com/recaptcha/api.js?render=${sitekey}`
 export const handler = {
     async GET(req: any, ctx: any) {
@@ -103,6 +104,7 @@ export default function Home({ data }: { data: any }) {
                 settings={settings}
                 userNickName={data.nickName}
                 userName={data.userName + "@" + env["serverDomain"]}
+                wsSSL={wsSSL}
             >
             </Chat>
         </>

diff --git a/routes/addFriend/index.tsx b/routes/addFriend/index.tsx
@@ -7,6 +7,7 @@ import { useSignal } from "@preact/signals"
 import User from "../../components/Chats/ChatUserList.jsx"
 const env = await load()
 const sitekey = env["recaptcha_site_key"]
+const wsSSL = env["wsSSL"]
 const url = `https://www.google.com/recaptcha/api.js?render=${sitekey}`
 export const handler = {
     async GET(req: any, ctx: any) {
@@ -86,6 +87,7 @@ export default function Home({ data }: { data: any }) {
                 isAddFriendForm={false}
                 userNickName={data.nickName}
                 userName={data.userName + "@" + env["serverDomain"]}
+                wsSSL={wsSSL}
             >
             </Chat>
         </>

diff --git a/routes/home/[roomid].tsx b/routes/home/[roomid].tsx
@@ -7,6 +7,7 @@ import User from "../../components/Chats/ChatUserList.jsx"
 const env = await load()
 const sitekey = env["recaptcha_site_key"]
 const url = `https://www.google.com/recaptcha/api.js?render=${sitekey}`
+const wsSSL = env["wsSSL"]
 export const handler = {
     async GET(req: any, ctx: any) {
         const { roomid } = ctx.params
@@ -103,6 +104,7 @@ export default function Home({ data }: { data: any }) {
                 settings={settings}
                 userNickName={data.nickName}
                 userName={data.userName + "@" + env["serverDomain"]}
+                wsSSL={wsSSL}
             >
             </Chat>
         </>

diff --git a/routes/home/index.tsx b/routes/home/index.tsx
@@ -3,10 +3,10 @@ import users from "../../models/users.ts"
 import { load } from "$std/dotenv/mod.ts"
 import Chat from "../../islands/Chats/Chat.tsx"
 import { useSignal } from "@preact/signals"
-
 import User from "../../components/Chats/ChatUserList.jsx"
 const env = await load()
 const sitekey = env["recaptcha_site_key"]
+const wsSSL = env["wsSSL"]
 const url = `https://www.google.com/recaptcha/api.js?render=${sitekey}`
 export const handler = {
     async GET(req: any, ctx: any) {
@@ -86,6 +86,7 @@ export default function Home({ data }: { data: any }) {
                 isAddFriendForm={false}
                 userNickName={data.nickName}
                 userName={data.userName + "@" + env["serverDomain"]}
+                wsSSL={wsSSL}
             >
             </Chat>
         </>

diff --git a/routes/index.tsx b/routes/index.tsx
@@ -3,10 +3,10 @@ import users from "../models/users.ts"
 import { load } from "$std/dotenv/mod.ts"
 import Chat from "../islands/Chats/Chat.tsx"
 import { useSignal } from "@preact/signals"
-
 import User from "../components/Chats/ChatUserList.jsx"
 const env = await load()
 const sitekey = env["recaptcha_site_key"]
+const wsSSL = env["wsSSL"]
 const url = `https://www.google.com/recaptcha/api.js?render=${sitekey}`
 export const handler = {
     async GET(req: any, ctx: any) {
@@ -89,6 +89,7 @@ export default function Home({ data }: { data: any }) {
                         AddFriendKey={data.key}
                         userNickName={data.nickName}
                         userName={data.userName + "@" + env["serverDomain"]}
+                        wsSSL={wsSSL}
                     >
                     </Chat>
                 )
@@ -104,5 +105,4 @@ export default function Home({ data }: { data: any }) {
                 )}
         </>
     )
-}
-//
+}
diff --git a/routes/setting/[roomid].tsx b/routes/setting/[roomid].tsx
@@ -7,6 +7,7 @@ import User from "../../components/Chats/ChatUserList.jsx"
 const env = await load()
 const sitekey = env["recaptcha_site_key"]
 const url = `https://www.google.com/recaptcha/api.js?render=${sitekey}`
+const wsSSL = env["wsSSL"]
 export const handler = {
     async GET(req: any, ctx: any) {
         const { roomid } = ctx.params
@@ -103,6 +104,7 @@ export default function Home({ data }: { data: any }) {
                 settings={settings}
                 userNickName={data.nickName}
                 userName={data.userName + "@" + env["serverDomain"]}
+                wsSSL={wsSSL}
             >
             </Chat>
         </>

diff --git a/routes/setting/index.tsx b/routes/setting/index.tsx
@@ -3,9 +3,9 @@ import users from "../../models/users.ts"
 import { load } from "$std/dotenv/mod.ts"
 import Chat from "../../islands/Chats/Chat.tsx"
 import { useSignal } from "@preact/signals"
-
 const env = await load()
 const sitekey = env["recaptcha_site_key"]
+const wsSSL = env["wsSSL"]
 const url = `https://www.google.com/recaptcha/api.js?render=${sitekey}`
 export const handler = {
     async GET(req: any, ctx: any) {
@@ -85,6 +85,7 @@ export default function Home({ data }: { data: any }) {
                 isAddFriendForm={false}
                 userNickName={data.nickName}
                 userName={data.userName + "@" + env["serverDomain"]}
+                wsSSL={wsSSL}
             >
             </Chat>
         </>

diff --git a/routes/talk/[roomid].tsx b/routes/talk/[roomid].tsx
@@ -7,6 +7,7 @@ import User from "../../components/Chats/ChatUserList.jsx"
 const env = await load()
 const sitekey = env["recaptcha_site_key"]
 const url = `https://www.google.com/recaptcha/api.js?render=${sitekey}`
+const wsSSL = env["wsSSL"]
 export const handler = {
     async GET(req: any, ctx: any) {
         const { roomid } = ctx.params
@@ -103,6 +104,7 @@ export default function Home({ data }: { data: any }) {
                 settings={settings}
                 userNickName={data.nickName}
                 userName={data.userName + "@" + env["serverDomain"]}
+                wsSSL={wsSSL}
             >
             </Chat>
         </>

diff --git a/routes/talk/index.tsx b/routes/talk/index.tsx
@@ -7,6 +7,7 @@ import User from "../../components/Chats/ChatUserList.jsx"
 const env = await load()
 const sitekey = env["recaptcha_site_key"]
 const url = `https://www.google.com/recaptcha/api.js?render=${sitekey}`
+const wsSSL = env["wsSSL"]
 export const handler = {
     async GET(req: any, ctx: any) {
         const { roomid } = ctx.params
@@ -103,6 +104,7 @@ export default function Home({ data }: { data: any }) {
                 settings={settings}
                 userNickName={data.nickName}
                 userName={data.userName + "@" + env["serverDomain"]}
+                wsSSL={wsSSL}
             >
             </Chat>
         </>