mirror of
https://github.com/kiddin9/op-packages.git
synced 2026-10-31 11:55:13 +08:00
🍉 Sync 2026-06-12 21:11:08
This commit is contained in:
github-actions[bot] committed
1 parent
6517ee70be
commit
a65af00c3f
29 files changed
+646
-185
No files matched your search
@@ -75,9 +75,12 @@ function detectInstalledBackends() {
|
||||
}
|
||||
|
||||
function detectRunning() {
|
||||
/* pidof matches the program name exactly and, unlike busybox `pgrep -x`
|
||||
(which compares the full cmdline `/usr/bin/dae run …` and never hits),
|
||||
reliably tells dae from daed without substring false positives. */
|
||||
return Promise.all([
|
||||
execOk('/usr/bin/pgrep', ['-x', 'dae']),
|
||||
execOk('/usr/bin/pgrep', ['-x', 'daed'])
|
||||
execOk('/bin/pidof', ['dae']),
|
||||
execOk('/bin/pidof', ['daed'])
|
||||
]).then(function(r) {
|
||||
return { dae: r[0], daed: r[1] };
|
||||
});
|
||||
|
||||
@@ -114,6 +114,29 @@ function ellipsisCell(section_id) {
|
||||
return E('span', { 'title': v, 'style': 'font-family:ui-monospace,Menlo,monospace;font-size:12px' }, short);
|
||||
}
|
||||
|
||||
/* Tag is auto-generated and rarely relevant to beginners — render it muted. */
|
||||
function mutedCell(section_id) {
|
||||
const v = this.cfgvalue(section_id) || '';
|
||||
return E('span', { 'class': 'dd-meta', 'style': 'opacity:.55;font-size:11.5px' }, v);
|
||||
}
|
||||
|
||||
/* Fill blank tags of a section type with unique <prefix>_<n> values so dae's
|
||||
config generator always has a stable identifier. Runs after m.save() wrote
|
||||
the form values into the uci session, before uci.save(). */
|
||||
function autofillTags(stype, prefix) {
|
||||
const secs = uci.sections('dae', stype) || [];
|
||||
const used = {};
|
||||
secs.forEach(function(s) { if (s.tag) used[s.tag] = 1; });
|
||||
let n = 1;
|
||||
secs.forEach(function(s) {
|
||||
if (s.tag) return;
|
||||
while (used[prefix + '_' + n]) n++;
|
||||
const t = prefix + '_' + n;
|
||||
uci.set('dae', s['.name'], 'tag', t);
|
||||
used[t] = 1; n++;
|
||||
});
|
||||
}
|
||||
|
||||
/* Wrap every form section in a collapsible accordion. openTitles lists the
|
||||
section titles that should start expanded; the rest start collapsed. */
|
||||
function accordionizeSections(mapNode, openTitles) {
|
||||
@@ -156,7 +179,8 @@ function renderDaeForms(ctx) {
|
||||
s.anonymous = true;
|
||||
s.sortable = false;
|
||||
o = s.option(form.Value, 'tag', _('Tag'));
|
||||
o.placeholder = 'my_sub';
|
||||
o.placeholder = _('auto-generated');
|
||||
o.textvalue = mutedCell;
|
||||
o = s.option(form.Value, 'url', _('Subscription URL'));
|
||||
o.rmempty = false;
|
||||
o.placeholder = 'https://example.com/sub';
|
||||
@@ -169,65 +193,16 @@ function renderDaeForms(ctx) {
|
||||
o = s.option(form.Flag, 'enabled', _('Enabled'));
|
||||
o.default = '1';
|
||||
o.editable = true;
|
||||
/* add an Update button next to Edit/Delete in each row; dae re-pulls all
|
||||
subscriptions on reload, so the action is global regardless of the row */
|
||||
const origRowActions = s.renderRowActions;
|
||||
s.renderRowActions = function(section_id, more_label) {
|
||||
const cell = origRowActions.call(this, section_id, more_label);
|
||||
/* only real subscription links (http/https) are re-fetchable; fixed share
|
||||
links (vless:// ss:// …) are static. Keep the button on every row for a
|
||||
consistent layout, but grey it out (disabled) on the fixed ones. */
|
||||
const subUrl = uci.get('dae', section_id, 'url') || '';
|
||||
const fetchable = /^https?:\/\//i.test(subUrl);
|
||||
const btn = E('button', {
|
||||
'class': 'cbi-button cbi-button-action',
|
||||
'style': 'margin-right:.25em',
|
||||
'disabled': fetchable ? null : '',
|
||||
'title': fetchable ? '' : _('Fixed link — nothing to fetch.')
|
||||
}, _('Update'));
|
||||
const upMsg = E('span', { 'class': 'dd-meta', 'style': 'margin-left:8px;display:none' }, '');
|
||||
function setUpMsg(text, kind) {
|
||||
upMsg.textContent = text;
|
||||
upMsg.style.display = '';
|
||||
upMsg.style.color = (kind === 'err') ? 'var(--error-color, #d33)' : (kind === 'ok') ? 'var(--success-color, #2a8)' : '';
|
||||
if (kind !== 'err')
|
||||
setTimeout(function() { if (upMsg.textContent === text) upMsg.style.display = 'none'; }, 5000);
|
||||
}
|
||||
if (fetchable) {
|
||||
btn.addEventListener('click', function(ev) {
|
||||
ev.preventDefault();
|
||||
btn.disabled = true;
|
||||
setUpMsg(_('Updating…'));
|
||||
backend.detectRunning().then(function(r) {
|
||||
if (!r || !r.dae)
|
||||
return setUpMsg(_('dae is stopped; it fetches subscriptions on start.'), 'warn');
|
||||
return fs.exec(backend.BACKENDS.dae.initd, ['hot_reload']).then(function(res) {
|
||||
if (res && res.code !== 0)
|
||||
setUpMsg(_('Update failed: %s').format(res.stderr || res.stdout || ('exit ' + res.code)), 'err');
|
||||
else
|
||||
setUpMsg(_('Subscriptions updated (dae reloaded)'), 'ok');
|
||||
});
|
||||
}).catch(function(e) {
|
||||
setUpMsg(_('Update failed: %s').format(e.message || e), 'err');
|
||||
}).finally(function() { btn.disabled = false; });
|
||||
});
|
||||
}
|
||||
const firstBtn = cell.querySelector('button, a.cbi-button');
|
||||
if (firstBtn && firstBtn.parentNode) firstBtn.parentNode.insertBefore(btn, firstBtn);
|
||||
else cell.appendChild(btn);
|
||||
if (btn.parentNode) btn.parentNode.insertBefore(upMsg, btn.nextSibling);
|
||||
else cell.appendChild(upMsg);
|
||||
return cell;
|
||||
};
|
||||
|
||||
/* Manual nodes (share links) */
|
||||
s = m.section(form.GridSection, 'node', _('Nodes'),
|
||||
s = m.section(form.GridSection, 'node', _('Manual nodes'),
|
||||
_('One node share link per line — ss, vmess, vless, trojan, tuic, hysteria2, socks5.'));
|
||||
s.addremove = true;
|
||||
s.anonymous = true;
|
||||
s.sortable = false;
|
||||
o = s.option(form.Value, 'tag', _('Tag'));
|
||||
o.placeholder = 'node1';
|
||||
o.placeholder = _('auto-generated');
|
||||
o.textvalue = mutedCell;
|
||||
o = s.option(form.Value, 'link', _('Share Link'));
|
||||
o.rmempty = false;
|
||||
o.placeholder = 'vmess://...';
|
||||
@@ -325,55 +300,98 @@ function renderDaeForms(ctx) {
|
||||
statusTimer = setTimeout(function() { status.classList.remove('show'); }, hold || 3000);
|
||||
}
|
||||
|
||||
const save = E('button', { 'class': 'cbi-button cbi-button-positive' }, _('Save and Hot Reload'));
|
||||
/* one save pipeline, parameterised by intent:
|
||||
- opts.start: after generate, enable + start dae (stopped → "Save and Start")
|
||||
- otherwise just save + generate; generate hot-reloads itself when dae runs */
|
||||
function doSave(opts, btns) {
|
||||
btns.forEach(function(b) { b.disabled = true; });
|
||||
flash(_('Saving…'));
|
||||
/* ensure the singleton sections exist before parsing the form —
|
||||
on installs where uci-defaults never seeded them, writing an
|
||||
option to a missing named section fails with ubus NOT_FOUND (4) */
|
||||
if (!uci.get('dae', 'routing')) uci.add('dae', 'routing', 'routing');
|
||||
if (!uci.get('dae', 'dns')) uci.add('dae', 'dns', 'dns');
|
||||
if (!uci.get('dae', 'config')) uci.add('dae', 'dae', 'config');
|
||||
return m.save(null, true)
|
||||
.then(function() {
|
||||
/* assign unique tags to any rows the user left blank */
|
||||
autofillTags('subscription', 'subscription');
|
||||
autofillTags('node', 'node');
|
||||
})
|
||||
.then(function() { return uci.save(); })
|
||||
.then(function() {
|
||||
/* apply flushes the rpc session to /etc/config so the
|
||||
generator (reads /etc/config/dae) sees the form data;
|
||||
skip it when nothing changed — apply on an empty
|
||||
changeset throws ubus NO_DATA (code 5). */
|
||||
return uci.changes().then(function(ch) {
|
||||
return (ch && Object.keys(ch).length) ? uci.apply() : null;
|
||||
});
|
||||
})
|
||||
.then(function() { return fs.exec(GEN, ['generate']); })
|
||||
.then(function(res) {
|
||||
if (res && res.code !== 0) {
|
||||
const err = (res.stderr || res.stdout || ('exit ' + res.code)).trim().split('\n')[0];
|
||||
flash(_('Apply failed: %s').format(err), 'err', 9000);
|
||||
throw new Error('gen-failed');
|
||||
}
|
||||
if (!opts.start) {
|
||||
/* generate already hot-reloaded if dae was running */
|
||||
flash(opts.okMsg || _('Saved'), 'ok');
|
||||
setTimeout(function() { window.location.reload(); }, 900);
|
||||
return;
|
||||
}
|
||||
flash(_('Starting…'));
|
||||
return fs.exec('/sbin/uci', ['set', 'dae.config.enabled=1'])
|
||||
.then(function() { return fs.exec('/sbin/uci', ['commit', 'dae']); })
|
||||
.then(function() { return fs.exec(backend.BACKENDS.dae.initd, ['enable']); })
|
||||
.then(function() { return fs.exec(backend.BACKENDS.dae.initd, ['start']); })
|
||||
.then(function(r2) {
|
||||
if (r2 && r2.code !== 0)
|
||||
flash(_('Start failed: %s').format(r2.stderr || r2.stdout || ('exit ' + r2.code)), 'err', 9000);
|
||||
else {
|
||||
flash(_('Saved · started'), 'ok');
|
||||
setTimeout(function() { window.location.reload(); }, 900);
|
||||
}
|
||||
});
|
||||
})
|
||||
.catch(function(e) {
|
||||
if (e && e.message === 'gen-failed') return;
|
||||
if (e && e.name === 'CBIValidationError') {
|
||||
flash(_('Please fix the highlighted fields.'), 'err', 6000);
|
||||
return;
|
||||
}
|
||||
flash(_('Save failed: %s').format(e.message || e), 'err', 9000);
|
||||
})
|
||||
.finally(function() { btns.forEach(function(b) { b.disabled = false; }); });
|
||||
}
|
||||
|
||||
return m.render().then(function(mapNode) {
|
||||
save.addEventListener('click', function(ev) {
|
||||
ev.preventDefault();
|
||||
save.disabled = true;
|
||||
flash(_('Saving…'));
|
||||
/* ensure the singleton sections exist before parsing the form —
|
||||
on installs where uci-defaults never seeded them, writing an
|
||||
option to a missing named section fails with ubus NOT_FOUND (4) */
|
||||
if (!uci.get('dae', 'routing')) uci.add('dae', 'routing', 'routing');
|
||||
if (!uci.get('dae', 'dns')) uci.add('dae', 'dns', 'dns');
|
||||
if (!uci.get('dae', 'config')) uci.add('dae', 'dae', 'config');
|
||||
/* commit dae UCI (apply flushes the rpc session to /etc/config,
|
||||
which a CLI `uci commit` cannot see), then regenerate + hot reload */
|
||||
m.save(null, true)
|
||||
.then(function() { return uci.save(); })
|
||||
.then(function() {
|
||||
/* apply flushes the rpc session to /etc/config so the
|
||||
generator (reads /etc/config/dae) sees the form data;
|
||||
skip it when nothing changed — apply on an empty
|
||||
changeset throws ubus NO_DATA (code 5). */
|
||||
return uci.changes().then(function(ch) {
|
||||
return (ch && Object.keys(ch).length) ? uci.apply() : null;
|
||||
});
|
||||
})
|
||||
.then(function() { return fs.exec(GEN, ['generate']); })
|
||||
.then(function(res) {
|
||||
if (res && res.code !== 0) {
|
||||
const err = (res.stderr || res.stdout || ('exit ' + res.code)).trim().split('\n')[0];
|
||||
flash(_('Apply failed: %s').format(err), 'err', 9000);
|
||||
return;
|
||||
}
|
||||
/* reload to reflect committed state and clear the change badge */
|
||||
flash(_('Saved · validated · hot-reloaded'), 'ok');
|
||||
setTimeout(function() { window.location.reload(); }, 900);
|
||||
})
|
||||
.catch(function(e) {
|
||||
if (e && e.name === 'CBIValidationError') {
|
||||
flash(_('Please fix the highlighted fields.'), 'err', 6000);
|
||||
return;
|
||||
}
|
||||
flash(_('Save failed: %s').format(e.message || e), 'err', 9000);
|
||||
})
|
||||
.finally(function() { save.disabled = false; });
|
||||
});
|
||||
|
||||
/* make each form section collapsible; keep the two everyday ones open */
|
||||
accordionizeSections(mapNode, [ _('Subscriptions'), _('Nodes') ]);
|
||||
/* beginner default: only Subscriptions starts open; nodes/groups/routing/dns/logging collapse */
|
||||
accordionizeSections(mapNode, [ _('Subscriptions') ]);
|
||||
|
||||
/* fold groups / routing / dns / logging under one "Advanced settings"
|
||||
collapsible so the everyday view is just subscriptions + nodes */
|
||||
const advTitles = [ _('Groups'), _('Routing'), _('DNS'), _('Logging') ];
|
||||
const advWraps = [];
|
||||
mapNode.querySelectorAll('.dd-adv').forEach(function(w) {
|
||||
const t = w.querySelector('.dd-adv-bar span');
|
||||
if (t && advTitles.indexOf(t.textContent.trim()) >= 0) advWraps.push(w);
|
||||
});
|
||||
if (advWraps.length) {
|
||||
const outerBody = E('div', { 'class': 'dd-adv-body' });
|
||||
const outer = E('div', { 'class': 'dd-adv dd-closed' }, [
|
||||
E('div', { 'class': 'dd-adv-bar' }, [
|
||||
E('span', {}, _('Advanced settings')),
|
||||
E('span', { 'class': 'dd-adv-chevron' }, '›')
|
||||
]),
|
||||
outerBody
|
||||
]);
|
||||
outer.firstChild.addEventListener('click', function() { outer.classList.toggle('dd-closed'); });
|
||||
advWraps[0].parentNode.insertBefore(outer, advWraps[0]);
|
||||
advWraps.forEach(function(w) { outerBody.appendChild(w); });
|
||||
}
|
||||
|
||||
const cardChildren = [
|
||||
E('h4', { 'class': 'dd-card-title' }, _('dae Configuration')),
|
||||
@@ -381,9 +399,72 @@ function renderDaeForms(ctx) {
|
||||
_('Add a subscription or node, then save — it takes effect automatically.'))
|
||||
];
|
||||
cardChildren.push(mapNode);
|
||||
cardChildren.push(E('div', { 'class': 'dd-editor-actions' }, [ save, status ]));
|
||||
|
||||
return E('div', { 'class': 'dd-card dd-settings-card' }, cardChildren);
|
||||
/* state-aware primary action: running → one "Save and Apply"; stopped →
|
||||
"Save config" (secondary) + "Save and Start" (primary). Starting the
|
||||
proxy is an explicit choice, never an implicit side effect of saving. */
|
||||
return backend.detectRunning().then(function(rr) {
|
||||
const running = rr && rr.dae;
|
||||
|
||||
/* "Update all subscriptions" only helps while dae runs (hot reload
|
||||
re-pulls them). A stopped dae re-fetches every subscription on
|
||||
start, so there is nothing to update — hide the button then. */
|
||||
if (running) {
|
||||
const upBtn = E('button', { 'class': 'cbi-button cbi-button-action' }, _('Update all subscriptions'));
|
||||
const upMsg = E('span', { 'class': 'dd-meta', 'style': 'margin-left:8px;display:none' }, '');
|
||||
const setUp = function(text, kind) {
|
||||
upMsg.textContent = text;
|
||||
upMsg.style.display = '';
|
||||
upMsg.style.color = (kind === 'err') ? 'var(--error-color, #d33)' : 'var(--success-color, #2a8)';
|
||||
if (kind !== 'err')
|
||||
setTimeout(function() { if (upMsg.textContent === text) upMsg.style.display = 'none'; }, 5000);
|
||||
};
|
||||
upBtn.addEventListener('click', function(ev) {
|
||||
ev.preventDefault();
|
||||
upBtn.disabled = true;
|
||||
setUp(_('Updating…'));
|
||||
fs.exec(backend.BACKENDS.dae.initd, ['hot_reload']).then(function(res) {
|
||||
if (res && res.code !== 0)
|
||||
setUp(_('Update failed: %s').format(res.stderr || res.stdout || ('exit ' + res.code)), 'err');
|
||||
else
|
||||
setUp(_('Subscriptions updated (dae reloaded)'), 'ok');
|
||||
}).catch(function(e) {
|
||||
setUp(_('Update failed: %s').format(e.message || e), 'err');
|
||||
}).finally(function() { upBtn.disabled = false; });
|
||||
});
|
||||
const upWrap = E('div', { 'class': 'dd-actions', 'style': 'margin:0 0 8px' }, [ upBtn, upMsg ]);
|
||||
const advs = mapNode.querySelectorAll('.dd-adv');
|
||||
for (let i = 0; i < advs.length; i++) {
|
||||
const t = advs[i].querySelector('.dd-adv-bar span');
|
||||
if (t && t.textContent.trim() === _('Subscriptions')) {
|
||||
const body = advs[i].querySelector('.dd-adv-body');
|
||||
const tbl = body && body.querySelector('.cbi-section-table');
|
||||
if (tbl) tbl.parentNode.insertBefore(upWrap, tbl);
|
||||
else if (body) body.insertBefore(upWrap, body.firstChild);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const actions = [];
|
||||
let btns;
|
||||
if (running) {
|
||||
const apply = E('button', { 'class': 'cbi-button cbi-button-positive' }, _('Save and Apply'));
|
||||
btns = [ apply ];
|
||||
apply.addEventListener('click', function(ev) { ev.preventDefault(); doSave({ okMsg: _('Saved · applied') }, btns); });
|
||||
actions.push(apply);
|
||||
} else {
|
||||
const saveOnly = E('button', { 'class': 'cbi-button' }, _('Save config'));
|
||||
const saveStart = E('button', { 'class': 'cbi-button cbi-button-positive' }, _('Save and Start'));
|
||||
btns = [ saveOnly, saveStart ];
|
||||
saveOnly.addEventListener('click', function(ev) { ev.preventDefault(); doSave({ okMsg: _('Saved') }, btns); });
|
||||
saveStart.addEventListener('click', function(ev) { ev.preventDefault(); doSave({ start: true }, btns); });
|
||||
actions.push(saveOnly, saveStart);
|
||||
}
|
||||
actions.push(status);
|
||||
cardChildren.push(E('div', { 'class': 'dd-editor-actions' }, actions));
|
||||
return E('div', { 'class': 'dd-card dd-settings-card' }, cardChildren);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
@@ -425,12 +506,36 @@ function renderDaeImportBanner() {
|
||||
}).catch(function() { return null; });
|
||||
}
|
||||
|
||||
/* Lightweight dae-DSL syntax highlighter: tokenises into spans for a <pre>
|
||||
layer drawn behind a transparent textarea (no editor library needed). */
|
||||
function highlightDae(src) {
|
||||
const re = /(#[^\n]*)|('[^'\n]*')|\b(global|subscription|node|group|routing|dns|include|upstream|request|response)\b|\b([A-Za-z_][\w-]*)(?=\s*\()|(->|&&|\|\|)|\b(geoip|geosite)(?=:)/g;
|
||||
let out = '', last = 0, m;
|
||||
const esc = function(s) { return s.replace(/&/g, '&').replace(/</g, '<').replace(/>/g, '>'); };
|
||||
while ((m = re.exec(src)) !== null) {
|
||||
out += esc(src.slice(last, m.index));
|
||||
const cls = m[1] ? 'c' : m[2] ? 's' : m[3] ? 'k' : m[4] ? 'f' : m[5] ? 'o' : 'g';
|
||||
out += '<span class="dh-' + cls + '">' + esc(m[0]) + '</span>';
|
||||
last = m.index + m[0].length;
|
||||
}
|
||||
out += esc(src.slice(last));
|
||||
return out;
|
||||
}
|
||||
|
||||
function renderDaeEditor() {
|
||||
const textarea = E('textarea', {
|
||||
'class': 'dd-editor',
|
||||
'class': 'dd-editor dd-editor-hl',
|
||||
'spellcheck': 'false',
|
||||
'placeholder': _('dae config file is empty. Click "Initialize from example" to start, or paste your config here.')
|
||||
}, '');
|
||||
const hlCode = E('code', {});
|
||||
const hlPre = E('pre', { 'class': 'dd-hl', 'aria-hidden': 'true' }, hlCode);
|
||||
const editWrap = E('div', { 'class': 'dd-edit-wrap' }, [ hlPre, textarea ]);
|
||||
function syncHL() {
|
||||
hlCode.innerHTML = highlightDae(textarea.value) + '\n';
|
||||
hlPre.scrollTop = textarea.scrollTop;
|
||||
}
|
||||
textarea.addEventListener('scroll', function() { hlPre.scrollTop = textarea.scrollTop; });
|
||||
const save = E('button', { 'class': 'cbi-button cbi-button-positive' }, _('Save manual config'));
|
||||
const init = E('button', { 'class': 'cbi-button cbi-button-action' }, _('Initialize from example'));
|
||||
const status = E('span', { 'class': 'dd-editor-status' }, '');
|
||||
@@ -514,6 +619,7 @@ function renderDaeEditor() {
|
||||
}
|
||||
|
||||
function refreshPlaceholders() {
|
||||
syncHL();
|
||||
const hits = detectPlaceholders(textarea.value);
|
||||
const titleEl = phWarn.querySelector('.dd-ph-warn-title');
|
||||
const howtoEl = phWarn.querySelector('.dd-ph-howto');
|
||||
@@ -634,7 +740,7 @@ function renderDaeEditor() {
|
||||
_('Edit config DSL — subscriptions, nodes, routing, DNS. Load template via Initialize. Replace placeholder URL before saving. Switch to daed for GUI.')
|
||||
]),
|
||||
phWarn,
|
||||
textarea,
|
||||
editWrap,
|
||||
footer,
|
||||
E('div', { 'class': 'dd-editor-actions' }, [ save, init, insertSelect, status ])
|
||||
])
|
||||
|
||||
@@ -17,7 +17,7 @@ const CSS = [
|
||||
'.dd-log-toolbar label{display:inline-flex;align-items:center;gap:5px;font-size:11.5px;cursor:pointer;margin:0;opacity:.85}',
|
||||
'.dd-log-toolbar input[type="checkbox"]{margin:0}',
|
||||
'.dd-log-toolbar input[type="text"]{font-size:11.5px;padding:4px 8px;border-radius:5px;border:1px solid rgba(128,128,128,.28);background:transparent;color:inherit;min-width:160px}',
|
||||
'.dd-log-toolbar .dd-log-btn{font-size:11.5px;padding:4px 12px;border-radius:5px;border:1px solid rgba(128,128,128,.28);background:transparent;color:inherit;cursor:pointer}',
|
||||
'.dd-log-toolbar .dd-log-btn{font-size:11.5px;line-height:1.4;min-height:0;height:auto;padding:4px 12px;border-radius:5px;border:1px solid rgba(128,128,128,.28);background:transparent;color:inherit;cursor:pointer}',
|
||||
'.dd-log-toolbar .dd-log-btn:hover{background:rgba(128,128,128,.1)}',
|
||||
'.dd-log-toolbar .dd-log-meta{margin-left:auto;font-size:10.5px;opacity:.55;font-family:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,monospace}',
|
||||
'.dd-log-pane{height:60vh;min-height:360px;overflow:auto;padding:8px 10px;border:1px solid rgba(0,0,0,.08);border-radius:7px;background:#1a1d21;color:#d8dde6;font-family:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono",monospace;font-size:11.5px;line-height:1.55;white-space:pre-wrap;word-break:break-all}',
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
const CSS = [
|
||||
'.dd-wrap{padding:4px 0;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI","PingFang SC",sans-serif}',
|
||||
'.dd-card{border:1px solid rgba(0,0,0,.06);border-radius:10px;padding:10px 14px;margin-bottom:10px;box-shadow:0 2px 8px rgba(0,0,0,.03);background:rgba(255,255,255,.02)}',
|
||||
'.dd-card{border:1px solid rgba(0,0,0,.06);border-radius:10px;padding:9px 14px;margin-bottom:7px;box-shadow:0 2px 8px rgba(0,0,0,.03);background:rgba(255,255,255,.02)}',
|
||||
'.dd-card-title{font-size:11px;font-weight:600;opacity:.55;margin:0 0 8px;letter-spacing:.3px;text-transform:uppercase}',
|
||||
'.dd-status-row{display:flex;align-items:center;flex-wrap:wrap;gap:10px;margin-bottom:0}',
|
||||
'.dd-status-row .dd-grow{flex:1 1 auto}',
|
||||
@@ -18,7 +18,7 @@ const CSS = [
|
||||
'.dd-actions{display:flex;flex-wrap:wrap;gap:6px;margin:8px 0 0}',
|
||||
'.dd-actions .cbi-button{font-size:11.5px;padding:4px 12px;border-radius:5px}',
|
||||
'.dd-actions a.cbi-button{display:inline-flex;align-items:center;gap:4px}',
|
||||
'.dd-wrap .cbi-button{font-size:11px !important;padding:4px 12px !important;border-radius:5px !important;border:1px solid rgba(128,128,128,.35) !important;background:transparent !important;color:inherit !important;box-shadow:none !important;cursor:pointer;white-space:nowrap}',
|
||||
'.dd-wrap .cbi-button{font-size:11px !important;line-height:1.4 !important;min-height:0 !important;height:auto !important;padding:4px 12px !important;border-radius:5px !important;border:1px solid rgba(128,128,128,.35) !important;background:transparent !important;color:inherit !important;box-shadow:none !important;cursor:pointer;white-space:nowrap}',
|
||||
'.dd-wrap .cbi-button:hover{background:rgba(128,128,128,.12) !important}',
|
||||
'.dd-wrap .cbi-button:disabled{opacity:.45;cursor:not-allowed}',
|
||||
'.dd-wrap .cbi-button-action,.dd-wrap .cbi-button-positive,.dd-wrap .cbi-button-add,.dd-wrap .cbi-button-edit{border-color:#4aa065 !important;color:#4aa065 !important}',
|
||||
@@ -56,13 +56,18 @@ const CSS = [
|
||||
'.dd-settings-card .cbi-value-description,.dd-settings-card .cbi-value-helptext{font-size:11.5px !important;opacity:.6;line-height:1.45;padding-top:3px}',
|
||||
'.dd-settings-card .cbi-section-remove{background:transparent !important;border:0 !important;box-shadow:none !important}',
|
||||
'.dd-settings-card .cbi-section-remove .cbi-button{border-color:#d96d6d !important;color:#d96d6d !important}',
|
||||
'.dd-settings-card input[type="checkbox"]{box-shadow:none !important;background-repeat:no-repeat !important;background-position:center !important;background-size:62% !important}',
|
||||
'.dd-settings-card input[type="checkbox"]:before{content:none !important;display:none !important;box-shadow:none !important}',
|
||||
/* themes (esp. Argon) restyle checkboxes into faint, near-invisible boxes;
|
||||
force native rendering + brand accent so the checkmark is always clear */
|
||||
'.dd-settings-card input[type="checkbox"]{-webkit-appearance:checkbox !important;appearance:checkbox !important;accent-color:#4aa065;width:16px;height:16px;background:none !important;border:0 !important;box-shadow:none !important;background-image:none !important}',
|
||||
'.dd-settings-card input[type="checkbox"]:before,.dd-settings-card input[type="checkbox"]:after{content:none !important;display:none !important}',
|
||||
/* line the Subscriptions and Nodes grid tables up column-for-column. fixed
|
||||
layout + explicit per-column percentages make the widths authoritative
|
||||
across themes (Argon's auto layout otherwise sizes the empty Nodes table
|
||||
by content, and even ignores px cell widths, so they drift apart) */
|
||||
'.dd-settings-card .cbi-section-table{table-layout:fixed !important;width:100%}',
|
||||
/* flatten the table header: Argon tints header cells (#f6f9fc), which reads
|
||||
as an off-colour band on the white card — keep it transparent */
|
||||
'.dd-settings-card .cbi-section-table-titles,.dd-settings-card .cbi-section-table-titles .cbi-section-table-cell{background:transparent !important;background-image:none !important}',
|
||||
'.dd-settings-card .cbi-section-table-cell:nth-child(1){width:14% !important}',
|
||||
'.dd-settings-card .cbi-section-table-cell:nth-child(2){width:50% !important;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}',
|
||||
'.dd-settings-card .cbi-section-table-cell:nth-child(3){width:12% !important}',
|
||||
@@ -79,13 +84,37 @@ const CSS = [
|
||||
'.dd-adv-body{margin-top:8px;padding:2px 4px 4px}',
|
||||
'.dd-adv.dd-closed .dd-adv-body{display:none}',
|
||||
'.dd-editor{width:100%;min-height:460px;font-family:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono",monospace;font-size:12px;line-height:1.5;box-sizing:border-box;resize:vertical;border-radius:6px 6px 0 0}',
|
||||
/* syntax-highlight overlay: a <pre> sits behind a transparent <textarea>.
|
||||
both share identical box metrics so glyphs line up; the textarea stays the
|
||||
real editor (caret, selection, insert-at-cursor, jump-to-line all native) */
|
||||
'.dd-edit-wrap{position:relative}',
|
||||
'.dd-edit-wrap .dd-editor,.dd-edit-wrap .dd-hl{margin:0;padding:10px 12px;border-width:1px;font-family:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono",monospace;font-size:12px;line-height:1.5;letter-spacing:0;tab-size:4;white-space:pre-wrap;word-break:break-word;box-sizing:border-box}',
|
||||
'.dd-edit-wrap .dd-hl{position:absolute;inset:0;margin:0;overflow:hidden;border:1px solid transparent;border-radius:6px 6px 0 0;pointer-events:none;background:transparent;color:#3b4252;z-index:1}',
|
||||
'.dd-edit-wrap .dd-hl code{font:inherit;white-space:inherit;word-break:inherit;display:block}',
|
||||
'.dd-edit-wrap .dd-editor-hl{position:relative;z-index:2;color:transparent;background:transparent;caret-color:#2f7288;border:1px solid rgba(128,128,128,.28)}',
|
||||
'.dd-edit-wrap .dd-editor-hl::placeholder{color:rgba(128,128,128,.55)}',
|
||||
'.dd-edit-wrap .dd-editor-hl::selection{background:rgba(56,134,161,.25)}',
|
||||
'.dh-c{color:#8a919a;font-style:italic}',
|
||||
'.dh-s{color:#2a8a4a}',
|
||||
'.dh-k{color:#9a3fb5;font-weight:600}',
|
||||
'.dh-f{color:#2f7288}',
|
||||
'.dh-o{color:#c2772a}',
|
||||
'.dh-g{color:#b0226a}',
|
||||
'html[data-darkmode="true"] .dd-edit-wrap .dd-hl,body.dark .dd-edit-wrap .dd-hl,html[data-bs-theme="dark"] .dd-edit-wrap .dd-hl{color:#c8cdd6}',
|
||||
'html[data-darkmode="true"] .dd-edit-wrap .dd-editor-hl,body.dark .dd-edit-wrap .dd-editor-hl,html[data-bs-theme="dark"] .dd-edit-wrap .dd-editor-hl{caret-color:#7fd0e8}',
|
||||
'html[data-darkmode="true"] .dh-c,body.dark .dh-c{color:#6b7280}',
|
||||
'html[data-darkmode="true"] .dh-s,body.dark .dh-s{color:#7ec699}',
|
||||
'html[data-darkmode="true"] .dh-k,body.dark .dh-k{color:#c792ea}',
|
||||
'html[data-darkmode="true"] .dh-f,body.dark .dh-f{color:#82c4dd}',
|
||||
'html[data-darkmode="true"] .dh-o,body.dark .dh-o{color:#e0a35a}',
|
||||
'html[data-darkmode="true"] .dh-g,body.dark .dh-g{color:#ec6fa8}',
|
||||
'.dd-editor-footer{display:flex;flex-wrap:wrap;align-items:center;gap:14px;padding:5px 10px;font-family:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,monospace;font-size:10.5px;background:rgba(128,128,128,.06);border:1px solid rgba(0,0,0,.06);border-top:0;border-radius:0 0 6px 6px;color:inherit;opacity:.78}',
|
||||
'.dd-editor-footer .dd-fb-item{display:inline-flex;align-items:center;gap:5px}',
|
||||
'.dd-editor-footer .dd-fb-key{opacity:.55}',
|
||||
'.dd-editor-footer .dd-fb-warn{color:#b07d00;font-weight:600}',
|
||||
'.dd-editor-footer .dd-fb-ok{color:#3da66a;font-weight:600}',
|
||||
'body.dark .dd-editor-footer,html[data-theme="dark"] .dd-editor-footer,html[data-bs-theme="dark"] .dd-editor-footer{border-color:rgba(255,255,255,.1);background:rgba(255,255,255,.04)}',
|
||||
'body.dark .dd-editor-footer .dd-fb-warn,html[data-theme="dark"] .dd-editor-footer .dd-fb-warn,html[data-bs-theme="dark"] .dd-editor-footer .dd-fb-warn{color:#e0b34a}',
|
||||
'body.dark .dd-editor-footer,html[data-theme="dark"] .dd-editor-footer,html[data-bs-theme="dark"] .dd-editor-footer,html[data-darkmode="true"] .dd-editor-footer{border-color:rgba(255,255,255,.1);background:rgba(255,255,255,.04)}',
|
||||
'body.dark .dd-editor-footer .dd-fb-warn,html[data-theme="dark"] .dd-editor-footer .dd-fb-warn,html[data-bs-theme="dark"] .dd-editor-footer .dd-fb-warn,html[data-darkmode="true"] .dd-editor-footer .dd-fb-warn{color:#e0b34a}',
|
||||
'.dd-insert-select{font-size:11.5px;padding:4px 8px;border-radius:5px;border:1px solid rgba(128,128,128,.35);background:transparent;color:inherit;cursor:pointer}',
|
||||
'.dd-insert-select:hover{border-color:rgba(56,134,161,.55)}',
|
||||
'.dd-editor-actions{display:flex;flex-wrap:wrap;align-items:center;gap:8px;margin-top:10px}',
|
||||
@@ -108,7 +137,7 @@ const CSS = [
|
||||
'.dd-ph-warn{display:none;font-size:12px;line-height:1.6;margin:0 0 8px;padding:10px 12px;border-radius:6px;background:rgba(217,158,0,.08);color:inherit}',
|
||||
'.dd-ph-warn.show{display:block}',
|
||||
'.dd-ph-warn-title{font-weight:600;margin-bottom:6px;color:#b07d00;font-size:12.5px}',
|
||||
'body.dark .dd-ph-warn-title,html[data-theme="dark"] .dd-ph-warn-title,html[data-bs-theme="dark"] .dd-ph-warn-title{color:#e0b34a}',
|
||||
'body.dark .dd-ph-warn-title,html[data-theme="dark"] .dd-ph-warn-title,html[data-bs-theme="dark"] .dd-ph-warn-title,html[data-darkmode="true"] .dd-ph-warn-title{color:#e0b34a}',
|
||||
'.dd-ph-howto{margin:4px 0 8px;opacity:.85}',
|
||||
'.dd-ph-howto code{padding:1px 5px;border-radius:3px;background:rgba(128,128,128,.18);font-size:11px;font-family:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,monospace}',
|
||||
'.dd-ph-list{margin:6px 0 0;padding:6px 0 0;list-style:none;border-top:1px dashed rgba(217,158,0,.3)}',
|
||||
@@ -116,11 +145,21 @@ const CSS = [
|
||||
'.dd-ph-list li{padding:2px 0;display:flex;gap:8px;align-items:baseline;font-family:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,monospace;font-size:11px}',
|
||||
'.dd-ph-list .dd-ph-ln{display:inline-block;min-width:38px;text-align:center;padding:1px 4px;border-radius:3px;background:rgba(217,158,0,.18);color:#8a6300;opacity:.95;cursor:pointer;font-weight:600;text-decoration:none}',
|
||||
'.dd-ph-list .dd-ph-ln:hover{background:rgba(217,158,0,.32)}',
|
||||
'body.dark .dd-ph-list .dd-ph-ln,html[data-theme="dark"] .dd-ph-list .dd-ph-ln,html[data-bs-theme="dark"] .dd-ph-list .dd-ph-ln{color:#f0c763;background:rgba(217,158,0,.22)}',
|
||||
'body.dark .dd-ph-list .dd-ph-ln,html[data-theme="dark"] .dd-ph-list .dd-ph-ln,html[data-bs-theme="dark"] .dd-ph-list .dd-ph-ln,html[data-darkmode="true"] .dd-ph-list .dd-ph-ln{color:#f0c763;background:rgba(217,158,0,.22)}',
|
||||
'.dd-ph-list .dd-ph-txt{opacity:.7;word-break:break-all}',
|
||||
'body.dark .dd-card,html[data-theme="dark"] .dd-card,html[data-bs-theme="dark"] .dd-card{border-color:rgba(255,255,255,.08);background:rgba(255,255,255,.02)}',
|
||||
'body.dark .dd-adv-bar,html[data-theme="dark"] .dd-adv-bar,html[data-bs-theme="dark"] .dd-adv-bar{background:rgba(255,255,255,.04);border-color:rgba(255,255,255,.10)}',
|
||||
'body.dark .dd-settings-card .cbi-value-field input,body.dark .dd-settings-card .cbi-value-field select,body.dark .dd-settings-card .cbi-value-field textarea,html[data-theme="dark"] .dd-settings-card .cbi-value-field input,html[data-theme="dark"] .dd-settings-card .cbi-value-field select,html[data-theme="dark"] .dd-settings-card .cbi-value-field textarea,html[data-bs-theme="dark"] .dd-settings-card .cbi-value-field input,html[data-bs-theme="dark"] .dd-settings-card .cbi-value-field select,html[data-bs-theme="dark"] .dd-settings-card .cbi-value-field textarea{border-color:rgba(255,255,255,.18)}'
|
||||
'body.dark .dd-card,html[data-theme="dark"] .dd-card,html[data-bs-theme="dark"] .dd-card,html[data-darkmode="true"] .dd-card{border-color:rgba(255,255,255,.08);background:rgba(255,255,255,.02)}',
|
||||
'body.dark .dd-adv-bar,html[data-theme="dark"] .dd-adv-bar,html[data-bs-theme="dark"] .dd-adv-bar,html[data-darkmode="true"] .dd-adv-bar{background:rgba(255,255,255,.04);border-color:rgba(255,255,255,.10)}',
|
||||
'body.dark .dd-settings-card .cbi-value-field input,body.dark .dd-settings-card .cbi-value-field select,body.dark .dd-settings-card .cbi-value-field textarea,html[data-theme="dark"] .dd-settings-card .cbi-value-field input,html[data-theme="dark"] .dd-settings-card .cbi-value-field select,html[data-theme="dark"] .dd-settings-card .cbi-value-field textarea,html[data-bs-theme="dark"] .dd-settings-card .cbi-value-field input,html[data-bs-theme="dark"] .dd-settings-card .cbi-value-field select,html[data-bs-theme="dark"] .dd-settings-card .cbi-value-field textarea,html[data-darkmode="true"] .dd-settings-card .cbi-value-field input,html[data-darkmode="true"] .dd-settings-card .cbi-value-field select,html[data-darkmode="true"] .dd-settings-card .cbi-value-field textarea{border-color:rgba(255,255,255,.18)}',
|
||||
/* phone: render each subscription/node row as a self-contained card instead
|
||||
of a cramped table (LuCI already block-stacks the cells; we add the card
|
||||
frame, drop the desktop column widths, and shrink the action buttons) */
|
||||
'@media (max-width:600px){',
|
||||
'.dd-settings-card .cbi-section-table-cell:nth-child(1),.dd-settings-card .cbi-section-table-cell:nth-child(2),.dd-settings-card .cbi-section-table-cell:nth-child(3),.dd-settings-card .cbi-section-table-cell:nth-child(4){width:auto !important;min-width:0 !important;white-space:normal !important;overflow:visible !important;text-overflow:clip !important}',
|
||||
'.dd-settings-card .cbi-section-table-row{display:block;border:1px solid rgba(128,128,128,.2);border-radius:8px;padding:6px 10px;margin:0 0 8px;background:rgba(128,128,128,.03)}',
|
||||
'.dd-settings-card .cbi-section-table-cell{display:block;padding:3px 0 !important}',
|
||||
'.dd-settings-card .cbi-section-actions{display:flex;flex-wrap:wrap;gap:6px;padding-top:6px !important}',
|
||||
'.dd-settings-card .cbi-section-actions .cbi-button{width:auto;margin:0;flex:0 0 auto}',
|
||||
'}'
|
||||
].join('');
|
||||
|
||||
return baseclass.extend({ CSS: CSS });
|
||||
@@ -31,7 +31,7 @@ const CSS = [
|
||||
'.dd-up-name{font-weight:600;opacity:.85}',
|
||||
'.dd-up-meta{opacity:.7;font-family:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,monospace;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}',
|
||||
'.dd-up-version{font-size:11px;opacity:.55;font-family:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,monospace;white-space:nowrap}',
|
||||
'.dd-up-btn{font-size:11px;padding:4px 12px;border-radius:5px;border:1px solid rgba(128,128,128,.35);background:transparent;color:inherit;cursor:pointer;white-space:nowrap}',
|
||||
'.dd-up-btn{font-size:11px;line-height:1.4;min-height:0;height:auto;padding:4px 12px;border-radius:5px;border:1px solid rgba(128,128,128,.35);background:transparent;color:inherit;cursor:pointer;white-space:nowrap}',
|
||||
'.dd-up-btn:hover{background:rgba(128,128,128,.12)}',
|
||||
'.dd-up-btn:disabled{opacity:.45;cursor:not-allowed}',
|
||||
'.dd-up-btn-primary{border-color:#4aa065;color:#4aa065}',
|
||||
|
||||
@@ -202,7 +202,7 @@ function renderStatusCard(ctx, listenAddr) {
|
||||
});
|
||||
actions.push(restart);
|
||||
}
|
||||
if (be.name === 'dae') {
|
||||
if (state.running && be.name === 'dae') {
|
||||
const hot = E('button', { 'class': 'cbi-button cbi-button-action' }, _('Hot Reload'));
|
||||
hot.addEventListener('click', function(ev) {
|
||||
ev.preventDefault();
|
||||
|
||||
Reference in new issue
Block a user