Skip to content

Commit c3af5a0

Browse files
committed
fix(logger): don’t use colors if disalbed in node
fix(connection): only serialize known props
1 parent e6e845e commit c3af5a0

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

client/connections/ConnectionToCore.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import Log from '@secret-agent/commons/Logger';
77
import ICreateSessionOptions from '@secret-agent/core-interfaces/ICreateSessionOptions';
88
import ISessionMeta from '@secret-agent/core-interfaces/ISessionMeta';
99
import { CanceledPromiseError } from '@secret-agent/commons/interfaces/IPendingWaitEvent';
10+
import ICoreConfigureOptions from '@secret-agent/core-interfaces/ICoreConfigureOptions';
1011
import IConnectionToCoreOptions from '../interfaces/IConnectionToCoreOptions';
1112
import CoreCommandQueue from '../lib/CoreCommandQueue';
1213
import CoreSession from '../lib/CoreSession';
@@ -60,7 +61,14 @@ export default abstract class ConnectionToCore {
6061
if (err) throw err;
6162
return this.internalSendRequestAndWait({
6263
command: 'connect',
63-
args: [this.options],
64+
args: [
65+
<ICoreConfigureOptions>{
66+
coreServerPort: this.options.coreServerPort,
67+
browserEmulatorIds: this.options.browserEmulatorIds,
68+
localProxyPortStart: this.options.localProxyPortStart,
69+
sessionsDir: this.options.sessionsDir,
70+
},
71+
],
6472
});
6573
})
6674
.then(result => this.onConnected(result.data))

commons/Logger.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,12 +96,13 @@ class Log implements ILog {
9696

9797
const params = Object.keys(printData).length ? [printData] : [];
9898
if (error) params.push(error);
99+
const useColors = process.env.NODE_DISABLE_COLORS !== 'true';
99100
// eslint-disable-next-line no-console
100101
console.log(
101102
`${entry.timestamp.toISOString()} ${entry.level.toUpperCase()} [${printablePath}] ${
102103
entry.action
103104
}`,
104-
...params.map(x => inspect(x, false, null, true)),
105+
...params.map(x => inspect(x, false, null, useColors)),
105106
);
106107
}
107108
LogEvents.broadcast(entry);

0 commit comments

Comments
 (0)