Merge pull request #58 from GalaxyPay/dev

chore: release version 3.2.4

Author: acfunk

Diff for: .github/workflows/go.yml

@@ -266,5 +266,5 @@ jobs:
         uses: ncipollo/release-action@v1
         with:
           allowUpdates: true
-          tag: v3.2.3
+          tag: v3.2.4
           artifacts: "Output/*"

Diff for: FUNC.iss

@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "FUNC"
-#define MyAppVersion "3.2.3"
+#define MyAppVersion "3.2.4"
 #define MyAppPublisher "Galaxy Pay, LLC"
 #define MyAppPublisherURL "https://galaxy-pay.com"
 #define MyPublishPath "publish"

Diff for: FUNC/Models/NodeStatus.cs

@@ -5,7 +5,6 @@ public class NodeStatus
         public required string ServiceStatus { get; set; }
         public required int Port { get; set; }
         public required string Token { get; set; }
-        public required bool P2p { get; set; }
         public string? TelemetryStatus { get; set; }
         public RetiStatus? RetiStatus { get; set; }
     }

Diff for: FUNC/Node.cs

@@ -18,7 +18,6 @@ public static async Task<NodeStatus> Get(string name)
             int port = 0;
             string token = string.Empty;
             try { token = File.ReadAllText(Path.Combine(Utils.NodeDataParent(name), name, "algod.admin.token")); } catch { }
-            bool p2p = false;
             string? configText = null;
             try { configText = File.ReadAllText(Path.Combine(Utils.NodeDataParent(name), name, "config.json")); } catch { }
             if (configText != null)
@@ -27,11 +26,6 @@ public static async Task<NodeStatus> Get(string name)
                 var endpointAddressToken = config.GetValue("EndpointAddress");
                 string endpointAddress = endpointAddressToken?.Value<string>() ?? ":0";
                 port = int.Parse(endpointAddress[(endpointAddress.IndexOf(":") + 1)..]);
-                var enableP2PToken = config.GetValue("EnableP2P");
-                var enableP2PHybridModeToken = config.GetValue("EnableP2PHybridMode");
-                bool enableP2P = enableP2PToken != null && enableP2PToken.Value<bool>();
-                bool enableP2PHybridMode = enableP2PHybridModeToken != null && enableP2PHybridModeToken.Value<bool>();
-                if (enableP2P || enableP2PHybridMode) p2p = true;
             }
 
             string sc = string.Empty;
@@ -56,7 +50,6 @@ public static async Task<NodeStatus> Get(string name)
                 ServiceStatus = serviceStatus,
                 Port = port,
                 Token = token,
-                P2p = p2p,
             };
 
             if (name == "algorand")

Diff for: README.md

@@ -95,7 +95,7 @@ sudo rm -rf /usr/share/func
 
 ### Configure
 
-- Change your node's Port, DNS Bootstrap, and P2P settings
+- Change your node's Port, DNS Bootstrap, and BaseLoggerDebugLevel
 
 ### Enable/Disable Telemetry
 

Diff for: create-package-deb.sh

@@ -1,6 +1,6 @@
 rm -r Output
 
-PKG=Output/func_3.2.3_linux-$1
+PKG=Output/func_3.2.4_linux-$1
 
 mkdir -p $PKG/lib/systemd/system
 mkdir -p $PKG/opt/func

Diff for: create-package-pkg.sh

@@ -5,4 +5,4 @@ pkgbuild --root publish \
     --install-location /opt/func \
     --scripts pkg/scripts \
     --identifier func.app \
-    Output/func_3.2.3_darwin-$1.pkg
+    Output/func_3.2.4_darwin-$1.pkg

Diff for: deb/amd64/control

@@ -1,5 +1,5 @@
 Package: func
-Version: 3.2.3
+Version: 3.2.4
 Section: base
 Priority: optional
 Architecture: amd64

Diff for: deb/arm64/control

@@ -1,5 +1,5 @@
 Package: func
-Version: 3.2.3
+Version: 3.2.4
 Section: base
 Priority: optional
 Architecture: arm64

Diff for: webui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "func-webui",
-  "version": "3.2.3",
+  "version": "3.2.4",
   "scripts": {
     "dev": "vite",
     "build": "vite build",

Diff for: webui/src/components/Config.vue

@@ -28,10 +28,15 @@
           v-model="config.DNSBootstrapID"
           rows="2"
         />
-        <v-checkbox-btn v-model="enableP2P" label="Enable P2P" />
+        <v-checkbox-btn
+          v-model="enableP2P"
+          label="Enable P2P"
+          :disabled="!enableP2P"
+        />
         <v-checkbox-btn
           v-model="enableP2PHybridMode"
           label="Enable P2P Hybrid Mode"
+          :disabled="!enableP2PHybridMode"
         />
       </v-container>
       <v-card-actions>

Diff for: webui/src/components/Manage.vue

@@ -48,7 +48,6 @@
         />
         <template
           v-if="
-            store.isIncentiveReady &&
             nodeStatus.retiStatus &&
             (status === 'Running' ||
               ['Running', 'Stopped'].includes(

Diff for: webui/src/components/Node.vue

@@ -67,7 +67,7 @@
             class="mt-4"
             :name="name"
             :node-status="nodeStatus"
-            @get-status="getNodeStatus()"
+            @get-status="getAllStatus()"
           />
         </v-col>
         <template v-if="nodeStatus.serviceStatus === 'Running'">
@@ -194,35 +194,6 @@
       @part-details="(val) => (partDetails = val)"
       @generating-key="(val) => (generatingKey = val)"
     />
-    <v-container fluid v-if="peers">
-      <v-divider />
-      <v-card-title>Peers ({{ peers.length }})</v-card-title>
-      <v-card-text>
-        <div v-for="item in peers">
-          {{ item.address }}
-          <span>
-            <v-icon
-              v-if="item.network === 'p2p'"
-              class="ml-1"
-              size="small"
-              color="primary"
-              :icon="mdiLanConnect"
-            />
-            <v-tooltip activator="parent" location="right" text="P2P" />
-          </span>
-          <span>
-            <v-icon
-              v-if="!item.outgoing"
-              class="ml-1"
-              size="small"
-              color="success"
-              :icon="mdiArrowLeft"
-            />
-            <v-tooltip activator="parent" location="right" text="Inbound" />
-          </span>
-        </div>
-      </v-card-text>
-    </v-container>
     <v-container
       class="text-caption text-grey text-center"
       v-show="nodeStatus?.serviceStatus === 'Running'"
@@ -235,17 +206,12 @@
 
 <script setup lang="ts">
 import FUNC from "@/services/api";
-import { NodeStatus, Peer } from "@/types";
+import { NodeStatus } from "@/types";
 import { checkCatchup, delay } from "@/utils";
-import {
-  mdiArrowLeft,
-  mdiInformation,
-  mdiLanConnect,
-  mdiOpenInNew,
-  mdiRefresh,
-} from "@mdi/js";
+import { mdiInformation, mdiOpenInNew, mdiRefresh } from "@mdi/js";
 import { Algodv2 } from "algosdk";
 
+const FuncApi = FUNC.api;
 const store = useAppStore();
 const props = defineProps({ name: { type: String, required: true } });
 const nodeStatus = ref<NodeStatus>();
@@ -324,76 +290,68 @@ const status = computed(() =>
     : "Unknown"
 );
 
-const algodClient = computed(() => {
-  if (!nodeStatus.value?.token) return undefined;
-  return new Algodv2(
-    nodeStatus.value.token,
-    `http://${location.hostname}`,
-    nodeStatus.value.port
-  );
-});
-
-watch(
-  () => algodStatus.value,
-  (val) => {
-    if (props.name === "Algorand" && val?.["last-round"] >= 46512890)
-      store.isIncentiveReady = true;
-  }
-);
+const algodClient = ref<Algodv2>();
 
 onBeforeMount(async () => {
-  await getNodeStatus();
+  await getAllStatus();
 });
 
-const isMounted = ref(true);
 onBeforeUnmount(() => {
-  isMounted.value = false;
+  refreshing = false;
 });
 
 let refreshing = false;
 
 async function autoRefresh() {
   if (refreshing) return;
   refreshing = true;
-  while (nodeStatus.value?.serviceStatus === "Running") {
+  while (refreshing) {
+    await getAlgodStatus();
     await delay(1200);
-    if (!isMounted.value) return;
-    await getNodeStatus();
   }
-  refreshing = false;
 }
 
-let restartAttempted = false;
-
-const peers = ref<Peer[]>();
+async function getAllStatus() {
+  await getNodeStatus();
+  await getAlgodStatus();
+}
 
 async function getNodeStatus() {
   try {
-    const resp = await FUNC.api.get(props.name);
+    const oldStatus: NodeStatus | undefined = nodeStatus.value
+      ? JSON.parse(JSON.stringify(nodeStatus.value))
+      : undefined;
+    const resp = await FuncApi.get(props.name);
     nodeStatus.value = resp.data;
+    if (nodeStatus.value?.serviceStatus !== "Running") {
+      refreshing = false;
+    }
+    if (
+      nodeStatus.value &&
+      (oldStatus?.port !== nodeStatus.value.port ||
+        oldStatus?.token !== nodeStatus.value.token)
+    ) {
+      algodClient.value = new Algodv2(
+        nodeStatus.value.token,
+        `http://${location.hostname}`,
+        nodeStatus.value.port
+      );
+      await delay(500);
+    }
+  } catch (err: any) {
+    console.error(err);
+    store.setSnackbar(err?.response?.data || err.message, "error");
+  }
+}
+
+let restartAttempted = false;
+
+async function getAlgodStatus() {
+  try {
     if (nodeStatus.value?.serviceStatus === "Running") {
-      if (algodClient.value) {
-        algodStatus.value = await algodClient.value?.status().do();
-        if (nodeStatus.value.p2p) {
-          try {
-            const response = (
-              await axios({
-                url: `http://${location.hostname}:${nodeStatus.value.port}/v2/status/peers`,
-                headers: { "X-Algo-Api-Token": nodeStatus.value.token },
-              })
-            ).data as Peer[];
-            peers.value = response.sort((a, b) =>
-              a.address.localeCompare(b.address)
-            );
-          } catch {}
-        } else {
-          peers.value = undefined;
-        }
-      }
-      if (!refreshing) autoRefresh();
+      algodStatus.value = await algodClient.value?.status().do();
     } else {
       algodStatus.value = undefined;
-      peers.value = undefined;
     }
     if (nodeStatus.value?.retiStatus?.version && !retiLatest.value) {
       const releases = await axios({
@@ -409,8 +367,12 @@ async function getNodeStatus() {
     ) {
       restartAttempted = true;
       console.error("reti not running - attempting restart");
-      await FUNC.api.put("reti/stop");
-      await FUNC.api.put("reti/start");
+      await FuncApi.put("reti/stop");
+      await FuncApi.put("reti/start");
+    }
+    if (nodeStatus.value?.serviceStatus === "Running" && !refreshing) {
+      await delay(1200);
+      autoRefresh();
     }
   } catch (err: any) {
     console.error(err);
@@ -458,7 +420,7 @@ async function updateReti() {
   try {
     if (!retiUpdate.value) return;
     loading.value = true;
-    await FUNC.api.post("reti/update");
+    await FuncApi.post("reti/update");
     await getNodeStatus();
     store.setSnackbar("Reti Updated", "success");
   } catch (err: any) {