Commit Graph

248 Commits (develop)

Author SHA1 Message Date
knotteye fe3ec1bd75 Fix CORS issues in reccomended nginx config 2020-10-24 22:52:59 -05:00
knotteye 07cba66096 Fix a typo in the generated config file 2020-10-24 22:47:03 -05:00
knotteye 2de486da46 Switch to shaka-player and initialize it on pageload.
Maybe todo: more testing and re-check if the stream has started after the page has already loaded
2020-10-18 09:23:28 -05:00
knotteye 2c073a7cdb Update URLs with new repository 2020-10-18 09:25:54 +00:00
knotteye 8a71680971 Merge pull request 'Fix a bug with migrate.ts calling a function incorrectly' (#4) from migrate-bugfix into develop 2020-10-18 04:16:15 -05:00
knotteye 0900496d70 Fix a bug with migrate.ts calling a function incorrectly 2020-10-18 09:13:09 +00:00
knotteye 34d6fa91df Fix some typos in documentation 2020-10-18 02:16:54 -05:00
knotteye 97b6f50b7c Merge pull request 'master -> develop' (#2) from develop into master
Reviewed-on: http://localhost:3000/git/knotteye/satyr/pulls/2
2020-10-17 23:49:01 -05:00
knotteye 94f240d4d6 Merge branch 'master' into develop 2020-10-17 23:48:18 -05:00
knotteye d8b327752e Bump minor version 2020-10-17 23:41:37 -05:00
knotteye 7107cb4c8f Update documentation for new repository host 2020-10-17 23:37:34 -05:00
knotteye 90cce68581 Fix bug 2020-10-17 22:40:30 -05:00
knotteye 1fa6bf7e81 Update documentation 2020-10-17 22:23:05 -05:00
knotteye ab9a9b4585 Expose whether cluster mode is enabled over /api/instance/config 2020-10-17 22:08:56 -05:00
knotteye 01744df3cd Fix a bug where XMPP bridge would repeatedly ignore channels 2020-10-17 22:07:30 -05:00
knotteye ab082e5f95 Fix logging in cluster.ts
Fix a bug calling the cluster process in index.ts
Set a default value for rtmp.cluster in config.ts
Update documentation
2020-10-17 21:39:56 -05:00
knotteye de17128cd2 Merge branch 'xmpp-mirror' into 'develop'
Xmpp mirror

See merge request knotteye/satyr!30
2020-10-18 01:19:20 +00:00
knotteye cfa7c5ab13 Implement XMPP mirror 2020-10-17 20:17:24 -05:00
knotteye 81afb7493b Update config options for xmpp bridge 2020-10-17 18:30:38 -05:00
knotteye 9a6e5c8798 Add documentation for configuring XMPP bridge 2020-10-17 18:29:17 -05:00
knotteye 06dc05eb8b Add a dependency for xmpp mirroring and add configurability 2020-10-17 16:55:55 -05:00
knotteye dfd0bc4881 Commit a local.css file to get rid of some error messages 2020-10-17 16:15:49 -05:00
knotteye 30a62e6378 Handle back button when the user navigates to one of our own history events 2020-10-17 16:02:50 -05:00
knotteye cc3876ff4a Update URL when navigating to new pages and push state to history in client-side SPA 2020-10-17 15:39:19 -05:00
knotteye 56c4b94a80 Fix the start video function to avoid redudant calls 2020-10-17 05:26:31 -05:00
knotteye a5c1adfffc Return live flag as well when getting user info 2020-10-17 05:13:32 -05:00
knotteye 4d36c2c429 Merge branch 'develop' into 'master'
Develop -> Master

See merge request knotteye/satyr!29
2020-10-17 07:32:23 +00:00
knotteye 18d521a35b Merge branch 'cluster' into 'develop'
Cluster

See merge request knotteye/satyr!28
2020-10-17 07:29:31 +00:00
knotteye 5126bccbc7 Add configurability to cluster option 2020-10-17 02:17:10 -05:00
knotteye 80cf01ef30 Add unique ports per worker so that ffmpeg can reliably record. 2020-10-17 01:53:33 -05:00
knotteye 1ae7128b9d Update server code 2020-10-17 01:07:29 -05:00
knotteye 7806b34cfa Remove unused code 2020-10-17 01:03:20 -05:00
knotteye bdfac44e21 Add the beginnings of the ability to cluster RTMP servers. It looks like there won't be a way to reliably play RTMP streams like this without digging into node-media-server code.
For now that means clustering will have the drawback of being able to do DASH only.

Still need to add a config option and reliable recording.
2020-10-17 00:51:47 -05:00
knotteye 9e5b3f360c Merge branch 'client-templates' into 'develop'
Client templates -> develop

See merge request knotteye/satyr!27
2020-10-17 05:20:57 +00:00
knotteye 58e8be123c Intercept internal links and render the page without reloading 2020-10-17 00:11:24 -05:00
knotteye 54a891dac1 Update documentation 2020-10-16 22:25:24 -05:00
knotteye 95837beaf7 Make server side rendering fully configurable 2020-10-16 21:57:24 -05:00
knotteye 961b5fe648 Add config option to turn server side rendering off.
Ensure templates are precompiled before starting the server.
2020-10-16 21:31:23 -05:00
knotteye 4ec89d71f8 Bump major version. There were some breaking changes in there somewhere 2020-10-14 07:51:26 -05:00
knotteye 988e3473a7 Big commit. Implement handlers for everything that's currently rendered server side in the client-side frontend.
Add compiled templates file to .gitignore, will work out a system for making sure templates are compiled later.
Fix a couple bugs in the API and templates.

TODO for client-side rendering:
Make sure templates get compiled before running the server.
Add a config option to switch between server-side and client-side rendering
Fancy SPA stuff like intercepting links to render changes without a page-reload
2020-10-14 07:44:19 -05:00
knotteye 57d0b0f856 initial work on client-side templating 2020-10-14 00:03:45 -05:00
knotteye 99879fd91e Merge branch 'invite-codes' into 'develop'
Invite codes

See merge request knotteye/satyr!26
2020-10-13 21:31:24 +00:00
knotteye 1a410a597a Fix a bug checking the validity of invite codes 2020-10-13 16:29:13 -05:00
knotteye acce235812 Increment minor version due to backwards compatible API changes 2020-10-13 16:17:15 -05:00
knotteye eba53c3732 Rework invitation UI a bit, document API changes 2020-10-13 16:16:37 -05:00
knotteye 67de11e66b Add API handling of invite codes, add web page for inviting users. 2020-10-13 16:12:07 -05:00
knotteye 9605ff8c92 Add a way to generate invites from the command line. Add database migration script. 2020-10-13 15:48:39 -05:00
knotteye 8caad60a43 Add functions for generating and using invite codes 2020-10-13 15:29:47 -05:00
knotteye 987d837ee6 Update some dependency versions. 2020-10-13 15:07:30 -05:00
knotteye 444c3c8f7e Merge branch 'twitch-mirror' into 'develop'
Twitch mirror

See merge request knotteye/satyr!25
2020-10-13 01:57:25 +00:00