Merge pull request #17 from el3um4s/replace-ipc

Replace ipc

Author: el3um4s

electron/IPC/systemInfo.ts

@@ -4,7 +4,8 @@ import { autoUpdater } from "electron-updater";
 import Main from "./mainWindow";
 import globals from "./globals";
 
-import systemInfo from "./IPC/systemInfo";
+import systemInfo from "@el3um4s/ipc-for-electron-system-info";
+
 import updaterInfo from "./IPC/updaterInfo";
 import fileSystem from "./IPC/fileSystem";
 

electron/index.ts

@@ -1,9 +1,7 @@
 import { generateContextBridge } from "@el3um4s/ipc-for-electron";
+import systemInfo from "@el3um4s/ipc-for-electron-system-info";
 
-import systemInfo from "./IPC/systemInfo";
 import updaterInfo from "./IPC/updaterInfo";
 import fileSystem from "./IPC/fileSystem";
 
-generateContextBridge([systemInfo, updaterInfo, fileSystem], "api");
-
-console.log("ciao mondo");
+generateContextBridge([systemInfo, updaterInfo, fileSystem], "ipc");

electron/preload.ts

@@ -19,6 +19,8 @@
     "check-updates:patch": "npx npm-check-updates --target patch"
   },
   "devDependencies": {
+    "@el3um4s/ipc-for-electron": "^1.0.7",
+    "@el3um4s/ipc-for-electron-system-info": "^2.0.4",
     "@types/node": "^18.7.18",
     "concurrently": "^7.4.0",
     "electron": "^20.1.4",
@@ -27,7 +29,6 @@
     "typescript": "^4.8.3"
   },
   "dependencies": {
-    "@el3um4s/ipc-for-electron": "^1.0.7",
     "electron-reload": "^1.5.0",
     "electron-serve": "^1.1.0",
     "electron-updater": "^5.2.1"

package-lock.json

@@ -11,6 +11,7 @@
 		"format": "prettier --write ."
 	},
 	"devDependencies": {
+		"@el3um4s/renderer-for-electron-system-info": "^2.0.1",
 		"@sveltejs/adapter-auto": "next",
 		"@sveltejs/adapter-static": "^1.0.0-next.43",
 		"@sveltejs/kit": "next",

package.json

@@ -1,27 +1,28 @@
 <script lang="ts">
-	let chrome = '-';
-	let node = '-';
-	let electron = '-';
+	import systemInfo from '@el3um4s/renderer-for-electron-system-info';
 
-	const systemInfo = globalThis['api' as keyof typeof globalThis]['systemInfo'];
+	let chrome: string = '-';
+	let node: string = '-';
+	let electron: string = '-';
+	let app: string = '-';
 
-	systemInfo.send('requestSystemInfo', null);
-	systemInfo.receive(
-		'getSystemInfo',
-		(data: { chrome: string; node: string; electron: string }) => {
+	systemInfo.requestSystemInfo({
+		callback: (data) => {
 			chrome = data.chrome;
 			node = data.node;
 			electron = data.electron;
+			app = data.app;
 		}
-	);
+	});
 </script>
 
 <div>
 	<p>We are using</p>
 	<ul>
 		<li>Node.js <span class="version">{node}</span></li>
-		<li>Chromium <span class="version">{chrome}</span></li>
 		<li>Electron <span class="version">{electron}</span></li>
+		<li>Chromium <span class="version">{chrome}</span></li>
+		<li>App <span class="version">{app}</span></li>
 	</ul>
 </div>
 

svelte/package-lock.json

@@ -9,7 +9,7 @@
 
 	let downloadMessage: string = '';
 
-	const updaterInfo = globalThis['api' as keyof typeof globalThis]['updaterInfo'];
+	const updaterInfo = globalThis['ipc' as keyof typeof globalThis]['updaterInfo'];
 
 	updaterInfo.send('requestVersionNumber', null);
 

svelte/package.json

@@ -11,7 +11,7 @@
 
 	let fileSystem: any;
 	try {
-		fileSystem = globalThis['api' as keyof typeof globalThis]['fileSystem'];
+		fileSystem = globalThis['ipc' as keyof typeof globalThis]['fileSystem'];
 	} catch (error) {
 		console.error(error);
 		fileSystem = null;