feat: Add terminal access

discloud · Dec 25, 2023 · 39bcb76 · 39bcb76
1 parent ed46962
commit 39bcb76
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -216,6 +216,10 @@
         "title": "%command.apps.stop%",
         "icon": "$(debug-stop)"
       },
+      {
+        "command": "discloud.apps.terminal",
+        "title": "%command.apps.terminal%"
+      },
       {
         "command": "discloud.domain.refresh",
         "title": "%command.domain.refresh%",
@@ -673,6 +677,10 @@
           "command": "discloud.apps.stop",
           "when": "never"
         },
+        {
+          "command": "discloud.apps.terminal",
+          "when": "never"
+        },
         {
           "command": "discloud.domain.refresh",
           "when": "config.discloud.token"
@@ -853,6 +861,11 @@
           "group": "0",
           "when": "view == discloud-apps && discloudAppLength"
         },
+        {
+          "command": "discloud.apps.terminal",
+          "group": "1",
+          "when": "view == discloud-apps && viewItem =~ /online\":true/"
+        },
         {
           "command": "discloud.upload",
           "group": "inline",

diff --git a/package.nls.json b/package.nls.json
@@ -23,6 +23,7 @@
   "command.apps.start": "Start app",
   "command.apps.status": "Refresh app status",
   "command.apps.stop": "Stop app",
+  "command.apps.terminal": "Use the terminal",
   "command.domain.refresh": "Refresh domain list",
   "command.subdomain.refresh": "Refresh subdomain list",
   "command.team.backup": "Backup team app",

diff --git a/package.nls.pt.json b/package.nls.pt.json
@@ -23,6 +23,7 @@
   "command.apps.start": "Iniciar app",
   "command.apps.status": "Atualizar estado do app",
   "command.apps.stop": "Parar app",
+  "command.apps.terminal": "Usar o terminal",
   "command.domain.refresh": "Atualizar lista de domínios",
   "command.subdomain.refresh": "Atualizar lista de subdomínios",
   "command.team.backup": "Backup app de equipe",

diff --git a/src/commands/apps/terminal.ts b/src/commands/apps/terminal.ts
@@ -0,0 +1,28 @@
+import { Uri, window } from "vscode";
+import { TaskData } from "../../@types";
+import extension from "../../extension";
+import AppTreeItem from "../../structures/AppTreeItem";
+import Command from "../../structures/Command";
+
+export default class extends Command {
+  constructor() {
+    super();
+  }
+
+  async run(task: TaskData, item?: AppTreeItem) {
+    if (!item) {
+      const picked = await this.pickAppOrTeamApp(task, { showOther: false });
+      item = picked.app;
+    }
+
+    const terminal = window.createTerminal({
+      env: { DISCLOUD_TOKEN: extension.token },
+      iconPath: item.iconPath as Uri,
+      name: typeof item.label === "string" ? item.label : item.appId,
+    });
+
+    terminal.show();
+
+    terminal.sendText(`npx discloud-cli terminal ${item.appId}\nexit`);
+  }
+}
diff --git a/src/structures/AppChildTreeItem.ts b/src/structures/AppChildTreeItem.ts
@@ -1,13 +1,13 @@
 import { TreeItem } from "vscode";
 import { AppTreeItemData } from "../@types";
-import { getIconPath } from "../util";
+import { JSONparse, getIconPath } from "../util";
 
 export default class AppChildTreeItem extends TreeItem {
   iconName?: string;
   readonly appId: string;
   readonly children?: Map<string, TreeItem>;
 
-  constructor(options: AppTreeItemData & { appId: string }) {
+  constructor(options: AppTreeItemData & { appId: string, online: boolean }) {
     super(options.label, options.collapsibleState);
     this.description = options.description;
     this.iconName = options.iconName;
@@ -22,6 +22,11 @@ export default class AppChildTreeItem extends TreeItem {
         this.children = new Map(options.children.map(child => [`${child.label}`, child]));
       }
     }
+
+    const values = this.contextValue.match(/([^\W]+)(?:\W(.*))?/) ?? [];
+    const json = values[2] ? JSONparse(values[2]) : null;
+
+    this.contextValue = `${values[1]}.${JSON.stringify(Object.assign({}, json, { online: options.online }))}`;
   }
 
   contextValue = "ChildTreeItem";

diff --git a/src/structures/AppTreeItem.ts b/src/structures/AppTreeItem.ts
@@ -2,7 +2,7 @@ import { t } from "@vscode/l10n";
 import { LogOutputChannel, TreeItemCollapsibleState, Uri, window } from "vscode";
 import { ApiVscodeApp, AppTreeItemData } from "../@types";
 import extension from "../extension";
-import { calculatePercentage, getIconName, getIconPath } from "../util";
+import { JSONparse, calculatePercentage, getIconName, getIconPath } from "../util";
 import AppChildTreeItem from "./AppChildTreeItem";
 import BaseTreeItem from "./BaseTreeItem";
 
@@ -49,6 +49,11 @@ export default class AppTreeItem extends BaseTreeItem<AppChildTreeItem> {
     this.iconPath = getIconPath(this.iconName);
     this.isOnline = this.iconName === "on";
 
+    const values = this.contextValue.match(/([^\W]+)(?:\W(.*))?/) ?? [];
+    const json = values[2] ? JSONparse(values[2]) : null;
+
+    this.contextValue = `${values[1]}.${JSON.stringify(Object.assign({}, json, { online: this.isOnline }))}`;
+
     const showAvatar = extension.config.get<string>("app.show.avatar.instead.status");
 
     switch (showAvatar) {
@@ -90,6 +95,7 @@ export default class AppTreeItem extends BaseTreeItem<AppChildTreeItem> {
         description: t("container"),
         iconName: "container",
         appId: this.appId,
+        online: this.isOnline,
       }));
 
     if ("memory" in data)
@@ -98,6 +104,7 @@ export default class AppTreeItem extends BaseTreeItem<AppChildTreeItem> {
         description: t("label.ram"),
         iconName: "ram",
         appId: this.appId,
+        online: this.isOnline,
       }));
 
     if ("cpu" in data)
@@ -106,6 +113,7 @@ export default class AppTreeItem extends BaseTreeItem<AppChildTreeItem> {
         description: t("label.cpu"),
         iconName: "cpu",
         appId: this.appId,
+        online: this.isOnline,
       }));
 
     if ("ssd" in data)
@@ -114,6 +122,7 @@ export default class AppTreeItem extends BaseTreeItem<AppChildTreeItem> {
         description: t("label.ssd"),
         iconName: "ssd",
         appId: this.appId,
+        online: this.isOnline,
       }));
 
     if ("netIO" in data)
@@ -122,6 +131,7 @@ export default class AppTreeItem extends BaseTreeItem<AppChildTreeItem> {
         description: t("network"),
         iconName: "network",
         appId: this.appId,
+        online: this.isOnline,
       }));
 
     if ("last_restart" in data)
@@ -130,6 +140,7 @@ export default class AppTreeItem extends BaseTreeItem<AppChildTreeItem> {
         description: t("last.restart"),
         iconName: "uptime",
         appId: this.appId,
+        online: this.isOnline,
       }));
 
     this.collapsibleState =