NethServer · edospadoni · Mar 4, 2025 · Feb 26, 2025 · Feb 26, 2025 · Feb 27, 2025
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,7 @@ out
 *.log*
 .yarn/install-state.gz
 yarn.lock
+package-lock.json
 certification
 *.env
 test/
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -49,7 +49,7 @@
     "@nethesis/nethesis-brands-svg-icons": "github:nethesis/Font-Awesome#ns-brands",
     "@nethesis/nethesis-light-svg-icons": "github:nethesis/Font-Awesome#ns-light",
     "@nethesis/nethesis-solid-svg-icons": "github:nethesis/Font-Awesome#ns-solid",
-    "@nethesis/phone-island": "^0.8.45",
+    "@nethesis/phone-island": "^0.10.2",
     "@tailwindcss/forms": "^0.5.7",
     "@types/lodash": "^4.14.202",
     "@types/node": "^18.19.9",

diff --git a/src/main/classes/controllers/NetworkController.ts b/src/main/classes/controllers/NetworkController.ts
@@ -8,7 +8,10 @@ export class NetworkController {
 
   async post(path: string, data: object | undefined, config: { headers: { Authorization?: string | undefined; 'Content-Type': string; }; } | undefined = { headers: { 'Content-Type': 'application/json' } }): Promise<any> {
     try {
-      const response = await axios.post(path, data, config)
+      const response = await axios.post(path, data, {
+        timeout: 5000,
+        ...config
+      })
 
       return response.data
     } catch (e: any) {
@@ -19,7 +22,10 @@ export class NetworkController {
   }
   async get(path: string, config: { headers: { Authorization?: string | undefined; 'Content-Type': string } } | undefined = { headers: { 'Content-Type': 'application/json' } }): Promise<any> {
     try {
-      const response = await axios.get(path, config)
+      const response = await axios.get(path, {
+        timeout: 5000,
+        ...config
+      })
       return response.data
     } catch (e: any) {
       const err: AxiosError = e

diff --git a/src/main/classes/windows/NethLinkWindow.ts b/src/main/classes/windows/NethLinkWindow.ts
@@ -123,7 +123,7 @@ export class NethLinkWindow extends BaseWindow {
     super.buildWindow()
     this._window?.on('hide', this.toggleVisibility)
     this._window?.on('moved', () => {
-      this.saveBounds()
+      debouncer('onMoveNethLinkWindow', () => this.saveBounds(), 1000)
     })
     this._window?.on('show', this.toggleVisibility)
     this._window?.on('closed', this.toggleVisibility)

diff --git a/src/main/lib/ipcEvents.ts b/src/main/lib/ipcEvents.ts
@@ -104,7 +104,7 @@ export function registerIpcEvents() {
       if (!draggingWindows?.hasOwnProperty(window.title)) {
         const interval: number = setInterval(() => {
           updateWindowPosition(window)
-        }, 1000 / 60) as unknown as number; // => 60 frames per seconds
+        }, 1000 / 300) as unknown as number; // => 300 frames per seconds
         draggingWindows = {
           ...draggingWindows,
           [window.title]: {

diff --git a/src/renderer/index.html b/src/renderer/index.html
@@ -1,32 +1,21 @@
 <!doctype html>
 <html>
-  <head>
-    <meta charset="UTF-8" />
-    <!-- <meta http-equiv="Content-Security-Policy"
-    content="default-src 'self'; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-eval';" /> -->
-    <!-- IMPORT THE WIDGET CSS -->
-    <link
-      rel="stylesheet"
-      type="text/css"
-      href="https://cdn.jsdelivr.net/gh/nethesis/phone-island/dist-widget/index.widget.css"
-    />
-    <!-- IMPORT THE POPPINS FONTS -->
-    <link rel="preconnect" href="https://fonts.googleapis.com" />
-    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
-    <link
-      href="https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap"
-      rel="stylesheet"
-    />
-    <!-- IMPORT THE WIDGET CSS -->
-    <meta
-      http-equiv="Content-Security-Policy"
-      content="default-src * self blob: data: gap:; style-src * self 'unsafe-inline' blob: data: gap:; script-src * 'self' 'unsafe-inline' blob: data: gap:; object-src * 'self' blob: data: gap:; img-src * self 'unsafe-inline' blob: data: gap:; connect-src self * 'unsafe-inline' blob: data: gap:; frame-src * self blob: data: gap:;"
-    />
-    <!-- 'unsafe-eval' -->
-  </head>
 
-  <body>
-    <div id="root"></div>
-    <script type="module" src="/src/index.tsx"></script>
-  </body>
-</html>
+<head>
+  <meta charset="UTF-8" />
+  <!-- IMPORT THE POPPINS FONTS -->
+  <link rel="preconnect" href="https://fonts.googleapis.com" />
+  <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
+  <link
+    href="https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap"
+    rel="stylesheet" />
+  <meta http-equiv="Content-Security-Policy"
+    content="default-src * self blob: data: gap:; style-src * self 'unsafe-inline' blob: data: gap:; script-src * 'self' 'unsafe-inline' blob: data: gap:; object-src * 'self' blob: data: gap:; img-src * self 'unsafe-inline' blob: data: gap:; connect-src self * 'unsafe-inline' blob: data: gap:; frame-src * self blob: data: gap:;" />
+</head>
+
+<body>
+  <div id="root"></div>
+  <script type="module" src="/src/index.tsx"></script>
+</body>
+
+</html>
diff --git a/src/renderer/src/App.tsx b/src/renderer/src/App.tsx
@@ -13,7 +13,7 @@ import { useRegisterStoreHook, useSharedState } from "@renderer/store";
 import { PageContext, usePageCtx } from './contexts/pageContext'
 import { GIT_RELEASES_URL, IPC_EVENTS } from '@shared/constants'
 import { useNetwork } from '@shared/useNetwork'
-
+import './index.css'
 
 const RequestStateComponent = () => {
   const pageData = usePageCtx()
@@ -66,7 +66,7 @@ const RequestStateComponent = () => {
   }, [account?.username, pageData?.page])
 
   const loader = async () => {
-    Log.info('check i18n initialization')
+    Log.debug('check i18n initialization')
     let time = 0
     //I wait for the language to load or 200 milliseconds
     while (time < 20 && !i18next.isInitialized) {
@@ -119,10 +119,9 @@ const Layout = ({ theme, page }: { theme?: AvailableThemes, page?: PAGES }) => {
 
   const importStyle = async () => {
     // Importing CSS dynamically when the page is not 'PHONEISLAND'
-    if (page !== PAGES.PHONEISLAND) {
-      await import('./tailwind.css')
+    if (page === PAGES.PHONEISLAND) {
+      await import('@nethesis/phone-island/dist/index.css')
     }
-    await import('./index.css')
     setIsCSSLoaded(true);
   }
 
@@ -142,7 +141,7 @@ const Layout = ({ theme, page }: { theme?: AvailableThemes, page?: PAGES }) => {
 export default function App() {
 
   useInitialize(() => {
-    Log.info('initialize i18n')
+    Log.debug('initialize i18n')
     loadI18n()
   })
   return (

diff --git a/src/renderer/src/components/ElectronDraggableWindow.tsx b/src/renderer/src/components/ElectronDraggableWindow.tsx
@@ -39,12 +39,10 @@ export const ElectronDraggableWindow = ({ children }) => {
   };
 
   const handleMouseUp = (e: MouseEvent) => {
-    if (!mouseUpEvent.current) {
-      mouseDownEvent.current = null
-      window.electron.send(IPC_EVENTS.STOP_DRAG);
-      isDrag.current = false
-      mouseUpEvent.current = e
-    }
+    mouseDownEvent.current = null
+    window.electron.send(IPC_EVENTS.STOP_DRAG);
+    isDrag.current = false
+    mouseUpEvent.current = e
   };
 
   useEffect(() => {
@@ -81,7 +79,7 @@ export const ElectronDraggableWindow = ({ children }) => {
 
   return (
     <div
-      className={classNames('absolute select-none top-0 left-0 h-screen w-screen z-[10000]', isDev() ? 'bg-red-700/75' : '')}
+      className={classNames('select-none h-[inherit] w-[inherit] z-[10000]', isDev() ? 'bg-red-700/75' : '')}
     >
       {children}
     </div>

diff --git a/src/renderer/src/components/pageComponents/phoneIsland/phoneIslandContainer.tsx b/src/renderer/src/components/pageComponents/phoneIsland/phoneIslandContainer.tsx
@@ -1,14 +1,11 @@
 import { PhoneIsland } from "@nethesis/phone-island"
-import { eventDispatch } from "@renderer/hooks/eventDispatch"
-import { useLoggedNethVoiceAPI } from "@renderer/hooks/useLoggedNethVoiceAPI"
 import { useSharedState } from "@renderer/store"
-import { IPC_EVENTS, PHONE_ISLAND_EVENTS } from "@shared/constants"
+import { IPC_EVENTS } from "@shared/constants"
 import { Log } from "@shared/utils/logger"
 import { useEffect, useMemo } from "react"
 
-export const PhoneIslandContainer = ({ dataConfig, deviceInformationObject, isDataConfigCreated, i18nLoadPath }) => {
+export const PhoneIslandContainer = ({ dataConfig, deviceInformationObject, isDataConfigCreated }) => {
   const [account] = useSharedState('account')
-  const { NethVoiceAPI } = useLoggedNethVoiceAPI()
 
   useEffect(() => {
     updateAccountInfo()
@@ -17,18 +14,14 @@ export const PhoneIslandContainer = ({ dataConfig, deviceInformationObject, isDa
   const updateAccountInfo = async () => {
     if (deviceInformationObject) {
       Log.info('FORCE DEFAULT DEVICE TO NETHLINK')
-      //TODO: controlla
-      if(account?.data?.default_device?.type === 'webrtc') {
+      if (account?.data?.default_device?.type === 'webrtc') {
         window.electron.send(IPC_EVENTS.CHANGE_DEFAULT_DEVICE, deviceInformationObject)
       }
-      // await NethVoiceAPI.User.default_device(deviceInformationObject)
-      // eventDispatch(PHONE_ISLAND_EVENTS['phone-island-default-device-change'], { deviceInformationObject })
-
     }
   }
 
   const PhoneIslandComponent = useMemo(() => {
-    return dataConfig && isDataConfigCreated && <PhoneIsland dataConfig={dataConfig} i18nLoadPath={i18nLoadPath} uaType='mobile' />
+    return dataConfig && isDataConfigCreated && <PhoneIsland dataConfig={dataConfig} uaType='mobile' />
   }, [account?.username, dataConfig, isDataConfigCreated])
 
   return PhoneIslandComponent