Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 4 additions & 3 deletions src/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ import { encodeMumbleVersion } from './encode-mumble-version';
import { ClientOptions } from './client-options';
import { ConnectionRejectedError } from './errors';
import { filterPacket } from './rxjs-operators/filter-packet';
import { platform, release } from 'os';
import { Permissions } from './permissions';
import { EventNames } from './event-names';
import { discoverPlatform } from './discover-platform';

const defaultOptions: Partial<ClientOptions> = {
port: 64738,
Expand Down Expand Up @@ -148,6 +148,7 @@ export class Client extends EventEmitter {
* @internal
*/
private async sendVersion(): Promise<void> {
const { platform, version: platformVersion } = await discoverPlatform();
const version = encodeMumbleVersion({
major: 1,
minor: 4,
Expand All @@ -158,8 +159,8 @@ export class Client extends EventEmitter {
Version.create({
release: this.options.clientName,
version,
os: platform(),
osVersion: release(),
os: platform,
osVersion: platformVersion,
}),
);
}
Expand Down
17 changes: 17 additions & 0 deletions src/discover-platform.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
interface PlatformDescription {
platform: string;
version?: string;
}

export const discoverPlatform = async (): Promise<PlatformDescription> => {
if (typeof process !== 'undefined' && process.release.name === 'node') {
// Node.JS
const { platform, release } = await import('os');
return { platform: platform(), version: release() };
} else if (typeof navigator !== 'undefined') {
// browser
return { platform: navigator.userAgent };
} else {
return { platform: 'unknown' };
}
};
10 changes: 7 additions & 3 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"extends": "ts-node/node16/tsconfig.json",
"compilerOptions": {
"incremental": true,
"target": "es2018",
"module": "commonjs",
"target": "es6",
"module": "esnext",
"esModuleInterop": true,
"forceConsistentCasingInFileNames": true,
"strict": true,
Expand All @@ -22,7 +22,11 @@
"paths": {
"@": ["src"],
"@/*": ["src/*"]
}
},
"lib": [
"es2018",
"dom"
]
},
"exclude": [
"node_modules",
Expand Down