Implement simplified metacom client

Refs: #152
PR-URL: #161

Author: tshemsedinov

static/.eslintrc.json

@@ -0,0 +1,5 @@
+{
+  "parserOptions": {
+    "sourceType": "module"
+  }
+}

static/console.js

@@ -1,39 +1,8 @@
-'use strict';
+import { Metacom } from './metacom.js';
 
-// API Builder
-
-const socket = new WebSocket('wss://' + location.host);
-
-const buildAPI = (methods, socket = null) => {
-  const api = {};
-  for (const method of methods) {
-    api[method] = (args = {}) => new Promise((resolve, reject) => {
-      if (socket) {
-        socket.send(JSON.stringify({ method, args }));
-        socket.onmessage = event => {
-          const obj = JSON.parse(event.data);
-          if (obj.result !== 'error') resolve(obj);
-          else reject(new Error(`Status Code: ${obj.reason}`));
-        };
-      } else {
-        fetch(`/api/${method}`, {
-          method: 'POST',
-          headers: { 'Content-Type': 'application/json' },
-          body: JSON.stringify(args),
-        }).then(res => {
-          const { status } = res;
-          if (status === 200) resolve(res.json());
-          else reject(new Error(`Status Code: ${status}`));
-        });
-      }
-    });
-  }
-  return api;
-};
-
-let api = buildAPI(['status', 'signIn', 'introspection'], socket);
-
-// Console Emulation
+const metacom = new Metacom(location.host);
+const { api } = metacom;
+window.api = api;
 
 const ALPHA_UPPER = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
 const ALPHA_LOWER = 'abcdefghijklmnopqrstuvwxyz';
@@ -276,12 +245,12 @@ function commandLoop() {
 
 const signIn = async () => {
   try {
+    await metacom.load('status', 'signIn', 'introspection');
     await api.status();
   } catch (err) {
     await api.signIn({ login: 'marcus', password: 'marcus' });
   }
-  const methods = await api.introspection();
-  api = buildAPI(methods, socket);
+  await metacom.load('example');
 };
 
 window.addEventListener('load', () => {

static/index.html

@@ -5,7 +5,7 @@
     <meta charset="utf-8">
     <link rel="manifest" href="/manifest.json">
     <link rel="stylesheet" href="/console.css">
-    <script src="console.js"></script>
+    <script src="console.js" type="module"></script>
     <meta name="HandheldFriendly" content="true" />
     <meta name="apple-mobile-web-app-capable" content="yes" />
     <meta name="apple-mobile-web-app-status-bar-style" content="black" />

static/metacom.js

@@ -0,0 +1,59 @@
+export class Metacom {
+  constructor(host) {
+    this.socket = new WebSocket('wss://' + host);
+    this.api = {};
+    this.callId = 0;
+    this.calls = new Map();
+    this.socket.onmessage = ({ data }) => {
+      try {
+        const packet = JSON.parse(data);
+        const { callback, event } = packet;
+        const callId = callback || event;
+        const [resolve, reject] = this.calls.get(callId);
+        if (packet.error) {
+          const { code, message } = packet.error;
+          const error = new Error(message);
+          error.code = code;
+          reject(error);
+          return;
+        }
+        resolve(packet.result);
+      } catch (err) {
+        console.error(err);
+      }
+    };
+  }
+
+  async load(...methods) {
+    for (const methodName of methods) {
+      this.api[methodName] = this.socketCall(methodName);
+    }
+  }
+
+  httpCall(methodName) {
+    return (args = {}) => {
+      const callId = ++this.callId;
+      const packet = { call: callId, [methodName]: args };
+      return fetch('/api', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify(packet),
+      }).then(res => {
+        const { status } = res;
+        if (status === 200) return res.json().then(({ result }) => result);
+        throw new Error(`Status Code: ${status}`);
+      });
+    };
+  }
+
+  socketCall(methodName) {
+    return (args = {}) => {
+      const callId = ++this.callId;
+      return new Promise((resolve, reject) => {
+        this.calls.set(callId, [resolve, reject]);
+        const packet = { call: callId, [methodName]: args };
+        this.socket.send(JSON.stringify(packet));
+      });
+    };
+  }
+}