fix: test CI issues

Author: professoralex13

package-lock.json

@@ -26,11 +26,10 @@
     "eslint-plugin-prettier": "^5.0.1",
     "jest": "^29.7.0",
     "prettier": "^3.0.3",
-    "random-bigint": "^0.0.1",
     "ts-jest": "^29.1.1",
     "ts-node": "^10.9.2",
     "tsup": "^8.0.1",
     "typescript": "^5.2.2",
     "uuid": "^9.0.1"
   }
-}
+}

package.json

@@ -0,0 +1,51 @@
+// https://github.com/bnoordhuis/random-bigint/blob/master/index.js
+
+import { randomBytes } from "crypto"
+
+export function random(bits: number) {
+	if (bits < 0)
+		throw new RangeError('bits < 0')
+
+	// @ts-ignore
+	const n = (bits >>> 3) + !!(bits & 7) // Round up to next byte.
+	const r = 8*n - bits
+	const s = 8 - r
+	const m = (1 << s) - 1 // Bits to mask off from MSB.
+
+	const bytes = randomBytes(n)
+
+	maskbits(m, bytes)
+
+	return bytes2bigint(bytes)
+}
+
+function maskbits(m: number, bytes: Buffer) {
+	// Mask off bits from the MSB that are > log2(bits).
+	// |bytes| is treated as a big-endian bigint so byte 0 is the MSB.
+	if (bytes.length > 0)
+		bytes[0] &= m
+}
+
+function bytes2bigint(bytes: Buffer) {
+	let result = BigInt(0)
+
+	const n = bytes.length
+
+	// Read input in 8 byte slices. This is, on average and at the time
+	// of writing, about 35x faster for large inputs than processing them
+	// one byte at a time.
+	if (n >= 8) {
+		const view = new DataView(bytes.buffer, bytes.byteOffset)
+
+		for (let i = 0, k = n & ~7; i < k; i += 8) {
+			const x = view.getBigUint64(i, false)
+			result = (result << BigInt(64)) + x
+		}
+	}
+
+	// Now mop up any remaining bytes.
+	for (let i = n & ~7; i < n; i++)
+		result = result * BigInt(256) + BigInt(bytes[i])
+
+	return result
+}

src/test/RandomBigint.d.ts

@@ -1,11 +1,11 @@
 import { readFileSync } from "node:fs"
 import { argv, env } from "node:process"
 import { WASI } from "wasi"
-import random from "random-bigint"
 import { v4 } from "uuid"
 import { NavigraphNavigationDataInterface } from "../js"
 import { WEBASSEMBLY_PATH, WORK_FOLDER_PATH } from "./constants"
 import "dotenv/config"
+import { random } from "./randomBigint"
 
 enum PanelService {
   POST_QUERY = 1,
@@ -157,6 +157,7 @@ let wasmFunctionTable: WebAssembly.Table // The table of callback functions in t
  * Maps request ids to a tuple of the returned data's pointer, and the data's size
  */
 const promiseResults = new Map<bigint, [number, number]>()
+const failedRequests: bigint[] = [];
 
 wasmInstance = new WebAssembly.Instance(wasmModule, {
   wasi_snapshot_preview1: wasiSystem.wasiImport,
@@ -205,7 +206,7 @@ wasmInstance = new WebAssembly.Instance(wasmModule, {
     fsNetworkHttpRequestGet: (urlPointer: number, paramPointer: number, callback: number, ctx: number) => {
       const url = readString(urlPointer)
 
-      const requestId: bigint = random(32) // Setting it to 64 does... strange things
+      const requestId = random(16) // Extra bits get lopped off by WASM, this number works
 
       // Currently the only network request is for the navigation data zip which is downloaded as a blob
       fetch(url)
@@ -222,11 +223,20 @@ wasmInstance = new WebAssembly.Instance(wasmModule, {
           func(requestId, 200, ctx)
         })
         .catch(err => {
-          console.error(err)
+          failedRequests.push(requestId);
         })
 
       return requestId
     },
+    fsNetworkHttpRequestGetState: (requestId: bigint) => {
+      if(failedRequests.includes(requestId)) {
+        return 4 // FS_NETWORK_HTTP_REQUEST_STATE_FAILED
+      }
+      if(promiseResults.has(requestId)) {
+        return 3 // FS_NETWORK_HTTP_REQUEST_STATE_DATA_READY
+      }
+      return 2 // FS_NETWORK_HTTP_REQUEST_STATE_WAITING_FOR_DATA
+    }
   },
 }) as WasmInstance