build: Bun

.github/workflows/e2e.yml

@@ -16,6 +16,9 @@ jobs:
     - uses: actions/setup-node@v3
       with:
         node-version: 16
+    - uses: oven-sh/setup-bun@v1
+      with:
+        bun-version: canary
     - uses: pnpm/[email protected]
       name: Install pnpm
       id: pnpm-install

Dockerfile

@@ -1,18 +1,15 @@
-FROM node:current-alpine
-# FROM mcr.microsoft.com/playwright:focal
+FROM oven/bun:canary
 
 WORKDIR /usr/api
 
 COPY api/package.json ./
 
-RUN npm install -g pnpm
-
-RUN pnpm install
+RUN bun install
 
 COPY api/ .
 
-RUN npx tsc
+RUN bun tsc
 
 EXPOSE 3000
 
-CMD [ "node", "build/index.js" ]
+CMD [ "bun", "run", "build/index.js" ]

api/package.json

@@ -8,7 +8,7 @@
   "scripts": {
     "build": "tsc",
     "start": "node build/index.js",
-    "dev": "concurrently --raw \"tsc -w --preserveWatchOutput\" \"node --watch build/index.js\"",
+    "dev": "concurrently --raw \"tsc -w --preserveWatchOutput\" \"bun --watch build/index.js\"",
     "db:create": "mikro-orm schema:create --run",
     "db:update": "mikro-orm schema:update --run",
     "db:drop": "mikro-orm schema:drop --run",
@@ -30,7 +30,6 @@
     "@sentry/integrations": "7.77.0",
     "@sentry/node": "7.77.0",
     "aws-sdk": "^2.1563.0",
-    "bcrypt": "^5.1.1",
     "body-parser": "^1.20.2",
     "car-info": "^0.1.6",
     "class-validator": "^0.14.1",
@@ -63,6 +62,7 @@
     "@types/uuid": "^9.0.8",
     "@types/ws": "^8.5.10",
     "concurrently": "^8.2.2",
+    "@types/bun": "latest",
     "ts-node": "^10.9.2",
     "typescript": "^5.3.3"
   },

api/src/auth/resolver.ts

@@ -9,7 +9,7 @@ import { Token } from '../entities/Token';
 import { Context } from '../utils/context';
 import { s3 } from '../utils/s3';
 import { FileUpload } from 'graphql-upload-minimal';
-import { compare, hash } from 'bcrypt';
+import { password as bunPassword } from 'bun';
 import { isDevelopment } from '../utils/constants';
 
 @ObjectType()
@@ -35,7 +35,7 @@ export class AuthResolver {
         isPasswordCorrect = sha256(password) === user.password;
         break;
       case (PasswordType.BCRYPT):
-        isPasswordCorrect = await compare(password, user.password);
+        isPasswordCorrect = await bunPassword.verify(password, user.password, "bcrypt");
         break;
       default:
         throw new Error(`Unknown password type ${user.passwordType}`);
@@ -77,7 +77,7 @@ export class AuthResolver {
       throw new Error("No result from AWS");
     }
 
-    const password = await hash(input.password, 10);
+    const password = await bunPassword.hash(input.password, "bcrypt");
 
     wrap(user).assign({
       username: input.username,
@@ -185,7 +185,7 @@ export class AuthResolver {
       throw new Error("Your reset token has expired. You must re-request to reset your password.");
     }
 
-    entry.user.password = await hash(input.password, 10);
+    entry.user.password = await bunPassword.hash(input.password, "bcrypt");
     entry.user.passwordType = PasswordType.BCRYPT;
 
     await ctx.em.nativeDelete(Token, { user: entry.user });

api/src/directions/resolver.ts

@@ -33,4 +33,4 @@ export class DirectionsResolver {
 
     return `${etaMinutes} min`;
   }
-}
+}

api/src/index.ts

@@ -3,7 +3,7 @@ import "dotenv/config";
 import Redis from 'ioredis';
 import express from "express";
 import config from './mikro-orm.config';
-import ws from 'ws';
+import { WebSocketServer } from 'ws';
 import cors from 'cors';
 import * as Sentry from "./utils/sentry";
 import * as RealSentry from "@sentry/node";
@@ -99,7 +99,7 @@ async function start() {
     plugins,
   });
 
-  const wsServer = new ws.Server({
+  const wsServer = new WebSocketServer({
     server: httpServer,
     path: '/subscriptions',
   });

api/src/payments/resolver.ts

@@ -71,7 +71,7 @@ export async function syncUserPayments(em: EntityManager, userId: string): Promi
 
   const request = await fetch(`https://api.revenuecat.com/v1/subscribers/${userId}`, options);
 
-  const response: SubscriberResponse = await request.json();
+  const response = await request.json() as SubscriberResponse;
 
   const user = await em.findOneOrFail(User, userId, { populate: ['payments.id'] });
 

api/src/users/resolver.ts

@@ -11,7 +11,7 @@ import { S3 } from 'aws-sdk';
 import { getOlderObjectsToDelete, getAllObjects, getUserFromObjectKey, deleteObject, s3 } from '../utils/s3';
 import { ChangePasswordInput, EditUserInput, NotificationArgs } from './args';
 import { createVerifyEmailEntryAndSendEmail } from '../auth/helpers';
-import { hash } from 'bcrypt';
+import { password as bunPassword } from 'bun';
 import { VerifyEmail } from '../entities/VerifyEmail';
 import { GraphQLUpload } from 'graphql-upload-minimal';
 import { setContext } from "@sentry/node";
@@ -109,7 +109,7 @@ export class UserResolver {
   @Mutation(() => Boolean)
   @Authorized('No Verification')
   public async changePassword(@Ctx() ctx: Context, @Arg('input') input: ChangePasswordInput): Promise<boolean> {
-    ctx.user.password = await hash(input.password, 10);
+    ctx.user.password = await bunPassword.hash(input.password, "bcrypt");
     ctx.user.passwordType = PasswordType.BCRYPT;
 
     await ctx.em.flush();
@@ -164,15 +164,14 @@ export class UserResolver {
 
   @Mutation(() => User)
   @Authorized('No Verification')
-  public async addProfilePicture(@Ctx() ctx: Context, @Arg("picture", () => GraphQLUpload) { createReadStream, filename }: Upload, @PubSub() pubSub: PubSubEngine): Promise<User> {
-
+  public async addProfilePicture(@Ctx() ctx: Context, @Arg("picture", () => GraphQLUpload) picture: Upload, @PubSub() pubSub: PubSubEngine): Promise<User> {
+    const { createReadStream, filename } = await picture;
+
     const extention = filename.substring(filename.lastIndexOf("."), filename.length);
 
-    filename = ctx.user.id + "-" + Date.now() + extention;
-
     const uploadParams = {
       Body: createReadStream(),
-      Key: "images/" + filename,
+      Key: "images/" + ctx.user.id + "-" + Date.now() + extention,
       Bucket: "beep",
       ACL: "public-read"
     };

api/tsconfig.json

@@ -20,7 +20,10 @@
     "esModuleInterop": true,
     "experimentalDecorators": true,
     "emitDecoratorMetadata": true,
-    "forceConsistentCasingInFileNames": true
+    "forceConsistentCasingInFileNames": true,
+    "types": [
+      "@types/bun" // add Bun global
+    ]
   },
   "compileOnSave": true,
   "include": [