casjaysdevdocker/aria2
1
0
Fork 0
mirror of https://github.com/casjaysdevdocker/aria2 synced 2025-05-15 02:11:29 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

🗃️ Committing everything that changed 🗃️

Browse Source 
rootfs/tmp/etc/aria2/aria-ng.config.js
rootfs/tmp/etc/nginx/nginx.conf
rootfs/usr/local/etc/docker/init.d/00-aria2c.sh
rootfs/usr/local/etc/docker/init.d/zz-nginx.sh
This commit is contained in:
casjay 2025-05-13 17:50:29 -04:00
parent 0d671d8ee2
commit 5c19c0e5c1
Signed by untrusted user who does not match committer: jason
GPG Key ID: 1AB309F42A764145
4 changed files with 180 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

340
rootfs/tmp/etc/aria2/aria-ng.config.js
View File

@ -525,7 +525,7 @@
browserNotification: !1, browserNotification: !1,
rpcAlias: 'aria2', rpcAlias: 'aria2',
rpcHost: 'REPLACE_SERVER_ADDR', rpcHost: 'REPLACE_SERVER_ADDR',
rpcPort: 'REPLACE_SERVER_PORT', rpcPort: '80',
rpcInterface: 'jsonrpc', rpcInterface: 'jsonrpc',
protocol: 'http', protocol: 'http',
httpMethod: 'POST', httpMethod: 'POST',
@ -2712,59 +2712,61 @@
); );
})(a.url, a) })(a.url, a)
: 0 === t.indexOf('/settings/rpc/set') : 0 === t.indexOf('/settings/rpc/set')
? (function (e, t, a, n, i) { ? (function (e, t, a, n, i) {
if ( if (
((a = a || l.rpcPort), ((a = a || l.rpcPort),
(n = n || l.rpcInterface), (n = n || l.rpcInterface),
(i = i || l.secret), (i = i || l.secret),
u.info( u.info(
'[CommandController] set rpc: ' + '[CommandController] set rpc: ' +
e + e +
'://' + '://' +
t + t +
':' + ':' +
a + a +
'/' + '/' +
n + n +
', secret: ' + ', secret: ' +
i i
), ),
!e || !e ||
('http' !== e && ('http' !== e &&
'https' !== e && 'https' !== e &&
'ws' !== e && 'ws' !== e &&
'wss' !== e)) 'wss' !== e))
) )
return d.showError('Protocol is invalid!'), !1; return d.showError('Protocol is invalid!'), !1;
if (!t) return d.showError('RPC host cannot be empty!'), !1; if (!t) return d.showError('RPC host cannot be empty!'), !1;
if (i) if (i)
try { try {
i = c.base64UrlDecode(i); i = c.base64UrlDecode(i);
} catch (e) { } catch (e) {
return d.showError('RPC secret is not base64 encoded!'), !1; return (
} d.showError('RPC secret is not base64 encoded!'), !1
var s = { );
rpcAlias: '', }
rpcHost: t, var s = {
rpcPort: a, rpcAlias: '',
rpcInterface: n, rpcHost: t,
protocol: e, rpcPort: a,
httpMethod: l.httpMethod, rpcInterface: n,
secret: i, protocol: e,
}; httpMethod: l.httpMethod,
return ( secret: i,
p.isRpcSettingEqualsDefault(s) };
? r.path('/downloading') return (
: (p.setDefaultRpcSetting(s, { p.isRpcSettingEqualsDefault(s)
keepCurrent: !1, ? r.path('/downloading')
forceSet: !0, : (p.setDefaultRpcSetting(s, {
}), keepCurrent: !1,
r.path('/downloading'), forceSet: !0,
o.location.reload()), }),
!0 r.path('/downloading'),
); o.location.reload()),
})(a.protocol, a.host, a.port, a.interface, a.secret) !0
: (d.showError('Parameter is invalid!'), 0)) || );
})(a.protocol, a.host, a.port, a.interface, a.secret)
: (d.showError('Parameter is invalid!'), 0)) ||
r.path('/downloading'); r.path('/downloading');
}, },
]); ]);
@ -2920,8 +2922,8 @@
? r.path('/waiting') ? r.path('/waiting')
: o.reload()) : o.reload())
: '/waiting' === r.path() : '/waiting' === r.path()
? r.path('/downloading') ? r.path('/downloading')
: o.reload()); : o.reload());
}, },
1 < a.length 1 < a.length
); );
@ -2946,8 +2948,8 @@
? r.path('/downloading') ? r.path('/downloading')
: o.reload() : o.reload()
: 'task-detail' === t : 'task-detail' === t
? r.path('/task/detail/' + e.data) ? r.path('/task/detail/' + e.data)
: o.reload()); : o.reload());
} else p.showError('Failed to retry this task.'); } else p.showError('Failed to retry this task.');
}, },
!1 !1
@ -3225,8 +3227,8 @@
'task-detail' === p.getAfterCreatingNewTask() && t && t.data 'task-detail' === p.getAfterCreatingNewTask() && t && t.data
? d.path('/task/detail/' + t.data) ? d.path('/task/detail/' + t.data)
: a : a
? d.path('/waiting') ? d.path('/waiting')
: d.path('/downloading'); : d.path('/downloading');
} }
}; };
'urls' === c.context.taskType 'urls' === c.context.taskType
@ -3245,25 +3247,25 @@
return f(n), g.newUriTasks(i, e, t); return f(n), g.newUriTasks(i, e, t);
})(a, r)) })(a, r))
: 'torrent' === c.context.taskType : 'torrent' === c.context.taskType
? (l.loadPromise = ? (l.loadPromise =
((i = a), ((i = a),
(s = r), (s = r),
(o = { (o = {
content: c.context.uploadFile.base64Content, content: c.context.uploadFile.base64Content,
options: angular.copy(c.context.options), options: angular.copy(c.context.options),
}), }),
f(o.options), f(o.options),
g.newTorrentTask(o, i, s))) g.newTorrentTask(o, i, s)))
: 'metalink' === c.context.taskType && : 'metalink' === c.context.taskType &&
(l.loadPromise = (l.loadPromise =
((e = a), ((e = a),
(t = r), (t = r),
(n = { (n = {
content: c.context.uploadFile.base64Content, content: c.context.uploadFile.base64Content,
options: angular.copy(c.context.options), options: angular.copy(c.context.options),
}), }),
f(n.options), f(n.options),
g.newMetalinkTask(n, e, t))); g.newMetalinkTask(n, e, t)));
}), }),
(c.setOption = function (e, t, a) { (c.setOption = function (e, t, a) {
'' !== t ? (c.context.options[e] = t) : delete c.context.options[e], '' !== t ? (c.context.options[e] = t) : delete c.context.options[e],
@ -3435,8 +3437,8 @@
('le102400' === a ('le102400' === a
? t.numPieces <= 102400 ? t.numPieces <= 102400
: 'le10240' === a : 'le10240' === a
? t.numPieces <= 10240 ? t.numPieces <= 10240
: 'le1024' !== a || t.numPieces <= 1024))), : 'le1024' !== a || t.numPieces <= 1024))),
v('pieces', g.context.showPiecesInfo), v('pieces', g.context.showPiecesInfo),
v('btpeers', 'active' === e.status && e.bittorrent), v('btpeers', 'active' === e.status && e.bittorrent),
(g.task && g.task.status === e.status) || (g.task && g.task.status === e.status) ||
@ -3644,8 +3646,8 @@
('all' === e ('all' === e
? (a.selected = !0) ? (a.selected = !0)
: 'none' === e : 'none' === e
? (a.selected = !1) ? (a.selected = !1)
: 'reverse' === e && (a.selected = !a.selected)); : 'reverse' === e && (a.selected = !a.selected));
} }
C(); C();
} }
@ -4653,23 +4655,23 @@
return 'success' === a return 'success' === a
? 'has-success' ? 'has-success'
: 'failed' === a : 'failed' === a
? 'has-warning' ? 'has-warning'
: 'error' === a : 'error' === a
? 'has-error' ? 'has-error'
: ''; : '';
}, },
getStatusIcon: function () { getStatusIcon: function () {
return 'pending' === a return 'pending' === a
? 'fa-hourglass-start' ? 'fa-hourglass-start'
: 'saving' === a : 'saving' === a
? 'fa-spin fa-pulse fa-spinner' ? 'fa-spin fa-pulse fa-spinner'
: 'success' === a : 'success' === a
? 'fa-check' ? 'fa-check'
: 'failed' === a : 'failed' === a
? 'fa-exclamation' ? 'fa-exclamation'
: 'error' === a : 'error' === a
? 'fa-times' ? 'fa-times'
: ''; : '';
}, },
isShowStatusIcon: function () { isShowStatusIcon: function () {
return '' !== this.getStatusIcon(); return '' !== this.getStatusIcon();
@ -4956,16 +4958,16 @@
return null === a return null === a
? e ? e
: 'index' === a.type : 'index' === a.type
? n('orderBy')(e, ['index'], a.reverse) ? n('orderBy')(e, ['index'], a.reverse)
: 'name' === a.type : 'name' === a.type
? n('orderBy')(e, ['fileName'], a.reverse) ? n('orderBy')(e, ['fileName'], a.reverse)
: 'size' === a.type : 'size' === a.type
? n('orderBy')(e, ['length'], a.reverse) ? n('orderBy')(e, ['length'], a.reverse)
: 'percent' === a.type : 'percent' === a.type
? n('orderBy')(e, ['completePercent'], a.reverse) ? n('orderBy')(e, ['completePercent'], a.reverse)
: 'selected' === a.type : 'selected' === a.type
? n('orderBy')(e, ['selected'], a.reverse) ? n('orderBy')(e, ['selected'], a.reverse)
: e; : e;
}; };
}, },
]); ]);
@ -4995,16 +4997,16 @@
return null === a return null === a
? e ? e
: 'address' === a.type : 'address' === a.type
? n('orderBy')(e, ['ip', 'port'], a.reverse) ? n('orderBy')(e, ['ip', 'port'], a.reverse)
: 'client' === a.type : 'client' === a.type
? n('orderBy')(e, ['client.name', 'client.version'], a.reverse) ? n('orderBy')(e, ['client.name', 'client.version'], a.reverse)
: 'percent' === a.type : 'percent' === a.type
? n('orderBy')(e, ['completePercent'], a.reverse) ? n('orderBy')(e, ['completePercent'], a.reverse)
: 'dspeed' === a.type : 'dspeed' === a.type
? n('orderBy')(e, ['downloadSpeed'], a.reverse) ? n('orderBy')(e, ['downloadSpeed'], a.reverse)
: 'uspeed' === a.type : 'uspeed' === a.type
? n('orderBy')(e, ['uploadSpeed'], a.reverse) ? n('orderBy')(e, ['uploadSpeed'], a.reverse)
: e; : e;
}; };
}, },
]); ]);
@ -5042,18 +5044,22 @@
return null === a return null === a
? e ? e
: 'name' === a.type : 'name' === a.type
? n('orderBy')(e, ['taskName'], a.reverse) ? n('orderBy')(e, ['taskName'], a.reverse)
: 'size' === a.type : 'size' === a.type
? n('orderBy')(e, ['totalLength'], a.reverse) ? n('orderBy')(e, ['totalLength'], a.reverse)
: 'percent' === a.type : 'percent' === a.type
? n('orderBy')(e, ['completePercent'], a.reverse) ? n('orderBy')(e, ['completePercent'], a.reverse)
: 'remain' === a.type : 'remain' === a.type
? n('orderBy')(e, ['idle', 'remainTime', 'remainLength'], a.reverse) ? n('orderBy')(
: 'dspeed' === a.type e,
? n('orderBy')(e, ['downloadSpeed'], a.reverse) ['idle', 'remainTime', 'remainLength'],
: 'uspeed' === a.type a.reverse
? n('orderBy')(e, ['uploadSpeed'], a.reverse) )
: e; : 'dspeed' === a.type
? n('orderBy')(e, ['downloadSpeed'], a.reverse)
: 'uspeed' === a.type
? n('orderBy')(e, ['uploadSpeed'], a.reverse)
: e;
}; };
}, },
]); ]);
@ -5067,25 +5073,25 @@
? e.verifyIntegrityPending ? e.verifyIntegrityPending
? 'Pending Verification' ? 'Pending Verification'
: e.verifiedLength : e.verifiedLength
? e.verifiedPercent ? e.verifiedPercent
? 'format.task.verifying-percent' ? 'format.task.verifying-percent'
: 'Verifying' : 'Verifying'
: !0 === e.seeder || 'true' === e.seeder : !0 === e.seeder || 'true' === e.seeder
? 'Seeding' ? 'Seeding'
: 'Downloading' : 'Downloading'
: 'waiting' === e.status : 'waiting' === e.status
? 'Waiting' ? 'Waiting'
: 'paused' === e.status : 'paused' === e.status
? 'Paused' ? 'Paused'
: t || 'complete' !== e.status : t || 'complete' !== e.status
? t || 'error' !== e.status ? t || 'error' !== e.status
? t || 'removed' !== e.status ? t || 'removed' !== e.status
? '' ? ''
: 'Removed' : 'Removed'
: e.errorCode : e.errorCode
? 'format.task.error-occurred' ? 'format.task.error-occurred'
: 'Error Occurred' : 'Error Occurred'
: 'Completed' : 'Completed'
: ''; : '';
}; };
}); });
@ -5448,16 +5454,16 @@
? 'format.time.millisecond' ? 'format.time.millisecond'
: 'format.time.milliseconds' : 'format.time.milliseconds'
: i < 6e4 : i < 6e4
? 1 === (o = i / 1e3) ? 1 === (o = i / 1e3)
? 'format.time.second' ? 'format.time.second'
: 'format.time.seconds' : 'format.time.seconds'
: i < 144e4 : i < 144e4
? 1 === (o = i / 1e3 / 60) ? 1 === (o = i / 1e3 / 60)
? 'format.time.minute' ? 'format.time.minute'
: 'format.time.minutes' : 'format.time.minutes'
: 1 === (o = i / 1e3 / 60 / 24) : 1 === (o = i / 1e3 / 60 / 24)
? 'format.time.hour' ? 'format.time.hour'
: 'format.time.hours'), : 'format.time.hours'),
a.push({ name: s, value: o, optionValue: i }); a.push({ name: s, value: o, optionValue: i });
} }
return a; return a;
@ -7984,18 +7990,18 @@
return 'basic' === e return 'basic' === e
? t.basicOptions ? t.basicOptions
: 'http-ftp-sftp' === e : 'http-ftp-sftp' === e
? t.httpFtpSFtpOptions ? t.httpFtpSFtpOptions
: 'http' === e : 'http' === e
? t.httpOptions ? t.httpOptions
: 'ftp-sftp' === e : 'ftp-sftp' === e
? t.ftpSFtpOptions ? t.ftpSFtpOptions
: 'bt' === e : 'bt' === e
? t.btOptions ? t.btOptions
: 'metalink' === e : 'metalink' === e
? t.metalinkOptions ? t.metalinkOptions
: 'rpc' === e : 'rpc' === e
? t.rpcOptions ? t.rpcOptions
: 'advanced' === e && t.advancedOptions; : 'advanced' === e && t.advancedOptions;
}, },
getAria2QuickSettingsAvailableOptions: function (e) { getAria2QuickSettingsAvailableOptions: function (e) {
return 'globalSpeedLimit' === e && a.globalSpeedLimitOptions; return 'globalSpeedLimit' === e && a.globalSpeedLimitOptions;

4
rootfs/tmp/etc/nginx/nginx.conf
View File

@ -40,7 +40,7 @@ http {
proxy_read_timeout 86400; proxy_read_timeout 86400;
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade"; proxy_set_header Connection "upgrade";
proxy_pass http://127.0.0.1:6800/jsonrpc; proxy_pass http://REPLACE_SERVER_ADDR:REPLACE_RPC_PORT/jsonrpc;
} }
location /rpc { location /rpc {
@ -48,7 +48,7 @@ http {
proxy_read_timeout 86400; proxy_read_timeout 86400;
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade"; proxy_set_header Connection "upgrade";
proxy_pass http://127.0.0.1:6800/jsonrpc; proxy_pass http://REPLACE_SERVER_ADDR:REPLACE_RPC_PORT/jsonrpc;
} }
location = /favicon.ico { location = /favicon.ico {

4
rootfs/usr/local/etc/docker/init.d/00-aria2c.sh
View File

@ -224,6 +224,7 @@ __update_conf_files() {
local get_data_dir="$(grep -Rs 'dir=' "/config/aria2/aria2.conf" | awk -F'=' '{print $2}')" local get_data_dir="$(grep -Rs 'dir=' "/config/aria2/aria2.conf" | awk -F'=' '{print $2}')"
local get_config="$(find "$WWW_ROOT_DIR/js" -name 'aria-ng-*.min.js' | grep -v 'f1dd57abb9.min' | head -n1)" local get_config="$(find "$WWW_ROOT_DIR/js" -name 'aria-ng-*.min.js' | grep -v 'f1dd57abb9.min' | head -n1)"
local get_session_file="$(grep -Rs 'aria2.session' "/config/aria2/aria2.conf" | awk -F'=' '{print $2}' | head -n1)" local get_session_file="$(grep -Rs 'aria2.session' "/config/aria2/aria2.conf" | awk -F'=' '{print $2}' | head -n1)"
local rpc_port="${RPC_PORT:-${RPC_LISTEN:-6800}}"
local dht_port="$DHT_LISTEN_PORT" local dht_port="$DHT_LISTEN_PORT"
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# delete files # delete files
@ -234,8 +235,7 @@ __update_conf_files() {
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# replace variables # replace variables
__replace "REPLACE_RPC_PORT" "$SERVICE_PORT" "$CONF_DIR/aria2.conf" __replace "REPLACE_RPC_PORT" "$rpc_port" "$CONF_DIR/aria2.conf"
__replace "REPLACE_SERVER_PORT" "$SERVICE_PORT" "$CONF_DIR/aria-ng.config.js"
__replace "REPLACE_SERVER_ADDR" "$CONTAINER_IP4_ADDRESS" "$CONF_DIR/aria-ng.config.js" __replace "REPLACE_SERVER_ADDR" "$CONTAINER_IP4_ADDRESS" "$CONF_DIR/aria-ng.config.js"
if [ -n "$RPC_SECRET" ]; then if [ -n "$RPC_SECRET" ]; then
echo "Changing rpc secret to $RPC_SECRET" echo "Changing rpc secret to $RPC_SECRET"

7
rootfs/usr/local/etc/docker/init.d/zz-nginx.sh
View File

@ -221,6 +221,7 @@ __run_pre_execute_checks() {
__update_conf_files() { __update_conf_files() {
local exitCode=0 # default exit code local exitCode=0 # default exit code
local sysname="${SERVER_NAME:-${FULL_DOMAIN_NAME:-$HOSTNAME}}" # set hostname local sysname="${SERVER_NAME:-${FULL_DOMAIN_NAME:-$HOSTNAME}}" # set hostname
local rpc_port="${RPC_PORT:-${RPC_LISTEN:-6800}}"
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# delete files # delete files
#__rm "" #__rm ""
@ -230,10 +231,8 @@ __update_conf_files() {
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# replace variables # replace variables
# __replace "" "" "$CONF_DIR/nginx.conf" __replace "REPLACE_RPC_PORT" "$rpc_port" "$CONF_DIR/nginx.conf"
# replace variables recursively __replace "REPLACE_SERVER_ADDR" "$CONTAINER_IP4_ADDRESS" "$CONF_DIR/nginx.conf"
# __find_replace "" "" "$CONF_DIR"
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# define actions # define actions