Skip to content

Commit 0b5f302

Browse files
committed
Pass lint check
1 parent 7f1e4e1 commit 0b5f302

File tree

3 files changed

+119
-114
lines changed

3 files changed

+119
-114
lines changed

src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33

44
export * from './version';
55
export * from './widget';
6-
export * from './qimessaging';
6+
export * from './qimessaging';

src/qimessaging.ts

Lines changed: 67 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,18 @@
88
*/
99
import io from 'nao-socket.io';
1010

11+
interface replyType {
12+
__MetaObject?: any;
13+
[key: string]: any;
14+
}
15+
16+
interface signalType {
17+
connect?: any;
18+
disconnect?: any;
19+
setValue?: any;
20+
value?: any;
21+
}
22+
1123
export class QiSession {
1224
connected: any;
1325
disconnected: any;
@@ -19,10 +31,10 @@ export class QiSession {
1931
_socket: any;
2032

2133
constructor(
22-
ipAddress: string = 'nao.local',
23-
port: string = '80',
24-
connected?: any,
25-
disconnected?: any
34+
ipAddress = 'nao.local',
35+
port = '80',
36+
connected?: 'function',
37+
disconnected?: 'function'
2638
) {
2739
this.connected = connected;
2840
this.disconnected = disconnected;
@@ -32,95 +44,93 @@ export class QiSession {
3244
'force new connection': true,
3345
});
3446
console.log('DBG Emile qim connecting..');
35-
let _dfd = (this._dfd = new Array());
36-
let _sigs = (this._sigs = new Array());
47+
this._dfd = [];
48+
this._sigs = [];
3749
this._idm = 0;
3850

39-
interface replyType {
40-
__MetaObject?: any;
41-
[key: string]: any;
42-
}
43-
4451
this._socket.on('reply', (data: any) => {
4552
console.log('DBG Emile qim reply');
4653

47-
let idm = data['idm'];
48-
if (data['result'] != null && data['result']['metaobject'] != undefined) {
49-
let replyObject: replyType = {
54+
const idm = data['idm'];
55+
if (
56+
data['result'] !== undefined &&
57+
data['result']['metaobject'] !== undefined
58+
) {
59+
const replyObject: replyType = {
5060
__MetaObject: data['result']['metaobject'],
5161
};
5262

53-
let pyobj = data['result']['pyobject'];
54-
_sigs[pyobj] = new Array();
55-
let methods = replyObject.__MetaObject['methods'];
63+
const pyobj = data['result']['pyobject'];
64+
this._sigs[pyobj] = [];
65+
const methods = replyObject.__MetaObject['methods'];
5666

57-
for (let i in methods) {
58-
let methodName = methods[i]['name'];
67+
for (const i in methods) {
68+
const methodName = methods[i]['name'];
5969
replyObject[methodName] = this.createMetaCall(
6070
pyobj,
6171
methodName,
6272
'data'
6373
);
6474
}
6575

66-
let signals = replyObject.__MetaObject['signals'];
67-
for (let i in signals) {
68-
let signalName = signals[i]['name'];
76+
const signals = replyObject.__MetaObject['signals'];
77+
for (const i in signals) {
78+
const signalName = signals[i]['name'];
6979
replyObject[signalName] = this.createMetaSignal(
7080
pyobj,
7181
signalName,
7282
false
7383
);
7484
}
7585

76-
let properties = replyObject.__MetaObject['properties'];
77-
for (let i in properties) {
78-
let propertyName = properties[i]['name'];
86+
const properties = replyObject.__MetaObject['properties'];
87+
for (const i in properties) {
88+
const propertyName = properties[i]['name'];
7989
replyObject[propertyName] = this.createMetaSignal(
8090
pyobj,
8191
propertyName,
8292
true
8393
);
8494
}
8595

86-
_dfd[idm].resolve(replyObject);
96+
this._dfd[idm].resolve(replyObject);
8797
} else {
88-
if (_dfd[idm].__cbi != undefined) {
89-
let cbi = _dfd[idm].__cbi;
90-
_sigs[cbi['obj']][cbi['signal']][data['result']] = cbi['cb'];
98+
if (this._dfd[idm].__cbi !== undefined) {
99+
const cbi = this._dfd[idm].__cbi;
100+
this._sigs[cbi['obj']][cbi['signal']][data['result']] = cbi['cb'];
91101
}
92-
_dfd[idm].resolve(data['result']);
102+
this._dfd[idm].resolve(data['result']);
93103
}
94-
delete _dfd[idm];
104+
delete this._dfd[idm];
95105
});
96106

97-
this._socket.on('error', function (data: any) {
107+
this._socket.on('error', (data: any) => {
98108
console.log('DBG Emile qim error');
99-
if (data['idm'] != undefined) {
100-
_dfd[data['idm']].reject(data['result']);
101-
delete _dfd[data['idm']];
109+
if (data['idm'] !== undefined) {
110+
this._dfd[data['idm']].reject(data['result']);
111+
delete this._dfd[data['idm']];
102112
}
103113
});
104114

105115
this._socket.on('signal', (data: any) => {
106116
console.log('DBG Emile qim signal');
107-
let res = data['result'];
108-
let callback = _sigs[res['obj']][res['signal']][res['link']];
109-
if (callback != undefined) {
110-
callback.apply(this, res['data']);
117+
const result = data['result'];
118+
const callback =
119+
this._sigs[result['obj']][result['signal']][result['link']];
120+
if (callback !== undefined) {
121+
callback.apply(this, result['data']);
111122
}
112123
});
113124

114125
this._socket.on('disconnect', (data: any) => {
115126
console.log('DBG Emile qim disconnect');
116-
for (let idm in _dfd) {
117-
_dfd[idm].reject('Call ' + idm + ' canceled: disconnected');
118-
delete _dfd[idm];
127+
for (const idm in this._dfd) {
128+
this._dfd[idm].reject('Call ' + idm + ' canceled: disconnected');
129+
delete this._dfd[idm];
119130
}
120131

121132
if (this.disconnected) {
122133
this.disconnected();
123-
console.log('DBG Isabel disconnected');
124134
}
125135
});
126136

@@ -132,30 +142,31 @@ export class QiSession {
132142
this.connected(this);
133143
}
134144
});
145+
135146
console.log('DBG Emile qim done with init');
136147
}
137148

138149
createMetaCall(obj: any, member: any, data: any) {
139150
return (...serviceArgs: any[]) => {
140-
let idm = ++this._idm;
141-
let args = Array.prototype.slice.call(serviceArgs, 0);
142-
let promise = new Promise((resolve, reject) => {
143-
this._dfd[idm] = { resolve: resolve, reject: reject };
151+
++this._idm;
152+
153+
const promise = new Promise((resolve, reject) => {
154+
this._dfd[this._idm] = { resolve: resolve, reject: reject };
144155
});
145-
if (args[0] == 'connect') {
146-
this._dfd[idm].__cbi = data;
156+
if (serviceArgs[0] === 'connect') {
157+
this._dfd[this._idm].__cbi = data;
147158
}
148159
this._socket.emit('call', {
149-
idm: idm,
150-
params: { obj: obj, member: member, args: args },
160+
idm: this._idm,
161+
params: { obj: obj, member: member, args: serviceArgs },
151162
});
152163
return promise;
153164
};
154165
}
155166

156-
createMetaSignal(obj: any, signal: any, isProperty: any) {
157-
let signalObject: any = {};
158-
this._sigs[obj][signal] = new Array();
167+
createMetaSignal(obj: any, signal: any, isProperty: boolean) {
168+
const signalObject: signalType = {};
169+
this._sigs[obj][signal] = [];
159170
signalObject.connect = (cb: any) => {
160171
return this.createMetaCall(obj, signal, {
161172
obj: obj,
@@ -173,11 +184,10 @@ export class QiSession {
173184
return signalObject;
174185
}
175186

176-
signalObject.setValue = () => {
177-
let args = Array.prototype.slice.call(arguments, 0);
187+
signalObject.setValue = (...valueArgs: any[]) => {
178188
return this.createMetaCall(obj, signal, 'data').apply(
179189
this,
180-
['setValue'].concat(args)
190+
['setValue'].concat(valueArgs)
181191
);
182192
};
183193

0 commit comments

Comments
 (0)