Merge pull request #18 from th-ch/upgrade-dependencies

th-ch · web-flow · commit 552947fc25e6 · 2025-01-03T14:19:22.000+01:00
Upgrade dependencies
diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
@@ -5,7 +5,6 @@ name: Node.js CI
 
 on:
   push:
-    branches: [ master ]
   pull_request:
     branches: [ master ]
 
@@ -16,7 +15,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [12.x, 14.x, 16.x, 18.x, 20.x]
+        node-version: [18.x, 20.x, 22.x]
 
     steps:
     - uses: actions/checkout@v2
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,10 @@
 /node_modules
 /package
 *.tgz
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -0,0 +1 @@
+nodeLinker: node-modules
diff --git a/package.json b/package.json
@@ -8,14 +8,14 @@
         "type": "git"
     },
     "devDependencies": {
-        "@types/chai": "^4.3.11",
-        "@types/mocha": "^9.1.0",
-        "@types/node": "^14.11.8",
-        "chai": "^4.4.1",
-        "mocha": "^9.2.2",
-        "prettier": "^2.1.2",
-        "ts-node": "^9.0.0",
-        "typescript": "^4.0.3"
+        "@types/chai": "^4.3.20",
+        "@types/mocha": "^10.0.10",
+        "@types/node": "^22.10.2",
+        "chai": "^4.5.0",
+        "mocha": "11.0.2",
+        "prettier": "^3.4.2",
+        "ts-node": "^10.9.2",
+        "typescript": "^5.7.2"
     },
     "scripts": {
         "build": "yarn clean && tsc",
diff --git a/src/stream.ts b/src/stream.ts
@@ -82,7 +82,7 @@ export class Stream extends Duplex {
     }
 
     private sendFlags() {
-        let flags: FLAGS = 0;
+        let flags: FLAGS | number = 0;
 
         switch (this.state) {
             case STREAM_STATES.Init:
diff --git a/test/header.test.ts b/test/header.test.ts
@@ -9,7 +9,7 @@ describe('Header', () => {
     });
 
     it('can parse and re-encode an encoded header', () => {
-        const encodedHeader = Buffer.from(['00', '02', '00', '01', '00', '00', '00', '00', '00', '00', '00', '07']);
+        const encodedHeader = Buffer.from([0x0, 0x2, 0x0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7]);
         const header = Header.parse(encodedHeader);
 
         expect(header.version).to.equal(VERSION);
diff --git a/test/session.test.ts b/test/session.test.ts
@@ -35,11 +35,11 @@ describe('Server session', () => {
         const server = new Session(false, testConfigWithKeepAlive);
         const expectedPings = [
             // first ping
-            Buffer.from(['00', '02', '00', '01', '00', '00', '00', '00', '00', '00', '00', '00']),
+            Buffer.from([0x0, 0x2, 0x0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0]),
             // second ping
-            Buffer.from(['00', '02', '00', '01', '00', '00', '00', '00', '00', '00', '00', '01']),
+            Buffer.from([0x0, 0x2, 0x0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1]),
             // Third ping
-            Buffer.from(['00', '02', '00', '01', '00', '00', '00', '00', '00', '00', '00', '02']),
+            Buffer.from([0x0, 0x2, 0x0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2]),
         ];
 
         server.on('data', (data) => {
diff --git a/test/stream.test.ts b/test/stream.test.ts
@@ -25,7 +25,7 @@ describe('Stream', () => {
             expect(
                 Buffer.compare(
                     data,
-                    Buffer.from(['00', '01', '00', '01', '00', '00', '00', '00', '00', '00', '00', '00'])
+                    Buffer.from([0x0, 0x1, 0x0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0])
                 )
             ).to.equal(0);
             session.removeAllListeners('data');
@@ -42,15 +42,15 @@ describe('Stream', () => {
             expect(
                 Buffer.compare(
                     data,
-                    Buffer.from(['00', '00', '00', '00', '00', '00', '00', '00', '00', '00', '00', '01', 'ff'])
+                    Buffer.from([0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0xff])
                 )
             ).to.equal(0);
             expect(stream['sendWindow']).to.equal(0)
             session.removeAllListeners('data');
             session.close();
             done();
         });
-        stream.write(Buffer.from(['ff']), () => stream.close());
+        stream.write(Buffer.from([0xff]), () => stream.close());
     });
 
     it('waits for a window update if send window is empty', (done) => {
@@ -61,7 +61,7 @@ describe('Stream', () => {
             expect(
                 Buffer.compare(
                     data,
-                    Buffer.from(['00', '00', '00', '00', '00', '00', '00', '00', '00', '00', '00', '01', 'ff'])
+                    Buffer.from([0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0xff])
                 )
             ).to.equal(0);
             expect(stream['sendWindow']).to.equal(0)
@@ -70,7 +70,7 @@ describe('Stream', () => {
             session.close();
             done();
         });
-        stream.write(Buffer.from(['ff']), () => stream.close());
+        stream.write(Buffer.from([0xff]), () => stream.close());
         const hdr = new Header(VERSION, TYPES.WindowUpdate, 0, stream.ID(), 1);
         setTimeout(() => stream.incrSendWindow(hdr), 50)
     });
@@ -82,13 +82,13 @@ describe('Stream', () => {
         session.on('data', (data) => {
             if (data[1] === 0) { // packet is of type Data
                 numberOfDataPackets++
-                expect(Buffer.compare(data, Buffer.from(['00', '00', '00', '00', '00', '00', '00', '00', '00', '00', '00', '01', 'ff']))).to.equal(0);
+                expect(Buffer.compare(data, Buffer.from([0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0xff]))).to.equal(0);
                 expect(stream['sendWindow']).to.equal(0)
                 const hdr = new Header(VERSION, TYPES.WindowUpdate, 0, stream.ID(), 1);
                 stream.incrSendWindow(hdr)
             }
         });
-        stream.write(Buffer.from(['ff', 'ff']), () => {
+        stream.write(Buffer.from([0xff, 0xff]), () => {
             expect(numberOfDataPackets).to.equal(2)
             stream.close();
             session.removeAllListeners('data');
@@ -104,7 +104,7 @@ describe('Stream', () => {
             expect(
                 Buffer.compare(
                     data,
-                    Buffer.from(['00', '01', '00', '04', '00', '00', '00', '00', '00', '00', '00', '00'])
+                    Buffer.from([0x00, 0x01, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00])
                 )
             ).to.equal(0);
             session.removeAllListeners('data');
@@ -120,7 +120,7 @@ describe('Stream', () => {
             expect(
                 Buffer.compare(
                     data,
-                    Buffer.from(['00', '01', '00', '04', '00', '00', '00', '00', '00', '00', '00', '00'])
+                    Buffer.from([0x00, 0x01, 0x00, 0x4, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0])
                 )
             ).to.equal(0);
             session.removeAllListeners('data');
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ export class Stream extends Duplex {`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`private sendFlags() {`
`85`		`- let flags: FLAGS = 0;`
	`85`	`+ let flags: FLAGS \| number = 0;`
`86`	`86`
`87`	`87`	`switch (this.state) {`
`88`	`88`	`case STREAM_STATES.Init:`