From f7938b456728dcd1306f0677a04c34ceae0aa411 Mon Sep 17 00:00:00 2001 From: yaruno Date: Mon, 20 Nov 2023 12:54:11 +0100 Subject: [PATCH 1/7] fix: AsyncSRT types and tests, add super() to AsyncSRT constructor (#67) * add event emitter to async class * fix types for AsyncSRT class * Should call super() on constructor as extending event emitter, fixes tests --- src/async.js | 2 +- types/srt-api-async.d.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/async.js b/src/async.js index c2bafc2..1f56349 100644 --- a/src/async.js +++ b/src/async.js @@ -25,7 +25,7 @@ class AsyncSRT extends EventEmitter { static TimeoutMs = DEFAULT_PROMISE_TIMEOUT_MS; constructor() { - + super() DEBUG && debug('Creating task-runner worker instance'); this._worker = new Worker(path.resolve(__dirname, './async-worker.js')); diff --git a/types/srt-api-async.d.ts b/types/srt-api-async.d.ts index 40b56f9..7f000f9 100644 --- a/types/srt-api-async.d.ts +++ b/types/srt-api-async.d.ts @@ -1,11 +1,11 @@ - +import { EventEmitter } from "events"; import { SRTLoggingLevel, SRTResult, SRTSockOpt, SRTSockStatus } from "../src/srt-api-enums"; import { SRTReadReturn, SRTFileDescriptor, SRTEpollEvent, SRTSockOptValue, SRTStats } from "./srt-api" export type AsyncSRTCallback = (result: T) => void; -export class AsyncSRT { +export class AsyncSRT extends EventEmitter { static TimeoutMs: number; From fe1d9f9cee714158acef293cf4a59dc1804af288 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Birm=C3=A9?= Date: Mon, 20 Nov 2023 13:02:52 +0100 Subject: [PATCH 2/7] 0.8.3 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 58f4639..bf91413 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@eyevinn/srt", - "version": "0.8.2", + "version": "0.8.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@eyevinn/srt", - "version": "0.8.2", + "version": "0.8.3", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 5d81fb2..8ee47dd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@eyevinn/srt", - "version": "0.8.2", + "version": "0.8.3", "description": "Nodejs bindings for Secure Reliable Transport SDK", "main": "index.js", "scripts": { From 62b4a8ceaca0923929f9a1641ddda9c3bd0915a0 Mon Sep 17 00:00:00 2001 From: neoxpert <18628980+neoxpert@users.noreply.github.com> Date: Tue, 8 Apr 2025 22:24:10 +0200 Subject: [PATCH 3/7] Update SRT to 1.5.4 (#74) * use SRT 1.5.4 * Update nodejs.yml drop EoL NodeJS versions --- .github/workflows/nodejs.yml | 2 +- scripts/build-srt-sdk.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index 37aec88..5c6d04d 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node-version: [14.x, 16.x, 18.x] + node-version: [18.x, 20.x, 22.x] steps: - uses: actions/checkout@v3 diff --git a/scripts/build-srt-sdk.js b/scripts/build-srt-sdk.js index 0475e32..9bd557f 100755 --- a/scripts/build-srt-sdk.js +++ b/scripts/build-srt-sdk.js @@ -13,7 +13,7 @@ const os = require('os'); const env = process.env; const SRT_REPO = env.NODE_SRT_REPO || "https://github.com/Haivision/srt.git"; -const SRT_CHECKOUT = "v1.5.2"; +const SRT_CHECKOUT = "v1.5.4"; const srtRepoPath = env.NODE_SRT_LOCAL_REPO ? `file://${path.join(__dirname, env.NODE_SRT_LOCAL_REPO)}` : SRT_REPO; const srtCheckout = env.NODE_SRT_CHECKOUT || SRT_CHECKOUT; From 76c5dbc4216534a4d7c61f1d43a5a499614065f3 Mon Sep 17 00:00:00 2001 From: wrapper Date: Thu, 17 Jul 2025 11:28:41 +0700 Subject: [PATCH 4/7] Allow multiplex --- src/node-srt.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/node-srt.cc b/src/node-srt.cc index 4f8dd4f..1dbd457 100644 --- a/src/node-srt.cc +++ b/src/node-srt.cc @@ -177,7 +177,7 @@ Napi::Value NodeSRT::Accept(const Napi::CallbackInfo& info) { Napi::Error::New(env, srt_getlasterror_str()).ThrowAsJavaScriptException(); return Napi::Number::New(env, SRT_ERROR); } - srt_close(socketValue); + socketValue = Napi::Number::New(env, SRT_INVALID_SOCK); return Napi::Number::New(env, their_fd); } From 36111eec76ccaea72d0b8cea17e5f5ad094788a0 Mon Sep 17 00:00:00 2001 From: wrapper Date: Thu, 17 Jul 2025 13:26:56 +0700 Subject: [PATCH 5/7] socket opts --- src/srt-server.js | 10 +++++++++- types/srt-server.d.ts | 3 +++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/srt-server.js b/src/srt-server.js index 3f72fa2..99c4a2a 100644 --- a/src/srt-server.js +++ b/src/srt-server.js @@ -99,7 +99,7 @@ class SRTConnection extends EventEmitter { this.emit('closing'); const result = await asyncSrt.close(this.fd); this.emit('closed', result); - this.off(); + this.removeAllListeners(); return result; } @@ -113,6 +113,14 @@ class SRTConnection extends EventEmitter { this._gotFirstData = true; } } + + async getSocketOpt(opt) { + return await this._asyncSrt.getSockOpt(this.fd, opt); + } + + async setSocketOpt(opt, val) { + await this._asyncSrt.setSockOpt(this.fd, opt, val); + } } /** diff --git a/types/srt-server.d.ts b/types/srt-server.d.ts index 39996a2..4f6c7e7 100644 --- a/types/srt-server.d.ts +++ b/types/srt-server.d.ts @@ -30,6 +30,9 @@ export class SRTConnection extends EventEmitter { onData(): void; getReaderWriter(): AsyncReaderWriter; + + getSocketOpt(opt: number): Promise; + setSocketOpt(opt: number, val: number): Promise; } export class SRTServer extends EventEmitter /**/ { From 8e036283a950ba88b7bb81929b10ba24b562b573 Mon Sep 17 00:00:00 2001 From: wrapper Date: Thu, 17 Jul 2025 13:32:15 +0700 Subject: [PATCH 6/7] part 2 --- types/srt-server.d.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/types/srt-server.d.ts b/types/srt-server.d.ts index 4f6c7e7..339c7ac 100644 --- a/types/srt-server.d.ts +++ b/types/srt-server.d.ts @@ -31,8 +31,8 @@ export class SRTConnection extends EventEmitter { getReaderWriter(): AsyncReaderWriter; - getSocketOpt(opt: number): Promise; - setSocketOpt(opt: number, val: number): Promise; + getSocketOpt(opt: number): Promise; + setSocketOpt(opt: number, val: number|boolean|string): Promise; } export class SRTServer extends EventEmitter /**/ { From 4a7cb0dc2a8bd9f2c63ea098ba22b8569817b7f0 Mon Sep 17 00:00:00 2001 From: wrapper Date: Thu, 17 Jul 2025 13:34:10 +0700 Subject: [PATCH 7/7] 21521 --- src/srt-server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/srt-server.js b/src/srt-server.js index 99c4a2a..92f5b10 100644 --- a/src/srt-server.js +++ b/src/srt-server.js @@ -119,7 +119,7 @@ class SRTConnection extends EventEmitter { } async setSocketOpt(opt, val) { - await this._asyncSrt.setSockOpt(this.fd, opt, val); + return await this._asyncSrt.setSockOpt(this.fd, opt, val); } }