Skip to content

Commit 81ee431

Browse files
ThanhDodeurOdooseb-odoo
authored andcommitted
[FIX] cleanup package.json
* Remove the "sideEffects" property from the package.json as this property was for WebPack* and we are now using Rollup. dev dependencies changes: * Limit version tolerance of some linting dependencies to prevent linting inconsistencies. * Add missing rollup dependencies. * Lint JS files back to es5 trailing comma as it is the default of prettier <3.0, which is the version used in the rest of the odoo codebase.
1 parent 53120d2 commit 81ee431

File tree

7 files changed

+672
-403
lines changed

7 files changed

+672
-403
lines changed

Diff for: package-lock.json

+652-383
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: package.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
"author": "Odoo",
66
"license": "LGPL-3.0",
77
"type": "module",
8-
"sideEffects": false,
98
"scripts": {
109
"build": "rollup -c",
1110
"start": "node ./src/server.js",
@@ -30,18 +29,19 @@
3029
},
3130
"devDependencies": {
3231
"@jest/globals": "^29.6.2",
32+
"@rollup/plugin-commonjs": "^25.0.7",
33+
"@rollup/plugin-node-resolve": "^13.0.4",
3334
"@types/node": "^20.5.0",
34-
"eslint": "^8.46.0",
35+
"eslint": "~8.46.0",
3536
"eslint-plugin-import": "^2.25.3",
3637
"eslint-plugin-jest": "^27.2.3",
38+
"eslint-plugin-prettier": "~4.2.0",
3739
"fake-mediastreamtrack": "^1.2.0",
3840
"git-rev-sync": "^3.0.2",
3941
"jest": "^29.6.2",
4042
"mediasoup-client": "^3.6.101",
41-
"prettier": "^2.8.8",
43+
"prettier": "~2.8.8",
4244
"rollup": "^2.79.1",
43-
"rollup-plugin-license": "3.2.0",
44-
"@rollup/plugin-node-resolve": "^13.0.4",
45-
"@rollup/plugin-commonjs": "^25.0.7"
45+
"rollup-plugin-license": "3.2.0"
4646
}
4747
}

Diff for: src/client.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ export class SfuClient extends EventTarget {
187187
proms.push(
188188
(async () => {
189189
stats[type] = await producer.getStats();
190-
})(),
190+
})()
191191
);
192192
}
193193
}
@@ -210,7 +210,7 @@ export class SfuClient extends EventTarget {
210210
name: CLIENT_MESSAGE.INFO_CHANGE,
211211
payload: { info, needRefresh },
212212
},
213-
{ batch: true },
213+
{ batch: true }
214214
);
215215
}
216216

@@ -251,7 +251,7 @@ export class SfuClient extends EventTarget {
251251
name: CLIENT_MESSAGE.CONSUMPTION_CHANGE,
252252
payload: { sessionId, states },
253253
},
254-
{ batch: true },
254+
{ batch: true }
255255
);
256256
}
257257

@@ -275,7 +275,7 @@ export class SfuClient extends EventTarget {
275275
name: CLIENT_MESSAGE.PRODUCTION_CHANGE,
276276
payload: { type, active: Boolean(track) },
277277
},
278-
{ batch: true },
278+
{ batch: true }
279279
);
280280
return;
281281
}
@@ -390,7 +390,7 @@ export class SfuClient extends EventTarget {
390390
() => {
391391
webSocket.send(JSON.stringify(this._jsonWebToken));
392392
},
393-
{ once: true },
393+
{ once: true }
394394
);
395395
/**
396396
* Receiving a message means that the server has authenticated the client and is ready to receive messages.
@@ -400,7 +400,7 @@ export class SfuClient extends EventTarget {
400400
() => {
401401
resolve(new Bus(webSocket));
402402
},
403-
{ once: true },
403+
{ once: true }
404404
);
405405
});
406406
}

Diff for: src/server.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ const processHandlers = {
5454
logger.info(`-- camera: ${camera} bps`);
5555
logger.info(`-- screen: ${screen} bps`);
5656
logger.info(`-- total: ${total} bps`);
57-
})(),
57+
})()
5858
);
5959
}
6060
await Promise.all(proms);

Diff for: src/services/http.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ export async function start({ httpInterface = config.HTTP_INTERFACE, port = conf
6868
JSON.stringify({
6969
uuid: channel.uuid,
7070
url: `${protocol}://${host}`,
71-
}),
71+
})
7272
);
7373
} catch (error) {
7474
logger.warn(`[${remoteAddress}] failed to create channel: ${error.message}`);
@@ -83,15 +83,15 @@ export async function start({ httpInterface = config.HTTP_INTERFACE, port = conf
8383
/** @type {{ sessionIdsByChannel: Object<string, number[]> }} */
8484
const claims = await auth.verify(jsonWebToken);
8585
for (const [channelUuid, sessionIds] of Object.entries(
86-
claims.sessionIdsByChannel,
86+
claims.sessionIdsByChannel
8787
)) {
8888
const channel = Channel.records.get(channelUuid);
8989
if (!channel) {
9090
return res.end();
9191
}
9292
if (!channel.remoteAddress === remoteAddress) {
9393
logger.warn(
94-
`[${remoteAddress}] tried to disconnect sessions from channel ${channelUuid} but is not the owner`,
94+
`[${remoteAddress}] tried to disconnect sessions from channel ${channelUuid} but is not the owner`
9595
);
9696
return res.end();
9797
}
@@ -198,7 +198,7 @@ class RouteListener {
198198
});
199199
} catch (error) {
200200
logger.error(
201-
`[${remoteAddress}] ${error.message} when calling ${req.url}: ${error.message}`,
201+
`[${remoteAddress}] ${error.message} when calling ${req.url}: ${error.message}`
202202
);
203203
res.statusCode = 500; // Internal server error
204204
return res.end();

Diff for: src/services/rtc.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export async function start() {
1515
}
1616
logger.info(`initialized ${workers.size} mediasoup workers`);
1717
logger.info(
18-
`transport(RTC) layer at ${config.PUBLIC_IP}:${config.RTC_MIN_PORT}-${config.RTC_MAX_PORT}`,
18+
`transport(RTC) layer at ${config.PUBLIC_IP}:${config.RTC_MIN_PORT}-${config.RTC_MAX_PORT}`
1919
);
2020
}
2121

@@ -57,7 +57,7 @@ export async function getWorker() {
5757
leastUsedWorker = worker;
5858
lowestUsage = ru_maxrss;
5959
}
60-
})(),
60+
})()
6161
);
6262
}
6363
await Promise.all(proms);

Diff for: src/services/ws.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ async function connect(webSocket, jsonWebToken) {
130130
});
131131
});
132132
webSocket.on("error", (error) =>
133-
session.close({ code: SESSION_CLOSE_CODE.WS_ERROR, cause: error.message }),
133+
session.close({ code: SESSION_CLOSE_CODE.WS_ERROR, cause: error.message })
134134
);
135135
// Not awaiting connect
136136
session.connect(bus, ice_servers);

0 commit comments

Comments
 (0)