InPanel 1.2.4__tar.gz → 1.2.5__tar.gz

{inpanel-1.2.4 → inpanel-1.2.5}/InPanel.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: InPanel
-Version: 1.2.4
+Version: 1.2.5
 Summary: InPanel - A Web-based Linux Server Management Tool
 Author-email: Jackson Dou <jksdou@qq.com>
 Maintainer-email: Jackson Dou <jksdou@qq.com>

{inpanel-1.2.4 → inpanel-1.2.5}/InPanel.egg-info/SOURCES.txt

@@ -68,7 +68,6 @@ inpanel/mod/shell.py
 inpanel/mod/ssh.py
 inpanel/mod/system.py
 inpanel/mod/task.py
-inpanel/mod/ufw.py
 inpanel/mod/user.py
 inpanel/mod/vsftpd.py
 inpanel/mod/yum.py
@@ -209,6 +208,7 @@ inpanel/public/partials/utils/process.html
 inpanel/public/partials/utils/shell.html
 inpanel/public/partials/utils/sources.html
 inpanel/public/partials/utils/ssl.html
+inpanel/public/partials/utils/task.html
 inpanel/public/partials/utils/time.html
 inpanel/public/partials/utils/user.html
 inpanel/public/templates/index.html

{inpanel-1.2.4 → inpanel-1.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: InPanel
-Version: 1.2.4
+Version: 1.2.5
 Summary: InPanel - A Web-based Linux Server Management Tool
 Author-email: Jackson Dou <jksdou@qq.com>
 Maintainer-email: Jackson Dou <jksdou@qq.com>

{inpanel-1.2.4 → inpanel-1.2.5}/inpanel/app.py

@@ -384,7 +384,7 @@ def run_server():
         (r'/api/firewall/(.+)', web.FirewallHandler),
         (r'/api/setting/(.+)', web.SettingHandler),
         (r'/api/operation/(.+)', web.OperationHandler),
-        (r'/api/backend/(.+)', web.BackendHandler),
+        (r'/api/task/(.+)', web.TaskHandler),
         (r'/api/sitepackage/(.+)', web.SitePackageHandler),
         (r'/api/client/(.+)', web.ClientHandler),
         (r'/api/plugins', web.PluginHandler),

{inpanel-1.2.4 → inpanel-1.2.5}/inpanel/base.py

@@ -41,7 +41,7 @@ __author__ = 'Jackson Dou'
 __license__ = 'BSD'
 
 app_name    = 'InPanel'
-releasetime = '2026-07-17'
+releasetime = '2026-07-18'
 DEBUG       = False
 COMMENTFLAG = '#INPANEL#'
 GENBY       = 'AUTOMATICALLY GENERATED BY INPANEL'

{inpanel-1.2.4 → inpanel-1.2.5}/inpanel/mod/query.py

@@ -25,16 +25,16 @@ def handle_query(items):
     qdict = {'server': [], 'service': [], 'config': [], 'tool': []}
     
     for item in items:
-        if item == '**':
-            qdict = {'server': '**', 'service': '**'}
+        if item == 'all':
+            qdict = {'server': 'all', 'service': 'all'}
             break
-        elif item == '*':
-            qdict = {'server': '*', 'service': '*'}
+        elif item == 'dynamic':
+            qdict = {'server': 'dynamic', 'service': 'dynamic'}
             break
-        elif item == 'server.**':
-            qdict['server'] = '**'
-        elif item == 'mod.service.**':
-            qdict['service'] = '**'
+        elif item == 'server.all':
+            qdict['server'] = 'all'
+        elif item == 'service.all':
+            qdict['service'] = 'all'
         else:
             iteminfo = item.split('.', 1)
             if len(iteminfo) != 2:
@@ -42,9 +42,12 @@ def handle_query(items):
             sec, q = iteminfo
             if sec not in ('server', 'service', 'config', 'tool'):
                 continue
-            if qdict[sec] == '**':
+            if qdict[sec] == 'all':
                 continue
-            qdict[sec].append(q)
+            if q in ('all', 'dynamic'):
+                qdict[sec] = q
+            else:
+                qdict[sec].append(q)
 
     config_items = {
         'fstab': False,
@@ -57,9 +60,9 @@ def handle_query(items):
     for sec, qs in qdict.items():
         if sec == 'server':
             server_items = server.ServerInfo.server_items
-            if qs == '**':
+            if qs == 'all':
                 qs = server_items.keys()
-            elif qs == '*':
+            elif qs == 'dynamic':
                 qs = [item for item, relup in server_items.items() if relup == True]
             for q in qs:
                 if q not in server_items:
@@ -68,9 +71,9 @@ def handle_query(items):
         elif sec == 'service':
             service_items = service.Service.service_items
             autostart_services = service.get_autostart_list()
-            if qs == '**':
+            if qs == 'all':
                 qs = service_items.keys()
-            elif qs == '*':
+            elif qs == 'dynamic':
                 qs = [item for item, relup in service_items.items() if relup == True]
             for q in qs:
                 if q not in service_items:

{inpanel-1.2.4 → inpanel-1.2.5}/inpanel/mod/remote.py

@@ -13,7 +13,7 @@ import base64
 import os
 import shlex
 
-from .lib import pxssh
+from ..lib import pxssh
 
 
 def inpanel_install(ssh_ip, ssh_port, ssh_user, ssh_password, accesskey=None, inpanel_ip=None, inpanel_port=None):

{inpanel-1.2.4 → inpanel-1.2.5}/inpanel/mod/task.py

@@ -6,8 +6,18 @@
 # InPanel is distributed under the terms of the (new) BSD License.
 # The full license can be found in 'LICENSE'.
 
-"""任务管理模块"""
+"""后台异步任务管理模块
 
+提供异步任务的生命周期管理：创建、执行、状态查询、取消、清理。
+
+设计原则：
+- TaskManager 管理任务状态（running → finish/cancel）
+- 业务逻辑由各 async 方法实现，通过 run_job() 提交到事件循环
+- 前端通过 Task service 的 "POST 创建 → GET 轮询" 模式获取任务结果
+"""
+
+import asyncio
+import logging
 import time
 from datetime import datetime
 from functools import partial
@@ -18,7 +28,6 @@ from subprocess import PIPE, Popen
 import tornado.escape
 import tornado.httpclient
 
-from . import remote
 from ..base import app_api, os_versint
 from . import disk
 from . import shell
@@ -29,52 +38,145 @@ from . import file
 from . import ssh
 from . import ftp
 
+logger = logging.getLogger(__name__)
+
 
 class TaskManager:
-    jobs = {}
-    locks = {}
+    """后台异步任务管理器。
+
+    管理所有后台任务的创建、执行、状态追踪。
+
+    任务状态流转:
+        running → finish (成功/失败)
+        running → cancel (用户取消)
+    """
+
+    # 类变量：所有实例共享同一份任务数据
+    _jobs = {}    # {jobname: {status, code, msg, started_at, finished_at, data?}}
+    _locks = {}   # {lockname: True}  互斥锁
 
     def __init__(self, settings, config):
         self.settings = settings
         self.config = config
 
+    # ------------------------------------------------------------------
+    # 任务生命周期管理（公共接口）
+    # ------------------------------------------------------------------
+
+    def run_job(self, coro):
+        """将协程提交到事件循环异步执行。
+
+        Args:
+            coro: 协程对象 或 返回协程的 callable（如 partial, lambda）
+        """
+        async def _wrapper():
+            try:
+                if callable(coro) and not asyncio.iscoroutine(coro):
+                    await coro()
+                else:
+                    await coro
+            except Exception as e:
+                logger.error(f"TaskManager async task error: {e}", exc_info=True)
+        asyncio.ensure_future(_wrapper())
+
+    def get_job(self, jobname):
+        """获取指定任务的状态。
+
+        Returns:
+            dict: 任务状态，不存在的任务返回 {'status': 'none', 'code': -1, 'msg': ''}
+        """
+        if jobname not in self._jobs:
+            return {'status': 'none', 'code': -1, 'msg': ''}
+        return self._jobs[jobname]
+
+    def list_jobs(self):
+        """获取所有任务列表。
+
+        Returns:
+            list[dict]: 任务列表，每个任务包含 name, status, code, msg, started_at, finished_at
+        """
+        result = []
+        for name, info in self._jobs.items():
+            result.append({
+                'name': name,
+                'status': info.get('status', 'unknown'),
+                'code': info.get('code', -1),
+                'msg': info.get('msg', ''),
+                'started_at': info.get('started_at', 0),
+                'finished_at': info.get('finished_at', 0),
+            })
+        return result
+
+    def cancel_job(self, jobname):
+        """取消指定任务（仅标记状态，不强制终止进程）。
+
+        Returns:
+            bool: 是否成功取消
+        """
+        if jobname not in self._jobs:
+            return False
+        if self._jobs[jobname]['status'] == 'running':
+            self._jobs[jobname]['status'] = 'cancel'
+            self._jobs[jobname]['msg'] = '任务已被用户取消'
+            return True
+        return False
+
+    def clear_finished(self):
+        """清除所有已完成/已取消/无效的任务记录。
+
+        Returns:
+            int: 清除的任务数量
+        """
+        to_remove = [name for name, info in self._jobs.items()
+                     if info.get('status') in ('finish', 'cancel', 'none')]
+        for name in to_remove:
+            del self._jobs[name]
+        return len(to_remove)
+
+    # ------------------------------------------------------------------
+    # 内部辅助方法
+    # ------------------------------------------------------------------
+
     def _lock_job(self, lockname):
-        if lockname in self.locks:
+        """尝试获取互斥锁，防止同一类任务并发执行。"""
+        if lockname in self._locks:
             return False
-        self.locks[lockname] = True
+        self._locks[lockname] = True
         return True
 
     def _unlock_job(self, lockname):
-        if lockname not in self.locks:
+        """释放互斥锁。"""
+        if lockname not in self._locks:
             return False
-        del self.locks[lockname]
+        del self._locks[lockname]
         return True
 
     def _start_job(self, jobname):
-        if jobname in self.jobs and self.jobs[jobname]['status'] == 'running':
+        """标记任务为 running 状态。如果同名任务已在运行则返回 False。"""
+        if jobname in self._jobs and self._jobs[jobname]['status'] == 'running':
             return False
-        self.jobs[jobname] = {'status': 'running', 'msg': ''}
+        self._jobs[jobname] = {'status': 'running', 'msg': '', 'started_at': time.time()}
         return True
 
     def _update_job(self, jobname, code, msg):
-        self.jobs[jobname]['code'] = code
-        self.jobs[jobname]['msg'] = msg
-        return True
-
-    def _get_job(self, jobname):
-        if jobname not in self.jobs:
-            return {'status': 'none', 'code': -1, 'msg': ''}
-        return self.jobs[jobname]
+        """更新任务的进度消息（任务仍在运行中）。"""
+        self._jobs[jobname]['code'] = code
+        self._jobs[jobname]['msg'] = msg
 
     def _finish_job(self, jobname, code, msg, data=None):
-        self.jobs[jobname]['status'] = 'finish'
-        self.jobs[jobname]['code'] = code
-        self.jobs[jobname]['msg'] = msg
-        if data:
-            self.jobs[jobname]['data'] = data
-
-    def _call(self, callback):
-        tornado.ioloop.IOLoop.instance().add_callback(callback)
+        """标记任务为 finish 状态。
+
+        Args:
+            code: 0=成功, -1=失败
+            msg: 结果描述
+            data: 可选的附加数据
+        """
+        self._jobs[jobname]['status'] = 'finish'
+        self._jobs[jobname]['code'] = code
+        self._jobs[jobname]['msg'] = msg
+        self._jobs[jobname]['finished_at'] = time.time()
+        if data is not None:
+            self._jobs[jobname]['data'] = data
 
     async def update(self):
         if not self._start_job('update'):
@@ -1263,6 +1365,7 @@ class TaskManager:
         self._finish_job(jobname, code, msg)
 
     async def inpanel_install(self, ssh_ip, ssh_port, ssh_user, ssh_password, instance_name, accessnet, accessport=None, accesskey=None):
+        from . import remote
         jobname = f'remote_inpanel_install_{ssh_ip}'
         if not self._start_job(jobname):
             return
@@ -1281,6 +1384,7 @@ class TaskManager:
         self._finish_job(jobname, code, msg)
 
     async def inpanel_uninstall(self, ssh_ip, ssh_port, ssh_user, ssh_password, instance_name):
+        from . import remote
         jobname = f'remote_inpanel_uninstall_{ssh_ip}'
         if not self._start_job(jobname):
             return
@@ -1301,6 +1405,7 @@ class TaskManager:
         self._finish_job(jobname, code, msg)
 
     async def inpanel_config(self, ssh_ip, ssh_port, ssh_user, ssh_password, accesskey=None):
+        from . import remote
         jobname = f'remote_inpanel_config_{ssh_ip}'
         if not self._start_job(jobname):
             return

{inpanel-1.2.4 → inpanel-1.2.5}/inpanel/public/js/controllers/controllers.js

@@ -119,7 +119,7 @@ var MainCtrl = [
         $scope.auto_refresh = false;
 
         $scope.load = function () {
-            $scope.loadInfo('**');
+            $scope.loadInfo('all');
             $scope.checkUpVersion();
         };
 
@@ -152,7 +152,7 @@ var MainCtrl = [
         }
 
         $scope.loadInfo = function (items) {
-            if (!items) items = '*';
+            if (!items) items = 'dynamic';
             Request.get('/api/query/' + items, function (data) {
                 if ($scope.info == null) {
                     $scope.info = data;
@@ -162,6 +162,8 @@ var MainCtrl = [
                         $scope.info['server.netifaces'][i]['tx_speed'] = '0';
                     }
                     if (!$scope.loaded) $scope.loaded = true;
+                    // 首次加载后自动再拉一次，用于计算 CPU 使用率差值
+                    Timeout(function () { $scope.loadInfo(items); }, 1000);
                 } else {
                     if ($scope.info) {
                         // caculate the cpu usage
@@ -426,9 +428,9 @@ var SettingCtrl = [
         $scope.update = function () {
             $scope.upverMessage = '正在升级，请稍候...'
             $scope.showUpdateBtn = false;
-            Request.post('/api/backend/update', {}, function (data) {
+            Request.post('/api/task/update', {}, function (data) {
                 var getUpdateStatus = function () {
-                    Request.get('/api/backend/update', function (data) {
+                    Request.get('/api/task/update', function (data) {
                         Message.setInfo('')
                         if (data.msg) $scope.upverMessage = data.msg;
                         if (data.code == -1) {
@@ -437,11 +439,11 @@ var SettingCtrl = [
                             // restart service
                             $scope.upverMessage = '正在重启 InPanel...';
                             Timeout(function () {
-                                Request.post('/api/backend/service_restart', {
+                                Request.post('/api/task/service_restart', {
                                     service: 'inpanel'
                                 }, function (data) {
                                     var getRestartStatus = function () {
-                                        Request.get('/api/backend/service_restart_inpanel', function (data) {
+                                        Request.get('/api/task/service_restart_inpanel', function (data) {
                                             Message.setInfo('')
                                             if (data.msg) $scope.upverMessage = data.msg;
                                             Timeout(getRestartStatus, 500, module);
@@ -470,11 +472,11 @@ var SettingCtrl = [
             $scope.restartMessage = '正在重启，请稍候...'
             $scope.showRestartBtn = false;
             Timeout(function () {
-                Request.post('/api/backend/service_restart', {
+                Request.post('/api/task/service_restart', {
                     service: 'inpanel'
                 }, function (data) {
                     var getRestartStatus = function () {
-                        Request.get('/api/backend/service_restart_inpanel', function (data) {
+                        Request.get('/api/task/service_restart_inpanel', function (data) {
                             if (data.msg) $scope.restartMessage = data.msg;
                             Timeout(getRestartStatus, 500, module);
                         }, function (data, status) { // error occur because server is terminate