efactor app directories and enforce ts strict mode

.gitignore

@@ -4,9 +4,10 @@
 # Jan inference
 models/**
 error.log
-app/electron/core/*/node_modules
-app/electron/core/*/dist
-app/electron/core/*/package-lock.json
+node_modules
+package-lock.json
 *.tgz
-app/yarn.lock
-app/dist
+yarn.lock
+dist
+build
+.DS_Store

app/electron/core/plugin-manager/execution/index.js → electron/core/plugin-manager/execution/index.js

@@ -2,7 +2,7 @@ import { definePresetEps, setImporter } from "./import-manager.js";
 
 export * as extensionPoints from "./extension-manager.js";
 export * as activationPoints from "./activation-manager.js";
-export * as plugins from "./facade";
+export * as plugins from "./facade.js";
 export { default as ExtensionPoint } from "./ExtensionPoint.js";
 
 if (typeof window === "undefined" || !window.pluggableElectronIpc)

app/electron/main.ts → electron/main.ts

@@ -1,49 +1,83 @@
 // @ts-nocheck
-const {
+import {
   app,
   BrowserWindow,
-  screen: electronScreen,
+  screen as electronScreen,
   dialog,
   ipcMain,
-} = require("electron");
-const isDev = require("electron-is-dev");
-const path = require("path");
-const pe = require("pluggable-electron/main");
-const fs = require("fs");
-const { mkdir, writeFile } = require("fs/promises");
-const { Readable } = require("stream");
-const { finished } = require("stream/promises");
-const request = require("request");
-const progress = require("request-progress");
+} from "electron";
+import { resolve, join } from "path";
+import { readdirSync, createWriteStream, unlink, lstatSync } from "fs";
+import isDev = require("electron-is-dev");
+import request = require("request");
+import progress = require("request-progress");
+import { init, getStore } from "./core/plugin-manager/pluginMgr";
 
 let modelSession = undefined;
 let modelName = "llama-2-7b-chat.gguf.q4_0.bin";
+let mainWindow;
 
-let window;
+const _importDynamic = new Function('modulePath', 'return import(modulePath)')
 
 const createMainWindow = () => {
-  window = new BrowserWindow({
+  mainWindow = new BrowserWindow({
     width: electronScreen.getPrimaryDisplay().workArea.width,
     height: electronScreen.getPrimaryDisplay().workArea.height,
     show: false,
     backgroundColor: "white",
     webPreferences: {
       nodeIntegration: true,
       enableRemoteModule: true,
-      preload: path.resolve(app.getAppPath(), "electron/preload.js"),
+      preload: join(__dirname, "preload.js"),
     },
   });
 
+  // TODO: add options for model configuration
+  ipcMain.handle("initModel", async (event, product, importer) => {
+    if (!product.fileName) {
+      await dialog.showMessageBox({
+        message: "Selected model does not have file name..",
+      });
+
+      return;
+    }
+
+    console.info(`Initializing model: ${product.name}..`);
+    _importDynamic(
+      isDev
+        ? join(__dirname, "../node_modules/node-llama-cpp/dist/index.js")
+        : resolve(
+            app.getAppPath(),
+            "./../../app.asar.unpacked/node_modules/node-llama-cpp/dist/index.js"
+          )
+    )
+      .then(({ LlamaContext, LlamaChatSession, LlamaModel }) => {
+        const modelPath = join(app.getPath("userData"), product.fileName);
+        // TODO: check if file is already there
+        const model = new LlamaModel({
+          modelPath: modelPath,
+        });
+        const context = new LlamaContext({ model });
+        modelSession = new LlamaChatSession({ context });
+        console.info(`Init model ${product.name} successfully!`);
+      })
+      .catch(async (e) => {
+        console.error(e);
+        await dialog.showMessageBox({
+          message: "Failed to import LLM module",
+        });
+      });
+  });
+
   ipcMain.handle("invokePluginFunc", async (event, plugin, method, ...args) => {
-    const plg = pe
-      .getStore()
+    const plg = getStore()
       .getActivePlugins()
       .filter((p) => p.name === plugin)[0];
-    const pluginPath = path.join(
+    const pluginPath = join(
       app.getPath("userData"),
       "plugins",
       plg.name,
-      "dist/module.js",
+      "dist/module.js"
     );
     return await import(
       /* webpackIgnore: true */
@@ -65,54 +99,54 @@ const createMainWindow = () => {
 
   const startURL = isDev
     ? "http://localhost:3000"
-    : `file://${path.join(__dirname, "../out/index.html")}`;
+    : `file://${join(__dirname, "../out/index.html")}`;
 
-  window.loadURL(startURL);
+  mainWindow.loadURL(startURL);
 
-  window.once("ready-to-show", () => window.show());
-  window.on("closed", () => {
+  mainWindow.once("ready-to-show", () => mainWindow.show());
+  mainWindow.on("closed", () => {
     if (process.platform !== "darwin") app.quit();
   });
 
-  window.webContents.openDevTools();
+  mainWindow.webContents.openDevTools();
 };
 
 app.whenReady().then(() => {
   createMainWindow();
   setupPlugins();
 
   ipcMain.handle("userData", async (event) => {
-    return path.resolve(__dirname, "../");
+    return join(__dirname, "../");
   });
 
   ipcMain.handle("downloadModel", async (event, url) => {
     const userDataPath = app.getPath("userData");
-    const destination = path.resolve(userDataPath, modelName);
+    const destination = resolve(userDataPath, modelName);
 
     progress(request(url), {})
       .on("progress", function (state) {
-        window.webContents.send("model-download-update", {
+        mainWindow.webContents.send("model-download-update", {
           ...state,
           modelId: modelName,
         });
       })
       .on("error", function (err) {
-        window.webContents.send("model-download-error", err);
+        mainWindow.webContents.send("model-download-error", err);
       })
       .on("end", function () {
         app.relaunch();
         app.exit();
         // Do something after request finishes
       })
-      .pipe(fs.createWriteStream(destination));
+      .pipe(createWriteStream(destination));
   });
 
   ipcMain.handle("deleteModel", async (event, modelFileName) => {
     const userDataPath = app.getPath("userData");
-    const fullPath = path.join(userDataPath, modelFileName);
+    const fullPath = join(userDataPath, modelFileName);
 
     let result = "NULL";
-    fs.unlink(fullPath, function (err) {
+    unlink(fullPath, function (err) {
       if (err && err.code == "ENOENT") {
         console.info("File doesn't exist, won't remove it.");
         result = "FILE_NOT_EXIST";
@@ -128,50 +162,14 @@ app.whenReady().then(() => {
     return result;
   });
 
-  // TODO: add options for model configuration
-  ipcMain.handle("initModel", async (event, product) => {
-    if (!product.fileName) {
-      await dialog.showMessageBox({
-        message: "Selected model does not have file name..",
-      });
-
-      return;
-    }
-
-    console.info(`Initializing model: ${product.name}..`);
-    import(
-      isDev
-        ? "../node_modules/node-llama-cpp/dist/index.js"
-        : path.resolve(
-            app.getAppPath(),
-            "./../../app.asar.unpacked/node_modules/node-llama-cpp/dist/index.js",
-          )
-    )
-      .then(({ LlamaContext, LlamaChatSession, LlamaModel }) => {
-        const modelPath = path.join(app.getPath("userData"), product.fileName);
-        // TODO: check if file is already there
-        const model = new LlamaModel({
-          modelPath: modelPath,
-        });
-        const context = new LlamaContext({ model });
-        modelSession = new LlamaChatSession({ context });
-        console.info(`Init model ${product.name} successfully!`);
-      })
-      .catch(async (e) => {
-        await dialog.showMessageBox({
-          message: "Failed to import LLM module",
-        });
-      });
-  });
-
   ipcMain.handle("getDownloadedModels", async (event) => {
     const userDataPath = app.getPath("userData");
 
     const allBinariesName = [];
-    var files = fs.readdirSync(userDataPath);
+    var files = readdirSync(userDataPath);
     for (var i = 0; i < files.length; i++) {
-      var filename = path.join(userDataPath, files[i]);
-      var stat = fs.lstatSync(filename);
+      var filename = join(userDataPath, files[i]);
+      var stat = lstatSync(filename);
       if (stat.isDirectory()) {
         // ignore
       } else if (filename.endsWith(".bin")) {
@@ -203,19 +201,19 @@ app.on("window-all-closed", () => {
 });
 
 function setupPlugins() {
-  pe.init({
+  init({
     // Function to check from the main process that user wants to install a plugin
     confirmInstall: async (plugins) => {
       const answer = await dialog.showMessageBox({
         message: `Are you sure you want to install the plugin ${plugins.join(
-          ", ",
+          ", "
         )}`,
         buttons: ["Ok", "Cancel"],
         cancelId: 1,
       });
       return answer.response == 0;
     },
     // Path to install plugin to
-    pluginsPath: path.join(app.getPath("userData"), "plugins"),
+    pluginsPath: join(app.getPath("userData"), "plugins"),
   });
 }

electron/package.json

@@ -0,0 +1,43 @@
+{
+  "name": "jan-electron-app",
+  "version": "1.0.0",
+  "description": "Hello World!",
+  "main": "./build/main.js",
+  "author": "Jan",
+  "license": "MIT",
+  "build": {
+    "appId": "jan.ai.app",
+    "productName": "Jan Desktop App",
+    "asarUnpack": [
+      "node_modules",
+      "core"
+    ],
+    "files": [
+      "out/**/*",
+      "build/**/*",
+      "core"
+    ],
+    "extends": null,
+    "mac": {
+      "type": "distribution"
+    }
+  },
+  "scripts": {
+    "dev": "tsc -p . && electron .",
+    "electron:start": "concurrently \"yarn dev\" \"wait-on http://localhost:3000 && tsc -p . && electron .\"",
+    "electron:build:all": "yarn build && electron-builder build --publish never -mwl"
+  },
+  "dependencies": {
+    "electron-is-dev": "^2.0.0",
+    "pluggable-electron": "^0.6.0",
+    "request": "^2.88.2",
+    "request-progress": "^3.0.0",
+    "node-llama-cpp": "^2.4.1"
+  },
+  "devDependencies": {
+    "concurrently": "^8.2.1",
+    "electron": "^26.2.1",
+    "electron-builder": "^24.6.4",
+    "wait-on": "^7.0.1"
+  }
+}

app/electron/preload.js → electron/preload.ts

@@ -1,31 +1,33 @@
 /* eslint-disable react-hooks/rules-of-hooks */
 // Make Pluggable Electron's facade available to the renderer on window.plugins
+//@ts-ignore
 const useFacade = require("pluggable-electron/facade");
 useFacade();
-
+//@ts-ignore
 const { contextBridge, ipcRenderer } = require("electron");
 
 contextBridge.exposeInMainWorld("electronAPI", {
-  invokePluginFunc: (plugin, method, ...args) =>
+  invokePluginFunc: (plugin: any, method: any, ...args: any[]) =>
     ipcRenderer.invoke("invokePluginFunc", plugin, method, ...args),
 
   userData: () => ipcRenderer.invoke("userData"),
 
-  sendInquiry: (question) => ipcRenderer.invoke("sendInquiry", question),
+  sendInquiry: (question: string) =>
+    ipcRenderer.invoke("sendInquiry", question),
 
-  initModel: (product) => ipcRenderer.invoke("initModel", product),
+  initModel: (product: any) => ipcRenderer.invoke("initModel", product),
 
   getDownloadedModels: () => ipcRenderer.invoke("getDownloadedModels"),
 
   getAvailableModels: () => ipcRenderer.invoke("getAvailableModels"),
 
-  deleteModel: (path) => ipcRenderer.invoke("deleteModel", path),
+  deleteModel: (path: string) => ipcRenderer.invoke("deleteModel", path),
 
-  downloadModel: (url) => ipcRenderer.invoke("downloadModel", url),
+  downloadModel: (url: string) => ipcRenderer.invoke("downloadModel", url),
 
-  onModelDownloadUpdate: (callback) =>
+  onModelDownloadUpdate: (callback: any) =>
     ipcRenderer.on("model-download-update", callback),
 
-  onModelDownloadError: (callback) =>
+  onModelDownloadError: (callback: any) =>
     ipcRenderer.on("model-download-error", callback),
 });

electron/tsconfig.json

@@ -0,0 +1,13 @@
+{
+  "compilerOptions": {
+    "target": "es5",
+    "module": "commonjs",
+    "sourceMap": true,
+    "strict": true,
+    "outDir": "./build",
+    "rootDir": "./",
+    "noEmitOnError": true,
+    "allowJs": true,
+    "typeRoots": ["node_modules/@types"]
+  }
+}

app/app/_components/Preferences.tsx → web/app/_components/Preferences.tsx

@@ -5,7 +5,7 @@ import {
   plugins,
   extensionPoints,
   activationPoints,
-} from "../../electron/core/plugin-manager/execution/index";
+} from "../../../electron/core/plugin-manager/execution/index";
 
 import {
   ChartPieIcon,

app/app/_components/SidebarEmptyHistory/index.tsx → web/app/_components/SidebarEmptyHistory/index.tsx

@@ -1,6 +1,6 @@
 import Image from "next/image";
 import { SidebarButton } from "../SidebarButton";
-import { executeSerial } from "../../../electron/core/plugin-manager/execution/extension-manager";
+import { executeSerial } from "../../../../electron/core/plugin-manager/execution/extension-manager";
 import { ModelManagementService } from "../../../shared/coreService";
 import useCreateConversation from "@/_hooks/useCreateConversation";