Skip to content

Commit 87a94c1

Browse files
committed
Switched from prefixes to flags.
1 parent cba7bff commit 87a94c1

File tree

3 files changed

+26
-32
lines changed

3 files changed

+26
-32
lines changed

src/logger/logger.test.ts

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ describe(Logger.name, () => {
8383

8484
expect(mockConsoleInfo).toHaveBeenCalledWith(
8585
JSON.stringify({
86-
message: '[USER] ' + message,
86+
message: message,
87+
verified: false,
8788
...mockEvent.payload.event_context,
8889
dev_oid: mockEvent.payload.event_context.dev_oid,
8990
})
@@ -101,7 +102,8 @@ describe(Logger.name, () => {
101102
});
102103
expect(mockConsoleInfo).toHaveBeenCalledWith(
103104
JSON.stringify({
104-
message: '[USER] ' + expectedMessage,
105+
message: expectedMessage,
106+
verified: false,
105107
...mockEvent.payload.event_context,
106108
dev_oid: mockEvent.payload.event_context.dev_oid,
107109
})
@@ -120,7 +122,8 @@ describe(Logger.name, () => {
120122
});
121123
expect(mockConsoleInfo).toHaveBeenCalledWith(
122124
JSON.stringify({
123-
message: `[USER] ${text} ${expectedDataMessage}`,
125+
message: `${text} ${expectedDataMessage}`,
126+
verified: false,
124127
...mockEvent.payload.event_context,
125128
dev_oid: mockEvent.payload.event_context.dev_oid,
126129
})
@@ -140,7 +143,8 @@ describe(Logger.name, () => {
140143
});
141144
expect(mockConsoleInfo).toHaveBeenCalledWith(
142145
JSON.stringify({
143-
message: `[USER] ${text1} ${expectedDataMessage} ${text2}`,
146+
message: `${text1} ${expectedDataMessage} ${text2}`,
147+
verified: false,
144148
...mockEvent.payload.event_context,
145149
dev_oid: mockEvent.payload.event_context.dev_oid,
146150
})
@@ -162,7 +166,7 @@ describe(Logger.name, () => {
162166

163167
logger.info(message, data);
164168

165-
expect(mockConsoleInfo).toHaveBeenCalledWith('[USER]', message, data);
169+
expect(mockConsoleInfo).toHaveBeenCalledWith(message, data);
166170
});
167171
});
168172

@@ -210,7 +214,7 @@ describe(Logger.name, () => {
210214
const callArgs = mockConsoleInfo.mock.calls[0][0];
211215
const logObject = JSON.parse(callArgs);
212216

213-
expect(logObject.message).toBe('[USER] ');
217+
expect(logObject.message).toBe('');
214218
expect(logObject.dev_oid).toBe(mockEvent.payload.event_context.dev_oid);
215219
expect(logObject.request_id).toBe(
216220
mockEvent.payload.event_context.request_id
@@ -225,7 +229,7 @@ describe(Logger.name, () => {
225229
const logObject = JSON.parse(callArgs);
226230

227231
// inspect shows 'null' and 'undefined' as strings
228-
expect(logObject.message).toBe('[USER] test null undefined');
232+
expect(logObject.message).toBe('test null undefined');
229233
expect(logObject.dev_oid).toBe(mockEvent.payload.event_context.dev_oid);
230234
});
231235

@@ -250,7 +254,7 @@ describe(Logger.name, () => {
250254
compact: false,
251255
depth: Infinity,
252256
});
253-
expect(logObject.message).toBe('[USER] ' + expectedMessage);
257+
expect(logObject.message).toBe(expectedMessage);
254258
expect(logObject.dev_oid).toBe(mockEvent.payload.event_context.dev_oid);
255259
expect(typeof logObject.callback_url).toBe('string');
256260
});

src/logger/logger.ts

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -73,35 +73,25 @@ export class Logger extends Console {
7373
}
7474

7575
logFn(args: unknown[], level: LogLevel): void {
76-
// Always add prefix based on verification status
77-
// false = unverified ([USER] prefix), true = verified ([SDK] prefix)
78-
const prefix = this.isVerifiedChannel ? '[SDK]' : '[USER]';
79-
80-
// Don't prepend prefix if the string already contains the same one
81-
let processedArgs: unknown[] = args;
82-
if (!(typeof args[0] === 'string' && args[0].startsWith(prefix)) || typeof args[0] !== 'string') {
83-
processedArgs.unshift(prefix);
84-
}
85-
86-
8776
if (isMainThread) {
8877
if (this.options?.isLocalDevelopment) {
89-
console[level](...processedArgs);
78+
console[level](...args);
9079
} else {
9180
let message: string;
92-
if (processedArgs.length === 1 && typeof processedArgs[0] === 'string') {
81+
if (args.length === 1 && typeof args[0] === 'string') {
9382
// Single string argument - use directly
94-
message = processedArgs[0];
95-
} else if (processedArgs.length === 1) {
83+
message = args[0];
84+
} else if (args.length === 1) {
9685
// Single non-string argument - convert to string properly
97-
message = this.valueToString(processedArgs[0]);
86+
message = this.valueToString(args[0]);
9887
} else {
9988
// Multiple arguments - create a readable format
100-
message = processedArgs.map((arg) => this.valueToString(arg)).join(' ');
89+
message = args.map((arg) => this.valueToString(arg)).join(' ');
10190
}
10291

10392
const logObject = {
10493
message,
94+
verified: this.isVerifiedChannel,
10595
...this.tags,
10696
};
10797

@@ -111,7 +101,7 @@ export class Logger extends Console {
111101
parentPort?.postMessage({
112102
subject: WorkerMessageSubject.WorkerMessageLog,
113103
payload: {
114-
args: processedArgs.map((arg) => this.valueToString(arg)),
104+
args: args.map((arg) => this.valueToString(arg)),
115105
level,
116106
},
117107
});

src/logger/private_logger.test.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ describe('Private Logger Security', () => {
5454
sdkLogger.info('SDK message');
5555

5656
expect(mockConsoleInfo).toHaveBeenCalledWith(
57-
expect.stringContaining('"message":"[SDK] SDK message"')
57+
expect.stringContaining('"message":"SDK message"')
5858
);
5959
});
6060

@@ -68,7 +68,7 @@ describe('Private Logger Security', () => {
6868
userLogger.info('User message');
6969

7070
expect(mockConsoleInfo).toHaveBeenCalledWith(
71-
expect.stringContaining('"message":"[USER] User message"')
71+
expect.stringContaining('"message":"User message"')
7272
);
7373
});
7474

@@ -109,10 +109,10 @@ describe('Private Logger Security', () => {
109109

110110
expect(mockConsoleInfo).toHaveBeenCalledTimes(2);
111111
expect(mockConsoleInfo).toHaveBeenNthCalledWith(1,
112-
expect.stringContaining('"message":"[SDK] SDK internal message"')
112+
expect.stringContaining('"message":"SDK internal message"')
113113
);
114114
expect(mockConsoleInfo).toHaveBeenNthCalledWith(2,
115-
expect.stringContaining('"message":"[USER] User application message"')
115+
expect.stringContaining('"message":"User application message"')
116116
);
117117
});
118118

@@ -134,8 +134,8 @@ describe('Private Logger Security', () => {
134134
expect(userCall).toContain('"dev_oid":"test-dev-oid"');
135135

136136
// But different prefixes
137-
expect(sdkCall).toContain('"[SDK] Warning from SDK"');
138-
expect(userCall).toContain('"[USER] Warning from user"');
137+
expect(sdkCall).toContain('"Warning from SDK"');
138+
expect(userCall).toContain('"Warning from user"');
139139
});
140140
});
141141

0 commit comments

Comments
 (0)