init

Author: WantClue

main/CMakeLists.txt

@@ -11,6 +11,7 @@ SRCS
     "lv_font_portfolio-6x8.c"
     "logo.c"
     "./http_server/http_server.c"
+    "./http_server/handler_ota_github.c"
     "./self_test/self_test.c"
     "./tasks/stratum_task.c"
     "./tasks/create_jobs_task.c"
@@ -47,6 +48,7 @@ PRIV_REQUIRES
     "esp_adc"
     "esp_app_format"
     "esp_event"
+    "esp_http_client"
     "esp_http_server"
     "esp_netif"
     "esp_psram"

main/http_server/axe-os/src/app/components/settings/settings.component.html

@@ -4,31 +4,56 @@ <h2>Settings</h2>
 </div>
 
 <div class="grid">
-    <div class="col-12 lg:col-6 xl:col-4">
+    <div class="col-12 lg:col-6">
         <div class="card" *ngIf="checkLatestRelease == false">
             <h5>Current Version: {{(info$ | async)?.version}}</h5>
-            <h2>Latest Release: <p-button (onClick)="checkLatestRelease = true">Check</p-button></h2>
+            <h2>Release & Update: <p-button (onClick)="loadReleases()">Check</p-button></h2>
             <small>Clicking this button will connect to GitHub to check for recent updates</small>
         </div>
         <div class="card" *ngIf="checkLatestRelease == true">
-            <ng-container *ngIf="latestRelease$ | async as latestRelease">
             <h5>Current Version: {{(info$ | async)?.version}}</h5>
-            <h2>Latest Release: {{latestRelease.name}}</h2>
 
-            <div *ngFor="let asset of latestRelease.assets">
-                <div *ngIf="asset.name == 'bitforgeos.bin'">
-                    <a style="text-decoration: underline;" target="_blank"
-                        [href]="asset.browser_download_url">bitforgeos.bin</a>
+            <ng-container *ngIf="releases$ | async as releases">
+                <div class="mb-3">
+                    <label class="block mb-2 font-bold">Select Release</label>
+                    <p-dropdown
+                        [options]="releases"
+                        optionLabel="name"
+                        placeholder="Select a release"
+                        (onChange)="onReleaseSelected($event.value)"
+                        [style]="{'width': '100%'}">
+                    </p-dropdown>
                 </div>
-                <div *ngIf="asset.name == 'www.bin'">
-                    <a style="text-decoration: underline;" target="_blank"
-                        [href]="asset.browser_download_url">www.bin</a>
+
+                <div *ngIf="selectedRelease" class="mb-3">
+                    <div *ngFor="let asset of selectedRelease.assets">
+                        <div *ngIf="asset.name == 'bitforgeos.bin' || asset.name == 'www.bin'">
+                            <a style="text-decoration: underline;" target="_blank"
+                                [href]="asset.browser_download_url">{{asset.name}}</a>
+                            <small class="ml-2">({{(asset.size / 1024 / 1024).toFixed(1)}} MB)</small>
+                        </div>
+                    </div>
+
+                    <div class="mt-3">
+                        <p-button
+                            label="Install from GitHub"
+                            icon="pi pi-download"
+                            [disabled]="isGithubOTA"
+                            (onClick)="installFromGithub()">
+                        </p-button>
+                    </div>
+
+                    <div *ngIf="isGithubOTA" class="mt-3">
+                        <div class="mb-2">
+                            <strong>{{getStepLabel(githubOTAStep)}}</strong>
+                        </div>
+                        <p-progressBar [value]="githubOTAProgress"></p-progressBar>
+                    </div>
                 </div>
-            </div>
-        </ng-container>
+            </ng-container>
         </div>
     </div>
-    <div class="col-12 lg:col-6 xl:col-4">
+    <div class="col-12 lg:col-6 xl:col-3">
       <div class="card">
           <h2>Update Website <span *ngIf="websiteUpdateProgress != null">{{websiteUpdateProgress}}%</span></h2>
 
@@ -38,10 +63,9 @@ <h2>Update Website <span *ngIf="websiteUpdateProgress != null">{{websiteUpdatePr
           <small>(www.bin)</small>
       </div>
     </div>
-    <div class="col-12 lg:col-6 xl:col-4">
+    <div class="col-12 lg:col-6 xl:col-3">
         <div class="card">
             <h2>Update Firmware <span *ngIf="firmwareUpdateProgress != null">{{firmwareUpdateProgress}}%</span></h2>
-            <!-- <input type="file" id="file" (change)="otaUpdate($event)" accept=".bin"> -->
             <p-fileUpload #firmwareUpload [customUpload]="true" mode="basic" accept=".bin" (uploadHandler)="otaUpdate($event)"
                 [auto]="true" chooseLabel="Browse"></p-fileUpload>
 

main/http_server/axe-os/src/app/components/settings/settings.component.ts

@@ -1,10 +1,10 @@
 import { HttpErrorResponse, HttpEventType } from '@angular/common/http';
-import { Component, ViewChild } from '@angular/core';
+import { Component, OnDestroy, ViewChild } from '@angular/core';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { ToastrService } from 'ngx-toastr';
 import { FileUploadHandlerEvent, FileUpload } from 'primeng/fileupload';
-import { map, Observable, shareReplay, startWith } from 'rxjs';
-import { GithubUpdateService } from 'src/app/services/github-update.service';
+import { map, Observable, shareReplay, startWith, Subscription } from 'rxjs';
+import { GithubRelease, GithubUpdateService } from 'src/app/services/github-update.service';
 import { LoadingService } from 'src/app/services/loading.service';
 import { SystemService } from 'src/app/services/system.service';
 import { eASICModel } from 'src/models/enum/eASICModel';
@@ -14,7 +14,7 @@ import { eASICModel } from 'src/models/enum/eASICModel';
   templateUrl: './settings.component.html',
   styleUrls: ['./settings.component.scss']
 })
-export class SettingsComponent {
+export class SettingsComponent implements OnDestroy {
 
   public form!: FormGroup;
 
@@ -27,6 +27,15 @@ export class SettingsComponent {
 
   public checkLatestRelease: boolean = false;
   public latestRelease$: Observable<any>;
+  public releases$!: Observable<GithubRelease[]>;
+  public selectedRelease: GithubRelease | null = null;
+
+  // GitHub OTA state
+  public isGithubOTA: boolean = false;
+  public githubOTAStep: string = 'idle';
+  public githubOTAProgress: number = 0;
+  private otaPollSub: Subscription | null = null;
+  private rebootCheckSub: Subscription | null = null;
 
   public info$: Observable<any>;
 
@@ -86,6 +95,14 @@ export class SettingsComponent {
       });
 
   }
+
+  ngOnDestroy() {
+    this.stopOTAPolling();
+    if (this.rebootCheckSub) {
+      this.rebootCheckSub.unsubscribe();
+    }
+  }
+
   public updateSystem() {
 
     const form = this.form.getRawValue();
@@ -191,6 +208,132 @@ export class SettingsComponent {
       });
   }
 
+  public loadReleases() {
+    this.checkLatestRelease = true;
+    this.releases$ = this.githubUpdateService.getReleases();
+  }
+
+  public onReleaseSelected(release: GithubRelease) {
+    this.selectedRelease = release;
+  }
+
+  public getStepLabel(step: string): string {
+    switch (step) {
+      case 'downloading_fw': return 'Downloading firmware...';
+      case 'flashing_fw': return 'Downloading & flashing firmware...';
+      case 'downloading_www': return 'Downloading website...';
+      case 'flashing_www': return 'Flashing website...';
+      case 'rebooting': return 'Rebooting...';
+      case 'error': return 'Error';
+      default: return 'Starting...';
+    }
+  }
+
+  public installFromGithub() {
+    if (!this.selectedRelease) return;
+
+    const fwUrl = this.githubUpdateService.findAssetUrl(this.selectedRelease, 'bitforgeos.bin');
+    const wwwUrl = this.githubUpdateService.findAssetUrl(this.selectedRelease, 'www.bin');
+
+    if (!fwUrl || !wwwUrl) {
+      this.toastrService.error('Release is missing bitforgeos.bin or www.bin assets', 'Error');
+      return;
+    }
+
+    this.isGithubOTA = true;
+    this.githubOTAStep = 'idle';
+    this.githubOTAProgress = 0;
+
+    this.systemService.startGithubOTA(fwUrl, wwwUrl).subscribe({
+      next: () => {
+        this.toastrService.info('Update started', 'GitHub OTA');
+        this.startOTAPolling();
+      },
+      error: (err) => {
+        this.isGithubOTA = false;
+        const msg = err.error?.message || err.message || 'Failed to start update';
+        this.toastrService.error(msg, 'Error');
+      }
+    });
+  }
+
+  private startOTAPolling() {
+    this.stopOTAPolling();
+
+    const poll = () => {
+      this.otaPollSub = this.systemService.getGithubOTAStatus().subscribe({
+        next: (status) => {
+          this.githubOTAStep = status.step;
+          this.githubOTAProgress = status.progress;
+
+          if (status.step === 'rebooting') {
+            this.stopOTAPolling();
+            this.toastrService.success('Update complete! Device is rebooting...', 'Success');
+            this.startRebootCheck();
+            return;
+          }
+
+          if (status.step === 'error') {
+            this.stopOTAPolling();
+            this.isGithubOTA = false;
+            this.toastrService.error(status.error || 'Update failed', 'Error');
+            return;
+          }
+
+          if (status.running) {
+            setTimeout(() => poll(), 1000);
+          } else {
+            this.isGithubOTA = false;
+          }
+        },
+        error: () => {
+          // Device may have rebooted, start checking
+          this.stopOTAPolling();
+          this.startRebootCheck();
+        }
+      });
+    };
+
+    poll();
+  }
+
+  private stopOTAPolling() {
+    if (this.otaPollSub) {
+      this.otaPollSub.unsubscribe();
+      this.otaPollSub = null;
+    }
+  }
+
+  private startRebootCheck() {
+    let attempts = 0;
+    const maxAttempts = 60;
+
+    const check = () => {
+      attempts++;
+      if (attempts > maxAttempts) {
+        this.isGithubOTA = false;
+        this.toastrService.warning('Device did not come back online within 60 seconds', 'Warning');
+        return;
+      }
+
+      this.rebootCheckSub = this.systemService.getInfo().subscribe({
+        next: () => {
+          // Device is back!
+          this.isGithubOTA = false;
+          this.toastrService.success('Device is back online! Reloading...', 'Success');
+          setTimeout(() => window.location.reload(), 1500);
+        },
+        error: () => {
+          // Not back yet, retry
+          setTimeout(() => check(), 1000);
+        }
+      });
+    };
+
+    // Wait 5 seconds before first check
+    setTimeout(() => check(), 5000);
+  }
+
   public restart() {
     this.systemService.restart().subscribe(res => {
 

main/http_server/axe-os/src/app/prime-ng.module.ts

@@ -7,6 +7,7 @@ import { FileUploadModule } from 'primeng/fileupload';
 import { InputGroupModule } from 'primeng/inputgroup';
 import { InputGroupAddonModule } from 'primeng/inputgroupaddon';
 import { InputTextModule } from 'primeng/inputtext';
+import { ProgressBarModule } from 'primeng/progressbar';
 import { SidebarModule } from 'primeng/sidebar';
 import { SliderModule } from 'primeng/slider';
 
@@ -21,6 +22,7 @@ const primeNgModules = [
     ChartModule,
     InputGroupModule,
     InputGroupAddonModule,
+    ProgressBarModule,
 ];
 
 @NgModule({

main/http_server/axe-os/src/app/services/github-update.service.ts

@@ -4,11 +4,19 @@ import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
 
-interface GithubRelease {
+export interface GithubAsset {
+  name: string;
+  browser_download_url: string;
+  size: number;
+}
+
+export interface GithubRelease {
   id: number;
   tag_name: string;
   name: string;
   prerelease: boolean;
+  body: string;
+  assets: GithubAsset[];
 }
 
 @Injectable({
@@ -29,4 +37,8 @@ export class GithubUpdateService {
     );
   }
 
+  public findAssetUrl(release: GithubRelease, filename: string): string | null {
+    const asset = release.assets.find(a => a.name === filename);
+    return asset ? asset.browser_download_url : null;
+  }
 }

main/http_server/axe-os/src/app/services/system.service.ts

@@ -121,6 +121,14 @@ export class SystemService {
   }
 
 
+  public startGithubOTA(fwUrl: string, wwwUrl: string): Observable<any> {
+    return this.httpClient.post('/api/system/OTA/github', { fw_url: fwUrl, www_url: wwwUrl });
+  }
+
+  public getGithubOTAStatus(): Observable<any> {
+    return this.httpClient.get('/api/system/OTA/github');
+  }
+
   public getSwarmInfo(uri: string = ''): Observable<{ ip: string }[]> {
     return this.httpClient.get(`${uri}/api/swarm/info`) as Observable<{ ip: string }[]>;
   }