inline worker

Author: aeinstein

dist/webrtmp.js

@@ -16,7 +16,8 @@
     "build-production": "node_modules/.bin/webpack --mode=production"
   },
   "dependencies": {
-    "webworkify": "^1.5.0"
+    "webworkify": "^1.5.0",
+    "worker-loader": "^3.0.8"
   },
   "devDependencies": {
     "webpack": "^5.58.2",

dist/webrtmp.js.map

@@ -0,0 +1,38 @@
+/*
+ *
+ * Copyright (C) 2023 itNOX. All Rights Reserved.
+ *
+ * @author Michael Balen <mb@itnox.de>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+import Log from "./utils/logger";
+
+export const loglevels = {
+    "RTMPMessage": Log.ERROR,
+    "RTMPMessageHandler": Log.WARN,
+    "RTMPMediaMessageHandler": Log.ERROR,
+    "ChunkParser": Log.WARN,
+    "RTMPHandshake": Log.ERROR,
+    "Chunk": Log.OFF,
+    "MP4Remuxer": Log.ERROR,
+    "Transmuxer": Log.WARN,
+    "EventEmitter": Log.DEBUG,
+    "MSEController": Log.INFO,
+    "WebRTMP": Log.DEBUG,
+    "WebRTMP_Controller": Log.WARN,
+    "WebRTMP Worker": Log.WARN,
+    "AMF": Log.WARN
+}

dist/webrtmp.worker.js

@@ -20,9 +20,11 @@
 
 
 import { WebRTMP } from "./webrtmp";
-
+import Log from "./utils/logger";
 export { WebRTMP } from "./webrtmp";
 
 export function createWebRTMP(){
     return new WebRTMP();
 }
+
+window["Log"] = Log;

dist/webrtmp.worker.js.map

@@ -31,7 +31,7 @@ class Log {
 
     /**
      * Object with [ClassName, Loglevel]
-     * @type {}
+     * @type {Object}
      */
     static loglevels = {};
 
@@ -45,7 +45,13 @@ class Log {
     static _output = function output(level, tag, ...txt){
         let tmpLevel = Log.LEVEL;
 
-        if(Log.loglevels[tag]) tmpLevel = Log.loglevels[tag];
+        // Dirty fix because inline worker cant access static properties
+        try{
+            if(Log.loglevels[tag]) tmpLevel = Log.loglevels[tag];
+        }catch (e) {
+            return;
+        }
+
 
         if(tmpLevel === Log.OFF) return;
         if(tmpLevel > level) return;

package.json

@@ -256,5 +256,3 @@ export class WebRTMP{
 		}
 	}
 }
-
-window["Log"] = Log;

src/config.js

@@ -20,6 +20,7 @@
 
 import EventEmitter from "../utils/event_emitter";
 import Log from "../utils/logger";
+import Worker from "./connection.worker.js";
 
 class WebRTMP_Controller {
 	TAG = "WebRTMP_Controller";
@@ -28,31 +29,26 @@ class WebRTMP_Controller {
 	WSSReconnect = false;
 	isConnected = false;
 
-	loglevels = {
-		"RTMPMessage": Log.ERROR,
-		"RTMPMessageHandler": Log.WARN,
-		"RTMPMediaMessageHandler": Log.ERROR,
-		"ChunkParser": Log.WARN,
-		"RTMPHandshake": Log.ERROR,
-		"Chunk": Log.OFF,
-		"MP4Remuxer": Log.ERROR,
-		"Transmuxer": Log.WARN,
-		"EventEmitter": Log.DEBUG,
-		"MSEController": Log.INFO,
-		"WebRTMP": Log.DEBUG,
-		"WebRTMP_Controller": Log.WARN,
-		"WebRTMP Worker": Log.WARN,
-		"AMF": Log.WARN
-	}
-
-	WebRTMPWorker = new Worker(new URL('connection.worker.js', import.meta.url), {
-		name: "webrtmp.worker",
-		type: "module"
-		/* webpackEntryOptions: { filename: "[name].js" } */
-	});
+	WebRTMPWorker = new Worker();
 
 	constructor() {
-		Log.loglevels = this.loglevels;
+		Log.loglevels = {
+            "RTMPMessage": Log.ERROR,
+            "RTMPMessageHandler": Log.WARN,
+            "RTMPMediaMessageHandler": Log.ERROR,
+            "ChunkParser": Log.WARN,
+            "RTMPHandshake": Log.ERROR,
+            "Chunk": Log.OFF,
+            "MP4Remuxer": Log.ERROR,
+            "Transmuxer": Log.WARN,
+            "EventEmitter": Log.DEBUG,
+            "MSEController": Log.INFO,
+            "WebRTMP": Log.DEBUG,
+            "WebRTMP_Controller": Log.WARN,
+            "WebRTMP Worker": Log.WARN,
+            "AMF": Log.WARN,
+            "WSSConnectionManager": Log.DEBUG
+        };
 
 		this._emitter = new EventEmitter();