Commit Graph

228 Commits (739f9d83b06fda33cbb04ab787a1f3eb376b710e)

Author SHA1 Message Date
Moe Alam 1a6fbee0ab event.js : finish moving out functions to events/utils.js 2021-01-02 10:49:05 -08:00
Moe Alam e5854f7528 events.js, monitor.js : more cleanup 2021-01-02 10:30:20 -08:00
Moe Alam d42da0e873 clean up ping method 2020-12-16 11:58:01 -08:00
Moe Alam ffbc25c62e Fixes for PTZ and ONVIF controls 2020-12-16 09:28:16 -08:00
Moe Alam 49b7a5cdca onMonitorStart event only occur if ffmpeg process remains alive 2020-12-10 15:21:20 -08:00
Moe Alam cde4a7dddb make probeMonitorOnStart configurable from conf.json
probeMonitorOnStart = true : do probe to check for and fix possible configuration abberations.
probeMonitorOnStart = false : no check. Just start with user configuration.
2020-12-01 11:59:42 -08:00
Moe eb0800c857 Merge branch 'dev' into 'dev'
Resolve issue with timeout killing snap process before it can produce a snapshot.

See merge request Shinobi-Systems/Shinobi!251
2020-11-03 05:54:24 +00:00
Moe Alam 27b0dc3cdc ffmpeg.js : rewrite traditional recording, cleanup execution
+ disable resetSnapCheck
2020-11-02 21:22:03 -08:00
Ian Rubado 7d94d0a854 Resolve issue with timeout killing snap process before it can produce a snapshot. 2020-11-02 19:38:15 -05:00
Moe Alam f7b91bb6fa ffmpeg.js : rewrite Stream output flags builder (Main-only) 2020-11-01 17:47:05 -08:00
Moe Alam 56905c04f7 make MJPEG Input Types Orphan Check when process closes 2020-11-01 09:10:35 -08:00
Moe Alam e3491fb8d8 remove await for snapshot on monitor start and lower timeout for snapshot 2020-11-01 09:06:57 -08:00
Moe Alam a2bc27335a ffmpeg.js : rewrite Continuous Recording output flags builder
+ add some Error checking and bypass for 453 occurence
2020-11-01 00:36:41 -07:00
Moe Alam 588b183dae framework for Monitor Configuration Warnings and Automatic Repair 2020-10-25 22:07:36 -07:00
Moe Alam ea9e97e437 remove coprocessor code 2020-10-17 18:39:54 -07:00
Moe b04749852b Merge branch 'dev' into 'p2p-framework'
# Conflicts:
#   libs/monitor.js
2020-09-22 15:45:34 +00:00
Moe Alam fe928efcab minor cleanup to usage 2020-09-21 23:49:18 -07:00
Moe Alam a2e8de4386 auto ptz : cleanup return home 2020-09-20 10:45:10 -07:00
Moe Alam ad007b6f8f Improve Automatic PTZ (Return Home when Object lost)
+ Add Inverting Y-Axis
+ Add ONVIF Scanning Port 8899
+ Cleanup some ptz.js function uses
2020-09-19 23:28:35 -07:00
Moe Alam 9a10777d3f make detector frame sender check connectivity on each frame
- this will avoid needing to start a monitor after a plugin is added
2020-09-16 21:04:30 -07:00
Moe cf6799eff2 add damaged audio warning 2020-08-27 21:58:42 -07:00
Moe 2886e58918 Child Node cameraDestroy fix 2020-08-27 15:39:39 -07:00
Moe 6398578897 Minor cleanup+ 2020-08-26 22:37:44 -07:00
Moe cc4adfa5bc Minor cleanup in libs/monitor.js+ 2020-08-26 22:30:18 -07:00
Moe 1bb95ef664 Minor cleanup 2020-08-26 22:18:42 -07:00
Moe a446c0aa59 Minor cleanup in libs/monitor.js 2020-08-26 21:36:36 -07:00
Moe 20633e2da4 cleaner snapshot creation 2020-08-16 15:41:05 -07:00
Moe c4a56f276c Update monitor.js 2020-08-15 22:08:12 -07:00
Moe b14ef3cda6 fix caching for snapshot icon 2020-08-15 22:06:22 -07:00
Moe 9b00ec8d93 Icon HTTP API Endpoint 2020-08-15 20:36:32 -07:00
Moe f2828dd0cc make s.getRawSnapshotFromMonitor a Promise function 2020-08-12 17:37:04 -07:00
Moe 650122c384 Prepare FileBin management : add proper FileBin database controller func + 2020-08-10 20:31:02 -07:00
Moe c95f34d7da Fix permissions to view monitors for sub accounts+ 2020-08-09 19:21:26 -07:00
Moe 7948ef9089 Fix permissions to view monitors for sub accounts 2020-08-09 19:18:32 -07:00
Moe e0c9d4c434 Merge branch 'dev' into 'rebuild-sql-queries'
# Conflicts:
#   libs/startup.js
#   libs/webServerPaths.js
2020-08-08 00:16:24 +00:00
Moe 52a84f4501 pass only groupKey when request Max Storage Amount check 2020-08-07 00:54:56 -07:00
Moe 811b6fc846 Modify Max Purge for Video, Timelapse Frames, FileBin, addStorage 2020-08-06 21:33:58 -07:00
Moe 7d07124ac5 force image format for image in Email Notifcation (Discord as well)
- This should hopefully fix users with broken images in their email notifications.
-- Audio was not being stripped and was being encoded with the frame (JPEG cannot hold audio, duh)
-- image2 format specified
2020-07-25 22:40:35 -07:00
Moe cf91cf85ea Update Dashcam (Shinobi Streamer) data Input 2020-07-22 21:19:16 -07:00
Moe c2cab29515 knexQuery logic fixes 2020-07-12 14:34:04 -07:00
Moe f1fc729435 sqlQuery Conversion : minor cleanup 2020-07-11 13:16:01 -07:00
Moe 7f42e3efd0 sqlQuery Conversion : timelapse.js (also refactored backend slightly) 2020-07-10 17:30:08 -07:00
Moe 477d756bef sqlQuery Conversion : make asCallback inside knexQuery 2020-07-09 07:57:54 -07:00
Moe b99e258f8f sqlQuery Conversion : monitor.js 2020-07-08 22:52:49 -07:00
Moe f07fe1968f JPEG Input Type capture from Camera Thread (Fix JPEG Input Stream) 2020-06-18 00:51:06 -07:00
Moe ab8971ad28 Refactor PTZ Control code+ 2020-06-13 11:04:38 -07:00
Moe bbc1dc533f Refactor PTZ Control code, move ptz and onvif code to separate libs 2020-06-13 00:28:50 -07:00
Moe b93abc1589 Basic PTZ Follow : detecting position on X axis works, y axis does not 😭 2020-06-07 11:48:39 -07:00
Moe 2c7fd09c94 Basic PTZ Follow now only follows largest "person" object found
- will think of better name later
2020-06-07 10:32:44 -07:00
Moe df1cf56d62 Basic PTZ Follow upon Object Detection 2020-06-06 23:50:43 -07:00
Moe 615f66bb1b better port validation on monitor start 2020-06-05 15:25:02 -07:00
Moe c8e054ce25 validate port chosen on monitor start 2020-06-04 12:59:46 -07:00
Moe 479efbf228 adjust counting methodology for tracking plugins
- tracking plugins are currently not available to public but you may still use the counting feature on a per-frame basis instead of tracked object
2020-05-24 22:10:31 -07:00
Moe 48e6483550 fix line 405 bug 2020-05-24 21:00:19 -07:00
Moe 664a30ee32 add Event Counting engine 0.1 2020-05-23 22:12:42 -07:00
Moe 447cce9b6f Adjustment to Snapshot command 2020-05-13 17:39:00 -07:00
Moe b0c3f38049 fix large image object detection 2020-05-13 15:10:08 -07:00
Moe a993130f4b Fix "Send Frames" for Object Detector 2020-05-13 14:30:50 -07:00
Moe 0fc140d3be fix monitor process hang if ordered to do obj detection with no plugin 2020-05-11 15:57:40 -07:00
Moe d72b61f592 Add Basic Object Counting mechanism 2020-05-05 08:02:23 -07:00
Moe 39b8337b1c fix concatted detector event response 2020-04-10 08:59:48 -07:00
Moe 9cd9446800 move segment file creation to separate pipe 2020-04-05 16:00:32 -07:00
Moe 21b2de65fd fix missing detector_motion_count array 2020-03-29 10:47:21 -07:00
Moe ec1041c389 Add tree-kill fix for snap zombies
- fix found by dieseldude in the community chat
2020-03-28 16:26:01 -07:00
Moe 443b5565fe add "events" to Traditional Recording insertCompletedVideo request
- this will allow these kinds of recordings to provide a notification to the Mobile App upon completion
2020-03-05 11:12:54 -08:00
Moe 6bd18faf1d replace motion counter with holding list of events in memory
+ allow adding "events" to s.insertCompletedVideo
2020-03-03 07:14:32 -08:00
Moe 6282860b64 add windows taskkill in snapshot.js 2020-02-24 20:34:09 -08:00
Moe ed4eab625a add some windows specific kill and delete commands
+ add Shinobi Mobile mention
2020-02-23 10:09:54 -08:00
Moe b281a34476 fix lingering "singleCamera.js" bug 2020-02-13 12:29:45 -08:00
Moe b7f234a086 snapCmd path fix 2020-01-20 12:38:44 -08:00
Moe 2bb2f83af5 add force kill on pid for zombie cameraThread processes 2020-01-03 23:27:16 -08:00
Moe 81fe768e0c remove old executor for icon grabber 2019-12-23 12:33:04 -08:00
Moe ebf3189c31 snapshot run from camera thread instead of main daemon 2019-12-22 08:19:09 +06:00
Moe ae24fc5651 Retry Connection counter resets after 1 minute of success
+ light cleanup
+ Retry Connection now default is 10
2019-12-12 18:07:01 +06:00
Moe fe67fbbc37 Merge branch 'multi-thread-alpha' into 'dev'
Multi Threading

See merge request Shinobi-Systems/Shinobi!135
2019-12-12 05:42:08 +00:00
Moe 3320f7b958 comment out logger used for debug 2019-12-11 15:39:40 +06:00
Moe 26df5e3470 Fix monitor black on Save 2019-12-11 15:37:53 +06:00
Moe 712c2a0419 light cleanup, still broken
still blacks on monitor restart with pipe 3 enabeld
2019-12-11 13:23:01 +06:00
Moe 0637e32d38 add more logging to thread handling
+minor cleanup
2019-12-08 21:49:27 +06:00
Moe 891294281d Monitor black on start fix 2019-12-08 14:00:56 +06:00
Moe 332f6185ff show threaded process logs in UI log stream 2019-12-08 11:53:17 +06:00
Moe 59d0635680 no reference on launchMonitorProcess
+deglobalize cameraDestroy
2019-12-07 10:24:10 +06:00
Moe 5c5fbcaf4a fix broken stream on restart 2019-12-07 10:20:05 +06:00
Moe 2e03111043 Fix Steam Handler Memory Leak
+ minor function name cleanup, remove some globals
2019-12-07 10:09:09 +06:00
Moe 577190c657 disable loggers in added threads, need better solution 2019-12-05 18:38:52 +06:00
Moe f18a4ed4fc put snapshot/icon creation in separate thread 2019-12-05 18:23:46 +06:00
Moe da53108ba9 Multi Threaded Camera Spawn (Alpha) 2019-12-05 13:25:13 +06:00
Moe 19ca1d00b9 update monitor queue action to allow 3 at a time 2019-11-14 12:46:49 -08:00
Moe ed76347b25 Add Webhook and Command to No Motion Detector 2019-10-31 22:02:14 -07:00
Moe 115752820d Update No Motion Detector; Add Discord Notification 2019-10-31 17:26:52 -07:00
Moe 38287ae784 add missing icon rules 2019-10-03 08:15:07 -07:00
Moe cf1fd47745 reset activeMonitor object on failure
+ fix syntax error with monitor.details
2019-10-03 08:03:36 -07:00
Moe 3a81da567c cache side panel icon for faster loading and lower load on client open 2019-10-02 22:04:52 -07:00
Moe 2ad0dbcc4d silence log for fail snapshot 2019-10-02 20:17:29 -07:00
Moe 34e06c4bc6 lightly clean output flag option for snapshot 2019-10-02 19:36:21 -07:00
Moe e4ea376f48 fix snapshot : move rtsp_transport flag insertion 2019-10-02 14:45:11 -07:00
Moe 52aa04b2d7 fix snap time on detectorStream and HLS 2019-10-02 11:56:20 -07:00
Moe ccf90f67f8 add RTSP Transport to monitorSnapShot command 2019-10-01 13:53:20 -07:00
Moe 7a1ff82b5b delete all instances of monitor from other childNode servers on start 2019-09-26 12:18:44 -07:00
Moe 0db090c093 clear stale cameras from childNode activeCamera list 2019-09-25 15:33:03 -07:00