Merge pull request #49 from GalaxyPay/dev

func updates

Author: acfunk

.github/workflows/go.yml

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

FUNC.iss

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

FUNC/Controllers/FuncController.cs

@@ -0,0 +1,41 @@
+using System.Runtime.InteropServices;
+using Microsoft.AspNetCore.Mvc;
+using Octokit;
+using static System.OperatingSystem;
+
+namespace FUNC.Controllers
+{
+    [ApiController]
+    [Route("[controller]")]
+    public class FuncController(ILogger<FuncController> logger) : ControllerBase
+    {
+        private readonly ILogger<FuncController> _logger = logger;
+
+        // GET: func/latest
+        [HttpGet("latest")]
+        public async Task<ActionResult<string>> FuncLatest()
+        {
+            try
+            {
+                string workspaceName = "GalaxyPay";
+                string repositoryName = "func";
+                var client = new GitHubClient(new ProductHeaderValue(repositoryName));
+                var latestInfo = await client.Repository.Release.GetLatest(workspaceName, repositoryName);
+
+                string? pattern = IsWindows() ? "windows"
+                : IsLinux() ? (RuntimeInformation.OSArchitecture == Architecture.Arm64 ? "linux-arm64" : "linux-amd64")
+                : IsMacOS() ? (RuntimeInformation.OSArchitecture == Architecture.Arm64 ? "darwin-arm64" : "darwin-amd64")
+                : null;
+
+                if (pattern == null) return BadRequest();
+                var asset = latestInfo?.Assets.FirstOrDefault(a => a.Name.Contains(pattern));
+                if (asset == null) return BadRequest();
+                return asset.BrowserDownloadUrl;
+            }
+            catch (Exception ex)
+            {
+                return BadRequest(ex.Message);
+            }
+        }
+    }
+}

README.md

@@ -25,7 +25,7 @@ When updating a previous installation, the installer will recommend to let it au
 After downloading the `.pkg` file to your machine, run
 
 ```sh
-sudo installer -pkg func_<version>_darwin-<architecture>.pkg -target /
+sudo installer -target / -pkg func_<version>_darwin-<architecture>.pkg
 ```
 
 If instead you wish to install the package by double-clicking the `.pkg` file , you will have to follow [these instuctions](https://support.apple.com/guide/mac-help/apple-cant-check-app-for-malicious-software-mchleab3a043/mac) for bypassing unsigned packages:

create-package-deb.sh

@@ -1,6 +1,6 @@
 rm -r Output
 
-PKG=Output/func_3.1.2_linux-$1
+PKG=Output/func_3.2.0_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_3.1.2_darwin-$1.pkg
+    Output/func_3.2.0_darwin-$1.pkg

deb/amd64/control

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

deb/arm64/control

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

webui/package.json

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

webui/src/components/AppBar.vue

@@ -9,7 +9,12 @@
     <v-btn icon @click="showSettings = true">
       <v-icon
         :icon="mdiCog"
-        :color="store.updateAvailable && !store.downloading ? 'warning' : ''"
+        :color="
+          (store.nodeUpdateAvailable || store.funcUpdateAvailable) &&
+          !store.downloading
+            ? 'warning'
+            : ''
+        "
       />
       <v-tooltip text="Settings" activator="parent" location="bottom" />
     </v-btn>

webui/src/components/Settings.vue

@@ -7,19 +7,44 @@
         <v-icon color="currentColor" :icon="mdiClose" @click="show = false" />
       </v-card-title>
       <v-container>
+        <v-row align="center">
+          <v-col>
+            <div>FUNC Version</div>
+            <div class="text-caption text-grey">
+              {{ appVersion }}
+              {{ !store.funcUpdateAvailable ? "(latest)" : "" }}
+            </div>
+          </v-col>
+          <v-col class="text-right">
+            <v-btn
+              :color="url ? 'warning' : ''"
+              variant="tonal"
+              :disabled="!url"
+              :href="url"
+            >
+              Download
+              <v-tooltip
+                activator="parent"
+                location="left"
+                :text="`Download ${funcLatest}`"
+              />
+            </v-btn>
+          </v-col>
+        </v-row>
         <v-row align="center">
           <v-col>
             <div>Node Version</div>
             <div class="text-caption text-grey">
               {{ store.goalVersion?.installed }}
+              {{ !store.nodeUpdateAvailable ? "(latest)" : "" }}
             </div>
           </v-col>
           <v-col class="text-right">
             <v-btn
-              :color="store.updateAvailable ? 'warning' : ''"
+              :color="store.nodeUpdateAvailable ? 'warning' : ''"
               variant="tonal"
-              :disabled="!store.updateAvailable || store.downloading"
-              @click="updateLatest()"
+              :disabled="!store.nodeUpdateAvailable || store.downloading"
+              @click="updateNodeLatest()"
             >
               Update
               <v-tooltip
@@ -28,7 +53,6 @@
                 :text="`Update to ${store.goalVersion?.latest}`"
               />
             </v-btn>
-            <Releases class="ml-2" @release="updateRelease" />
           </v-col>
         </v-row>
         <v-row align="center">
@@ -72,28 +96,39 @@ const show = computed({
   },
 });
 
+const appVersion = __APP_VERSION__;
+const funcLatest = ref();
+const url = ref();
 let init = false;
 
-onBeforeMount(() => {
+onBeforeMount(async () => {
   if (activeNetwork.value !== "mainnet") setShowNetworks(true);
-  getVersion();
+  await getVersion();
+  if (store.funcUpdateAvailable) {
+    url.value = (await FUNC.api.get("func/latest")).data;
+  }
 });
 
 async function getVersion() {
   try {
-    const version = await FUNC.api.get("goal/version");
-    store.goalVersion = version.data;
+    const func = await axios({
+      url: "https://api.github.com/repos/GalaxyPay/func/releases/latest",
+    });
+    funcLatest.value = func.data?.name.slice(1);
+    store.funcUpdateAvailable = funcLatest.value !== appVersion;
+    const goalVersion = await FUNC.api.get("goal/version");
+    store.goalVersion = goalVersion.data;
     if (store.goalVersion?.installed) store.ready = true;
     else {
       if (!init) {
         init = true;
-        updateLatest(true);
+        updateNodeLatest(true);
       } else {
         throw Error("Download Failed");
       }
     }
 
-    store.updateAvailable =
+    store.nodeUpdateAvailable =
       !!store.goalVersion?.latest &&
       store.goalVersion?.latest !== store.goalVersion?.installed;
   } catch (err: any) {
@@ -102,16 +137,16 @@ async function getVersion() {
   }
 }
 
-async function updateLatest(bypass = false) {
+async function updateNodeLatest(bypass = false) {
   if (
     !bypass &&
     !confirm("Are you sure you want to update your node to the latest version?")
   )
     return;
-  await updateRelease("latest");
+  await updateNode("latest");
 }
 
-async function updateRelease(release: string) {
+async function updateNode(release: string) {
   try {
     store.downloading = true;
     store.stopNodeServices = true;

webui/src/stores/app.ts

@@ -15,7 +15,8 @@ export const useAppStore = defineStore("app", {
     refresh: 0,
     connectMenu: false,
     stopNodeServices: false,
-    updateAvailable: false,
+    funcUpdateAvailable: false,
+    nodeUpdateAvailable: false,
     downloading: false,
     stoppingReti: false,
     goalVersion: undefined as GoalVersion | undefined,