桌面端
- 新增 LocalWsServer(ws://127.0.0.1:17301):hello / ping / get_channels /
start_preview / stop_preview / open_window / close_window / ptz / ptz_preset,
一条连接可同时推多路 JPEG 帧(帧头带 sid);慢命令并发派发,云台命令按连接串行,
页面断开自动清理会话与满帧率窗口
- LocalHttpServer 删除预览(MJPEG/快照/满帧率窗口)、/api/hik/channels、/api/hik/ptz*,
HTTP 17300 只保留 /api/query/{code}、/api/activate-login、/api/playback/download,
其余 POST 统一回 404 并提示已迁到 WS;不再依赖 HCNetSDK
- App 自行组装 HikStreamService -> HikPreviewService + HikNativePreviewService 注入 WS
- 后台服务加固:框架依赖(开发版)安装/启动时自动写服务环境变量 DOTNET_ROOT,
避免 LocalSystem 找不到用户目录里的 .NET 8 而报「后台服务启动超时」
前端
- 新增 api/localWs.ts(连接/断线/请求-响应/二进制帧分发),补 getChannels / openWindow /
closeWindow / ptz / ptzPreset
- CamerasView 预览只走 WS(保留「唤起本机软件 -> 等待 -> 提示安装」兜底),
满帧率窗口、云台、预置点改走 WS
- NvrsView 拉取通道改走 WS(连不上时自动唤起一次再重试)
- CameraLayoutCanvas 合成画面 4 路改 WS 推帧
- 删除 createHikPreview/closeHikPreview*/openHikWindow/closeHikWindow*/ptzControl/ptzPreset
与 isLocalServiceAlive/waitForLocalService
其他
- 移除 cameras.has_ptz(迁移 20261019233000)与相关接口/字段/UI
- 通道号按 struStreamMode 映射(IP 通道空槽导致 51 之后整体错位)
- 扫码 24 小时内只保留最后一次扫描(后上报时间更新时覆盖)
- 清理历史 DESKTOP 占位通道(迁移 20261019230000)
- README / desktop README 补 17301 与 WS 接口说明,修正已删除的 /api/health 描述
351 lines
14 KiB
C#
351 lines
14 KiB
C#
using System;
|
||
using System.Collections.Concurrent;
|
||
using System.Collections.Generic;
|
||
using System.Linq;
|
||
using System.Threading;
|
||
using System.Threading.Tasks;
|
||
using YuncangTrace.LocalService.Services.Scan;
|
||
|
||
namespace YuncangTrace.LocalService.Services;
|
||
|
||
/// <summary>
|
||
/// 桌面端「设备服务」:把本机当成一台扫码中控(scanner),向服务器上报扫码记录。
|
||
///
|
||
/// - **默认关闭**:只有主体管理员在菜单「服务 → 开启设备服务」里手动开启;
|
||
/// - 开启时调 `POST /api/web/devices/activate`,服务端保证「一个主体只有一台设备在线」,
|
||
/// 同主体其他设备会被踢下线(旧令牌立即 401);
|
||
/// - 开启后拿到**长期设备 JWT**,上报走 `POST /api/scan/{channels,records}`;
|
||
/// - 关闭时调 `POST /api/web/devices/:id/logout` 让令牌立即作废。
|
||
/// </summary>
|
||
public sealed class DeviceService
|
||
{
|
||
/// <summary>本机上报用的通道 id / 名称(一台电脑就是一个通道)</summary>
|
||
public const string LocalChannelId = "DESKTOP";
|
||
public const string LocalChannelName = "本机中控";
|
||
|
||
private readonly ApiClient _api;
|
||
private readonly AppSettings _settings;
|
||
private readonly Session _session;
|
||
|
||
// 扫码记录上报队列:条码先进本地库,后台循环批量推送,**服务器确认后才标记已上传**
|
||
private readonly SemaphoreSlim _uploadSignal = new(0, 1);
|
||
private CancellationTokenSource? _uploadCts;
|
||
private Task? _uploadTask;
|
||
private int _uploadRetryMs = 1000;
|
||
|
||
// 面单一直放在扫码器上时会持续「更新最近扫描时间」(每 1~2 秒一次)——
|
||
// 这种事件不能每条都写日志,否则一天几万行;同一个 通道+条码 5 分钟记一次。
|
||
private static readonly ConcurrentDictionary<string, DateTime> TouchedLogAt = new();
|
||
|
||
private static bool ShouldLogTouched(string channel, string code)
|
||
{
|
||
var key = $"{channel}|{code}";
|
||
var now = DateTime.Now;
|
||
|
||
if (TouchedLogAt.TryGetValue(key, out var last) && now - last < TimeSpan.FromMinutes(5)) return false;
|
||
|
||
TouchedLogAt[key] = now;
|
||
return true;
|
||
}
|
||
|
||
public DeviceService(ApiClient api, AppSettings settings, Session session)
|
||
{
|
||
_api = api;
|
||
_settings = settings;
|
||
_session = session;
|
||
}
|
||
|
||
/// <summary>上报状态(给界面看的一句话;空串 = 一切正常)</summary>
|
||
public string UploadStatus { get; private set; } = string.Empty;
|
||
|
||
/// <summary>是否已开启(本地标记 + 有令牌)</summary>
|
||
public bool Enabled => _settings.DeviceServiceEnabled && !string.IsNullOrWhiteSpace(_settings.DeviceToken);
|
||
|
||
/// <summary>本机 SN(默认机器名,最多 64 字符)</summary>
|
||
public string Sn
|
||
{
|
||
get
|
||
{
|
||
if (!string.IsNullOrWhiteSpace(_settings.DeviceSn)) return _settings.DeviceSn;
|
||
var name = Environment.MachineName;
|
||
return string.IsNullOrWhiteSpace(name) ? "PC-DESKTOP" : name.ToUpperInvariant();
|
||
}
|
||
set
|
||
{
|
||
var text = (value ?? string.Empty).Trim();
|
||
_settings.DeviceSn = text.Length > 64 ? text[..64] : text;
|
||
}
|
||
}
|
||
|
||
/// <summary>当前主体 id(没有主体时 0)</summary>
|
||
public int SubjectId => _settings.SubjectId;
|
||
|
||
/// <summary>当前主体下**除本机以外**的已绑定设备(开启前提示"会被踢掉")</summary>
|
||
public async Task<IReadOnlyList<ApiDevice>> OtherDevicesAsync(CancellationToken ct = default)
|
||
{
|
||
if (SubjectId <= 0) return Array.Empty<ApiDevice>();
|
||
|
||
var devices = await _api.DevicesAsync(_session.Token, SubjectId, ct).ConfigureAwait(false);
|
||
return devices.Where(item => !string.Equals(item.Sn, Sn, StringComparison.OrdinalIgnoreCase)).ToList();
|
||
}
|
||
|
||
/// <summary>
|
||
/// 开启设备服务:注册本机 → 保存令牌 → 上报通道。
|
||
/// (踢掉其他设备的确认由界面负责,这里只管干活)
|
||
/// </summary>
|
||
/// <exception cref="ApiException">不是管理员 / 网络失败 / 主体到期等,message 可直接显示</exception>
|
||
public async Task<DeviceActivation> EnableAsync(CancellationToken ct = default)
|
||
{
|
||
if (SubjectId <= 0) throw new ApiException("还没有选择主体,请先在「服务 → 切换主体」里选一个");
|
||
|
||
var result = await _api.ActivateDeviceAsync(_session.Token, SubjectId, Sn, $"{Environment.MachineName}(本机)", ct)
|
||
.ConfigureAwait(false);
|
||
|
||
_settings.DeviceServiceEnabled = true;
|
||
_settings.DeviceId = result.Id;
|
||
_settings.DeviceSn = result.Sn;
|
||
_settings.DeviceToken = result.Token;
|
||
_settings.DeviceRefreshToken = result.RefreshToken;
|
||
_settings.DeviceTokenExpiresAt = result.ExpiresIn ?? string.Empty;
|
||
_settings.Save();
|
||
|
||
AppLog.Write($"[device] 设备服务已开启:{result.Sn}(id={result.Id},踢下线 {result.Kicked.Count} 台)");
|
||
|
||
// 拉起扫码记录上报循环(断网期间的积压会一次性补上去)
|
||
EnsureUploadLoop();
|
||
TriggerUpload();
|
||
|
||
// 通道不在这里上报:真实通道由 `ScanService` 同步(加了几个扫码通道就报几个)。
|
||
// 以前这里会补一个 `DESKTOP`「本机中控」占位通道,结果工作台绑定页能看到一个
|
||
// 永远没数据的假通道;查询也不是扫码,不需要这个通道来"记账"。
|
||
AppLog.Write("[device] 通道由扫码服务同步(不再上报本机占位通道)");
|
||
|
||
return result;
|
||
}
|
||
|
||
/// <summary>上报一批通道(扫码服务的每条通道都同步给服务器,供工作台绑定)</summary>
|
||
public async Task ReportChannelsAsync(IEnumerable<(string ChannelId, string ChannelName)> channels,
|
||
bool replace = false, CancellationToken ct = default)
|
||
{
|
||
if (!Enabled) return;
|
||
|
||
var list = channels
|
||
.Where(item => !string.IsNullOrWhiteSpace(item.ChannelId))
|
||
.Select(item => (item.ChannelId, string.IsNullOrWhiteSpace(item.ChannelName) ? item.ChannelId : item.ChannelName))
|
||
.ToList();
|
||
// 全量对账时允许空列表(表示通道已全部删除)
|
||
if (list.Count == 0 && !replace) return;
|
||
|
||
await _api.ReportChannelsAsync(_settings.DeviceToken, list, replace, ct).ConfigureAwait(false);
|
||
}
|
||
|
||
/// <summary>关闭设备服务:让令牌立即作废并清掉本地状态</summary>
|
||
public async Task DisableAsync(CancellationToken ct = default)
|
||
{
|
||
StopUploadLoop();
|
||
|
||
var deviceId = _settings.DeviceId;
|
||
var token = _settings.DeviceToken;
|
||
|
||
_settings.DeviceServiceEnabled = false;
|
||
_settings.DeviceToken = string.Empty;
|
||
_settings.DeviceRefreshToken = string.Empty;
|
||
_settings.DeviceTokenExpiresAt = string.Empty;
|
||
_settings.Save();
|
||
|
||
if (deviceId > 0 && token.Length > 0 && SubjectId > 0)
|
||
{
|
||
try
|
||
{
|
||
await _api.DeactivateDeviceAsync(_session.Token, SubjectId, deviceId, ct).ConfigureAwait(false);
|
||
AppLog.Write($"[device] 设备服务已关闭(id={deviceId},令牌已作废)");
|
||
}
|
||
catch (Exception ex)
|
||
{
|
||
// 关服务不该因为网络问题卡住用户
|
||
AppLog.Write($"[device] 通知服务器关闭失败(本地已关闭):{ex.Message}");
|
||
}
|
||
}
|
||
else
|
||
{
|
||
AppLog.Write("[device] 设备服务已关闭(本地)");
|
||
}
|
||
}
|
||
|
||
/// <summary>换了主体/退出登录:本地状态清掉(不动服务器上的旧设备)</summary>
|
||
public void ResetLocalState()
|
||
{
|
||
StopUploadLoop();
|
||
|
||
_settings.DeviceServiceEnabled = false;
|
||
_settings.DeviceId = 0;
|
||
_settings.DeviceToken = string.Empty;
|
||
_settings.DeviceRefreshToken = string.Empty;
|
||
_settings.DeviceTokenExpiresAt = string.Empty;
|
||
_settings.Save();
|
||
}
|
||
|
||
/// <summary>
|
||
/// 上报一条扫码记录(fire-and-forget 的**入队**版本)。
|
||
///
|
||
/// ⚠️ 只在真的"扫了一次码"时调用;**运单查询不要调** ——
|
||
/// 查询只是看看,记一条 `DESKTOP` 记录会污染扫码记录表(历史要求)。
|
||
/// 先落本地库,由后台上报循环推给服务器;失败会一直重试,不会丢。
|
||
/// </summary>
|
||
public void ReportScan(string code) => ReportOnChannel(LocalChannelId, LocalChannelName, code);
|
||
|
||
/// <summary>
|
||
/// 用指定通道记一条扫码记录。
|
||
///
|
||
/// 与 AndroidScanCenter 的 ScanStore + BarcodeReporter 一致:
|
||
/// ① 先落本地(连续扫描只刷新「最近一次扫描时间」)→ ② 唤醒后台上报循环 →
|
||
/// ③ 服务器 2xx 确认后才把记录标成已上传,否则按退避重试。
|
||
///
|
||
/// **延迟上报**:扫到后 5 分钟没再扫到同一个码才真正上报(见
|
||
/// <see cref="ScanRecordStore.SettleDelay"/>),上报的是最后一次扫描时间。
|
||
/// </summary>
|
||
/// <returns>true = 一次新的扫码事件(连续扫描的重复帧返回 false,界面不用重查)</returns>
|
||
public bool ReportOnChannel(string channelId, string channelName, string code)
|
||
{
|
||
var barcode = (code ?? string.Empty).Trim();
|
||
if (barcode.Length == 0) return false;
|
||
|
||
var channel = string.IsNullOrWhiteSpace(channelId) ? LocalChannelId : channelId;
|
||
var name = string.IsNullOrWhiteSpace(channelName) ? channel : channelName;
|
||
|
||
// 没开设备服务也照样记本地:开起来之后会把积压的自动补上去(断网/未开启期间不丢码)
|
||
var result = ScanRecordStore.Add(channel, name, barcode, DateTime.Now);
|
||
if (result.Item is null || result.Kind == ScanAddKind.Repeated) return false;
|
||
|
||
if (result.Kind == ScanAddKind.Touched)
|
||
{
|
||
if (ShouldLogTouched(channel, barcode))
|
||
{
|
||
AppLog.Write($"[scan] 通道 {channel} 扫码:{barcode}(更新最近扫描时间;5 分钟内不再重复记录)");
|
||
}
|
||
}
|
||
else
|
||
{
|
||
AppLog.Write($"[scan] 通道 {channel} 扫码:{barcode}(5 分钟未再扫到后上报)");
|
||
}
|
||
|
||
if (!Enabled) return true;
|
||
EnsureUploadLoop();
|
||
SignalUpload();
|
||
return true;
|
||
}
|
||
|
||
/// <summary>查服务器上当前中控已登记的通道(用于确认同步)</summary>
|
||
public Task<HashSet<string>> ChannelsAsync(CancellationToken ct = default)
|
||
=> _api.ChannelsAsync(_settings.DeviceToken, ct);
|
||
|
||
/// <summary>立即触发一次上报(界面的「立即上传」)</summary>
|
||
public void TriggerUpload()
|
||
{
|
||
if (!Enabled) return;
|
||
EnsureUploadLoop();
|
||
SignalUpload();
|
||
}
|
||
|
||
/// <summary>开设备服务时把上报循环拉起来(重复调用无影响)</summary>
|
||
public void EnsureUploadLoop()
|
||
{
|
||
if (_uploadTask is { IsCompleted: false }) return;
|
||
|
||
_uploadCts = new CancellationTokenSource();
|
||
_uploadTask = Task.Run(() => UploadLoopAsync(_uploadCts.Token));
|
||
}
|
||
|
||
/// <summary>停上报循环(关服务 / 退出登录)</summary>
|
||
public void StopUploadLoop()
|
||
{
|
||
try
|
||
{
|
||
_uploadCts?.Cancel();
|
||
}
|
||
catch
|
||
{
|
||
// 忽略
|
||
}
|
||
_uploadCts = null;
|
||
_uploadTask = null;
|
||
UploadStatus = string.Empty;
|
||
ScanRecordStore.Flush();
|
||
}
|
||
|
||
private void SignalUpload()
|
||
{
|
||
try
|
||
{
|
||
if (_uploadSignal.CurrentCount == 0) _uploadSignal.Release();
|
||
}
|
||
catch
|
||
{
|
||
// 忽略
|
||
}
|
||
}
|
||
|
||
/// <summary>
|
||
/// 后台上报循环:有信号或每 30 秒检查一次,把**静默满 5 分钟**的待上传记录攒批推送。
|
||
///
|
||
/// 失败时**不标记**那批记录,等退避(1s→2s→5s→10s→30s 封顶)后重发;
|
||
/// 服务端按 设备+通道+条码+秒 去重、同一运单 24 小时内覆盖成最新时间,
|
||
/// 所以整批重发不会造成重复落库,也不会把时间改回过去。
|
||
/// </summary>
|
||
private async Task UploadLoopAsync(CancellationToken ct)
|
||
{
|
||
while (!ct.IsCancellationRequested)
|
||
{
|
||
try
|
||
{
|
||
await _uploadSignal.WaitAsync(TimeSpan.FromSeconds(30), ct).ConfigureAwait(false);
|
||
}
|
||
catch (OperationCanceledException)
|
||
{
|
||
break;
|
||
}
|
||
|
||
while (!ct.IsCancellationRequested && Enabled)
|
||
{
|
||
var batch = ScanRecordStore.Pending(50);
|
||
if (batch.Count == 0)
|
||
{
|
||
UploadStatus = string.Empty;
|
||
break;
|
||
}
|
||
|
||
try
|
||
{
|
||
var rows = batch.Select(item => (item.ChannelId, item.Code, item.ScannedAt)).ToList();
|
||
await _api.ReportRecordsAsync(_settings.DeviceToken, rows, ct).ConfigureAwait(false);
|
||
|
||
// 服务器已确认:只有这里才把记录标成已上传
|
||
// (传入上报时的扫描时间:上报期间又扫到的话保持待上传,下一轮带最新时间重发)
|
||
ScanRecordStore.MarkUploaded(batch.Select(item => (item.Id, item.ScannedAt)));
|
||
_uploadRetryMs = 1000;
|
||
UploadStatus = string.Empty;
|
||
AppLog.Write($"[scan] 已上报扫码 {batch.Count} 条");
|
||
}
|
||
catch (OperationCanceledException)
|
||
{
|
||
break;
|
||
}
|
||
catch (Exception ex)
|
||
{
|
||
UploadStatus = $"上报失败(待上传 {ScanRecordStore.PendingCount()} 条),{_uploadRetryMs / 1000} 秒后重试";
|
||
AppLog.Write($"[scan] 上报扫码失败({batch.Count} 条,{_uploadRetryMs}ms 后重试):{ex.Message}");
|
||
try
|
||
{
|
||
await Task.Delay(_uploadRetryMs, ct).ConfigureAwait(false);
|
||
}
|
||
catch (OperationCanceledException)
|
||
{
|
||
break;
|
||
}
|
||
_uploadRetryMs = Math.Min(_uploadRetryMs * 2, 30000);
|
||
}
|
||
}
|
||
}
|
||
}
|
||
}
|