Commit Graph

589 Commits (f514c8edc8c186be850ca0bca7cadfc223e263e2)

Author SHA1 Message Date
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 303af1771e Merge branch 'undefined' into 'dev'
Czech language initial, updates will follow

See merge request Shinobi-Systems/Shinobi!51
2019-02-22 19:36:17 +00:00
Moe 6ee59e6357 Merge branch 'patch-2' into 'dev'
Update fr.json

See merge request Shinobi-Systems/Shinobi!52
2019-02-22 19:35:28 +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 75f7be4900 Add Automatic SFTP Uploader+ 2019-02-19 19:34:11 -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
Moe 83f08ccb4f chunk video list in `deleteListOfVideos` function
- this will avoid the `ER_LOCK_WAIT_TIMEOUT` error by breaking up the video list into sets of 100 then querying each set as a single query rather the entire video list as a single query.
2019-02-17 11:49:37 -08:00
Moe ac00f22ee8 corn key warning 2019-02-16 20:35:54 -08:00
Moe 05b14b3956 Fix cron.js not connecting to camera.js 2019-02-16 20:11:11 -08:00
Moe 89bbbf4330 Bug Fix for Detector flag building 2019-02-16 14:56:46 -08:00
Moe 322d50d912 Update ffmpeg.js 2019-02-16 12:40:20 -08:00
Jonathan Tran 962924de8a updated addEventDetailsToString to replace event detail tokens 2019-02-15 21:25:59 -08:00
Moe a128f71eb5 capture OpenCL opening for response. 2019-02-15 11:07:57 -08:00
Moe 3503ac1426 Add RTMP Server with Node-Media-Server
- Instead of including the npmjs module; the rtmp portion has been ripped from the main package.
- to enable the RTMP server with default settings just add `"rtmpServer":true` to your conf.json
- `rtmpServer` object in conf.json correlates to `rtmp` object in NodeMediaServer configuration.
- WARNING : currently no authentication for incoming RTMP streams.
2019-02-13 22:29:19 -08:00
Moe bdbf3458b6 Add Wasabi Hot Cloud Storage in cloudUploaders.js 2019-02-04 10:37:22 -08:00
Moe bf7a5d2d83 Add "onMonitorDied" extender 2019-01-31 10:51:35 -08:00
hartigoon1 8811c0bd8b Update fr.json 2019-01-31 02:23:21 +00:00
Jan Švejdík d51c858040 Czech language initial, updates will follow 2019-01-29 23:11:32 +00:00
Moe d35a058412 Merge branch 'fix-delete-video' into 'dev'
Fix href for delete video button

See merge request Shinobi-Systems/Shinobi!50
2019-01-29 19:29:15 +00:00
caedmon 1f09e6afcb Fix href for delete video button 2019-01-29 11:20:55 -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 bbb6ef108a minor cleanup 2019-01-28 12:25:53 -08:00
Moe f9450a58dd Humanize configuring Notification Video Length
- Notification Video Length : The length of the video that gets sent to your Notification service, like Email or Discord.
- New option appears under Recording Timeout.
2019-01-28 12:25:43 -08:00
Moe 8bccd65fa1 Merge branch 'dev' into 'master'
Tabantha Frontier

See merge request Shinobi-Systems/Shinobi!49
2019-01-27 23:22:34 +00:00
Moe 6f47b720b1 Merge branch 'dev' into 'dev'
command killing ffmpeg simplified

See merge request Shinobi-Systems/Shinobi!42
2019-01-27 23:01:02 +00:00
Moe 96d5353864 Merge branch 'patch-1' into 'master'
Update fr.json

See merge request Shinobi-Systems/Shinobi!48
2019-01-27 22:52:56 +00:00
Moe e87f031df0 fix onDetectorNoTriggerTimeoutExtensions bug 2019-01-27 08:53:12 -08:00
Moe a60d9ecd73 update customAutoLoad
- allow addition static files, blocks, css, js, and language files without modifying the core
2019-01-26 20:43:31 -08:00
Moe 3bf2222c0a add missing module "onvif" in webServerPaths 2019-01-26 12:21:55 -08:00
hartigoon1 f7c33190ae Update fr.json 2019-01-26 14:47:09 +00:00
Bret Palsson 3a09a11ac5 Prevent corrupted recording when recording is interrupted.
It's very annoying to get partial video because the process died or was shutdown uncleanly. This fixes the issue. Here is an explanation of the options set:

Normally, a MOV/MP4 file has all the metadata about all packets stored in one location (written at the end of the file. 

faststart: Will move the metadata to the beginning of the file after the recording is complete.

frag_keyframe: Starts a new fragment at each video keyframe. This allows a file to work, even if the metadata isn't written at the end or beginning of the file, since it encodes with each keyframe. (Tested with kill -9 on and start/stop recording where the end metata data wasn't written)

empty_moov: will cause output to be 100% fragmented; without this the first fragment will be muxed as a short movie (using moov) followed by the rest of the media in fragments.
2019-01-26 05:51:50 +00:00
Moe daeda7f970 minor cleanup 2019-01-23 22:15:29 -08:00
Moe 2d5434ac21 allow customAutoLoad to get blocks, js, and css automatically from fs 2019-01-23 22:15:17 -08:00
Moe fe3121a7a8 Hourly check for possible stale sizePurge lock+ 2019-01-23 21:33:55 -08:00
Moe 107893d058 Hourly check for possible stale sizePurge lock 2019-01-22 21:43:10 -08:00
Moe 79e3632b88 Return of the coProcessor
- now is optional and can be enabled in the Input section.
+ add humanized log for "error while decoding", mention network performance issues
2019-01-22 20:09:20 -08:00
Moe 4857ce846e Minor Cleanup+ 2019-01-22 08:44:50 -08:00
Moe 715b0e54cc Add Custom Flags field for Traditional Recording 2019-01-22 08:44:32 -08:00
Moe 9cd6a1d3d5 Minor Cleanup 2019-01-22 08:42:26 -08:00
Moe 2ba1015984 change "startupEnable", etc. to "bootupEnable", etc. in terminal commander 2019-01-14 12:11:16 -08:00
Moe 23f1d115de Add Update functions to terminal commander
+ minor cleanup and bug fixes
2019-01-14 12:05:35 -08:00
Moe a780889fe6 Update "help" for terminal commander 2019-01-14 11:18:46 -08:00