Skip to content

Commit 55b9049

Browse files
kpres12kpres12
committed
Fixing bugs
1 parent 3352fc7 commit 55b9049

File tree

11 files changed

+965
-73
lines changed

11 files changed

+965
-73
lines changed

‎.turbo/cookies/2.cookie‎

Whitespace-only changes.

‎.turbo/cookies/3.cookie‎

Whitespace-only changes.

‎.turbo/cookies/4.cookie‎

Whitespace-only changes.

‎.turbo/daemon/3aff60b3317b5818-turbo.log.2025-10-16‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
2025-10-16T23:22:06.725497Z WARN turborepo_lib::package_changes_watcher: changed_files: {AnchoredSystemPathBuf(".turbo/cookies/1.cookie")}
2+
2025-10-16T23:22:06.725518Z WARN turborepo_lib::package_changes_watcher: changed_packages: Ok(Some({WorkspacePackage { name: Root, path: AnchoredSystemPathBuf("") }}))
3+
2025-10-16T23:22:18.226025Z WARN turborepo_lib::package_changes_watcher: changed_files: {AnchoredSystemPathBuf("apps/edge-agent/src/MQTTClient.ts")}
4+
2025-10-16T23:22:18.226037Z WARN turborepo_lib::package_changes_watcher: changed_packages: Ok(Some({WorkspacePackage { name: Other("@bigmt/edge-agent"), path: AnchoredSystemPathBuf("apps/edge-agent") }}))
5+
2025-10-16T23:22:18.326712Z WARN turborepo_lib::package_changes_watcher: changed_files: {AnchoredSystemPathBuf("apps/edge-agent/src/MQTTClient.ts")}
6+
2025-10-16T23:22:18.326723Z WARN turborepo_lib::package_changes_watcher: changed_packages: Ok(Some({WorkspacePackage { name: Other("@bigmt/edge-agent"), path: AnchoredSystemPathBuf("apps/edge-agent") }}))
7+
2025-10-16T23:22:18.326738Z WARN turborepo_lib::package_changes_watcher: hashes are the same, no need to rerun
8+
2025-10-16T23:22:21.426969Z WARN turborepo_lib::package_changes_watcher: changed_files: {AnchoredSystemPathBuf("apps/edge-agent/src/MQTTClient.ts")}
9+
2025-10-16T23:22:21.426980Z WARN turborepo_lib::package_changes_watcher: changed_packages: Ok(Some({WorkspacePackage { name: Other("@bigmt/edge-agent"), path: AnchoredSystemPathBuf("apps/edge-agent") }}))
10+
2025-10-16T23:22:37.526089Z WARN turborepo_lib::package_changes_watcher: changed_files: {AnchoredSystemPathBuf(".turbo/cookies/2.cookie")}
11+
2025-10-16T23:22:37.526100Z WARN turborepo_lib::package_changes_watcher: changed_packages: Ok(Some({WorkspacePackage { name: Root, path: AnchoredSystemPathBuf("") }}))
12+
2025-10-16T23:23:22.027528Z WARN turborepo_lib::package_changes_watcher: changed_files: {AnchoredSystemPathBuf(".turbo/cookies/3.cookie")}
13+
2025-10-16T23:23:22.027545Z WARN turborepo_lib::package_changes_watcher: changed_packages: Ok(Some({WorkspacePackage { name: Root, path: AnchoredSystemPathBuf("") }}))
14+
2025-10-16T23:23:33.125921Z WARN turborepo_lib::package_changes_watcher: changed_files: {AnchoredSystemPathBuf("apps/summit-integration/src/VideoStreamManager.ts")}
15+
2025-10-16T23:23:33.125939Z WARN turborepo_lib::package_changes_watcher: changed_packages: Ok(Some({WorkspacePackage { name: Other("@bigmt/summit-integration"), path: AnchoredSystemPathBuf("apps/summit-integration") }}))
16+
2025-10-16T23:23:36.826831Z WARN turborepo_lib::package_changes_watcher: changed_files: {AnchoredSystemPathBuf("apps/summit-integration/src/VideoStreamManager.ts")}
17+
2025-10-16T23:23:36.826843Z WARN turborepo_lib::package_changes_watcher: changed_packages: Ok(Some({WorkspacePackage { name: Other("@bigmt/summit-integration"), path: AnchoredSystemPathBuf("apps/summit-integration") }}))
18+
2025-10-16T23:23:41.027445Z WARN turborepo_lib::package_changes_watcher: changed_files: {AnchoredSystemPathBuf("apps/summit-integration/src/VideoStreamManager.ts")}
19+
2025-10-16T23:23:41.027456Z WARN turborepo_lib::package_changes_watcher: changed_packages: Ok(Some({WorkspacePackage { name: Other("@bigmt/summit-integration"), path: AnchoredSystemPathBuf("apps/summit-integration") }}))
20+
2025-10-16T23:23:46.026686Z WARN turborepo_lib::package_changes_watcher: changed_files: {AnchoredSystemPathBuf("apps/summit-integration/src/VideoStreamManager.ts")}
21+
2025-10-16T23:23:46.026696Z WARN turborepo_lib::package_changes_watcher: changed_packages: Ok(Some({WorkspacePackage { name: Other("@bigmt/summit-integration"), path: AnchoredSystemPathBuf("apps/summit-integration") }}))
22+
2025-10-16T23:23:56.226063Z WARN turborepo_lib::package_changes_watcher: changed_files: {AnchoredSystemPathBuf("apps/edge-agent/src/MQTTClient.ts")}
23+
2025-10-16T23:23:56.226089Z WARN turborepo_lib::package_changes_watcher: changed_packages: Ok(Some({WorkspacePackage { name: Other("@bigmt/edge-agent"), path: AnchoredSystemPathBuf("apps/edge-agent") }}))
24+
2025-10-16T23:24:59.327389Z WARN turborepo_lib::package_changes_watcher: changed_files: {AnchoredSystemPathBuf(".turbo/cookies/4.cookie")}
25+
2025-10-16T23:24:59.327414Z WARN turborepo_lib::package_changes_watcher: changed_packages: Ok(Some({WorkspacePackage { name: Root, path: AnchoredSystemPathBuf("") }}))
26+
2025-10-16T23:25:14.127447Z WARN turborepo_lib::package_changes_watcher: changed_files: {AnchoredSystemPathBuf("apps/sentry-tower/src/index.ts")}
27+
2025-10-16T23:25:14.127495Z WARN turborepo_lib::package_changes_watcher: changed_packages: Ok(Some({WorkspacePackage { name: Other("@bigmt/sentry-tower"), path: AnchoredSystemPathBuf("apps/sentry-tower") }}))

‎apps/edge-agent/src/MQTTClient.ts‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,18 @@ export class MQTTClient {
4444
reject(error)
4545
},
4646
useSSL: this.config.mqttUseSSL,
47-
userName: this.config.mqttUsername || undefined,
48-
password: this.config.mqttPassword || undefined,
4947
keepAliveInterval: 60,
5048
cleanSession: true
5149
}
5250

51+
// Add authentication only if credentials are provided
52+
if (this.config.mqttUsername) {
53+
options.userName = this.config.mqttUsername
54+
}
55+
if (this.config.mqttPassword) {
56+
options.password = this.config.mqttPassword
57+
}
58+
5359
// Set up message handlers
5460
this.client.onConnectionLost = (error) => {
5561
this.logger.warn('MQTT connection lost:', error)
@@ -90,7 +96,7 @@ export class MQTTClient {
9096
try {
9197
const mqttMessage = new mqtt.Message(message)
9298
mqttMessage.destinationName = topic
93-
mqttMessage.qos = qos
99+
mqttMessage.qos = qos as mqtt.Qos
94100
mqttMessage.retained = false
95101

96102
this.client.send(mqttMessage)
@@ -108,7 +114,7 @@ export class MQTTClient {
108114
}
109115

110116
try {
111-
this.client.subscribe(topic, { qos })
117+
this.client.subscribe(topic, { qos: qos as mqtt.Qos })
112118
this.logger.info(`Subscribed to topic ${topic}`)
113119

114120
} catch (error) {

‎apps/fireline-bot/package.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@
1717
"ws": "^8.14.0",
1818
"mqtt": "^5.3.0",
1919
"node-cron": "^3.0.0",
20-
"winston": "^3.10.0",
21-
"ros2": "^0.0.1"
20+
"winston": "^3.10.0"
2221
},
2322
"devDependencies": {
2423
"@types/node": "^20.10.0",

‎apps/sentry-tower/src/index.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ async function main() {
131131
});
132132

133133
process.on('unhandledRejection', (reason, promise) => {
134-
logger.error('Unhandled rejection at:', promise, 'reason:', reason);
134+
logger.error(`Unhandled rejection at: ${promise}, reason: ${reason}`);
135135
process.exit(1);
136136
});
137137

‎apps/summit-integration/src/VideoStreamManager.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
*/
55

66
import { EventEmitter } from 'events';
7-
import * as ffmpeg from 'fluent-ffmpeg';
8-
import * as sharp from 'sharp';
7+
import ffmpeg from 'fluent-ffmpeg';
8+
import sharp from 'sharp';
99
import { SummitClient, VideoStream } from './SummitClient';
1010

1111
export interface StreamConfig {
@@ -239,13 +239,13 @@ export class VideoStreamManager extends EventEmitter {
239239
'-f', 'rtsp'
240240
])
241241
.output(`rtsp://localhost:8554/${config.deviceId}`)
242-
.on('start', (commandLine) => {
242+
.on('start', (commandLine: string) => {
243243
console.log(`FFmpeg started for device ${config.deviceId}: ${commandLine}`);
244244
})
245-
.on('progress', (progress) => {
245+
.on('progress', (progress: any) => {
246246
this.updateStreamStats(config.deviceId, progress);
247247
})
248-
.on('error', (error) => {
248+
.on('error', (error: Error) => {
249249
console.error(`FFmpeg error for device ${config.deviceId}:`, error);
250250
this.emit('streamError', { deviceId: config.deviceId, error });
251251
})

‎infra/docker/docker-compose.dev.yml‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -156,58 +156,58 @@ console:
156156
- ../../apps/edge-agent:/app
157157

158158
# Fusion Service
159-
fusion:
160-
build:
161-
context: ../../apps/fusion
162-
dockerfile: Dockerfile
163-
container_name: wildfire-fusion
164-
environment:
165-
DATABASE_URL: postgresql://wildfire:wildfire123@postgres:5432/wildfire_ops
166-
REDIS_HOST: redis
167-
REDIS_PORT: 6379
168-
depends_on:
169-
postgres:
170-
condition: service_healthy
171-
redis:
172-
condition: service_healthy
173-
volumes:
174-
- ../../apps/fusion:/app
159+
# fusion:
160+
# build:
161+
# context: ../../apps/fusion
162+
# dockerfile: Dockerfile
163+
# container_name: wildfire-fusion
164+
# environment:
165+
# DATABASE_URL: postgresql://wildfire:wildfire123@postgres:5432/wildfire_ops
166+
# REDIS_HOST: redis
167+
# REDIS_PORT: 6379
168+
# depends_on:
169+
# postgres:
170+
# condition: service_healthy
171+
# redis:
172+
# condition: service_healthy
173+
# volumes:
174+
# - ../../apps/fusion:/app
175175

176176
# Triangulation Service
177-
triangulate:
178-
build:
179-
context: ../../apps/triangulate
180-
dockerfile: Dockerfile
181-
container_name: wildfire-triangulate
182-
environment:
183-
DATABASE_URL: postgresql://wildfire:wildfire123@postgres:5432/wildfire_ops
184-
REDIS_HOST: redis
185-
REDIS_PORT: 6379
186-
depends_on:
187-
postgres:
188-
condition: service_healthy
189-
redis:
190-
condition: service_healthy
191-
volumes:
192-
- ../../apps/triangulate:/app
177+
# triangulate:
178+
# build:
179+
# context: ../../apps/triangulate
180+
# dockerfile: Dockerfile
181+
# container_name: wildfire-triangulate
182+
# environment:
183+
# DATABASE_URL: postgresql://wildfire:wildfire123@postgres:5432/wildfire_ops
184+
# REDIS_HOST: redis
185+
# REDIS_PORT: 6379
186+
# depends_on:
187+
# postgres:
188+
# condition: service_healthy
189+
# redis:
190+
# condition: service_healthy
191+
# volumes:
192+
# - ../../apps/triangulate:/app
193193

194194
# Prediction Service
195-
predict:
196-
build:
197-
context: ../../apps/predict
198-
dockerfile: Dockerfile
199-
container_name: wildfire-predict
200-
environment:
201-
DATABASE_URL: postgresql://wildfire:wildfire123@postgres:5432/wildfire_ops
202-
REDIS_HOST: redis
203-
REDIS_PORT: 6379
204-
depends_on:
205-
postgres:
206-
condition: service_healthy
207-
redis:
208-
condition: service_healthy
209-
volumes:
210-
- ../../apps/predict:/app
195+
# predict:
196+
# build:
197+
# context: ../../apps/predict
198+
# dockerfile: Dockerfile
199+
# container_name: wildfire-predict
200+
# environment:
201+
# DATABASE_URL: postgresql://wildfire:wildfire123@postgres:5432/wildfire_ops
202+
# REDIS_HOST: redis
203+
# REDIS_PORT: 6379
204+
# depends_on:
205+
# postgres:
206+
# condition: service_healthy
207+
# redis:
208+
# condition: service_healthy
209+
# volumes:
210+
# - ../../apps/predict:/app
211211

212212
# Summit Integration Service
213213
summit-integration:

‎package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
"db:migrate": "cd apps/apigw && alembic upgrade head",
1919
"db:seed": "cd apps/apigw && python scripts/seed_data.py",
2020
"docker:dev": "docker-compose -f infra/docker/docker-compose.dev.yml up",
21-
"docker:down": "docker-compose -f infra/docker/docker-compose.dev.yml down"
21+
"docker:down": "docker-compose -f infra/docker/docker-compose.dev.yml down",
22+
"start": "docker-compose -f infra/docker/docker-compose.dev.yml up"
2223
},
2324
"devDependencies": {
2425
"@types/node": "^20.10.0",

0 commit comments

Comments
 (0)