@qpjoy/electron-tunnel 0.1.2 → 0.1.3

package/dist/admin/AdminServer.js

@@ -209,6 +209,23 @@ class AdminServer {
                 sendJson(res, 200, subscription);
             };
         }
+        const editSubscriptionMatch = pathname.match(/^\/api\/subscriptions\/(\d+)$/);
+        if ((method === 'PATCH' || method === 'PUT') && editSubscriptionMatch) {
+            return async (_req, res, body) => {
+                const input = body;
+                const subscription = await this.manager.editSubscription({
+                    ...input,
+                    id: Number(editSubscriptionMatch[1])
+                });
+                if (subscription.active) {
+                    await this.applyRuntimeConfigChange();
+                }
+                else {
+                    await this.notifySettingsChange();
+                }
+                sendJson(res, 200, subscription);
+            };
+        }
         const deleteSubscriptionMatch = pathname.match(/^\/api\/subscriptions\/(\d+)$/);
         if (method === 'DELETE' && deleteSubscriptionMatch) {
             return async (_req, res) => {
@@ -241,6 +258,13 @@ class AdminServer {
                 sendJson(res, 200, rules);
             };
         }
+        if (method === 'DELETE' && presetMatch) {
+            return async (_req, res) => {
+                const count = this.manager.removePreset(presetMatch[1]);
+                await this.applyRuntimeConfigChange();
+                sendJson(res, 200, { ok: true, count });
+            };
+        }
         return null;
     }
 }

package/dist/admin/admin-ui.js

@@ -57,7 +57,7 @@ function navMarkup() {
 function presetMarkup() {
     return Object.keys(defaults_1.DOMAIN_PRESETS).map((id) => {
         const preset = presetLabels[id] ?? { label: id, icon: 'globe' };
-        return '<button class="btn outline" data-preset="' + id + '">' + icon(preset.icon) + '<span>' + preset.label + '</span></button>';
+        return '<button class="btn outline" data-preset="' + id + '" data-preset-button="' + id + '">' + icon(preset.icon) + '<span>' + preset.label + '</span></button>';
     }).join('');
 }
 function adminHtml() {
@@ -105,6 +105,7 @@ function adminHtml() {
     .field-short{width:150px}
     .btn{height:42px;border:1px solid #1578ff;border-radius:6px;background:#1976d2;color:#fff;padding:0 16px;display:inline-flex;align-items:center;justify-content:center;gap:9px;font-weight:800;white-space:nowrap}
     .btn.outline{background:#fff;color:#1976d2}
+    .btn.active{background:#dce9ff;color:#0f62d0}
     .btn.negative{background:#fff;color:#c10015;border-color:#c10015}
     .icon-button{width:46px;height:46px;border:0;border-radius:50%;background:transparent;color:#101418;display:grid;place-items:center}
     .icon-button.outline{border:1px solid #1976d2;color:#1976d2;background:#fff}
@@ -124,6 +125,12 @@ function adminHtml() {
     .mono-log{height:calc(100vh - 150px);min-height:280px;overflow:auto;border-radius:8px;background:#101418;color:#dbeafe;font-family:ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;font-size:12px;line-height:1.5;padding:12px;white-space:pre-wrap}
     .toast{position:fixed;right:18px;top:18px;z-index:20;max-width:min(520px,calc(100vw - 36px));border-radius:6px;padding:12px 16px;background:#21ba45;color:#fff;box-shadow:0 8px 24px rgba(16,24,40,.18);font-weight:700}
     .toast.negative{background:#c10015}
+    .modal-backdrop{position:fixed;inset:0;z-index:15;display:grid;place-items:center;background:rgba(15,23,42,.28);padding:24px}
+    .modal-card{width:min(720px,100%);border:1px solid #dfe4ea;border-radius:8px;background:#fff;padding:18px;box-shadow:0 18px 48px rgba(16,24,40,.22)}
+    .modal-title{margin:0 0 14px;font-size:22px;font-weight:800}
+    .modal-form{display:grid;grid-template-columns:1fr 1fr;gap:12px}
+    .modal-form .wide{grid-column:1 / -1}
+    .modal-actions{display:flex;justify-content:flex-end;gap:10px;margin-top:16px}
     .empty{color:#697386;padding:10px 0}
     [hidden]{display:none!important}
     @media (max-width:860px){
@@ -166,6 +173,7 @@ function adminHtml() {
   </div>
 
   <div id="toast" class="toast" hidden></div>
+  <div id="modal" class="modal-backdrop" hidden></div>
 
   <script>
     var token = window.localStorage.getItem('qpjoyTunnelAdminToken') || '';
@@ -218,14 +226,16 @@ function adminHtml() {
       toast.timer = window.setTimeout(function () { el.hidden = true; }, 1800);
     }
     async function run(action, message) {
-      if (busy) return;
+      if (busy) return false;
       setBusy(true);
       try {
         await action();
         await refresh();
         if (message) toast(message, false);
+        return true;
       } catch (error) {
         toast(error instanceof Error ? error.message : String(error), true);
+        return false;
       } finally {
         setBusy(false);
       }
@@ -267,6 +277,12 @@ function adminHtml() {
     function status() {
       return snapshot ? snapshot.status : null;
     }
+    function presetActive(preset) {
+      return !!((snapshot && snapshot.rules) || []).some(function (rule) { return rule.source === 'preset:' + preset; });
+    }
+    function subscriptionById(id) {
+      return ((snapshot && snapshot.subscriptions) || []).find(function (sub) { return sub.id === Number(id); });
+    }
     function renderFrame() {
       var s = status();
       byId('pageTitle').textContent = pageTitles[currentPage] || '首页';
@@ -332,6 +348,7 @@ function adminHtml() {
       var cards = items.length ? items.map(function (sub) {
         return '<article class="subscription-card ' + (sub.active ? 'active' : '') + '">' +
           '<div class="card-head"><span>${icon('subscriptions')}</span><div class="card-title">' + escapeHtml(sub.name) + '</div><div class="spacer"></div>' +
+          '<button class="icon-button" data-edit-sub="' + sub.id + '" title="编辑">${icon('save')}</button>' +
           '<button class="icon-button" data-refresh-sub="' + sub.id + '" title="刷新">${icon('refresh')}</button>' +
           '<button class="icon-button" data-delete-sub="' + sub.id + '" title="删除">${icon('delete')}</button></div>' +
           '<div class="muted ellipsis">' + escapeHtml(redactedUrl(sub.url)) + '</div>' +
@@ -402,6 +419,51 @@ function adminHtml() {
       else if (currentPage === 'logs') body.innerHTML = renderLogs();
       else body.innerHTML = renderHome();
       bindPageEvents();
+      document.querySelectorAll('[data-preset-button]').forEach(function (button) {
+        var preset = button.dataset.presetButton;
+        var active = presetActive(preset);
+        button.classList.toggle('active', active);
+        button.title = active ? '再次点击移除这一组白名单' : '点击加入这一组白名单';
+      });
+    }
+    function closeModal() {
+      var modal = byId('modal');
+      modal.hidden = true;
+      modal.innerHTML = '';
+    }
+    function openEditSubscriptionModal(id) {
+      var sub = subscriptionById(id);
+      if (!sub) return;
+      var modal = byId('modal');
+      modal.innerHTML = '<div class="modal-card">' +
+        '<h2 class="modal-title">编辑订阅</h2>' +
+        '<div class="modal-form">' +
+        '<input id="editSubUrl" class="field wide" placeholder="订阅文件链接" value="' + escapeHtml(sub.url) + '">' +
+        '<input id="editSubName" class="field" placeholder="名称" value="' + escapeHtml(sub.name) + '">' +
+        '<input id="editSubUser" class="field" placeholder="用户" value="' + escapeHtml(sub.username || '') + '">' +
+        '<input id="editSubPass" class="field wide" type="password" placeholder="密码" value="' + escapeHtml(sub.password || '') + '">' +
+        '</div>' +
+        '<div class="modal-actions">' +
+        '<button id="cancelEditSub" class="btn outline">取消</button>' +
+        '<button id="saveEditSub" class="btn">${icon('save')}<span>保存</span></button>' +
+        '</div>' +
+        '</div>';
+      modal.hidden = false;
+      byId('cancelEditSub').onclick = closeModal;
+      byId('saveEditSub').onclick = async function () {
+        var saved = await run(function () {
+          return api('/api/subscriptions/' + sub.id, {
+            method: 'PATCH',
+            body: JSON.stringify({
+              name: byId('editSubName').value,
+              url: byId('editSubUrl').value,
+              username: byId('editSubUser').value,
+              password: byId('editSubPass').value
+            })
+          });
+        }, '订阅已保存');
+        if (saved) closeModal();
+      };
     }
     function bindPageEvents() {
       var modeSelect = byId('modeSelect');
@@ -453,12 +515,16 @@ function adminHtml() {
     document.body.onclick = function (event) {
       var target = event.target;
       if (!(target instanceof Element)) return;
-      var element = target.closest('[data-preset],[data-active-sub],[data-refresh-sub],[data-delete-sub],[data-rule-remove],[data-test-url]');
+      var element = target.closest('[data-preset],[data-active-sub],[data-refresh-sub],[data-delete-sub],[data-edit-sub],[data-rule-remove],[data-test-url]');
       if (!element) return;
-      if (element.dataset.preset) run(function () { return api('/api/presets/' + element.dataset.preset, { method: 'POST' }); }, '白名单集合已加入');
+      if (element.dataset.preset) {
+        var active = presetActive(element.dataset.preset);
+        run(function () { return api('/api/presets/' + element.dataset.preset, { method: active ? 'DELETE' : 'POST' }); }, active ? '白名单集合已移除' : '白名单集合已加入');
+      }
       if (element.dataset.activeSub) run(function () { return api('/api/subscriptions/' + element.dataset.activeSub + '/active', { method: 'POST' }); }, '订阅已启用');
       if (element.dataset.refreshSub) run(function () { return api('/api/subscriptions/' + element.dataset.refreshSub + '/update', { method: 'POST' }); }, '订阅已更新');
       if (element.dataset.deleteSub) run(function () { return api('/api/subscriptions/' + element.dataset.deleteSub, { method: 'DELETE' }); }, '订阅已删除');
+      if (element.dataset.editSub) openEditSubscriptionModal(Number(element.dataset.editSub));
       if (element.dataset.ruleRemove) run(function () { return api('/api/rules/' + element.dataset.ruleRemove, { method: 'DELETE' }); }, '规则已删除');
       if (element.dataset.testUrl) {
         var testInput = byId('testUrl');

package/dist/db/TunnelDatabase.d.ts

@@ -11,12 +11,14 @@ export declare class TunnelDatabase {
     getSubscription(id: number): SubscriptionRecord | null;
     getActiveSubscription(): SubscriptionRecord | null;
     createSubscription(input: SubscriptionInput): SubscriptionRecord;
+    updateSubscription(id: number, input: SubscriptionInput): SubscriptionRecord;
     deleteSubscription(id: number): void;
     setActiveSubscription(id: number): SubscriptionRecord;
     updateSubscriptionContent(id: number, content: string, localPath: string): SubscriptionRecord;
     listRules(): DomainRule[];
     upsertRule(kind: DomainRuleKind, domain: string, source?: string): DomainRule;
     removeRule(id: number): void;
+    removeRulesBySource(source: string): number;
     addEvent(level: EventRecord['level'], message: string): void;
     listEvents(limit?: number): EventRecord[];
     private ensureDefaultSettings;

package/dist/db/TunnelDatabase.js

@@ -174,6 +174,33 @@ class TunnelDatabase {
         }
         return this.getSubscription(created.id) ?? created;
     }
+    updateSubscription(id, input) {
+        const current = this.getSubscription(id);
+        if (!current) {
+            throw new Error(`subscription not found: ${id}`);
+        }
+        this.db.prepare(`
+      UPDATE subscriptions
+      SET name = @name,
+          url = @url,
+          username = @username,
+          password = @password,
+          updated_at = @updatedAt
+      WHERE id = @id
+    `).run({
+            id,
+            name: input.name,
+            url: input.url,
+            username: input.username ?? '',
+            password: input.password ?? '',
+            updatedAt: nowIso()
+        });
+        const updated = this.getSubscription(id);
+        if (!updated) {
+            throw new Error(`subscription not found after update: ${id}`);
+        }
+        return updated;
+    }
     deleteSubscription(id) {
         this.db.prepare('DELETE FROM subscriptions WHERE id = ?').run(id);
         const active = this.getActiveSubscription();
@@ -245,6 +272,10 @@ class TunnelDatabase {
     removeRule(id) {
         this.db.prepare('DELETE FROM domain_rules WHERE id = ?').run(id);
     }
+    removeRulesBySource(source) {
+        const result = this.db.prepare('DELETE FROM domain_rules WHERE source = ?').run(source);
+        return Number(result.changes);
+    }
     addEvent(level, message) {
         this.db.prepare(`
       INSERT INTO events (level, message, created_at)

package/dist/ipc/registerTunnelIpc.js

@@ -20,6 +20,16 @@ function registerTunnelIpc(ipcMain, manager, options) {
         }
         return subscription;
     });
+    ipcMain.handle('tunnel:edit-subscription', async (_event, input) => {
+        const subscription = await manager.editSubscription(input);
+        if (subscription.active) {
+            await runtimeChanged(manager, options);
+        }
+        else {
+            await changed(options);
+        }
+        return subscription;
+    });
     ipcMain.handle('tunnel:delete-subscription', async (_event, id) => {
         manager.deleteSubscription(id);
         await runtimeChanged(manager, options);
@@ -95,4 +105,9 @@ function registerTunnelIpc(ipcMain, manager, options) {
         await runtimeChanged(manager, options);
         return rules;
     });
+    ipcMain.handle('tunnel:remove-preset', async (_event, preset) => {
+        const count = manager.removePreset(preset);
+        await runtimeChanged(manager, options);
+        return count;
+    });
 }

package/dist/mihomo/MihomoManager.d.ts

@@ -2,7 +2,7 @@ import { EventEmitter } from 'events';
 import { TunnelDatabase } from '../db/TunnelDatabase';
 import { type DomainPresetId } from '../defaults';
 import { MihomoApi } from './MihomoApi';
-import type { DomainRule, RuntimeMode, SubscriptionInput, SubscriptionRecord, TunnelManagerOptions, TunnelSnapshot, TunnelPorts, TunnelStatus } from '../types';
+import type { DomainRule, RuntimeMode, SubscriptionInput, SubscriptionUpdateInput, SubscriptionRecord, TunnelManagerOptions, TunnelSnapshot, TunnelPorts, TunnelStatus } from '../types';
 interface ManagerPaths {
     root: string;
     db: string;
@@ -32,6 +32,7 @@ export declare class MihomoManager extends EventEmitter {
     listRules(): DomainRule[];
     listEvents(): import("../types").EventRecord[];
     createSubscription(input: SubscriptionInput): Promise<SubscriptionRecord>;
+    editSubscription(input: SubscriptionUpdateInput): Promise<SubscriptionRecord>;
     private localSubscriptionPath;
     private fetchSubscriptionContent;
     deleteSubscription(id: number): void;
@@ -46,6 +47,7 @@ export declare class MihomoManager extends EventEmitter {
     updateActiveSubscription(): Promise<SubscriptionRecord>;
     addDomainRule(kind: 'allow' | 'block', domain: string, source?: string): DomainRule;
     addPreset(preset: DomainPresetId): DomainRule[];
+    removePreset(preset: DomainPresetId): number;
     removeDomainRule(id: number): void;
     renderConfig(): string;
     private runExclusive;

package/dist/mihomo/MihomoManager.js

@@ -210,6 +210,20 @@ class MihomoManager extends events_1.EventEmitter {
             throw error;
         }
     }
+    async editSubscription(input) {
+        const current = this.db.getSubscription(input.id);
+        if (!current) {
+            throw new Error(`subscription not found: ${input.id}`);
+        }
+        const normalized = normalizeSubscriptionInput(input);
+        const content = await this.fetchSubscriptionContent(normalized);
+        const subscription = this.db.updateSubscription(input.id, normalized);
+        const localPath = this.localSubscriptionPath(subscription.id);
+        (0, fs_1.writeFileSync)(localPath, content, 'utf8');
+        const updated = this.db.updateSubscriptionContent(subscription.id, content, localPath);
+        this.log('info', `Subscription edited: ${updated.name}`);
+        return updated;
+    }
     localSubscriptionPath(id) {
         return (0, path_1.join)(this.paths.profiles, `subscription-${id}.yaml`);
     }
@@ -313,6 +327,11 @@ class MihomoManager extends events_1.EventEmitter {
         this.log('info', `Preset allowlist added: ${preset}`);
         return rules;
     }
+    removePreset(preset) {
+        const changes = this.db.removeRulesBySource(`preset:${preset}`);
+        this.log('info', `Preset allowlist removed: ${preset} (${changes} rules)`);
+        return changes;
+    }
     removeDomainRule(id) {
         this.db.removeRule(id);
         this.log('info', `Domain rule removed: ${id}`);

package/dist/types.d.ts

@@ -24,6 +24,9 @@ export interface SubscriptionInput {
     username?: string;
     password?: string;
 }
+export interface SubscriptionUpdateInput extends SubscriptionInput {
+    id: number;
+}
 export interface SubscriptionRecord extends Required<SubscriptionInput> {
     id: number;
     localPath: string | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qpjoy/electron-tunnel",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "private": false,
   "description": "Reusable QPJoy tunnel runtime and CLI for Electron apps on macOS and Linux.",
   "license": "UNLICENSED",