Commit Graph

293 Commits (2540090499141db123c9930301adcd98758bf7f2)

Author SHA1 Message Date
Moe 10acea1286 add missing rules for startup.js (cloud timelapse count) 2019-07-07 20:02:49 -07:00
Moe 44dc8e865e Update basic.js 2019-07-07 20:01:20 -07:00
Moe 3441618701 auth.js refactor, code cleaner 2019-07-07 20:01:16 -07:00
Moe 57b312711d add minimum value 0 for region editor polygon points 2019-07-07 09:00:46 -07:00
Moe 043c07deb7 remove undefined "callback" 2019-06-28 23:04:02 -07:00
Moe a4b931214a modify libs/rtmpserver/node_core_logger.js 2019-06-21 13:23:25 -07:00
Moe 1051291c87 Add async.queue to s.sqlQuery, fs.readFile and fs.stat+ 2019-06-20 22:43:23 -07:00
Moe 63ded4d92c Add async.queue to s.sqlQuery, fs.readFile and fs.stat
+ change backblaze human name accountId to keyId
2019-06-20 22:42:17 -07:00
Moe f4bcbab297 fix uploaders "Max Storage Amount" fields 2019-06-10 09:22:52 -07:00
Moe 868b5a5eea Update user.js 2019-06-08 16:26:36 -07:00
Moe 9ff60ded36 fix orphan check max setting and add #56 2019-06-07 16:55:25 -07:00
Moe d82b32a885 Merge branch 'dev' into 'dev'
Fix ONVIF Camera Zooming

See merge request Shinobi-Systems/Shinobi!59
2019-06-07 22:45:15 +00:00
Moe 66fc2d19ac delete timelapse frame from childNode 2019-06-07 14:30:33 -07:00
Moe 9b8d637401 Change method to getting initial addStorage size 2019-06-07 13:11:09 -07:00
Moe 8e9c130145 Add saving Timelapse Frames from Child Node 2019-06-07 09:52:07 -07:00
Moe 616adf6957 minor tuning for sql.js 2019-06-05 17:32:31 -07:00
Moe 775be6be11 ftp dropInEvent server detects MP4 files and adds them to the database 2019-06-05 16:09:52 -07:00
Moe 6bd998afae allow lowercase "shinobi" in smtp/ftp trigger username 2019-06-05 16:08:34 -07:00
Moe b2b3e574d8 Minor fixes 2019-06-05 16:06:59 -07:00
Moe 88094d07f2 Fix stack exceed error for large videos 2019-06-05 16:06:45 -07:00
Moe c8f38b0d2f minor cleanup 2019-06-04 09:39:36 -07:00
Moe ce1fe2bc66 fix Command on Event timeout 2019-05-25 12:38:46 -07:00
Moe 72cacda9b0 fix addStorage counter 2019-05-20 17:31:47 -07:00
Moe 5dc18248e3 fix missing variable storageType 2019-05-16 08:09:49 -07:00
Moe 7204b0ed2e Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2019-05-15 10:46:28 -07:00
Moe a60a73848d Update videos.js 2019-05-15 10:46:24 -07:00
Austin Lakeman 44aa8c5ac5 Fix addStorage variables for video & timelapse checks - startup.js 2019-05-15 14:43:27 +00:00
Moe a87c2e6acc Compound Update
- Calculate Max Storage Amount for Videos and Timelapse Frames separately
- Split Max Storage Amount by percentage for Videos and Timelapse Frames
- Fix order of operations for on start monitor load and orphan check
- move some extender definitions to extenders.js
- Slim Power Video Viewer event bars
- Add hours to date range selector for Timelapse Jpeg
2019-05-05 13:30:07 -07:00
Moe cfa26f2f4e fix sizeLimit on start (again) 2019-04-29 15:59:15 -07:00
Moe f5d416bf54 fix on Max Storage Amount set on start 2019-04-27 10:15:55 -07:00
Moe a1f33195ee clear "over max" timelapse frames 2019-04-26 11:10:53 -07:00
Moe f8103fad1f fix on start sizeLimit value 2019-04-20 12:06:23 -07:00
Moe d0b4c83ba9 Fix Max Storage purge function
- add missing webServerPaths.js update
2019-04-20 11:52:53 -07:00
Moe 4e4dd66cfa fix usedSpace check for addStorage 2019-04-20 08:11:43 -07:00
Moe dfd6d2e08c Fix Max Storage Amount loader 2019-04-20 07:58:56 -07:00
Moe c0f381af8f change addStorage startup value from bytes to kb 2019-04-19 18:00:05 -07:00
Moe fc870627ac Simplify and fix storage calculcation on start 2019-04-19 17:50:01 -07:00
Moe 8d1e03d148 set `oldPluginConnectionMethod` to false as default 2019-04-19 08:20:25 -07:00
Moe 90ba9cd75c default addStorage Max Storage Amount to "Main" value 2019-04-18 21:58:50 -07:00
Moe 3ebfc90906 Update monitor.js 2019-04-18 17:57:51 -07:00
Moe ec8824985f Packging, addStorage Max Amounts, Fix s3uploader and minor fixes
- Add ability to pacakge with `pkg`
- Add Max Storage Amount for each `addStorage` storage array per user
- Fix `uploaders/s3based.js` variable names
- Update Timelapse.jpeg video builder
- Allow rendering a separate page upon login for Sub-Accounts
2019-04-18 17:54:07 -07:00
TechplexEngineer 448c9f00d4 Fix zooming 2019-04-16 15:43:51 +00:00
Moe 6253979f10 Update customAutoLoad.js 2019-04-13 19:24:45 -07:00
Moe 57c5168454 Allow custom loading definition elements 2019-04-13 18:58:55 -07:00
Moe c7700b8eea add cpu and ram event extensions 2019-04-13 17:36:00 -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 ee678cf4f3 proper fix for recording dimensions
- this fix is not backward compatible, you will need to reset your dimensions manually. default is Auto (blank).
2019-04-02 23:21:19 -07:00
Moe 774756e3ad move well-known directory setting 2019-04-02 22:42:48 -07:00
Moe 0c3a3ada1e Fix Blank value insert for Monitor Settings+ 2019-04-02 22:37:37 -07:00
Moe 3beab3313c Fix Blank value insert for Monitor Settings 2019-04-02 22:26:37 -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 9877ac480f Fix Host Connection for Plugins and pluginBase.js use CWS 2019-03-30 13:53:24 -07:00
Moe e01acf9381 modify poweredBy variable name 2019-03-24 23:46:31 -07:00
Moe 6a0f3d8599 move plugin functions from socketio.js into plugins.js 2019-03-24 23:45:03 -07:00
Moe cd72207acf improve timelapse.jpeg appearance and performance++ 2019-03-24 23:43:23 -07:00
Moe ea9f363fe1 improve timelapse.jpeg appearance and performance+ 2019-03-24 23:42:32 -07:00
Moe 85bfd75280 improve timelapse.jpeg appearance and performance 2019-03-24 11:19:55 -07:00
Moe bcdb54d02b Modify JPEG-Based Timelapse Method and add basic GUI
+Bug fixes for UI
2019-03-23 18:25:58 -07:00
Moe a3251246f0 revert s.stringToSqlTime 2019-03-23 09:00:50 -07:00
Moe 3093345e19 Fix Sub-Account Delete API method 2019-03-22 15:26:56 -07:00
Moe 9ff69b28b3 add more config parameters for branding on login 2019-03-21 21:22:27 -07:00
Moe 8735d9b27b fix Timelapse table creation 2019-03-21 16:50:46 -07:00
Moe cf4b1c6d04 fix config parameter for poweredByClass 2019-03-21 14:59:16 -07:00
Moe 5c2f70cd74 Fix definitions for Uploaders 2019-03-21 14:54:11 -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 040080fd0b Allow configuring Logo on login screen with conf.json 2019-03-21 14:24:32 -07:00
Moe 6fbfeb52e2 Add path for .well-known
- This addition is to accomodate the manual modification made in Beowulf's SSL setup guide.
- "Setting up SSL with Shinobi Video using Let’s Encrypt and Certbot" by Beowulf : https://www.scheh.com/index.php/2018/01/26/setting-up-ssl-with-shinobi-video-using-lets-encrypt-and-certbot/
2019-03-19 19:56:22 -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 2826c858ac move authenticateUser in dropInEvents.js 2019-03-09 10:34:07 -08:00
Moe 8928d777bb Fix flag for connected plugins 2019-03-07 21:27:40 -08:00
Moe f87dd59039 Feature Request #49 : Custom Endpoint with S3-Based Uploading++ 2019-03-07 16:04:14 -08:00
Moe 9664e98fa6 Feature Request #49 : Custom Endpoint with S3-Based Uploading+ 2019-03-07 15:57:01 -08:00
Moe 8fe57162af Feature Request #49 : Custom Endpoint with S3-Based Uploading
- Wasabi Hot Cloud Storage has been converted to being a dynamic S3-based upload controller.
2019-03-07 15:53:49 -08:00
Moe 4eb68ee900 Remove hardcoded "uploader" fields and place in dynamically loaded files 2019-03-07 15:26:56 -08:00
Moe 18e0923a7e Allow connecting multiple Detector Plugins+ 2019-03-05 18:18:52 -08:00
Moe 9c4b153ab4 Allow connecting multiple Detector Plugins
+ remove `frameToRam` method.
+ add extenders for onWebsocketConnect/Disconnect
2019-03-05 16:22:04 -08:00
Moe a901bd2e32 fix SQLite Power Video bug
- newly created events will only be fixed. Previous events will unfortunately remain broken. MariaDB/MySQL databases are unafftected.
2019-03-04 20:31:24 -08:00
Moe cdf2e6f8c8 remove `videoTime` logging for events, use basic search method of power video 2019-03-03 09:52:23 -08:00
Moe 9aabfea193 Update Stale Purge Lock function set
- when "No space left on device" is detected a check to see if you are over your account storage max will be done, if so then it will force an unlock and create a purge request.
2019-02-28 14:07:14 -08:00
Moe 9ff20b8442 Update dropInEvents.js
- close fs.watch and delete monitor's folder onMonitorStop to drop requests when monitor is disabled.
- shorten file trigger timeout from 3 seconds to 1.2
- SMTP events check if monitor is started upon receipt, drop request if not
2019-02-28 11:27:20 -08:00
Moe c4129e4202 disable eventBasedRecording creation if detector is off 2019-02-27 22:22:33 -08:00
Moe 38e67d933a Multi Trigger by Group
- In Global Detector Settings you can now find the option to trigger other cameras when a particular monitor has been triggered.
+ Remember monitor order in dashboard list
+ Allow sending frames to Plugin based detection with Primary Send Frames off.
+ minor clean up
2019-02-27 20:32:29 -08:00
Moe c2100d7790 Allow starting SMTP server without dropInEvent server 2019-02-27 20:17:49 -08:00
Moe 54883d46f7 Fix Backblaze B2 Auth Refresh+ 2019-02-26 18:44:28 -08:00
Moe a33a2798a8 Fix Backblaze B2 Auth Refresh 2019-02-26 18:41:05 -08:00
Moe 94e7a03b4b change cloudUploaders to uploaders
- split `uploaders.js` into multiple files. Each based on their service provided.
2019-02-26 18:35:45 -08:00
Moe 1be41d7f3b Add SMTP server to dropInEvents module 2019-02-26 18:34:04 -08:00
Moe 9a71cd9c95 Use cws(uws) for Socket.IO engine 2019-02-24 18:47:39 -08:00
Moe 490ac88b00 Update dropInEvents.js 2019-02-23 22:01:53 -08:00
Moe 27ac21bdbd Add FTP server to dropInEvents module 2019-02-23 09:50:03 -08:00
Moe 31eb99f551 Add dropInEvents module++ 2019-02-22 23:06:04 -08:00
Moe 97b341481e Add dropInEvents module+
+ better filename parse for file insert
+ add missing RTMP server addition in camera.js
2019-02-22 23:04:52 -08:00
Moe 55aedbabb9 Add dropInEvents module
- This allows you to drop a file into `/dev/shm/streams/dropInEvents/[GROUP KEY]/[MONITOR ID]` to trigger an event.
- This is useful for cameras that can do FTP upload on Motion detected with their internal detector.
- `dropInEventsDir` can be configured in conf.json
2019-02-22 22:59:06 -08:00
Moe e129afd756 fix `onMonitorSave` event
+prettify config cron error
2019-02-22 19:24:21 -08:00
Moe 127da9700d Merge branch 'patch-1' into 'dev'
Prevent corrupted recording when recording is interrupted.

See merge request Shinobi-Systems/Shinobi!47
2019-02-22 19:46:47 +00:00
Moe 3914ea30e4 Merge branch 'addEventDetailsToString' into 'dev'
Updated addEventDetailsToString to replace event detail tokens

See merge request Shinobi-Systems/Shinobi!53
2019-02-22 19:38:08 +00:00
Moe d8fd16c033 humanize and cleanup cloudUploader.js
+ add privateKey field for SSH file upload
2019-02-19 22:31:07 -08:00
Moe 6a3daccb2f Add Automatic SFTP Uploader
- SFTP Uploader is basic uploader. This method is not capable of managing space like other cloud back up methods.
+ Minor cleanup
2019-02-19 19:29:12 -08:00
Moe 1078960db2 CORS added to all web routes through `app.use` 2019-02-19 19:14:11 -08:00
Moe c706da1ca3 Added timed auth refresh for Backblaze B2 connections 2019-02-19 13:10:49 -08:00