Merge branch 'main' into dependabot/npm_and_yarn/postcss-8.4.31

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

README.md

@@ -7,29 +7,16 @@
 </p>
 
 <h3 align="center"><b>Firecamp</b></h3>
-<p align="center"><b>dx-first open-source API devtool</b></p>
+<h4 align="center"><b>Open Source Postman Alternative</b></h4>
 
 <p align="center">
    <a href="https://discord.gg/8hRaqhK"><img alt="Discord online members" src="https://badgen.net/discord/members/8hRaqhK?color=5865F2&label=Discord&style=for-the-badge" /></a>
    <a href="https://github.com/firecamp-dev/firecamp/stargazers"><img src="https://img.shields.io/github/stars/firecamp-dev/firecamp" alt="GitHub Stars"></a>
-   <a href="https://github.com/firecamp-dev/firecamp/blob/main/LICENSE"><img src="https://img.shields.io/badge/license-AGPLv3-purple" alt="License"></a>
    <a href="https://github.com/firecamp-dev/firecamp/pulse"><img src="https://img.shields.io/github/commit-activity/y/firecamp-dev/firecamp" alt="Commits-per-month"></a>
 </p>
 
 <br/>
 
-> **🚧 We're currently working on the desktop application which can be found on the [feat/62-desktop](https://github.com/firecamp-dev/firecamp/tree/feat/62-desktop) branch.**
->
-> **[Read more 👀](https://github.com/firecamp-dev/firecamp/issues/62)**
-
-<br/>
-
-<p align="center">
-  <a href="https://firecamp.dev">
-  <img alt ="firecamp-cover" src="https://github.com/firecamp-dev/firecamp/assets/5078921/1ef25fd3-bf97-4bd0-b440-7c1f4ef3eb22"/>
-  </a>
-</p>
-
 # Firecamp
 
 Firecamp is a dx-first API development platform that helps developers design, develop, test, and document their APIs effortlessly. With a user-friendly interface and a range of powerful features, it streamlines the API development workflow and enhances collaboration among team members.
@@ -40,8 +27,23 @@ Firecamp is a dx-first API development platform that helps developers design, de
 - ⛺ build APIs faster without switching between tools and apps. documentation, cli, ci/cd under one roof <br/>
 
 
-👉 live at https://firecamp.dev
+👉 Web: https://firecamp.dev
 
+## Download Firecamp Desktop Application
+
+1. [Firecamp for MacOS Intel](https://fcamp.co/mac)
+2. [Firecamp for  MacOS Silicon](https://fcamp.co/mac-silicon)
+3. [Firecamp for Windows](https://fcamp.co/win-x64)
+4. [Firecamp for Linux AppImage](https://fcamp.co/linux-appImage)
+
+<br/>
+
+
+<p align="center">
+  <a href="https://firecamp.dev">
+  <img alt ="firecamp-cover" src="https://github.com/firecamp-dev/firecamp/assets/5078921/1ef25fd3-bf97-4bd0-b440-7c1f4ef3eb22"/>
+  </a>
+</p>
 
 ## 🚀 Getting started with Firecamp
 To get started with Firecamp, follow these steps:
@@ -96,9 +98,6 @@ There is a dedicated GUI playground for each API protocol you would be using for
 
 ## 🛣️  Roadmap
 
-
-💻  Desktop Apps: Get the Desktop app for your preferred OS/platform <br/>
-
 🛰️ Self-hosted: Host Firecamp on your own server
 
 🔁 CLI & CI/CD: Run API Collection Tests in the terminal or set in CI/CD pipeline <br/>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "firecamp",
-  "version": "3.2.3",
+  "version": "3.3.0-beta.3",
   "private": true,
   "description": "DX-first API devtool",
   "main": "packages/firecamp-desktop-app/dist/services/Main",

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