castcaster 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 473f74bfc9f9b8f427068f501fc5db2dc13071234084647028e13f487152dedd
-  data.tar.gz: 8566513c993848a0160a91f6c548c1c0dcd1cfdd9a162decb5df4c5e5a0a1122
+  metadata.gz: 3fc25e98798f5e17ea43d7d3a0c23f0803dc5ff13e7182464e4ce285414502d9
+  data.tar.gz: 798e995b0fe8a6669d959c12bc3675acf2a15d15c3b6cadc8503d072b102e99e
 SHA512:
-  metadata.gz: 7169e96f6ba961b134a96205f43bd023c6ed6a6a1287d57e73e3e78b34fabbb011f19059beb1b27550611a87ac901b51b014a2ef51fdfce99f6d5fd544c21171
-  data.tar.gz: a777f05ee638aa1cb76c74edfcf76c1d8d0aa7b1f8cb405ccd4cfe6c34294c41949144ae47b581d26194b31e02759db0b8a180ac4e99bb8e0da211f49d7dd742
+  metadata.gz: d5d8314c5a5c895721d54cbc2f2154313d766d54f405ce867ff74b9396a9d81e1f7afc290c6ad88cfd60dd248dda112331247960eb2f8958489ee1da1c1ae07a
+  data.tar.gz: 07bde36a96d3f93de56be65cb0773192b469f865ebb8867e8cf1333f5fd8001f098affaea3e62cfefdbf64b86dc066429d64eb74bbf04f73f0c61a763285de0d

data/lib/castcaster/channel.rb

@@ -75,12 +75,15 @@ module CastCaster
       def from_file(path)
         data = YAML.safe_load(File.read(path))
         unless data
-          warn "Warning: failed to parse channel file: #{path}"
+          warn "Warning: empty channel file: #{path}"
           return nil
         end
         ch = new(data['name'], data)
         ch.path = path
         ch
+      rescue => e
+        warn "Warning: failed to parse channel file #{path}: #{e.message}"
+        nil
       end
     end
 

data/lib/castcaster/cli.rb

@@ -61,11 +61,7 @@ module CastCaster
       say_status :created, path
     end
 
-    IMAGES = {
-      'nginx' => 'ghcr.io/lax/castcaster-nginx',
-      'ffmpeg' => 'ghcr.io/lax/castcaster-ffmpeg',
-      'webui' => 'ghcr.io/lax/castcaster-webui'
-    }.freeze
+    IMAGES = CastCaster::IMAGES
 
     desc 'doctor', 'Check system environment'
     def doctor

data/lib/castcaster/config.rb

@@ -40,8 +40,7 @@ module CastCaster
       path = File.join(Dir.pwd, 'castcaster.token')
       return File.read(path).strip if File.exist?(path)
       token = SecureRandom.hex(32)
-      File.write(path, token)
-      File.chmod(0600, path)
+      File.open(path, 'w', 0600) { |f| f.write(token) }
       token
     end
 

data/lib/castcaster/deploy/compose.rb

@@ -33,7 +33,7 @@ module CastCaster
 
         all = {
           'nginx' => {
-            'image' => 'ghcr.io/lax/castcaster-nginx',
+            'image' => CastCaster::IMAGES['nginx'],
             'restart' => 'unless-stopped',
             'ports' => nginx_ports,
             'volumes' => [
@@ -42,7 +42,7 @@ module CastCaster
             ]
           },
           'webui' => {
-            'image' => 'ghcr.io/lax/castcaster-webui',
+            'image' => CastCaster::IMAGES['webui'],
             'restart' => 'unless-stopped',
             'volumes' => ["./channels:/channels:rw", "./hls:/var/lib/castcaster/hls:ro"],
             'depends_on' => ['nginx'],

data/lib/castcaster/deploy/ffmpeg_services.rb

@@ -12,7 +12,7 @@ module CastCaster
           name = ch.name
           label = { 'castcaster/channel' => name }
           common = {
-            'image' => 'ghcr.io/lax/castcaster-ffmpeg',
+            'image' => CastCaster::IMAGES['ffmpeg'],
             'restart' => 'unless-stopped',
             'volumes' => ["#{hls_dir}:/var/lib/castcaster/hls"],
             'depends_on' => ['nginx'],

data/lib/castcaster/deploy/k8s.rb

@@ -34,9 +34,9 @@ module CastCaster
         erb = ERB.new(tpl, trim_mode: '-')
         ctx = TemplateContext.new(
           app: 'castcaster',
-          engine_image: 'ghcr.io/lax/castcaster-nginx',
-          webui_image: 'ghcr.io/lax/castcaster-webui',
-          ffmpeg_image: 'ghcr.io/lax/castcaster-ffmpeg',
+          engine_image: CastCaster::IMAGES['nginx'],
+          webui_image: CastCaster::IMAGES['webui'],
+          ffmpeg_image: CastCaster::IMAGES['ffmpeg'],
           engine_name: @engine.name,
           channels_dir: File.join(@cfg.fetch('project_dir', Dir.pwd), 'channels'),
           hls_dir: @cfg.fetch('hls_dir', '/var/lib/castcaster/hls'),

data/lib/castcaster/deploy/swarm.rb

@@ -28,13 +28,13 @@ module CastCaster
       def render
         all = {
           'nginx' => {
-            'image' => 'ghcr.io/lax/castcaster-nginx',
+            'image' => CastCaster::IMAGES['nginx'],
             'restart' => 'unless-stopped',
             'ports' => ['1935:1935', '8080:8080'],
             'volumes' => ["./nginx/nginx.conf:/etc/nginx/nginx.conf:ro", "./hls:/var/lib/castcaster/hls"]
           },
           'webui' => {
-            'image' => 'ghcr.io/lax/castcaster-webui',
+            'image' => CastCaster::IMAGES['webui'],
             'restart' => 'unless-stopped',
             'volumes' => ["./channels:/channels:rw"],
             'environment' => {'HLS_DIR' => '/var/lib/castcaster/hls', 'CHANNELS_DIR' => '/channels'}

data/lib/castcaster/deploy.rb

@@ -1,3 +1,4 @@
+require 'erb'
 require_relative 'deploy/ffmpeg_services'
 require_relative 'deploy/compose'
 require_relative 'deploy/swarm'

data/lib/castcaster/engines/nginx_rtmp.rb

@@ -1,7 +1,7 @@
 module CastCaster
   module Engines
-    class NginxRTMP < Base
-      IMAGE = 'ghcr.io/lax/castcaster-nginx'
+  class NginxRTMP < Base
+    IMAGE = CastCaster::IMAGES['nginx']
 
       def config_file
         File.join(project_dir, 'nginx', 'nginx.conf')

data/lib/castcaster/version.rb

@@ -1,3 +1,3 @@
 module CastCaster
-  VERSION = '0.0.1'
+  VERSION = '0.0.3'
 end

data/lib/castcaster.rb

@@ -6,6 +6,12 @@ require 'securerandom'
 module CastCaster
   class Error < StandardError; end
 
+  IMAGES = {
+    'nginx'  => 'ghcr.io/lax/castcaster-nginx',
+    'ffmpeg' => 'ghcr.io/lax/castcaster-ffmpeg',
+    'webui'  => 'ghcr.io/lax/castcaster-webui'
+  }.freeze
+
   autoload :CLI,           'castcaster/cli'
   autoload :Channel,       'castcaster/channel'
   autoload :ChannelCLI,    'castcaster/channel_cli'

data/templates/deploy/k8s/deployment.yaml.erb

@@ -62,12 +62,16 @@ spec:
       - name: webui
         image: <%= webui_image %>
         ports:
-        - containerPort: 8080
+        - containerPort: 8081
         env:
         - name: STREAM_ENGINE
           value: "<%= engine_name %>"
         - name: STREAM_ENGINE_URL
           value: "http://<%= app %>-stream:80"
+        - name: HLS_DIR
+          value: "<%= hls_dir || '/var/lib/castcaster/hls' %>"
+        - name: CHANNELS_DIR
+          value: "/channels"
         volumeMounts:
         - name: channels
           mountPath: /channels

data/templates/deploy/k8s/deployment.yaml.tera

@@ -62,12 +62,16 @@ spec:
       - name: webui
         image: {{ webui_image }}
         ports:
-        - containerPort: 8080
+        - containerPort: 8081
         env:
         - name: STREAM_ENGINE
           value: "{{ engine_name }}"
         - name: STREAM_ENGINE_URL
           value: "http://{{ app }}-stream:80"
+        - name: HLS_DIR
+          value: "{{ hls_dir | default(value="/var/lib/castcaster/hls") }}"
+        - name: CHANNELS_DIR
+          value: "/channels"
         volumeMounts:
         - name: channels
           mountPath: /channels

data/templates/nginx-rtmp/nginx.conf.erb

@@ -42,8 +42,8 @@ rtmp {
             drop_idle_publisher 25s;
             hls on;
             hls_path <%= hls_dir %>/<%= ch['name'] %>;
-            hls_fragment <%= ch.dig('hls', 'fragment') || 6 %>;
-            hls_playlist_length <%= ch.dig('hls', 'playlist_length') || 60 %>;
+            hls_fragment <%= ch.dig('hls', 'fragment') || 6 %>s;
+            hls_playlist_length <%= ch.dig('hls', 'playlist_length') || 60 %>s;
             allow publish all;
             allow play all;
         }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: castcaster
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Lax