API execution code unification

PR-URL: #105

Author: tshemsedinov

lib/server.js

@@ -70,36 +70,33 @@ class Client {
     this.res.end(`HTTP ${status}: ${http.STATUS_CODES[status]}`);
   }
 
-  async api() {
-    const { semaphore } = this.application.server;
+  async apihttp(method, args) {
+    const { res, application } = this;
+    const { semaphore } = application.server;
     try {
       await semaphore.enter();
     } catch {
       this.error(504);
       return;
     }
-    const { req, res } = this;
-    const { url } = req;
-    const name = url.substring(METHOD_OFFSET);
     const session = await this.application.auth.restore(this);
-    const args = await receiveArgs(req);
     const sandbox = session ? session.sandbox : undefined;
     const context = session ? session.context : {};
     try {
-      const exp = this.application.runScript(name, sandbox);
-      const { method, access } = exp(context);
-      if (!session && access !== 'public') {
-        this.application.logger.error(`Forbidden ${url}`);
+      const exp = this.application.runScript(method, sandbox);
+      const proc = exp(context);
+      if (!session && proc.access !== 'public') {
+        this.application.logger.error(`Forbidden ${method}`);
         this.error(403);
         semaphore.leave();
         return;
       }
-      const result = await method(args);
+      const result = await proc.method(args);
       if (res.finished) {
         semaphore.leave();
         return;
       }
-      if (!session && access === 'public') {
+      if (!session && proc.access === 'public') {
         this.application.auth.start(this, result.userId);
       }
       res.end(JSON.stringify(result));
@@ -109,6 +106,41 @@ class Client {
     }
     semaphore.leave();
   }
+
+  async apiws(method, args) {
+    const { connection, application } = this;
+    const { semaphore } = application.server;
+    const send = obj => connection.send(JSON.stringify(obj));
+    try {
+      await semaphore.enter();
+    } catch {
+      send({ result: 'error', reason: 'timeout' });
+      return;
+    }
+    try {
+      const session = await application.auth.restore(this);
+      const sandbox = session ? session.sandbox : undefined;
+      const context = session ? session.context : {};
+      const exp = application.runScript(method, sandbox);
+      const proc = exp(context);
+      if (!session && proc.access !== 'public') {
+        application.logger.error(`Forbidden: ${method}`);
+        send({ result: 'error', reason: 'forbidden' });
+        semaphore.leave();
+        return;
+      }
+      const result = await proc.method(args);
+      if (!session && proc.access === 'public') {
+        const session = application.auth.start(this, result.userId);
+        result.token = session.token;
+      }
+      send(result);
+    } catch (err) {
+      application.logger.error(err.stack);
+      send({ result: 'error' });
+    }
+    semaphore.leave();
+  }
 }
 
 const listener = application => (req, res) => {
@@ -133,48 +165,19 @@ const listener = application => (req, res) => {
 
   application.logger.log(`${method}\t${url}`);
   if (url.startsWith('/api/')) {
-    if (method === 'POST') client.api();
-    else client.error(403);
+    if (method !== 'POST') {
+      client.error(403);
+      return;
+    }
+    receiveArgs(req).then(args => {
+      const method = url.substring(METHOD_OFFSET);
+      client.apihttp(method, args);
+    });
   } else {
     client.static();
   }
 };
 
-const apiws = async (client, message) => {
-  const { connection, application } = client;
-  const { semaphore } = application.server;
-  const send = obj => connection.send(JSON.stringify(obj));
-  try {
-    await semaphore.enter();
-  } catch {
-    send({ result: 'error', reason: 'timeout' });
-    return;
-  }
-  try {
-    const { method: name, args } = JSON.parse(message);
-    const session = await application.auth.restore(client);
-    const sandbox = session ? session.sandbox : undefined;
-    const context = session ? session.context : {};
-    const exp = application.runScript(name, sandbox);
-    const { method, access } = exp(context);
-    if (!session && access !== 'public') {
-      application.logger.error(`Forbidden: ${name}`);
-      send({ result: 'error', reason: 'forbidden' });
-      semaphore.leave();
-      return;
-    }
-    const result = await method(args);
-    if (!session && access === 'public') {
-      const session = application.auth.start(client, result.userId);
-      result.token = session.token;
-    }
-    send(result);
-  } catch (err) {
-    application.logger.error(err.stack);
-    send({ result: 'error' });
-  }
-  semaphore.leave();
-};
 
 class Server {
   constructor(config, application) {
@@ -192,7 +195,8 @@ class Server {
       this.ws.on('connection', (connection, req) => {
         const client = new Client(req, null, application, connection);
         connection.on('message', message => {
-          apiws(client, message);
+          const { method, args } = JSON.parse(message);
+          client.apiws(method, args);
         });
       });
     }