native Bun support

Author: eliasdarruda

.tool-versions

@@ -1 +1 @@
-nodejs 16.17.0
+nodejs 20.10.0

bun.lockb

@@ -23,10 +23,10 @@
     "proto-gen-spawn-actor": "protoc --ts_out ./src/protos/eigr/functions/protocol/actors --proto_path protos/eigr/functions/protocol/actors protos/eigr/functions/protocol/actors/actor.proto",
     "proto-gen-spawn-state": "protoc --ts_out ./src/protos/eigr/functions/protocol/actors --proto_path protos/eigr/functions/protocol/actors protos/eigr/functions/protocol/actors/state.proto",
     "start": "ts-node --esm --require tsconfig-paths/register index.ts",
-    "run-benchmark": "ts-node --esm --require tsconfig-paths/register benchmark/benchmark.ts",
-    "run-benchmark-bun": "bun run benchmark/benchmark.ts",
+    "benchmark": "bun run benchmark/benchmark.ts",
     "test": "bun test --forceExit --runInBand --detectOpenHandles",
-    "format": "prettier --config .prettierrc '{src,test}/**/*.ts' --write"
+    "format": "prettier --config .prettierrc '{src,test}/**/*.ts' --write",
+    "bun:build": "bun build --outdir _build"
   },
   "author": "eigr",
   "license": "ISC",
@@ -39,6 +39,7 @@
     "@types/jest": "^28.1.4",
     "@types/stoppable": "^1.1.1",
     "benny": "^3.7.1",
+    "bun-types": "^1.0.18",
     "jest": "^29.0.3",
     "prettier": "^2.8.2",
     "ts-jest": "^29.0.1",

package.json

@@ -68,7 +68,6 @@ async function register(
   }
 
   try {
-    console.log('callback?')
     const value = await callback(context, finalPayload)
     const parsedValue = value.parse()
 
@@ -109,8 +108,8 @@ export const registerControllerHandlerNode = (
 export const registerControllerHandlerBun = async (
   req: Request,
   actorCallbacks: Map<string, ActorCallbackConnector>
-) => {
+): Promise<Response> => {
   const buffer = Buffer.from(await req.arrayBuffer())
 
-  return register(buffer, actorCallbacks, null)
+  return register(buffer, actorCallbacks, null) as Promise<Response>
 }

src/integration/controller/invoke-actions-controller.ts

@@ -5,7 +5,6 @@ import {
   registerControllerHandlerBun
 } from './controller/invoke-actions-controller'
 import { ActorCallbackConnector } from '../spawn'
-import stoppable = require('stoppable')
 
 export function sendResponse(
   status: number,
@@ -15,9 +14,7 @@ export function sendResponse(
   // this is Bun
   if (res === null) {
     if (resp && status === 200) {
-      console.log('resp?')
-
-      return new Response(Buffer.from(ActorInvocationResponse.toBinary(resp)), {
+      return new Response(ActorInvocationResponse.toBinary(resp), {
         status,
         headers: {
           'Content-Type': 'application/octet-stream',
@@ -26,7 +23,7 @@ export function sendResponse(
       })
     }
 
-    return new Response(Buffer.from(''), {
+    return new Response('', {
       status
     })
   }
@@ -49,15 +46,15 @@ export function sendResponse(
   res.end()
 }
 
-const getActionPort = () => process.env.USER_FUNCTION_PORT || 8090
+const getActionPort = (): number | string => process.env.USER_FUNCTION_PORT || 8090
 
 export function startServer(actorCallbacks: Map<string, ActorCallbackConnector>) {
   let server: any = null
 
-  if (typeof Bun.serve === 'function') {
+  if (typeof Bun !== 'undefined' && typeof Bun.serve === 'function') {
     server = Bun.serve({
       port: getActionPort(),
-      fetch(req: Request) {
+      fetch(req: Request): Promise<Response> | Response {
         const url = new URL(req.url)
         if (url.pathname === '/api/v1/actors/actions') {
           return registerControllerHandlerBun(req, actorCallbacks)
@@ -66,7 +63,10 @@ export function startServer(actorCallbacks: Map<string, ActorCallbackConnector>)
         return new Response('404!', { status: 404 })
       }
     })
+    console.log(`[SpawnSystem] Server listening on :${getActionPort()}`)
   } else {
+    const stoppable = require('stoppable')
+
     server = stoppable(
       http.createServer((req: IncomingMessage, res: ServerResponse) => {
         if (req.url === '/api/v1/actors/actions') {
@@ -86,3 +86,19 @@ export function startServer(actorCallbacks: Map<string, ActorCallbackConnector>)
 
   return server
 }
+
+export async function stopServer(server: any) {
+  if (typeof Bun !== 'undefined' && typeof Bun.serve === 'function') {
+    server.stop(true)
+
+    return true
+  }
+
+  return new Promise((resolve, reject) => {
+    server.stop((err: any) => {
+      if (err) return reject()
+
+      resolve(true)
+    })
+  })
+}

src/integration/server.ts

@@ -24,7 +24,7 @@ import {
   scheduledToBigInt,
   unpackPayload
 } from './integration/parsers'
-import { startServer } from './integration/server'
+import { startServer, stopServer } from './integration/server'
 import { MessageType } from '@protobuf-ts/runtime'
 import { Value } from './client-actor/value'
 
@@ -228,14 +228,9 @@ const createSystem = (system: string = uniqueDefaultSystem): SpawnSystem => {
       return doRegister()
     },
     destroy: async () => {
-      return new Promise((resolve, reject) => {
-        server.stop((err: any) => {
-          if (err) return reject()
-
-          registered = false
-          systemCreated = false
-          resolve(true)
-        })
+      return stopServer(server).then(() => {
+        registered = false
+        systemCreated = false
       })
     }
   }

src/spawn.ts

@@ -9,8 +9,6 @@ function timeout(ms: number) {
 }
 
 describe('testing workflows', () => {
-  // jest.setTimeout(5_000)
-
   const randomActorName = crypto.randomUUID()
   let system: SpawnSystem
 
@@ -21,7 +19,7 @@ describe('testing workflows', () => {
     createRandomActor(system, randomActorName)
 
     const registered = await system.register()
-    expect(registered.status?.message).toBe('Accepted')
+    if (registered.status?.message != 'Accepted') throw new Error('Failed to register system')
   })
 
   afterAll(async () => {

test/actors-workflow.test.ts

@@ -12,7 +12,7 @@ describe('testing spawn unnamed actor', () => {
     createUnnamedActor(system)
 
     const registered = await system.register()
-    expect(registered.status?.message).toBe('Accepted')
+    if (registered.status?.message != 'Accepted') throw new Error('Failed to register system')
   })
 
   afterAll(async () => {

test/spawn-abstract.test.ts

@@ -3,8 +3,6 @@ import { createJsonActor } from './stubs/actors'
 import { describe, beforeAll, afterAll, test, expect } from 'bun:test'
 
 describe('testing invoke', () => {
-  // jest.setTimeout(30_000)
-
   let system: SpawnSystem
 
   beforeAll(async () => {
@@ -13,7 +11,7 @@ describe('testing invoke', () => {
     createJsonActor(system)
 
     const registered = await system.register()
-    expect(registered.status?.message).toBe('Accepted')
+    if (registered.status?.message != 'Accepted') throw new Error('Failed to register system')
   })
 
   afterAll(async () => {

test/spawn-invoke-json.test.ts

@@ -10,8 +10,6 @@ import { createRandomActor, createUserActor } from './stubs/actors'
 import { describe, beforeAll, afterAll, test, expect } from 'bun:test'
 
 describe('testing invoke', () => {
-  // jest.setTimeout(120_000)
-
   const randomActorName = crypto.randomUUID()
   let system: SpawnSystem
 
@@ -22,7 +20,7 @@ describe('testing invoke', () => {
     createRandomActor(system, randomActorName)
 
     const registered = await system.register()
-    expect(registered.status?.message).toBe('Accepted')
+    if (registered.status?.message != 'Accepted') throw new Error('Failed to register system')
   })
 
   afterAll(async () => {

test/spawn-invoke.test.ts

@@ -4,8 +4,6 @@ import { createPooledActor } from './stubs/actors'
 import { describe, beforeAll, afterAll, test, expect } from 'bun:test'
 
 describe('testing spawn pooled actor', () => {
-  // jest.setTimeout(120_000)
-
   let system: SpawnSystem
 
   beforeAll(async () => {
@@ -14,7 +12,7 @@ describe('testing spawn pooled actor', () => {
     createPooledActor(system)
 
     const registered = await system.register()
-    expect(registered.status?.message).toBe('Accepted')
+    if (registered.status?.message != 'Accepted') throw new Error('Failed to register system')
   })
 
   afterAll(async () => {

test/spawn-pooled.test.ts

@@ -18,6 +18,7 @@
     "target": "ES2020",
     "module": "commonjs",
     "sourceMap": true,
+    "types": ["bun-types"],
 
     "outDir": "_build",
     "declaration": true