nabaztag_hack_kit 0.1.0.alpha2 → 0.1.0.alpha3

data/bytecode/bin/mtl_merge

@@ -10,12 +10,26 @@ unless ARGV.size == 1
 end
 
 file = ARGV.first
+BASE_DIR = File.dirname(file)
+BASE_DIR_LIB = File.dirname(File.dirname(__FILE__))
+
+def mtl_file(name)
+  "#{name}.mtl"
+end
+
+def src_file(name)
+  [BASE_DIR, BASE_DIR_LIB].each do |dir|
+    if (path = File.join(dir, name)) && File.exists?(path)
+      return path
+    end
+  end
+  raise "LIB FILE #{name} not found"
+end
 
-dir = File.dirname(file)
 File.open(TMP, 'w') do |out|
   File.open(file).each_line do |line|
     if line =~ /\A#include "([^"]+)"/
-      line = `cat #{dir}/#{$1}.mtl`
+      line = `cat #{src_file(mtl_file($1))}`
     end
     out.puts line
   end

data/bytecode/lib/button.mtl

@@ -4,7 +4,12 @@
 const BUTTON_REBOOT = 3000;; //ms MIN 50ms
 var button_pressed  = 0;;
 
-fun checkButton=
+fun buttonPressedUrl data=
+  strcatlist confGetServerUrl::apiPath::"/button-pressed.jsp?duration="::(itoa data)::nil;;
+
+//-------------------------------------------------------------
+
+fun buttonCheck =
   if (button2 > 0) then
   (
     if button_pressed == 0 then

data/bytecode/lib/data_helper.mtl

@@ -1,16 +1,3 @@
-var logs = "";;
-
-fun log t tab=
-  let "|"::nil -> all in
-  (
-    for i = tablen tab; i > 0 ; i - 1 do
-    (
-      let itoa tab.(i - 1) -> data in
-      set all =  data::","::all
-    );
-  set logs = strcatlist logs::t::","::(itoa time_ms)::","::all
-  )
-;;
 
 fun TLtoS tlist=
   if tlist == nil then

data/bytecode/lib/logger.mtl

@@ -0,0 +1,23 @@
+//###############################################
+//------------------ LOGGER ----------------------
+
+var logs = "";;
+
+fun logUrl =
+  strcatlist confGetServerUrl::apiPath::"/log.jsp?"::nil;;
+
+fun log t tab=
+  let "|"::nil -> all in
+  (
+    for i = tablen tab; i > 0 ; i - 1 do
+    (
+      let itoa tab.(i - 1) -> data in
+      set all =  data::","::all
+    );
+  set logs = strcatlist logs::t::","::(itoa time_ms)::","::all
+  )
+;;
+
+fun sendLogs=
+  httprequest "POST" logUrl (strcat "logs=" logs) #_cbDummyHttp HTTP_NORMAL;
+  set logs = "";;

data/bytecode/lib/ping.mtl

@@ -1,10 +1,16 @@
 //###############################################
 //------------------ PING ----------------------
+
 const PING_CHECK_FQ = 5000;; //ms -> 5s
 const PING_PARAMS   = "";;
 
 var ping_last_check = 0;;
 
+fun pingUrl params=
+  strcatlist confGetServerUrl::apiPath::"/ping.jsp?"::params::nil;;
+
+//-------------------------------------------------------------
+
 fun pingCheck=
   let PING_CHECK_FQ -> ping_check_fq in
   if ((time_ms - ping_last_check) > ping_check_fq) then

data/bytecode/lib/playback.mtl

@@ -0,0 +1,33 @@
+//###############################################
+//------------------- Playback --------------------
+
+fun playbackFinishedUrl =
+  strcatlist confGetServerUrl::apiPath::"/playback-finished.jsp?"::nil;;
+
+fun playbackLoadFinishedUrl =
+  strcatlist confGetServerUrl::apiPath::"/playback-load-finished.jsp?"::nil;;
+
+fun streamUrl filename=
+  strcatlist confGetServerUrl::"/streams/"::filename::nil;;
+
+// var playback_fifo = nil;;
+
+// fun playbackStart =
+// ;;
+
+// fun playbackStop =
+// ;;
+
+// fun _playbackLoadCB httpreq req=
+//   if req != nil then
+//   (
+//     set wav_fifo=conc playback_fifo req::nil;
+//   )
+// ;;
+
+
+// fun playbackLoad val=
+//   httprequest "GET" (streamUrl val) nil #_playbackLoadCB HTTP_NORMAL //HTTP_STREAM
+// ;;
+
+// fun playbackStream val=

data/bytecode/lib/record.mtl

@@ -1,3 +1,6 @@
+//###############################################
+//------------------- Record --------------------
+
 var lrec;;
 var recording = 0;;
 var recordingStartedAt = 0;;
@@ -7,6 +10,9 @@ var buff;;
 var buffx;;
 var buffy;;
 
+fun recordingFinishedUrl =
+  strcatlist confGetServerUrl::apiPath::"/recording-finished.jsp?"::nil;;
+
 //-------------------------------------------------------------
 
 fun sqrt_ i i0 i1=

data/bytecode/lib/rfid.mtl

@@ -10,7 +10,10 @@ const RFID_ID_ERROR  = "\69\114\114\111\114\0\0\0\v";; // 0x45 72 72 6f 72 00 00
 var rfid_last_check  = 0;;
 var rfid_data        = "";;
 
-fun checkRFID=
+fun rfidUrl tag=
+  strcatlist confGetServerUrl::apiPath::"/rfid.jsp?id="::(webmac tag)::nil;;
+
+fun rfidCheck=
   if ((time_ms - rfid_last_check) > RFID_CHECK_FQ) then
   (
     let rfidGet -> rfid in

data/bytecode/main.mtl

@@ -14,46 +14,38 @@ proto evalTrame 1;;
 #include "src/lib/http"
 #include "src/lib/dhcp"
 #include "src/lib/wav"
-#include "lib/data_helper"
-#include "lib/buffer"
 #include "src/lib/wifi"
 
-//-------------------- HTTP Endpoints
-fun logUrl=
-  strcatlist confGetServerUrl::"/api/log.jsp"::nil;;
-
-fun buttonPressedUrl data=
-  strcatlist confGetServerUrl::"/api/button-pressed.jsp?duration="::(itoa data)::nil;;
-
-fun recordingFinishedUrl =
-  strcatlist confGetServerUrl::"/api/recording-finished.jsp"::nil;;
-
-fun playbackFinishedUrl =
-  strcatlist confGetServerUrl::"/api/playback-finished.jsp"::nil;;
-
-fun playbackLoadFinishedUrl =
-  strcatlist confGetServerUrl::"/api/playback-load-finished.jsp"::nil;;
-
-fun rfidUrl tag=
-  strcatlist confGetServerUrl::"/api/rfid.jsp?id="::(webmac tag)::nil;;
+#include "lib/data_helper"
 
-fun pingUrl params=
-  strcatlist confGetServerUrl::"/api/ping.jsp?"::params::nil;;
+//-------------------- HTTP Endpoints
+fun bunnyId =
+  netMac;;
 
-fun streamUrl filename=
-  strcatlist confGetServerUrl::"/streams/"::filename::nil;;
+fun apiPath =
+ strcatlist "/api/"::(webmac bunnyId)::nil;;
 
 //-------------------- HTTP
-
-fun _cbdummyhttp http res=
+fun _cbDummyHttp http res=
   0;;
 
 fun _cbHttp http res=
   evalTrame res;
   0;;
 
-#include "lib/record"
+#include "lib/buffer"
 #include "lib/ping"
+#include "lib/logger"
+
+//inputs
+// #include "lib/rfid"
+#include "lib/record"
+#include "lib/button"
+
+//outputs
+#include "lib/playback"
+#include "lib/led"
+#include "lib/ear"
 
 fun evalTrame res=
   let parseResponse httpgetcontent res -> bufferlist in
@@ -73,8 +65,7 @@ fun evalTrame res=
         )
         else if code == 17 then // LOG
         (
-          httprequest "POST" logUrl (strcat "logs=" logs) #_cbdummyhttp HTTP_NORMAL;
-          set logs = "";
+          sendLogs;
           0
         )
         else if code == 18 then // ERROR
@@ -141,29 +132,21 @@ fun evalTrame res=
     )
 ;;
 
-//inputs
-// #include "lib/rfid"
-#include "lib/button"
-
-//outputs
-#include "lib/led"
-#include "lib/ear"
-
 //###############################################
 //-------------------- LOOP ---------------------
 fun loop=
   wifiRun;
   wifiCheck;
 
-  // checkRFID;
-  checkButton;
+  // rfidCheck;
+  buttonCheck;
 
   setLeds;
   earRead 0;
   earRead 1;
 
   pingCheck;
-  // wavtime;
+  wavtime;
 
   recordingCheck;
 0;;

data/examples/record/server.rb

@@ -5,8 +5,6 @@ require "echonest"
 
 class Server < NabaztagHackKit::Server
 
-  REC_FILE = "rec.wav"
-
   def initialize(echonest_cfg, soundcloud_cfg)
     super('bytecode.bin')
     @@echonest   = Echonest(echonest_cfg[:key])

data/lib/nabaztag_hack_kit/server.rb

@@ -7,12 +7,16 @@ module NabaztagHackKit
   class Server < Sinatra::Base
     include Message::Api
 
-    PREFIX = "/api"
+    configure :production, :development do
+      enable :logging
+    end
+
+    REC_FILE = "rec.wav"
+    PREFIX = "/api/:bunnyid"
 
     def initialize(bytecode_path = nil)
       super
-      @bytecode_path = bytecode_path || File.expand_path(File.join('../', 'public', 'bytecode.bin'), __FILE__)
-      puts "Serving Bytecode from #{@bytecode_path}"
+      @bytecode_path = bytecode_path || public_file('bytecode.bin')
     end
 
     class << self
@@ -46,27 +50,26 @@ module NabaztagHackKit
       if callback = self.class.callbacks[action.to_s]
         instance_exec data, request, &callback
       else
-        # puts "no callback found for #{action}"
+        logger.warn "no callback found for #{action}"
         send_nabaztag OK
       end
     end
 
     get "/" do
-      path = File.expand_path(File.join('../', 'public', 'index.html'), __FILE__)
-      puts path
-      File.read(path)
+      File.read public_file("index.html")
     end
 
     get "/bc.jsp" do
-      # TODO recompile if changed
+      logger.info "Serving Bytecode from #{@bytecode_path}"
       send_file @bytecode_path
     end
 
     post "#{PREFIX}/log.jsp" do
-      @logs = parse_log params[:logs]
-      puts "#########################"
-      puts @logs.join("\n")
-      puts "#########################"
+      parse_log(params[:logs]).tap do |logs|
+        logger.info "#########################"
+        logger.info logs.join("\n")
+        logger.info "#########################"
+      end
       send_nabaztag OK
     end
 
@@ -86,11 +89,26 @@ module NabaztagHackKit
       callback('button-pressed', params[:duration], request)
     end
 
+    get "/streams/:file.mp3" do
+      File.read public_file("#{params[:file]}.mp3")
+    end
+
     # generic callback
     %w(get post).each do |method|
       send(method, "#{PREFIX}/:action.jsp") do
         callback(params[:action], params, request)
       end
     end
+
+    # generic catchall
+    get "/*" do
+      logger.warn "no route found for #{params[:splat]}"
+      status 404
+    end
+
+    protected
+    def public_file(name)
+      File.expand_path(File.join('..', 'public', name), __FILE__)
+    end
   end
 end

data/lib/nabaztag_hack_kit/version.rb

@@ -1,3 +1,3 @@
 module NabaztagHackKit
-  VERSION = "0.1.0.alpha2"
+  VERSION = "0.1.0.alpha3"
 end

data/spec/integration/server_spec.rb

@@ -21,26 +21,26 @@ describe NabaztagHackKit::Server do
     it_behaves_like :successful_route
   end
 
-  describe "/api/log.jsp" do
-    let(:route) { "/api/log.jsp" }
+  describe "log.jsp" do
+    let(:route) { "/api/bunnyid/log.jsp" }
 
     it_behaves_like :successful_route
   end
 
-  describe "/api/rfid.jsp" do
-    let(:route) { "/api/rfid.jsp" }
+  describe "rfid.jsp" do
+    let(:route) { "/api/bunnyid/rfid.jsp" }
 
     it_behaves_like :successful_route
   end
 
-  describe "/api/recording-finished.jsp" do
-    let(:route) { "/api/recording-finished.jsp" }
+  describe "recording-finished.jsp" do
+    let(:route) { "/api/bunnyid/recording-finished.jsp" }
 
     it_behaves_like :successful_route
   end
 
   describe "catch all route" do
-    let(:route) { "/api/custom.jsp" }
+    let(:route) { "/api/bunnyid/custom.jsp" }
 
     it_behaves_like :successful_route
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nabaztag_hack_kit
 version: !ruby/object:Gem::Version
-  version: 0.1.0.alpha2
+  version: 0.1.0.alpha3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bytecode/bin
 cert_chain: []
-date: 2012-09-11 00:00:00.000000000Z
+date: 2012-09-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70237085758020 !ruby/object:Gem::Requirement
+  requirement: &70172330100880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70237085758020
+  version_requirements: *70172330100880
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70237085757480 !ruby/object:Gem::Requirement
+  requirement: &70172330100340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70237085757480
+  version_requirements: *70172330100340
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70237085757020 !ruby/object:Gem::Requirement
+  requirement: &70172330099880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70237085757020
+  version_requirements: *70172330099880
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70237085756560 !ruby/object:Gem::Requirement
+  requirement: &70172330099420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70237085756560
+  version_requirements: *70172330099420
 description: Sinatra server api framework to run custom bytecode on Nabaztag v1/v2.
   Sources + Compiler included (linux only)
 email:
@@ -84,7 +84,9 @@ files:
 - bytecode/lib/data_helper.mtl
 - bytecode/lib/ear.mtl
 - bytecode/lib/led.mtl
+- bytecode/lib/logger.mtl
 - bytecode/lib/ping.mtl
+- bytecode/lib/playback.mtl
 - bytecode/lib/record.mtl
 - bytecode/lib/rfid.mtl
 - bytecode/main.mtl