Skip to content

fix: add explicit origin to notifications socket-io and put setup of … #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Corstor merged 1 commit into from
Sep 26, 2025
Merged

fix: add explicit origin to notifications socket-io and put setup of … #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/api/notifications-management/requests.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export function openSocketIOForNotifications(
email: string,
onReceivedNotification: (notification: Notification) => void
): Socket {
const socket = io()
const socket = io(window.location.origin)
.on('connect', () => socket.emit('login', { email: email }))
.on('notification', (data: NotificationDTO) => {
onReceivedNotification(notificationDeserializer(data))
Expand Down
32 changes: 17 additions & 15 deletions src/views/devices/DeviceView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import * as api from '@/api/devices-management/requests/devices'
import * as notificationsApi from '@/api/notifications-management/requests'
import { Type } from '@/model/Type'
import ValueIOControl from '@/components/devices/ValueIOControl.vue'
import { io } from 'socket.io-client'
import { io, Socket } from 'socket.io-client'
import { presentSuccess, useSuccessPresenterStore } from '@/stores/success-presenter'
import NavbarLayout from '@/components/NavbarLayout.vue'
import DeviceGroupsButton from '@/components/DeviceGroupsButton.vue'
Expand Down Expand Up @@ -88,9 +88,25 @@ async function executeAction(action: DeviceAction<unknown>, input?: unknown) {
/* Managing the device offline notifications subscription */
const offlineNotificationsModal = useTemplateRef('offline-notifications-modal')
const isSubscribedForOfflineNotifications = ref<boolean | undefined>(undefined)
let socket: Socket
onMounted(async () => {
isSubscribedForOfflineNotifications.value =
await notificationsApi.isSubscribedForDeviceOfflineNotifications(deviceId, userInfo.token)

const baseURL = window.location.origin

/* SocketIO subscription for real time property updates */
type PropertyUpdateDTO = { deviceId: string; propertyId: string; value: unknown }
socket = io(baseURL + '/api/devices/property-updates')
.on('connect', () => socket.emit('subscribe', { deviceId: deviceId }))
.on('device-property-update', (data: PropertyUpdateDTO) => {
if (data.deviceId == deviceId) {
const property = device.value?.properties.find((p) => p.id == data.propertyId)
if (property) {
property.value = data.value
}
}
})
})
async function subscribeForOfflineNotifications(activate: boolean) {
if (activate === isSubscribedForOfflineNotifications.value) return
Expand All @@ -113,20 +129,6 @@ async function subscribeForOfflineNotifications(activate: boolean) {
}
}

const baseURL = window.location.origin

/* SocketIO subscription for real time property updates */
type PropertyUpdateDTO = { deviceId: string; propertyId: string; value: unknown }
const socket = io(baseURL + '/api/devices/property-updates')
.on('connect', () => socket.emit('subscribe', { deviceId: deviceId }))
.on('device-property-update', (data: PropertyUpdateDTO) => {
if (data.deviceId == deviceId) {
const property = device.value?.properties.find((p) => p.id == data.propertyId)
if (property) {
property.value = data.value
}
}
})
onUnmounted(() => {
socket.close()
})
Expand Down