Commit 90a6a8a0 authored by martin hou's avatar martin hou

fix: 取消对消息不一致的应答的处理

parent d4845cb8
......@@ -264,7 +264,7 @@ function Jensen(log, conn) {
if (commands.length == 0) return;
cmd = commands.shift();
if (cmd.expireTime > 0 && cmd.expireTime < now) {
Logger.info('jensen', 'sendNext', 'expired: cmd-' + cmd.command + '-' + cmd.index + ', ' + COMMAND_NAMES[cmd.command]);
Logger.info('jensen', 'sendNext', 'expired: cmd-' + cmd.command + '-' + cmd.index + ', ' + cmd.command);
continue;
}
break;
......@@ -272,7 +272,7 @@ function Jensen(log, conn) {
let data = cmd.make();
current = 'cmd-' + cmd.command + '-' + cmd.index;
Logger.debug('jensen', 'sendNext', pid + '-command: ' + COMMAND_NAMES[cmd.command] + ', data bytes: ' + data.byteLength);
Logger.debug('jensen', 'sendNext', pid + '-command: ' + cmd.command + ', data bytes: ' + data.byteLength);
self.timewait = cmd.command == TRANSFER_FILE || cmd.command == GET_FILE_BLOCK ? 1000 : 10;
console.log(pid + 'Send', data);
......@@ -326,7 +326,7 @@ function Jensen(log, conn) {
if (current == null) return;
Logger.debug('jensen', 'trigger', pid + ':trigger - ' + current.substring(0, current.lastIndexOf('-')) + ' <---> cmd-' + (msgid || 'err'));
if (current.substring(0, current.lastIndexOf('-')) != 'cmd-' + msgid) {
current = null;
// current = null;
return;
}
if (current in actions == false) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment