diff --git a/.changeset/breezy-jars-boil.md b/.changeset/breezy-jars-boil.md new file mode 100644 index 00000000..39b58b34 --- /dev/null +++ b/.changeset/breezy-jars-boil.md @@ -0,0 +1,5 @@ +--- +'@livekit/rtc-node': patch +--- + +Bump '@types/node' pkg version and remove all explicit `ReadableStream` imports diff --git a/packages/livekit-rtc/package.json b/packages/livekit-rtc/package.json index 5e012b3a..7aa2df67 100644 --- a/packages/livekit-rtc/package.json +++ b/packages/livekit-rtc/package.json @@ -54,7 +54,7 @@ }, "devDependencies": { "@napi-rs/cli": "^2.18.0", - "@types/node": "^20.9.2", + "@types/node": "^22.13.10", "prettier": "^3.0.3", "tsup": "^8.3.5", "typescript": "^5.2.2", diff --git a/packages/livekit-rtc/src/audio_stream.ts b/packages/livekit-rtc/src/audio_stream.ts index 55ee54dd..be0d2483 100644 --- a/packages/livekit-rtc/src/audio_stream.ts +++ b/packages/livekit-rtc/src/audio_stream.ts @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2024 LiveKit, Inc. // // SPDX-License-Identifier: Apache-2.0 -import { ReadableStream, type UnderlyingSource } from 'node:stream/web'; +import type { UnderlyingSource } from 'node:stream/web'; import { AudioFrame } from './audio_frame.js'; import type { FfiEvent } from './ffi_client.js'; import { FfiClient, FfiClientEvent, FfiHandle } from './ffi_client.js'; diff --git a/packages/livekit-rtc/src/data_streams/stream_reader.ts b/packages/livekit-rtc/src/data_streams/stream_reader.ts index 9b358541..a2382c68 100644 --- a/packages/livekit-rtc/src/data_streams/stream_reader.ts +++ b/packages/livekit-rtc/src/data_streams/stream_reader.ts @@ -1,7 +1,6 @@ // SPDX-FileCopyrightText: 2024 LiveKit, Inc. // // SPDX-License-Identifier: Apache-2.0 -import type { ReadableStream } from 'node:stream/web'; import { log } from '../log.js'; import type { DataStream_Chunk } from '../proto/room_pb.js'; import { bigIntToNumber } from '../utils.js'; diff --git a/packages/livekit-rtc/src/data_streams/stream_writer.ts b/packages/livekit-rtc/src/data_streams/stream_writer.ts index b5540868..c99f14e8 100644 --- a/packages/livekit-rtc/src/data_streams/stream_writer.ts +++ b/packages/livekit-rtc/src/data_streams/stream_writer.ts @@ -1,7 +1,6 @@ // SPDX-FileCopyrightText: 2024 LiveKit, Inc. // // SPDX-License-Identifier: Apache-2.0 -import type { WritableStream } from 'node:stream/web'; import type { BaseStreamInfo, ByteStreamInfo, TextStreamInfo } from './types.js'; class BaseStreamWriter { diff --git a/packages/livekit-rtc/src/participant.ts b/packages/livekit-rtc/src/participant.ts index b79da7b6..bfff8abe 100644 --- a/packages/livekit-rtc/src/participant.ts +++ b/packages/livekit-rtc/src/participant.ts @@ -20,21 +20,29 @@ import { ParticipantKind, } from './proto/participant_pb.js'; import { + ChatMessage as ChatMessageModel, DataStream_ByteHeader, DataStream_Chunk, DataStream_Header, DataStream_OperationType, DataStream_TextHeader, DataStream_Trailer, + EditChatMessageRequest, + TranscriptionSegment as ProtoTranscriptionSegment, type PublishDataCallback, + PublishDataRequest, type PublishDataResponse, type PublishSipDtmfCallback, + PublishSipDtmfRequest, type PublishSipDtmfResponse, type PublishTrackCallback, + PublishTrackRequest, type PublishTrackResponse, type PublishTranscriptionCallback, + PublishTranscriptionRequest, type PublishTranscriptionResponse, type SendChatMessageCallback, + SendChatMessageRequest, type SendChatMessageResponse, type SendStreamChunkCallback, SendStreamChunkRequest, @@ -46,28 +54,18 @@ import { SendStreamTrailerRequest, type SendStreamTrailerResponse, type SetLocalAttributesCallback, + SetLocalAttributesRequest, type SetLocalAttributesResponse, type SetLocalMetadataCallback, + SetLocalMetadataRequest, type SetLocalMetadataResponse, type SetLocalNameCallback, + SetLocalNameRequest, type SetLocalNameResponse, type TrackPublishOptions, type UnpublishTrackCallback, - type UnpublishTrackResponse, -} from './proto/room_pb.js'; -import { ChatMessage as ChatMessageModel } from './proto/room_pb.js'; -import { - EditChatMessageRequest, - TranscriptionSegment as ProtoTranscriptionSegment, - PublishDataRequest, - PublishSipDtmfRequest, - PublishTrackRequest, - PublishTranscriptionRequest, - SendChatMessageRequest, - SetLocalAttributesRequest, - SetLocalMetadataRequest, - SetLocalNameRequest, UnpublishTrackRequest, + type UnpublishTrackResponse, } from './proto/room_pb.js'; import type { PerformRpcCallback, @@ -460,7 +458,7 @@ export class LocalParticipant extends Participant { const fileStats = await stat(path); const file = await open(path); try { - const stream: ReadableStream = file.readableWebStream({ type: 'bytes' }); + const stream: ReadableStream = file.readableWebStream(); const streamId = crypto.randomUUID(); const destinationIdentities = options?.destinationIdentities; diff --git a/packages/livekit-rtc/src/room.ts b/packages/livekit-rtc/src/room.ts index dad75ac3..df98fd99 100644 --- a/packages/livekit-rtc/src/room.ts +++ b/packages/livekit-rtc/src/room.ts @@ -3,7 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 import type { TypedEventEmitter as TypedEmitter } from '@livekit/typed-emitter'; import EventEmitter from 'events'; -import { ReadableStream } from 'node:stream/web'; import { ByteStreamReader, TextStreamReader } from './data_streams/stream_reader.js'; import type { ByteStreamHandler, diff --git a/packages/livekit-rtc/src/video_stream.ts b/packages/livekit-rtc/src/video_stream.ts index 92aff82f..2b856944 100644 --- a/packages/livekit-rtc/src/video_stream.ts +++ b/packages/livekit-rtc/src/video_stream.ts @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2024 LiveKit, Inc. // // SPDX-License-Identifier: Apache-2.0 -import { ReadableStream, type UnderlyingSource } from 'node:stream/web'; +import type { UnderlyingSource } from 'node:stream/web'; import type { FfiEvent } from './ffi_client.js'; import { FfiClient, FfiClientEvent, FfiHandle } from './ffi_client.js'; import type { NewVideoStreamResponse, VideoRotation } from './proto/video_frame_pb.js'; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b1c4a009..44323453 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -16,7 +16,7 @@ importers: version: 0.0.4 '@rushstack/heft': specifier: ^0.68.0 - version: 0.68.15(@types/node@20.17.17) + version: 0.68.15(@types/node@22.15.29) '@trivago/prettier-plugin-sort-imports': specifier: ^5.0.0 version: 5.2.2(prettier@3.5.3) @@ -70,7 +70,7 @@ importers: version: 5.8.3 vitest: specifier: ^3.0.0 - version: 3.1.3(@edge-runtime/vm@5.0.0)(@types/node@20.17.17)(happy-dom@17.0.2)(tsx@4.17.0)(yaml@2.6.1) + version: 3.1.3(@edge-runtime/vm@5.0.0)(@types/node@22.15.29)(happy-dom@17.0.2)(tsx@4.17.0)(yaml@2.6.1) examples/agent-dispatch: dependencies: @@ -242,8 +242,8 @@ importers: specifier: ^2.18.0 version: 2.18.4 '@types/node': - specifier: ^20.9.2 - version: 20.17.17 + specifier: ^22.13.10 + version: 22.15.29 prettier: specifier: ^3.0.3 version: 3.5.0 @@ -1596,6 +1596,9 @@ packages: '@types/node@20.17.17': resolution: {integrity: sha512-/WndGO4kIfMicEQLTi/mDANUu/iVUhT7KboZPdEqqHQ4aTS+3qT3U5gIqWDFV+XouorjfgGqvKILJeHhuQgFYg==} + '@types/node@22.15.29': + resolution: {integrity: sha512-LNdjOkUDlU1RZb8e1kOIUpN1qQUlzGkEtbVNo53vbrwDg5om6oduhm4SiUaPW5ASTXhAiP0jInWG8Qx9fVlOeQ==} + '@types/prop-types@15.7.12': resolution: {integrity: sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q==} @@ -3978,6 +3981,9 @@ packages: undici-types@6.19.8: resolution: {integrity: sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==} + undici-types@6.21.0: + resolution: {integrity: sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==} + universalify@0.1.2: resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==} engines: {node: '>= 4.0.0'} @@ -5209,23 +5215,23 @@ snapshots: '@rushstack/eslint-patch@1.11.0': {} - '@rushstack/heft-config-file@0.16.4(@types/node@20.17.17)': + '@rushstack/heft-config-file@0.16.4(@types/node@22.15.29)': dependencies: - '@rushstack/node-core-library': 5.11.0(@types/node@20.17.17) + '@rushstack/node-core-library': 5.11.0(@types/node@22.15.29) '@rushstack/rig-package': 0.5.3 - '@rushstack/terminal': 0.14.6(@types/node@20.17.17) + '@rushstack/terminal': 0.14.6(@types/node@22.15.29) jsonpath-plus: 10.2.0 transitivePeerDependencies: - '@types/node' - '@rushstack/heft@0.68.15(@types/node@20.17.17)': + '@rushstack/heft@0.68.15(@types/node@22.15.29)': dependencies: - '@rushstack/heft-config-file': 0.16.4(@types/node@20.17.17) - '@rushstack/node-core-library': 5.11.0(@types/node@20.17.17) - '@rushstack/operation-graph': 0.2.37(@types/node@20.17.17) + '@rushstack/heft-config-file': 0.16.4(@types/node@22.15.29) + '@rushstack/node-core-library': 5.11.0(@types/node@22.15.29) + '@rushstack/operation-graph': 0.2.37(@types/node@22.15.29) '@rushstack/rig-package': 0.5.3 - '@rushstack/terminal': 0.14.6(@types/node@20.17.17) - '@rushstack/ts-command-line': 4.23.4(@types/node@20.17.17) + '@rushstack/terminal': 0.14.6(@types/node@22.15.29) + '@rushstack/ts-command-line': 4.23.4(@types/node@22.15.29) '@types/tapable': 1.0.6 fast-glob: 3.3.3 git-repo-info: 2.1.1 @@ -5235,7 +5241,7 @@ snapshots: transitivePeerDependencies: - '@types/node' - '@rushstack/node-core-library@5.11.0(@types/node@20.17.17)': + '@rushstack/node-core-library@5.11.0(@types/node@22.15.29)': dependencies: ajv: 8.13.0 ajv-draft-04: 1.0.0(ajv@8.13.0) @@ -5246,30 +5252,30 @@ snapshots: resolve: 1.22.10 semver: 7.5.4 optionalDependencies: - '@types/node': 20.17.17 + '@types/node': 22.15.29 - '@rushstack/operation-graph@0.2.37(@types/node@20.17.17)': + '@rushstack/operation-graph@0.2.37(@types/node@22.15.29)': dependencies: - '@rushstack/node-core-library': 5.11.0(@types/node@20.17.17) - '@rushstack/terminal': 0.14.6(@types/node@20.17.17) + '@rushstack/node-core-library': 5.11.0(@types/node@22.15.29) + '@rushstack/terminal': 0.14.6(@types/node@22.15.29) optionalDependencies: - '@types/node': 20.17.17 + '@types/node': 22.15.29 '@rushstack/rig-package@0.5.3': dependencies: resolve: 1.22.10 strip-json-comments: 3.1.1 - '@rushstack/terminal@0.14.6(@types/node@20.17.17)': + '@rushstack/terminal@0.14.6(@types/node@22.15.29)': dependencies: - '@rushstack/node-core-library': 5.11.0(@types/node@20.17.17) + '@rushstack/node-core-library': 5.11.0(@types/node@22.15.29) supports-color: 8.1.1 optionalDependencies: - '@types/node': 20.17.17 + '@types/node': 22.15.29 - '@rushstack/ts-command-line@4.23.4(@types/node@20.17.17)': + '@rushstack/ts-command-line@4.23.4(@types/node@22.15.29)': dependencies: - '@rushstack/terminal': 0.14.6(@types/node@20.17.17) + '@rushstack/terminal': 0.14.6(@types/node@22.15.29) '@types/argparse': 1.0.38 argparse: 1.0.10 string-argv: 0.3.2 @@ -5329,6 +5335,10 @@ snapshots: dependencies: undici-types: 6.19.8 + '@types/node@22.15.29': + dependencies: + undici-types: 6.21.0 + '@types/prop-types@15.7.12': {} '@types/react-dom@18.0.6': @@ -5508,13 +5518,13 @@ snapshots: optionalDependencies: vite: 5.4.14(@types/node@20.17.17) - '@vitest/mocker@3.1.3(vite@6.3.5(@types/node@20.17.17)(tsx@4.17.0)(yaml@2.6.1))': + '@vitest/mocker@3.1.3(vite@6.3.5(@types/node@22.15.29)(tsx@4.17.0)(yaml@2.6.1))': dependencies: '@vitest/spy': 3.1.3 estree-walker: 3.0.3 magic-string: 0.30.17 optionalDependencies: - vite: 6.3.5(@types/node@20.17.17)(tsx@4.17.0)(yaml@2.6.1) + vite: 6.3.5(@types/node@22.15.29)(tsx@4.17.0)(yaml@2.6.1) '@vitest/pretty-format@3.0.5': dependencies: @@ -8103,6 +8113,8 @@ snapshots: undici-types@6.19.8: {} + undici-types@6.21.0: {} + universalify@0.1.2: {} universalify@2.0.1: {} @@ -8155,13 +8167,13 @@ snapshots: - supports-color - terser - vite-node@3.1.3(@types/node@20.17.17)(tsx@4.17.0)(yaml@2.6.1): + vite-node@3.1.3(@types/node@22.15.29)(tsx@4.17.0)(yaml@2.6.1): dependencies: cac: 6.7.14 debug: 4.4.1 es-module-lexer: 1.7.0 pathe: 2.0.3 - vite: 6.3.5(@types/node@20.17.17)(tsx@4.17.0)(yaml@2.6.1) + vite: 6.3.5(@types/node@22.15.29)(tsx@4.17.0)(yaml@2.6.1) transitivePeerDependencies: - '@types/node' - jiti @@ -8185,7 +8197,7 @@ snapshots: '@types/node': 20.17.17 fsevents: 2.3.3 - vite@6.3.5(@types/node@20.17.17)(tsx@4.17.0)(yaml@2.6.1): + vite@6.3.5(@types/node@22.15.29)(tsx@4.17.0)(yaml@2.6.1): dependencies: esbuild: 0.25.4 fdir: 6.4.4(picomatch@4.0.2) @@ -8194,7 +8206,7 @@ snapshots: rollup: 4.40.2 tinyglobby: 0.2.13 optionalDependencies: - '@types/node': 20.17.17 + '@types/node': 22.15.29 fsevents: 2.3.3 tsx: 4.17.0 yaml: 2.6.1 @@ -8236,10 +8248,10 @@ snapshots: - supports-color - terser - vitest@3.1.3(@edge-runtime/vm@5.0.0)(@types/node@20.17.17)(happy-dom@17.0.2)(tsx@4.17.0)(yaml@2.6.1): + vitest@3.1.3(@edge-runtime/vm@5.0.0)(@types/node@22.15.29)(happy-dom@17.0.2)(tsx@4.17.0)(yaml@2.6.1): dependencies: '@vitest/expect': 3.1.3 - '@vitest/mocker': 3.1.3(vite@6.3.5(@types/node@20.17.17)(tsx@4.17.0)(yaml@2.6.1)) + '@vitest/mocker': 3.1.3(vite@6.3.5(@types/node@22.15.29)(tsx@4.17.0)(yaml@2.6.1)) '@vitest/pretty-format': 3.1.3 '@vitest/runner': 3.1.3 '@vitest/snapshot': 3.1.3 @@ -8256,12 +8268,12 @@ snapshots: tinyglobby: 0.2.13 tinypool: 1.0.2 tinyrainbow: 2.0.0 - vite: 6.3.5(@types/node@20.17.17)(tsx@4.17.0)(yaml@2.6.1) - vite-node: 3.1.3(@types/node@20.17.17)(tsx@4.17.0)(yaml@2.6.1) + vite: 6.3.5(@types/node@22.15.29)(tsx@4.17.0)(yaml@2.6.1) + vite-node: 3.1.3(@types/node@22.15.29)(tsx@4.17.0)(yaml@2.6.1) why-is-node-running: 2.3.0 optionalDependencies: '@edge-runtime/vm': 5.0.0 - '@types/node': 20.17.17 + '@types/node': 22.15.29 happy-dom: 17.0.2 transitivePeerDependencies: - jiti