Switch to a multi-request/response API to make batching possible.

api.py

@@ -26,74 +26,82 @@ from cosmopolite.lib import utils
 import config
 
 
-class SetValue(webapp2.RequestHandler):
-  @utils.chaos_monkey
-  @utils.returns_json
-  @utils.local_namespace
-  @security.google_user_xsrf_protection
-  @security.weak_security_checks
-  @session.session_required
-  @db.transactional()
-  def post(self):
-    entry_key = self.request.get('key')
-    entry_value = self.request.get('value')
-    public = (self.request.get('public') == 'true')
-
-    entries = (models.StateEntry.all()
-               .ancestor(self.client.parent_key())
-               .filter('entry_key =', entry_key)
-               .fetch(1))
-    if entries:
-      entry = entries[0]
-      entry.entry_value = entry_value
-      entry.public = public
-    else:
-      entry = models.StateEntry(
-          parent=self.client.parent_key(),
-          entry_key=entry_key,
-          entry_value=entry_value,
-          public=public)
-
-    entry.put()
-    msg = entry.ToMessage()
-    clients = (models.Client.all()
-               .ancestor(self.client.parent_key()))
-    for client in clients:
-      client.SendMessage(msg)
-
-    return {}
-
-
-class CreateChannel(webapp2.RequestHandler):
+@db.transactional()
+def SetValue(google_user, client, args):
+  entry_key = args['key']
+  entry_value = args['value']
+  public = (args['public'] == 'true')
+
+  entries = (models.StateEntry.all()
+             .ancestor(client.parent_key())
+             .filter('entry_key =', entry_key)
+             .fetch(1))
+  if entries:
+    entry = entries[0]
+    entry.entry_value = entry_value
+    entry.public = public
+  else:
+    entry = models.StateEntry(
+        parent=client.parent_key(),
+        entry_key=entry_key,
+        entry_value=entry_value,
+        public=public)
+
+  entry.put()
+  msg = entry.ToMessage()
+  clients = (models.Client.all()
+             .ancestor(client.parent_key()))
+  for client in clients:
+    client.SendMessage(msg)
+
+  return {}
+
+
+def CreateChannel(google_user, client, args):
+  token = channel.create_channel(
+      client_id=str(client.key()),
+      duration_minutes=config.CHANNEL_DURATION_SECONDS / 60)
+  messages = [x.ToMessage()
+              for x in client.parent().GetStateEntries()]
+  if google_user:
+    messages.append({
+        'message_type': 'login',
+        'google_user':  google_user.email(),
+    })
+  else:
+    messages.append({
+        'message_type': 'logout',
+    })
+
+  return {
+    'token': token,
+    'messages': messages,
+  }
+
+
+class APIWrapper(webapp2.RequestHandler):
+
+  _COMMANDS = {
+      'createChannel': CreateChannel,
+      'setValue': SetValue,
+  }
+
   @utils.chaos_monkey
+  @utils.expects_json
   @utils.returns_json
   @utils.local_namespace
   @security.google_user_xsrf_protection
   @security.weak_security_checks
   @session.session_required
   def post(self):
-    token = channel.create_channel(
-        client_id=str(self.client.key()),
-        duration_minutes=config.CHANNEL_DURATION_SECONDS / 60)
-    messages = [x.ToMessage()
-                for x in self.client.parent().GetStateEntries()]
-    if self.verified_google_user:
-      messages.append({
-          'message_type': 'login',
-          'google_user':  self.verified_google_user.email(),
-      })
-    else:
-      messages.append({
-          'message_type': 'logout',
-      })
-
-    return {
-      'token': token,
-      'messages': messages,
-    }
+    ret = []
+    for command in self.request_json['commands']:
+      callback = self._COMMANDS[command['command']]
+      result = callback(self.verified_google_user, self.client, command.get('arguments', {}))
+      ret.append(result)
+    return ret
 
 
 app = webapp2.WSGIApplication([
-  (config.URL_PREFIX + '/api/createChannel', CreateChannel),
-  (config.URL_PREFIX + '/api/setValue', SetValue),
+  (config.URL_PREFIX + '/api', APIWrapper),
 ])