diff --git a/node/src/Channel.ts b/node/src/Channel.ts index b36eaf01c6..abab10c2eb 100644 --- a/node/src/Channel.ts +++ b/node/src/Channel.ts @@ -1,7 +1,7 @@ import * as os from 'node:os'; import { info, warn } from 'node:console'; import * as flatbuffers from 'flatbuffers'; -import { WorkerChannel } from '../workerChannel'; +import { WorkerChannel } from 'worker-channel'; import { Logger } from './Logger'; import { EnhancedEventEmitter } from './enhancedEvents'; import { InvalidStateError } from './errors'; diff --git a/node/src/Worker.ts b/node/src/Worker.ts index 27e15bdf66..d7c9bee5ef 100644 --- a/node/src/Worker.ts +++ b/node/src/Worker.ts @@ -1,7 +1,7 @@ import * as process from 'node:process'; import * as path from 'node:path'; +import { WorkerChannel } from 'worker-channel'; import { version } from './'; -import { WorkerChannel } from '../workerChannel'; import { Logger } from './Logger'; import { EnhancedEventEmitter } from './enhancedEvents'; import * as ortc from './ortc'; diff --git a/node/workerChannel/package-lock.json b/node/workerChannel/package-lock.json index e4c39de2b8..8ea0568616 100644 --- a/node/workerChannel/package-lock.json +++ b/node/workerChannel/package-lock.json @@ -1,19 +1,41 @@ { - "name": "mediasoup worker native module", - "version": "0.0.0", + "name": "worker-channel", + "version": "1.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "mediasoup worker native module", - "version": "0.0.0", + "name": "worker-channel", + "version": "1.0.0", "dependencies": { + "debug": "^4.3.4", "node-addon-api": "*" }, "devDependencies": { "typescript": "^5.4.5" } }, + "node_modules/debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + }, "node_modules/node-addon-api": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.0.0.tgz", diff --git a/node/workerChannel/package.json b/node/workerChannel/package.json index 4dd765c046..bd96eb166a 100644 --- a/node/workerChannel/package.json +++ b/node/workerChannel/package.json @@ -1,6 +1,6 @@ { - "name": "mediasoup worker channel", - "version": "0.0.0", + "name": "worker-channel", + "version": "1.0.0", "description": "Node.js Addon to communicate with mediasoup worker", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -13,6 +13,7 @@ "test": "node npm-scripts.mjs test" }, "dependencies": { + "debug": "^4.3.4", "node-addon-api": "*" }, "devDependencies": { diff --git a/node/workerChannel/src/index.ts b/node/workerChannel/src/index.ts index e6e49c18ce..de44b5bced 100644 --- a/node/workerChannel/src/index.ts +++ b/node/workerChannel/src/index.ts @@ -1,5 +1,5 @@ import { EventEmitter } from 'events'; -import { EnhancedEventEmitter } from '../../src/enhancedEvents'; +import { EnhancedEventEmitter } from './enhancedEvents'; const buildType = process.env.MEDIASOUP_BUILDTYPE ?? 'Release'; @@ -9,7 +9,7 @@ const { WorkerChannel: NativeWorkerChannel } = require( ); export type WorkerChannelEvents = { - data: [Uint8Array]; + data: [Buffer]; error: [number]; }; diff --git a/package-lock.json b/package-lock.json index 8caf01a522..1f8f8b2da0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,7 +17,8 @@ "ini": "^4.1.2", "node-fetch": "^3.3.2", "supports-color": "^9.4.0", - "tar": "^7.1.0" + "tar": "^7.1.0", + "worker-channel": "file:node/workerChannel" }, "devDependencies": { "@octokit/rest": "^20.1.1", @@ -4889,6 +4890,14 @@ "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", "dev": true }, + "node_modules/node-addon-api": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.0.0.tgz", + "integrity": "sha512-ipO7rsHEBqa9STO5C5T10fj732ml+5kLN1cAG8/jdHd56ldQeGj3Q7+scUS+VHK/qy1zLEwC4wMK5+yM0btPvw==", + "engines": { + "node": "^18 || ^20 || >= 21" + } + }, "node_modules/node-domexception": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz", @@ -6232,6 +6241,10 @@ "node": ">= 8" } }, + "node_modules/worker-channel": { + "resolved": "node/workerChannel", + "link": true + }, "node_modules/wrap-ansi": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", @@ -6340,11 +6353,9 @@ } }, "node/workerChannel": { - "name": "mediasoup worker native module", + "name": "worker-channel", "version": "0.0.0", - "extraneous": true, "dependencies": { - "bindings": "*", "node-addon-api": "*" }, "devDependencies": { @@ -9868,6 +9879,11 @@ "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", "dev": true }, + "node-addon-api": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.0.0.tgz", + "integrity": "sha512-ipO7rsHEBqa9STO5C5T10fj732ml+5kLN1cAG8/jdHd56ldQeGj3Q7+scUS+VHK/qy1zLEwC4wMK5+yM0btPvw==" + }, "node-domexception": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz", @@ -10759,6 +10775,13 @@ "isexe": "^2.0.0" } }, + "worker-channel": { + "version": "file:node/workerChannel", + "requires": { + "node-addon-api": "*", + "typescript": "^5.4.5" + } + }, "wrap-ansi": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", diff --git a/package.json b/package.json index 0eb048158f..fd6bbf523a 100644 --- a/package.json +++ b/package.json @@ -106,7 +106,8 @@ "ini": "^4.1.2", "node-fetch": "^3.3.2", "supports-color": "^9.4.0", - "tar": "^7.1.0" + "tar": "^7.1.0", + "worker-channel": "file:node/workerChannel" }, "devDependencies": { "@octokit/rest": "^20.1.1",