Commit Graph

179 Commits (c742b552a7424efdb5f1290b68902f75fc3ed0c6)

Author SHA1 Message Date
Moe 5547ff0b25 Allow watching uploaded videos from Google Drive in Dashboard 2020-06-15 07:53:08 -07:00
Moe c004275fa8 put logger inside s.cameraControl callback 2020-06-13 11:27:46 -07:00
Moe a0f07406cc Move Probe and ONVIF functions to separate lib (scanners.js) 2020-06-06 18:55:01 -07:00
Moe 34d9b49f6b Refactor Probe tool (backend), cleanup Probe tool (front) 2020-06-06 15:29:57 -07:00
Moe 5bf8a04d53 Probe result can populate Monitor Settings window 2020-06-06 13:47:27 -07:00
Moe f8a0160356 fix Probe JSON output 2020-06-06 13:13:04 -07:00
Moe 7c60fd16de Update webServerPaths.js 2020-05-24 13:55:48 -07:00
Moe 93fdabb232 refactor /logs/ rows API method 2020-05-24 09:36:52 -07:00
Moe 1269bfe08a refactor /events/ rows API method 2020-05-24 08:44:44 -07:00
Moe a5b04de5de refactor /videos/ row request API 2020-05-24 07:41:10 -07:00
Moe 8526eea89a refactor querying tables for rows binded to monitors with start and end times
- prepare function for other API functions that use this methodology
2020-05-23 23:08:54 -07:00
Moe d79a59f401 refactor Events Counts get rows API method 2020-05-23 22:33:55 -07:00
Moe 664a30ee32 add Event Counting engine 0.1 2020-05-23 22:12:42 -07:00
Moe d72b61f592 Add Basic Object Counting mechanism 2020-05-05 08:02:23 -07:00
Moe 1a8fa925de Merge branch 'filter_streamtype_for_tv_channels' into 'dev'
Filter streamtype for tv channels

See merge request Shinobi-Systems/Shinobi!178
2020-04-06 20:41:30 +00:00
Ian Rubado 00a883f127 Simplified even more. 2020-04-06 16:33:38 -04:00
Ian Rubado 2a22db2e55 Fix whitespace. 2020-04-06 16:16:19 -04:00
Ian Rubado 8b95989f97 No need to check req.query.streamtype contents, only need to know it exists and filter accordingly. 2020-04-06 16:14:23 -04:00
Moe 2260abbda4 clear two factor token on login 2020-04-05 20:31:01 -07:00
Ian Rubado e0284ede1e Fix whitespace 2020-04-05 23:28:00 -04:00
Ian Rubado f90329d015 Filter by streamtype for tv channel listing. 2020-04-05 23:26:03 -04:00
Moe 5308449979 send only essential data on 2FactorAuth 2020-04-05 19:51:12 -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 e6144ef1c1 make HTTP Event Trigger and DropIn Trigger act for pass off to object detector 2020-01-17 23:20:16 -08:00
Moe 4a69a1aa8e adjust response headers
- make Access-Control-Allow-Origin : *
- add no-caching headers to streams over http
2020-01-15 13:47:59 -08:00
Moe 6d826ca527 update video file upload method - fix endTime parsing 2019-11-23 16:53:54 -08:00
Moe e6a18ee7c8 set start time for uploaded video based on uploaded file name 2019-11-04 08:47:20 -08:00
Moe 147f3c0051 Add Uploading Video to Monitor Recordings by POST 2019-11-03 07:59:18 -08:00
Moe 5ff2419fac add async methods to webServerPaths
+ zipVideos with server is being removed. the client side method requires no extra storage space on the server.
2019-10-28 13:31:10 -07:00
Moe 2a6a10664d log Shinobi version on start and show in Superuser panel+++ 2019-07-30 17:05:00 -07:00
Austin Lakeman cb18ea71f8 Update `/events/` API 2019-07-19 20:43:05 +00:00
Moe 9347f4187e Update HTTP Motion Trigger+ 2019-07-14 19:38:28 -07:00
Moe d0adfcc1ff Update HTTP Motion Trigger
- Make it a JSON response
- Add ability to Block it with a switch
2019-07-14 18:02:15 -07:00
Moe a6a854bd03 move timelapse web paths to timelapse.js
+ fix calculator designation for Files insert for Timelapse Video creation
2019-07-09 23:12:17 -07:00
Moe f2918cb09b rename `.mon` and `.mon_conf`
- now labelled `.activeMonitors` and `.rawMonitorConfigurations`
2019-07-07 20:39:41 -07:00
Moe d0b4c83ba9 Fix Max Storage purge function
- add missing webServerPaths.js update
2019-04-20 11:52:53 -07:00
Moe 447315cfef Updates and Fixes
- add videoDropInServer (FTP), currently only logs timelapse frames to database
- cleanup timelapse appearance
- allow replacing renderPaths.home with embeddable page for basic landing after login
- light ejs touchups
2019-04-05 22:27:22 -07:00
Moe 89a70b6438 Some Updates and Fixes
- Add Branding Engine
- Lock PM2 install to 3.0.0 (newer versions cannot catch `uncaughtException`.
- Update macOS installer
- Update OpenALPR (CPU) installer
- Add Portuguese Language
- Fix Language Selector
- Lay-In ability to create Matrix from Pam-Diff detection blob
- createEventBasedRecording called for Traditional Recording labelled 5 seconds before real time to capture event
- fix NaN for new user created in Superuser
- count space used for Timelapse Frames and Files tables (does not purge Timelapse data yet)
- Update TimelapseJpeg, lay-in MP4 builder, many fixes, additonal page
- add `impervious` to gitignore in `web/libs` for custom static files
- Fix delete button for quick video list
- Fix Super form appearance
2019-04-02 20:47:03 -07:00
Moe ea9f363fe1 improve timelapse.jpeg appearance and performance+ 2019-03-24 23:42:32 -07:00
Moe 00ab3046ff Add JPEG-based Timelapse creation
- Currently can only retrieve data about Timelapse through API, GUI coming soon
+ Definition fixes
2019-03-21 14:30:50 -07:00
Moe 758fc700b1 Rewrite Settings and Montior Edit forms in JSON instead of HTML
- rewrite of forms in JSON allow auto-generating the necessary fields on almost any template with a lot more ease
- remove ejs files for uploaders and make fields generate by JSON as well
+ activate separated css files
2019-03-15 00:32:18 -07:00
Moe 1078960db2 CORS added to all web routes through `app.use` 2019-02-19 19:14:11 -08:00
Moe bf7a5d2d83 Add "onMonitorDied" extender 2019-01-31 10:51:35 -08:00
Moe 75269f7d9f Method to merge videos from Videos List
- button will appear as "Merge and Download" next to "Zip and Download"
2019-01-28 17:41:14 -08:00
Moe 3bf2222c0a add missing module "onvif" in webServerPaths 2019-01-26 12:21:55 -08:00
Moe 2d5434ac21 allow customAutoLoad to get blocks, js, and css automatically from fs 2019-01-23 22:15:17 -08:00
Moe 3b4d2d339f Force copy of global lang variable
- to avoid overwriting by user change
2018-12-12 15:53:49 -08:00
Moe 96c6d1de19 Add robots.txt 2018-12-04 08:34:59 -08:00
Moe 219fdd1139 Fix 2-Factor Authentication 2018-11-14 19:24:50 -08:00
Moe a0ec9afc87 Allow Mass Config Changes by API (monitorStates) and more
- Unlike /configureMonitor/ this method, /monitorSates/, can take single veriables for a monitor edit.
+ clean /configureMonitor/'s addEdit portion and make it a separate function
+ add "raw" catch. if "raw" not found another database init will be requested
+ fix "undefined" monitor status for Disabled monitors on Shinobi start
+ fix color threshold save for region editor
+add fallback for snapBuffer failure
2018-11-10 19:59:02 -08:00
Moe eb65330fa8 pathing fixes for streams 2018-11-06 10:44:01 -08:00
Moe 3a2c95e0f3 fix failed login page redirect 2018-11-06 10:09:38 -08:00
Moe 89a057a62a fix front end lib pathing when using custom webPaths 2018-11-05 20:27:19 -08:00
Moe 1727f2c5e7 add catch for video file range read on get 2018-11-03 10:40:41 -07:00
Moe f3d60ca674 Additions and Cleanup
+ Allow global designation for Backblaze B2, Amazon S3, and WebDAV
+ allow frame transfer to plugin by "File in RAM" (experimental and currently only works with yolo and dlib)
+ API method for account save/edit
+ Add C++ based Dlib plugin (face-recognition)
+ allow choosing tiny or regular weights for yolo
- remove old python-dlib plugin because it is just bad (yucky python)
2018-11-02 16:44:53 -07:00
Moe d0398670a4 Update libs/webServerPaths.js 2018-10-27 10:36:20 -07:00
Moe 2edb408702 Cleanup for Super and Admin panel user management functions
+ added sample JSONs for docs and test scripts
2018-10-24 16:41:02 -07:00
Moe 224a06cb3e Prepare Build Testing
+ cleanup some comments functions
+ move some functions to startup.js
+ add ability to search videos with "startFrom" and "startTo" instead of "start" and "end"
2018-10-23 11:36:02 -07:00
Moe d6e7f628f0 Add API methods to manage API keys
- Add, Delete, List are the methods added
+ light cleanup
2018-10-15 19:39:50 -07:00
Moe c178984084 Add CPU usage indicator (per monitor)
+ adjust purge videos on max space operation order
+ light cleanup with var names
2018-10-09 15:40:06 -07:00
Moe f219ff8fbc add the ability to detect viewers without websocket more stream types
- viewer count detection added for : mjpeg, poseidon over http, flv over http, h265 over http, and raw h264
- with it you can detect when a stream is opened without the websocket connection
+ move web stream paths to their own file "webServerStreamPaths.js"
2018-10-07 23:01:27 -07:00
Moe c5c3743f59 fix "Error: read ECONNRESET" when Poseidon stream is restarted 2018-10-07 11:59:01 -07:00
Moe 5fcdd860e0 humanize some variable names
+ some minor adjustments
2018-10-07 11:45:38 -07:00
Moe 656849ae8a add some comments in webServerPath libs 2018-10-06 09:46:48 -07:00
Moe fd8c526b7f Update Superuser
- Update API to allow request on "all"
- Update superAuth
- add temporary superSessionKey to use REST API in Superuser dashboard
- fix favicon in Superuser panel
- make some UI adjustments in Superuser panel
2018-10-05 23:20:16 -07:00
Moe b80ebb6bcd move configureMonitor to admin 2018-10-05 21:16:21 -07:00
Moe f4e24005e8 RESTful APIs for Admin functions
- Create Sub-Account
- Update Sub-Account
- Delete Sub-Account
2018-10-05 19:52:02 -07:00
Moe cd38c01649 minor cleanup 2018-10-05 14:19:48 -07:00
Moe ce81c4672a light houstkeeping
- moving some functions around and cleanup
2018-10-02 17:52:49 -07:00
Moe aee4fec0e9 move extenders to separate file 2018-10-01 17:21:48 -07:00
Moe 9e11f6d810 move discord and email functions into libs/notification.js
+ add more event controllers for custom functions
2018-09-30 22:44:35 -07:00
Moe a3744787d9 Mega Update
- Add Extender functions in some places. Hopefully will add in all functions after more rewriting.
- Add Backblaze B2 uploading support
- Add support for managing cloud storage space used
- put all cloud video management functions in one library file using Extender
- separate uses of "s.s". s.s = JSON.stringify again and API calls with s.s will use "s.prettyPrint"
- move ffmpeg init functions
- rename s.beat to better reflect purpose
2018-09-30 15:44:04 -07:00
Moe 9393c8caf7 Modularize camera.js+++++++
- clean up some more functions names to be more human readable.
2018-09-29 08:00:51 -07:00
Moe 7431aee9fc Modularize camera.js+++++ 2018-09-28 21:04:50 -07:00
Moe f4b544c52c change var name from currentDirectory to mainDirectory
- "mainDirectory" better reflects the value of the variable
2018-09-28 19:02:53 -07:00
Moe d834698b27 default custom JSON stringify function to pretty print, 3 spaces 2018-09-28 18:57:26 -07:00
Moe 1740e3461d break s.init into individual functions 2018-09-28 18:38:14 -07:00
Moe dd3858e94e Modularize camera.js+++ 2018-09-28 13:26:24 -07:00
Moe af8fc608e7 Modularize camera.js 2018-09-27 22:37:08 -07:00