Add TypeScript and some refactoring to perfTest

graphile · Nov 13, 2024 · 072ba95 · 072ba95
1 parent 601a66c
commit 072ba95
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 29 deletions.
diff --git a/perfTest/graphile.config.js b/perfTest/graphile.config.js
@@ -1,8 +1,10 @@
-// import "graphile-config";
+// @ts-check
 
-// import { WorkerProPreset } from "../graphile-pro-worker/dist/index.js";
+/** @typedef {import("../dist/index.js")} Worker  */
 // import type {} from "../src/index.js";
 
+// import { WorkerProPreset } from "../graphile-pro-worker/dist/index.js";
+
 /** @type {GraphileConfig.Preset} */
 const preset = {
   // extends: [WorkerProPreset],

diff --git a/perfTest/graphile.config.ts b/perfTest/graphile.config.ts
diff --git a/perfTest/latencyTest.js b/perfTest/latencyTest.js
@@ -1,19 +1,25 @@
+// @ts-check
 const assert = require("assert");
 const { Pool } = require("pg");
 const { runTaskList } = require("../dist/main");
 const { default: deferred } = require("../dist/deferred");
+const preset = require("./graphile.config.js");
 
+/** @type {(ms: number) => Promise<void>} */
 const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 
+/** @type {import('../dist/index.js').WorkerPoolOptions} */
 const options = {
   concurrency: 1,
+  preset,
 };
 
 async function main() {
   const pgPool = new Pool({ connectionString: process.env.PERF_DATABASE_URL });
   const startTimes = {};
   let latencies = [];
   const deferreds = {};
+  /** @type {import('../dist/index.js').TaskList} */
   const tasks = {
     latency: ({ id }) => {
       latencies.push(process.hrtime(startTimes[id]));
@@ -86,6 +92,7 @@ main().catch((e) => {
   process.exit(1);
 });
 
+/** @type {(pgPool: Pool) => Promise<void>} */
 async function forEmptyQueue(pgPool) {
   let remaining;
   do {

diff --git a/perfTest/run.js b/perfTest/run.js
@@ -50,9 +50,14 @@ async function main() {
   console.log();
   console.log();
   console.log("Timing startup/shutdown time...");
-  const startupTime = await time(() => {
-    execSync("node ../dist/cli.js --once", execOptions);
+  let result;
+  const startupTime = await time(async () => {
+    result = await exec(
+      `node ../dist/cli.js --once -j ${CONCURRENCY} -m ${CONCURRENCY + 1}`,
+      execOptions,
+    );
   });
+  logResult(result);
   console.log();
 
   if (STUCK_JOB_COUNT > 0) {
@@ -83,17 +88,7 @@ async function main() {
         ),
       );
     }
-    (await Promise.all(promises)).map(({ error, stdout, stderr }) => {
-      if (error) {
-        throw error;
-      }
-      if (stdout) {
-        console.log(stdout);
-      }
-      if (stderr) {
-        console.error(stderr);
-      }
-    });
+    (await Promise.all(promises)).map(logResult);
   });
   console.log(
     `Jobs per second: ${((1000 * JOB_COUNT) / (dur - startupTime)).toFixed(2)}`,
@@ -112,3 +107,15 @@ main().catch((e) => {
   console.error(e);
   process.exit(1);
 });
+
+function logResult({ error, stdout, stderr }) {
+  if (error) {
+    throw error;
+  }
+  if (stdout) {
+    console.log(stdout);
+  }
+  if (stderr) {
+    console.error(stderr);
+  }
+}
diff --git a/perfTest/types.d.ts b/perfTest/types.d.ts
@@ -0,0 +1,10 @@
+declare global {
+  namespace GraphileWorker {
+    interface Tasks {
+      latency: { id: number };
+    }
+  }
+}
+
+// Has to be a module, so export something
+export type Foo = "Foo";