19a24f5f38
cleanup ffmpeg check and add ffbinary usability
...
- run npm install ffbinaries to use that downloader instead.
- ffmpeg-static and ffbinaries should get the same version just get them in a different way.
2018-09-29 13:09:24 -07:00
9393c8caf7
Modularize camera.js+++++++
...
- clean up some more functions names to be more human readable.
2018-09-29 08:00:51 -07:00
7431aee9fc
Modularize camera.js+++++
2018-09-28 21:04:50 -07:00
3efbfae9bb
move ffmpeg functions
2018-09-28 19:09:14 -07:00
f4b544c52c
change var name from currentDirectory to mainDirectory
...
- "mainDirectory" better reflects the value of the variable
2018-09-28 19:02:53 -07:00
d834698b27
default custom JSON stringify function to pretty print, 3 spaces
2018-09-28 18:57:26 -07:00
1740e3461d
break s.init into individual functions
2018-09-28 18:38:14 -07:00
dd3858e94e
Modularize camera.js+++
2018-09-28 13:26:24 -07:00
2b4dcd8694
silence query logs for `Files` table fix+
2018-09-28 09:18:49 -07:00
dc554481d4
silence query logs for `Files` table fix
2018-09-28 09:16:06 -07:00
040b9368eb
Fix cron `Files` table bug
2018-09-28 09:13:03 -07:00
af8fc608e7
Modularize camera.js
2018-09-27 22:37:08 -07:00
c713e61341
Merge branch 'dev' into 'dev'
...
Fixed confidence value not being propagated in Web hooks URL
See merge request Shinobi-Systems/Shinobi!22
2018-09-25 23:03:29 +00:00
8ab159e94a
Merge branch 'freebsd-cpu-ram-stats' into 'dev'
...
Adding ram and cpu stats commands for freebsd
See merge request Shinobi-Systems/Shinobi!24
2018-09-25 23:01:56 +00:00
b7a3317aac
Password Hashing with SHA256 and SHA512
...
- "passwordType" can be added to conf.json to use a hash other than md5.
- Options for passwordType : md5, sha256, sha512. md5 is default.
- Superuser will still be allowed to use MD5 passwords regardless of the "passwordType" selected in conf.json.
- To add salt to your SHA512 accompany the "passwordType":"sha512" with "passwordSalt":"". Fill it with your favorite salty secret.
2018-09-24 17:12:19 -07:00
1c56eb313a
Send Screenshot on Event to Discord and Email without JPEG API enabled
2018-09-23 22:37:24 -07:00
8c1ee0a9c6
Brute Force Protection for Login
2018-09-23 21:10:20 -07:00
e3890391bd
Provide .mp4 on Event for Discord and Email Alerts instead of .ts+
...
- cleanup functions and fix pathing
2018-09-22 20:53:48 -07:00
b75258bfc2
Provide .mp4 on Event for Discord and Email Alerts instead of .ts
2018-09-22 20:12:46 -07:00
2c5b5b8c80
Remove coProcessor
...
- CPU encoded data can now be created from CUDA decoded stream. Thanks Bogey!
+ prepare webpage streaming
2018-09-22 11:31:54 -07:00
95790d479b
Update WebDAV Autosave for "Cloud Videos"
...
- WebDAV saving has been updated to work with the new "Cloud Videos" listing method.
- WebDAV folder structure will now be created automatically
+ remove some whtie spaces from settings.ejs
2018-09-16 00:51:20 -07:00
9bde8ba386
fix Skip Ping condition+
2018-09-12 16:15:48 -07:00
4c081e2755
fix Skip Ping condition
2018-09-12 16:01:42 -07:00
373752c914
Allow retrieving Cloud saved links from API and dashboard
2018-09-11 21:38:26 -07:00
185173e40e
add filtering events by time and action to modify indifference on filter event
...
- you can now set indifference based on time with the filter engine.
+ comment out onvif-nvt for now
2018-09-10 21:58:21 -07:00
33a9152b17
Adding ram and cpu stats commands for freebsd
2018-09-09 20:49:10 +00:00
fac6956f75
fix jpeg capture rate
...
+ make diskPurgedEmitter and diskUsedEmitter in one emitter with separate emit keys.
2018-09-02 10:00:18 -07:00
5f431dfa66
Fixed confidence value not being propagated in Web hooks URL
2018-08-31 17:15:16 +02:00
384a89eb6a
Replace Queue System for Disk Purge to Emitter System
...
- This should fix any lockups of the purging function as the queue is now handled by the emitter.
2018-08-29 10:29:51 -07:00
0eaa16b19b
Default Audio Codec = No for Traditional Recording with JPEG based inputs
...
+ minor comment and whitespace fixes/changes
2018-08-27 10:12:35 -07:00
262207d12a
remove 10 second checker and use -progress
...
+ method found in kevin's ffmpeg-streamer demonstration application.
2018-08-23 14:04:39 -07:00
514413975c
check monitor process life status every 10 seconds
2018-08-23 13:10:28 -07:00
653ac052af
H.265 Stream Type over HTTP
...
+ many bug fixes and tweaks for client side stream creator function
+ allow coProcessor only in specific situations
2018-08-21 23:33:26 -07:00
9166d7e8a9
H.265 Stream Type Added
...
- Now play H.265 video in almost any browser with the help of libde265.js!
+ minor bug fixes
+ preparation for slickslider page (timed switcher)
2018-08-20 23:07:08 -07:00
7f05c62c08
fix stream_fps condition+
2018-08-20 15:08:34 -07:00
e8fa79239c
fix stream_fps condition
2018-08-20 15:00:18 -07:00
ace8c7e916
fix condition for detector output
...
+ automated whitespace removal with atom
2018-08-20 14:52:17 -07:00
eb0796ca1a
use request() for webhook on event
2018-08-12 17:44:12 -07:00
b7c628fe2d
fix factorAuth screen selection
...
- bug would cause factorAuth login to always login to dashboard
2018-08-12 14:22:26 -07:00
19a14c237c
check for available group
2018-08-12 11:07:29 -07:00
adb07b403b
2-Factor Authentication can use Discord
2018-08-12 11:06:56 -07:00
6c198b07e0
no stream_loop flag for anything other than mp4 and local inputs
2018-08-09 13:17:30 -07:00
429c2fe64b
allow motion events to skip the filter
2018-08-08 21:52:10 -07:00
f2313f5ba3
Allow different fps, height, and width when using "Check for Motion First" with "Built-In"
2018-08-08 21:40:34 -07:00
b9e57f9364
minor bug fixes
2018-08-08 19:59:32 -07:00
3639b7b622
Detector Plugin Filtering Engine 0.1
2018-08-07 21:07:19 -07:00
4a0c34ba7c
vaapi ignores coProcessor flags
2018-08-05 14:48:36 -07:00
971ecc513a
Preparation for ONVIF Events (Profile T cameras only)
2018-08-02 22:58:28 -07:00
b68e515bab
Merge branch 'catch_SIGINT' into 'dev'
...
catch SIGINT so we can Ctrl+C to close camera.js on the terminal
See merge request Shinobi-Systems/Shinobi!10
2018-07-26 06:52:01 +00:00
6a0f83a1eb
fix webPaths.home and ad webPaths.apiPrefix
...
webPaths.apiPrefix may not be accomodated for in the provided dashboards. Use this options only if you are only using Shinobi's core.
2018-07-25 23:24:46 -07:00
8f6c3541da
auto remove special characters on admin creation
2018-07-25 13:51:51 -07:00
1a58a87df2
fix Cloud Videos row insertion
2018-07-24 22:42:55 -07:00
fab0839cd2
Minor bug fixes and additional table for "Cloud Videos"
...
- fixed Superuser editing a user caused user settings to be destroyed
- added Cloud Videos table for Amazon S3 and future Cloud Based Storage
- Added error handler for Discord message bot
2018-07-24 22:24:14 -07:00
6b528cd291
fix blank variable pass to config.baseURL
2018-07-24 12:34:21 -07:00
5b29ee1955
skip over "null" detector region objects
...
- additional cleanup
- set default config.baseURL to "" (will work like before "baseURL")
2018-07-24 10:55:31 -07:00
1b141bb3c3
remove extra amazon s3 log and log error only
2018-07-23 22:51:23 -07:00
013873c6f7
fix amazon s3 (aws) cleanup on user settings update
2018-07-23 22:44:44 -07:00
2bd790545b
Amazon S3 upload on video complete
...
- Open "Settings" in the "Admin" account (sub-account creator) to reveal your Amazon S3 configuration fields.
2018-07-23 22:33:06 -07:00
4c7a664f90
move path ending check
2018-07-23 22:06:35 -07:00
dc6d65d0a9
some additional whitespace for human readability
2018-07-23 12:01:37 -07:00
911966ac17
Force full URL for libraries and allow custom base URL
...
- `baseURL` can now be used in conf.json to specify a custom origin.
2018-07-23 11:53:35 -07:00
20c5cbefc7
disallow coProcessor when input maps are present
2018-07-18 14:09:29 -07:00
26a44b6e40
Allow custom from email
...
A redoing of Helvio's MR https://gitlab.com/Shinobi-Systems/Shinobi/merge_requests/16
it was redone to make it appear in the same coding style. Thanks Helvio!
2018-07-16 10:21:14 -07:00
7a84e087ff
fix event mail send function
2018-07-16 09:59:52 -07:00
f2fcf8e034
Allow deleting files from filesystem when deleting monitor
2018-07-15 21:57:06 -07:00
4bc6a9bb3c
add permission check and failed response for monitor delete
2018-07-15 19:52:44 -07:00
9dd8c2caf0
allow passing region_name and snap_path in detector_webhook and detector_command
2018-07-15 15:44:51 -07:00
9c93c7c777
fix createPamDiffEngine and show region name the in motion meter
2018-07-15 15:15:32 -07:00
fe89c9f5ab
iStreamer check fix and hide Automatic Connection options for Streamer type
2018-07-15 14:41:14 -07:00
989c4984a4
disable accelerator when Streamer type monitors are used
2018-07-15 14:27:01 -07:00
b8c8f4bb3f
more coProcessor logs and cleanup
2018-07-15 14:10:22 -07:00
c6ee3ea8b0
fix crashing coProcess with no outputs
2018-07-15 13:05:11 -07:00
ca5fcd3e63
cleanup coProcessor launch and close
2018-07-15 11:59:14 -07:00
84073bd554
add missing checkLog
2018-07-12 23:18:29 -07:00
946eba0618
quieter coProcessor logs
2018-07-12 23:11:40 -07:00
2a58f4405c
update package.json, remove extra log, increase start delay for coProcessor
2018-07-12 23:01:03 -07:00
f52a725c0e
critical bug fixes : coProcessor spawns, log filter
...
- Fix non-gracefully closing coProcessors
- add error handler on Mp4Frag
- speedup ffmpeg log filter
2018-07-12 22:57:48 -07:00
950fc7c8c1
Option to attach video on event (Discord and Email)
2018-07-12 11:27:15 -07:00
70500dca7a
Allow JPEG API (and other JPEG based outputs) with CUDA with coProcessor
...
- a second FFmpeg process is launched to create the JPEG and PAM data.
- currently stream channels are not offloaded
2018-07-11 23:47:43 -07:00
7f9aa5b705
fix syntax for video email attachment on event
2018-07-09 13:02:26 -07:00
cb83daeab8
Discord bot as account option instead of system configuration
...
- each "admin" account can login their own discord bot for notifications
2018-07-09 11:29:20 -07:00
939c0d4e5e
Event on Trigger gets Discord notifications and video clip attachments
...
- Traditional Recording must be enabled to get a video clip and JPEG API must be enabled to get a JPEG snapshot (for now)
- Email also gets the attachments
2018-07-08 23:32:52 -07:00
21c8bc47d6
syntax fix for kill allowStdinWrite
2018-07-08 09:38:22 -07:00
92ed6fd819
remove some whitespace
2018-07-07 19:56:36 -07:00
bd7d84306d
Option to Restrict Sub-Account viewing logs
2018-07-07 16:06:16 -07:00
1fad2f319f
Option to Restrict Sub-Account changing their user settings
2018-07-07 16:00:23 -07:00
0fc33342a3
clear API keys on user update from admin
...
- additional checks for API access
2018-07-07 14:24:43 -07:00
a6cd2f412e
remove extra console log on zip
2018-07-07 10:58:46 -07:00
4f5da4ad7a
allow multiple zip and download of videos
...
- and cleanup in main.dash2.js
2018-07-07 10:41:09 -07:00
08a80f2b7e
sql time query cleanup
2018-07-07 10:33:23 -07:00
0372337e09
catch SIGINT so we can Ctrl+C to close camera.js on the terminal
2018-07-05 18:34:01 +09:00
fe67b6e1e9
Strict database time insert
...
- some databases are "strict" and do not allow inserting time with a raw Date object.
2018-07-04 09:23:29 -07:00
654c1564fd
get logs by api in time frame
2018-07-02 21:17:05 -07:00
cd908a0433
disable Update button
...
script only works from command line at the moment.
2018-07-01 15:49:26 -07:00
56c6624de4
extend recording restart check for streamer camera
2018-06-30 22:05:27 -07:00
1038a4839f
Streamer v2 write lock on start to prevent crashing
...
-also always refresh stream with key frame when main process is restarted
2018-06-30 21:57:15 -07:00
977089dced
modify capture function for streamer cameras
...
- lock for streamer write function
- additional bug fixes added
- add hwaccel and cust_input in proper places
2018-06-30 17:06:01 -07:00
a850ad638d
show real monitor status instead of just mode
2018-06-28 18:36:56 -07:00
74ec5fc302
Camera Not Recording Check
2018-06-28 09:06:34 -07:00
4147c60f53
minor code cleanup
2018-06-26 17:59:42 -07:00
Moe
teklabania
David Martin
Moe
影月 零