Commit Graph

1354 Commits (27d956bc22ac5fae4525580f75dc403e8ba51e72)

Author SHA1 Message Date
Moe c16a2c7812 Force P2P Reconnect on any error 2022-05-21 07:17:20 -07:00
Moe 304e3d0280 fix updating Email address for Sub-Account 2022-05-16 13:40:42 -07:00
Moe 31878b342e fix getting video in notification from Event Based Recording 2022-05-15 11:10:53 -07:00
Moe 1c547640e6 P2P : add heartbeat check 2022-05-10 19:07:16 -07:00
Serdar Sanri b6524b7acc Sercom ICamera1000 fails to store http trigger url when json provided. This MR will allow a fallback method to provide plug, name, confidence and reason parameters to be passed as querystring 2022-05-06 20:49:39 +00:00
Moe 51cb2294ba Merge branch 'update-dependencies' into 'dashboard-v3'
Critical Update to Dependencies, Replace request with fetch

See merge request Shinobi-Systems/Shinobi!357
2022-05-05 18:16:15 +00:00
Moe d5f85ec7b3 make monitor process log to original stderr instead of dataPort 2022-05-02 13:23:56 -07:00
Moe 748b3cf88a Update language loader, minor cleanup 2022-05-02 13:12:42 -07:00
Moe 576354901d minor fixes to monitorListOrder filter 2022-04-30 19:22:36 -07:00
Moe efe9d7c093 Fix Language Modifier and rename definitions framework 2022-04-30 13:15:26 -07:00
Moe a7c707980b add discont_start for low bandwidth clients viewing hls 2022-04-29 10:48:11 -07:00
Moe 45756b3e64 Add Heartbeat and "Authenticated" notice, minor rearrange 2022-04-28 22:04:32 -07:00
Moe c63f6bb62e Make P2P wait for readyState on connect 2022-04-28 08:24:38 -07:00
Moe 6a0b4577c6 fix signal checker 2022-04-27 10:09:52 -07:00
Moe b2ad513bd9 fix missing outboundMessage definition 2022-04-26 07:32:19 -07:00
Moe bc6d446cf7 more package updates
+ googleapis
+ ldapauth-fork
2022-03-31 22:04:16 -07:00
Moe 504781df3a Critical Update to Dependencies, Replace request with fetch
+ Replaced all uses of `request` with `node-fetch`
+ Update WebDAV
+ Add pushover-notifications
+ Update CWS
+ Update discord.js
+ Fix authentication for HLS stream API endpoint
+ Last Update to P2P v1 to remove request module

Requires further testing.
2022-03-31 21:58:27 -07:00
Moe 2a061b2264 Upgrade Socket.IO to version 4
- Some tweaks to BetterP2P
- Update static server list to use v2
2022-03-30 16:20:53 -07:00
Moe 1281bdb7fc fix relative video pathing 2022-03-28 21:14:56 -07:00
Moe 25fddb7ba5 Better P2P (Easy Remote Access v2)+ 2022-03-28 17:48:08 -07:00
Moe c28b246ac4 Better P2P (Easy Remote Access v2) 2022-03-28 16:02:05 -07:00
Moe 500bd51679 let Shinobi manage P2P reconnection 2022-03-21 11:19:05 -07:00
Moe db9115d853 Merge branch 'master' into 'dashboard-v3'
Add missing SQL column in cloud timelapse frames table insert for s3 based upload

See merge request Shinobi-Systems/Shinobi!355
2022-02-22 16:33:34 +00:00
Miłosz Tyborowski fea94476e3 Add missing SQL column in cloud timelapse frames table insert for s3 based upload 2022-02-22 13:42:26 +01:00
Moe 302ef4b3f7 Merge branch 'remove_static_configuration' into 'dashboard-v3'
Remove statically set probesize and analyzeduration

See merge request Shinobi-Systems/Shinobi!352
2022-02-21 16:02:26 +00:00
Moe b894c1c7eb fix side monitor list order 2022-02-12 21:42:11 -08:00
Moe 0ae2c135c5 `statisUsers` parameter in conf.json creates users 2022-02-12 16:38:21 -08:00
Moe a03c158480 add "superUserLoginDisabled" parameter to allow disabling use of super user 2022-02-12 14:15:56 -08:00
Moe eb0e93e5d2 allow creating admin users from conf.json 2022-02-12 14:14:16 -08:00
Moe eeda089276 Email Notification settings are now configurable in Account Settings+ 2022-02-10 11:14:03 -08:00
Milosz Tyborowski 40804fa650 Remove statically set probesize and analyzeduration 2022-02-08 10:07:16 +01:00
Moe 5709a3f140 Email Notification settings are now configurable in Account Settings
Email settings in conf.json are separate from Account Settings configurations. To hide all System Level (conf.json) Email settings : remove `mail` object from your conf.json.
2022-02-07 11:15:11 -08:00
kitty99 cefe3eeb0d Update libs/ffmpeg/builders.js 2022-01-30 02:09:58 +00:00
kitty99 2f2e64a55c fixed issue 359 2022-01-29 08:47:25 +00:00
Moe 894e07fc38 update PASV options for FTP dropInEvent Server 2022-01-26 11:45:15 -08:00
Moe d2d46f0795 run finalize action on event based recording on exit of record process 2022-01-20 13:02:36 -08:00
Moe e6e9060de4 run finalize action on timelapse video build on exit of build process 2022-01-20 13:01:59 -08:00
Moe a7fb7b33ea fix event save on child node, fix command filter condition, add SideMenuAfterList 2022-01-12 10:41:23 -08:00
Moe 6d0d606ad5 add "Not Authorized" notice to Backblaze Uploader 2021-12-25 16:08:50 -08:00
Moe e4b7098386 remove packet limit on child node file transfer 2021-12-23 08:55:15 -08:00
Moe 3e3e2f6b58 better dataPort security 2021-12-21 12:03:56 -08:00
Moe 82eb83df71 fix onvif scanner result draw 2021-12-19 12:32:44 -08:00
Moe 372100f07e fix ffmpeg.js 2021-12-19 07:39:44 -08:00
Moe 41037abaf9 Merge branch 'dashboard-v3' into 'data-port'
# Conflicts:
#   libs/ffmpeg.js
2021-12-19 15:17:13 +00:00
Moe 12e7a921b2 allow noLimit queries on videos, events, and timelapse frames 2021-12-17 09:50:35 -08:00
Moe b1278a191c Update ffmpeg.js 2021-12-09 16:08:26 -08:00
Moe f06e9f28b9 adjustments to timelapse transfer from child 2021-12-09 15:29:48 -08:00
Moe 769f0ab8c6 fix fatalError trigger on monitor processes 2021-12-09 08:22:44 -08:00
Moe c945d53d9f tweak auto-closing of Substreams+ 2021-12-08 07:41:32 -08:00
Moe 3f23502214 start rebuilding email notifications to be configured from user account (not active yet) 2021-12-07 21:56:41 -08:00
Moe 4af73b062d tweak auto-closing of Substreams 2021-12-07 21:55:01 -08:00
Moe 494bed8d25 fix timelapse video build+ 2021-12-06 22:35:19 -08:00
Moe 810e0aca19 fix timelapse video build 2021-12-06 20:25:55 -08:00
Moe 3cf38a7843 Substream can now be used for On-Demand Live Stream on Dashboard 2021-12-06 15:45:25 -08:00
Moe 5204df7a40 video delete remove UI elements fix 2021-12-05 12:23:51 -08:00
Moe 4bb4828acf Add Substream Default values and some validation for startup 2021-12-04 21:59:26 -08:00
Moe 6b3804a5b4 Add Dynamic Substream Toggle button 2021-12-04 19:49:25 -08:00
Moe 988ba75b45 properly get snap from ONVIF device when available 2021-12-04 19:11:18 -08:00
Moe 7b6c939de0 fix event based recording... oof 2021-12-03 17:52:40 -08:00
Moe 80f5225191 remove frame limit on timelapse frame retrieval 2021-12-03 10:20:56 -08:00
Moe 4b418ed8a3 fix managing addStorage 2021-11-30 08:24:36 -08:00
Moe a2faa40ab0 fix managing addStorage 2021-11-30 08:24:25 -08:00
Moe b4c886c16a fix managing addStorage 2021-11-30 08:23:50 -08:00
Moe 02b8546940 clean up scanForOrphanedVideos execution for childNode 2021-11-30 08:08:07 -08:00
Moe 9d1f7e0991 disable scanForOrphanedVideos on child node completely 2021-11-29 21:14:57 -08:00
Moe 2084b0b8c8 fix Sub Account Manager Edit new account before page refresh and delete 2021-11-29 17:46:55 -08:00
Moe 8bcf65f64d Merge branch 'dev' into 'dashboard-v3'
# Conflicts:
#   cron.js
2021-11-30 00:06:51 +00:00
Moe 26572e480b fix cron addStorage calculation 2021-11-29 13:56:26 -08:00
Moe 1fc0c1d03e disengage "masterSaysToStop" 2021-11-29 09:32:08 -08:00
Moe fa13e70562 Child Node Framework Update : fix disconnected child recovery 2021-11-28 11:06:01 -08:00
Moe d6d9d4fb05 Child Node Framework Update : syntax fixes+++ 2021-11-28 09:21:15 -08:00
Moe 9a018400b5 update Child Node selection formula+ 2021-11-27 16:43:42 -08:00
Moe bb5612ac7a remove some old Child Node code from videos.js 2021-11-27 15:53:38 -08:00
Moe fa3040504a Child Node : Stop looping FFmpeg process if Disabled during Restart/Crash 2021-11-27 15:53:20 -08:00
Moe 77ac7c6192 update Child Node selection formula 2021-11-27 15:46:54 -08:00
Moe f51f623a75 Child Node Framework : minor cleanup 2021-11-27 07:13:10 -08:00
Moe 06908c4e0f Child Node Framework : allow using Master Node for Processing 2021-11-26 21:22:49 -08:00
Moe 3f20721dc9 Child Node Framework : cleanup node selection operation 2021-11-26 20:53:06 -08:00
Moe d20297429a Child Node Framework Update : Child Node continuously attempt reconnect to Master Node 2021-11-26 19:48:59 -08:00
Moe 2a53d77cad Child Node Framework Update : fix double insert video 2021-11-26 19:42:59 -08:00
Moe 5caa08aba1 Child Node Framework Update : clean up+ 2021-11-26 19:42:23 -08:00
Moe a907887f8c Child Node Framework Update : clean up 2021-11-26 17:56:29 -08:00
Moe ffbfd57f27 Child Node use plain buffer data for timelapse frame transfer to Master Node 2021-11-26 17:47:20 -08:00
Moe a717084e7d Child Node use plain buffer data for video transfer to Master Node 2021-11-26 14:54:04 -08:00
Moe 6ec1fcb9fe Child Node Framework Update : syntax fixes++ 2021-11-25 13:05:17 -08:00
Moe 7ff0601776 Child Node Framework Update : syntax fixes+ 2021-11-25 12:49:35 -08:00
Moe f336bb654a Child Node Framework Update : syntax fixes 2021-11-25 09:30:23 -08:00
Moe d7409db6f0 Child Node Framework Update 2021-11-25 09:20:50 -08:00
Moe d908ff22d2 Start modifying Child Node connectivity to use Data Port methodology 2021-11-24 23:59:13 -08:00
Moe 9784a853ed prepare cws websocket spawn to be used elsewhere 2021-11-24 15:52:04 -08:00
Moe 309abf9758 make http websocket upgrade less hardcoded 2021-11-24 15:40:59 -08:00
Moe 440939483b cleanup cameraThread/dataPortConnection 2021-11-24 13:02:38 -08:00
Moe 993636746c dataPort is now bridge for detector events from cameraThread 2021-11-24 12:30:50 -08:00
Moe c4f78ede6a fix posting on ONVIF Device Manager Endpoints 2021-11-23 22:56:50 -08:00
Moe 0cc3344489 Port over ONVIF Device Manager 2021-11-23 21:05:56 -08:00
Moe 9a0b766631 P2P Connection check every 15 minutes if disconnected 2021-11-21 07:39:40 -08:00
Moe 9648f8cc60 update P2P Server list for dev branch 2021-11-18 19:48:13 -08:00
Moe 8240933437 almost functional dataPort 2021-11-17 12:10:25 -08:00
Moe 20aaf85725 Data Port for ease in transferring info between processes 2021-11-16 18:04:35 -08:00
Moe 1bc684e627 event filter and mqtt fixes 2021-11-16 18:02:27 -08:00
Moe aa65df241f fix displaying Uploader fields 2021-11-15 13:09:37 -08:00
Moe 256658f9da MQTT Outbound Messages++ 2021-11-15 11:41:08 -08:00
Moe 7ffe3bc7f0 get latest p2p server list on start 2021-11-15 10:39:01 -08:00
Moe b2eab1573b Merge branch 'dev' into 'dashboard-v3'
Critical Changes from Dev into Dash v3

See merge request Shinobi-Systems/Shinobi!342
2021-11-15 18:20:07 +00:00
Moe 8cfc0f5f7c MQTT Outbound Messages+ 2021-11-15 10:19:31 -08:00
Moe fda5f1cb82 MQTT Intake -> MQTT Inbound, Add "All Monitors" trigger 2021-11-15 00:10:43 -08:00
Moe cfbb528770 Integrate MQTT Outbound Messages 0.1 2021-11-15 00:08:37 -08:00
Moe 1cc56ca0e8 Integrate MQTT Event Intake 0.1++ 2021-11-14 08:38:22 -08:00
Moe c7e84111e3 Integrate MQTT Event Intake 0.1+ 2021-11-13 14:51:40 -08:00
Moe fbbe8fb0c7 Integrate MQTT Event Intake 0.1 2021-11-12 18:32:53 -08:00
Moe 1d8ab96c9a minor cleanup 2021-11-11 22:08:39 -08:00
Moe e085f5e726 modernize 2-factor auth, add debug logs to telegram errors 2021-11-08 20:48:33 -08:00
Moe 91122851d2 make storage array use count update on account save 2021-11-08 16:09:26 -08:00
Moe 9baca18736 Update branding.js 2021-11-08 14:29:05 -08:00
Moe 822d7d1229 Add Modular method to add Stream Types + 2021-11-06 11:28:33 -07:00
Moe 40b4669d01 Add Modular method to add Stream Types, Remove Integrated H.265 Support
- H.265 Support must now be added by user intervention via a Custom Auto Load Module. You can install the module easily by using the zip link in the Super User panel's Custom Auto Load manager.
Repository : https://gitlab.com/moeiscool/shinobi-h265-support
Zip Link : https://gitlab.com/moeiscool/shinobi-h265-support/-/archive/main/shinobi-h265-support-main.zip

Why? the library libde265.js is great but it is not a proper fit for the application. Moving onward it will be nice to allow new stream types to be easily added as well as get ready to try a different H.265 library for our web viewing pleasure.
2021-11-05 15:59:42 -07:00
Moe 1b29dc3f4c Fix Backblaze's response changes 2021-11-04 19:14:42 -07:00
Moe 91f8af3002 allow grouping with brackets on event filter conditions 2021-11-02 18:32:24 -07:00
Moe b984b20026 some validation for filters 2021-11-01 18:07:42 -07:00
Moe 528434ffe4 Simplify Event Filters
No option has been removed from filter actions. To "not" do an action you must disable it in Monitor Settings so that the "Original Choice" action is to not do it.
2021-10-28 22:20:35 -07:00
Moe e34679aa92 Fix Event Filter Handling 2021-10-28 21:00:52 -07:00
Ian Rubado 1578300225 Logic fix for object detection and motion. Allows for motion first to work with yes and no.
Logic fix for object detection and motion. Allows for motion first to work with yes and no.
2021-10-28 15:37:15 -04:00
Moe 339fc6a425 monitor debug info in console log requires config.debugLogMonitors = true now 2021-10-27 10:16:41 -07:00
Moe 5abcbcb3b4 fix SQL query limit when set to "0" (no limit) 2021-10-27 10:15:32 -07:00
Moe 72da06a78f Show Number of Events for last 24 hours 2021-10-27 10:14:24 -07:00
Moe 42ff7e6d8d fix language selection 2021-10-24 16:34:31 -07:00
Moe 8dbfce7e28 minor cleanup 2021-10-23 17:28:26 -07:00
Moe 4c3947d9a8 Add Global Webhook Notifications (will replace Monitor settings based in future) 2021-10-23 17:27:45 -07:00
Moe 105afb7a6e allow better setting logo from configuration 2021-10-20 17:16:57 -07:00
Moe cde8b7b0bd fix filtered event starting record on monitor 2021-10-19 19:39:28 -07:00
Moe df74cef008 get snapshot from ONVIF if initialized
+ minor cleaning
2021-10-17 22:04:21 -07:00
Moe e89ad75f71 add stimeout to snapshot ffmpeg command 2021-10-16 15:46:13 -07:00
Moe eae45a1ae7 allow choosing which page blocks load to dashboard 2021-10-15 21:21:37 -07:00
Moe 5a99599bf7 Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2021-10-15 13:43:10 -07:00
Moe dc3f94e37c allow swapping pam-diff engine 2021-10-15 13:43:00 -07:00
Jarrod Connolly 0ac6d371e7 delete messages were emitting to wrong childnode 2021-10-15 10:10:29 +08:00
Jarrod Connolly 35e339761f fix master failing to write as dir not existing 2021-10-15 10:05:38 +08:00
Jarrod Connolly 459dc73394 ensure camera stream dir exists on master 2021-10-15 09:58:17 +08:00
Moe 139223f750 Render Home page and SideMenu from definitions/en_CA.js 2021-10-07 21:49:34 -07:00
Moe 569545fbfd fix for issue #339 2021-10-03 13:04:34 -07:00
Moe 12d04b9bee put autoPtz in after event is validated 2021-09-30 15:49:34 -07:00
Moe b922258a13 fix catching detector events when many posts happen simultaneously 2021-09-27 20:08:18 -07:00
Moe 4f5b255d63 remove some console.logs 2021-09-24 21:39:02 -07:00
Moe e0de64609d substream operation clean ups 2021-09-24 21:37:56 -07:00
Moe daa8f12e95 substream keep alive, cleaning livegrid, substream options in mon settings 2021-09-24 00:06:48 -07:00
Moe 4950dd5841 Merge branch 'dynamic-substream' into dashboard-v3 2021-09-23 12:34:28 -07:00
Moe 950cfbc53c substream display in UI and auto switch when substream toggled 2021-09-22 21:13:22 -07:00
Moe 638fa438c5 Merge branch 'dev' into dashboard-v3 2021-09-22 12:33:49 -07:00
Moe 0452eb02cb framework to spawn substream process
- currently no UI handler
2021-09-20 21:58:26 -07:00
Moe 15954f8b76 remove null matrices from end result 2021-09-15 13:52:34 -07:00
Moe a7c168a73d minor cleanup 2021-09-13 08:03:35 -07:00
Moe f0c00b3def update checking for event handoff to be part of event trigger
originally it was necessary the initiator of the trigger would provide this flag but it is now checked during the event trigger for all events.
2021-09-12 12:05:59 -07:00
Moe 3499c42e21 allow multiple ptz tracking target names separated by comma 2021-09-12 10:12:48 -07:00
Moe af8f41dd10 background image on login page 2021-09-03 19:05:32 -07:00
Moe 02270b4ca4 redesigned login page 2021-09-02 21:45:35 -07:00
Moe 06d8976749 minor cleanup
- fix Retry Connection field visibility
- docker readme update
2021-09-02 17:51:36 -07:00
Moe 11dc044ac7 allow dynamic data instead of only trigger data from monitor daemon 2021-08-31 17:03:18 -07:00
Moe dfc747d6ce clean up and better performance 2021-08-28 19:39:11 -07:00
Moe 99a3b1aeed add config.monitorDetectorDaemonPath to change cameraThread/detector.js 2021-08-28 11:21:44 -07:00
Moe cdfe5b4643 move all functions and parameters to detectorUtils.js
- this change will make it easier to make modified engines around the motion detector
2021-08-28 11:05:59 -07:00
Moe 4defe6e26b rewrite cameraThread/detector.js : cleanup 2021-08-26 21:37:10 -07:00
Moe d1a469f5ad Update detector.js 2021-08-26 18:48:03 -07:00
Moe 8f7b6d54ba 99% complete rewrite to cameraThread/detector.js 2021-08-26 18:46:31 -07:00
Moe e15e01fea0 make cameraThread/singleCamera.js daemon path configurable 2021-08-26 12:51:05 -07:00
Moe 38807bf3c9 partial rewrite to cameraThread/detector.js 2021-08-26 12:50:35 -07:00
Moe 9969f33d57 add s.onUserLog event handler 2021-08-17 20:43:51 -07:00
Malte Hillmann c4b04da3c5 Merge branch 'technokami-dev-patch-94374' into 'dev'
Technokami dev patch 94374

See merge request malte.hillmann/Shinobi!1
2021-08-03 12:46:40 +00:00
Moe 4ec4091924 Fix Zombie Processes+ 2021-08-02 10:04:24 -07:00
Moe 916fb7b8cf Fix Zombie Processes 2021-08-02 09:31:02 -07:00
Malte Hillmann 6e39210316 Added Pushover notifications 2021-07-18 19:36:09 +00:00
Moe 4638ee66a0 add toggle for Snapshot type in Notifications section 2021-07-02 19:39:57 -07:00
Moe ddb814aeaa Make Notification Video Length apply to new video extract method 2021-06-21 16:52:07 -07:00
Moe d168da0d1e fix docker config save, add customAutoLoad superRawJs 2021-06-21 13:06:39 -07:00
Moe 482272f8c2 fix a typo + whitespace 2021-06-17 13:26:48 -07:00
Moe 374225de4c Merge branch 'dev' into 'dashboard-v3'
Update dashboard-v3 with latest dev backend changes

See merge request Shinobi-Systems/Shinobi!314
2021-06-14 23:29:28 +00:00
Moe 4c43e1e835 fix Cannot read property 'eventBasedRecording' of undefined+ 2021-06-14 11:28:27 -07:00
Moe cfc39dc95c fix Cannot read property 'eventBasedRecording' of undefined 2021-06-14 11:27:15 -07:00
Moe 7de8363a59 fix wallclock timestamp toggler 2021-06-09 12:58:11 -07:00
Moe ccaff73e01 Fix saving Subscription Key in first login 2021-06-09 12:52:34 -07:00
Moe 985971da0f Merge branch 'dev' into 'dashboard-v3'
Over 9001

See merge request Shinobi-Systems/Shinobi!311
2021-06-08 19:13:32 +00:00
Moe 1e5ea4b3e9 make event video notification use last recorded video made by event 2021-06-02 13:11:36 -07:00
Moe a014b90a9a Dashboard V3 Integration begins 🎊 2021-06-01 20:19:22 -07:00
Moe 1cbffe87ac Minor cleaning for discordBot.js 2021-05-31 10:52:18 -07:00
Moe ee455f009e Point node-ssh at git repo because npmjs version is broken
+ fix sftp always enabling even if disabled
2021-05-31 10:51:41 -07:00
Moe 40c8ece611 make "Unexpected Exit" description more elaborate 2021-05-26 13:22:07 -07:00
Moe 695301cbfd minor cleaning and catcher for monitor spawn failure 2021-05-23 13:40:29 -07:00
Moe b316ddf893 ffbinaries download ffmpeg 4.2 instead of 3.4 2021-05-22 10:48:58 -07:00
Moe 7a8d0e7dca minor cleaning 2021-05-22 09:25:29 -07:00
Moe 20598d36b0 Add onSubscriptionCheck extender, minor adjustment to plugin loader 2021-05-22 09:24:51 -07:00
Moe e5bdfe7497 make snapshot acquired by worker instead of spawn 2021-05-22 09:23:48 -07:00
Moe 054fa039fd customAutoLoad display loading modules in debugLog 2021-05-22 09:23:07 -07:00
Moe 8ccd07cf06 Update Face Plugin Installer 2021-05-22 09:22:44 -07:00
Moe 63c71d914b Force each Event Frame saved to be at least 1 second apart 2021-05-20 19:10:31 -07:00
Moe ff442ace9f Easy Activation Prompt in Superuser Panel 2021-05-20 19:09:33 -07:00
Moe f9c41c4fc7 Allow plugin to send frame back to be re-used for save or notification 2021-05-19 20:18:19 -07:00
Moe d219b0979f Add date to Uncaught Exceptions 2021-05-19 07:39:37 -07:00
Moe 6666db6364 Dashboard 3 adjustments + cleanup 2021-05-18 23:09:04 -07:00
Moe a0119e7c55 Update socketio.js 2021-05-18 12:30:52 -07:00
Moe 268baf371d Update detector.js 2021-05-18 00:03:41 -07:00
Moe 7dbcaa0443 add minimum confidence check when receiving trigger from pam 2021-05-18 00:02:13 -07:00
Moe c9659cf963 Update utils.js 2021-05-04 16:38:38 -07:00
Moe 023717602f Add Monitor Status Codes+ 2021-05-04 16:38:34 -07:00
Moe 81f55c4214 Update monitor.js 2021-05-04 16:24:23 -07:00
Moe 97089f29b8 Add Monitor Status Codes 2021-05-04 16:24:08 -07:00
Moe 5d672c240b monitorId update in onDetectorJpegOutputSecondary 2021-05-03 18:50:30 -07:00
Moe 3e81485d43 Fix SFTP Upload and Update package.json 2021-05-03 18:49:17 -07:00
Moe 496504282b Force P2P connection to reinit every 15 minutes 2021-04-29 17:59:05 -07:00
Moe 4bb8738a87 fix Object Detection > Check for Motion first 2021-04-29 17:58:28 -07:00
Moe 14bb429c54 load DiscordBot UI fields dynamically 2021-04-29 17:54:11 -07:00
Moe 9f4b1934b9 update discord fields to be created dynamically 2021-04-27 11:37:19 -07:00
Moe ff60df27d4 ffmpeg.js : change crf to q:v 2021-04-27 08:28:59 -07:00
Moe b8f66b2786 Add Telegram Notifications+ 2021-04-26 23:11:43 -07:00
Moe 87650716cc Add Telegram Notifications 2021-04-26 23:02:26 -07:00
ecarjat c1e5c5f006 charset and collate are only allowed for mysql 2021-04-25 13:39:59 +00:00
Moe 92d14c1072 FIx ER_TOO_LONG_KEY: LoginTokens table 2021-04-22 09:42:26 -07:00
Moe 7bd51122b5 fix basic Control request missing query string 2021-04-17 10:27:44 -07:00
Moe 9238679119 Fix Sub-Account being created as Admin account 2021-04-17 10:04:27 -07:00
Moe 25c4b9d085 minor cleanup 2021-04-17 10:04:08 -07:00
Moe 4f985bd52e Add second Vancouver P2P server 2021-04-13 20:49:26 -07:00
Moe 6987ca20f4 make motion detection show pam-diff bounding boxes 2021-04-09 14:18:56 -07:00
Moe a47b40444e Object Detect for 5 seconds instead of 1 frame when check Motion first 2021-04-09 14:10:31 -07:00
Moe 04ec802951 fix detector fps when using motion first for object detect 2021-04-09 12:08:37 -07:00
Moe 56d15a179a Merge branch 'ldap-auth-update' into 'dev'
Update LDAP to use Alternate Login System

See merge request Shinobi-Systems/Shinobi!298
2021-04-08 03:49:47 +00:00
Moe 226c41c727 Fix backblaze init when disabled 2021-04-07 19:06:06 -07:00
Moe 1d6ae4e5d9 update Settings Window Builder, cleanup LDAP presentation 2021-04-07 19:03:24 -07:00
Moe 268ce83784 update ldap account linking to use Alternate Login system 2021-04-06 20:55:16 -07:00
Moe feee34a074 Add System Information to Superuser UI 2021-04-05 14:13:20 -07:00
Moe 3401a6bec9 Fix Monitor Config Field Updater, Fix duplicated flags in detector output 2021-04-05 12:41:56 -07:00
Moe 0a95ca2b02 Update alternateLogins.js 2021-04-04 21:21:59 -07:00
Moe 9a68b24136 rename param for google app id 2021-04-04 11:37:20 -07:00
Moe 8609ce959e Fix Google App ID designation, add Name to LoginTokens
+ Show Last Login for LoginTokens in Settings window
2021-04-04 10:35:09 -07:00
Moe 9282a19331 Add Linking and Unlinking Google Sign-In from Alt Logins section 2021-04-03 23:53:38 -07:00
Moe 2cb3d8c9a2 Add Alternate Logins section in Settings, Minor Cleanup
+ Login Token API Endpoints for : get single, get all, delete by loginId
+ framework.sql update
+ update auto table creation for existing installations
+ fail message specific to alternateLogin can be passed to UI
+ add type column to LoginTokens table, default is "google" because its the only one (first of many to come)
2021-04-03 21:46:58 -07:00
Moe c0042c9a36 clean up google login script 2021-04-03 17:19:20 -07:00
Moe 325d56edc5 make LoginTokens designated by prefix name 2021-04-03 14:27:08 -07:00
Moe 8249a9d74b allow binding google auth with login screen 2021-04-03 14:16:15 -07:00
Moe faf3e3b221 require enabling Google Sign-In from conf.json 2021-04-03 10:01:10 -07:00
Moe 74f9f28070 add LoginTokens table creation (for existing installs being updated) 2021-04-03 09:48:00 -07:00
Moe adf3d1c8e9 alternate login engine, add google sign-in 2021-04-02 22:14:34 -07:00
Moe 62177e886d partial rewrite for login post handler
+ make streamer and dashcam get monitors list from API rather than page write
2021-04-02 18:23:21 -07:00
Moe e9ee4aca8b add get for conf.json by api and make config update POST only 2021-04-01 22:41:39 -07:00
Moe aa4192b6fe rewrite superLogin for initial login, create base for other login types 2021-04-01 22:40:37 -07:00
Moe 2ae9bcaaf0 make Super page use API to get Admin list and System Logs 2021-04-01 15:49:35 -07:00
Moe ee45ef3f1a fix Super Log API endpoint 2021-04-01 15:44:32 -07:00
Moe c20cf9113a google login test framework 2021-03-31 23:03:34 -07:00
Moe 40d172e52c Fix Reolink RTMP restart bug, fix undefined codec array 2021-03-31 11:01:05 -07:00
Moe ad27f9ee2f fix detector buffer custom flag build 2021-03-29 12:06:33 -07:00
Moe f4d00ba6cd Default failed addStorage detection to null 2021-03-29 11:37:13 -07:00
Nunya Bidnezz 471d81e501 Enable PASV mode support for the FTP server. Some cheap Dahua imports require PASV mode when sending FTP event notifications. 2021-03-28 13:04:42 -05:00
Moe 91702d4d3c fix addEventDetailsToString undefined 2021-03-27 13:04:01 -07:00
Moe af69666d8b send headers in P2P bridges as well 2021-03-27 06:56:32 -07:00
Moe 880f8e6350 error catching parse for db row details parsing 2021-03-27 06:56:00 -07:00
Moe Alam 1ef74e5201 fix checking matrix in region 2021-02-27 08:39:17 -08:00
Moe Alam 36dc9f932d Fix Superuser Penetration Bug (properly) 2021-02-19 07:25:36 -08:00
Moe Alam 43889776b9 Fix Superuser Penetration Bug 2021-02-19 07:02:54 -08:00
Moe a8a7f0d991 Merge branch 'cron.js-update' into 'dev'
cron.js update

See merge request Shinobi-Systems/Shinobi!249
2021-02-12 19:13:49 +00:00
Moe Alam d991516ddf Fix frame deletion (allow row delete if file does not exist) 2021-02-11 09:45:05 -08:00
Moe Alam a425701e29 API Keys Manager : clean up interface layout 2021-02-08 20:45:35 -08:00
Moe Alam 4ac4c60d18 API Key Manager : clean up code and some fixes 2021-02-08 09:43:46 -08:00
Moe Alam 1ac929fb82 disable old admin page 2021-02-07 13:46:23 -08:00
Moe Alam 94a51ad17b Sub-Account Manager : cleanup 2021-02-07 13:34:48 -08:00
Moe Alam f18b184dca Sub-Account Manager : saving, editing, and create new working 2021-02-07 12:03:17 -08:00
Moe Alam 7277e802b6 Sub-Account Manager : begin rewrite (the move from /admin to /) 2021-02-06 20:45:26 -08:00
Moe Alam a66492b871 cron.js updates storage used when deleteOldVideos 2021-02-05 19:13:12 -08:00
Moe Alam bf1d78235b make all deleteOldVideos actions occur in cron.js, promisify cron funcs 2021-02-05 17:36:10 -08:00
Moe 3a4a405e1c Merge branch 'dev' into 'cron.js-update'
# Conflicts:
#   cron.js
2021-02-05 16:16:07 +00:00
Moe Alam a3cfae7b4d fix discord notification lock 2021-01-30 15:04:26 -08:00
Moe Alam 102aaaa7c7 PTZ : Fix Turn Speed 2021-01-30 11:02:13 -08:00
Moe Alam 80a4a9dcd0 fix motion mask use 2021-01-30 10:38:50 -08:00
Moe Alam b3c72b2ef0 Fix Timelapse Max Storage Share default amount 2021-01-30 07:33:19 -08:00
Moe Alam dd733b0cb7 fix JPEG API/Mode 2021-01-30 06:37:36 -08:00
Moe Alam 804de123d7 Fix Sub Account Settings Save
- prevent sub account from transforming into admin account.
2021-01-30 06:26:00 -08:00
Moe Alam a92fdea98a fix event-based recording audio codec "auto" option 2021-01-27 08:21:44 -08:00
Moe Alam 91e5ce24fd cleanup orphaned video scanner+ 2021-01-26 10:49:51 -08:00
Moe Alam 5b63671794 cleanup orphaned video scanner 2021-01-25 18:55:59 -08:00
Moe Alam 06231dde61 Add Inverse Triggering for Regions (Motion Detection only) 2021-01-25 16:11:37 -08:00
Moe fda036f8a3 Merge branch 'plugin-manager-ui' into 'dev'
Plugin Manager UI

See merge request Shinobi-Systems/Shinobi!274
2021-01-22 03:15:27 +00:00
Moe Alam 18f4bb295e Plugin Manager : allow cancelling install processes 2021-01-21 08:32:08 -08:00
Moe Alam f9c80277d9 Plugin Manager : add configuration editor 2021-01-21 08:00:52 -08:00
Moe Alam 88d5bb3479 Plugin Manager : allow interacting with Installer from UI 2021-01-21 05:50:46 -08:00
Moe Alam ff452e5b2e create pluginWorkerBase to be used with plugins running as Workers 2021-01-20 19:00:45 -08:00
Moe Alam 51f5c08f35 fix undefined response for unauthorized websocket request 2021-01-20 07:23:31 -08:00
Moe Alam e352cd71cd use `find` command instead of `fs.readdir` for orphanVideoCheck+ 2021-01-19 20:52:16 -08:00
Moe Alam 971719dbe3 use `find` command instead of `fs.readdir` for orphanVideoCheck 2021-01-19 20:51:39 -08:00
Moe Alam 6d56243791 allow hotloading for certain plugins 2021-01-19 10:15:38 -08:00
Moe Alam 599ec9c8c1 remove `+frag_keyframe+empty_moov` from recorded videos 2021-01-19 09:41:11 -08:00
Moe Alam d5b82ec305 disable hotloading plugins from superuser 2021-01-19 09:07:06 -08:00
Moe Alam 69dc2191d7 allow enable and disable of plugins as workers 2021-01-19 09:04:07 -08:00
Moe Alam 59b810fac6 Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2021-01-18 19:23:57 -08:00
Moe Alam 49ae947a97 @Zikeji fix for Digest Auth with PTZ 2021-01-18 19:23:28 -08:00
Moe Alam 49d1a1a125 rebuild query string without postData instead of search and replace 2021-01-18 08:03:14 -08:00
Moe 330201d7c4 Merge branch 'reolink-ptz' into 'allow-postData-in-ptz-request'
PTZ POST Changes (for ReoLink Support)

See merge request Shinobi-Systems/Shinobi!270
2021-01-17 17:43:25 +00:00
Moe Alam 4c380b3cb9 Fix events/utils.js filters 2021-01-17 06:38:08 -08:00
Joshua Seltzer be5b9e96ab Updates to refine the POST command processing for PTZ which allows more recent ReoLink cameras to function within Shinobi. 2021-01-16 13:49:45 -05:00
Moe Alam 863acb67b3 set snapshots default size from 200x200 to 500x500 2021-01-11 11:25:25 -08:00
Moe Alam dbfd6616d3 ffmpeg : change recording movflags to its own flag 2021-01-08 15:22:00 -08:00
asmithaxe 623d1c1b19 Add references to method signatures to fix reference errors. 2021-01-07 00:05:36 +10:00
Moe Alam 3b5358890c fix skip_ping 2021-01-05 13:37:53 -08:00
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