Merge branch 'dev' into main

Author: ddddeadispose

src/docs/openapi.js

@@ -44,6 +44,7 @@ function addCommonSchemas(target) {
                 xray: { type: 'object', description: 'Xray-specific settings when `type=xray`.' },
                 cascadeRole: { type: 'string', enum: ['standalone', 'portal', 'bridge'], default: 'standalone' },
                 country: { type: 'string', example: 'DE' },
+                comment: { type: 'string', maxLength: 500, example: 'Hetzner FSN1 — backup node', description: 'Free-form operator note shown in panel UI.' },
                 rankingCoefficient: { type: 'number', example: 1 },
             },
         },
@@ -67,6 +68,7 @@ function addCommonSchemas(target) {
                 xray: { type: 'object' },
                 cascadeRole: { type: 'string' },
                 country: { type: 'string' },
+                comment: { type: 'string', maxLength: 500 },
                 initScript: { type: 'string' },
             },
         },
@@ -858,6 +860,7 @@ These endpoints are not under \`/api\` and are not part of this specification:
                 properties: {
                     _id:           { type: 'string', example: '64a1b2c3d4e5f6a7b8c9d0e1' },
                     name:          { type: 'string', example: 'Germany' },
+                    comment:       { type: 'string', example: 'Hetzner FSN1 — backup node', description: 'Free-form operator note shown in panel UI.' },
                     ip:            { type: 'string', example: '1.2.3.4' },
                     domain:        { type: 'string', example: 'de.example.com' },
                     port:          { type: 'integer', example: 443 },

src/locales/en.json

@@ -174,6 +174,9 @@
     "flag": "Flag (emoji)",
     "flagPlaceholder": "🇩🇪",
     "flagHint": "Country flag emoji",
+    "comment": "Comment",
+    "commentPlaceholder": "Provider, location, notes…",
+    "commentHint": "Free-form note shown in the node list and dashboard (up to 500 characters)",
     "port": "Main Port",
     "portRange": "Port Hopping Range",
     "portRangeHint": "Clients will connect to these ports",

src/locales/ru.json

@@ -174,6 +174,9 @@
     "flag": "Флаг (эмодзи)",
     "flagPlaceholder": "🇩🇪",
     "flagHint": "Эмодзи флага страны",
+    "comment": "Комментарий",
+    "commentPlaceholder": "Провайдер, локация, заметки…",
+    "commentHint": "Произвольная заметка, показывается в списке нод и на дашборде (до 500 символов)",
     "port": "Основной порт",
     "portRange": "Port Hopping диапазон",
     "portRangeHint": "Клиенты будут подключаться на эти порты",

src/models/hyNodeModel.js

@@ -215,6 +215,9 @@ const hyNodeSchema = new mongoose.Schema({
 
     name: { type: String, required: true },
     flag: { type: String, default: '' },
+    // Free-form operator note displayed in the node list and dashboard.
+    // Trimmed and capped to avoid abuse / excessive payload size.
+    comment: { type: String, default: '', trim: true, maxlength: 500 },
     ip: { type: String, required: true },
     domain: { type: String, default: '' },
     sni: { type: String, default: '' },

src/routes/nodes.js

@@ -96,7 +96,7 @@ router.post('/', requireScope('nodes:write'), async (req, res) => {
         const {
             name, ip, domain, sni, port, portRange, statsPort,
             groups, ssh, paths, settings, rankingCoefficient,
-            type, xray, cascadeRole, country,
+            type, xray, cascadeRole, country, comment,
             hopInterval, acme, masquerade, bandwidth,
             ignoreClientBandwidth, speedTest, disableUDP,
             udpIdleTimeout, sniff, quic, resolver, acl,
@@ -151,6 +151,7 @@ router.post('/', requireScope('nodes:write'), async (req, res) => {
             rankingCoefficient: rankingCoefficient || 1.0,
             cascadeRole: cascadeRole || 'standalone',
             country: country || '',
+            comment: typeof comment === 'string' ? comment.trim().slice(0, 500) : '',
             initScript: req.body.initScript || '',
             active: true,
             status: 'offline',
@@ -189,7 +190,7 @@ router.put('/:id', requireScope('nodes:write'), async (req, res) => {
         const allowedUpdates = [
             'name', 'domain', 'sni', 'port', 'portRange', 'statsPort',
             'groups', 'ssh', 'paths', 'settings', 'active', 'rankingCoefficient',
-            'type', 'xray', 'cascadeRole', 'country',
+            'type', 'xray', 'cascadeRole', 'country', 'comment',
             'hopInterval', 'acme', 'masquerade', 'bandwidth',
             'ignoreClientBandwidth', 'speedTest', 'disableUDP',
             'udpIdleTimeout', 'sniff', 'quic', 'resolver', 'acl',
@@ -199,9 +200,15 @@ router.put('/:id', requireScope('nodes:write'), async (req, res) => {
         const updates = {};
         for (const key of allowedUpdates) {
             if (req.body[key] !== undefined) {
-                updates[key] = key === 'ssh'
-                    ? cryptoService.encryptSshCredentials(req.body[key])
-                    : req.body[key];
+                if (key === 'ssh') {
+                    updates[key] = cryptoService.encryptSshCredentials(req.body[key]);
+                } else if (key === 'comment') {
+                    updates[key] = typeof req.body[key] === 'string'
+                        ? req.body[key].trim().slice(0, 500)
+                        : '';
+                } else {
+                    updates[key] = req.body[key];
+                }
             }
         }
 

src/routes/panel/nodes.js

@@ -77,7 +77,7 @@ router.get('/', async (req, res) => {
         const { usersTotal, usersEnabled, nodesTotal, nodesOnline, trafficStats } = counts;
 
         const nodes = await HyNode.find({ active: true })
-            .select('name ip status onlineUsers maxOnlineUsers groups traffic type flag rankingCoefficient')
+            .select('name ip status onlineUsers maxOnlineUsers groups traffic type flag rankingCoefficient comment')
             .populate('groups', 'name color')
             .sort({ rankingCoefficient: 1, name: 1 });
 
@@ -300,6 +300,9 @@ router.post('/nodes', async (req, res) => {
             customConfig: req.body.customConfig || '',
             cascadeRole: req.body.cascadeRole || 'standalone',
             country: req.body.country || '',
+            comment: typeof req.body.comment === 'string'
+                ? req.body.comment.trim().slice(0, 500)
+                : '',
             initScript: req.body.initScript || '',
             obfs: {
                 type: req.body['obfs.type'] || '',
@@ -541,6 +544,9 @@ router.post('/nodes/:id', async (req, res) => {
             flag: req.body.flag || '',
             cascadeRole: req.body.cascadeRole || 'standalone',
             country: req.body.country || '',
+            comment: typeof req.body.comment === 'string'
+                ? req.body.comment.trim().slice(0, 500)
+                : '',
             initScript: req.body.initScript || '',
             'ssh.port': parseInt(req.body['ssh.port']) || 22,
             'ssh.username': req.body['ssh.username'] || 'root',

views/dashboard.ejs

@@ -94,6 +94,9 @@
                                              style="width:14px;height:14px;vertical-align:middle;opacity:0.7;">
                                     </span>
                                     <code class="node-ip"><%= node.ip %></code>
+                                    <% if (node.comment) { %>
+                                    <span class="node-comment" title="<%= node.comment %>"><i class="ti ti-message-circle"></i> <%= node.comment %></span>
+                                    <% } %>
                                 </div>
                             </td>
                     <td>
@@ -149,6 +152,11 @@
                                          style="width:13px;height:13px;vertical-align:middle;opacity:0.7;">
                                 </span>
                                 <code><%= node.ip %></code>
+                                <% if (node.comment) { %>
+                                <div class="node-comment node-comment-mobile" title="<%= node.comment %>">
+                                    <i class="ti ti-message-circle"></i> <%= node.comment %>
+                                </div>
+                                <% } %>
                             </div>
                                 <span class="status-indicator status-<%= node.status %>">
                                     <span class="status-dot"></span>
@@ -389,6 +397,30 @@
     color: var(--text-muted);
     font-size: 0.85em;
 }
+.node-comment {
+    display: inline-block;
+    max-width: 280px;
+    margin-left: 6px;
+    color: var(--text-muted);
+    font-size: 11px;
+    line-height: 1.3;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    vertical-align: middle;
+}
+.node-comment .ti {
+    font-size: 12px;
+    opacity: 0.7;
+    vertical-align: -1px;
+}
+.node-comment-mobile {
+    display: block;
+    margin: 4px 0 0;
+    max-width: 100%;
+    white-space: normal;
+    word-break: break-word;
+}
 </style>
 
 <script>

views/nodes.ejs

@@ -118,6 +118,9 @@
                                     <% if (node.domain) { %>
                                     <br><small class="text-muted"><%= node.domain %></small>
                                     <% } %>
+                                    <% if (node.comment) { %>
+                                    <br><small class="node-comment" title="<%= node.comment %>"><i class="ti ti-message-circle"></i> <%= node.comment %></small>
+                                    <% } %>
                                 </div>
                             </div>
                         </td>
@@ -227,7 +230,13 @@
                             <%= node.status %>
                         </span>
                     </div>
-                    
+
+                    <% if (node.comment) { %>
+                    <div class="node-comment node-comment-mobile" title="<%= node.comment %>">
+                        <i class="ti ti-message-circle"></i> <%= node.comment %>
+                    </div>
+                    <% } %>
+
                     <div class="mobile-node-stats">
                         <div class="mobile-stat-item">
                             <span class="mobile-stat-label"><%= t('common.online') %></span>
@@ -589,6 +598,29 @@
 .node-flag {
     font-size: 20px;
 }
+.node-comment {
+    display: inline-block;
+    max-width: 360px;
+    color: var(--text-muted);
+    font-size: 11px;
+    line-height: 1.35;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    vertical-align: middle;
+}
+.node-comment .ti {
+    font-size: 12px;
+    opacity: 0.7;
+    vertical-align: -1px;
+}
+.node-comment-mobile {
+    display: block;
+    margin: 4px 0 6px;
+    max-width: 100%;
+    white-space: normal;
+    word-break: break-word;
+}
 .btn-icon-danger:hover {
     background: var(--danger-bg);
     border-color: var(--danger);

views/partials/node-form/basic.ejs

@@ -22,6 +22,15 @@
                 </div>
             </div>
 
+            <div class="form-group">
+                <label for="comment"><%= t('nodes.comment') %></label>
+                <input type="text" id="comment" name="comment"
+                       value="<%= node?.comment || '' %>"
+                       placeholder="<%= t('nodes.commentPlaceholder') %>"
+                       maxlength="500" autocomplete="off">
+                <small><%= t('nodes.commentHint') %></small>
+            </div>
+
             <%# ========== 1b. Cascade Role & Country (Xray only) ========== %>
             <div class="form-section xray-only" id="cascadeRoleSection" style="<%= node?.type === 'xray' ? '' : 'display:none' %>">
                 <h3><i class="ti ti-topology-star-3"></i> <%= t('nodes.cascadeRole') %></h3>