bundled electron app starts without error

packages/web/src/utility/connectionsPinger.js

@@ -15,15 +15,19 @@ const doDatabasePing = value => {
 };
 
 let openedConnectionsHandle = null;
-openedConnections.subscribe(value => {
-  doServerPing(value);
-  if (openedConnectionsHandle) window.clearInterval(openedConnectionsHandle);
-  openedConnectionsHandle = window.setInterval(() => doServerPing(value), 30 * 1000);
-});
 
 let currentDatabaseHandle = null;
-currentDatabase.subscribe(value => {
-  doDatabasePing(value);
-  if (currentDatabaseHandle) window.clearInterval(currentDatabaseHandle);
-  currentDatabaseHandle = window.setInterval(() => doDatabasePing(value), 30 * 1000);
-});
+
+export function subscribeConnectionPingers() {
+  openedConnections.subscribe(value => {
+    doServerPing(value);
+    if (openedConnectionsHandle) window.clearInterval(openedConnectionsHandle);
+    openedConnectionsHandle = window.setInterval(() => doServerPing(value), 30 * 1000);
+  });
+
+  currentDatabase.subscribe(value => {
+    doDatabasePing(value);
+    if (currentDatabaseHandle) window.clearInterval(currentDatabaseHandle);
+    currentDatabaseHandle = window.setInterval(() => doDatabasePing(value), 30 * 1000);
+  });
+}

packages/web/src/utility/exportElectronFile.ts

@@ -48,12 +48,12 @@ export async function exportElectronFile(dataName, reader, format) {
 
   function handleRunnerDone() {
     closeSnackbar(snackId);
-    socket.off(`runner-done-${runid}`, handleRunnerDone);
+    socket().off(`runner-done-${runid}`, handleRunnerDone);
     if (isCanceled) showSnackbarError(`Export ${dataName} canceled`);
     else showSnackbarInfo(`Export ${dataName} finished`);
   }
 
-  socket.on(`runner-done-${runid}`, handleRunnerDone);
+  socket().on(`runner-done-${runid}`, handleRunnerDone);
 }
 
 export async function saveFileToDisk(

packages/web/src/utility/getElectron.ts

@@ -16,14 +16,13 @@ class ElectronApi {
 let apiInstance = null;
 
 function initializeElectron(args) {
-  // console.log('Initialize electron with args:', args);
-
   apiInstance = new ElectronApi(args);
   if (window['dbgate_recreateAxiosInstance']) {
-    // console.log('Recreating axios instance');
-
     window['dbgate_recreateAxiosInstance']();
   }
+  if (window['dbgate_recreateSocket']) {
+    window['dbgate_recreateSocket']();
+  }
 }
 
 window['dbgate_initializeElectron'] = initializeElectron;

packages/web/src/utility/hasPermission.ts

@@ -3,13 +3,14 @@ import { useConfig } from './metadataLoaders';
 
 let compiled = null;
 
-const config = useConfig();
-config.subscribe(value => {
-  if (!value) return;
-  const { permissions } = value;
-  compiled = compilePermissions(permissions);
-});
-
 export default function hasPermission(tested) {
   return testPermission(tested, compiled);
 }
+
+export function subscribePermissionCompiler() {
+  useConfig().subscribe(value => {
+    if (!value) return;
+    const { permissions } = value;
+    compiled = compilePermissions(permissions);
+  });
+}

packages/web/src/utility/metadataLoaders.ts

@@ -208,11 +208,11 @@ function useCore(loader, args) {
       handleReload();
       if (reloadTrigger && socket) {
         for (const item of getAsArray(reloadTrigger)) {
-          socket.on(item, handleReload);
+          socket().on(item, handleReload);
         }
         return () => {
           for (const item of getAsArray(reloadTrigger)) {
-            socket.off(item, handleReload);
+            socket().off(item, handleReload);
           }
         };
       }

packages/web/src/utility/socket.js

@@ -1,8 +1,23 @@
 import io from 'socket.io-client';
 import resolveApi from './resolveApi';
 import { cacheClean } from './cache';
+import { shouldWaitForElectronInitialize } from './getElectron';
 
-const socket = io(resolveApi());
-socket.on('clean-cache', reloadTrigger => cacheClean(reloadTrigger));
+let socketInstance;
+
+function recreateSocket() {
+  if (shouldWaitForElectronInitialize()) return;
+
+  socketInstance = io(resolveApi());
+  socketInstance.on('clean-cache', reloadTrigger => cacheClean(reloadTrigger));
+}
+
+window['dbgate_recreateSocket'] = recreateSocket;
+
+recreateSocket();
+
+function socket() {
+  return socketInstance;
+}
 
 export default socket;