Optimize API execution

Author: tshemsedinov

lib/application.js

@@ -63,7 +63,7 @@ class Application extends events.EventEmitter {
 
   runScript(methodName, sandbox = this.sandbox) {
     const script = this.api.get(methodName);
-    if (!script) throw new Error('Not found');
+    if (!script) return null;
     return script.runInContext(sandbox, SCRIPT_OPTIONS);
   }
 

lib/server.js

@@ -81,44 +81,43 @@ class Client {
     res.end(result);
   }
 
-  async execute(method, args) {
-    const { application } = this;
+  async rpc(method, args) {
+    const { application, res, connection } = this;
     const { semaphore } = application.server;
-    await semaphore.enter();
+    try {
+      await semaphore.enter();
+    } catch {
+      this.error(504);
+      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);
+      if (!exp) {
+        this.error(404);
+        return;
+      }
       const proc = exp(context);
       if (!session && proc.access !== 'public') {
-        semaphore.leave();
-        throw new Error(`Forbidden: /api/${method}`);
+        this.error(403, new Error(`Forbidden: /api/${method}`));
+        return;
       }
       const result = await proc.method(args);
       if (!session && proc.access === 'public') {
         const session = application.auth.start(this, result.userId);
         result.token = session.token;
       }
-      return JSON.stringify(result);
+      const data = JSON.stringify(result);
+      if (connection) connection.send(data);
+      else res.end(data);
+    } catch (err) {
+      this.error(500, err);
     } finally {
       semaphore.leave();
     }
   }
-
-  async rpc(method, args) {
-    const { res, connection } = this;
-    try {
-      const result = await this.execute(method, args);
-      if (connection) connection.send(result);
-      else res.end(result);
-    } catch (err) {
-      if (err.message === 'Not found') this.error(404);
-      else if (err.message === 'Semaphore timeout') this.error(504);
-      else if (err.message.startsWith('Forbidden:')) this.error(403, err);
-      else this.error(500, err);
-    }
-  }
 }
 
 const listener = application => (req, res) => {