Skip to content

fix rpc client 连接 rpc server emit error constants.RPC_ERROR.FAIL_CONNECT_SERVER 没有msg对象 #1001

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zerowise wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix rpc client 连接 rpc server emit error constants.RPC_ERROR.FAIL_CONNECT_SERVER 没有msg对象 #1001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
606e321
Update failureProcess.ts
zerowise May 29, 2025
38d9092
Update mailstation.ts
zerowise May 29, 2025
cf5bea5
Merge branch 'node-pinus:master' into master
zerowise May 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/pinus-rpc/lib/rpc-client/failureProcess.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ let failsafe = function (this: any, code: number, tracer: {[key: string]: any},
case constants.RPC_ERROR.FAIL_CONNECT_SERVER:
if (tracer && tracer.retryTimes <= retryTimes) {
setTimeout(function () {
self.connect(tracer, serverId, cb);
self.connect(tracer, serverId, msg, cb);
}, retryConnectTime * tracer.retryTimes);
} else {
cb(new Error('rpc client failed to connect to remote server: ' + serverId));
Expand Down
12 changes: 6 additions & 6 deletions packages/pinus-rpc/lib/rpc-client/mailstation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ export class MailStation extends EventEmitter {
if (!mailbox) {
tracer && tracer.debug('client', __filename, 'dispatch', 'mailbox is not exist');
// try to connect remote server if mailbox instance not exist yet
if (!lazyConnect(tracer, this, serverId, this.mailboxFactory, cb)) {
if (!lazyConnect(tracer, this, serverId, this.mailboxFactory, msg, cb)) {
tracer && tracer.error('client', __filename, 'dispatch', 'fail to find remote server:' + serverId);
logger.error('[pinus-rpc] fail to find remote server:' + serverId);
self.emit('error', constants.RPC_ERROR.NO_TRAGET_SERVER, tracer, serverId, msg, opts);
Expand Down Expand Up @@ -351,7 +351,7 @@ export class MailStation extends EventEmitter {
* @return {String} serverId remote server id
* @param {Function} cb callback function
*/
connect(tracer: Tracer, serverId: string, cb: Function) {
connect(tracer: Tracer, serverId: string, msg: any, cb: Function) {
let self = this;
let mailbox = self.mailboxes[serverId];
mailbox.connect(tracer, function (err: Error) {
Expand All @@ -361,7 +361,7 @@ export class MailStation extends EventEmitter {
if (!!self.mailboxes[serverId]) {
delete self.mailboxes[serverId];
}
self.emit('error', constants.RPC_ERROR.FAIL_CONNECT_SERVER, tracer, serverId, null, self.opts);
self.emit('error', constants.RPC_ERROR.FAIL_CONNECT_SERVER, tracer, serverId, msg, self.opts);
return;
}
mailbox.on('close', function (id: string) {
Expand Down Expand Up @@ -416,7 +416,7 @@ let doFilter = function (tracer: Tracer, err: Error, serverId: string, msg: Mail
doFilter(tracer, err, serverId, msg, opts, filters, index, operate, cb);
};

let lazyConnect = function (tracer: Tracer, station: MailStation, serverId: string, factory: IMailBoxFactory, cb: Function) {
let lazyConnect = function (tracer: Tracer, station: MailStation, serverId: string, factory: IMailBoxFactory, msg: any, cb: Function) {
tracer && tracer.info('client', __filename, 'lazyConnect', 'create mailbox and try to connect to remote server');
let server = station.servers[serverId];
let online = station.onlines[serverId];
Expand All @@ -431,7 +431,7 @@ let lazyConnect = function (tracer: Tracer, station: MailStation, serverId: stri
let mailbox = factory(server, station.opts as MailBoxOpts);
station.connecting[serverId] = true;
station.mailboxes[serverId] = mailbox;
station.connect(tracer, serverId, cb);
station.connect(tracer, serverId, msg, cb);
return true;
};

Expand Down Expand Up @@ -485,4 +485,4 @@ let errorHandler = function (tracer: Tracer, station: MailStation, err: Error, s
*/
export function createMailStation(opts?: MailStationOpts) {
return new MailStation(opts || {});
}
}