Skip to content

Commit 3e6b589

Browse files
committed
new eslint version + fixes
1 parent dfd3e20 commit 3e6b589

File tree

6 files changed

+27
-29
lines changed

6 files changed

+27
-29
lines changed

.eslintrc.json

Lines changed: 0 additions & 20 deletions
This file was deleted.

eslint.config.mjs

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
import eslint from '@eslint/js';
2+
import tseslint from 'typescript-eslint';
3+
import globals from "globals";
4+
5+
export default tseslint.config(
6+
{
7+
ignores: ["**/types/", "**/dist/", "**/lib/"]
8+
},
9+
eslint.configs.recommended,
10+
tseslint.configs.recommended,
11+
{
12+
files: ["examples/*.js"],
13+
languageOptions: {
14+
globals: {
15+
...globals.node,
16+
},
17+
},
18+
}
19+
);

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,10 @@
5959
"homepage": "https://github.com/cloudamqp/amqp-client.js#readme",
6060
"devDependencies": {
6161
"@types/node": "*",
62-
"@typescript-eslint/eslint-plugin": "*",
63-
"@typescript-eslint/parser": "*",
6462
"@vitest/browser": "*",
6563
"@vitest/coverage-v8": "*",
6664
"eslint": "*",
65+
"typescript-eslint": "*",
6766
"playwright": "*",
6867
"rollup": "*",
6968
"rollup-plugin-sourcemaps": "*",

src/amqp-base-client.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -163,13 +163,14 @@ export abstract class AMQPBaseClient {
163163
const type = view.getUint8(i); i += 1
164164
const channelId = view.getUint16(i); i += 2
165165
const frameSize = view.getUint32(i); i += 4
166+
let frameEnd = 0
166167
try {
167-
const frameEnd = view.getUint8(i + frameSize)
168-
if (frameEnd !== 206)
169-
throw (new AMQPError(`Invalid frame end ${frameEnd}, expected 206`, this))
170-
} catch (e) {
168+
frameEnd = view.getUint8(i + frameSize)
169+
} catch {
171170
throw (new AMQPError(`Frame end out of range, frameSize=${frameSize}, pos=${i}, byteLength=${view.byteLength}`, this))
172171
}
172+
if (frameEnd !== 206)
173+
throw (new AMQPError(`Invalid frame end ${frameEnd}, expected 206`, this))
173174

174175
const channel = this.channels[channelId]
175176
if (!channel) {

src/amqp-channel.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -831,13 +831,13 @@ export class AMQPChannel {
831831
* Resolvs next RPC command
832832
* @ignore
833833
*/
834-
resolveRPC(value?: unknown) : void { value }
834+
resolveRPC(value?: unknown) : unknown | void { return value }
835835

836836
/**
837837
* Reject next RPC command
838838
* @ignore
839839
*/
840-
rejectRPC(err?: Error) : void { err }
840+
rejectRPC(err?: Error) : Error | void { return err }
841841

842842
/**
843843
* Deliver a message to a consumer

src/amqp-view.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ export class AMQPView extends DataView<Uint8Array['buffer']> {
1616
const combined = littleEndian ? left + 2**32 * right : 2**32 * left + right
1717

1818
if (!Number.isSafeInteger(combined)) {
19-
// eslint-disable-next-line no-console
2019
console.warn(combined, 'exceeds MAX_SAFE_INTEGER. Precision may be lost')
2120
}
2221

0 commit comments

Comments
 (0)