Decompose Channel.prototype.rpc

PR-URL: #146

Author: tshemsedinov

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## [Unreleased][unreleased]
 
 - Move Semaphore and timeout to metautil
+- Decompose Channel.prototype.rpc
 
 ## [1.4.0][] - 2021-02-17
 

lib/channel.js

@@ -184,51 +184,55 @@ class Channel {
   }
 
   async rpc(callId, interfaceName, methodName, args) {
-    const { res, connection, application, session, client } = this;
-    const { semaphore } = application.server;
+    const { application, session, client } = this;
+    const [iname, ver = '*'] = interfaceName.split('.');
+    const proc = application.getMethod(iname, ver, methodName);
+    if (!proc) {
+      this.error(404, null, callId);
+      return;
+    }
     try {
-      await semaphore.enter();
+      await proc.enter();
     } catch {
       this.error(504, null, callId);
       return;
     }
-    const [iname, ver = '*'] = interfaceName.split('.');
+    const context = session ? session.context : { client };
+    const publicMethod = proc.access === 'public';
+    if (!this.session && !publicMethod) {
+      this.error(403, null, callId);
+      return;
+    }
+    let result = null;
     try {
-      const context = session ? session.context : { client };
-      const proc = application.getMethod(iname, ver, methodName);
-      if (!proc) {
-        this.error(404, null, callId);
-        return;
-      }
-      if (!this.session && proc.access !== 'public') {
-        this.error(403, null, callId);
-        return;
-      }
-      const result = await application.invoke(context, proc, args);
-      if (result instanceof Error) {
-        this.error(result.code, result, callId);
-        return;
-      }
-      const id = result ? result.systemUserId : 0;
-      if (!this.session && id && proc.access === 'public') {
-        this.session = application.auth.startSession(this, id);
-        result.token = this.token;
-      }
-      const data = JSON.stringify({ callback: callId, result });
-      if (connection) {
-        connection.send(data);
-      } else {
-        res.writeHead(200, { 'Content-Type': MIME_TYPES.json, ...HEADERS });
-        res.end(data);
-      }
-      const { ip, token } = this;
-      const who = id > 0 ? id : token;
-      const record = `${ip}\t${who}\t${interfaceName}/${methodName}`;
-      application.console.log(record);
+      result = await proc.invoke(context, args);
     } catch (err) {
       this.error(500, err, callId);
     } finally {
-      semaphore.leave();
+      proc.leave();
+    }
+    this.reply(callId, result, publicMethod);
+    const record = `${this.ip}\t${interfaceName}/${methodName}`;
+    application.console.log(record);
+  }
+
+  reply(callId, result, publicMethod) {
+    const { res, connection, application } = this;
+    if (result instanceof Error) {
+      this.error(result.code, result, callId);
+      return;
+    }
+    const id = result ? result.systemUserId : 0;
+    if (!this.session && id && publicMethod) {
+      this.session = application.auth.startSession(this, id);
+      result.token = this.token;
+    }
+    const data = JSON.stringify({ callback: callId, result });
+    if (connection) {
+      connection.send(data);
+    } else {
+      res.writeHead(200, { 'Content-Type': MIME_TYPES.json, ...HEADERS });
+      res.end(data);
     }
   }