Commit Graph

876 Commits (268ce83784f7ff7ff074ce5479fcf790107bcbc0)

Author SHA1 Message Date
Moe Alam dbc5526831 fix ReferenceError: streamFlags is not defined 2020-11-29 18:09:28 -08:00
Moe Alam 8bdf015ce8 onvifDeviceManager : add setVideoConfiguration 2020-11-29 18:08:27 -08:00
Moe Alam 3d8ff64bbc add setHostname 2020-11-28 19:12:31 -08:00
Moe Alam 74e75c3231 basic onvif device manager functions 2020-11-28 18:52:02 -08:00
Moe Alam e5a722d5bb Fix UnhandledPromiseRejectionWarning: TypeError: Cannot read property 'getSocket' of undefined 2020-11-25 09:19:21 -08:00
Moe Alam b7c507cb78 add missing fs to ffmpeg/builders.js 2020-11-24 09:10:56 -08:00
Moe Alam 44d4b56b04 fix stringToSqlTime declaration 2020-11-20 18:57:54 -08:00
Moe Alam f2a84dfede control/ptz.js : apply turn speed option to moveCameraPtzToMatrix 2020-11-18 14:16:29 -08:00
Moe Alam 9f3d74bbfa cleanup sql.js 2020-11-18 11:26:38 -08:00
Moe Alam f86515c530 cleanup scanners.js and notification.js 2020-11-17 14:21:52 -08:00
Moe Alam f6bb25d091 clean up ffmpeg.js and use of ffprobe 2020-11-16 18:08:24 -08:00
Moe Alam a03fa3ff7a add Cloud Videos toggle to Power Viewer 2020-11-12 16:32:28 -08:00
Moe Alam 9b0362da17 fix video filters for encoded detectorStream 2020-11-12 15:49:35 -08:00
Moe Alam ccd2261b18 cleanup Google Drive Upload code 2020-11-08 21:20:39 -08:00
Moe Alam 050b70f8d7 fix cloudDisk manager, fix probe 2020-11-07 20:31:07 -08:00
Moe Alam e7ad11e5f9 fix timelapse frame purging 2020-11-07 16:49:43 -08:00
Moe Alam 6436ee7f34 fix orphan check 2020-11-07 08:17:36 -08:00
Moe Alam 555ef51442 ONVIF Scanner single selection enable ONVIF connection on save by default
+ Enable PTZ on cameras that report PanTilt and Zoom Configurations
2020-11-05 21:34:49 -08:00
Moe Alam b25004921d Update ffmpeg.js 2020-11-03 18:08:31 -08:00
Moe Alam 04c46c9a48 set primary map to 0 instead of 0:0 2020-11-03 14:28:31 -08:00
Moe Alam 15e0319db8 fix fps for timelapse 2020-11-03 13:24:56 -08:00
Moe Alam 75257c01ea Update ffmpeg.js 2020-11-03 11:26:56 -08:00
Moe Alam 60e8ac3e1a Update ffmpeg.js 2020-11-03 11:18:33 -08:00
Moe Alam 26b19223e7 Update ffmpeg.js 2020-11-03 08:12:26 -08:00
Moe Alam 2cac696300 Update ffmpeg.js 2020-11-03 08:10:38 -08:00
Moe Alam aae94fc5fe Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2020-11-02 21:55:00 -08:00
Moe Alam 12a9c1c7fa remove dev logging 2020-11-02 21:54:57 -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
Moe Alam a577abc4b6 ffmpeg.js : rewrite Input Flag builder 2020-11-02 16:52:53 -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 b182cb9002 ffmpeg.js : rewrite remaining outputs 2020-11-02 00:09:31 -08:00
Moe Alam 91008425ee ffmpeg.js : rewrite jpeg api output and clean up stream output 2020-11-01 21:27:23 -08:00
Moe Alam f7b91bb6fa ffmpeg.js : rewrite Stream output flags builder (Main-only) 2020-11-01 17:47:05 -08:00
Moe Alam fb841001af add function to check string existance in array elements 2020-11-01 17:45:25 -08:00
Moe Alam 80b364ddec Create updatedFields.js 2020-11-01 17:44:28 -08:00
Moe Alam f0f43c852a Add Monitor Configuration Migrator Tool 2020-11-01 17:44:21 -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 93fd9ed96b fix hanging ffmpeg process when encoding recorded videos 2020-11-01 08:49:52 -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 d78b17169f clean up ONVIF Scanner Snapshot error handling 2020-10-29 22:26:47 -07:00
Moe Alam fd4d228046 re-add Update button to Superuser panel (dedicated and git-only) 2020-10-29 20:56:57 -07:00
Moe Alam c21ec0d1b9 ONVIF Scanner show Snapshot 2020-10-29 16:14:52 -07:00
Moe Alam d1e17479bb Update "Non-Standard ONVIF" to work with Amcrest, add Turn Speed field 2020-10-29 01:19:37 -07:00
Moe Alam c65175a8b2 fix syntax for codec check in initial probe on start 2020-10-27 20:56:55 -07:00
Moe Alam 12f070d237 blackhole failed ffprobe parsing 2020-10-26 10:00:32 -07:00
Moe Alam 588b183dae framework for Monitor Configuration Warnings and Automatic Repair 2020-10-25 22:07:36 -07:00
Moe Alam c009fbc1a2 Simplify map (Additional Input) checking 2020-10-25 11:44:07 -07:00
Moe Alam 9d2629825b make cron delete fileBin files and adjust live counter accordingly 2020-10-18 22:15:06 -07:00
Moe Alam 4465649c4c cleanup cron.js and fix broken knexQuery 2020-10-18 21:41:27 -07:00
Moe Alam 702be4c927 fix hanging process with motion enabled (coProcessor junk removed) 2020-10-18 18:53:20 -07:00
Moe Alam 20f963ef06 return ffmpeg string parse code to old method 2020-10-18 17:29:06 -07:00
Moe Alam 22c4867eea bug cleanup 2020-10-18 17:18:46 -07:00
Moe Alam 7eeeebec10 remove coSpawnClose 2020-10-18 14:13:57 -07:00
Moe Alam 6353c2c3bb Update ffmpeg.js 2020-10-18 10:28:36 -07:00
Moe Alam 1d3aba59d6 add separate mapping available to Object Detector, default is global's 2020-10-17 20:35:35 -07:00
Moe Alam cbe0af5273 make google drive "Get Code" button launch setup tutorial if minimum not set 2020-10-17 18:40:25 -07:00
Moe Alam ea9e97e437 remove coprocessor code 2020-10-17 18:39:54 -07:00
Moe Alam bab046a741 minor cleaning 2020-10-17 15:11:23 -07:00
Moe Alam 82c03feec4 ffmpeg.js : rewrite detector frame output 2020-10-17 14:34:10 -07:00
Moe Alam 75be669bc2 add pureStream for video file API method 2020-10-15 15:07:26 -07:00
Moe Alam ba40d5bdb1 fix fileBin purging function 2020-10-09 22:50:49 -07:00
Moe Alam 368c23af25 Allow P2P server to pass real IP of user connected to dashboard 2020-10-09 22:50:08 -07:00
Moe Alam 560cf2c7ec add row caching and add delete button for timelapse frames 2020-10-09 22:49:11 -07:00
Moe Alam 76b9d7f105 fix Tmelapse Frame purge 2020-10-09 17:11:54 -07:00
Moe Alam dea7738713 Fix backward timelapse video 2020-10-09 12:47:08 -07:00
Moe Alam aae352c998 humanize timelapse mp4 builder 2020-10-09 12:34:15 -07:00
Moe Alam 862bcb4d1d Show more live stats in P2P Server selection 2020-10-08 17:01:23 -07:00
Moe Alam d462978454 modify PTZ center button to move camera to Home position for ONVIF 2020-10-08 16:57:20 -07:00
Moe Alam a50d7041dc http icon flag handler from query string 2020-10-07 14:26:30 -07:00
Moe Alam c43377d196 humanize Easy Remote Access tab more 2020-10-07 14:25:28 -07:00
Moe Alam ce5107550a p2p : kill client connections when server disconnects 2020-10-03 15:48:25 -07:00
Moe Alam 6dc438fdd7 humanize P2P UI more 2020-10-03 11:54:48 -07:00
Moe Alam e45c411490 Add Production P2P Servers to list in Super User Panel 2020-10-02 21:27:29 -07:00
Moe Alam 4e481b37b8 fix p2p memory leak with streaming http methods 2020-09-30 21:50:07 -07:00
Moe Alam 14b15be4c0 begin proper secton for Notification toggles
- Future versions may have breaking changes involving notifications. Currently each type of notification has a toggle for each method. It will be mad so that a Method is the toggle for all types of Notifications and each type of Notifications will have a single toggle. This will be to mitigate the speed of the ever-growing numer of options.
2020-09-30 19:39:14 -07:00
Moe Alam f8e5235b1f add email and discord notification for when monitor dies 2020-09-30 12:17:25 -07:00
Moe Alam 91c29ea531 Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2020-09-29 11:39:59 -07:00
Moe Alam b5d762c9b3 provide proper response data in 3rd argument of insertCompletedVideoExtensions 2020-09-29 11:39:56 -07:00
Reda B d355cd23b9 uploaders/s3based: GCP does not support multipart 2020-09-29 17:15:37 +00:00
Moe Alam 04671cdec0 Update worker.js 2020-09-28 15:07:14 -07:00
Moe Alam e2feb19b39 Update worker.js 2020-09-28 09:31:49 -07:00
Moe Alam c35f286fad cleaner connection to p2p 2020-09-27 22:14:36 -07:00
Moe Alam 6e2ab4d61f Add UI for Easy Remote Access (P2P) in Superuser panel 2020-09-26 22:52:52 -07:00
Moe Alam b1d8672566 put p2p functions in worker process 2020-09-23 21:21:03 -07:00
Moe bec8039b79 Merge branch 'p2p-framework' into 'dev'
P2P Service Connector (Optional)

See merge request Shinobi-Systems/Shinobi!239
2020-09-22 17:27:30 +00:00
Moe Alam 70d22322e1 P2P : Machine ID is now forced as P2P API Key and Group Key 2020-09-22 10:21:08 -07:00
Moe Alam 7ce737395c fix video limit+ 2020-09-22 08:58:58 -07:00
Moe Alam 830a2291f3 fix video limit 2020-09-22 08:54:57 -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 5dd153f288 clean p2p logging 2020-09-20 23:11:07 -07:00
Moe Alam edbcbcdd29 update PTZ button appearance 2020-09-20 21:26:01 -07:00
Moe Alam a2e8de4386 auto ptz : cleanup return home 2020-09-20 10:45:10 -07:00
Moe Alam e5646e5fb1 Update ptz.js 2020-09-19 23:31:55 -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 Alam 27fff92c7f fix schedules repeat 2020-09-16 13:04:56 -07:00
Moe Alam 55329bb4ae minor cleanup 2020-09-13 23:53:51 -07:00
Moe Alam 91fadc44df P2P : Can create connection based on config 2020-09-13 23:49:52 -07:00
Moe Alam 9f157abe8c minor cleanup 2020-09-06 12:16:25 -07:00
Moe Alam 22c9b334b6 Cache video row when viewing to prevent database hammer on chunking 2020-09-06 12:11:36 -07:00
Moe Alam d1e68ffe37 Revert ftp daemon back to ftp-srv
- The telnet vulnerability was fixed, no longer any need to attempt migration
2020-09-06 11:55:42 -07:00
Moe Alam e791a9895e fix deleting monitorStates 2020-09-06 09:41:51 -07:00
Moe Alam 49be90333f Disallow email spamming from improper account creations 2020-09-05 09:46:31 -07:00
Moe Alam 7c1a1a0c08 re-engage previous mp4 file serving 2020-09-02 14:38:13 -07:00
Moe 2acec03cc7 Merge branch 'minor-bugs' into 'dev'
Minor Bug: Entering to an undefined variable on libs/webServerPaths.js

See merge request Shinobi-Systems/Shinobi!230
2020-08-28 20:02:56 +00:00
Sebastián Felipe 4e9c6b9dd3 minor bug solved 2020-08-28 15:35:45 -04:00
Moe 41cd51ccd6 update ram collection 2020-08-28 09:30:25 -07:00
Moe cf6799eff2 add damaged audio warning 2020-08-27 21:58:42 -07:00
Moe 3cfa84e317 update ram collection 2020-08-27 19:45:49 -07:00
Moe 815fbb0cae remove extraneous option 2020-08-27 16:20:33 -07:00
Moe 4af8b7ff8c update CPU use collection for Child Nodes 2020-08-27 15:49:16 -07:00
Moe a3df638988 Update CPU and RAM collection and display methods 2020-08-27 15:40:30 -07:00
Moe 2886e58918 Child Node cameraDestroy fix 2020-08-27 15:39:39 -07:00
Moe d916b8d5cd Minor cleanup++ 2020-08-26 22:40:57 -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 3e8d605de8 Merge branch 'poseidon-mp4-command-issue' into 'dev'
Poseidon Socket-IO "Race Condition" Issue

See merge request Shinobi-Systems/Shinobi!229
2020-08-27 00:46:10 +00:00
Moe f0321004ac Update Docker image to use Ubuntu 20.04 2020-08-26 15:30:34 -07:00
Sebastián Felipe 7e44316c39 issue solved 2020-08-26 14:41:20 -04:00
Moe 37ad70ba6c update /config/conf.json when conf.json saved from Superuser panel 2020-08-26 10:34:10 -07:00
Moe 21eee0f477 save super.json in /config on update - Docker only 2020-08-26 10:26:58 -07:00
Austin Lakeman 31eaa2efbc timelapse and minor error fixes 2020-08-25 21:55:01 +00:00
Moe 7387866aee Merge branch 'dev' into 'dev'
Remote ONVIF Control

See merge request Shinobi-Systems/Shinobi!226
2020-08-19 18:47:05 +00:00
Moe 8a6bfecf05 add cuda and opencl hwaccel options 2020-08-19 11:46:29 -07:00
Sebastián Felipe dedaa79a68 Remote ONVIF Control 2020-08-19 01:11:11 -04:00
Moe b193827192 fix row deletion 2020-08-18 08:42:43 -07:00
Moe b06a3ee1a9 speed up monitor snapshot retrieval on login 2020-08-17 11:26:05 -07:00
Moe 3f13478d60 temporary fix for 2 factor auth login 2020-08-17 11:25:42 -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 0462aae539 lightly update FileBin methods, prepare for shinobi-video-synopsis 2020-08-14 23:05:01 -07:00
Moe b7cd712ba7 update debugLog 2020-08-14 19:22:33 -07:00
Moe 0d92d354c7 keep primary Temp directory path in memory 2020-08-14 19:21:55 -07:00
Moe b71dc60f20 validation for failed FTP login attempt 2020-08-14 12:30:17 -07:00
Moe cb279ef400 By default enable Use Camera Timestamps 2020-08-14 10:28:40 -07:00
Moe cb5a170aa2 fix Child Node video push 2020-08-12 20:04:08 -07:00
Moe 0ea7857e45 Update notification.js 2020-08-12 18:21:38 -07:00
Moe aa1e552325 Update notification.js 2020-08-12 17:49:19 -07:00
Moe 09a92e7d17 make custom events run syncronously inside async function 2020-08-12 17:37:24 -07:00
Moe f2828dd0cc make s.getRawSnapshotFromMonitor a Promise function 2020-08-12 17:37:04 -07:00
Moe a6fdc9cf51 Replace FTP Server (ftp-srv) with ftpd (shinobi-ftpd) 2020-08-12 16:35:30 -07:00
Moe 495b5cf0b8 disable ranges in mp4 file streamed over http 2020-08-12 10:37:59 -07:00
Moe 7e18b8e1f3 minor update on ptz logging 2020-08-11 13:29:15 -07:00