fix socket

client/src/socket.jsx

@@ -28,115 +28,95 @@ function createSocket(events) {
     //   Outgoing
     // -------------
     function send(msg) {
-        if (msg.method !== 'ping') console.log('outgoing msg', msg);
+        if (msg.method !== 'Ping') console.log('outgoing msg', msg);
         ws.send(cbor.encode(msg));
     }
 
     let ping;
     function sendPing() {
         ping = Date.now();
-        send({ method: 'ping', params: {} });
+        send(['Ping', {}]);
-    }
-
-    function sendAccountLogin(name, password) {
-        send({ method: 'account_login', params: { name, password } });
-    }
-
-    function sendAccountCreate(name, password, code) {
-        send({ method: 'account_create', params: { name, password, code } });
     }
 
     function sendAccountConstructs() {
-        send({ method: 'account_constructs', params: {} });
+        send(['AccountConstructs', {}]);
     }
 
     function sendAccountInstances() {
-        send({ method: 'account_instances', params: {} });
+        send(['AccountInstances', {}]);
-    }
-
-    function sendConstructSpawn(name) {
-        send({ method: 'construct_spawn', params: { name } });
-    }
-
-    function sendConstructDelete(id) {
-        send({ method: 'construct_delete', params: { id } });
     }
 
     function sendGameState(id) {
-        send({ method: 'game_state', params: { id } });
+        send(['GameState', { id }]);
     }
 
     function sendGameReady(id) {
-        send({ method: 'game_ready', params: { id } });
+        send(['GameReady', { id }]);
     }
 
     function sendInstanceState(instanceId) {
-        send({ method: 'instance_state', params: { instance_id: instanceId } });
+        send(['InstanceState', { instance_id: instanceId }]);
     }
 
     function sendInstanceList() {
-        send({ method: 'instance_list', params: {} });
+        send(['InstanceList', {}]); }
-    }
 
     function sendVboxAccept(instanceId, group, index) {
-        send({ method: 'vbox_accept', params: { instance_id: instanceId, group, index } });
+        send(['VboxAccept', { instance_id: instanceId, group, index }]);
         events.clearInstance();
     }
 
     function sendVboxApply(instanceId, constructId, index) {
-        send({ method: 'vbox_apply', params: { instance_id: instanceId, construct_id: constructId, index } });
+        send(['VboxApply', { instance_id: instanceId, construct_id: constructId, index }]);
         events.clearInstance();
     }
 
     function sendVboxUnequip(instanceId, constructId, target) {
-        send({ method: 'vbox_unequip', params: { instance_id: instanceId, construct_id: constructId, target } });
+        send(['VboxUnequip', { instance_id: instanceId, construct_id: constructId, target }]);
         events.clearInstance();
     }
 
     function sendVboxDiscard(instanceId) {
-        send({ method: 'vbox_discard', params: { instance_id: instanceId } });
+        send(['VboxDiscard', { instance_id: instanceId }]);
         events.clearInstance();
     }
 
     function sendVboxCombine(instanceId, indices) {
-        send({ method: 'vbox_combine', params: { instance_id: instanceId, indices } });
+        send(['VboxCombine', { instance_id: instanceId, indices }]);
         events.clearCombiner();
     }
 
     function sendVboxReclaim(instanceId, index) {
-        send({ method: 'vbox_reclaim', params: { instance_id: instanceId, index } });
+        send(['VboxReclaim', { instance_id: instanceId, index }]);
         events.clearInstance();
     }
 
     function sendItemInfo() {
-        send({ method: 'item_info', params: {} });
+        send(['ItemInfo', {}]);
     }
 
     function sendGameSkill(gameId, constructId, targetConstructId, skill) {
-        send({
+        send(['GameSkill',
-            method: 'game_skill',
+            { game_id: gameId, construct_id: constructId, target_construct_id: targetConstructId, skill, },
-            params: {
+        ]);
-                game_id: gameId, construct_id: constructId, target_construct_id: targetConstructId, skill,
-            },
-        });
         events.setActiveSkill(null);
     }
 
     function sendGameTarget(gameId, constructId, skillId) {
-        send({ method: 'game_target', params: { game_id: gameId, construct_id: constructId, skill_id: skillId } });
+        send(['GameTarget', { game_id: gameId, construct_id: constructId, skill_id: skillId }]);
         events.setActiveSkill(null);
     }
 
     function sendInstanceJoin(instanceId, constructs) {
-        send({ method: 'instance_join', params: { instance_id: instanceId, construct_ids: constructs } });
+        send(['Instancejoin', { instance_id: instanceId, construct_ids: constructs }]);
     }
 
     function sendInstanceNew(constructs, name, pve) {
-        send({ method: 'instance_new', params: { construct_ids: constructs, name, pve } });
+        send(['Instancenew', { construct_ids: constructs, name, pve }]);
     }
 
     function sendInstanceReady(instanceId) {
-        send({ method: 'instance_ready', params: { instance_id: instanceId } });
+        send(['instance_ready', { instance_id: instanceId }]);
     }
 
     function sendMtxApply(constructId, mtx) {
@@ -155,7 +135,7 @@ function createSocket(events) {
 
     function onAccountInstances(list) {
         events.setAccountInstances(list);
-        // setTimeout(sendAccountInstances, 5000);
+        setTimeout(sendAccountInstances, 5000);
     }
 
     function onAccountConstructs(constructs) {
@@ -205,7 +185,7 @@ function createSocket(events) {
     let pongTimeout;
     function onPong() {
         events.setPing(Date.now() - ping);
-        // pongTimeout = setTimeout(sendPing, 1000);
+        pongTimeout = setTimeout(sendPing, 1000);
     }
 
     // -------------
@@ -309,16 +289,12 @@ function createSocket(events) {
     return {
         clearGameStateTimeout,
         clearInstanceStateTimeout,
-        sendAccountLogin,
-        sendAccountCreate,
         sendAccountConstructs,
         sendAccountInstances,
         sendGameState,
         sendGameReady,
         sendGameSkill,
         sendGameTarget,
-        sendConstructSpawn,
-        sendConstructDelete,
         sendInstanceJoin,
         sendInstanceList,
         sendInstanceReady,

server/src/rpc.rs

@@ -156,7 +156,7 @@ pub fn receive(data: Vec<u8>, db: &Db, _client: &mut MnmlWs, begin: Instant, acc
         },
         Err(e) => {
             info!("{:?}", e);
-            Err(err_msg("invalid message"))
+            Err(format_err!("invalid message data={:?}", data))
         },
     }
 }