Browse Source

update: add task from web api

master
Dnomd343 3 years ago
parent
commit
562ed56c5d
  1. 86
      Web.py

86
Web.py

@ -1,11 +1,19 @@
#!/usr/bin/python #!/usr/bin/python
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
import json
import redis
import random
import hashlib
from flask import Flask, request from flask import Flask, request
apiPath = '/' apiPath = '/'
api = Flask(__name__) api = Flask(__name__)
redisPort = 6379
redisHost = 'localhost'
redisPrefix = 'proxyc-'
accessToken = 'dnomd343' accessToken = 'dnomd343'
def httpPostArg(field: str): # 获取HTTP POST参数 def httpPostArg(field: str): # 获取HTTP POST参数
@ -20,6 +28,16 @@ def httpPostArg(field: str): # 获取HTTP POST参数
pass pass
return None return None
def genRandomId(length = 24): # 生成随机ID
tag = ''
for i in range(0, length):
tmp = random.randint(0, 15)
if tmp >= 10:
tag += chr(tmp + 87) # a ~ f
else:
tag += str(tmp) # 0 ~ 9
return tag
def genError(message: str): # 生成JSON错误回复 def genError(message: str): # 生成JSON错误回复
return { return {
'success': False, 'success': False,
@ -28,11 +46,51 @@ def genError(message: str): # 生成JSON错误回复
def getAllTask(): # 获取当前所有检测任务 def getAllTask(): # 获取当前所有检测任务
# TODO: redis query # TODO: redis query
# print(redisObject.keys(redisPrefix + '*'))
return [ return [
'54cd9ba3a8e86f93', '54cd9ba3a8e86f93',
'f43c9bae21ae8693', 'f43c9bae21ae8693',
] ]
def addCheckTask(priority, checkList, proxyList): # 检测任务加入数据库
digestList = []
checkId = genRandomId()
for proxyInfo in proxyList:
digest = hashlib.md5(json.dumps({
'check': checkList,
'info': proxyInfo,
}).encode(encoding = 'UTF-8')).hexdigest() # 计算节点摘要
digestList.append(digest)
repeatKey = redisObject.keys(redisPrefix + 'check-*-' + digest)
if repeatKey != []: # 存在重复
repeatKey = str(repeatKey[0], encoding = 'utf-8')
repeatPriority = repeatKey[len(redisPrefix) + 6:][:1] # 获取原优先级
if ord(repeatPriority) > ord(priority): # 原优先级较低
redisObject.rename( # 提升优先级
repeatKey,
redisPrefix + 'check-' + priority + '-' + digest
)
else:
redisObject.set( # 写入数据库
redisPrefix + 'check-' + priority + '-' + digest,
json.dumps({
'tag': digest,
'check': checkList,
'info': proxyInfo
})
)
redisObject.set( # 记录任务
redisPrefix + 'task-' + checkId,
json.dumps({
'checkId': checkId,
'priority': priority,
'check': checkList,
'proxy': digestList,
'checkNum': len(digestList),
'completeNum': 0
})
)
def getCheckList(): # 获取检测任务列表 def getCheckList(): # 获取检测任务列表
if request.args.get('token') != accessToken: # token无效 if request.args.get('token') != accessToken: # token无效
return genError('invalid token') return genError('invalid token')
@ -42,11 +100,14 @@ def getCheckList(): # 获取检测任务列表
} }
def newCheckTask(): # 新增检测任务 def newCheckTask(): # 新增检测任务
import ProxyDecoder as Decoder
import ProxyFilter as Filter
if httpPostArg('token') != accessToken: # token无效 if httpPostArg('token') != accessToken: # token无效
return genError('invalid token') return genError('invalid token')
priority = httpPostArg('priority') # 优先级选项 priority = httpPostArg('priority') # 优先级选项
if not 'priority' in ['a','b','c','d','e']: if not priority in ['a','b','c','d','e']:
priority = 'c' # 默认优先级 priority = 'c' # 默认优先级
checkList = httpPostArg('check') # 检测列表 checkList = httpPostArg('check') # 检测列表
@ -61,13 +122,21 @@ def newCheckTask(): # 新增检测任务
return genError('missing proxy list') return genError('missing proxy list')
if isinstance(proxyList, str): # 单项任务 if isinstance(proxyList, str): # 单项任务
proxyList = [ proxyList ] proxyList = [ proxyList ]
for i in range(0, len(proxyList)):
# TODO: decode and filter if isinstance(proxyList[i], str): # 解码分享链接
# TODO: save to redis and generate checkId proxyList[i] = Decoder.decode(proxyList[i])
if proxyList[i] == None:
return genError('could not decode index ' + str(i))
status, proxyList[i] = Filter.filter(proxyList[i]) # 节点信息检查
if status == False: # 节点不合法
return genError('index ' + str(i) + ': ' + proxyList[i])
checkId = addCheckTask(priority, checkList, proxyList) # 任务加入数据库
if checkId == None: # 异常错误
return genError('server error')
return { return {
'success': True, 'success': True,
'checkId': '233' 'checkId': checkId
} }
def getTaskInfo(checkId): # 获取任务详情 def getTaskInfo(checkId): # 获取任务详情
@ -98,4 +167,9 @@ def check_id(checkId):
elif request.method == 'POST': elif request.method == 'POST':
return deleteTask(checkId) return deleteTask(checkId)
redisObject = redis.StrictRedis(
db = 0,
host = redisHost,
port = redisPort
)
api.run(host = '0.0.0.0', port = 43581, debug = True) api.run(host = '0.0.0.0', port = 43581, debug = True)

Loading…
Cancel
Save