Merge pull request #38 from GalaxyPay/dev

fix: windows service not found parsing

.github/workflows/go.yml

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

FUNC.iss

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

FUNC/Utils.cs

@@ -40,7 +40,7 @@ public static string ParseServiceStatus(string sc)
             string status = "Unknown";
             if (IsWindows())
             {
-                if (sc.Contains("OpenService FAILED")) { status = "Not Found"; }
+                if (sc.Contains("1060:")) { status = "Not Found"; }
                 else if (sc.Contains("1  STOPPED")) { status = "Stopped"; }
                 else if (sc.Contains("4  RUNNING")) { status = "Running"; }
             }

create-package-deb.sh

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

create-package-pkg.sh

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

deb/amd64/control

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

deb/arm64/control

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

webui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "func-webui",
-  "version": "2.2.2",
+  "version": "2.2.3",
   "scripts": {
     "dev": "vite",
     "build": "vue-tsc --noEmit && vite build",

webui/src/components/Node.vue

@@ -223,14 +223,23 @@ const retiUpdate = computed(() => {
 const isSyncing = computed(() => !!algodStatus.value?.["catchup-time"]);
 
 const createdColor = computed(() =>
-  nodeStatus.value?.serviceStatus !== "Not Found" ? "success" : "red"
+  nodeStatus.value?.serviceStatus === "Unknown"
+    ? "grey"
+    : nodeStatus.value?.serviceStatus !== "Not Found"
+    ? "success"
+    : "red"
 );
+
 const runningColor = computed(() =>
   nodeStatus.value?.serviceStatus === "Running" ? "success" : "red"
 );
 
 const syncedColor = computed(() =>
-  isSyncing.value && !generatingKey.value ? "warning" : runningColor.value
+  algodStatus.value?.["last-round"] == 0
+    ? "red"
+    : isSyncing.value && !generatingKey.value
+    ? "warning"
+    : runningColor.value
 );
 
 const participatingColor = computed(() =>