Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
mybios committed Aug 27, 2024
1 parent 924e605 commit 1ecd036
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 9 deletions.
3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@
"engines": {
"node": ">=14.17.0"
},
"resolutions": {
"@types/node": "12.20.55"
},
"license": "MIT",
"private": true,
"workspaces": [
Expand Down
4 changes: 2 additions & 2 deletions packages/pinus-rpc/lib/rpc-client/mailboxes/ws-mailbox.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ let logger = getLogger('pinus-rpc', 'ws-mailbox');
import { EventEmitter } from 'events';
import { constants } from '../../util/constants';
import { Tracer } from '../../util/tracer';
import {io} from 'socket.io-client';
import * as socketioclient from 'socket.io-client';
import * as utils from '../../util/utils';
import * as util from 'util';
import { Msg } from '../../util/coder';
Expand Down Expand Up @@ -62,7 +62,7 @@ export class WSMailBox extends EventEmitter {
return;
}
let self = this;
this.socket = io(this.host + ':' + this.port, <any>{
this.socket = socketioclient(this.host + ':' + this.port, <any>{
'force new connection': true,
'reconnect': false
});
Expand Down
8 changes: 5 additions & 3 deletions packages/pinus-rpc/lib/rpc-server/acceptors/ws-acceptor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ let logger = getLogger('pinus-rpc', 'ws-acceptor');
import { EventEmitter } from 'events';
import { Tracer } from '../../util/tracer';
import * as utils from '../../util/utils';
import { Server } from 'socket.io';
import * as CreateServer from 'socket.io';
import * as util from 'util';
import * as Coder from '../../util/coder';
import { Server } from 'socket.io';


export interface AcceptorPkg {
Expand Down Expand Up @@ -61,10 +62,11 @@ export class WSAcceptor extends EventEmitter {

let self = this;

this.server = new Server(port);
this.server = CreateServer(port);

this.server.set('log level', 0);
// this.server.set('log level', 0);


this.server.server.on('error', function (err: Error) {
logger.error('rpc server is error: %j', err.stack);
self.emit('error', err);
Expand Down
5 changes: 4 additions & 1 deletion packages/pinus-rpc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,11 @@
"@types/bluebird": "^3.5.19",
"@types/crc": "^3.4.0",
"@types/node": "^12.20.41",
"@types/socket.io": "1.4.40",
"@types/socket.io-client": "1.4.32",
"@types/socket.io-parser": "2.2.0",
"@types/uuid": "^10.0.0",
"@types/ws": "^8.5.4",
"@types/ws": "3.0.0",
"mocha": "10.3.0",
"should": "13.2.3",
"tslint": "6.1.3",
Expand Down
7 changes: 4 additions & 3 deletions packages/pinus/lib/connectors/sioconnector.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ import { createServer as createHttpServer } from 'http';
import { createServer as createHttpsServer } from 'https';
import { SioSocket } from './siosocket';
import { IConnector } from '../interfaces/IConnector';
import { Server, ServerOptions } from 'socket.io';
import * as CreateServer from 'socket.io';
import {Server, ServerOptions } from 'socket.io';

let PKG_ID_BYTES = 4;
let PKG_ROUTE_LENGTH_BYTES = 1;
Expand Down Expand Up @@ -68,10 +69,10 @@ export class SIOConnector extends EventEmitter implements IConnector {
res.writeHead(200);
res.end('HTTPS Server is up');
}).listen(port);
sio = new Server(httpsServer, opts);
sio = CreateServer(httpsServer, opts);
} else {
let httpServer = createHttpServer();
sio = new Server(httpServer, opts);
sio = CreateServer(httpServer, opts);
httpServer.listen(port, function () {
console.log('sio http Server listening at port %d', port);
});
Expand Down

0 comments on commit 1ecd036

Please sign in to comment.