Qortal/qortal-ui
4
1
Fork 4
mirror of https://github.com/Qortal/qortal-ui.git synced 2025-02-23 07:35:49 +00:00
Code Issues Projects Releases Wiki Activity

Change protocol check

Browse Source
This commit is contained in:
AlphaX-Qortal 2025-02-12 22:26:49 +01:00
parent d3f9e0878b
commit f7971f7026
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/plugins/core/components/ChatPage.js
View File

@ -2551,15 +2551,13 @@ class ChatPage extends LitElement {
const initDirect = async (cid, noInitial) => { const initDirect = async (cid, noInitial) => {
let timeoutId let timeoutId
let initial = 0 let initial = 0
let directSocketTimeout let directSocketTimeout
let myNode = window.parent.reduxStore.getState().app.nodeConfig.knownNodes[window.parent.reduxStore.getState().app.nodeConfig.node] let myNode = window.parent.reduxStore.getState().app.nodeConfig.knownNodes[window.parent.reduxStore.getState().app.nodeConfig.node]
let nodeUrl = myNode.domain + ":" + myNode.port let nodeUrl = myNode.domain + ":" + myNode.port
let nodeProtocol = myNode.protocol
let directSocketLink let directSocketLink
if (window.parent.location.protocol === "https:") { if (nodeProtocol === "https") {
directSocketLink = `wss://${nodeUrl}/websockets/chat/messages?involving=${window.parent.reduxStore.getState().app.selectedAddress.address}&involving=${cid}&encoding=BASE64&limit=1` directSocketLink = `wss://${nodeUrl}/websockets/chat/messages?involving=${window.parent.reduxStore.getState().app.selectedAddress.address}&involving=${cid}&encoding=BASE64&limit=1`
} else { } else {
// Fallback to http // Fallback to http
@ -2675,17 +2673,15 @@ class ChatPage extends LitElement {
const initGroup = (gId, noInitial) => { const initGroup = (gId, noInitial) => {
let timeoutId let timeoutId
let groupId = Number(gId) let groupId = Number(gId)
let initial = 0 let initial = 0
let count = 0 let count = 0
let groupSocketTimeout let groupSocketTimeout
let myNode = window.parent.reduxStore.getState().app.nodeConfig.knownNodes[window.parent.reduxStore.getState().app.nodeConfig.node] let myNode = window.parent.reduxStore.getState().app.nodeConfig.knownNodes[window.parent.reduxStore.getState().app.nodeConfig.node]
let nodeUrl = myNode.domain + ":" + myNode.port let nodeUrl = myNode.domain + ":" + myNode.port
let nodeProtocol = myNode.protocol
let groupSocketLink let groupSocketLink
if (window.parent.location.protocol === "https:") { if (nodeProtocol === "https") {
groupSocketLink = `wss://${nodeUrl}/websockets/chat/messages?txGroupId=${groupId}&encoding=BASE64&limit=1` groupSocketLink = `wss://${nodeUrl}/websockets/chat/messages?txGroupId=${groupId}&encoding=BASE64&limit=1`
} else { } else {
// Fallback to http // Fallback to http

6
plugins/plugins/core/streams/onNewBlock.js
View File

@ -136,9 +136,10 @@ function attemptReconnectNodeStatusSocket() {
const initBlockSocket = () => { const initBlockSocket = () => {
let myNode = window.parent.reduxStore.getState().app.nodeConfig.knownNodes[window.parent.reduxStore.getState().app.nodeConfig.node] let myNode = window.parent.reduxStore.getState().app.nodeConfig.knownNodes[window.parent.reduxStore.getState().app.nodeConfig.node]
let nodeUrl = myNode.domain + ":" + myNode.port let nodeUrl = myNode.domain + ":" + myNode.port
let nodeProtocol = myNode.protocol
let activeBlockSocketLink let activeBlockSocketLink
if (window.parent.location.protocol === "https:") { if (nodeProtocol === "https") {
activeBlockSocketLink = `wss://${nodeUrl}/websockets/blocks` activeBlockSocketLink = `wss://${nodeUrl}/websockets/blocks`
} else { } else {
activeBlockSocketLink = `ws://${nodeUrl}/websockets/blocks` activeBlockSocketLink = `ws://${nodeUrl}/websockets/blocks`
@ -205,9 +206,10 @@ const pingactiveBlockSocket = () => {
const initNodeStatusSocket = () => { const initNodeStatusSocket = () => {
let myNode = window.parent.reduxStore.getState().app.nodeConfig.knownNodes[window.parent.reduxStore.getState().app.nodeConfig.node] let myNode = window.parent.reduxStore.getState().app.nodeConfig.knownNodes[window.parent.reduxStore.getState().app.nodeConfig.node]
let nodeUrl = myNode.domain + ":" + myNode.port let nodeUrl = myNode.domain + ":" + myNode.port
let nodeProtocol = myNode.protocol
let activeNodeStatusSocketLink let activeNodeStatusSocketLink
if (window.parent.location.protocol === "https:") { if (nodeProtocol === "https") {
activeNodeStatusSocketLink = `wss://${nodeUrl}/websockets/admin/status` activeNodeStatusSocketLink = `wss://${nodeUrl}/websockets/admin/status`
} else { } else {
activeNodeStatusSocketLink = `ws://${nodeUrl}/websockets/admin/status` activeNodeStatusSocketLink = `ws://${nodeUrl}/websockets/admin/status`

3
plugins/plugins/core/streams/streams.js
View File

@ -112,9 +112,10 @@ parentEpml.subscribe('logged_in', async isLoggedIn => {
const initChatHeadSocket = () => { const initChatHeadSocket = () => {
let myNode = window.parent.reduxStore.getState().app.nodeConfig.knownNodes[window.parent.reduxStore.getState().app.nodeConfig.node] let myNode = window.parent.reduxStore.getState().app.nodeConfig.knownNodes[window.parent.reduxStore.getState().app.nodeConfig.node]
let nodeUrl = myNode.domain + ":" + myNode.port let nodeUrl = myNode.domain + ":" + myNode.port
let nodeProtocol = myNode.protocol
let activeChatSocketLink let activeChatSocketLink
if (window.parent.location.protocol === "https:") { if (nodeProtocol === "https") {
activeChatSocketLink = `wss://${nodeUrl}/websockets/chat/active/${window.parent.reduxStore.getState().app.selectedAddress.address}?encoding=BASE64` activeChatSocketLink = `wss://${nodeUrl}/websockets/chat/active/${window.parent.reduxStore.getState().app.selectedAddress.address}?encoding=BASE64`
} else { } else {
activeChatSocketLink = `ws://${nodeUrl}/websockets/chat/active/${window.parent.reduxStore.getState().app.selectedAddress.address}?encoding=BASE64` activeChatSocketLink = `ws://${nodeUrl}/websockets/chat/active/${window.parent.reduxStore.getState().app.selectedAddress.address}?encoding=BASE64`