ae9cd98636
Manually add changes from !329
...
- Had to manually add them because part of it already existed in the repository in a different method. Portions have been rewritten since as well; which required a manual merge.
2022-08-09 16:33:44 -07:00
5d9db1124b
Merge branch 'dev' into 'cron-as-worker-process'
...
# Conflicts:
# libs/socketio.js
2022-08-09 23:22:54 +00:00
87914222e6
Update socketio.js
2022-08-09 16:19:58 -07:00
55b850c6f7
add basic restrictor for cloud file delete
2022-08-09 08:24:49 -07:00
e3b1a9b4a4
Add getting Cloud Timelapse Frames through API
2022-08-08 15:16:59 -07:00
9f1bbca9b1
Update WebDAV uploader
...
+ timelapse frame uploads
+ proxy video data through Shinobi server on video GET for security and consistency
2022-08-08 10:15:58 -07:00
92ef41401a
Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev
2022-08-08 07:18:23 -07:00
73cc0a0e83
change toggleSubstream permission to view instead of edit
2022-08-08 07:18:17 -07:00
eadeca8753
Merge branch 'fix/api-auth' into 'dev'
...
User details parsing fixed in editSession #362
See merge request Shinobi-Systems/Shinobi!360
2022-08-08 05:07:13 +00:00
cb31a0ee61
Merge branch 'dev' into 'dev'
...
Cleanup and Jquery update
See merge request Shinobi-Systems/Shinobi!376
2022-08-08 03:50:43 +00:00
3b17bc733a
Changed login splash image to a local avif
2022-08-08 12:45:00 +10:00
c3c97ce80b
Merge branch 'fix-sub-account-permissions' into 'dev'
...
Refactor Sub Account Permissions
See merge request Shinobi-Systems/Shinobi!377
2022-08-08 02:12:40 +00:00
428d17cf87
add some UI fixes for displaying Unauthorized features for Sub-Acc
2022-08-07 16:27:03 -07:00
e11edc7c89
cleanup and proxy video data for cloud videos (s3based, amazonS3)
2022-08-07 12:09:28 -07:00
55f2567976
Add Permission checks to Scheduler, Probe, and ONVIF Device Man
2022-08-06 11:18:46 -07:00
4e8300f3f9
Refactor Permission check for Sub-Accounts and API Keys
2022-08-05 23:20:08 -07:00
551834d8d7
update permission check system for Sub-Accounts (replace only some)
2022-07-31 17:58:10 -07:00
18137da4ab
tweak forced disconnection from p2p
2022-07-30 15:09:00 -07:00
575db0f054
fix file deletion when monitor is deleted
2022-07-29 21:22:40 -07:00
d23413f287
Fix request for ShinobiHub Private config auto backup
2022-07-25 12:16:37 -07:00
3787f759b4
Don't allow Max Storage Amount below 0
2022-07-24 07:36:47 -07:00
a0d7112025
make mqtt wait 10 seconds before reconnect
2022-07-24 07:36:15 -07:00
c0452b5416
Update Time lapse Frames Percent Checker
2022-07-24 07:36:04 -07:00
6a7c2ba0b9
Update amazonS3.js
2022-07-24 07:35:25 -07:00
0444dc9889
Make snapshot for Notification come before Video
2022-07-24 07:35:12 -07:00
e6d3f6e0dc
Update Appearance for Super User panel
...
- a Refactor for the actual code may be coming soon, however the goal with this is only to convert the appearance to match the style of Dashboard v3
2022-07-22 22:14:06 -07:00
bde04877b5
Allow adjusting Event-Based Recording Analyze Duration and Probe
2022-07-21 18:58:18 -07:00
5963d8c759
Add more buffer to insert time for Event-Based Video
2022-07-21 18:55:33 -07:00
d43767c2ae
Fix getting Cloud Uploaded Videos through Shinobi API
2022-07-20 12:13:36 -07:00
fd4cfa207c
Fix recording audio for Event-Based Recording
2022-07-19 22:15:01 -07:00
f0a317fb7c
Add credentials to snapshots for cameras that need it
2022-07-19 13:24:48 -07:00
0dbe456e5e
catch when activeMonitor details fails to propagate before merge
2022-07-18 22:56:23 -07:00
17e7fdc15a
Add Accuracy Mode for Motion Detection
2022-07-17 23:48:10 -07:00
9abe25fc02
Merge branch 'bugfix/memory-reports' into 'dev'
...
Fix issues of wrong CPU report on macOS and wrong memory on non-linux systems
See merge request Shinobi-Systems/Shinobi!366
2022-07-15 05:05:57 +00:00
dba7c78272
Merge branch 'dev' into 'dev'
...
proc and proc.stdin check
See merge request Shinobi-Systems/Shinobi!368
2022-07-14 05:41:34 +00:00
36fbf5621c
check proc and stdin support
2022-07-13 16:30:25 +00:00
dfb275cd2f
Fix CPU usage on macos
2022-07-10 21:09:17 -03:00
204169030a
Fix memory usage report on non-linux systems
2022-07-10 19:17:13 -03:00
8a27126c8b
update ONVIF Events toggle position to Detector Settings
...
- Only show if Detector Settings and ONVIF are enabled
2022-07-08 20:48:02 -07:00
85ab76178f
Add Fix button to reprocess Videos from Videos Table
...
- This is for when a video has become corrupt and you want to attempt making it playable with the content it has.
+ move stitchMp4Files function
2022-07-07 15:53:46 -07:00
87867373a5
disallow Timelapse video build without a Monitor ID
2022-07-07 12:33:19 -07:00
a6c8595550
Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev
2022-07-07 09:58:20 -07:00
a1eeed4a4d
Setup Websocket Callback+
2022-07-07 09:56:55 -07:00
d9f26a22cc
Merge branch 'ssanri-master-patch-59109' into 'dev'
...
fix for error reported in scheduler when there are no scheduled events in database
See merge request Shinobi-Systems/Shinobi!365
2022-07-07 14:55:59 +00:00
267cd88500
fix for
...
```
0|camera | knexError----------------------------------- END
0|camera | TypeError: Cannot read properties of undefined (reading 'forEach')
0|camera | at /home/Shinobi/libs/scheduler.js:11:18
0|camera | at /home/Shinobi/libs/database/utils.js:159:33
0|camera | at __node_internal_ (node:util:281:10)
0|camera | at processTicksAndRejections (node:internal/process/task_queues:83:21)
0|camera | Uncaught Exception occured! Wed Jul 06 2022 03:58:06 GMT+0000 (Coordinated Universal Time)
```
2022-07-07 04:50:10 +00:00
4a3eec7429
Setup Websocket Callback
2022-07-06 21:24:24 -07:00
9d7035bffa
Make searching videos by object tag draw in reverse order
2022-07-06 17:22:16 -07:00
450b7ab855
Option to Search for videos by Object Tag
...
this feature will only work on detections and recordings made after this update is applied. Previous detections are not searchable in this way.
2022-07-05 21:59:37 -07:00
a4c5a0d58a
Daily Timelapse builder only do one build at a time
2022-07-05 19:25:30 -07:00
83750bb20e
add timelapseVideoBuild to Websocket API
2022-07-04 20:29:26 -07:00
62d7b8d7f0
Fix onOtherWebSocketMessagesExtensions exec placement
2022-07-04 20:24:00 -07:00
6a6deb4fdc
Cleanup PTZ Refactor+
2022-07-03 22:37:20 -07:00
70c0d1a19a
Cleanup PTZ Refactor
2022-07-03 21:08:32 -07:00
330c4db114
Syntax fixes
2022-07-03 14:52:30 -07:00
afc598e2a2
Fix onHttpRequestUpgrade Extender
2022-07-03 14:09:56 -07:00
87623c1ded
Refactor Extensions initiator
2022-07-03 13:50:53 -07:00
364822f3a4
Lightly Refactor PTZ controls, Add PTZ Hold to move and release to stop
2022-07-03 13:50:16 -07:00
0ae6bc8419
Rename Traditional Recording to Event-Based Recording, +
...
+ Re-arrange some fields and make them only show when advanced is toggled on in the Monitor Settings
+ removal of some unused fields
2022-06-30 21:16:32 -07:00
344fa858c9
Remove HLS List Size in favor of Buffer Time from Event
...
monitorConfig.details.detector_buffer_hls_list_size is now deprecated. It will be automatically calculated based on the Buffer Time from Event that is provided.
2022-06-30 18:07:40 -07:00
e1d83e7c14
Make cron.js a worker process of camera.js
...
Old connection of cron.js to camera.js through socket.io has been disabled. Old cron.js file has been disabled. File will remain to keep old systems from having looping errors, the file will just post a notice.
2022-06-29 12:29:20 -07:00
508ae263b9
Remove /admin operation
2022-06-29 00:12:43 -07:00
36819d4cdf
set default server ports for p2p and minor cleanup
2022-06-28 19:55:50 -07:00
4ca6f59986
Remove /admin operation
...
all Sub-Account Management is done in the main dashboard now.
2022-06-28 19:54:25 -07:00
1f238d2175
Speed up video play for FileBin video files
2022-06-27 15:04:14 -07:00
9711472dda
add quick play to built timelapse video, further cleanup
2022-06-27 15:03:55 -07:00
c95fa80e0d
Delete Timelapse Date Folder on last existing frame of folder
2022-06-27 13:21:51 -07:00
a088e85a71
Update utils.js
2022-06-27 13:20:35 -07:00
a63e015cd1
clean up fileBin max space cleaner+
2022-06-27 13:20:30 -07:00
93256f2917
clean up fileBin max space cleaner
2022-06-27 13:17:56 -07:00
a8fc50efb9
Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev
2022-06-27 00:42:07 -07:00
aac82bff63
Fix Timelapse Video download when File Already Exists
2022-06-27 00:41:57 -07:00
ee556be4ef
Fix broken Timelapse Video Build if too many frames
2022-06-27 00:30:22 -07:00
8045c8fc8d
Merge branch 'fix/auth-failure' into 'dev'
...
Fix auth response when no credentials supplied
See merge request Shinobi-Systems/Shinobi!361
2022-06-26 19:03:25 +00:00
4316a4a4d2
Fix auth response when no credentials supplied
2022-06-26 14:05:48 +03:00
7483ee0226
User details parsing fixed in editSession #362
2022-06-26 13:35:07 +03:00
8f0f7f0d3e
Add FileBin list viewer
2022-06-26 00:57:18 -07:00
137770b891
Update Timelapse Video Build and Download
2022-06-26 00:56:15 -07:00
a3b23e7633
P2P v2 is now default engine for Easy Remote Access
2022-06-23 16:38:25 -07:00
96c69c12c9
more stable p2p v2 connection to server
2022-06-23 16:36:13 -07:00
dee1cb27fa
p2p reconnection only use readyState check and heartbeat check
2022-06-23 15:57:39 -07:00
52d1331d4c
Update customAutoLoad.js
2022-06-23 14:28:40 -07:00
c4632a0564
more stable p2p v2 connection to server+
2022-06-22 23:55:04 -07:00
7cebb5eafc
more stable p2p v2 connection to server
2022-06-22 17:59:22 -07:00
fe5a0b4045
more stable p2p v2 connection to server++
2022-06-22 16:13:15 -07:00
2f6f3c232d
more stable p2p v2 connection to server+
2022-06-21 17:32:00 -07:00
68225a63b1
more stable p2p v2 connection to server
2022-06-21 17:31:31 -07:00
ff5c7b7f4b
add notice for failed license check to p2p server
2022-06-20 22:42:13 -07:00
821b547b89
update notices for customAutoLoad modules
2022-06-20 22:41:55 -07:00
562893ef6c
Add Z-Wave API Control through Shinobi
2022-06-17 00:29:57 -07:00
0c55a4d012
ONVIF Events
2022-06-16 23:23:12 -07:00
11c69d56ce
reload language and definitions when a customAutoLoad module loads+
2022-06-07 17:40:53 -07:00
a8c9309f00
Easy Remote Access shows servers based config.useBetterP2P flag
2022-06-07 16:47:28 -07:00
8d042552c7
reload language and definitions when a customAutoLoad module loads
2022-06-07 16:46:36 -07:00
3d3d864835
Update mqtt.js
2022-06-07 16:45:55 -07:00
f70305114f
fix syntax error in mqtt Client start
2022-06-06 13:58:31 -07:00
a63e08f48e
add Username and Password fields to MQTT Outbound
2022-06-06 13:32:58 -07:00
084382882c
Merge branch 'dashboard-v3' of https://gitlab.com/Shinobi-Systems/Shinobi into dashboard-v3
2022-06-04 11:42:39 -07:00
d28385e4ee
Update telegram.js
2022-06-04 11:39:41 -07:00
f2eb3b0fca
Merge branch 'ssanri-dashboard-v3-patch-76414' into 'dashboard-v3'
...
Sercom ICamera1000 fails to store http trigger url when json provided.
See merge request Shinobi-Systems/Shinobi!358
2022-06-04 18:30:18 +00:00
4fe690075a
Update detectorUtils.js
2022-05-24 21:56:14 -07:00
c16a2c7812
Force P2P Reconnect on any error
2022-05-21 07:17:20 -07:00
304e3d0280
fix updating Email address for Sub-Account
2022-05-16 13:40:42 -07:00
31878b342e
fix getting video in notification from Event Based Recording
2022-05-15 11:10:53 -07:00
1c547640e6
P2P : add heartbeat check
2022-05-10 19:07:16 -07:00
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
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
d5f85ec7b3
make monitor process log to original stderr instead of dataPort
2022-05-02 13:23:56 -07:00
748b3cf88a
Update language loader, minor cleanup
2022-05-02 13:12:42 -07:00
576354901d
minor fixes to monitorListOrder filter
2022-04-30 19:22:36 -07:00
efe9d7c093
Fix Language Modifier and rename definitions framework
2022-04-30 13:15:26 -07:00
a7c707980b
add discont_start for low bandwidth clients viewing hls
2022-04-29 10:48:11 -07:00
45756b3e64
Add Heartbeat and "Authenticated" notice, minor rearrange
2022-04-28 22:04:32 -07:00
c63f6bb62e
Make P2P wait for readyState on connect
2022-04-28 08:24:38 -07:00
6a0b4577c6
fix signal checker
2022-04-27 10:09:52 -07:00
b2ad513bd9
fix missing outboundMessage definition
2022-04-26 07:32:19 -07:00
bc6d446cf7
more package updates
...
+ googleapis
+ ldapauth-fork
2022-03-31 22:04:16 -07:00
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
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
1281bdb7fc
fix relative video pathing
2022-03-28 21:14:56 -07:00
25fddb7ba5
Better P2P (Easy Remote Access v2)+
2022-03-28 17:48:08 -07:00
c28b246ac4
Better P2P (Easy Remote Access v2)
2022-03-28 16:02:05 -07:00
500bd51679
let Shinobi manage P2P reconnection
2022-03-21 11:19:05 -07:00
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
fea94476e3
Add missing SQL column in cloud timelapse frames table insert for s3 based upload
2022-02-22 13:42:26 +01:00
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
b894c1c7eb
fix side monitor list order
2022-02-12 21:42:11 -08:00
0ae2c135c5
`statisUsers` parameter in conf.json creates users
2022-02-12 16:38:21 -08:00
a03c158480
add "superUserLoginDisabled" parameter to allow disabling use of super user
2022-02-12 14:15:56 -08:00
eb0e93e5d2
allow creating admin users from conf.json
2022-02-12 14:14:16 -08:00
eeda089276
Email Notification settings are now configurable in Account Settings+
2022-02-10 11:14:03 -08:00
40804fa650
Remove statically set probesize and analyzeduration
2022-02-08 10:07:16 +01:00
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
cefe3eeb0d
Update libs/ffmpeg/builders.js
2022-01-30 02:09:58 +00:00
2f2e64a55c
fixed issue 359
2022-01-29 08:47:25 +00:00
894e07fc38
update PASV options for FTP dropInEvent Server
2022-01-26 11:45:15 -08:00
d2d46f0795
run finalize action on event based recording on exit of record process
2022-01-20 13:02:36 -08:00
e6e9060de4
run finalize action on timelapse video build on exit of build process
2022-01-20 13:01:59 -08:00
a7fb7b33ea
fix event save on child node, fix command filter condition, add SideMenuAfterList
2022-01-12 10:41:23 -08:00
6d0d606ad5
add "Not Authorized" notice to Backblaze Uploader
2021-12-25 16:08:50 -08:00
e4b7098386
remove packet limit on child node file transfer
2021-12-23 08:55:15 -08:00
3e3e2f6b58
better dataPort security
2021-12-21 12:03:56 -08:00
82eb83df71
fix onvif scanner result draw
2021-12-19 12:32:44 -08:00
372100f07e
fix ffmpeg.js
2021-12-19 07:39:44 -08:00
41037abaf9
Merge branch 'dashboard-v3' into 'data-port'
...
# Conflicts:
# libs/ffmpeg.js
2021-12-19 15:17:13 +00:00
12e7a921b2
allow noLimit queries on videos, events, and timelapse frames
2021-12-17 09:50:35 -08:00
b1278a191c
Update ffmpeg.js
2021-12-09 16:08:26 -08:00
f06e9f28b9
adjustments to timelapse transfer from child
2021-12-09 15:29:48 -08:00
769f0ab8c6
fix fatalError trigger on monitor processes
2021-12-09 08:22:44 -08:00
c945d53d9f
tweak auto-closing of Substreams+
2021-12-08 07:41:32 -08:00
3f23502214
start rebuilding email notifications to be configured from user account (not active yet)
2021-12-07 21:56:41 -08:00
4af73b062d
tweak auto-closing of Substreams
2021-12-07 21:55:01 -08:00
494bed8d25
fix timelapse video build+
2021-12-06 22:35:19 -08:00
810e0aca19
fix timelapse video build
2021-12-06 20:25:55 -08:00
3cf38a7843
Substream can now be used for On-Demand Live Stream on Dashboard
2021-12-06 15:45:25 -08:00
5204df7a40
video delete remove UI elements fix
2021-12-05 12:23:51 -08:00
4bb4828acf
Add Substream Default values and some validation for startup
2021-12-04 21:59:26 -08:00
6b3804a5b4
Add Dynamic Substream Toggle button
2021-12-04 19:49:25 -08:00
988ba75b45
properly get snap from ONVIF device when available
2021-12-04 19:11:18 -08:00
7b6c939de0
fix event based recording... oof
2021-12-03 17:52:40 -08:00
80f5225191
remove frame limit on timelapse frame retrieval
2021-12-03 10:20:56 -08:00
4b418ed8a3
fix managing addStorage
2021-11-30 08:24:36 -08:00
a2faa40ab0
fix managing addStorage
2021-11-30 08:24:25 -08:00
b4c886c16a
fix managing addStorage
2021-11-30 08:23:50 -08:00
02b8546940
clean up scanForOrphanedVideos execution for childNode
2021-11-30 08:08:07 -08:00
9d1f7e0991
disable scanForOrphanedVideos on child node completely
2021-11-29 21:14:57 -08:00
2084b0b8c8
fix Sub Account Manager Edit new account before page refresh and delete
2021-11-29 17:46:55 -08:00
8bcf65f64d
Merge branch 'dev' into 'dashboard-v3'
...
# Conflicts:
# cron.js
2021-11-30 00:06:51 +00:00
26572e480b
fix cron addStorage calculation
2021-11-29 13:56:26 -08:00
1fc0c1d03e
disengage "masterSaysToStop"
2021-11-29 09:32:08 -08:00
fa13e70562
Child Node Framework Update : fix disconnected child recovery
2021-11-28 11:06:01 -08:00
d6d9d4fb05
Child Node Framework Update : syntax fixes+++
2021-11-28 09:21:15 -08:00
9a018400b5
update Child Node selection formula+
2021-11-27 16:43:42 -08:00
bb5612ac7a
remove some old Child Node code from videos.js
2021-11-27 15:53:38 -08:00
fa3040504a
Child Node : Stop looping FFmpeg process if Disabled during Restart/Crash
2021-11-27 15:53:20 -08:00
77ac7c6192
update Child Node selection formula
2021-11-27 15:46:54 -08:00
f51f623a75
Child Node Framework : minor cleanup
2021-11-27 07:13:10 -08:00
06908c4e0f
Child Node Framework : allow using Master Node for Processing
2021-11-26 21:22:49 -08:00
3f20721dc9
Child Node Framework : cleanup node selection operation
2021-11-26 20:53:06 -08:00
d20297429a
Child Node Framework Update : Child Node continuously attempt reconnect to Master Node
2021-11-26 19:48:59 -08:00
2a53d77cad
Child Node Framework Update : fix double insert video
2021-11-26 19:42:59 -08:00
5caa08aba1
Child Node Framework Update : clean up+
2021-11-26 19:42:23 -08:00
a907887f8c
Child Node Framework Update : clean up
2021-11-26 17:56:29 -08:00
ffbfd57f27
Child Node use plain buffer data for timelapse frame transfer to Master Node
2021-11-26 17:47:20 -08:00
a717084e7d
Child Node use plain buffer data for video transfer to Master Node
2021-11-26 14:54:04 -08:00
6ec1fcb9fe
Child Node Framework Update : syntax fixes++
2021-11-25 13:05:17 -08:00
7ff0601776
Child Node Framework Update : syntax fixes+
2021-11-25 12:49:35 -08:00
f336bb654a
Child Node Framework Update : syntax fixes
2021-11-25 09:30:23 -08:00
d7409db6f0
Child Node Framework Update
2021-11-25 09:20:50 -08:00
d908ff22d2
Start modifying Child Node connectivity to use Data Port methodology
2021-11-24 23:59:13 -08:00
9784a853ed
prepare cws websocket spawn to be used elsewhere
2021-11-24 15:52:04 -08:00
309abf9758
make http websocket upgrade less hardcoded
2021-11-24 15:40:59 -08:00
440939483b
cleanup cameraThread/dataPortConnection
2021-11-24 13:02:38 -08:00
993636746c
dataPort is now bridge for detector events from cameraThread
2021-11-24 12:30:50 -08:00
c4f78ede6a
fix posting on ONVIF Device Manager Endpoints
2021-11-23 22:56:50 -08:00
0cc3344489
Port over ONVIF Device Manager
2021-11-23 21:05:56 -08:00
9a0b766631
P2P Connection check every 15 minutes if disconnected
2021-11-21 07:39:40 -08:00
9648f8cc60
update P2P Server list for dev branch
2021-11-18 19:48:13 -08:00
8240933437
almost functional dataPort
2021-11-17 12:10:25 -08:00
20aaf85725
Data Port for ease in transferring info between processes
2021-11-16 18:04:35 -08:00
1bc684e627
event filter and mqtt fixes
2021-11-16 18:02:27 -08:00
Moe
Gamertech
Serdar Sanri
Kennedy Oliveira
Oleg Vivtash
Miłosz Tyborowski
kitty99