ass 0.0.15 → 0.0.17

data/VERSION

@@ -1 +1 @@
-0.0.15
+0.0.17

data/ass.yml

@@ -3,5 +3,7 @@ mode: development
 log: off
 cron: cron
 timer: 0
+user: admin
+pass: pass
 apps:
 - app1

data/cron

@@ -1,11 +1,12 @@
+#encoding: utf-8
 #!/usr/bin/env ruby
-# -*- coding: utf-8 -*-
 
 require 'rubygems'
 require 'yaml'
 require 'cgi'
 require 'digest/sha2'
 require 'uri-handler'
+require 'net/http'
 
 ###########################################################################
 ####
@@ -26,13 +27,25 @@ $apps = config['apps'] || []
 ## Using curl command to send push notification message
 ############################################################
 
-@message = CGI::escape("This is an push notification message sent by ASS".to_uri)
+@message = "This is an push notification message sent by ASS" # CGI::escape("This is an push notification message sent by ASS".to_uri)
 
 #@pid = Digest::SHA2.hexdigest("#{Time.now.to_i}")
 @pid = "#{Time.now.to_i}"
 
+
+## get api 
 $apps.each { |app|
   sleep 1
-  puts "curl http://localhost:#{$port}/v1/apps/#{app}/push/#{@message}/#{@pid}"
-  system "curl http://localhost:#{$port}/v1/apps/#{app}/push/#{@message}/#{@pid}"
+#  system "curl http://localhost:#{$port}/v1/apps/#{app}/push/#{@message}/#{@pid}"
 }
+
+## post api 
+begin  
+  url = URI.parse("http://localhost:#{$port}/v1/apps/#{app}/push")
+  post_args1 = { :alert => "#{@message}", :pid => "#{@pid}" }
+  puts url
+  Net::HTTP.post_form(url, post_args1) 
+rescue =>err  
+  puts "#{err.class} ##{err}"  
+end  
+

data/lib/ass.rb

@@ -1,5 +1,4 @@
-#!/usr/bin/env ruby
-# -*- coding: utf-8 -*-
+#encoding: utf-8
 
 require 'rubygems'
 require 'sinatra'
@@ -12,7 +11,14 @@ require 'eventmachine'
 require 'sinatra/base'
 require 'yaml'
 require 'uri-handler'
+require 'net/http'
 require 'active_support'
+require 'json'
+require 'digest/sha2'
+require 'will_paginate'
+require 'will_paginate/sequel'  # or data_mapper/sequel
+require 'uri' 
+require 'sinatra/reloader' if development?
 
 ############################################################
 ## Initilization Setup
@@ -45,6 +51,8 @@ $mode = config['mode'] || env
 $VERSION = File.open("#{ROOTDIR}/VERSION", "rb").read
 $apps = config['apps'] || []
 $log = config['log'] || 'off'
+$user = config['user'] || 'admin'
+$pass = config['pass'] || 'pass'
 
 ############################################################
 ## Certificate Key Setup
@@ -71,15 +79,15 @@ end
 
 unless check_cert then
   html = <<-END
-1: please provide certificate key pem file under current directory, name should be: appid_dev.pem for development and appid_prod.pem for production
+1: please provide certificate key pem file under current directory, name should be: appid_development.pem for development and appid_production.pem for production
 2: edit your ass.yml under current directory
 3: run ass
 4: iOS Client: in AppDelegate file, didRegisterForRemoteNotificationsWithDeviceToken method should access url below:
-END
+  END
   $apps.each { |app|
     html << "'#{app}'s registration url:  http://serverIP:#{$port}/v1/apps/#{app}/DeviceToken"
   }
-  html <<  "5: Server: cron should access 'curl http://localhost:#{$port}/v1/app/push/{messages}/{pid}' to send push message"
+  html << "5: Server: cron should access 'curl http://localhost:#{$port}/v1/app/push/{messages}/{pid}' to send push message"
   puts html
   exit
 else
@@ -89,7 +97,7 @@ Apple Service Server(#{$VERSION}) is Running ...
 Push Notification Service: Enabled
 Mode: #{$mode}
 Port: #{$port}
-END
+  END
   html << "#{'*'*80}"
   html << "Cron Job: '#{Dir.pwd}/#{$cron}' script is running every #{$timer} #{($timer == 1) ? 'minute' : 'minutes'} " unless "#{$timer}".to_i == 0
   html << "\n"
@@ -110,20 +118,38 @@ unless File.exist?("#{Dir.pwd}/ass.db") then
     primary_key :id
     String :app, :unique => false, :null => false
     String :token, :unique => false, :null => false, :size => 100
+    Time :created_at
     index [:app, :token]
   end
 
   $DB.create_table :pushes do
     primary_key :id
     String :pid, :unique => true, :null => false, :size => 100
-    index :pid
+    String :app, :unique => true, :null => false, :size => 30
+    String :message, :unique => false, :null => false, :size => 107
+    Time :created_at
+    index [:pid, :message]
   end
 else
   $DB = Sequel.connect("sqlite://#{Dir.pwd}/ass.db")
 end
 
-Token = $DB[:tokens]
-Push = $DB[:pushes]
+WillPaginate.per_page = 10
+
+# Token = $DB[:tokens]
+# Push = $DB[:pushes]
+
+class Token < Sequel::Model
+  Sequel.extension :pagination
+
+  # here is your code
+end
+
+class Push < Sequel::Model
+  Sequel.extension :pagination
+
+  # here is your code
+end
 
 ############################################################
 ## Timer Job Setup
@@ -142,17 +168,29 @@ end
 ############################################################
 
 class App < Sinatra::Base
-  
+
   set :root, File.expand_path('../../', __FILE__)
   set :port, "#{$port}".to_i
   set :public_folder, File.dirname(__FILE__) + '/../public'
-  set :views, File.dirname(__FILE__) + '/../views'    
+  set :views, File.dirname(__FILE__) + '/../views'
+
+  def authorized?
+    @auth ||= Rack::Auth::Basic::Request.new(request.env)
+    @auth.provided? && @auth.basic? && @auth.credentials && @auth.credentials == ["#{$user}", "#{$pass}"]
+  end
+
+  def protected!
+    unless authorized?
+      response['WWW-Authenticate'] = %(Basic realm="Restricted Area")
+      throw(:halt, [401, "Oops... we need your login name & password\n"])
+    end
+  end
 
   configure :production, :development do
     if "#{$log}".strip == 'on' then
-      enable :logging 
+      enable :logging
     end
-  end  
+  end
 
   if "#{$mode}".strip == 'development' then
     set :show_exceptions, true
@@ -166,10 +204,60 @@ class App < Sinatra::Base
     erb :index
   end
 
+  get '/about' do
+    erb :about
+  end
+
+  not_found do
+    erb :not_found
+  end  
+
+  error do
+    @error = params['captures'].first.inspect
+  end  
+
+  post '/v1/send' do
+    app = params[:app]
+    message = CGI::escape(params[:message] || "")   
+    pid = "#{Time.now.to_i}"   
+    # begin  
+    #   url = URI.parse("http://localhost:#{$port}/v1/apps/#{app}/push")
+    #   post_args1 = { :alert => "#{message}".encode('UTF-8'), :pid => "#{pid}" }
+    #   Net::HTTP.post_form(url, post_args1) 
+    # rescue =>err  
+    #   puts "#{err.class} ##{err}"  
+    # end   
+    system "curl http://localhost:#{$port}/v1/apps/#{app}/push/#{message}/#{pid}"  
+    redirect '/' if (params[:app] and  params[:message])
+  end  
+
+  get "/v1/admin/:db" do
+    protected!
+    db = params[:db] || 'token'
+    page = 1
+    page = params[:page].to_i if params[:page]
+    if (db == 'token') then 
+      @o = []
+      $apps.each_with_index { |app, index|
+        @o << Token.where(:app => app).order(:id).reverse.paginate(page, 20)
+      }
+      erb :token
+    end
+    if (db == 'push') then 
+      @p = []
+      $apps.each_with_index { |app, index|
+        @p << Push.where(:app => app).order(:id).reverse.paginate(page, 20)
+      }
+      erb :push
+    end
+  end  
+
   $apps.each { |app|
+
+    ## register token api
     get "/v1/apps/#{app}/:token" do
-      puts "[#{params[:token]}] was added to '#{app}'" if "#{$mode}".strip == 'development' 
-      o = Token.first(:app => app , :token => params[:token])
+      puts "[#{params[:token]}] was added to '#{app}'" if "#{$mode}".strip == 'development'
+      o = Token.first(:app => app, :token => params[:token])
       unless o
         Token.insert(
             :app => app,
@@ -178,12 +266,65 @@ class App < Sinatra::Base
       end
     end
 
+    ## http POST method push api
+    post "/v1/apps/#{app}/push" do
+      protected! unless request.host == 'localhost'
+      message = CGI::unescape(params[:alert] || "")[0..107]
+      badge = 1
+      puts "params[:badge] = [#{params[:badge]}]"
+      badge = params[:badge].to_i if params[:badge] and params[:badge] != ''
+      sound = CGI::unescape(params[:sound] || "")
+      extra = CGI::unescape(params[:extra] || "")
+
+      puts "#{badge} : #{message} extra: #{extra}" if "#{$mode}".strip == 'development'
+      pid = params[:pid]
+
+      puts "'#{message}' was sent to (#{app}) with pid: [#{pid}], badge:#{badge} , sound: #{sound}, extra:#{extra}" if "#{$mode}".strip == 'development'
+
+      @push = Token.where(:app => app)
+      @exist = Push.first(:pid => pid)
+
+      unless @exist
+        openSSLContext = $certkey["#{app}"]
+        # Connect to port 2195 on the server.
+        sock = nil
+        if $mode == 'production' then
+          sock = TCPSocket.new('gateway.push.apple.com', 2195)
+        else
+          sock = TCPSocket.new('gateway.sandbox.push.apple.com', 2195)
+        end
+        # do our SSL handshaking
+        sslSocket = OpenSSL::SSL::SSLSocket.new(sock, openSSLContext)
+        sslSocket.connect
+        #Push.create( :pid => pid )
+        Push.insert(:pid => pid, :message => message, :created_at => Time.now, :app => "#{app}" )
+        # write our packet to the stream
+        @push.each do |o|
+          tokenText = o[:token]
+          # pack the token to convert the ascii representation back to binary
+          tokenData = [tokenText].pack('H*')
+          # construct the payload
+          po = {:aps => {:alert => "#{message}", :badge => badge, :sound => "#{sound}"}, :extra => "#{extra}"}
+          payload = ActiveSupport::JSON.encode(po)
+          # construct the packet
+          packet = [0, 0, 32, tokenData, 0, payload.length, payload].pack("ccca*cca*")
+          # read our certificate and set up our SSL context
+          sslSocket.write(packet)
+        end
+        # cleanup
+        sslSocket.close
+        sock.close
+      end
+    end
+
+    ## http GET method push api
     get "/v1/apps/#{app}/push/:message/:pid" do
+      protected! unless request.host == 'localhost'
       message = CGI::unescape(params[:message])
-      puts message if "#{$mode}".strip == 'development' 
+      puts message if "#{$mode}".strip == 'development'
       pid = params[:pid]
 
-      puts "'#{message}' was sent to (#{app}) with pid: [#{pid}]" if "#{$mode}".strip == 'development' 
+      puts "'#{message}' was sent to (#{app}) with pid: [#{pid}]" if "#{$mode}".strip == 'development'
 
       @push = Token.where(:app => app)
       @exist = Push.first(:pid => pid)

data/views/about.erb

@@ -0,0 +1,9 @@
+<h3>Apple Service Server (<%= $VERSION %>) </h3>
+<p/>
+<p>
+  Author: Eiffel(Q) <br/>
+  Email: <a href="mailto:eiffelqiu@gmail.com"> eiffelqiu@gmail.com </a> <br/>
+  QQ:  1053568  <br/>
+  Github: <a href="https://github.com/eiffelqiu/"> https://github.com/eiffelqiu/ </a>
+<p/>
+<p><a href="https://github.com/eiffelqiu/ass" class="btn btn-primary btn-large">Learn more ASS &raquo;</a></p>

data/views/error.erb

@@ -0,0 +1,6 @@
+<h3>Apple Service Server (<%= $VERSION %>) </h3>
+<p/>
+<p>
+	Oops , you got an error : <%= @error %>
+<p/>
+<p><a href="https://github.com/eiffelqiu/ass" class="btn btn-primary btn-large">Learn more ASS &raquo;</a></p>

data/views/index.erb

@@ -1,26 +1,17 @@
-
-    <h1>Apple Service Server (<%= $VERSION %>) </h1>
-	<hr>
-	<p/>
-    <p><b>
-		author: Eiffel(Q) <br/>
-		email: eiffelqiu@gmail.com <br/>
-		github: https://github.com/eiffelqiu/
-	</b><p/>
-	<hr>	
-	<pre class="prettyprint linenums">		
+<h3>Apple Service Server Usage: </h3>
+<pre class="prettyprint linenums">
     1: How to register notification? (Client Side)
-	
+    
     In AppDelegate file, inside didRegisterForRemoteNotificationsWithDeviceToken method access url below to register device token:
-    <% $apps.each { |app| %>
-    '#{app}':  http://serverIP:#{$port}/v1/apps/#{app}/DeviceToken
-    <% } %>
+
+    http://serverIP:4567/v1/apps/{yourapp}/DeviceToken
+
     2: How to send push notification? (Server Side)
-    <% $apps.each { |app| %> 
-    $ curl http://localhost:#{$port}/v1/apps/#{app}/push/{message}/{pid}
-    <% } %>
+
+    $ curl http://localhost:4567/v1/apps/{yourapp}/push/{message}/{pid}
+
     Note:
     param1 (message): push notification message you want to send, remember the message should be html escaped
-    param2 (pid    ): unique string to mark the message, for example current timestamp or md5/sha1 digest
-	</pre>
+    param2 (pid    ): unique string to mark the message, for example current timestamp or md5/sha1 digest, db table ID
+</pre>
 

data/views/layout.erb

@@ -1,29 +1,49 @@
 <!DOCTYPE html>
 <html>
-  <head>
-    <title>Apple Service Server</title>
-    <!-- Bootstrap -->
-    <link href="css/bootstrap.min.css" rel="stylesheet">
-  </head>
-  <body>
-      <div class="container">
-
-        <!-- Main hero unit for a primary marketing message or call to action -->
-        <div class="hero-unit">
-			<%= yield %>
-          <p><a href="https://github.com/eiffelqiu/ass" class="btn btn-primary btn-large">Learn more &raquo;</a></p>
-        </div>
-
-
-        <hr>
-
-        <footer>
-          <p>&copy; likenote.com 2012</p>
-        </footer>
-
-      </div> <!-- /container -->	  
-    <script src="http://code.jquery.com/jquery-latest.js"></script>
-    <script src="js/bootstrap.min.js"></script>
-  </body>
+<head>
+  <title>Apple Service Server</title>
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <meta name="description" content="Apple Service Server">
+  <meta name="author" content="eiffel.q">  
+  <!-- Bootstrap -->
+  <link href="/css/bootstrap.min.css" rel="stylesheet">  
+  <style type="text/css">
+      footer {
+        height: 60px;
+        background-color: #f5f5f5;   
+      }
+  </style>
+  <link href="/css/bootstrap-responsive.min.css" rel="stylesheet">
+  <link rel="icon" href="/favicon.ico" mce_href="/favicon.ico" type="image/x-icon">
+</head>
+<body>
+<div class="container">
+<div class="navbar navbar-inverse navbar-fixed-top">
+  <div class="navbar-inner">
+    <a class="brand" href="#">Apple Service Server (<%= $VERSION %>)</a>
+    <ul class="nav">
+      <li><a href="/">Home</a></li>
+      <li><a href="/about">About</a></li>
+      <li><a href="/v1/admin/token">Admin</a></li>
+    </ul>
+    <ul class="nav pull-right">
+      <li><a href="mailto:eiffelqiu@gmail.com">Eiffel Qiu</a></li>
+    </ul>    
+  </div>
+</div>
+<!-- Main hero unit for a primary marketing message or call to action -->
+<div class="hero-unit">
+  <%= yield %>
+</div>
+</div>
+<footer id="footer">
+  <div class="container">
+    <p><a href="https://github.com/eiffelqiu/">github.com/eiffelqiu</a>   2013</p>
+  </div>
+</footer>  
+<!-- /container -->
+<script src="http://code.jquery.com/jquery-latest.js"></script>
+<script src="/js/bootstrap.min.js"></script>
+</body>
 </html>