Compare commits

...

4 Commits

Author SHA1 Message Date
xboard
96df9305b6 fix: correct know issues
Some checks are pending
Docker Build and Publish / build (push) Waiting to run
2025-01-19 21:51:38 +08:00
xboard
444c3c93ed update dockerfile 2025-01-19 21:13:09 +08:00
xboard
ff259aee44 fix: resolve array spread operator syntax in VLESS tls_settings again 2025-01-19 21:12:32 +08:00
xboard
9ca5d96048 fix: resolve array spread operator syntax in VLESS tls_settings 2025-01-19 19:06:47 +08:00
3 changed files with 8 additions and 4 deletions

View File

@ -22,4 +22,6 @@ RUN composer install --optimize-autoloader --no-cache --no-dev \
ENV ENABLE_WEB=true \
ENABLE_HORIZON=true \
ENABLE_REDIS=false
EXPOSE 7001
CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]

View File

@ -116,9 +116,11 @@ class UniProxyController extends Controller
...$baseConfig,
'tls' => (int) $protocolSettings['tls'],
'flow' => $protocolSettings['flow'],
'tls_settings' => [...(int) $protocolSettings['tls'] === 1
? $protocolSettings['tls_settings']
: $protocolSettings['reality_settings']]
'tls_settings' =>
match ((int) $protocolSettings['tls']) {
2 => $protocolSettings['reality_settings'],
default => $protocolSettings['tls_settings']
}
],
'hysteria' => [
'server_port' => (int) $serverPort,

View File

@ -141,7 +141,7 @@ class Server extends Model
private function castValueWithConfig($value, array $config)
{
if ($value === null) {
if ($value === null && $config['type'] !== 'object') {
return $config['default'] ?? null;
}