faastruby 0.4.8 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4a573029053f751c92906881003347d1938c0df71fda2bfa363378375d8f613
-  data.tar.gz: c9c2d9fdba7d8b786b3065d5f66f9ed8f95830eae4dddc18f67faa91c3cdead4
+  metadata.gz: a1643e934126a8b362f512fef2ab59834562fc01cc1d8751f9ee7606d1586503
+  data.tar.gz: f363ba8b0befa0a807fd16f29c28893a7c5302457628511d77d9675c2683ce13
 SHA512:
-  metadata.gz: 062f7d9358d2a0ed608142a0a6ad1584a18cf1986717ebd626e0462a821749e4badb1c2a5c7568c0fedffe67b817c108c01419d6284a30b487083fa08502fed1
-  data.tar.gz: b8ba9a39e1ccad877601630709e980bcca3501f5ade59cbb1688872126c2bb0e8a8fd77858924373617521c006a73aa4ba67c881c8c0e5e7e264e12ef5b7fd64
+  metadata.gz: adce689b5896a361aed94ea73438d1cf7090afc3638f438fa9744cf9a8cceb34cf5a5c089506c24c47f433c22be0ed35cabb3c3266301fff731dc1a2415ba475
+  data.tar.gz: fc39dcf79dc53e71e788233b978f756aab26907562c0fb07cc912496c4b1821a151c2f2f3ba5db65476046f3bc31e284e17fb2a70d3bd304cc8a8c4c1293da89

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.4.9 - Jan 13 2019
+- Changes in `faastruby server` 
+  - Cleaned up code
+  - Logs are easier to read
+  - Function responses show up in the log
+  - Support for events with `publish`
+
 ## 0.4.8 - Jan 8 2019
 - Use the actual param rather than the Sinatra::Params object
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    faastruby (0.4.7)
+    faastruby (0.4.8)
       colorize (~> 0.8)
       faastruby-rpc (~> 0.2.1)
       oj (~> 3.6)

data/exe/faastruby-server

@@ -1,200 +1,74 @@
 #!/usr/bin/env ruby
-
-require 'sinatra'
-require 'sinatra/multi_route'
 require 'yaml'
 require 'oj'
 require 'faastruby-rpc'
 require 'base64'
-
-module FaaStRuby
-  class DoubleRenderError < StandardError; end
+require 'faastruby/server'
+require 'sinatra'
+require 'sinatra/multi_route'
+require 'colorize'
+FaaStRuby::EventHub.listen_for_events!
+
+set :port, 3000
+set :bind, '0.0.0.0'
+case ARGV.shift
+when '-p'
+  set :port, ARGV.shift
+when '-b', '-o'
+  set :bind, ARGV.shift
 end
-
-module FaaStRuby
-  class Runner
-    def initialize
-      @rendered = false
-    end
-
-    def call(workspace_name, function_name, event, args)
-      begin
-        load "./#{workspace_name}/#{function_name}/handler.rb"
-        response = handler(event, *args)
-        return response if response.is_a?(FaaStRuby::Response)
-        body = {
-          'error' => "Please use the helpers 'render' or 'respond_with' as your function return value."
-        }
-        FaaStRuby::Response.new(body: Oj.dump(body), status: 500, headers: {'Content-Type' => 'application/json'})
-      rescue Exception => e
-        body = {
-          'error' => e.message,
-          'location' => e.backtrace&.first,
-        }
-        FaaStRuby::Response.new(body: Oj.dump(body), status: 500, headers: {'Content-Type' => 'application/json'})
-      end
-    end
-
-    def rendered!
-      @rendered = true
-    end
-    def rendered?
-      @rendered
-    end
-
-    def respond_with(body, status: 200, headers: {}, binary: false)
-      raise FaaStRuby::DoubleRenderError.new("You called 'render' or 'respond_with' twice in your handler method") if rendered?
-      response = FaaStRuby::Response.new(body: body, status: status, headers: headers, binary: binary)
-      rendered!
-      response
-    end
-
-    def render(
-        js: nil,
-        body: nil,
-        inline: nil,
-        html: nil,
-        json: nil,
-        yaml: nil,
-        text: nil,
-        data: nil,
-        png: nil,
-        svg: nil,
-        jpeg: nil,
-        gif: nil,
-        icon: nil,
-        status: 200, headers: {}, content_type: nil, binary: false
-      )
-      headers["Content-Type"] = content_type if content_type
-      bin = false
-      case
-      when json
-        headers["Content-Type"] ||= "application/json"
-        resp_body = json.is_a?(String) ? json : Oj.dump(json)
-      when html, inline
-        headers["Content-Type"] ||= "text/html"
-        resp_body = html
-      when text
-        headers["Content-Type"] ||= "text/plain"
-        resp_body = text
-      when yaml
-        headers["Content-Type"] ||= "application/yaml"
-        resp_body = yaml.is_a?(String) ? yaml : YAML.load(yaml)
-      when body
-        headers["Content-Type"] ||= "application/octet-stream"
-        bin = binary
-        resp_body = bin ? Base64.urlsafe_encode64(body) : body
-      when data
-        headers["Content-Type"] ||= "application/octet-stream"
-        resp_body = Base64.urlsafe_encode64(data)
-        bin = true
-      when js
-        headers["Content-Type"] ||= "text/javascript"
-        resp_body = js
-      when png
-        headers["Content-Type"] ||= "image/png"
-        resp_body = Base64.urlsafe_encode64(png)
-        bin = true
-      when svg
-        headers["Content-Type"] ||= "image/svg+xml"
-        resp_body = svg
-      when jpeg
-        headers["Content-Type"] ||= "image/jpeg"
-        resp_body = Base64.urlsafe_encode64(jpeg)
-        bin = true
-      when gif
-        headers["Content-Type"] ||= "image/gif"
-        resp_body = Base64.urlsafe_encode64(gif)
-        bin = true
-      when icon
-        headers["Content-Type"] ||= "image/x-icon"
-        resp_body = Base64.urlsafe_encode64(icon)
-        bin = true
-      end
-      respond_with(resp_body, status: status, headers: headers, binary: bin)
-    end
+set :server, %w[puma]
+set :show_exceptions, true
+
+register Sinatra::MultiRoute
+route :get, :post, :put, :patch, :delete, '/:workspace_name/:function_name' do
+  path = "#{params[:workspace_name]}/#{params[:function_name]}"
+  headers = env.select { |key, value| key.include?('HTTP_') || ['CONTENT_TYPE', 'CONTENT_LENGTH', 'REMOTE_ADDR', 'REQUEST_METHOD', 'QUERY_STRING'].include?(key) }
+  if headers.has_key?("HTTP_FAASTRUBY_RPC")
+    body = nil
+    rpc_args = parse_body(request.body.read, headers['CONTENT_TYPE'], request.request_method) || []
+  else
+    body = parse_body(request.body.read, headers['CONTENT_TYPE'], request.request_method)
+    rpc_args = []
   end
-
-  class Event < Struct
-  end
-
-  class Response
-    attr_accessor :body, :status, :headers, :binary
-    def initialize(body:, status: 200, headers: {}, binary: false)
-      @body = body
-      @status = status
-      @headers = headers
-      @binary = binary
-    end
-
-    def binary?
-      @binary
-    end
+  query_params = parse_query(request.query_string)
+  context = set_context(params[:workspace_name], params[:function_name])
+  event = FaaStRuby::Event.new(body, query_params, headers, context)
+  response = FaaStRuby::Runner.new.call(params[:workspace_name], params[:function_name], event, rpc_args)
+  status response.status
+  headers response.headers
+  if response.binary?
+    response_body = Base64.urlsafe_decode64(response.body)
+  else
+    response_body = response.body
   end
+  puts "[#{path}] #=> status=#{response.status} body=#{response_body.inspect} headers=#{Oj.dump response.headers}".light_blue
+  body response_body
 end
 
-class FaaStRubyServer < Sinatra::Application
-  set :port, 3000
-  set :bind, '0.0.0.0'
-  case ARGV.shift
-  when '-p'
-    set :port, ARGV.shift
-  when '-b'
-    set :bind, ARGV.shift
-  end
-  set :server, %w[puma]
-  set :run, false
-  set :show_exceptions, true
-
-  register Sinatra::MultiRoute
-  route :get, :post, :put, :patch, :delete, '/:workspace_name/:function_name' do
-    e = FaaStRuby::Event.new(:body, :query_params, :headers, :context)
-    headers = env.select { |key, value| key.include?('HTTP_') || ['CONTENT_TYPE', 'CONTENT_LENGTH', 'REMOTE_ADDR', 'REQUEST_METHOD', 'QUERY_STRING'].include?(key) }
-    if headers.has_key?("HTTP_FAASTRUBY_RPC")
-      body = nil
-      rpc_args = parse_body(request.body.read, headers['CONTENT_TYPE'], request.request_method) || []
-    else
-      body = parse_body(request.body.read, headers['CONTENT_TYPE'], request.request_method)
-      rpc_args = []
-    end
-    query_params = parse_query(request.query_string)
-    context = set_context(params[:workspace_name], params[:function_name])
-    event = e.new(body, query_params, headers, context)
-    response = FaaStRuby::Runner.new.call(params[:workspace_name], params[:function_name], event, rpc_args)
-    status response.status
-    headers response.headers
-    if response.binary?
-      body Base64.urlsafe_decode64(response.body)
-    else
-      body response.body
-    end
-  end
-
-  def parse_body(body, content_type, method)
-    return nil if method == 'GET'
-    return {} if body.nil? && method != 'GET'
-    return Oj.load(body) if content_type == 'application/json'
-    return body
-  end
+def parse_body(body, content_type, method)
+  return nil if method == 'GET'
+  return {} if body.nil? && method != 'GET'
+  return Oj.load(body) if content_type == 'application/json'
+  return body
+end
 
-  def set_context(workspace_name, function_name)
-    return nil unless File.file?('context.yml')
-    yaml = YAML.load(File.read('context.yml'))
-    return nil unless yaml.has_key?(workspace_name)
-    yaml[workspace_name][function_name]
-  end
+def set_context(workspace_name, function_name)
+  return nil unless File.file?('context.yml')
+  yaml = YAML.load(File.read('context.yml'))
+  return nil unless yaml.has_key?(workspace_name)
+  yaml[workspace_name][function_name]
+end
 
-  def parse_query(query_string)
-    hash = {}
-    query_string.split('&').each do |param|
-      key, value = param.split('=')
-      hash[key] = value
-    end
-    hash
-  end
-  def self.run?
-    true
+def parse_query(query_string)
+  hash = {}
+  query_string.split('&').each do |param|
+    key, value = param.split('=')
+    hash[key] = value
   end
+  hash
+end
+def self.run?
+  true
 end
 
-FaaStRubyServer.run! rescue nil # this will suppress some of the errors messages

data/lib/faastruby/server.rb

@@ -0,0 +1,230 @@
+module FaaStRuby
+  class DoubleRenderError < StandardError; end
+  class EventChannel
+    @@channels = {}
+    def self.channels
+      @@channels
+    end
+    attr_accessor :name
+    def initialize(channel)
+      @name = channel
+      @@channels[channel] ||= []
+    end
+    def subscribe(function_path)
+      @@channels[@name] << function_path
+    end
+    def subscribers
+      @@channels[@name] || []
+    end
+  end
+  class Subscriber
+    attr_accessor :path
+    def initialize(path)
+      @path = path
+      @workspace_name, @function_name = @path.split("/")
+    end
+
+    def call(encoded_data)
+      data = Base64.urlsafe_decode64(encoded_data)
+      headers = {'X-Origin' => 'event_hub', 'Content-Transfer-Encoding' => 'base64'}
+      event = Event.new(data, {}, headers, nil)
+      Runner.new.call(@workspace_name, @function_name, event, [])
+    end
+  end
+
+  class EventHub
+    @@queue = Queue.new
+    def self.queue
+      @@queue
+    end
+
+    def self.push(payload)
+      @@queue << payload
+    end
+
+    def self.thread
+      @@thread
+    end
+
+    def self.load_subscribers
+      Dir.glob('*/*/faastruby.yml').each do |file|
+        workspace_name, function_name, _ = file.split('/') 
+        path = "#{workspace_name}/#{function_name}"
+        config = YAML.load(File.read(file))
+        next unless config['channels'].is_a?(Array)
+        config['channels'].compact!
+        config['channels'].each do |c|
+          channel = EventChannel.new(c)
+          channel.subscribe(path)
+        end
+      end
+      puts "[EventHub] Channel subscriptions: #{EventChannel.channels}".yellow
+      puts "[EventHub] If you modify 'faastruby.yml' in any function, you will need to restart the server to apply the changes.".yellow 
+    end
+
+    def self.listen_for_events!
+      load_subscribers
+      @@thread = Thread.new do
+        loop do
+          encoded_channel, encoded_data = @@queue.pop.split(',')
+          channel = EventChannel.new(Base64.urlsafe_decode64(encoded_channel))
+          puts "[EventHub] Event channel=#{channel.name.inspect}".yellow
+          channel.subscribers.each do |s|
+            subscriber = Subscriber.new(s)
+            puts "[EventHub] Trigger function=#{subscriber.path.inspect} base64_payload=#{encoded_data.inspect}".yellow
+            response = subscriber.call(encoded_data)
+            puts "[#{subscriber.path}] #=> status=#{response.status} body=#{response.body.inspect} headers=#{Oj.dump response.headers}".light_blue
+          end
+        end
+      end
+      puts "[EventHub] Events thread started.".yellow
+    end
+  end
+
+  class Runner
+    def initialize
+      @rendered = false
+    end
+
+    def path
+      @path
+    end
+
+    def call(workspace_name, function_name, event, args)
+      @path = "#{workspace_name}/#{function_name}"
+      begin
+        load "./#{workspace_name}/#{function_name}/handler.rb"
+        response = handler(event, *args)
+        return response if response.is_a?(FaaStRuby::Response)
+        body = {
+          'error' => "Please use the helpers 'render' or 'respond_with' as your function return value."
+        }
+        FaaStRuby::Response.new(body: Oj.dump(body), status: 500, headers: {'Content-Type' => 'application/json'})
+      rescue Exception => e
+        body = {
+          'error' => e.message,
+          'location' => e.backtrace&.first,
+        }
+        FaaStRuby::Response.new(body: Oj.dump(body), status: 500, headers: {'Content-Type' => 'application/json'})
+      end
+    end
+
+    def rendered!
+      @rendered = true
+    end
+    def rendered?
+      @rendered
+    end
+
+    def respond_with(body, status: 200, headers: {}, binary: false)
+      raise FaaStRuby::DoubleRenderError.new("You called 'render' or 'respond_with' twice in your handler method") if rendered?
+      response = FaaStRuby::Response.new(body: body, status: status, headers: headers, binary: binary)
+      rendered!
+      response
+    end
+
+    def render(
+        js: nil,
+        body: nil,
+        inline: nil,
+        html: nil,
+        json: nil,
+        yaml: nil,
+        text: nil,
+        data: nil,
+        png: nil,
+        svg: nil,
+        jpeg: nil,
+        gif: nil,
+        icon: nil,
+        status: 200, headers: {}, content_type: nil, binary: false
+      )
+      headers["Content-Type"] = content_type if content_type
+      bin = false
+      case
+      when json
+        headers["Content-Type"] ||= "application/json"
+        resp_body = json.is_a?(String) ? json : Oj.dump(json)
+      when html, inline
+        headers["Content-Type"] ||= "text/html"
+        resp_body = html
+      when text
+        headers["Content-Type"] ||= "text/plain"
+        resp_body = text
+      when yaml
+        headers["Content-Type"] ||= "application/yaml"
+        resp_body = yaml.is_a?(String) ? yaml : YAML.load(yaml)
+      when body
+        headers["Content-Type"] ||= "application/octet-stream"
+        bin = binary
+        resp_body = bin ? Base64.urlsafe_encode64(body) : body
+      when data
+        headers["Content-Type"] ||= "application/octet-stream"
+        resp_body = Base64.urlsafe_encode64(data)
+        bin = true
+      when js
+        headers["Content-Type"] ||= "text/javascript"
+        resp_body = js
+      when png
+        headers["Content-Type"] ||= "image/png"
+        resp_body = Base64.urlsafe_encode64(png)
+        bin = true
+      when svg
+        headers["Content-Type"] ||= "image/svg+xml"
+        resp_body = svg
+      when jpeg
+        headers["Content-Type"] ||= "image/jpeg"
+        resp_body = Base64.urlsafe_encode64(jpeg)
+        bin = true
+      when gif
+        headers["Content-Type"] ||= "image/gif"
+        resp_body = Base64.urlsafe_encode64(gif)
+        bin = true
+      when icon
+        headers["Content-Type"] ||= "image/x-icon"
+        resp_body = Base64.urlsafe_encode64(icon)
+        bin = true
+      end
+      respond_with(resp_body, status: status, headers: headers, binary: bin)
+    end
+
+    def puts(msg)
+      super "[#{@path}] #{msg}".green
+    end
+
+    def publish(channel, data: nil)
+      begin
+        encoded_data = data ? Base64.urlsafe_encode64(data, padding: false) : ""
+        payload = %(#{Base64.urlsafe_encode64(channel, padding: false)},#{encoded_data})
+        EventHub.queue.push payload
+        true
+      rescue
+        false
+      end
+    end
+  end
+
+  class Event
+    attr_accessor :body, :query_params, :headers, :context
+    def initialize(body, query_params, headers, context)
+      @body = body
+      @query_params = query_params
+      @headers = headers
+      @context = context
+    end
+  end
+
+  class Response
+    attr_accessor :body, :status, :headers, :binary
+    def initialize(body:, status: 200, headers: {}, binary: false)
+      @body = body
+      @status = status
+      @headers = headers
+      @binary = binary
+    end
+
+    def binary?
+      @binary
+    end
+  end
+end

data/lib/faastruby/version.rb

@@ -1,3 +1,3 @@
 module FaaStRuby
-  VERSION = '0.4.8'
+  VERSION = '0.4.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faastruby
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.9
 platform: ruby
 authors:
 - Paulo Arruda
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-08 00:00:00.000000000 Z
+date: 2019-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -256,6 +256,7 @@ files:
 - lib/faastruby/cli/credentials.rb
 - lib/faastruby/cli/package.rb
 - lib/faastruby/function.rb
+- lib/faastruby/server.rb
 - lib/faastruby/version.rb
 - lib/faastruby/workspace.rb
 - templates/crystal/example-blank/spec/handler_spec.cr