ci: merge staging to master

.gitlab-ci.yml

@@ -207,8 +207,8 @@ build:macos:
   stage: build
   needs: []
   tags:
-    - shared-macos-amd64
-  image: macos-11-xcode-12
+    - saas-macos-medium-m1
+  image: macos-12-xcode-14
   variables:
     # Produce universal binary
     RUST_BACKTRACE: "1"

.npmignore

@@ -13,4 +13,6 @@
 /benches
 /build
 /builds
+/prebuild
+/prepublishOnly
 /dist/tsbuildinfo

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "quic"
-version = "0.0.1"
+version = "0.0.7-alpha.0"
 authors = ["Roger Qiu <[email protected]>"]
 license-file = "LICENSE"
 edition = "2021"

README.md

@@ -154,3 +154,58 @@ npm publish --access public
 git push
 git push --tags
 ```
+
+---
+
+I need to be locked together.
+
+These need to be atomic operations.
+
+The only issue is that the "atomicity" is controlled outside of `QUICConnection` atm.
+
+Whereas it seems to make sense to do this directly?
+
+```
+recieve
+[IF IS DRAINING IS TRUE SKIP SEND]
+send
+[CLOSE] - we may be "closed here"
+set-timeout
+```
+
+This would be triggered by:
+* QUICStream
+* keepAliveTimer
+* after onTimeout
+
+```
+send
+[CLOSE] - we may be "closed here"
+set-timeout
+```
+
+Remember you may also "receive" and end up closing too. But you will always check if you need to send first before checking the close. At worst it will tell you it's done.
+
+Now of course we enable calling recv and send.
+
+But `send` actually ends up calling multiple things here.
+
+But if `recv` is synchronous, you can always call it infront of `send`.
+
+This technically means `send` should be encapsulating the logic of setting the timeout.
+
+If you want to make sure it's re-entrant, you can just "lock" on the send call.
+
+The setTimeout is then protected.
+
+The `recv` call is made synchronously.
+
+
+
+Receive Send Timer, Send Timer (all of this requires locking the conn lock)
+
+Closing too, it should require the conn lock
+Receive Send [Close] Timer, Send [Close] Timer
+It's all optional
+It's the send that has to do Send, Close, Timer... that's what needs to check it all
+Forget about events for now

benches/index.ts

@@ -4,13 +4,13 @@ import fs from 'fs';
 import path from 'path';
 import si from 'systeminformation';
 import Stream1KB from './stream_1KB';
-// import Dummy from './dummy';
+// Import Dummy from './dummy';
 
 async function main(): Promise<void> {
   await fs.promises.mkdir(path.join(__dirname, 'results'), { recursive: true });
   // Running benches
   await Stream1KB();
-  // await Dummy();
+  // Await Dummy();
   const resultFilenames = await fs.promises.readdir(
     path.join(__dirname, 'results'),
   );

benches/results/metrics.txt

@@ -1,26 +1,8 @@
-# TYPE dummy_ops gauge
-dummy_ops{name="add 1 + 1"} 11776647
-dummy_ops{name="subtract 1 - 1"} 11685857
-dummy_ops{name="multiply 1 * 1"} 12000931
-dummy_ops{name="divide 1 / 1"} 11857267
-
-# TYPE dummy_margin gauge
-dummy_margin{name="add 1 + 1"} 0.55
-dummy_margin{name="subtract 1 - 1"} 0.95
-dummy_margin{name="multiply 1 * 1"} 0.48
-dummy_margin{name="divide 1 / 1"} 0.58
-
-# TYPE dummy_samples counter
-dummy_samples{name="add 1 + 1"} 84
-dummy_samples{name="subtract 1 - 1"} 84
-dummy_samples{name="multiply 1 * 1"} 85
-dummy_samples{name="divide 1 / 1"} 83
-
 # TYPE stream_1KB_ops gauge
-stream_1KB_ops{name="send 1Kib of data"} 176
+stream_1KB_ops{name="send 1Kib of data"} 214
 
 # TYPE stream_1KB_margin gauge
-stream_1KB_margin{name="send 1Kib of data"} 2.68
+stream_1KB_margin{name="send 1Kib of data"} 0.95
 
 # TYPE stream_1KB_samples counter
-stream_1KB_samples{name="send 1Kib of data"} 76
+stream_1KB_samples{name="send 1Kib of data"} 84

benches/results/system.json

@@ -1,41 +1,41 @@
 {
   "cpu": {
-    "manufacturer": "Intel",
-    "brand": "Xeon® E3-1241 v3",
-    "vendor": "Intel",
-    "family": "6",
-    "model": "60",
-    "stepping": "3",
+    "manufacturer": "AMD",
+    "brand": "Ryzen 7 5800X 8-Core Processor",
+    "vendor": "AMD",
+    "family": "25",
+    "model": "33",
+    "stepping": "0",
     "revision": "",
     "voltage": "",
-    "speed": 3.5,
-    "speedMin": 0.8,
-    "speedMax": 3.9,
-    "governor": "performance",
-    "cores": 8,
-    "physicalCores": 4,
-    "performanceCores": 4,
+    "speed": 3.8,
+    "speedMin": null,
+    "speedMax": null,
+    "governor": "",
+    "cores": 16,
+    "physicalCores": 8,
+    "performanceCores": 8,
     "efficiencyCores": 0,
     "processors": 1,
     "socket": "",
-    "flags": "fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid xsaveopt dtherm ida arat pln pts md_clear flush_l1d",
-    "virtualization": true,
+    "flags": "fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm rep_good nopl cpuid extd_apicid pni pclmulqdq ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand hypervisor lahf_lm cmp_legacy cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw topoext ibrs ibpb stibp vmmcall fsgsbase bmi1 avx2 smep bmi2 erms rdseed adx smap clflushopt clwb sha_ni xsaveopt xsavec xgetbv1 xsaves xsaveerptr arat vaes vpclmulqdq rdpid",
+    "virtualization": false,
     "cache": {
-      "l1d": 131072,
-      "l1i": 131072,
-      "l2": 1048576,
-      "l3": 8388608
+      "l1d": 262144,
+      "l1i": 262144,
+      "l2": 4194304,
+      "l3": 33554432
     }
   },
   "osInfo": {
     "platform": "linux",
-    "distro": "nixos",
-    "release": "22.11",
-    "kernel": "5.10.177",
+    "distro": "Faulkes-Work",
+    "release": "unknown",
+    "kernel": "4.19.190",
     "arch": "x64"
   },
   "system": {
-    "model": "P7 Pro SE",
-    "manufacturer": "EUROCOM"
+    "model": "Virtual Machine",
+    "manufacturer": "Microsoft Corporation"
   }
 }

benches/stream_1KB.ts

@@ -1,7 +1,6 @@
 import type * as events from '../src/events';
 import type { Host } from '../src/types';
 import path from 'path';
-import fs from 'fs';
 import b from 'benny';
 import Logger, { formatting, LogLevel, StreamHandler } from '@matrixai/logger';
 import { suiteCommon } from './utils';
@@ -16,42 +15,32 @@ async function main() {
     ),
   ]);
   // Setting up initial state
-  const crypto = {
-    key: await testsUtils.generateKey(),
-    ops: {
-      sign: testsUtils.sign,
-      verify: testsUtils.verify,
-      randomBytes: testsUtils.randomBytes,
-    },
-  };
-
   const data1KiB = Buffer.alloc(1024, 0xf0);
   const host = '127.0.0.1' as Host;
-  const certChainPem = await fs.promises.readFile(
-    path.resolve(path.join(__dirname), '../tests/fixtures/certs/rsa1.crt'),
-  );
-  const privKeyPem = await fs.promises.readFile(
-    path.resolve(path.join(__dirname), '../tests/fixtures/certs/rsa1.key'),
-  );
+  const tlsConfig = await testsUtils.generateConfig('RSA');
 
   const quicServer = new QUICServer({
     config: {
-      tlsConfig: {
-        privKeyPem: privKeyPem.toString(),
-        certChainPem: certChainPem.toString(),
-      },
+      key: tlsConfig.key,
+      cert: tlsConfig.cert,
       verifyPeer: false,
+      keepAliveIntervalTime: 1000,
+    },
+    crypto: {
+      key: await testsUtils.generateKeyHMAC(),
+      ops: {
+        sign: testsUtils.signHMAC,
+        verify: testsUtils.verifyHMAC,
+      },
     },
-    keepaliveIntervalTime: 1000,
-    crypto,
     logger,
   });
   quicServer.addEventListener(
-    'connection',
+    'serverConnection',
     async (e: events.QUICServerConnectionEvent) => {
       const conn = e.detail;
       conn.addEventListener(
-        'stream',
+        'connectionStream',
         (streamEvent: events.QUICConnectionStreamEvent) => {
           const stream = streamEvent.detail;
           void Promise.allSettled([
@@ -80,7 +69,11 @@ async function main() {
     host,
     port: quicServer.port,
     localHost: host,
-    crypto,
+    crypto: {
+      ops: {
+        randomBytes: testsUtils.randomBytes,
+      },
+    },
     logger,
   });
 

jest.config.js

@@ -33,8 +33,21 @@ module.exports = {
   roots: ['<rootDir>/tests'],
   testMatch: ['**/?(*.)+(spec|test|unit.test).+(ts|tsx|js|jsx)'],
   transform: {
-    '^.+\\.tsx?$': 'ts-jest',
-    '^.+\\.jsx?$': 'babel-jest',
+    "^.+\\.(t|j)sx?$": [
+      "@swc/jest",
+      {
+        jsc: {
+          parser: {
+            syntax: "typescript",
+            tsx: true,
+            decorators: compilerOptions.experimentalDecorators,
+            dynamicImport: true,
+          },
+          target: compilerOptions.target.toLowerCase(),
+          keepClassNames: true,
+        },
+      }
+    ],
   },
   reporters: [
     'default',