workerChannel: add into node/src

versatica · May 21, 2024 · f437881 · f437881
1 parent 1b248e8
commit f437881
Showing 10 changed files with 21 additions and 6 deletions.
diff --git 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/src';
+import { WorkerChannel } from './workerChannel/src';
 import { Logger } from './Logger';
 import { EnhancedEventEmitter } from './enhancedEvents';
 import { InvalidStateError } from './errors';

diff --git a/node/src/Worker.ts b/node/src/Worker.ts
@@ -1,6 +1,6 @@
 import * as process from 'node:process';
 import * as path from 'node:path';
-import { WorkerChannel } from '../workerChannel/src';
+import { WorkerChannel } from './workerChannel/src';
 import { version } from './';
 import { Logger } from './Logger';
 import { EnhancedEventEmitter } from './enhancedEvents';

diff --git a/node/workerChannel/binding.gyp → node/src/workerChannel/binding.gyp b/node/workerChannel/binding.gyp → node/src/workerChannel/binding.gyp
@@ -14,12 +14,12 @@
       'cflags_cc!': [ '-fno-exceptions' ],
       'include_dirs': [
         "<!@(node -p \"require('node-addon-api').include\")",
-        "<(module_root_dir)/../../worker/include",
+        "<(module_root_dir)/../../../worker/include",
       ],
       'conditions': [
         ['mediasoup_worker_lib==""', {
           'libraries': [
-            '<(module_root_dir)/../../worker/out/<(mediasoup_build_type)/build/libmediasoup-worker.a'
+            '<(module_root_dir)/../../../worker/out/<(mediasoup_build_type)/build/libmediasoup-worker.a'
           ],
         }, {
           "libraries": [

diff --git a/node/workerChannel/include/workerChannel.hpp → ...c/workerChannel/include/workerChannel.hpp b/node/workerChannel/include/workerChannel.hpp → ...c/workerChannel/include/workerChannel.hpp
diff --git a/node/workerChannel/scripts.mjs → node/src/workerChannel/scripts.mjs b/node/workerChannel/scripts.mjs → node/src/workerChannel/scripts.mjs
diff --git a/node/workerChannel/src/binding.cpp → node/src/workerChannel/src/binding.cpp b/node/workerChannel/src/binding.cpp → node/src/workerChannel/src/binding.cpp
diff --git a/node/workerChannel/src/index.ts → node/src/workerChannel/src/index.ts b/node/workerChannel/src/index.ts → node/src/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';
 

diff --git a/node/workerChannel/src/test.ts → node/src/workerChannel/src/test.ts b/node/workerChannel/src/test.ts → node/src/workerChannel/src/test.ts
diff --git a/node/workerChannel/src/workerChannel.cpp → node/src/workerChannel/src/workerChannel.cpp b/node/workerChannel/src/workerChannel.cpp → node/src/workerChannel/src/workerChannel.cpp
diff --git a/npm-scripts.mjs b/npm-scripts.mjs
@@ -22,7 +22,7 @@ const WORKER_RELEASE_BIN_PATH = `${WORKER_RELEASE_DIR}/${WORKER_RELEASE_BIN}`;
 const WORKER_PREBUILD_DIR = 'worker/prebuild';
 const WORKER_PREBUILD_TAR = getWorkerPrebuildTarName();
 const WORKER_PREBUILD_TAR_PATH = `${WORKER_PREBUILD_DIR}/${WORKER_PREBUILD_TAR}`;
-const WORKER_CHANNEL_ADDON_PATH = 'node/workerChannel';
+const WORKER_CHANNEL_ADDON_PATH = 'node/src/workerChannel';
 const GH_OWNER = 'versatica';
 const GH_REPO = 'mediasoup';
 
@@ -334,6 +334,8 @@ function buildTypescript({ force = false } = { force: false }) {
 
 	deleteNodeLib();
 	executeCmd('tsc --project node');
+
+	copyAddon();
 }
 
 function buildWorker() {
@@ -354,6 +356,19 @@ function buildWorkerLib() {
 	executeCmd(
 		`cd ${WORKER_CHANNEL_ADDON_PATH} && node scripts.mjs binding:build`
 	);
+
+	copyAddon();
+}
+
+function copyAddon() {
+	const buildType = process.env.MEDIASOUP_BUILDTYPE || 'Release';
+	const outDir = `node/lib/workerChannel/build/${buildType}`;
+
+	ensureDir(outDir);
+
+	fs.cpSync(`${WORKER_CHANNEL_ADDON_PATH}/build/${buildType}`, outDir, {
+		recursive: true,
+	});
 }
 
 function cleanWorkerArtifacts() {