@decentnetwork/beagle 0.1.128 → 0.1.129

package/config/default-exits.yaml

@@ -26,10 +26,12 @@
 exits:
   # --- China (China-only / GFW-blocked-from-outside sites) ---
   - name: cn
+    label: ea-1
     userid: 5Aj6uQMd1cNRb9cGT4AwHCN4RdVZjfaGLtgKGhdP1LzN
     virtual_ip: 10.86.1.15
     region: china
   - name: sh
+    label: ea-2
     userid: 6D1PLSVqbSpcxnDMAd8ZXLWycYveeP2hU4g3igDQEqA7
     virtual_ip: 10.86.1.16
     region: china

package/dist/desktop/app.js

@@ -1,4 +1,4 @@
-window.__DK_UI_VERSION="0.1.128";
+window.__DK_UI_VERSION="0.1.129";
 "use strict";
 (() => {
   // packages/beagle-ui/dist/beagle-ui.js

package/dist/exits.d.ts

@@ -1,5 +1,7 @@
 export interface DefaultExit {
     name: string;
+    /** What the panel shows for this exit, when the name is not for users. */
+    label?: string;
     userid: string;
     virtual_ip?: string;
     region?: string;

package/dist/server.js

@@ -35,6 +35,15 @@ import { globalPrefixOf } from "./global-prefix.js";
 // Directory holding the built desktop UI bundle (index.html, app.js, vendor/).
 // scripts/build-ui.mjs emits it next to this compiled module at dist/ui/desktop/.
 const DESKTOP_DIR = join(dirname(fileURLToPath(import.meta.url)), "desktop");
+/** How an exit region is shown to users. The keys are routing keys (routes.yaml
+ *  region names, the router's built-in domain lists) and stay as they are; the
+ *  flag and label are display only. App strings never carry PRC place names
+ *  (CLAUDE.md), so the "china" region is shown as East Asia. */
+const REGION_META = {
+    china: { flag: "EA", label: "East Asia" },
+    japan: { flag: "JP", label: "Japan" },
+    us: { flag: "US", label: "United States" },
+};
 /** Set routes.yaml's top-level `default:` to `value`, keeping the rest of the
  *  file as written. False when there is no file or no such line to change. */
 function writeRoutesDefault(path, value) {
@@ -2116,7 +2125,8 @@ export function startBeagleServer(opts) {
                     channel: opts.meExtra?.channel ?? "@next",
                     wire: opts.meExtra?.wire ?? "163",
                     isExit: !!meExit,
-                    exitRegion: meExit?.region ?? null,
+                    // The display tag, not the routing key (see REGION_META).
+                    exitRegion: meExit?.region ? REGION_META[meExit.region]?.flag ?? meExit.region : null,
                     // null = backend didn't report it (daemon); the UI then hides the
                     // toggle rather than showing a state it cannot know.
                     autoAccept: typeof node.autoAccept === "boolean" ? node.autoAccept : null,
@@ -2222,11 +2232,6 @@ export function startBeagleServer(opts) {
                             onlineIps.add(ip);
                     }
                 }
-                const regionMeta = {
-                    china: { flag: "CN", label: "China" },
-                    japan: { flag: "JP", label: "Japan" },
-                    us: { flag: "US", label: "United States" },
-                };
                 const byRegion = new Map();
                 for (const e of DEFAULT_EXITS) {
                     if (!e.virtual_ip)
@@ -2236,7 +2241,7 @@ export function startBeagleServer(opts) {
                         byRegion.set(region, []);
                     byRegion.get(region).push({
                         ip: e.virtual_ip,
-                        host: e.name,
+                        host: e.label ?? e.name,
                         online: onlineUserids.has(e.userid) || onlineIps.has(e.virtual_ip),
                         reachable: false,
                         ping: null,
@@ -2299,8 +2304,8 @@ export function startBeagleServer(opts) {
                 };
                 const exits = [...byRegion.entries()].map(([region, nodes]) => ({
                     region,
-                    flag: regionMeta[region]?.flag ?? region.slice(0, 2).toUpperCase(),
-                    label: regionMeta[region]?.label ?? region,
+                    flag: REGION_META[region]?.flag ?? region.slice(0, 2).toUpperCase(),
+                    label: REGION_META[region]?.label ?? region,
                     nodes,
                     reachableCount: nodes.filter((n) => n.reachable).length,
                     unreachableCount: nodes.filter((n) => !n.reachable).length,
@@ -2905,8 +2910,8 @@ const PAGE = `<!doctype html>
 <div id="exits"></div>
 <div class="add">
   <input id="exitIp" placeholder="exit virtual IP (e.g. 10.86.1.15)" autocomplete="off" style="flex:2"/>
-  <input id="exitRegion" placeholder="region (china/japan/us)" autocomplete="off" list="regionList" style="flex:1"/>
-  <datalist id="regionList"><option>china</option><option>japan</option><option>us</option></datalist>
+  <input id="exitRegion" placeholder="region (e.g. japan, us)" autocomplete="off" list="regionList" style="flex:1"/>
+  <datalist id="regionList"><option>japan</option><option>us</option></datalist>
   <button onclick="addExit()">Add exit</button>
 </div>
 
@@ -3023,6 +3028,8 @@ async function sendChat(){
 document.getElementById('chatInput').addEventListener('keydown', e=>{ if(e.key==='Enter') sendChat(); });
 
 // ---- Exit nodes (routes.yaml) ----
+// Display names for routing keys; the key itself stays in routes.yaml.
+const REGION_LABEL = { china: 'East Asia' };
 let routesObj = { regions: [], default: 'direct' };
 async function refreshExits(){
   let r; try { r = await api('/api/routes'); } catch(e){ return; }
@@ -3033,7 +3040,7 @@ async function refreshExits(){
   document.getElementById('ecount').textContent = total ? '('+total+')' : '';
   document.getElementById('exits').innerHTML = regions.length ? regions.map((rg)=> \`
     <div class="row" style="flex-direction:column; align-items:stretch; gap:.3rem">
-      <div class="name">\${esc(rg.name)} \${(rg.exits||[]).length? '':'<span class="sub">(empty → direct)</span>'}</div>
+      <div class="name">\${esc(REGION_LABEL[rg.name]||rg.name)} \${(rg.exits||[]).length? '':'<span class="sub">(empty → direct)</span>'}</div>
       \${(rg.exits||[]).map(ip=>\`<div class="sub" style="display:flex; gap:.5rem; align-items:center"><span style="flex:1">\${esc(ip)}</span><button class="reject" onclick="removeExit('\${esc(rg.name)}','\${esc(ip)}')">×</button></div>\`).join('')}
     </div>\`).join('') : '<div class="empty">No routes.yaml regions — using auto-discovery.</div>';
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decentnetwork/beagle",
-  "version": "0.1.128",
+  "version": "0.1.129",
   "description": "Beagle — P2P chat, file transfer and calls for regular users, on the Decent Network. No admin privilege required.",
   "type": "module",
   "main": "./dist/index.js",