Skip to content

feat(NODE-5188): add alternative runtime detection to client metadata #3636

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Apr 14, 2023
Merged

feat(NODE-5188): add alternative runtime detection to client metadata #3636

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5f10d3d
feat(NODE-5188): add alternative runtime detection to client metadata
nbbeeken Apr 12, 2023
8dae68d
fix: assumption about Bun typeof
nbbeeken Apr 12, 2023
0d26183
fix: remove object case
nbbeeken Apr 12, 2023
5901ba8
fix: unit test
nbbeeken Apr 12, 2023
5fc39a1
rm .only
nbbeeken Apr 12, 2023
be89007
fix: simplify version checking
nbbeeken Apr 13, 2023
f46fb1f
docs: cleanup
nbbeeken Apr 13, 2023
d2a7f00
Merge branch 'main' into NODE-5188-deno-bun
durran Apr 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: assumption about Bun typeof
  • Loading branch information
@nbbeeken
nbbeeken committed Apr 12, 2023
commit 8dae68df8feb7f649799a4e1d87029211567bbeb
5 changes: 4 additions & 1 deletion src/cmap/handshake/client_metadata.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,10 @@ function getRuntimeInfo(): string {

if ('Bun' in globalThis) {
const version =
Bun != null && typeof Bun === 'object' && 'version' in Bun && typeof Bun.version === 'string'
Bun != null &&
(typeof Bun === 'function' || typeof Bun === 'object') &&
'version' in Bun &&
typeof Bun.version === 'string'
? Bun.version
: '0.0.0';

Expand Down
12 changes: 11 additions & 1 deletion test/unit/cmap/handshake/client_metadata.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,12 +344,22 @@ describe('client metadata module', () => {
expect(delete globalThis.Bun, 'failed to delete Bun global').to.be.true;
});

it('sets platform to Bun', () => {
it('sets platform to Bun if typeof is object', () => {
globalThis.Bun = { version: '1.2.3' };
const metadata = makeClientMetadata({ driverInfo: {} });
expect(metadata.platform).to.equal('Bun v1.2.3, LE');
});

it('sets platform to Bun if typeof is function', () => {
function Bun() {
return null;
}
Bun.version = '1.2.3';
globalThis.Bun = Bun;
const metadata = makeClientMetadata({ driverInfo: {} });
expect(metadata.platform).to.equal('Bun v1.2.3, LE');
});

it('sets platform to Bun with driverInfo.platform', () => {
globalThis.Bun = { version: '1.2.3' };
const metadata = makeClientMetadata({ driverInfo: { platform: 'myPlatform' } });
Expand Down