From d223f35731063a43d2a71b023f071016c3ec52e6 Mon Sep 17 00:00:00 2001
From: nallux-dozryl <nallux-dozryl@protonmail.com>
Date: Tue, 20 Dec 2022 02:07:37 +0800
Subject: [PATCH 1/3] beta-3.5.2-edge

---
 api/groundseg.py                       |  41 +++++++-
 api/orchestrator.py                    |  37 +++++++-
 api/webui_docker.py                    |   2 +-
 release/version_edge.csv               |   1 +
 ui/src/lib/AnchorButton.svelte         |   3 +-
 ui/src/lib/SettingsButton.svelte       |   3 +-
 ui/src/lib/SetupAnchor.svelte          | 124 ++++++++++++++++++++++++
 ui/src/lib/SetupPassword.svelte        | 126 +++++++++++++++++++++++++
 ui/src/lib/api.js                      |   2 +-
 ui/src/routes/(home)/+page.server.js   |   2 +-
 ui/src/routes/(home)/+page.svelte      |   6 ++
 ui/src/routes/[patp]/+page.server.js   |   2 +-
 ui/src/routes/[patp]/+page.svelte      |   5 +
 ui/src/routes/settings/+page.server.js |   2 +-
 ui/src/routes/settings/+page.svelte    |   5 +
 ui/src/routes/setup/+page.server.js    |  23 +++++
 ui/src/routes/setup/+page.svelte       |  41 ++++++++
 ui/src/routes/startram/+page.server.js |   2 +-
 ui/src/routes/startram/+page.svelte    |   5 +
 19 files changed, 416 insertions(+), 16 deletions(-)
 create mode 100644 ui/src/lib/SetupAnchor.svelte
 create mode 100644 ui/src/lib/SetupPassword.svelte
 create mode 100644 ui/src/routes/setup/+page.server.js
 create mode 100644 ui/src/routes/setup/+page.svelte

diff --git a/api/groundseg.py b/api/groundseg.py
index 887f7b88..0017a15d 100755
--- a/api/groundseg.py
+++ b/api/groundseg.py
@@ -162,10 +162,11 @@ def meld_loop():
 
         time.sleep(30)
 
-threading.Thread(target=check_bin_updates).start() # Start binary updater thread
-threading.Thread(target=sys_monitor).start() # Start system monitoring on a new thread
-threading.Thread(target=meld_loop).start() # Start meld loop on a new thread
-threading.Thread(target=anchor_information).start() # Start anchor information loop on a new thread
+# Threads
+threading.Thread(target=check_bin_updates).start() # Binary updater
+threading.Thread(target=sys_monitor).start() # System monitoring
+threading.Thread(target=meld_loop).start() # Meld loop
+threading.Thread(target=anchor_information).start() # Anchor information
 
 #
 #   Endpoints
@@ -174,6 +175,9 @@ def meld_loop():
 # Check if cookie is valid
 @app.route("/cookies", methods=['GET'])
 def check_cookies():
+    if orchestrator.config['firstBoot']:
+        return jsonify('setup')
+
     sessionid = request.args.get('sessionid')
 
     if sessionid in orchestrator.config['sessions']:
@@ -184,6 +188,9 @@ def check_cookies():
 # Get all urbits
 @app.route("/urbits", methods=['GET'])
 def all_urbits():
+    if orchestrator.config['firstBoot']:
+        return jsonify('setup')
+
     sessionid = request.args.get('sessionid')
 
     if len(str(sessionid)) != 64:
@@ -203,6 +210,9 @@ def all_urbits():
 # Handle urbit ID related requests
 @app.route('/urbit', methods=['GET','POST'])
 def urbit_info():
+    if orchestrator.config['firstBoot']:
+        return jsonify('setup')
+
     urbit_id = request.args.get('urbit_id')
     sessionid = request.args.get('sessionid')
 
@@ -227,6 +237,9 @@ def urbit_info():
 # Handle device's system settings
 @app.route("/system", methods=['GET','POST'])
 def system_settings():
+    if orchestrator.config['firstBoot']:
+        return jsonify('setup')
+
     sessionid = request.args.get('sessionid')
 
     if len(str(sessionid)) != 64:
@@ -251,6 +264,9 @@ def system_settings():
 # Handle anchor registration related information
 @app.route("/anchor", methods=['GET'])
 def anchor_settings():
+    if orchestrator.config['firstBoot']:
+        return jsonify('setup')
+
     sessionid = request.args.get('sessionid')
 
     if len(str(sessionid)) != 64:
@@ -270,6 +286,9 @@ def anchor_settings():
 # Pier upload
 @app.route("/upload", methods=['POST'])
 def pier_upload():
+    if orchestrator.config['firstBoot']:
+        return jsonify('setup')
+
     sessionid = request.args.get('sessionid')
 
     if len(str(sessionid)) != 64:
@@ -339,6 +358,9 @@ def pier_upload():
 # Login
 @app.route("/login", methods=['POST'])
 def login():
+    if orchestrator.config['firstBoot']:
+        return jsonify('setup')
+
     res = orchestrator.handle_login_request(request.get_json())
     if res == 200:
         res = make_response(jsonify(res))
@@ -348,6 +370,17 @@ def login():
 
     return res
 
+# Setup
+@app.route("/setup", methods=['POST'])
+def setup():
+    if not orchestrator.config['firstBoot']:
+        return jsonify(400)
+
+    page = request.args.get('page')
+
+    res = orchestrator.handle_setup(page, request.get_json())
+
+    return jsonify(res)
 
 if __name__ == '__main__':
     debug_mode = False
diff --git a/api/orchestrator.py b/api/orchestrator.py
index 843109e5..2bbe22a1 100755
--- a/api/orchestrator.py
+++ b/api/orchestrator.py
@@ -41,7 +41,7 @@ class Orchestrator:
     _disk = None
 
     # GroundSeg
-    gs_version = 'Beta-3.5.1'
+    gs_version = 'Beta-3.5.2-edge'
     anchor_config = {'lease': None,'ongoing': None}
     minIO_on = False
     config = {}
@@ -67,8 +67,9 @@ def __init__(self, config_file):
 
         # if first boot, set up keys
         if self.config['firstBoot']:
+            Log.log_groundseg("GroundSeg is in setup mode")
             self.reset_pubkey()
-            self.config['firstBoot'] = False
+            #self.config['firstBoot'] = False
         
         # save the latest config to file
         self.save_config()
@@ -201,6 +202,38 @@ def load_urbits(self):
 
         Log.log_groundseg("Urbit Piers loaded")
 
+#
+#   Setup
+#
+
+    def handle_setup(self, page, data):
+        try:
+            if page == "anchor":
+                # set endpoint
+                changed = self.change_wireguard_url(data['endpoint'])
+
+                # register key
+                if changed == 200:
+                    registered = self.register_device(data['key'])
+                    
+                    if registered == 400:
+                        return 401
+
+                    return registered
+
+
+            if page == "password":
+                self.create_password(data['password'])
+                self.config['firstBoot'] = False
+                return 200
+
+        except Exception as e:
+            Log.log_groundseg(e)
+            pass
+
+        return 401
+
+
 #
 #   Login
 #
diff --git a/api/webui_docker.py b/api/webui_docker.py
index c7918175..a64e0d96 100644
--- a/api/webui_docker.py
+++ b/api/webui_docker.py
@@ -6,7 +6,7 @@
 client = docker.from_env()
 
 class WebUIDocker:
-    _webui_img = "nativeplanet/groundseg-webui:latest"
+    _webui_img = "nativeplanet/groundseg-webui:edge"
 
     def __init__(self,port):
         client.images.pull(self._webui_img)
diff --git a/release/version_edge.csv b/release/version_edge.csv
index 6f83e670..55d13b80 100644
--- a/release/version_edge.csv
+++ b/release/version_edge.csv
@@ -1,3 +1,4 @@
+Beta-3.5.2-edge,2227a08abc4fd405a866858b87e0dc4f4777956a659033e2199ea7ce3139f064,https://github.com/Native-Planet/GroundSeg/releases/download/beta-3.5.2-edge/groundseg
 Beta-3.5.1-edge,c8bd6bab5e57aadcd9c7fd7369e2845761d1446797455bbd30aa36a1fa799fef,https://github.com/Native-Planet/GroundSeg/releases/download/beta-3.5.1-edge/groundseg
 Beta-3.5.0-edge,43429e4b06016fe1c57d3bd23a41bbf546dac292b6bc6937ae34015a9164def1,https://github.com/Native-Planet/GroundSeg/releases/download/beta-3.5.0-edge/groundseg
 Beta-3.4.0-edge,6edf1bac09c511986d2ade2f336eee4d4c24651f2fc25e386a9b071a8264b172,https://github.com/Native-Planet/GroundSeg/releases/download/beta-3.4.0-edge/groundseg
diff --git a/ui/src/lib/AnchorButton.svelte b/ui/src/lib/AnchorButton.svelte
index fe87830f..4611bfa5 100644
--- a/ui/src/lib/AnchorButton.svelte
+++ b/ui/src/lib/AnchorButton.svelte
@@ -51,9 +51,8 @@
 
 <style>
   .blur {
-    opacity: .2;
+    opacity: .3;
     pointer-events: none;
-    filter: blur(2px);
   }
   .hide {
     opacity: 0;
diff --git a/ui/src/lib/SettingsButton.svelte b/ui/src/lib/SettingsButton.svelte
index e6245ecd..5ed2815e 100644
--- a/ui/src/lib/SettingsButton.svelte
+++ b/ui/src/lib/SettingsButton.svelte
@@ -17,9 +17,8 @@
 
 <style>
   .blur {
-    opacity: .2;
+    opacity: .3;
     pointer-events: none;
-    filter: blur(2px);
   }
   .hide {
     opacity: 0;
diff --git a/ui/src/lib/SetupAnchor.svelte b/ui/src/lib/SetupAnchor.svelte
new file mode 100644
index 00000000..7f44f655
--- /dev/null
+++ b/ui/src/lib/SetupAnchor.svelte
@@ -0,0 +1,124 @@
+<script>
+  import { api } from '$lib/api'
+  import { scale } from 'svelte/transition'
+  import { createEventDispatcher } from 'svelte'
+  import PrimaryButton from '$lib/PrimaryButton.svelte'
+
+  let key = '',
+    keyView = false,
+    epKey = '',
+    defaultEpKey = 'api.startram.io',
+    buttonStatus = 'standard'
+
+  epKey = defaultEpKey
+
+  const dispatch = createEventDispatcher()
+
+  const insertNP = () => epKey = defaultEpKey
+
+  const toggleKeyView = () => {
+    keyView = !keyView
+    document.querySelector('#key-input').type = keyView ? 'text' : 'password'
+  }
+
+  const submitAnchor = () => {
+    let step = "anchor"
+    let query = {"key":key, "endpoint":epKey}
+
+    buttonStatus = "loading"
+
+    fetch($api + '/setup?page=' + step, {
+        method: 'POST',
+        headers: {'Content-Type': 'application/json'},
+        body: JSON.stringify(query)
+    })
+      .then(d => d.json())
+      .then(res => {
+        if (res == 400) {
+          window.location.href = "/login"
+        }
+
+        if (res == 401) {
+          buttonStatus = "failure"
+        }
+
+        if (res == 200) {
+          buttonStatus = "success"
+          setTimeout(()=> dispatch("nextPage"), 3000)
+        }
+        setTimeout(()=> buttonStatus = "standard", 3000)
+      })
+  }
+
+</script>
+
+<div class="title" in:scale={{duration:120, delay: 200}}>StarTram Key Registration</div>
+<div class="reg-key" in:scale={{duration:120, delay: 200}}>
+  <input id='key-input' type="password" bind:value={key} />
+  <img on:click={toggleKeyView} src="/eye-{keyView ? "closed" : "open"}.svg" alt="eye" />
+</div>
+
+<div class="title">Startram Endpoint</div>
+<div class="ep-key" in:scale={{duration:120, delay: 200}}>
+  <input type="text" bind:value={epKey} />
+  <img on:click={insertNP} width="24px" src="/nplogo.svg" alt="np logo" />
+</div>
+
+<div class="button">
+  <PrimaryButton
+    background="#ffffff4d"
+    standard="Skip"
+    on:click={()=> dispatch('nextPage')}
+  />
+
+  {#if ((epKey.length > 0) && (key.length > 0))}
+    <PrimaryButton
+      left={false}
+      status={buttonStatus}
+      standard="Register"
+      failure="Registration failed"
+      success="Registered!"
+      loading="Registering your key.."
+      on:click={submitAnchor}
+    />
+  {/if}
+</div>
+
+<style>
+  .title {
+    text-align: center;
+    padding: 12px;
+  }
+  .reg-key {
+    display: flex;
+    padding: 0 20px 0 20px;
+  }
+  .ep-key {
+    display: flex;
+    padding: 0 20px 0 20px;
+  }
+  input {
+    text-align: center;
+    font-family: inherit;
+    background: #ffffff4d;
+    color: inherit;
+    border-radius: 6px;
+    font-size: 12px;
+    padding: 8px;
+    border: none;
+    flex: 1;
+  }
+  input:focus {
+    outline: none;
+  }
+  img {
+    padding-left: 12px;
+    opacity: .8;
+    cursor: pointer;
+  }
+  .button {
+    padding-top: 24px;
+    padding-right: 20px;
+    display: flex;
+  }
+</style>
diff --git a/ui/src/lib/SetupPassword.svelte b/ui/src/lib/SetupPassword.svelte
new file mode 100644
index 00000000..a6992203
--- /dev/null
+++ b/ui/src/lib/SetupPassword.svelte
@@ -0,0 +1,126 @@
+<script>
+  import { api } from '$lib/api'
+  import { scale } from 'svelte/transition'
+  import { createEventDispatcher } from 'svelte'
+  import PrimaryButton from '$lib/PrimaryButton.svelte'
+
+  let password = '',
+    confirmPassword = '',
+    passView = false,
+    confirmView = false,
+    buttonStatus = 'standard'
+
+  const dispatch = createEventDispatcher()
+
+  const togglePassView = () => {
+    passView = !passView
+    document.querySelector('#pass-input-0').type = passView ? 'text' : 'password'
+  }
+
+  const toggleConfirmView = () => {
+    confirmView = !confirmView
+    document.querySelector('#pass-input-1').type = confirmView ? 'text' : 'password'
+  }
+
+  const createPassword = () => {
+    let step = "password"
+    let query = {"password":confirmPassword}
+
+    buttonStatus = "loading"
+
+    fetch($api + '/setup?page=' + step, {
+        method: 'POST',
+        headers: {'Content-Type': 'application/json'},
+        body: JSON.stringify(query)
+    })
+      .then(d => d.json())
+      .then(res => {
+        if (res == 400) {
+          window.location.href = "/login"
+        }
+
+        if (res == 401) {
+          buttonStatus = "failure"
+        }
+
+        if (res == 200) {
+          buttonStatus = 'success'
+          setTimeout(()=> window.location.href = "/login", 3000)
+        }
+        setTimeout(()=> buttonStatus = "standard", 3000)
+      })
+  }
+
+</script>
+
+<div class="title" in:scale={{duration:120, delay: 200}}>Create New Password</div>
+
+<div class="pass-key" in:scale={{duration:120, delay: 200}}>
+  <input id='pass-input-0' type="password" bind:value={password} />
+  <img on:click={togglePassView} src="/eye-{passView ? "closed" : "open"}.svg" alt="eye" />
+</div>
+
+{#if password.length > 0}
+  <div class="pass-key" in:scale={{duration:120, delay: 200}}>
+    <input placeholder="Confirm Password" id='pass-input-1' type="password" bind:value={confirmPassword} />
+    <img on:click={toggleConfirmView} src="/eye-{confirmView ? "closed" : "open"}.svg" alt="eye" />
+  </div>
+{/if}
+
+<div class="button">
+  <PrimaryButton
+    background="#ffffff4d"
+    standard="Back"
+    on:click={()=> dispatch('prevPage')}
+  />
+
+  {#if ((confirmPassword.length > 0) && (password == confirmPassword))}
+    <PrimaryButton
+      left={false}
+      status={buttonStatus}
+      standard="Set Password"
+      failure="Something went wrong"
+      success="Password set!"
+      loading="Setting your password.."
+      on:click={createPassword}
+    />
+  {/if}
+</div>
+
+<style>
+  .title {
+    text-align: center;
+    padding: 12px;
+  }
+  .pass-key {
+    display: flex;
+    padding: 0 20px 20px 20px;
+  }
+  input {
+    text-align: center;
+    font-family: inherit;
+    background: #ffffff4d;
+    color: inherit;
+    border-radius: 6px;
+    font-size: 12px;
+    padding: 8px;
+    border: none;
+    flex: 1;
+  }
+  input:focus {
+    outline: none;
+  }
+  input::placeholder {
+    color: #ffffff;
+  }
+  img {
+    padding-left: 12px;
+    opacity: .8;
+    cursor: pointer;
+  }
+  .button {
+    padding-top: 24px;
+    padding-right: 20px;
+    display: flex;
+  }
+</style>
diff --git a/ui/src/lib/api.js b/ui/src/lib/api.js
index 8acb33a9..f17e8e5e 100644
--- a/ui/src/lib/api.js
+++ b/ui/src/lib/api.js
@@ -1,6 +1,6 @@
 import { writable } from 'svelte/store'
 
-export const webuiVersion = 'Beta-3.5.1'
+export const webuiVersion = 'Beta-3.5.2-edge'
 
 //
 // fade transition params
diff --git a/ui/src/routes/(home)/+page.server.js b/ui/src/routes/(home)/+page.server.js
index ea71d514..1f437237 100644
--- a/ui/src/routes/(home)/+page.server.js
+++ b/ui/src/routes/(home)/+page.server.js
@@ -11,7 +11,7 @@ export function load({ cookies }) {
 	let d = fetch(query)
 	.then(j => j.json())
   .then(r => {
-    if (r == 404) {return {status:r}}
+    if ((r == 404) || (r == 'setup')) {return {status:r}}
     else {return r}
   })
   .catch(err => {
diff --git a/ui/src/routes/(home)/+page.svelte b/ui/src/routes/(home)/+page.svelte
index e0e45f21..f2287dcc 100644
--- a/ui/src/routes/(home)/+page.svelte
+++ b/ui/src/routes/(home)/+page.svelte
@@ -32,10 +32,16 @@
 
 	// Start the update loop
 	onMount(()=> {
+    console.log(data)
     api.set("http://" + $page.url.hostname + ":27016")
     if (data['status'] == 404) {
       window.location.href = "/login"
     }
+
+    if (data['status'] == 'setup') {
+      window.location.href = "/setup"
+    }
+
 		inView = true
 		update()
 	})
diff --git a/ui/src/routes/[patp]/+page.server.js b/ui/src/routes/[patp]/+page.server.js
index e0f6991d..5bad5098 100644
--- a/ui/src/routes/[patp]/+page.server.js
+++ b/ui/src/routes/[patp]/+page.server.js
@@ -12,7 +12,7 @@ export function load({ cookies }) {
 	let d = fetch(query, {credentials:"include"})
 	.then(j => j.json())
   .then(r => {
-    if (r == 404) {return {api:url,status:r}}
+    if ((r == 404) || (r == 'setup')) {return {status:r}}
     else {return {api:url}}
   })
   .catch(err => {
diff --git a/ui/src/routes/[patp]/+page.svelte b/ui/src/routes/[patp]/+page.svelte
index 9f9a5521..9ecee273 100644
--- a/ui/src/routes/[patp]/+page.svelte
+++ b/ui/src/routes/[patp]/+page.svelte
@@ -38,6 +38,11 @@
     if (data['status'] == 404) {
       window.location.href = "/login"
     }
+
+    if (data['status'] == 'setup') {
+      window.location.href = "/setup"
+    }
+
     update()
     getUrbitCode()
   })
diff --git a/ui/src/routes/settings/+page.server.js b/ui/src/routes/settings/+page.server.js
index 20d65554..0f1fb279 100644
--- a/ui/src/routes/settings/+page.server.js
+++ b/ui/src/routes/settings/+page.server.js
@@ -12,7 +12,7 @@ export function load({ cookies }) {
 	let d = fetch(query, {credentials:"include"})
 	.then(j => j.json())
   .then(r => {
-    if (r == 404) {return {api:url,status:r}}
+    if ((r == 404) || (r == 'setup')) {return {status:r}}
     else {r['api'] = url; return r}
   })
   .catch(err => {
diff --git a/ui/src/routes/settings/+page.svelte b/ui/src/routes/settings/+page.svelte
index f4e993f6..251d76d9 100644
--- a/ui/src/routes/settings/+page.svelte
+++ b/ui/src/routes/settings/+page.svelte
@@ -70,6 +70,11 @@
     if (data['status'] == 404) {
       window.location.href = "/login"
     }
+
+    if (data['status'] == 'setup') {
+      window.location.href = "/setup"
+    }
+
     update()
     inViewSettings = true
     selectedContainer = $system.containers[0]
diff --git a/ui/src/routes/setup/+page.server.js b/ui/src/routes/setup/+page.server.js
new file mode 100644
index 00000000..a1afdc38
--- /dev/null
+++ b/ui/src/routes/setup/+page.server.js
@@ -0,0 +1,23 @@
+/** @type {import('./$types').PageServerLoad} */
+import { env } from '$env/dynamic/private'
+
+export const prerender = false;
+
+export function load({ cookies }) {				
+  const sessionid = cookies.get('sessionid');
+
+  let query = 'http://127.0.0.1:27016/cookies?sessionid=' + sessionid 
+
+	let d = fetch(query)
+    .then(j => j.json())
+    .then(r => {return {status:r}})
+    .catch(err => {
+      console.log(err)
+      if ((typeof err) == 'object') {
+        err = 'noconn'
+      }
+      return {status:err}
+    })
+
+	return d
+}
diff --git a/ui/src/routes/setup/+page.svelte b/ui/src/routes/setup/+page.svelte
new file mode 100644
index 00000000..77eff4b3
--- /dev/null
+++ b/ui/src/routes/setup/+page.svelte
@@ -0,0 +1,41 @@
+<script>
+	import { onMount } from 'svelte'
+	import { updateState, api } from '$lib/api'
+  import { scale } from 'svelte/transition'
+
+  import { page } from '$app/stores'
+
+  import Card from '$lib/Card.svelte'
+  import Logo from '$lib/Logo.svelte'
+  import SetupAnchor from '$lib/SetupAnchor.svelte'
+  import SetupPassword from '$lib/SetupPassword.svelte'
+
+	// load data into store
+	export let data
+	updateState(data)
+
+  let inViewSetup = false, setupPage = 0
+
+  onMount(()=> {
+    api.set("http://" + $page.url.hostname + ":27016")
+    inViewSetup = true
+  })
+
+</script>
+
+{#if inViewSetup}
+  <Card width="480px">
+    <Logo t='GroundSeg Setup'/>
+
+    {#if setupPage == 0}
+      <SetupAnchor on:nextPage={()=> setupPage = 1}/>
+    {/if}
+
+    {#if setupPage == 1}
+      <SetupPassword on:prevPage={()=> setupPage = 0} />
+    {/if}
+
+  </Card>
+{/if}
+
+
diff --git a/ui/src/routes/startram/+page.server.js b/ui/src/routes/startram/+page.server.js
index 59d1d8b4..93b2585d 100644
--- a/ui/src/routes/startram/+page.server.js
+++ b/ui/src/routes/startram/+page.server.js
@@ -12,7 +12,7 @@ export function load({ cookies }) {
 	let d = fetch(query, {credentials:"include"})
 	.then(j => j.json())
   .then(r => {
-    if (r == 404) {return {api:url,status:r}}
+    if ((r == 404) || (r == 'setup')) {return {status:r}}
     else {r['api'] = url; return r}
   })
   .catch(err => {
diff --git a/ui/src/routes/startram/+page.svelte b/ui/src/routes/startram/+page.svelte
index 12d5a7d1..82d08d24 100644
--- a/ui/src/routes/startram/+page.svelte
+++ b/ui/src/routes/startram/+page.svelte
@@ -43,6 +43,11 @@
     if (data['status'] == 404) {
       window.location.href = "/login"
     }
+
+    if (data['status'] == 'setup') {
+      window.location.href = "/setup"
+    }
+
 		update()
     inView = true
 	})

From c104496a237da72bd0d6d0a7c43dac3fbaf7cfcf Mon Sep 17 00:00:00 2001
From: nallux-dozryl <nallux-dozryl@protonmail.com>
Date: Tue, 20 Dec 2022 02:38:56 +0800
Subject: [PATCH 2/3] beta-3.5.2

---
 api/orchestrator.py | 2 +-
 api/webui_docker.py | 2 +-
 release/version.csv | 1 +
 ui/src/lib/api.js   | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/api/orchestrator.py b/api/orchestrator.py
index 2bbe22a1..dd40bf6c 100755
--- a/api/orchestrator.py
+++ b/api/orchestrator.py
@@ -41,7 +41,7 @@ class Orchestrator:
     _disk = None
 
     # GroundSeg
-    gs_version = 'Beta-3.5.2-edge'
+    gs_version = 'Beta-3.5.2'
     anchor_config = {'lease': None,'ongoing': None}
     minIO_on = False
     config = {}
diff --git a/api/webui_docker.py b/api/webui_docker.py
index a64e0d96..c7918175 100644
--- a/api/webui_docker.py
+++ b/api/webui_docker.py
@@ -6,7 +6,7 @@
 client = docker.from_env()
 
 class WebUIDocker:
-    _webui_img = "nativeplanet/groundseg-webui:edge"
+    _webui_img = "nativeplanet/groundseg-webui:latest"
 
     def __init__(self,port):
         client.images.pull(self._webui_img)
diff --git a/release/version.csv b/release/version.csv
index 5910bb7d..4d43f14d 100644
--- a/release/version.csv
+++ b/release/version.csv
@@ -1,3 +1,4 @@
+Beta-3.5.2,560601e21e4ec25cbef1542ca3dd20bd3697f6887e50db3e40252002d4093ede,https://github.com/Native-Planet/GroundSeg/releases/download/beta-3.5.2/groundseg
 Beta-3.5.1,0cce788b8c0f2325db516f3a7635ff82e07b880f15f4d54257552410e853ca63,https://github.com/Native-Planet/GroundSeg/releases/download/beta-3.5.1/groundseg
 Beta-3.5.0,79c4c71dfede94a2f0ea3d5331437872acb130664f1e9d492c127c2e13d16be1,https://github.com/Native-Planet/GroundSeg/releases/download/beta-3.5.0/groundseg
 Beta-3.4.0,eb1f6f327e160ad192fde4996791758ae711538ca966b0cd1f679fd7ebee5824,https://github.com/Native-Planet/GroundSeg/releases/download/beta-3.4.0/groundseg
diff --git a/ui/src/lib/api.js b/ui/src/lib/api.js
index f17e8e5e..f947c096 100644
--- a/ui/src/lib/api.js
+++ b/ui/src/lib/api.js
@@ -1,6 +1,6 @@
 import { writable } from 'svelte/store'
 
-export const webuiVersion = 'Beta-3.5.2-edge'
+export const webuiVersion = 'Beta-3.5.2'
 
 //
 // fade transition params

From 41b3bf73ccaaf4cb2ab1fe72d4ee30096374a62e Mon Sep 17 00:00:00 2001
From: nallux-dozryl <nallux-dozryl@protonmail.com>
Date: Tue, 20 Dec 2022 02:39:34 +0800
Subject: [PATCH 3/3] updated install script

---
 release/groundseg_install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release/groundseg_install.sh b/release/groundseg_install.sh
index e12872cb..5027eeba 100755
--- a/release/groundseg_install.sh
+++ b/release/groundseg_install.sh
@@ -8,7 +8,7 @@ sudo firewall-cmd --reload
 ACC=Native-Planet
 REPO=GroundSeg
 BRANCH=main
-TAG=beta-3.5.1
+TAG=beta-3.5.2
 
 # Directory to save the scrips
 SAVE_DIR=/opt/nativeplanet/groundseg