Skip to content

Commit 48d6274

Browse files
committed
Change from esm to cjs
1 parent c7c5d5b commit 48d6274

18 files changed

Lines changed: 171 additions & 99 deletions

bin/app.js

100644100755
Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
import NodeMediaServer from "../src/index.js";
2-
import { createRequire } from "module";
3-
4-
const require = createRequire(import.meta.url);
1+
const NodeMediaServer = require("..");
52
const config = require("./config.json");
63

74
const nms = new NodeMediaServer(config);

eslint.config.js

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
import globals from "globals";
2-
import pluginJs from "@eslint/js";
3-
import jsdoc from "eslint-plugin-jsdoc";
1+
const eslint = require("eslint");
2+
const globals = require("globals");
3+
const pluginJs = require("@eslint/js");
4+
const jsdoc = require("eslint-plugin-jsdoc");
45

5-
/** @type {import('eslint').Linter.Config[]} */
6-
export default [
6+
/** @type {eslint.Linter.Config[]} */
7+
module.exports = [
78
pluginJs.configs.recommended,
89
jsdoc.configs["flat/recommended"],
10+
{ files: ["**/*.js"], languageOptions: { sourceType: "commonjs" } },
911
{
1012
languageOptions: { globals: globals.node },
1113
plugins: {

package.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"name": "node-media-server",
33
"description": "A Node.js implementation of RTMP Server",
44
"version": "4.0.1",
5-
"type": "module",
65
"bin": "bin/app.js",
76
"main": "src/index.js",
87
"scripts": {
@@ -21,7 +20,6 @@
2120
"license": "Apache-2.0",
2221
"devDependencies": {
2322
"@eslint/js": "^9.15.0",
24-
"@types/node": "^22.10.1",
2523
"eslint": "^9.15.0",
2624
"eslint-plugin-jsdoc": "50.6.0",
2725
"globals": "^15.12.0"
@@ -32,6 +30,6 @@
3230
"nanoid": "^5.0.9"
3331
},
3432
"engines": {
35-
"node": ">=18.0.0"
33+
"node": ">=16.0.0"
3634
}
3735
}

src/core/avcodec.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,4 @@
33
// Created by Chen Mingliang on 23/12/01.
44
// illuspas@msn.com
55
// Copyright (c) 2023 NodeMedia. All rights reserved.
6-
//
7-
8-
export {};
6+
//

src/core/avpacket.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// Copyright (c) 2023 NodeMedia. All rights reserved.
66
//
77

8-
export default class AVPacket {
8+
class AVPacket {
99
constructor() {
1010
this.codec_id = 0;
1111
this.codec_type = 0;
@@ -17,4 +17,6 @@ export default class AVPacket {
1717
this.offset = 0;
1818
this.data = Buffer.alloc(0);
1919
}
20-
}
20+
}
21+
22+
module.exports = AVPacket;

src/core/context.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
// Copyright (c) 2023 NodeMedia. All rights reserved.
66
//
77

8-
import BaseSession from "../session/base_session.js";
9-
import BroadcastServer from "../server/broadcast_server.js";
8+
const BaseSession = require("../session/base_session.js");
9+
const BroadcastServer = require( "../server/broadcast_server.js");
1010

11-
export default class Context {
11+
class Context {
1212
constructor(config) {
1313
this.config = config;
1414

@@ -18,4 +18,6 @@ export default class Context {
1818
/** @type {Map<string, BroadcastServer>} */
1919
this.broadcasts = new Map();
2020
}
21-
}
21+
}
22+
23+
module.exports = Context;

src/core/logger.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,4 @@ class Logger {
6161
}
6262
}
6363

64-
export default new Logger("debug");
64+
module.exports = new Logger("debug");

src/index.js

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,13 @@
55
// Copyright (c) 2024 NodeMedia. All rights reserved.
66
//
77

8-
import NodeHttpServer from "./server/http_server.js";
9-
import NodeRtmpServer from "./server/rtmp_server.js";
10-
import { createRequire } from "module";
11-
import logger from "./core/logger.js";
12-
import Context from "./core/context.js";
13-
14-
const require = createRequire(import.meta.url);
8+
const NodeHttpServer = require("./server/http_server.js");
9+
const NodeRtmpServer = require("./server/rtmp_server.js");
10+
const logger = require("./core/logger.js");
11+
const Context = require("./core/context.js");
1512
const Package = require("../package.json");
1613

17-
export default class NodeMediaServer {
14+
class NodeMediaServer {
1815
constructor(config) {
1916
logger.level = "debug";
2017
logger.info(`Node-Media-Server v${Package.version}`);
@@ -30,4 +27,6 @@ export default class NodeMediaServer {
3027
this.httpServer.run();
3128
this.rtmpServer.run();
3229
}
33-
}
30+
}
31+
32+
module.exports = NodeMediaServer;

src/protocol/amf.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* This module provides encoding and decoding of the AMF0 format
44
*/
55

6-
import logger from "../core/logger.js";
6+
const logger = require("../core/logger.js");
77

88

99
const amf0dRules = {
@@ -669,7 +669,7 @@ function encodeAmf0Data(opt) {
669669
}
670670

671671

672-
export {
672+
module.exports = {
673673
decodeAmf0Cmd,
674674
encodeAmf0Cmd,
675675
decodeAmf0Data,

src/protocol/flv.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
// Copyright (c) 2023 Nodemedia. All rights reserved.
66
//
77

8-
import logger from "../core/logger.js";
9-
import AVPacket from "../core/avpacket.js";
10-
import * as AMF from "./amf.js";
8+
const logger = require("../core/logger.js");
9+
const AVPacket = require("../core/avpacket.js");
10+
const AMF = require("./amf.js");
1111

1212
const FLV_MEDIA_TYPE_AUDIO = 8;
1313
const FLV_MEDIA_TYPE_VIDEO = 9;
@@ -63,7 +63,7 @@ const PacketTypeMPEG2TSSequenceStart = 5;
6363
/**
6464
* @class
6565
*/
66-
export default class Flv {
66+
class Flv {
6767
constructor() {
6868
this.parserBuffer = Buffer.alloc(13);
6969
this.parserState = FLV_PARSE_INIT;
@@ -285,3 +285,4 @@ export default class Flv {
285285
};
286286
}
287287

288+
module.exports = Flv;

0 commit comments

Comments
 (0)