Fix imports

Author: bperel

packages/api/services/app/index.ts

@@ -1,5 +1,4 @@
 import { existsSync, readFileSync } from "fs";
-import type { Errorable } from "socket-call-server";
 import { useSocketEvents } from "socket-call-server";
 
 import namespaces from "../namespaces";
@@ -8,17 +7,9 @@ type AppInfos = {
   version: string;
 };
 
-type ErrorableAppUpdate = Errorable<
-  {
-    version: string;
-    url: string;
-  },
-  "Not found" | "Already up to date"
->;
-
 export const getUpdateFileUrl = async (
   appInfos?: AppInfos,
-): Promise<ErrorableAppUpdate> => {
+) => {
   const fileName = import.meta.dirname + "/latest-whattheduck-bundle.txt";
   if (existsSync(fileName)) {
     const mostRecentBundleUrl = readFileSync(fileName).toString().trim();
@@ -34,10 +25,10 @@ export const getUpdateFileUrl = async (
         url: mostRecentBundleUrl,
       };
     } else {
-      return { error: "Already up to date" };
+      return { error: "Already up to date" } as const;
     }
   } else {
-    return { error: "Not found", errorDetails: fileName };
+    return { error: "Not found", errorDetails: fileName } as const;
   }
 };
 

packages/api/services/auth/index.ts

@@ -1,6 +1,5 @@
 import crypto from "crypto";
 import jwt from "jsonwebtoken";
-import type { Errorable } from "socket-call-server";
 import { useSocketEvents } from "socket-call-server";
 
 import { prismaClient } from "~prisma-schemas/schemas/dm/client";
@@ -67,20 +66,20 @@ const listenEvents = () => ({
     password: string;
     password2: string;
     token: string;
-  }): Promise<Errorable<{ token: string }, string>> =>
+  }) =>
     new Promise((resolve) => {
       jwt.verify(
         token,
         process.env.TOKEN_SECRET as string,
         async (err: unknown, data: unknown) => {
           if (err) {
-            resolve({ error: "Invalid token" });
+            resolve({ error: "Invalid token" } as const);
           } else if (password.length < 6) {
             resolve({
               error: "Your password should be at least 6 characters long",
-            });
+            } as const);
           } else if (password !== password2) {
-            resolve({ error: "The two passwords should be identical" });
+            resolve({ error: "The two passwords should be identical" } as const);
           } else {
             const hashedPassword = crypto
               .createHash("sha1")
@@ -100,11 +99,11 @@ const listenEvents = () => ({
               },
             }))!;
 
-            resolve({ token: await loginAs(user, hashedPassword) });
+            resolve({ token: await loginAs(user, hashedPassword) } as const);
           }
         },
       );
-      resolve({ error: "Something went wrong" });
+      resolve({ error: "Something went wrong" } as const);
     }),
 
   getCsrf: async () => "",
@@ -113,7 +112,7 @@ const listenEvents = () => ({
     username: string;
     password: string;
     email: string;
-  }): Promise<Errorable<string, "Bad request">> =>
+  }) =>
     new Promise(async (resolve) => {
       console.log(`signup with user ${input.username}`);
       await prismaDm.$transaction(async (transaction) => {
@@ -125,7 +124,7 @@ const listenEvents = () => ({
           new PasswordValidation(),
         ]);
         if (scopedError) {
-          resolve({ error: "Bad request", ...scopedError });
+          resolve({ error: "Bad request", ...scopedError } as const);
         } else {
           const { username, password, email } = input;
           const hashedPassword = getHashedPassword(password);

packages/api/services/bookcase/index.ts

@@ -1,9 +1,7 @@
-import type { Errorable } from "socket-call-server";
 import { useSocketEvents } from "socket-call-server";
 
 import type { BookcaseEdge } from "~dm-types/BookcaseEdge";
 import type { SessionUser } from "~dm-types/SessionUser";
-import type { user } from "~prisma-schemas/client_dm";
 import { prismaClient as prismaDm } from "~prisma-schemas/schemas/dm/client";
 
 import type { UserServices } from "../../index";
@@ -20,18 +18,18 @@ type BookcaseEdgeRaw = Omit<BookcaseEdge, "sprites"> & {
 const checkValidBookcaseUser = async (
   user?: SessionUser | null,
   username?: string,
-): Promise<Errorable<user, "Unauthorized" | "Forbidden" | "Not found">> => {
+) => {
   try {
     const dbUser = await prismaDm.user.findFirstOrThrow({
       where: { username },
     });
     if (user?.id === dbUser.id || dbUser.allowSharing) {
       return dbUser;
     } else if (!user) {
-      return { error: "Unauthorized" };
-    } else return { error: "Forbidden" };
+      return { error: "Unauthorized" } as const;
+    } else return { error: "Forbidden" } as const;
   } catch (_e) {
-    return { error: "Not found" };
+    return { error: "Not found" } as const;
   }
 };
 
@@ -46,7 +44,7 @@ const getLastPublicationPosition = async (userId: number) =>
 const listenEvents = ({ _socket }: UserServices<true>) => ({
   getBookcaseOrder: async (username: string) => {
     const user = await checkValidBookcaseUser(_socket.data.user, username);
-    if (user.error) {
+    if ('error' in user) {
       return { error: user.error };
     } else {
       const userId = user.id;
@@ -109,7 +107,7 @@ const listenEvents = ({ _socket }: UserServices<true>) => ({
   },
   getBookcase: async (username: string) => {
     const user = await checkValidBookcaseUser(null, username);
-    if (user.error) {
+    if ('error' in user) {
       return { error: user.error };
     }
 
@@ -158,7 +156,7 @@ const listenEvents = ({ _socket }: UserServices<true>) => ({
 
   getBookcaseOptions: async (username: string) => {
     const user = await checkValidBookcaseUser(null, username);
-    return user.error
+    return 'error' in user
       ? { error: user.error }
       : {
           textures: {

packages/api/services/collection/user/index.ts

@@ -1,5 +1,3 @@
-import type { Errorable } from "socket-call-server";
-
 import type { UserForAccountForm } from "~dm-types/UserForAccountForm";
 import { prismaClient as prismaDm } from "~prisma-schemas/schemas/dm/client";
 
@@ -44,12 +42,7 @@ export default ({ _socket }: UserServices) => ({
 
   updateUser: async (
     input: UserForAccountForm,
-  ): Promise<
-    Errorable<
-      { hasRequestedPresentationSentenceUpdate: boolean },
-      "Bad request"
-    >
-  > => {
+  ) => {
     let hasRequestedPresentationSentenceUpdate = false;
     let validators: Validation[] = [
       new DiscordIdValidation(),
@@ -71,7 +64,7 @@ export default ({ _socket }: UserServices) => ({
       await prismaDm.$transaction(async (transaction) => {
         const scopedError = await validate(transaction, input, validators);
         if (scopedError) {
-          resolve({ error: "Bad request", ...scopedError });
+          resolve({ error: "Bad request", ...scopedError } as const);
           hasResolved = true;
         }
       });