@camera.ui/server 2.0.17 → 2.0.18

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (158) hide show
  1. package/dist/interface/assets/{404-BWRNG7e3.js → 404-hjvRJoie.js} +1 -1
  2. package/dist/interface/assets/{About-CWvfgUA-.js → About-CXK9lps9.js} +1 -1
  3. package/dist/interface/assets/{Adminpanel-Cat_euTC.js → Adminpanel-D1bsiC_B.js} +1 -1
  4. package/dist/interface/assets/{Automation-cp0lTCAv.js → Automation-BE-lA9i2.js} +3 -3
  5. package/dist/interface/assets/{AutomationImport-mCGSgys2.js → AutomationImport-B1Wsf3O1.js} +2 -2
  6. package/dist/interface/assets/{AutomationStore-udNOn3FR.js → AutomationStore-BUmTKbR8.js} +2 -2
  7. package/dist/interface/assets/{AutomationStoreDetail-CcVksadt.js → AutomationStoreDetail-DfENt4wG.js} +2 -2
  8. package/dist/interface/assets/{Automations-CcQLbmoN.js → Automations-3SibYydl.js} +2 -2
  9. package/dist/interface/assets/{Camera-Cq466-gT.js → Camera-ByUigyg3.js} +2 -2
  10. package/dist/interface/assets/{CameraConsole-A414-zXW.js → CameraConsole-D_1E2i7a.js} +1 -1
  11. package/dist/interface/assets/{Cameras-CW5XnJ1g.js → Cameras-Co54hUIY.js} +1 -1
  12. package/dist/interface/assets/{Camview-zK6fnWI0.js → Camview-D83wwTUB.js} +1 -1
  13. package/dist/interface/assets/{Config-R2N_QUER.js → Config-CZ3qg4V7.js} +1 -1
  14. package/dist/interface/assets/{ConfigActionCameraControl-DdW92QxO.js → ConfigActionCameraControl-BkP4KpkL.js} +1 -1
  15. package/dist/interface/assets/{ConfigActionDelay-BiCLaHDd.js → ConfigActionDelay-CW3x89X3.js} +1 -1
  16. package/dist/interface/assets/{ConfigActionHttp-BvM-8hTt.js → ConfigActionHttp-CqRThGAM.js} +1 -1
  17. package/dist/interface/assets/{ConfigActionImageInput-CoyrNloo.js → ConfigActionImageInput-D-wCYFc9.js} +1 -1
  18. package/dist/interface/assets/{ConfigActionMqtt-CY8HOoug.js → ConfigActionMqtt-50Oit6xb.js} +1 -1
  19. package/dist/interface/assets/{ConfigActionNotification-DP3dTyFB.js → ConfigActionNotification-CV4TZpsD.js} +1 -1
  20. package/dist/interface/assets/{ConfigActionOutput-BwYwuQ1w.js → ConfigActionOutput-DDCdD_nG.js} +1 -1
  21. package/dist/interface/assets/{ConfigActionPlugin-DbhT4kyF.js → ConfigActionPlugin-3BiyEJsy.js} +1 -1
  22. package/dist/interface/assets/{ConfigActionSensor-_zmPKdhz.js → ConfigActionSensor-kkHOn3aC.js} +1 -1
  23. package/dist/interface/assets/{ConfigActionSnapshot-Bc3eukMk.js → ConfigActionSnapshot-O4nan24K.js} +1 -1
  24. package/dist/interface/assets/{ConfigActionVariable-BeQy6W8G.js → ConfigActionVariable-Ci3wXMYZ.js} +1 -1
  25. package/dist/interface/assets/{ConfigConditionIfElse-CiFC5fLv.js → ConfigConditionIfElse-CPzw54yv.js} +1 -1
  26. package/dist/interface/assets/{ConfigConditionSensorState-CGeGdh0d.js → ConfigConditionSensorState-DcV8-3Tj.js} +1 -1
  27. package/dist/interface/assets/{ConfigConditionSwitch-BjR776j5.js → ConfigConditionSwitch-b0ikuhC6.js} +1 -1
  28. package/dist/interface/assets/{ConfigConditionTime-BAypML9_.js → ConfigConditionTime-q7GYSoQk.js} +1 -1
  29. package/dist/interface/assets/{ConfigSensorValueInput-Dis2Kr1r.js → ConfigSensorValueInput-Ba_ZC14J.js} +1 -1
  30. package/dist/interface/assets/{ConfigTriggerDetection-CqS3IAqj.js → ConfigTriggerDetection-CF-C3A-0.js} +1 -1
  31. package/dist/interface/assets/{ConfigTriggerGeofence-BbNpW2l0.js → ConfigTriggerGeofence-CW5W3lot.js} +1 -1
  32. package/dist/interface/assets/{ConfigTriggerManual-DiyFl_g-.js → ConfigTriggerManual-B7UGIwE2.js} +1 -1
  33. package/dist/interface/assets/{ConfigTriggerMqtt-ZXEft2Hi.js → ConfigTriggerMqtt-DL1MIwBs.js} +1 -1
  34. package/dist/interface/assets/{ConfigTriggerSchedule-Dy3NCMvo.js → ConfigTriggerSchedule-DCUXevkw.js} +1 -1
  35. package/dist/interface/assets/{ConfigTriggerSensor-CnSSEh4s.js → ConfigTriggerSensor-DRX68f5E.js} +1 -1
  36. package/dist/interface/assets/{ConfigTriggerSystem-CuKwsM8D.js → ConfigTriggerSystem-BOt8AI3a.js} +1 -1
  37. package/dist/interface/assets/{ConfigTriggerWebhook-DJPepSlC.js → ConfigTriggerWebhook-CFeWElXX.js} +1 -1
  38. package/dist/interface/assets/Console-Cxs29skk.js +1 -0
  39. package/dist/interface/assets/{CuiAutomationRunsDialog-o2aLvK5K.js → CuiAutomationRunsDialog-yXyj7vrL.js} +1 -1
  40. package/dist/interface/assets/CuiBottomSheet-DVzVzs8p.js +1 -0
  41. package/dist/interface/assets/{CuiBottomSheet-v2xnKGrr.js → CuiBottomSheet-SnWWgn5I.js} +1 -1
  42. package/dist/interface/assets/{CuiCameraPipCard-CId6q8WW.js → CuiCameraPipCard-BmmyPCOP.js} +1 -1
  43. package/dist/interface/assets/{CuiCameraRecordings-C_1UfpAJ.js → CuiCameraRecordings-DLfMPUOL.js} +1 -1
  44. package/dist/interface/assets/{CuiCameraShares-DW_hDX2f.js → CuiCameraShares-BE9d09pX.js} +1 -1
  45. package/dist/interface/assets/{CuiCameraTable-BXzZ-gIg.js → CuiCameraTable-TiUZNpga.js} +1 -1
  46. package/dist/interface/assets/{CuiDataTable-CrL6zx3I.js → CuiDataTable-DqtFJKC6.js} +1 -1
  47. package/dist/interface/assets/{CuiPluginCard-C38Fk0bQ.js → CuiPluginCard-C8eDXMRg.js} +2 -2
  48. package/dist/interface/assets/{CuiPluginCategoryChip-B3XVum_D.js → CuiPluginCategoryChip-BX0xg3py.js} +1 -1
  49. package/dist/interface/assets/{CuiPluginOAuthButton-DRJnVV4F.js → CuiPluginOAuthButton-DZS31TnY.js} +2 -2
  50. package/dist/interface/assets/{CuiPluginTrustBadge-4xCyAUBM.js → CuiPluginTrustBadge-rZePqROi.js} +1 -1
  51. package/dist/interface/assets/{CuiQRCode-DmsP4eAY.js → CuiQRCode-BqMd2Oh6.js} +1 -1
  52. package/dist/interface/assets/{CuiRecordingsGrid-BnL8kQ29.js → CuiRecordingsGrid-Dkpe799a.js} +1 -1
  53. package/dist/interface/assets/{CuiSchema-D2yLW853.js → CuiSchema-J_b00DYu.js} +1 -1
  54. package/dist/interface/assets/{CuiTopNavbarItem-_7UaVuQT.js → CuiTopNavbarItem-CXxnNN1s.js} +1 -1
  55. package/dist/interface/assets/{Faces-BPgUsyT0.js → Faces-CaGWFf-y.js} +1 -1
  56. package/dist/interface/assets/{FirstSteps-CKXlbFN-.js → FirstSteps-fOhI977X.js} +1 -1
  57. package/dist/interface/assets/{Instances-BS4UPlay.js → Instances-BD727wNP.js} +1 -1
  58. package/dist/interface/assets/{Logs-UPgu6TsC.js → Logs-DK8-ilEl.js} +1 -1
  59. package/dist/interface/assets/{Menu-CdewzDV4.js → Menu-Cn0dBf4v.js} +1 -1
  60. package/dist/interface/assets/{OAuthDeviceFlow-SGgJTWAU.js → OAuthDeviceFlow-C6aER-P5.js} +1 -1
  61. package/dist/interface/assets/{Plugin-BSSYZcyQ.js → Plugin-Cq_hIp8V.js} +1 -1
  62. package/dist/interface/assets/{PluginConsole-Bm0ify7V.js → PluginConsole-cQBNvsGp.js} +1 -1
  63. package/dist/interface/assets/{PluginDetail-DY6Uvu3V.js → PluginDetail-9-jofn3X.js} +2 -2
  64. package/dist/interface/assets/{PluginSchema-BkM5iKma.js → PluginSchema-DhNpD_HM.js} +1 -1
  65. package/dist/interface/assets/{PluginSearch-4q_vZHJc.js → PluginSearch-CYEjSopJ.js} +2 -2
  66. package/dist/interface/assets/PluginSearch-Cy8JvNJD.js +1 -0
  67. package/dist/interface/assets/{Plugins-B1tZxl7k.js → Plugins-YyemYjP4.js} +1 -1
  68. package/dist/interface/assets/{Recordings-XY32_Jjt.js → Recordings-Cwns8Zzj.js} +1 -1
  69. package/dist/interface/assets/{Settings-CXWxt73x.js → Settings-CDH3BeuL.js} +1 -1
  70. package/dist/interface/assets/SettingsAccount-BoWR0DKm.js +1 -0
  71. package/dist/interface/assets/{SettingsAccount-MLkJU79V.js → SettingsAccount-CycVwV2K.js} +1 -1
  72. package/dist/interface/assets/{SettingsAppearance-CHRnfQ4O.js → SettingsAppearance-BnuFyX8o.js} +1 -1
  73. package/dist/interface/assets/SettingsAppearance-DHSpEmup.js +1 -0
  74. package/dist/interface/assets/{SettingsBackup-Xjb4i_YZ.js → SettingsBackup-CBF2IQN_.js} +1 -1
  75. package/dist/interface/assets/{SettingsMqtt-CW0uvXrU.js → SettingsMqtt-CChS0s5J.js} +1 -1
  76. package/dist/interface/assets/{SettingsNotifications-BbyXpyHK.js → SettingsNotifications-D-2v9oM8.js} +1 -1
  77. package/dist/interface/assets/{SettingsRecordings-DVZPpunU.js → SettingsRecordings-Ui2Xd5Ye.js} +1 -1
  78. package/dist/interface/assets/{SettingsRemote-BnFHx9_s.js → SettingsRemote-D2nKjVHR.js} +1 -1
  79. package/dist/interface/assets/{SettingsSystem-C1ne-w59.js → SettingsSystem-C1vJGmFo.js} +2 -2
  80. package/dist/interface/assets/{SettingsUsers-91m0163s.js → SettingsUsers-DTFIKS6H.js} +1 -1
  81. package/dist/interface/assets/{Terminal-D_E-kRbN.js → Terminal-DDsjIhe7.js} +1 -1
  82. package/dist/interface/assets/{VariableInput-BHvGHE7o.js → VariableInput-BEjTv8xz.js} +1 -1
  83. package/dist/interface/assets/{VariableSuggestions-uJAwwX7y.js → VariableSuggestions-DcgHR-OY.js} +1 -1
  84. package/dist/interface/assets/{VersionsHandler-DJ00TTHi.js → VersionsHandler-DrVcvut6.js} +1 -1
  85. package/dist/interface/assets/{Workers-BCBrqShK.js → Workers-xyas5_sn.js} +1 -1
  86. package/dist/interface/assets/{api-ByMXkaIi.js → api-B1n4M73U.js} +1 -1
  87. package/dist/interface/assets/api-CdJDEL3z.js +2 -0
  88. package/dist/interface/assets/{auth-B-MND66x.js → auth-DOnr6Mc1.js} +1 -1
  89. package/dist/interface/assets/{automations-DvpxT4Pa.js → automations-B-tYtR3y.js} +1 -1
  90. package/dist/interface/assets/{cameras.schema-2VoKYyFS.js → cameras.schema-C-xz1hwq.js} +1 -1
  91. package/dist/interface/assets/cloudHandoff-zt3rCB3J.js +1 -0
  92. package/dist/interface/assets/{config-UED3wn2k.js → config-CYmKCSzU.js} +1 -1
  93. package/dist/interface/assets/{flowSchema-DyobL8Pg.js → flowSchema-CsPTDyH8.js} +1 -1
  94. package/dist/interface/assets/main-DILs_jYV.js +3 -0
  95. package/dist/interface/assets/{main-DbPnvfcp.css → main-Dchuz606.css} +1 -1
  96. package/dist/interface/assets/{mqtt-BltdxiuG.js → mqtt-BrTLJ_eM.js} +1 -1
  97. package/dist/interface/assets/{notifications-D4Mi4q8n.js → notifications-Dt6ygmRP.js} +1 -1
  98. package/dist/interface/assets/{plugins-DmgMSZSt.js → plugins-BcJnIPJC.js} +1 -1
  99. package/dist/interface/assets/{round-restart-alt-D1SwcyIw.js → round-restart-alt-B6N0m8oC.js} +1 -1
  100. package/dist/interface/assets/{server-BBvLLocT.js → server-_ByAktOF.js} +1 -1
  101. package/dist/interface/assets/{theme-CHyA8uCs.js → theme-CORL_-pn.js} +1 -1
  102. package/dist/interface/assets/{types-ByD7R6WC.js → types-CGqXKLKp.js} +1 -1
  103. package/dist/interface/assets/{types-DRsoZjsP.js → types-DDSlYw6n.js} +1 -1
  104. package/dist/interface/assets/{useAppVersion-dQkatyRF.js → useAppVersion-CWa09Ql5.js} +1 -1
  105. package/dist/interface/assets/{useBackupRestore-D6Vxck9i.js → useBackupRestore-5tZ-awcr.js} +1 -1
  106. package/dist/interface/assets/{useCameraOptions-zPRiut_S.js → useCameraOptions-L0smaaZz.js} +1 -1
  107. package/dist/interface/assets/{useLogsSocket-DzKSWAVf.js → useLogsSocket-DQSgBMsw.js} +1 -1
  108. package/dist/interface/assets/{useServerRestart-DjaOOudi.js → useServerRestart-lPp2ZiX-.js} +1 -1
  109. package/dist/interface/assets/{useStreamStatus-DpXFSeOf.js → useStreamStatus-BroqI_Eh.js} +1 -1
  110. package/dist/interface/assets/{useUserOptions-B8T0ROJS.js → useUserOptions-BB451w9I.js} +1 -1
  111. package/dist/interface/assets/vendor-cameraui-Bq-hQsT7.js +2040 -0
  112. package/dist/interface/assets/{vendor-core-M6N9PctY.js → vendor-core-CoiYJRqo.js} +1 -1
  113. package/dist/interface/assets/{vendor-gridstack-DHPnER0W.js → vendor-gridstack-9ka60QnT.js} +1 -1
  114. package/dist/interface/assets/{vendor-gridstack-Dxwp3vpP.css → vendor-gridstack-Chv4ms9g.css} +1 -1
  115. package/dist/interface/assets/{vendor-primevue-BynQnxoR.js → vendor-primevue-B3sIO6X2.js} +1 -1
  116. package/dist/interface/index.html +19 -19
  117. package/dist/interface/sw.js +1 -1
  118. package/dist/server/package.json +7 -7
  119. package/dist/server/requirements.txt +1 -1
  120. package/dist/server/src/api/controllers/auth.controller.js +13 -3
  121. package/dist/server/src/api/controllers/auth.controller.js.map +1 -1
  122. package/dist/server/src/api/index.js +1 -0
  123. package/dist/server/src/api/index.js.map +1 -1
  124. package/dist/server/src/api/middlewares/authValidation.middleware.js +1 -1
  125. package/dist/server/src/api/middlewares/authValidation.middleware.js.map +1 -1
  126. package/dist/server/src/api/plugins/proxy.plugin.js +22 -16
  127. package/dist/server/src/api/plugins/proxy.plugin.js.map +1 -1
  128. package/dist/server/src/api/services/auth.service.d.ts +9 -2
  129. package/dist/server/src/api/services/auth.service.js +28 -12
  130. package/dist/server/src/api/services/auth.service.js.map +1 -1
  131. package/dist/server/src/api/services/remote.service.js +2 -1
  132. package/dist/server/src/api/services/remote.service.js.map +1 -1
  133. package/dist/server/src/api/types/index.d.ts +5 -0
  134. package/dist/server/src/api/types/index.js +5 -3
  135. package/dist/server/src/api/types/index.js.map +1 -1
  136. package/dist/server/src/api/utils/utils.d.ts +1 -0
  137. package/dist/server/src/api/utils/utils.js +8 -0
  138. package/dist/server/src/api/utils/utils.js.map +1 -0
  139. package/dist/server/src/api/websocket/index.js +2 -2
  140. package/dist/server/src/api/websocket/index.js.map +1 -1
  141. package/dist/server/src/camera/decoder/stationary-suppressor.d.ts +1 -0
  142. package/dist/server/src/camera/decoder/stationary-suppressor.js +49 -13
  143. package/dist/server/src/camera/decoder/stationary-suppressor.js.map +1 -1
  144. package/dist/server/src/rpc/server.js +3 -0
  145. package/dist/server/src/rpc/server.js.map +1 -1
  146. package/dist/server/src/services/mdns/index.js +1 -3
  147. package/dist/server/src/services/mdns/index.js.map +1 -1
  148. package/dist/server/src/types.d.ts +1 -4
  149. package/package.json +7 -7
  150. package/dist/interface/assets/Console-tfkkZnFl.js +0 -1
  151. package/dist/interface/assets/CuiBottomSheet-m_HX6x4G.js +0 -1
  152. package/dist/interface/assets/PluginSearch-BvhNP9WQ.js +0 -1
  153. package/dist/interface/assets/SettingsAccount-RGvmNkwD.js +0 -1
  154. package/dist/interface/assets/SettingsAppearance-CyaOt4lL.js +0 -1
  155. package/dist/interface/assets/api-ChlkJnEG.js +0 -2
  156. package/dist/interface/assets/cloudHandoff-o_0n9cgb.js +0 -1
  157. package/dist/interface/assets/main-Cd1DVdC9.js +0 -3
  158. package/dist/interface/assets/vendor-cameraui-D7o3alq7.js +0 -2039
@@ -46,11 +46,14 @@ class WebSocketProxy {
46
46
  try {
47
47
  const url = new URL(request.url, `http://${request.headers.host}`);
48
48
  const token = url.searchParams.get('token') ?? '';
49
- const dbToken = this.authService.findByAccessToken(token);
50
- if (!dbToken) {
51
- this.wss.handleUpgrade(request, socket, head, (clientWs) => {
52
- clientWs.close(4401, 'unauthorized: token expired');
53
- });
49
+ const resolved = this.authService.resolveAccessToken(token);
50
+ if (!resolved) {
51
+ this.reject(request, socket, head, 4401, 'unauthorized: unknown token', token);
52
+ return;
53
+ }
54
+ const dbToken = resolved.token;
55
+ if (resolved.via === 'current' && dbToken.type !== 'api' && dbToken.access_token_expires_at !== undefined && dbToken.access_token_expires_at < Date.now()) {
56
+ this.reject(request, socket, head, 4401, 'unauthorized: token expired', token);
54
57
  return;
55
58
  }
56
59
  let targetUrl = this.upstream;
@@ -59,9 +62,7 @@ class WebSocketProxy {
59
62
  if (this.target === 'go2rtc') {
60
63
  const src = url.searchParams.get('src') ?? '';
61
64
  if (dbToken.stream_scope && src !== dbToken.stream_scope) {
62
- this.wss.handleUpgrade(request, socket, head, (clientWs) => {
63
- clientWs.close(4403, 'forbidden: src out of scope');
64
- });
65
+ this.reject(request, socket, head, 4403, 'forbidden: src out of scope', token);
65
66
  return;
66
67
  }
67
68
  targetUrl += `?src=${src}`;
@@ -71,9 +72,7 @@ class WebSocketProxy {
71
72
  }
72
73
  else if (this.target === 'nats') {
73
74
  if (dbToken.stream_scope || dbToken.user_id.startsWith('share_')) {
74
- this.wss.handleUpgrade(request, socket, head, (clientWs) => {
75
- clientWs.close(4403, 'forbidden: token not allowed on rpc bus');
76
- });
75
+ this.reject(request, socket, head, 4403, 'forbidden: token not allowed on rpc bus', token);
77
76
  return;
78
77
  }
79
78
  const user = this.usersService.findById(dbToken.user_id);
@@ -82,9 +81,7 @@ class WebSocketProxy {
82
81
  if (!isAdmin) {
83
82
  const connId = url.searchParams.get('connId') ?? '';
84
83
  if (!/^[A-Za-z0-9_-]{8,128}$/.test(connId)) {
85
- this.wss.handleUpgrade(request, socket, head, (clientWs) => {
86
- clientWs.close(4400, 'bad request: missing or invalid connId');
87
- });
84
+ this.reject(request, socket, head, 4400, 'bad request: missing or invalid connId', token);
88
85
  return;
89
86
  }
90
87
  firewallConnId = connId;
@@ -107,7 +104,8 @@ class WebSocketProxy {
107
104
  this.proxyWebSockets(clientWs, serverWs, natsCreds, firewallConnId);
108
105
  });
109
106
  }
110
- catch {
107
+ catch (err) {
108
+ this.logger.warn(`Proxy upgrade failed (500) target=${this.target}: ${err?.message ?? err}`);
111
109
  socket.write('HTTP/1.1 500 Internal Server Error\r\n\r\n');
112
110
  socket.destroy();
113
111
  }
@@ -176,7 +174,9 @@ class WebSocketProxy {
176
174
  server.on('pong', (data) => client.readyState === WebSocket.OPEN && client.pong(data));
177
175
  server.on('close', (code, reason) => {
178
176
  if (client.readyState === WebSocket.OPEN) {
179
- client.close(isValidCloseCode(code) ? code : 1000, reason);
177
+ // abnormal upstream death (1006/no code) must not read as a clean
178
+ // close — 4500 tells the client to retry with backoff
179
+ client.close(isValidCloseCode(code) ? code : 4500, isValidCloseCode(code) ? reason : reason?.length ? reason : 'upstream lost');
180
180
  }
181
181
  });
182
182
  server.on('error', () => {
@@ -184,6 +184,12 @@ class WebSocketProxy {
184
184
  client.close(1011);
185
185
  });
186
186
  }
187
+ reject(request, socket, head, code, reason, token) {
188
+ this.logger.warn(`Proxy rejected (${code}) target=${this.target} token=${token.slice(0, 8)}… — ${reason}`);
189
+ this.wss.handleUpgrade(request, socket, head, (clientWs) => {
190
+ clientWs.close(code, reason);
191
+ });
192
+ }
187
193
  extractMessage(data) {
188
194
  if (Buffer.isBuffer(data))
189
195
  return data.toString('utf-8');
@@ -1 +1 @@
1
- {"version":3,"file":"proxy.plugin.js","sourceRoot":"","sources":["../../../../../src/api/plugins/proxy.plugin.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"proxy.plugin.js","sourceRoot":"","sources":["../../../../../src/api/plugins/proxy.plugin.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,6 @@
1
1
  import type { ClientKind, DBToken, DBTokenDevice } from '../types/index.js';
2
2
  export declare class AuthService {
3
3
  private dbs;
4
- private socketService;
5
4
  constructor();
6
5
  listTokens(): DBToken[];
7
6
  listTokensByUserId(userId: string): DBToken[];
@@ -10,6 +9,14 @@ export declare class AuthService {
10
9
  findById(id: string): DBToken | undefined;
11
10
  findByAccessToken(access_token: string): DBToken | undefined;
12
11
  findByRefreshToken(refresh_token: string): DBToken | undefined;
12
+ resolveAccessToken(access_token: string): {
13
+ token: DBToken;
14
+ via: 'current' | 'previous';
15
+ } | undefined;
16
+ resolveRefreshToken(refresh_token: string): {
17
+ token: DBToken;
18
+ via: 'current' | 'previous';
19
+ } | undefined;
13
20
  findByDeviceId(userId: string, deviceId: string): DBToken | undefined;
14
21
  insert(token: DBToken): Promise<void>;
15
22
  invalidateById(id: string): Promise<void>;
@@ -38,6 +45,6 @@ export declare class AuthService {
38
45
  }): DBToken;
39
46
  rotate(oldToken: DBToken, newAccessToken: string): Promise<DBToken>;
40
47
  mergeDevice(token: DBToken, patch: Partial<DBTokenDevice>): DBToken;
48
+ private withinRotationGrace;
41
49
  private generateRefreshToken;
42
- private unauthenticateToken;
43
50
  }
@@ -14,10 +14,8 @@ import { API_TOKEN_PREFIX, TOKEN_LIFETIME } from '../types/index.js';
14
14
  import { SocketService } from '../websocket/index.js';
15
15
  let AuthService = class AuthService {
16
16
  dbs;
17
- socketService;
18
17
  constructor() {
19
18
  this.dbs = container.resolve('dbs');
20
- this.socketService = container.resolve('socketService');
21
19
  }
22
20
  listTokens() {
23
21
  return [...this.dbs.tokensDB.getRange()].map(({ value }) => value);
@@ -48,6 +46,26 @@ let AuthService = class AuthService {
48
46
  }
49
47
  return undefined;
50
48
  }
49
+ resolveAccessToken(access_token) {
50
+ for (const { value } of this.dbs.tokensDB.getRange()) {
51
+ if (value.access_token === access_token)
52
+ return { token: value, via: 'current' };
53
+ if (value.previous_access_token === access_token && this.withinRotationGrace(value)) {
54
+ return { token: value, via: 'previous' };
55
+ }
56
+ }
57
+ return undefined;
58
+ }
59
+ resolveRefreshToken(refresh_token) {
60
+ for (const { value } of this.dbs.tokensDB.getRange()) {
61
+ if (value.refresh_token === refresh_token)
62
+ return { token: value, via: 'current' };
63
+ if (value.previous_refresh_token === refresh_token && this.withinRotationGrace(value)) {
64
+ return { token: value, via: 'previous' };
65
+ }
66
+ }
67
+ return undefined;
68
+ }
51
69
  findByDeviceId(userId, deviceId) {
52
70
  for (const { value } of this.dbs.tokensDB.getRange()) {
53
71
  if (value.user_id === userId && value.device.id === deviceId)
@@ -59,11 +77,7 @@ let AuthService = class AuthService {
59
77
  await this.dbs.tokensDB.put(token.id, token);
60
78
  }
61
79
  async invalidateById(id) {
62
- const token = this.dbs.tokensDB.get(id);
63
- if (!token)
64
- return;
65
80
  await this.dbs.tokensDB.remove(id);
66
- this.unauthenticateToken(token.access_token);
67
81
  }
68
82
  async invalidateByAccessToken(access_token) {
69
83
  const token = this.findByAccessToken(access_token);
@@ -79,10 +93,7 @@ let AuthService = class AuthService {
79
93
  await Promise.all(tokens.map((t) => this.invalidateById(t.id)));
80
94
  }
81
95
  async invalidateAll() {
82
- const tokens = this.listTokens();
83
96
  await this.dbs.tokensDB.clearAsync();
84
- for (const token of tokens)
85
- this.unauthenticateToken(token.access_token);
86
97
  }
87
98
  async invalidateAllSessions() {
88
99
  const tokens = this.listTokens().filter((t) => t.type !== 'api');
@@ -120,6 +131,7 @@ let AuthService = class AuthService {
120
131
  id: randomUUID(),
121
132
  user_id: params.userId,
122
133
  access_token: params.accessToken,
134
+ access_token_expires_at: now + TOKEN_LIFETIME.ACCESS_SECONDS * 1000,
123
135
  refresh_token: this.generateRefreshToken(),
124
136
  refresh_token_expires_at: now + window,
125
137
  persistent: params.persistent,
@@ -156,10 +168,14 @@ let AuthService = class AuthService {
156
168
  const rotated = {
157
169
  ...oldToken,
158
170
  access_token: newAccessToken,
171
+ access_token_expires_at: now + TOKEN_LIFETIME.ACCESS_SECONDS * 1000,
159
172
  refresh_token: this.generateRefreshToken(),
160
173
  refresh_token_expires_at: oldToken.persistent ? now + window : oldToken.refresh_token_expires_at,
161
174
  device: { ...oldToken.device, last_seen_at: now },
162
175
  parent_token_id: oldToken.parent_token_id ?? oldToken.id,
176
+ previous_access_token: oldToken.access_token,
177
+ previous_refresh_token: oldToken.refresh_token,
178
+ rotated_at: now,
163
179
  };
164
180
  await this.dbs.tokensDB.put(rotated.id, rotated);
165
181
  return rotated;
@@ -171,12 +187,12 @@ let AuthService = class AuthService {
171
187
  });
172
188
  return token;
173
189
  }
190
+ withinRotationGrace(token) {
191
+ return token.rotated_at !== undefined && Date.now() - token.rotated_at <= TOKEN_LIFETIME.ROTATION_GRACE_MS;
192
+ }
174
193
  generateRefreshToken() {
175
194
  return randomBytes(48).toString('base64url');
176
195
  }
177
- unauthenticateToken(token) {
178
- this.socketService?.io?.of('/camera.ui').emit('invalidToken', token);
179
- }
180
196
  };
181
197
  AuthService = __decorate([
182
198
  registry([
@@ -1 +1 @@
1
- {"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../../../../src/api/services/auth.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../../../../src/api/services/auth.service.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,7 @@
1
1
  import { mergeWith } from '@camera.ui/common/utils';
2
2
  import { hostname } from 'node:os';
3
3
  import { container } from 'tsyringe';
4
+ import { dbRemoteSchema } from '../database/record-schemas.js';
4
5
  export class RemoteService {
5
6
  dbs;
6
7
  constructor() {
@@ -13,7 +14,7 @@ export class RemoteService {
13
14
  return container.resolve('cloudApi');
14
15
  }
15
16
  info() {
16
- return this.dbs.remoteDB.get('remote');
17
+ return this.dbs.remoteDB.get('remote') ?? dbRemoteSchema.parse({});
17
18
  }
18
19
  async patch(infoData = {}) {
19
20
  const info = this.info();
@@ -1 +1 @@
1
- {"version":3,"file":"remote.service.js","sourceRoot":"","sources":["../../../../../src/api/services/remote.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACnC,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAWrC,MAAM,OAAO,aAAa;IAChB,GAAG,CAAW;IAEtB;QACE,IAAI,CAAC,GAAG,GAAG,SAAS,CAAC,OAAO,CAAW,KAAK,CAAC,CAAC;IAChD,CAAC;IAED,IAAY,WAAW;QACrB,OAAO,SAAS,CAAC,OAAO,CAAc,OAAO,CAAC,CAAC;IACjD,CAAC;IAED,IAAY,QAAQ;QAClB,OAAO,SAAS,CAAC,OAAO,CAAW,UAAU,CAAC,CAAC;IACjD,CAAC;IAEM,IAAI;QACT,OAAO,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAE,CAAC;IAC1C,CAAC;IAEM,KAAK,CAAC,KAAK,CAAC,WAAkC,EAAE;QACrD,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QAEzB,SAAS,CAAC,IAAI,EAAE,QAAQ,EAAE,CAAC,MAAW,EAAE,MAAW,EAAE,EAAE;YACrD,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC1B,OAAO,MAAM,CAAC;YAChB,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,MAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAE5C,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,gBAAgB;QACrB,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC;QACpC,OAAO,CAAC,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC;IACxC,CAAC;IAEM,QAAQ;QACb,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;IAC7C,CAAC;IAEM,KAAK,CAAC,UAAU,CAAC,KAAuB;QAC7C,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC;QAC/C,MAAM,KAAK,GAAG,EAAE,GAAG,IAAI,CAAC,QAAQ,EAAE,EAAE,GAAG,KAAK,EAAE,CAAC;QAC/C,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAC3C,IAAI,CAAC,6BAA6B,CAAC,MAAM,EAAE,KAAK,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAClE,OAAO,KAAK,CAAC;IACf,CAAC;IAEM,KAAK,CAAC,gBAAgB;QAC3B,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC9B,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,EAAE,QAAQ,CAAC;QACrC,OAAO,KAAK,CAAC,KAAK,CAAC;QACnB,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAC3C,IAAI,CAAC,6BAA6B,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACxD,CAAC;IAEM,KAAK,CAAC,WAAW,CAAC,IAAa;QAOpC,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC9B,MAAM,UAAU,GAAG,IAAI,EAAE,IAAI,EAAE,IAAI,KAAK,CAAC,IAAI,IAAI,QAAQ,EAAE,CAAC;QAE5D,MAAM,iBAAiB,GAAG,KAAK,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;QACxF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,eAAe,CAAC,iBAAiB,CAAC,CAAC;QAE/E,MAAM,IAAI,CAAC,UAAU,CAAC;YACpB,IAAI,EAAE,UAAU;YAChB,YAAY,EAAE;gBACZ,WAAW,EAAE,IAAI,CAAC,WAAW;gBAC7B,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,UAAU,GAAG,IAAI;aAChD;SACF,CAAC,CAAC;QAEH,OAAO;YACL,QAAQ,EAAE,IAAI,CAAC,SAAS;YACxB,eAAe,EAAE,IAAI,CAAC,gBAAgB;YACtC,uBAAuB,EAAE,IAAI,CAAC,yBAAyB;YACvD,SAAS,EAAE,IAAI,CAAC,UAAU;YAC1B,YAAY,EAAE,IAAI,CAAC,QAAQ;SAC5B,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,WAAW,CAAC,OAAgB,EAAE,cAAsB,EAAE,KAAc;QAC/E,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC,YAAY,CAAC;QAC7C,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;QAC9B,CAAC;QACD,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;YACpC,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC9B,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;QAC9B,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,cAAc,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAClF,QAAQ,MAAM,CAAC,KAAK,EAAE,CAAC;YACrB,KAAK,SAAS;gBACZ,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;YAC9B,KAAK,WAAW;gBACd,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC;YAChC,KAAK,SAAS;gBACZ,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBAC9B,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;YAC9B,KAAK,QAAQ;gBACX,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBAC9B,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;YAC7B,KAAK,UAAU;gBACb,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBAC9B,MAAM,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAC;gBACzC,IAAI,CAAC;oBACH,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;gBACjD,CAAC;gBAAC,MAAM,CAAC;oBACP,aAAa;gBACf,CAAC;gBACD,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC;YAChC;gBACE,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,IAAI,kBAAkB,CAAC,CAAC;QACxD,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,gBAAgB;QAC3B,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC9B,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC;YACxB,OAAO;QACT,CAAC;QACD,OAAO,KAAK,CAAC,YAAY,CAAC;QAC1B,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAC7C,CAAC;IAEM,KAAK,CAAC,iBAAiB,CAAC,OAAgB;QAC7C,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC;YAClD,OAAO,CAAC,aAAa;QACvB,CAAC;QACD,MAAM,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,IAAI,IAAI,QAAQ,EAAE,EAAE,QAAQ,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;IAC3G,CAAC;IAEM,KAAK,CAAC,qBAAqB;QAChC,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC;YAClD,OAAO;QACT,CAAC;QAED,MAAM,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QAC7D,MAAM,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;IAC1C,CAAC;IAEM,KAAK,CAAC,qBAAqB;QAChC,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QAE9B,OAAO;YACL,YAAY,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK;YAC3B,WAAW,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,YAAY;YACxC,UAAU,EAAE,KAAK,CAAC,IAAI,IAAI,QAAQ,EAAE;SACrC,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,qBAAqB,CAAC,IAAY;QAC7C,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC9B,MAAM,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC;QAEhC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC;QAClB,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAE3C,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC;YAClD,OAAO,CAAC,iBAAiB;QAC3B,CAAC;QAED,MAAM,mBAAmB,GAAG,SAAS,CAAC,OAAO,CAAsB,qBAAqB,CAAC,CAAC;QAC1F,MAAM,MAAM,GAAG,mBAAmB,CAAC,SAAS,EAAE,CAAC;QAE/C,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;QAC9E,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,KAAK,CAAC,IAAI,GAAG,YAAY,CAAC;YAC1B,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YAC3C,MAAM,GAAG,CAAC;QACZ,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,UAAU,CAAC,OAAgB,EAAE,cAAuB;QAChE,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC;YAClD,OAAO;QACT,CAAC;QACD,MAAM,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC;YACrC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,IAAI,IAAI,QAAQ,EAAE;YACxC,QAAQ,EAAE,CAAC,OAAO;YAClB,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACzD,CAAC,CAAC;IACL,CAAC;IAEO,6BAA6B,CAAC,QAA4B,EAAE,OAA2B;QAC7F,IAAI,QAAQ,KAAK,OAAO;YAAE,OAAO;QACjC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,uBAAuB,CAAC,qBAAqB,EAAE;YAC1E,SAAS,EAAE,CAAC,CAAC,OAAO;SACrB,CAAC,CAAC;QACH,IAAI,CAAC,uBAAuB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;QACxC,IAAI,CAAC,qBAAqB,EAAE,CAAC;IAC/B,CAAC;IAEO,qBAAqB;QAC3B,IAAI,CAAC;YACH,KAAK,SAAS,CAAC,OAAO,CAAsB,qBAAqB,CAAC,CAAC,eAAe,EAAE,CAAC;QACvF,CAAC;QAAC,MAAM,CAAC;YACP,SAAS;QACX,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,uBAAuB,CAAC,SAAkB;QACtD,IAAI,CAAC;YACH,MAAM,YAAY,GAAG,SAAS,CAAC,OAAO,CAAe,cAAc,CAAC,CAAC;YACrE,IAAI,SAAS,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC;gBACzC,MAAM,YAAY,CAAC,KAAK,EAAE,CAAC;YAC7B,CAAC;iBAAM,IAAI,CAAC,SAAS,IAAI,YAAY,CAAC,SAAS,EAAE,CAAC;gBAChD,MAAM,YAAY,CAAC,IAAI,EAAE,CAAC;YAC5B,CAAC;iBAAM,IAAI,SAAS,IAAI,YAAY,CAAC,SAAS,EAAE,CAAC;gBAC/C,MAAM,YAAY,CAAC,OAAO,EAAE,CAAC;YAC/B,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,oEAAoE;YACpE,mDAAmD;QACrD,CAAC;IACH,CAAC;CACF"}
1
+ {"version":3,"file":"remote.service.js","sourceRoot":"","sources":["../../../../../src/api/services/remote.service.ts"],"names":[],"mappings":"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"}
@@ -42,6 +42,7 @@ export interface DBToken {
42
42
  readonly id: string;
43
43
  user_id: string;
44
44
  access_token: string;
45
+ access_token_expires_at?: number;
45
46
  refresh_token: string;
46
47
  refresh_token_expires_at: number;
47
48
  persistent: boolean;
@@ -50,6 +51,9 @@ export interface DBToken {
50
51
  stream_scope?: string;
51
52
  type?: DBTokenType;
52
53
  name?: string;
54
+ previous_access_token?: string;
55
+ previous_refresh_token?: string;
56
+ rotated_at?: number;
53
57
  }
54
58
  export declare const API_TOKEN_PREFIX = "cui_";
55
59
  export interface ApiTokenInfo {
@@ -103,6 +107,7 @@ export declare const TOKEN_LIFETIME: {
103
107
  readonly ACCESS_SECONDS: number;
104
108
  readonly REFRESH_PERSISTENT_MS: number;
105
109
  readonly REFRESH_NON_PERSISTENT_MS: number;
110
+ readonly ROTATION_GRACE_MS: number;
106
111
  };
107
112
  export interface CameraCamviewSettings {
108
113
  enabled: boolean;
@@ -1,7 +1,9 @@
1
+ import { numberFromEnv } from '../utils/utils.js';
1
2
  export const API_TOKEN_PREFIX = 'cui_';
2
3
  export const TOKEN_LIFETIME = {
3
- ACCESS_SECONDS: 15 * 60,
4
- REFRESH_PERSISTENT_MS: 90 * 24 * 60 * 60 * 1000,
5
- REFRESH_NON_PERSISTENT_MS: 24 * 60 * 60 * 1000,
4
+ ACCESS_SECONDS: numberFromEnv('JWT_ACCESS_TTL_SECONDS', 15 * 60),
5
+ REFRESH_PERSISTENT_MS: numberFromEnv('JWT_REFRESH_PERSISTENT_TTL_MS', 90 * 24 * 60 * 60 * 1000),
6
+ REFRESH_NON_PERSISTENT_MS: numberFromEnv('JWT_REFRESH_NON_PERSISTENT_TTL_MS', 24 * 60 * 60 * 1000),
7
+ ROTATION_GRACE_MS: numberFromEnv('JWT_ROTATION_GRACE_MS', 30_000),
6
8
  };
7
9
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/api/types/index.ts"],"names":[],"mappings":"AA+EA,MAAM,CAAC,MAAM,gBAAgB,GAAG,MAAM,CAAC;AAwDvC,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B,cAAc,EAAE,EAAE,GAAG,EAAE;IACvB,qBAAqB,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAC/C,yBAAyB,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;CACtC,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/api/types/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAqFlD,MAAM,CAAC,MAAM,gBAAgB,GAAG,MAAM,CAAC;AAwDvC,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B,cAAc,EAAE,aAAa,CAAC,wBAAwB,EAAE,EAAE,GAAG,EAAE,CAAC;IAChE,qBAAqB,EAAE,aAAa,CAAC,+BAA+B,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAC/F,yBAAyB,EAAE,aAAa,CAAC,mCAAmC,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAClG,iBAAiB,EAAE,aAAa,CAAC,uBAAuB,EAAE,MAAM,CAAC;CACzD,CAAC"}
@@ -0,0 +1 @@
1
+ export declare function numberFromEnv(name: string, fallback: number): number;
@@ -0,0 +1,8 @@
1
+ export function numberFromEnv(name, fallback) {
2
+ const raw = process.env[name];
3
+ if (!raw)
4
+ return fallback;
5
+ const parsed = Number.parseInt(raw, 10);
6
+ return Number.isFinite(parsed) && parsed > 0 ? parsed : fallback;
7
+ }
8
+ //# sourceMappingURL=utils.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/api/utils/utils.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,aAAa,CAAC,IAAY,EAAE,QAAgB;IAC1D,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAC9B,IAAI,CAAC,GAAG;QAAE,OAAO,QAAQ,CAAC;IAC1B,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IACxC,OAAO,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC;AACnE,CAAC"}
@@ -84,7 +84,7 @@ export class SocketService {
84
84
  if (this.adminNsp.includes(nsp) && user.role !== 'admin' && user.role !== 'master') {
85
85
  return next(new UnauthorizedError('insufficient_role', { message: `Not authorized to connect to ${nsp}` }));
86
86
  }
87
- const dbToken = this.authService.findByAccessToken(socket.encodedToken);
87
+ const dbToken = this.authService.resolveAccessToken(socket.encodedToken)?.token;
88
88
  if (!dbToken) {
89
89
  return next(new UnauthorizedError('unauthenticated', { message: 'Unauthenticated' }));
90
90
  }
@@ -95,7 +95,7 @@ export class SocketService {
95
95
  const decodedToken = socket.decodedToken;
96
96
  const user = this.usersService.findByName(decodedToken?.username ?? '');
97
97
  const address = socket.conn.remoteAddress;
98
- const dbToken = this.authService.findByAccessToken(socket.encodedToken);
98
+ const dbToken = this.authService.resolveAccessToken(socket.encodedToken)?.token;
99
99
  const device = dbToken?.device.name;
100
100
  this.logger.trace(`${user?.username} | ${address} | ${device} | authenticated and connected to ${nsp} | id: ${socket.id}`);
101
101
  socket.on('disconnect', (reason) => {
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/api/websocket/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/api/websocket/index.ts"],"names":[],"mappings":"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"}
@@ -21,6 +21,7 @@ export declare class StationarySuppressor {
21
21
  dropForCameraMove(): void;
22
22
  resetEventState(): void;
23
23
  private evaluateTrack;
24
+ private matchCandidate;
24
25
  private evaluateAnchored;
25
26
  private evaluateDormant;
26
27
  private adoptAnchor;
@@ -6,11 +6,12 @@ export const WAKE_IOU = 0.6;
6
6
  export const DEPART_IOU = 0.15;
7
7
  export const WAKE_SIGHTINGS = 3;
8
8
  const MAX_ANCHORS = 25;
9
+ const MAX_CANDIDATES = 25;
9
10
  const ANCHOR_DRIFT_ALPHA = 0.1;
10
11
  export class StationarySuppressor {
11
12
  logger;
12
13
  anchors = new Map();
13
- candidates = new Map();
14
+ candidates = [];
14
15
  suppressionLogged = false;
15
16
  constructor(logger) {
16
17
  this.logger = logger;
@@ -62,6 +63,15 @@ export class StationarySuppressor {
62
63
  anchor.sealed = true;
63
64
  }
64
65
  }
66
+ for (let i = this.candidates.length - 1; i >= 0; i--) {
67
+ const candidate = this.candidates[i];
68
+ if (candidate.ghost) {
69
+ this.candidates.splice(i, 1);
70
+ }
71
+ else {
72
+ candidate.ghost = true;
73
+ }
74
+ }
65
75
  while (this.anchors.size > MAX_ANCHORS) {
66
76
  const oldest = this.anchors.keys().next().value;
67
77
  if (oldest === undefined)
@@ -75,16 +85,16 @@ export class StationarySuppressor {
75
85
  }
76
86
  clear() {
77
87
  this.anchors.clear();
88
+ this.candidates.length = 0;
78
89
  }
79
90
  dropForCameraMove() {
80
91
  if (this.anchors.size > 0) {
81
92
  this.logger.trace(`Static suppression: dropping ${this.anchors.size} anchor(s), camera moved`);
82
93
  }
83
94
  this.anchors.clear();
84
- this.candidates.clear();
95
+ this.candidates.length = 0;
85
96
  }
86
97
  resetEventState() {
87
- this.candidates.clear();
88
98
  this.suppressionLogged = false;
89
99
  }
90
100
  evaluateTrack(t) {
@@ -95,23 +105,50 @@ export class StationarySuppressor {
95
105
  if (anchor) {
96
106
  return anchor.dormant ? this.evaluateDormant(t, anchor) : this.evaluateAnchored(t, anchor);
97
107
  }
108
+ const candidate = this.matchCandidate(t);
98
109
  if ((t.trackSpeed ?? 0) < STATIONARY_SPEED_THRESHOLD) {
99
- if (this.adoptAnchor(t))
110
+ if (this.adoptAnchor(t)) {
111
+ if (candidate)
112
+ this.candidates.splice(this.candidates.indexOf(candidate), 1);
100
113
  return false;
101
- const sightings = (this.candidates.get(t.trackId) ?? 0) + 1;
102
- if (sightings >= ANCHOR_SIGHTINGS) {
103
- this.candidates.delete(t.trackId);
104
- this.anchors.set(t.trackId, { box: t.box, label: t.label, sealed: false, ghost: false, dormant: false, wakeMisses: 0, settleSightings: 0 });
105
114
  }
106
- else {
107
- this.candidates.set(t.trackId, sightings);
115
+ if (candidate) {
116
+ candidate.box = t.box;
117
+ candidate.ghost = false;
118
+ candidate.sightings += 1;
119
+ if (candidate.sightings >= ANCHOR_SIGHTINGS) {
120
+ this.candidates.splice(this.candidates.indexOf(candidate), 1);
121
+ this.anchors.set(t.trackId, { box: t.box, label: t.label, sealed: false, ghost: false, dormant: false, wakeMisses: 0, settleSightings: 0 });
122
+ }
123
+ }
124
+ else if (this.candidates.length < MAX_CANDIDATES) {
125
+ this.candidates.push({ box: t.box, label: t.label, sightings: 1, ghost: false });
108
126
  }
109
127
  }
110
- else {
111
- this.candidates.delete(t.trackId);
128
+ else if (candidate) {
129
+ // erode instead of reset: a single noisy speed frame must not wipe the
130
+ // warm-up of a genuinely parked object
131
+ candidate.sightings -= 1;
132
+ if (candidate.sightings <= 0) {
133
+ this.candidates.splice(this.candidates.indexOf(candidate), 1);
134
+ }
112
135
  }
113
136
  return true;
114
137
  }
138
+ matchCandidate(t) {
139
+ let best;
140
+ let bestIou = WAKE_IOU;
141
+ for (const candidate of this.candidates) {
142
+ if (candidate.label !== t.label)
143
+ continue;
144
+ const iou = boxIou(candidate.box, t.box);
145
+ if (iou >= bestIou) {
146
+ best = candidate;
147
+ bestIou = iou;
148
+ }
149
+ }
150
+ return best;
151
+ }
115
152
  evaluateAnchored(t, anchor) {
116
153
  const iou = boxIou(anchor.box, t.box);
117
154
  if (iou < DEPART_IOU) {
@@ -173,7 +210,6 @@ export class StationarySuppressor {
173
210
  anchor.wakeMisses = 0;
174
211
  anchor.settleSightings = 0;
175
212
  this.anchors.set(t.trackId, anchor);
176
- this.candidates.delete(t.trackId);
177
213
  this.logger.trace(`Static suppression: ${anchor.label}#${id} re-identified as #${t.trackId} (anchor adopted)`);
178
214
  return true;
179
215
  }
@@ -1 +1 @@
1
- {"version":3,"file":"stationary-suppressor.js","sourceRoot":"","sources":["../../../../../src/camera/decoder/stationary-suppressor.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"stationary-suppressor.js","sourceRoot":"","sources":["../../../../../src/camera/decoder/stationary-suppressor.ts"],"names":[],"mappings":"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"}