Merge pull request #164 from firecamp-dev/feat/62-desktop #62

Firecamp Desktop Apps

Author: Nishchit14

.env.vault

@@ -2,7 +2,6 @@
 #/         cloud-agnostic vaulting standard         /
 #/   [how it works](https://dotenv.org/env-vault)   /
 #/--------------------------------------------------/
-DOTENV_VAULT=vlt_a7698f74e5365a7834b9f3a62cc555169343e436f2cde5d317afa8c4adfa4eda
 
 # development
 DOTENV_VAULT_DEVELOPMENT="Yhme4DuEh1lu1ysCEEfwHtP+Qbxfa8RWkV3lTacXbO9PYbAVGm3jKDTt5i7D/xNp17s18Vqe4S8iqa3mdE0odWBpUuZG8JhvdCw2elMoLFq2uKU0zeeWIP2camdOogxKa6hmCJni58Re3d0OfIMDpCew28MzrSRSnGYLDqEKadhDkf8k5Ei06V/yUy4NQZ6Xj9wzKWRTC6eU4i9O/+puWHJCg0HUrx6eb2/m8tb1A0WSuaMIIjmk7zpzpeviyD+9J+4jlzxRkGP43W2mmBpHyQveBBe13OYIxH3rjL1a13fn2nHLvrOk3N6LLak/ITLekw3NeHakuMv7BmL8l+J5Msua89wqJuMIN8DxXaUJYFysxMBfuWQYcVOBnWoEW/XCZwptOgV/xK3EpcanAH+YdjNa1LALVxrlGNICNflfvzmKbVtp6yCiimaHKHy50Z+mCV2FGBHYKR1R+LONWvftKBOgOvlMhaqTDGAsGMe7ocyBYKYocr5NwBwwSbUXsTWhV6G2mRwQ/V7D7nvHot8QLBNbW6aPUjroUkQkcUjvmeKtZkmGIWMw0i1cdSwQjpiGTgKYqu0p6i5gb3Dgf6ffLI3ZuMg+URNvpOyVFIEBfR24s5Q6cw7tVsJv6FyH52KJJNQf9A3MiiHTLhh51NaQNSso/FG8v+rKKhU64fhKLw0Xlx+wuIPS7WoygbdtjAQ0IwwsMsGOmrCAcWo20NUe6s2x6BXHqiuvyYZBrekSIKK0JXrr8w94Mum8Ov6k6J9yVubgjyozQCP4MNnFrl4q7GiBDnoNBrZozVhtqDWOj7hFMwTMek13+EE4LW9Lg037anQqLcaqi2ut4JDaPaLPfQOTkksRZIsPeAv3Kx40bZbcOyMl0FH4szPZ6acoS0/CodAr+srg8KiRb0y8onLjV1cHQUjCeezhK9mu04mQ47WbFQXDrY2VUFhU6dOfTu+AI8MS1WtWSBy+nVlUysqud6pLV1/IWbZABfXU4eRk5JPp3/MfgYmzlTeDgbSwEBxRs3sdZ3FoT6ianSZoOzbe9zoPTjbmqIr/49VqAZjUxDt4UoM1G56xVlq/cWb/P/KhkykGlI9QO9H+cchwbXid/hvNoOIlP2yHoK5kEMWC10fkgbKUjBxAd33bpRgW8D43i0WUzZcrE/n0XTNd9JMahMflsdQNPY546l+6Dp27vz7QwRrkpMqCumQnZ2ncKQ94Gu79IOwvU8h4fLLYi97mppqUFV+mQhUBjy4NJUsgL+1dAYk0zKcAS6u8vUD8CIPc6U4lPfMzqIztGfzVfr4NpLs+/JGpyMNlMQJnJrhgQqrcqYxe2mGXLypG7z1nnT9s64bEVjC/L9sAXkvi+3QV144vOwtmlwuxqMb63c6TKwbtPVt70LygFjbL4WQK5EawAMrSlQecfjCfrnaSGzo06y6TdtysCZs7JMeq43TLM8RuTKy4qAXx3Z2D6ahVh3u0Bw/1SV8CU9kgB1YRWJV1VUwZtHSE7gHnXobH/Y318j8EU+EJBLiSSwLS/tzZCsFb38+jHkt2scYJAAPwjC8WR26TId7LLskAMwMSWZ8LD/WnXpmY6f8S4t7qRh338A=="
@@ -19,3 +18,8 @@ DOTENV_VAULT_STAGING_VERSION=5
 # production
 DOTENV_VAULT_PRODUCTION="fLx8FGdykYJ+GsdgQdn2df42Azv6lBP9KBGItwplX2sO6nYSZJSJifOWLMV4Wl8R8JRrrDjDzwr6lQTHfsvz36p3hF0JeXJbgFa1MptMXm8n/KucJx7bRFwyouPcFE+aoRHq8HpjsI4koG1PRHg8u/BwglBIAV9VJ6UhkGxYxek6X+v/u1OxpHfXj18WPQJ/adsEaG0UAZ0PqkP+9a6UX6meMdcSs0faWGTpJ4OOP5vm4lDbRE+55ekGBO1/D5kFvpfyXdM4GyvejRZIDMOQ3n7xPiHZxCVmMu4x2RUPdAf3Zmeq0HTnbjfXInCFaBtguFwYTcbLsEOhIczW9hVU/jMv8a8DBdF2PRJAHmvAhFD+UGwcsjlzF0oq8jCwwAlXJXLd3I/SyWTUWyLRoI9H6iT4Q78MUa3ZGldU/FKB9gMMawLOfk3Bit2kPrb4UDwCw/hjRG1e8RQJJbB5ExKj9tkL7xalk1HHsr8dAKfv1eSkYQ49XYcg3JX/CgAbRhUoOlyLHMdFG5JjxRHp19urlaRHfXn77ByyganeOKqMjybaAv5B032BGc1m4K2arwPnnnTJsHXo2z4y1QvS0xCG+igHYF3cS1mHPIcFE+qc07SupkzCyrilFdqLIIPQEquqDWm4tBSIQdudS6tWsr4dyS9IJIFpANTVhf24w4AfBRqKaqQAD9e1mFzKpgBlOXmSMMNw/8jFQqSQdEBaknuoLcku4WJCxGqAjm520XC44EUXxpNI5MLx+mNQLW91OveR4p3jbbgkhj5E2PGVjLFBPMQDom7xGYpyQvo2o3j1ko+z4kIOkRClmbiifzJ1MONXAJEcczhMkye5eWfYPp9mSZBbfmXP212XS6c1toW1gFDHvMLc0xM8rQ5xshY473qGGz5QNfsDgEv6+LVAMWXk835NHwZr50P3MBxhBDIjtFWKghfX65GHFdCFHEYiO2pPqQ0FT3+al1KCHZ9SK7Vo951r1a4YOzSGcNpTYrsIyMZ4I18upEQUq8AM5FahjowcaZhSmwsz0fp7VaE6pPkgejHqzYvKcIuLMn379y1MydhR5W1VFwd6sAyHWP6NVXyWmA6sLl7i3nbzM83EkIRhZBXVk+MBQVO26lBWFe+8EiNSJMBcodmB8sibh/G9XJ4PXCVu5x7aErqNSEHpvPsqdUQOgrqJux7F8CdtiQF23xVlOw0ZFybhB2yPhLH8EAk1voAyo5KrHgv59o/e3keqzJIPIIkzaRyaRXRB9FF29HlJBF70af7ymOLgO9WnWE+RwPacxEPc3zEuEHNtOMXsDM2cpCZQmwFduoyCvelyULjaQK/MjW058DvvsT3Lw02yXiE1nWluLcSDe2j/QXx+s5Lr395i4LhHW9f/qlEhZVD3fJNr610UuAYe5OH9XOXW1/0g9VwEbHJ7I1hL6MLFx8h5c/JkuI62CnQYPVMKnQmR44jwR3cRseXRi/MJ44BjFxwLijEGu3cNgG4UIUH3X5VpvDZkjMiJ47hn2e8vpn1u/XNOTWeY1PruVlwhmXOVe8vVZybOARXm/1q9DT0fcHB5OQ=="
 DOTENV_VAULT_PRODUCTION_VERSION=13
+
+#/----------------settings/metadata-----------------/
+DOTENV_VAULT="vlt_a7698f74e5365a7834b9f3a62cc555169343e436f2cde5d317afa8c4adfa4eda"
+DOTENV_API_URL="https://vault.dotenv.org"
+DOTENV_CLI="npx dotenv-vault@latest"

.github/actions/spelling/allow.txt

@@ -3,3 +3,27 @@ https
 ssh
 ubuntu
 workarounds
+tauri
+portpicker
+Avenir
+osx
+serde
+Enume
+OPPT
+Yirfjyjaujc
+heroku
+nel
+tne
+cloudflare
+vegur
+nosniff
+ratelimit
+icns
+notarisation
+Ecies
+ecies
+pbk
+encryptio
+keyval
+fce
+

.github/actions/spelling/expect.txt

@@ -1,6 +1,7 @@
 abksi
 adpcm
 ajv
+APPIMAGE
 applixware
 arraybufferview
 asds
@@ -52,6 +53,7 @@ dssc
 dts
 duplicat
 eamodio
+eciesjs
 ecmascript
 edt
 EGraph
@@ -229,6 +231,7 @@ ROfb
 Rpbjpvc
 rsd
 rtls
+rustc
 saf
 salesforce
 salesforcecli
@@ -268,6 +271,7 @@ timestamptz
 TItem
 tocstop
 TODOs
+togglefullscreen
 Tokenfrom
 TOODs
 tooltiptext

.gitignore

@@ -21,6 +21,7 @@ cypress/videos
 *.zip
 *.crx
 *.pem
+!x-dev-certs/**/*.pem
 update.xml
 .idea
 package-lock.json

packages/firecamp-agent-manager/src/chrome.ts

@@ -2,7 +2,7 @@
 
 import { IRest, IRestResponse, TId } from '@firecamp/types';
 import { _misc } from '@firecamp/utils';
-import RestExecutor from '@firecamp/rest-executor/dist/esm';
+import RestExecutor from '@firecamp/rest-executor';
 
 // Holds the rest executors instance to handle
 const restExecutors: { [key: TId]: RestExecutor } = {};

packages/firecamp-agent-manager/src/index.ts

@@ -30,15 +30,19 @@ export const send = async (
   testResult: any;
   scriptErrors: any[];
 }> => {
+  const requestId = request.__ref.id;
+  let res: any;
   switch (firecampAgent) {
     case EFirecampAgent.Desktop:
-      return window.fc.restExecutor.send(request, variables);
+      //@ts-ignore
+      return await window.__electron__.http.send(request, variables);
     case EFirecampAgent.Extension:
-      return extension.send(request, variables);
     case EFirecampAgent.Web:
       restExecutors[request.__ref.id] = new RestExecutor();
       //@ts-ignore
-      return await restExecutors[request.__ref.id].send(request, variables);
+      res = restExecutors[request.__ref.id].send(request, variables);
+      delete restExecutors[requestId];
+      return res;
     case EFirecampAgent.Cloud:
       if (request.body?.type == ERestBodyTypes.FormData) {
         const body = await parseBody(request.body);
@@ -76,14 +80,13 @@ export const cancel = async (
 ): Promise<void> => {
   switch (firecampAgent) {
     case EFirecampAgent.Desktop:
-      return window.fc.restExecutor.cancel(requestId);
-    case EFirecampAgent.Extension:
-      return extension.cancel(requestId);
+      /** @ts-ignore */
+      return window.__electron__.http.stop(requestId);
+    // case EFirecampAgent.Extension:
+    //   return extension.cancel(requestId);
     case EFirecampAgent.Web:
       restExecutors[requestId].cancel();
-
       delete restExecutors[requestId];
-
       return;
     case EFirecampAgent.Cloud:
       const response = await axios.get(

packages/firecamp-electron/.gitignore

@@ -0,0 +1,11 @@
+.idea/*
+.nyc_output
+.vscode
+build
+node_modules
+test
+src/**.js
+coverage
+*.log
+!src/declarations.d.ts
+dev-app-update.yml

packages/firecamp-electron/.npmrc

@@ -0,0 +1 @@
+shamefully-hoist=true

packages/firecamp-electron/assets/entitlements.mac.plist

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+    <true/>
+    <key>com.apple.security.cs.allow-jit</key>
+    <true/>
+  </dict>
+</plist>

packages/firecamp-electron/assets/icons/mac/128.png

@@ -0,0 +1,151 @@
+{
+  "name": "@firecamp/electron",
+  "productName": "Firecamp",
+  "version": "3.3.0-beta.2",
+  "description": "The Firecamp Desktop Application",
+  "main": "build/main.js",
+  "private": true,
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/firecamp-dev/firecamp.git",
+    "directory": "packages/firecamp-electron"
+  },
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "start": "pnpm build && electron .",
+    "build": "tsc",
+    "release": "pnpm build && electron-builder -mlw --publish always",
+    "pack": "pnpm build && electron-builder --dir -c.compression=store -c.mac.identity=null",
+    "postinstall": "electron-builder install-app-deps"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "AGPLv3",
+  "dependencies": {
+    "@firecamp/rest-executor": "workspace:*",
+    "@firecamp/scripts": "workspace:*",
+    "@firecamp/socket.io-executor": "workspace:*",
+    "@firecamp/ws-executor": "workspace:*",
+    "electron-is-dev": "^2.0.0",
+    "electron-log": "^5.0.0",
+    "electron-notarize": "^1.2.2",
+    "electron-updater": "^6.1.4",
+    "react-fast-compare": "^3.2.2"
+  },
+  "devDependencies": {
+    "@types/node": "^20.8.9",
+    "electron": "^27.1.2",
+    "electron-builder": "^24.13.3"
+  },
+  "build": {
+    "appId": "com.firecamp.electron",
+    "generateUpdatesFilesForAllChannels": true,
+    "productName": "Firecamp",
+    "afterSign": "scripts/notarize.js",
+    "files": [
+      "./build/**/*",
+      "package.json",
+      {
+        "from": "../../build/production",
+        "to": "app"
+      }
+    ],
+    "directories": {
+      "buildResources": "assets"
+    },
+    "dmg": {
+      "sign": false
+    },
+    "mac": {
+      "artifactName": "Firecamp-${version}.${arch}.${ext}",
+      "executableName": "Firecamp",
+      "type": "distribution",
+      "target": {
+        "target": "default",
+        "arch": [
+          "x64",
+          "arm64"
+        ]
+      },
+      "category": "public.app-category.developer-tools",
+      "entitlements": "assets/entitlements.mac.plist",
+      "entitlementsInherit": "assets/entitlements.mac.plist",
+      "icon": "icons/mac/512.png",
+      "hardenedRuntime": true,
+      "gatekeeperAssess": false,
+      "publish": [
+        {
+          "provider": "github",
+          "owner": "firecamp-dev",
+          "repo": "firecamp"
+        },
+        {
+          "provider": "spaces",
+          "name": "firecamp",
+          "region": "ams3",
+          "channel": "latest",
+          "path": "/electron-apps/mac",
+          "acl": "public-read"
+        }
+      ]
+    },
+    "linux": {
+      "artifactName": "Firecamp-${version}.${arch}.${ext}",
+      "executableName": "Firecamp",
+      "icon": "icons/mac/512.png",
+      "category": "Development",
+      "target": {
+        "target": "AppImage",
+        "arch": [
+          "x64"
+        ]
+      },
+      "publish": [
+        {
+          "provider": "github",
+          "owner": "firecamp-dev",
+          "repo": "firecamp"
+        },
+        {
+          "provider": "spaces",
+          "name": "firecamp",
+          "region": "ams3",
+          "channel": "latest",
+          "path": "/electron-apps/linux",
+          "acl": "public-read"
+        }
+      ]
+    },
+    "nsis": {
+      "oneClick": false,
+      "allowToChangeInstallationDirectory": true
+    },
+    "win": {
+      "artifactName": "Firecamp-${version}.${arch}.${ext}",
+      "executableName": "Firecamp",
+      "icon": "icons/win/logo.ico",
+      "target": {
+        "target": "nsis",
+        "arch": [
+          "x64"
+        ]
+      },
+      "verifyUpdateCodeSignature": false,
+      "publish": [
+        {
+          "provider": "github",
+          "owner": "firecamp-dev",
+          "repo": "firecamp"
+        },
+        {
+          "provider": "spaces",
+          "name": "firecamp",
+          "region": "ams3",
+          "channel": "latest",
+          "path": "/electron-apps/win",
+          "acl": "public-read"
+        }
+      ]
+    }
+  }
+}

packages/firecamp-electron/assets/icons/mac/256.png

@@ -0,0 +1,29 @@
+const { notarize } = require('electron-notarize');
+
+exports.default = async function notarizing(context) {
+  console.log('notarisation started manually.');
+  const { electronPlatformName, appOutDir } = context;
+  if (
+    electronPlatformName !== 'darwin' ||
+    !process.env.AID ||
+    !process.env.APASS
+  ) {
+    console.log(
+      'not running notarize. platform is not macos or environment not set up.'
+    );
+    return;
+  }
+
+  const appName = context.packager.appInfo.productFilename;
+
+  try {
+    return await notarize({
+      appBundleId: process.env.appBundleId,
+      appPath: `${appOutDir}/${appName}.app`,
+      appleId: process.env.AID,
+      appleIdPassword: process.env.APASS,
+    });
+  } catch (e) {
+    console.log('notarize error', e);
+  }
+};

packages/firecamp-electron/assets/icons/mac/512.png

@@ -0,0 +1,33 @@
+const path = require('path');
+const isDev = require('electron-is-dev');
+
+let trayIcon: string;
+let appIcon: string;
+
+// dev environment tray icon paths
+if (isDev) {
+  if (process.platform === 'linux')
+    trayIcon = path.join(__dirname, '../assets/icons/mac/64.png'); //22x22
+  else if (process.platform === 'darwin')
+    trayIcon = path.join(__dirname, '../assets/icons/mac/64.png'); // 16x16
+  else if (process.platform === 'win32')
+    trayIcon = path.join(__dirname, '.../assets/icons/mac/64.png'); //32x32
+} else if (process.platform === 'linux')
+  // prod. environment tray icon paths
+  trayIcon = path.join(process.resourcesPath, 'assets/icons/mac/64.png');
+// 22x22
+else if (process.platform === 'darwin')
+  trayIcon = path.join(process.resourcesPath, 'assets/icons/images/16x16.png');
+// 16x16
+else if (process.platform === 'win32')
+  trayIcon = path.join(process.resourcesPath, 'assets/icons/mac/64.png'); // 32x32
+
+// App icon paths
+if (process.platform === 'linux')
+  appIcon = path.join(__dirname, '../assets/icons/mac/512x512.png');
+else if (process.platform === 'darwin')
+  appIcon = path.join(__dirname, '../assets/mac/icon.icns');
+else if (process.platform === 'win32')
+  appIcon = path.join(__dirname, '../assets/icons/win/icon.ico');
+
+export { appIcon, trayIcon };