Web 2.0

.gitignore

@@ -138,7 +138,6 @@ test_*.png
 *.debug.png
 
 # Recordings and media files
-recordings/
 hls_*/
 
 # Thumbnails
@@ -171,3 +170,5 @@ Thumbs.db
 *.bak
 *.backup
 android/app/debug/output-metadata.json
+
+tsconfig.tsbuildinfo

eslint.config.mts

@@ -27,11 +27,20 @@ export default defineConfig([
     '.yarn/',
     'android/',
     'source/generated/',
+    'web2/dist/',
   ]),
   {
     extends: fixupConfigRules(compat.extends('plugin:import/recommended')),
 
-    files: ['source/**/*.ts', 'eslint.config.mts', 'scripts/**/*.ts', 'prisma.config.ts', 'capacitor.config.ts'],
+    files: [
+      'source/**/*.ts',
+      'eslint.config.mts',
+      'scripts/**/*.ts',
+      'prisma.config.ts',
+      'capacitor.config.ts',
+      'web2/**/*.ts',
+      'web2/**/*.tsx',
+    ],
 
     plugins: {
       '@stylistic': stylistic,

package.json

@@ -6,7 +6,8 @@
   "packageManager": "yarn@4.17.0",
   "workspaces": [
     ".",
-    "web"
+    "web",
+    "web2"
   ],
   "scripts": {
     "start": "node ./compiled/camera.js",
@@ -17,19 +18,17 @@
     "build:server": "yarn build:server:safe",
     "build:server:safe": "copyfiles -u 1 \"source/generated/**/*\" \"compiled-temp\" && tsc --project tsconfig.build.json --outDir compiled-temp && tsx --tsconfig tsconfig.build.json scripts/safeReplace.ts",
     "build:server:force": "copyfiles -u 1 \"source/generated/**/*\" \"compiled\" && tsc --project tsconfig.build.json",
-    "build:client": "dotenvx run -- yarn workspace web build",
-    "dev:client": "dotenvx run -- yarn workspace web vite build --watch",
+    "build:client": "dotenvx run -- yarn workspace web2 build",
+    "dev:client": "cross-env NODE_ENV=development dotenvx run -- yarn workspace web2 vite build --watch --mode development --minify false",
     "dev:server": "nodemon --watch source --ext ts --exec \"tsx --tsconfig tsconfig.build.json ./source/camera.ts\"",
     "db:generate": "yarn prisma generate",
     "db:push": "yarn prisma db push",
     "db:migrate:dev:reset": "yarn prisma migrate reset",
     "db:migrate:dev": "yarn prisma migrate dev",
     "db:migrate:resolve": "yarn prisma migrate resolve",
     "db:migrate:deploy": "yarn prisma migrate deploy",
-    "lint": "yarn lint:server || true && yarn lint:client",
-    "lint:fix": "yarn lint:server --fix && yarn lint:client --fix",
-    "lint:server": "yarn eslint",
-    "lint:client": "yarn workspace web eslint",
+    "lint": "yarn eslint",
+    "lint:fix": "yarn lint --fix",
     "format:server": "prettier --check source/",
     "format:server:fix": "prettier --write source/",
     "format:client": "prettier --check web/src",
@@ -50,12 +49,13 @@
     "@types/express-session": "1.19.0",
     "@types/greenlock-express": "4.0.3",
     "@types/jsonwebtoken": "9.0.10",
-    "@types/node": "25.6.0",
+    "@types/node": "25.9.7",
     "@types/session-file-store": "1.2.6",
     "@types/web-push": "3.6.4",
     "@typescript-eslint/eslint-plugin": "8.63.0",
     "@typescript-eslint/parser": "8.63.0",
     "concurrently": "10.0.3",
+    "cross-env": "10.1.0",
     "eslint": "10.3.0",
     "eslint-config-prettier": "10.1.8",
     "eslint-plugin-import": "2.32.0",

source/camera.ts

@@ -62,7 +62,6 @@ export const notifyLogPath = path.join(
 )
 export const socketDisconnectMap = new Map<string, number>()
 
-// Ensure logs directory exists
 const motionLogsDir = path.dirname(motionLogPath)
 if (!fs.existsSync(motionLogsDir)) {
   fs.mkdirSync(motionLogsDir, { recursive: true })
@@ -108,6 +107,7 @@ export interface RequestWithUser extends express.Request {
 }
 
 const streamStates: Record<string, StreamMotionState | undefined> = {}
+const streamStateInitializations = new Map<string, Promise<StreamMotionState>>()
 
 export const motionWatcherTimeouts = new Map<string, NodeJS.Timeout>()
 
@@ -119,36 +119,7 @@ export async function setupStreamMotionMonitoring(streamId?: string) {
       `[${streamId}] Monitoring started at ${new Date().toLocaleString()}`,
     )
 
-    if (!streamStates[streamId]) {
-      const persistedStates = await loadPersistedStreamStates()
-      streamStates[streamId] = {
-        segmentTimestampMap: new Map(),
-        processingSegment: false,
-        notificationSent: false,
-        motionRecordingActive: false,
-        motionRecordingTimeoutAt: 0,
-        motionSegments: [],
-        flushingSegments: [],
-        recentSegments: [],
-        flushedSegments: [],
-        motionPaused: persistedStates[streamId]?.motionPaused ?? false,
-        startupTime: Date.now(),
-        savingInProgress: false,
-        currentSaveProcess: null,
-        saveRetryCount: 0,
-        motionStartedAt: 0,
-        lastSegmentProcessAt: 0,
-        recordingTitle: `motion_${new Date().toISOString().replace(/[:.]/g, '-')}.mp4`,
-        flushRecordings: [],
-        nextFlushNumber: 1,
-        cleaningUp: false,
-        cancelFlush: false,
-        lowSpaceNotified: false,
-        lastNotifiedRestartCooldownAt: 0,
-        currentRecordingMotionTimestamps: [],
-        lastPlaylistUpdatedAt: 0,
-      }
-    }
+    await initializeStreamState(streamId)
 
     // --- Motion Detection Watcher ---
     watchers.set(
@@ -186,6 +157,7 @@ export async function setupStreamMotionMonitoring(streamId?: string) {
                 'New segment observed while processing previous segment, rescheduling processing to avoid busy loop.',
               )
               setTimeout(() => processSegment(segmentPath), 300)
+              return
             }
 
             state.processingSegment = true
@@ -350,6 +322,10 @@ export async function setupStreamMotionMonitoring(streamId?: string) {
       motionWatcherTimeouts.set(
         streamId,
         setTimeout(async () => {
+          if (!dynamicStreams[streamId]) {
+            motionWatcherTimeouts.delete(streamId)
+            return
+          }
           if (
             !streamStates[streamId] &&
             !dynamicStreams[streamId].restartInProgress
@@ -658,7 +634,7 @@ loadStreamsFromDb()
       if (process.env.API_ENV === 'production') return
       setTimeout(() => {
         open(`http://localhost:${port}`)
-      }, 1500)
+      }, 3000)
     })
   })
 
@@ -761,7 +737,9 @@ app.use(
   cors({
     origin: (origin, callback) => {
       const allowedOrigins = (
-        process.env.API_ENV === 'production' ? [] : ['http://localhost:3000']
+        process.env.API_ENV === 'production'
+          ? []
+          : [`http://localhost:${process.env.PORT ?? 3000}`]
       ).concat(config.domains ?? [])
       if (!origin || allowedOrigins.includes(origin)) {
         callback(null, true)
@@ -855,23 +833,39 @@ const thumbnailLimiter = rateLimit({
   legacyHeaders: false,
 })
 
+const staticResourceLimiter = rateLimit({
+  validate: { ip: false },
+  windowMs: 60 * 1000, // 1 minute
+  max: 240,
+  standardHeaders: true,
+  legacyHeaders: false,
+})
+
 // --- Static & API Routes ---
-app.use(express.static(path.join(__dirname, '..', 'web', 'dist')))
+app.use(express.static(path.join(__dirname, '..', 'web2', 'dist')))
 app.use(
   '/recordings/thumbnails',
   thumbnailLimiter,
   jwtAuth,
   express.static(path.join(config.recordingsDirectory, 'thumbnails')),
 )
-app.get(/^\/(?!hls|api|recordings|signed|sounds).*/, (req, res) => {
-  res.sendFile(path.join(__dirname, '..', 'web', 'dist', 'index.html'))
-})
+app.get(
+  /^\/(?!hls|api|recordings|signed|sounds).*/,
+  staticResourceLimiter,
+  (_req, res) => {
+    res.sendFile(path.join(__dirname, '..', 'web2', 'dist', 'index.html'))
+  },
+)
 
-app.get(/^\/recordings(\/[^/]+)(\/[^/]+)?$/, (req, res) => {
-  res.sendFile(path.join(__dirname, '..', 'web', 'dist', 'index.html'))
-})
+app.get(
+  /^\/recordings(\/[^/]+)(\/[^/]+)?$/,
+  staticResourceLimiter,
+  (_req, res) => {
+    res.sendFile(path.join(__dirname, '..', 'web2', 'dist', 'index.html'))
+  },
+)
 
-app.get('/api/vapid-public-key', (req, res) => {
+app.get('/api/vapid-public-key', (_req, res) => {
   res.json({ publicKey: config.vapid.publicKey })
 })
 
@@ -960,36 +954,54 @@ export async function createStreamManager(stream: {
 }
 
 export async function initializeStreamState(streamId: string) {
-  streamStates[streamId] = {
-    segmentTimestampMap: new Map(),
-    processingSegment: false,
-    notificationSent: false,
-    motionRecordingActive: false,
-    motionRecordingTimeoutAt: 0,
-    motionSegments: [],
-    flushingSegments: [],
-    recentSegments: [],
-    flushedSegments: [],
-    motionPaused:
-      (await loadPersistedStreamState(streamId))?.motionPaused ?? false,
-    startupTime: Date.now(),
-    savingInProgress: false,
-    currentSaveProcess: null,
-    saveRetryCount: 0,
-    motionStartedAt: 0,
-    lastSegmentProcessAt: 0,
-    recordingTitle: `motion_${new Date().toISOString().replace(/[:.]/g, '-')}.mp4`,
-    flushRecordings: [],
-    nextFlushNumber: 1,
-    cleaningUp: false,
-    cancelFlush: false,
-    lowSpaceNotified: false,
-    lastNotifiedRestartCooldownAt: 0,
-    currentRecordingMotionTimestamps: [],
-    lastPlaylistUpdatedAt: 0,
-  }
+  const existingState = streamStates[streamId]
+  if (existingState) return existingState
+
+  const existingInitialization = streamStateInitializations.get(streamId)
+  if (existingInitialization) return existingInitialization
+
+  const initialization = (async () => {
+    const state: StreamMotionState = {
+      segmentTimestampMap: new Map(),
+      processingSegment: false,
+      notificationSent: false,
+      motionRecordingActive: false,
+      motionRecordingTimeoutAt: 0,
+      motionSegments: [],
+      flushingSegments: [],
+      recentSegments: [],
+      flushedSegments: [],
+      motionPaused:
+        (await loadPersistedStreamState(streamId))?.motionPaused ?? false,
+      startupTime: Date.now(),
+      savingInProgress: false,
+      currentSaveProcess: null,
+      saveRetryCount: 0,
+      motionStartedAt: 0,
+      lastSegmentProcessAt: 0,
+      recordingTitle: `motion_${new Date().toISOString().replace(/[:.]/g, '-')}.mp4`,
+      flushRecordings: [],
+      nextFlushNumber: 1,
+      cleaningUp: false,
+      cancelFlush: false,
+      lowSpaceNotified: false,
+      lastNotifiedRestartCooldownAt: 0,
+      currentRecordingMotionTimestamps: [],
+      lastPlaylistUpdatedAt: 0,
+    }
+
+    // Publish once, after async persistence has completed, so every caller
+    // observes the same state object from this point onward.
+    streamStates[streamId] ??= state
+    return streamStates[streamId]!
+  })()
 
-  return streamStates[streamId]
+  streamStateInitializations.set(streamId, initialization)
+  try {
+    return await initialization
+  } finally {
+    streamStateInitializations.delete(streamId)
+  }
 }
 
 async function loadPersistedStreamState(

source/hardwareCheck.ts

@@ -0,0 +1,21 @@
+const { execSync } = require('child_process')
+
+let hasNvidiaHardware = false
+
+try {
+  // Execute a fast probe that exits immediately without printing outputs to the console
+  // Works on both Windows and Linux environments
+  execSync('nvidia-smi --help', { stdio: 'ignore' })
+  hasNvidiaHardware = true
+  console.log(
+    '[System Probe] Nvidia hardware capability detected successfully.',
+  )
+} catch (error) {
+  hasNvidiaHardware = false
+  console.log(
+    '[System Probe] Nvidia hardware not available. Falling back to CPU/Direct methods.',
+  )
+}
+
+// Export the live state variable
+export const isNvidiaAvailable = () => hasNvidiaHardware