ci: merge staging to master

.eslintrc

@@ -7,19 +7,18 @@
     "jest": true
   },
   "parser": "@typescript-eslint/parser",
-  "extends": [
-    "eslint:recommended",
-    "plugin:@typescript-eslint/recommended",
-    "plugin:prettier/recommended",
-    "prettier"
-  ],
-  "plugins": [
-    "import"
-  ],
   "parserOptions": {
     "project": "tsconfig.json",
     "sourceType": "module"
   },
+  "plugins": [
+    "import"
+  ],
+  "extends": [
+    "eslint:recommended",
+    "plugin:@typescript-eslint/recommended",
+    "plugin:prettier/recommended"
+  ],
   "rules": {
     "linebreak-style": ["error", "unix"],
     "no-empty": 1,
@@ -182,3 +181,4 @@
     ]
   }
 }
+

.github/workflows/tag.yml

@@ -6,6 +6,10 @@ on:
       - 'v*.*.*'
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   use-native-library-js-tag:
     permissions:

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "quic"
-version = "1.3.13"
+version = "2.0.8"
 authors = ["Roger Qiu <[email protected]>"]
 license-file = "LICENSE"
 edition = "2021"

README.md

@@ -30,7 +30,7 @@ npm run prebuild
 # build the dist and native objects
 npm run build
 # run the repl (this allows you to import from ./src)
-npm run ts-node
+npm run tsx
 # run the tests
 npm run test
 # lint the source code

benches/suites/buffers/buffer_allocation.ts → benches/buffer_allocation.ts

@@ -1,9 +1,13 @@
+import path from 'node:path';
+import url from 'node:url';
 import b from 'benny';
-import { summaryName, suiteCommon } from '../../utils';
+import { suiteCommon } from './utils/index.js';
+
+const filePath = url.fileURLToPath(import.meta.url);
 
 async function main() {
   const summary = await b.suite(
-    summaryName(__filename),
+    path.basename(filePath, path.extname(filePath)),
     b.add('Buffer.alloc', () => {
       Buffer.alloc(1350);
     }),
@@ -39,8 +43,11 @@ async function main() {
   return summary;
 }
 
-if (require.main === module) {
-  void main();
+if (import.meta.url.startsWith('file:')) {
+  const modulePath = url.fileURLToPath(import.meta.url);
+  if (process.argv[1] === modulePath) {
+    void main();
+  }
 }
 
 export default main;

benches/index.ts

@@ -1,56 +1,58 @@
-#!/usr/bin/env ts-node
+#!/usr/bin/env tsx
 
-import type { Summary } from 'benny/lib/internal/common-types';
-import fs from 'fs';
-import path from 'path';
+import fs from 'node:fs';
+import path from 'node:path';
+import url from 'node:url';
 import si from 'systeminformation';
-import { fsWalk, resultsPath, suitesPath } from './utils';
+import { benchesPath } from './utils/utils.js';
+import buffer_allocation from './buffer_allocation.js';
+import stream_1KiB from './stream_1KiB.js';
+import stream_1KiB_FFI from './stream_1KiB_FFI.js';
 
 async function main(): Promise<void> {
-  await fs.promises.mkdir(path.join(__dirname, 'results'), { recursive: true });
-  // Running all suites
-  for await (const suitePath of fsWalk(suitesPath)) {
-    // Skip over non-ts and non-js files
-    const ext = path.extname(suitePath);
-    if (ext !== '.ts' && ext !== '.js') {
-      continue;
-    }
-    const suite: () => Promise<Summary> = (await import(suitePath)).default;
-    // Skip default exports that are not functions and are not called "main"
-    // They might be utility files
-    if (typeof suite === 'function' && suite.name === 'main') {
-      await suite();
-    }
-  }
-  // Concatenating metrics
-  const metricsPath = path.join(resultsPath, 'metrics.txt');
-  await fs.promises.rm(metricsPath, { force: true });
+  await fs.promises.mkdir(path.join(benchesPath, 'results'), {
+    recursive: true,
+  });
+  await buffer_allocation();
+  await stream_1KiB();
+  await stream_1KiB_FFI();
+  const resultFilenames = await fs.promises.readdir(
+    path.join(benchesPath, 'results'),
+  );
+  const metricsFile = await fs.promises.open(
+    path.join(benchesPath, 'results', 'metrics.txt'),
+    'w',
+  );
   let concatenating = false;
-  for await (const metricPath of fsWalk(resultsPath)) {
-    // Skip over non-metrics files
-    if (!metricPath.endsWith('_metrics.txt')) {
-      continue;
+  for (const resultFilename of resultFilenames) {
+    if (/.+_metrics\.txt$/.test(resultFilename)) {
+      const metricsData = await fs.promises.readFile(
+        path.join(benchesPath, 'results', resultFilename),
+      );
+      if (concatenating) {
+        await metricsFile.write('\n');
+      }
+      await metricsFile.write(metricsData);
+      concatenating = true;
     }
-    const metricData = await fs.promises.readFile(metricPath);
-    if (concatenating) {
-      await fs.promises.appendFile(metricsPath, '\n');
-    }
-    await fs.promises.appendFile(metricsPath, metricData);
-    concatenating = true;
   }
+  await metricsFile.close();
   const systemData = await si.get({
     cpu: '*',
     osInfo: 'platform, distro, release, kernel, arch',
     system: 'model, manufacturer',
   });
   await fs.promises.writeFile(
-    path.join(__dirname, 'results', 'system.json'),
+    path.join(benchesPath, 'results', 'system.json'),
     JSON.stringify(systemData, null, 2),
   );
 }
 
-if (require.main === module) {
-  void main();
+if (import.meta.url.startsWith('file:')) {
+  const modulePath = url.fileURLToPath(import.meta.url);
+  if (process.argv[1] === modulePath) {
+    void main();
+  }
 }
 
 export default main;

benches/results/buffers/buffer_allocation.chart.html → benches/results/buffer_allocation.chart.html

@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta http-equiv="X-UA-Compatible" />
     <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/chart.min.js"></script>
-    <title>buffers.buffer_allocation</title>
+    <title>buffer_allocation</title>
     <style>
       body {
         margin: 0;
@@ -28,7 +28,7 @@
   </head>
   <body>
     <div class="container">
-      <canvas id="chart1697506316266" width="16" height="9"></canvas>
+      <canvas id="chart1743111766484" width="16" height="9"></canvas>
     </div>
     <script>
       const format = (num) => {
@@ -51,18 +51,18 @@
           chunked.map((chunk) => chunk.join('')).join(' ') + fractionStr
         )
       }
-      const ctx1697506316266 = document
-        .getElementById('chart1697506316266')
+      const ctx1743111766484 = document
+        .getElementById('chart1743111766484')
         .getContext('2d')
-      const chart1697506316266 = new Chart(ctx1697506316266, {
+      const chart1743111766484 = new Chart(ctx1743111766484, {
         type: 'bar',
         data: {
           labels: ["Buffer.alloc","Buffer.allocUnsafe","Buffer.allocUnsafeSlow","Buffer.from subarray","Buffer.copyBytesFrom","Uint8Array","Uint8Array slice"],
           datasets: [
             {
-              data: [1342250,7102874,1589200,3509682,936376,1310106,1435174],
-              backgroundColor: ["hsl(22.680000000000007, 85%, 55%)","hsl(120, 85%, 55%)","hsl(26.844000000000005, 85%, 55%)","hsl(59.292, 85%, 55%)","hsl(15.816000000000006, 85%, 55%)","hsl(22.127999999999997, 85%, 55%)","hsl(24.251999999999995, 85%, 55%)"],
-              borderColor: ["hsl(22.680000000000007, 85%, 55%)","hsl(120, 85%, 55%)","hsl(26.844000000000005, 85%, 55%)","hsl(59.292, 85%, 55%)","hsl(15.816000000000006, 85%, 55%)","hsl(22.127999999999997, 85%, 55%)","hsl(24.251999999999995, 85%, 55%)"],
+              data: [938109,4536822,1033223,2772304,664578,942396,967255],
+              backgroundColor: ["hsl(24.81600000000001, 85%, 55%)","hsl(120, 85%, 55%)","hsl(27.323999999999995, 85%, 55%)","hsl(73.332, 85%, 55%)","hsl(17.580000000000005, 85%, 55%)","hsl(24.923999999999996, 85%, 55%)","hsl(25.583999999999993, 85%, 55%)"],
+              borderColor: ["hsl(24.81600000000001, 85%, 55%)","hsl(120, 85%, 55%)","hsl(27.323999999999995, 85%, 55%)","hsl(73.332, 85%, 55%)","hsl(17.580000000000005, 85%, 55%)","hsl(24.923999999999996, 85%, 55%)","hsl(25.583999999999993, 85%, 55%)"],
               borderWidth: 2,
             },
           ],
@@ -72,7 +72,7 @@
           plugins: {
             title: {
               display: true,
-              text: 'buffers.buffer_allocation',
+              text: 'buffer_allocation',
               font: { size: 20 },
               padding: 20,
             },