Skip to content

Commit 1de5626

Browse files
committed
Convert indentation to tabs
1 parent 983aeef commit 1de5626

File tree

2 files changed

+72
-72
lines changed

2 files changed

+72
-72
lines changed

packages/server/src/node/evaluate.ts

+53-53
Original file line numberDiff line numberDiff line change
@@ -3,59 +3,59 @@ import { NewEvalMessage, TypedValue, EvalFailedMessage, EvalDoneMessage, ServerM
33
import { SendableConnection } from "../common/connection";
44

55
export const evaluate = async (connection: SendableConnection, message: NewEvalMessage): Promise<void> => {
6-
const argStr: string[] = [];
7-
message.getArgsList().forEach((value) => {
8-
argStr.push(value);
9-
});
10-
const sendResp = (resp: any): void => {
11-
const evalDone = new EvalDoneMessage();
12-
evalDone.setId(message.getId());
13-
const tof = typeof resp;
14-
if (tof !== "undefined") {
15-
const tv = new TypedValue();
16-
let t: TypedValue.Type;
17-
switch (tof) {
18-
case "string":
19-
t = TypedValue.Type.STRING;
20-
break;
21-
case "boolean":
22-
t = TypedValue.Type.BOOLEAN;
23-
break;
24-
case "object":
25-
t = TypedValue.Type.OBJECT;
26-
break;
27-
case "number":
28-
t = TypedValue.Type.NUMBER;
29-
break;
30-
default:
31-
sendErr(EvalFailedMessage.Reason.EXCEPTION, `unsupported response type ${tof}`);
32-
return;
33-
}
34-
tv.setValue(tof === "string" ? resp : JSON.stringify(resp));
35-
tv.setType(t);
36-
evalDone.setResponse(tv);
37-
}
6+
const argStr: string[] = [];
7+
message.getArgsList().forEach((value) => {
8+
argStr.push(value);
9+
});
10+
const sendResp = (resp: any): void => {
11+
const evalDone = new EvalDoneMessage();
12+
evalDone.setId(message.getId());
13+
const tof = typeof resp;
14+
if (tof !== "undefined") {
15+
const tv = new TypedValue();
16+
let t: TypedValue.Type;
17+
switch (tof) {
18+
case "string":
19+
t = TypedValue.Type.STRING;
20+
break;
21+
case "boolean":
22+
t = TypedValue.Type.BOOLEAN;
23+
break;
24+
case "object":
25+
t = TypedValue.Type.OBJECT;
26+
break;
27+
case "number":
28+
t = TypedValue.Type.NUMBER;
29+
break;
30+
default:
31+
sendErr(EvalFailedMessage.Reason.EXCEPTION, `unsupported response type ${tof}`);
32+
return;
33+
}
34+
tv.setValue(tof === "string" ? resp : JSON.stringify(resp));
35+
tv.setType(t);
36+
evalDone.setResponse(tv);
37+
}
3838

39-
const serverMsg = new ServerMessage();
40-
serverMsg.setEvalDone(evalDone);
41-
connection.send(serverMsg.serializeBinary());
42-
};
43-
const sendErr = (reason: EvalFailedMessage.Reason, msg: string): void => {
44-
const evalFailed = new EvalFailedMessage();
45-
evalFailed.setId(message.getId());
46-
evalFailed.setReason(reason);
47-
evalFailed.setMessage(msg);
39+
const serverMsg = new ServerMessage();
40+
serverMsg.setEvalDone(evalDone);
41+
connection.send(serverMsg.serializeBinary());
42+
};
43+
const sendErr = (reason: EvalFailedMessage.Reason, msg: string): void => {
44+
const evalFailed = new EvalFailedMessage();
45+
evalFailed.setId(message.getId());
46+
evalFailed.setReason(reason);
47+
evalFailed.setMessage(msg);
4848

49-
const serverMsg = new ServerMessage();
50-
serverMsg.setEvalFailed(evalFailed);
51-
connection.send(serverMsg.serializeBinary());
52-
};
53-
try {
54-
const value = vm.runInNewContext(`(${message.getFunction()})(${argStr.join(",")})`, { require, setTimeout }, {
55-
timeout: message.getTimeout() || 30000,
56-
});
57-
sendResp(await value);
58-
} catch (ex) {
59-
sendErr(EvalFailedMessage.Reason.EXCEPTION, ex.toString());
60-
}
49+
const serverMsg = new ServerMessage();
50+
serverMsg.setEvalFailed(evalFailed);
51+
connection.send(serverMsg.serializeBinary());
52+
};
53+
try {
54+
const value = vm.runInNewContext(`(${message.getFunction()})(${argStr.join(",")})`, { require, setTimeout }, {
55+
timeout: message.getTimeout() || 30000,
56+
});
57+
sendResp(await value);
58+
} catch (ex) {
59+
sendErr(EvalFailedMessage.Reason.EXCEPTION, ex.toString());
60+
}
6161
};

packages/server/test/helpers.ts

+19-19
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,26 @@ import { Client } from "../src/browser/client";
33
import { Server } from "../src/node/server";
44

55
export const createClient = (): Client => {
6-
const s2c = new Emitter<Uint8Array | Buffer>();
7-
const c2s = new Emitter<Uint8Array | Buffer>();
6+
const s2c = new Emitter<Uint8Array | Buffer>();
7+
const c2s = new Emitter<Uint8Array | Buffer>();
88

9-
new Server({
10-
close: () => undefined,
11-
onClose: () => undefined,
12-
onMessage: (cb) => {
13-
c2s.event((d) => cb(d));
14-
},
15-
send: (data) => setTimeout(() => s2c.emit(data), 0),
16-
});
9+
new Server({
10+
close: () => undefined,
11+
onClose: () => undefined,
12+
onMessage: (cb) => {
13+
c2s.event((d) => cb(d));
14+
},
15+
send: (data) => setTimeout(() => s2c.emit(data), 0),
16+
});
1717

18-
const client = new Client({
19-
close: () => undefined,
20-
onClose: () => undefined,
21-
onMessage: (cb) => {
22-
s2c.event((d) => cb(d));
23-
},
24-
send: (data) => setTimeout(() => c2s.emit(data), 0),
25-
});
18+
const client = new Client({
19+
close: () => undefined,
20+
onClose: () => undefined,
21+
onMessage: (cb) => {
22+
s2c.event((d) => cb(d));
23+
},
24+
send: (data) => setTimeout(() => c2s.emit(data), 0),
25+
});
2626

27-
return client;
27+
return client;
2828
};

0 commit comments

Comments
 (0)