chore: use server in electron app

nuclia · Dec 22, 2023 · 55a1aae · 55a1aae
1 parent 11c58b4
commit 55a1aae
Show file tree

Hide file tree

Showing 9 changed files with 70 additions and 102 deletions.
diff --git a/electron-app/package-lock.json b/electron-app/package-lock.json
diff --git a/electron-app/package.json b/electron-app/package.json
@@ -3,7 +3,7 @@
   "productName": "nuclia-sync-agent",
   "version": "0.0.1",
   "description": "This is a Nuclia Sync Agent App",
-  "main": "build/electron-app/src/index.js",
+  "main": "build/index.js",
   "scripts": {
     "compile": "tsc",
     "start": "npm run compile && electron-forge start",
@@ -34,7 +34,8 @@
     "rxjs": "^7.8.1",
     "typescript": "^5.2.2",
     "uuid": "^9.0.1",
-    "zod": "^3.22.4"
+    "zod": "^3.22.4",
+    "@nuclia/sync-agent": "file:../server"
   },
   "devDependencies": {
     "@electron-forge/cli": "^6.4.2",

diff --git a/electron-app/src/fileSystemFn.ts b/electron-app/src/fileSystemFn.ts
diff --git a/electron-app/src/fileSystemServerFn.ts b/electron-app/src/fileSystemServerFn.ts
diff --git a/electron-app/src/index.ts b/electron-app/src/index.ts
@@ -1,19 +1,12 @@
 import { Menu, Tray, app, nativeImage } from 'electron';
 import os from 'os';
 import path from 'path';
-import { EVENTS } from '../../server/src/events/events';
-import { beforeStartServer } from '../../server/src/fileSystemServerFn';
 
-import { AppFileSystemRoutes } from '../../server/src/presentation/routes';
-import { Server, eventEmitter } from '../../server/src/server';
-import { initFileSystemSubscribers } from '../../server/src/subscribers';
+import { EVENTS, eventEmitter, initFileSystemServer } from '@nuclia/sync-agent';
 
 let contextMenu: Electron.Menu;
 let tray = null;
 const basePath = `${os.homedir()}/.nuclia`;
-const appRoutes = new AppFileSystemRoutes(basePath);
-const server = new Server({ port: 8000, routes: appRoutes.getRoutes() });
-initFileSystemSubscribers(basePath);
 
 // Handle creating/removing shortcuts on Windows when installing/uninstalling.
 if (require('electron-squirrel-startup')) {
@@ -31,7 +24,7 @@ const updateTrayAfterStopServer = () => {
 
 const createWindow = async () => {
   const icon = nativeImage.createFromPath(path.join(__dirname, '../public/logo.png'));
-
+  const server = await initFileSystemServer(basePath);
   tray = new Tray(icon);
   contextMenu = Menu.buildFromTemplate([
     {
@@ -58,7 +51,6 @@ const createWindow = async () => {
   ]);
   tray.setToolTip('Nuclia sync');
   tray.setContextMenu(contextMenu);
-  await beforeStartServer(basePath);
   server.start();
 };
 

diff --git a/electron-app/tsconfig.json b/electron-app/tsconfig.json
@@ -1,14 +1,12 @@
 {
   "compilerOptions": {
+    "baseUrl": ".",
     "target": "es2015",
     "module": "commonjs",
     "strict": true,
     "esModuleInterop": true,
     "outDir": "./build",
-    "paths": {
-      "@server/*": ["../server/src/*"],
-    }
   },
   "include": ["src/**/*"],
-  "exclude": ["node_modules", "**/*.spec.ts", "**/*.spec.js"]
+  "exclude": ["**/*.spec.ts", "**/*.spec.js"]
 }
diff --git a/server/package.json b/server/package.json
@@ -3,6 +3,10 @@
   "version": "0.0.1",
   "description": "This is a sync agent to synchronize user files from diferent sources to nuclia",
   "main": "build/index.js",
+  "types": "build/types/index.d.ts",
+  "files": [
+    "build/events/index.js"
+  ],
   "keywords": [
     "Nuclia"
   ],

diff --git a/server/src/events/index.ts b/server/src/events/index.ts
@@ -0,0 +1 @@
+export * from './events';
diff --git a/server/src/index.ts b/server/src/index.ts
@@ -0,0 +1,15 @@
+import { EVENTS } from './events';
+import { beforeStartServer } from './fileSystemServerFn';
+import { AppFileSystemRoutes } from './presentation/routes';
+import { Server, eventEmitter } from './server';
+import { initFileSystemSubscribers } from './subscribers';
+
+export const initFileSystemServer = async (basePath: string) => {
+  const appRoutes = new AppFileSystemRoutes(basePath);
+  const server = new Server({ port: 8000, routes: appRoutes.getRoutes() });
+  initFileSystemSubscribers(basePath);
+  await beforeStartServer(basePath);
+  return server;
+};
+
+export { EVENTS, eventEmitter };