Merge pull request #16 from hackthedev/beta

Beta

Author: hackthedev

.idea/.gitignore

@@ -35,8 +35,14 @@ if (!fs.existsSync(profilePath)) fs.mkdirSync(profilePath);
 
 
 let server = null
+let localServerUrl = null;
 
 function startLocalServer() {
+    // so this is needed because with file:// we get some shitty ass
+    // issues. because i wrote this comment some time later i already forgot
+    // the exact error, but it was shit like cors errors etc, which is resolved
+    // by doing it this way.
+
     return new Promise((resolve) => {
         const web = express()
         const publicDir = path.join(__dirname, "web")
@@ -48,7 +54,12 @@ function startLocalServer() {
 
         server = web.listen(0, "127.0.0.1", () => {
             const { port } = server.address()
-            resolve(`http://127.0.0.1:${port}`)
+            let address = `http://127.0.0.1:${port}`;
+
+            // used later
+            localServerUrl = address;
+
+            resolve(address)
         })
     })
 }
@@ -78,11 +89,15 @@ function registerWindowBoundsPersistence(win) {
 }
 
 async function createWindow(width, height) {
+    let localUrl = await startLocalServer();
+
     // installing multiple packages
     const results = await FrontendLibs.installMultiple([
         { package: '@hackthedev/icons@latest', path: libDir },
+        { package: '@hackthedev/element-loader@latest', path: libDir },
         { package: '@hackthedev/mobile-ui@latest', path: libDir },
         { package: '@hackthedev/prompts@latest', path: libDir },
+        { package: '@hackthedev/file-manager', path: libDir },
         { package: '@hackthedev/rich-editor', path: libDir },
         { package: '@hackthedev/json-editor', path: libDir },
         { package: '@hackthedev/chat-tools@1.0.0', path: libDir },
@@ -111,7 +126,10 @@ async function createWindow(width, height) {
             sandbox: false,
             devTools: true,
             webviewTag: true,
-            additionalArguments: ["--appdata=" + applicationDataDir],
+            additionalArguments: [
+                "--appdata=" + applicationDataDir,
+                "--localServerUrl=" + localServerUrl,
+            ],
         },
     });
 
@@ -139,7 +157,6 @@ async function createWindow(width, height) {
         }
     )
 
-    let localUrl = await startLocalServer();
     await win.loadURL(localUrl)
     //win.loadFile(path.join(__dirname, "web/index.html"));
 }
@@ -172,6 +189,8 @@ app.commandLine.appendSwitch(
 
 app.whenReady().then(async () => {
     // Check for fucking update
+
+    /* Commented out for now as it needs a bit more work to work fine with linux too etc
     let updateCheck = await AppUpdater.check("https://dcts.community/app/electron", {
         includeOsUrl: true,
         version: app.getVersion()
@@ -226,10 +245,13 @@ app.whenReady().then(async () => {
         }
     }
 
+     */
+
 
     await Settings.initSettings(applicationDataDir);
 
-    // youtube embed fix — header spoofing
+    // youtube embed fix - header spoofing or some shit.
+    // it semi works?? still need to figure this shit out more
     session.defaultSession.webRequest.onBeforeSendHeaders(
         { urls: ['*://*.youtube-nocookie.com/*', '*://*.youtube.com/*', '*://*.googlevideo.com/*', '*://*.ytimg.com/*'] },
         (details, callback) => {
@@ -242,13 +264,19 @@ app.whenReady().then(async () => {
     const primaryDisplay = screen.getPrimaryDisplay();
     const {width, height} = primaryDisplay.workAreaSize;
 
-    session.defaultSession.setDisplayMediaRequestHandler((request, callback) => {
-        desktopCapturer
-            .getSources({types: ["window", "screen"]})
-            .then((sources) => {
-                callback({video: sources[0]});
-            });
-    })
+    // until there is a better solution.
+    // i had the idea of possibly adding some display fetching and selecting inside
+    // the web frontend itself to then just tell the backend (electron) which screen
+    // to use exactly. Just some idea for now tho.
+    if(isLinux){
+        session.defaultSession.setDisplayMediaRequestHandler((request, callback) => {
+            desktopCapturer
+                .getSources({types: ["window", "screen"]})
+                .then((sources) => {
+                    callback({video: sources[0]});
+                });
+        })
+    }
 
     await createWindow(
         1080,

.idea/dcts-client-shipping.iml

@@ -0,0 +1,6 @@
+import Settings from "./settings.js";
+
+export const DeleteChat = async ({ signer, applicationDataDir }, chatId) => {
+    if(!chatId) throw new Error("chatId must be provided");
+    return await Settings.Message.deleteChat(chatId)
+}

.idea/modules.xml

@@ -0,0 +1,10 @@
+
+export const ExportKey = async ({ signer, applicationDataDir }, code) => {
+    if(!code || code?.length < 24) throw new Error("Export code is not secure enough!");
+
+    let privateKey = await signer.getPrivateKey();
+    let encrypted = await signer.encrypt(privateKey, code);
+    privateKey = null;
+
+    return encrypted
+}

.idea/vcs.xml

@@ -0,0 +1,4 @@
+
+export const GetLocalServerAddress = async ({ signer, applicationDataDir, localServerUrl }) => {
+    return localServerUrl;
+}

electron/index.js

@@ -0,0 +1,5 @@
+import Settings from "./settings.js";
+
+export const GetSignature = async ({ signer, applicationDataDir }) => {
+    return await Settings.settings?.user?.signature ?? null;
+}

electron/modules/DeleteChat.mjs

@@ -0,0 +1,5 @@
+import Settings from "./settings.js";
+
+export const GetUnreadChats = async ({ signer, applicationDataDir }) => {
+    return await Settings.Message.getChatsUnread();
+}