Fix ddex webapp client lint (#8127)

packages/ddex/webapp/server/.eslintrc.cjs

@@ -1,30 +1,5 @@
 module.exports = {
   root: true,
   env: { node: true, es2020: true },
-  extends: [
-    'eslint:recommended',
-    'plugin:@typescript-eslint/recommended',
-    'prettier',
-    'plugin:prettier/recommended',
-  ],
-  ignorePatterns: ['dist', '.eslintrc.cjs'],
-  parser: '@typescript-eslint/parser',
-  plugins: ['prettier'],
-  rules: {
-    '@typescript-eslint/no-unsafe-call': 'off',
-    '@typescript-eslint/no-unsafe-assignment': 'off',
-    '@typescript-eslint/no-explicit-any': 'off',
-    '@typescript-eslint/no-non-null-assertion': 'off',
-    '@typescript-eslint/no-empty-function': 'off',
-    'prettier/prettier': ['error', {
-      singleQuote: true,
-      semi: false,
-      useTabs: false,
-      tabWidth: 2,
-      trailingComma: 'es5',
-      printWidth: 80,
-      bracketSpacing: true,
-      arrowParens: 'always',
-    }],
-  },
-};
+  extends: ['audius']
+}

packages/ddex/webapp/server/src/app.ts

@@ -1,10 +1,12 @@
-import express, { Express, NextFunction, Request, Response } from 'express'
 import path from 'path'
-import session from 'express-session'
+
+import { ProfilePicture } from '@audius/sdk'
 import connectMongoDBSession from 'connect-mongodb-session'
-import User from './userSchema'
+import express, { Express, NextFunction, Request, Response } from 'express'
+import session from 'express-session'
+
 import createSdkService from './services/sdkService'
-import { ProfilePicture } from '@audius/sdk'
+import User from './userSchema'
 
 declare module 'express-session' {
   interface SessionData {
@@ -39,10 +41,10 @@ export default function createApp(
   const MongoDBStore = connectMongoDBSession(session)
   const store = new MongoDBStore({
     uri: dbUrl,
-    collection: 'authSessions',
+    collection: 'authSessions'
   })
   store.on('error', function (error: any) {
-    console.log(error)
+    console.error(error)
   })
 
   if (!process.env.SESSION_SECRET) {
@@ -52,12 +54,12 @@ export default function createApp(
   const sess: session.SessionOptions = {
     secret: process.env.SESSION_SECRET,
     cookie: {
-      maxAge: 1000 * 60 * 60 * 24 * 7 * 3, // 3 weeks
+      maxAge: 1000 * 60 * 60 * 24 * 7 * 3 // 3 weeks
     },
     store,
     resave: false,
     saveUninitialized: false,
-    rolling: true, // Reset maxAge on every response
+    rolling: true // Reset maxAge on every response
   }
 
   if (app.get('env') === 'production') {
@@ -79,7 +81,7 @@ export default function createApp(
   // The frontend does this for the user on OAuth (there's no actual login button UI) and re-checks the session via /auth/session on page load.
   app.post('/auth/login', async (req: Request, res: Response) => {
     const decodedJwt = await sdkService.users.verifyIDToken({
-      token: req.body.token,
+      token: req.body.token
     })
     if (decodedJwt?.data) {
       const { userId, handle, email, name, verified, profilePicture } =
@@ -90,7 +92,7 @@ export default function createApp(
         email,
         name,
         verified,
-        profilePicture,
+        profilePicture
       })
 
       req.session.user = {
@@ -100,7 +102,7 @@ export default function createApp(
         name: user.name,
         verified: user.verified,
         profilePicture: user.profilePicture,
-        isAdmin: user.isAdmin,
+        isAdmin: user.isAdmin
       }
 
       req.session.save((err) => {
@@ -136,7 +138,7 @@ export default function createApp(
         name: updatedUser.name,
         verified: updatedUser.verified,
         profilePicture: updatedUser.profilePicture,
-        isAdmin: updatedUser.isAdmin,
+        isAdmin: updatedUser.isAdmin
       }
       req.session.save((err) => {
         if (err) {
@@ -175,8 +177,8 @@ export default function createApp(
       data: {
         env: process.env.NODE_ENV,
         ddexKey: process.env.DDEX_KEY,
-        ddexChoreography: process.env.DDEX_CHOREOGRAPHY,
-      },
+        ddexChoreography: process.env.DDEX_CHOREOGRAPHY
+      }
     }
     res.json(envData)
   })

packages/ddex/webapp/server/src/controllers/collectionController.ts

@@ -1,11 +1,11 @@
 import { Request, Response } from 'express'
-import mongoose from 'mongoose'
 import { Sort } from 'mongodb'
+import mongoose from 'mongoose'
 
 export const collections = [
   'deliveries',
   'pending_releases',
-  'published_releases',
+  'published_releases'
 ]
 
 export const getCollection = (collection: string) => {

packages/ddex/webapp/server/src/index.ts

@@ -1,6 +1,16 @@
-import dotenv from 'dotenv'
 import path from 'path'
+
+import * as trpcExpress from '@trpc/server/adapters/express'
+import dotenv from 'dotenv'
+
+import createApp from './app'
+import createAppRouter from './routers'
+import collectionRouters from './routers/collectionRouters'
+import makeUploadRouter from './routers/uploadRouter'
+import { dialDb } from './services/dbService'
 import createS3 from './services/s3'
+import createSdkService from './services/sdkService'
+import { createContext, router } from './trpc'
 
 // Load env vars from ddex package root
 dotenv.config({ path: path.join(__dirname, '..', '..', '..', '.env') })
@@ -17,15 +27,6 @@ switch (process.env.NETWORK) {
     process.env.NODE_ENV = 'development'
 }
 
-import createApp from './app'
-import { dialDb } from './services/dbService'
-import { createContext, router } from './trpc'
-import * as trpcExpress from '@trpc/server/adapters/express'
-import collectionRouters from './routers/collectionRouters'
-import makeUploadRouter from './routers/uploadRouter'
-import createAppRouter from './routers'
-import createSdkService from './services/sdkService'
-
 // TODO: Use superjson
 
 export type AppRouter = ReturnType<typeof createAppRouter>
@@ -45,22 +46,22 @@ const port = process.env.DDEX_PORT || 9000
     const s3 = createS3()
     const appRouter = router({
       upload: makeUploadRouter(s3),
-      deliveries: collectionRouters['deliveries'],
-      pendingReleases: collectionRouters['pending_releases'],
-      publishedReleases: collectionRouters['published_releases'],
+      deliveries: collectionRouters.deliveries,
+      pendingReleases: collectionRouters.pending_releases,
+      publishedReleases: collectionRouters.published_releases
     })
 
     app.use(
       '/api/trpc',
       isAuthedAsAdmin,
       trpcExpress.createExpressMiddleware({
         router: appRouter,
-        createContext: (opts) => createContext(opts, {}),
+        createContext: (opts) => createContext(opts, {})
       })
     )
 
     app.listen(port, () => {
-      console.log(`[server]: Server is running at http://localhost:${port}`)
+      console.info(`[server]: Server is running at http://localhost:${port}`)
     })
   } catch (error) {
     console.error('Failed to initialize:', error)

packages/ddex/webapp/server/src/routers/collectionRouters.ts

@@ -1,9 +1,9 @@
+import { Sort } from 'mongodb'
+import mongoose from 'mongoose'
 import { z } from 'zod'
 
-import { router, publicProcedure } from '../trpc'
 import { collections } from '../controllers/collectionController'
-import mongoose from 'mongoose'
-import { Sort } from 'mongodb'
+import { router, publicProcedure } from '../trpc'
 
 const getCollectionInput = z.object({
   nextId: z.string().optional(),

packages/ddex/webapp/server/src/routers/index.ts

@@ -1,14 +1,15 @@
-import { router } from '../trpc'
 import createS3 from '../services/s3'
-import makeUploadRouter from './uploadRouter'
+import { router } from '../trpc'
+
 import collectionRouters from './collectionRouters'
+import makeUploadRouter from './uploadRouter'
 
 export default function createAppRouter(s3: ReturnType<typeof createS3>) {
   return router({
     upload: makeUploadRouter(s3),
-    uploads: collectionRouters['uploads'],
-    deliveries: collectionRouters['deliveries'],
-    pendingReleases: collectionRouters['pending_releases'],
-    publishedReleases: collectionRouters['published_releases'],
+    uploads: collectionRouters.uploads,
+    deliveries: collectionRouters.deliveries,
+    pendingReleases: collectionRouters.pending_releases,
+    publishedReleases: collectionRouters.published_releases
   })
 }

packages/ddex/webapp/server/src/routers/uploadRouter.ts

@@ -1,4 +1,5 @@
 import { z } from 'zod'
+
 import createS3 from '../services/s3'
 import { router, publicProcedure } from '../trpc'
 
@@ -7,12 +8,12 @@ export default function makeUploadRouter(s3: ReturnType<typeof createS3>) {
     generateSignedUrl: publicProcedure
       .input(
         z.object({
-          fileName: z.string(),
+          fileName: z.string()
         })
       )
       .mutation(async ({ input }) => {
         const { fileName } = input
         return await s3.getSignedFileUrl(fileName)
-      }),
+      })
   })
 }

packages/ddex/webapp/server/src/services/dbService.ts

@@ -2,5 +2,5 @@ import mongoose from 'mongoose'
 
 export const dialDb = async (dbUrl: string) => {
   await mongoose.connect(dbUrl)
-  console.log('MongoDB connected...')
+  console.info('MongoDB connected...')
 }

packages/ddex/webapp/server/src/services/s3.ts

@@ -1,5 +1,5 @@
-import { getSignedUrl } from '@aws-sdk/s3-request-presigner'
 import { S3Client, PutObjectCommand, S3ClientConfig } from '@aws-sdk/client-s3'
+import { getSignedUrl } from '@aws-sdk/s3-request-presigner'
 
 export default function createS3() {
   if (!process.env.AWS_ACCESS_KEY_ID || !process.env.AWS_SECRET_ACCESS_KEY) {
@@ -9,9 +9,9 @@ export default function createS3() {
   const config: S3ClientConfig = {
     credentials: {
       accessKeyId: process.env.AWS_ACCESS_KEY_ID,
-      secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY,
+      secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY
     },
-    region: process.env.AWS_REGION,
+    region: process.env.AWS_REGION
   }
   const bucket = process.env.AWS_BUCKET_RAW
   const client = new S3Client(config)
@@ -22,7 +22,7 @@ export default function createS3() {
   ) {
     const command = new PutObjectCommand({
       Bucket: bucket,
-      Key: fileName,
+      Key: fileName
     })
 
     return await getSignedUrl(client, command, { expiresIn: expiresInSeconds })

packages/ddex/webapp/server/src/services/sdkService.ts

@@ -8,7 +8,7 @@ import {
   developmentConfig,
   stagingConfig,
   productionConfig,
-  sdk,
+  sdk
 } from '@audius/sdk'
 
 const createSdkService = async (): Promise<AudiusSdk> => {
@@ -52,13 +52,13 @@ const createSdkService = async (): Promise<AudiusSdk> => {
 
     // Init SDK
     const discoveryNodeSelector = new DiscoveryNodeSelector({
-      initialSelectedNode,
+      initialSelectedNode
     })
     const storageNodeSelector = new StorageNodeSelector({
       auth: new AppAuth(ddexKey, ddexSecret),
-      discoveryNodeSelector: discoveryNodeSelector,
+      discoveryNodeSelector,
       bootstrapNodes: config.storageNodes,
-      logger,
+      logger
     })
     const sdkInstance = sdk({
       services: {
@@ -69,16 +69,16 @@ const createSdkService = async (): Promise<AudiusSdk> => {
           contractAddress: config.entityManagerContractAddress,
           identityServiceUrl: config.identityServiceUrl,
           useDiscoveryRelay: true,
-          logger,
+          logger
         }),
         storageNodeSelector,
-        logger,
+        logger
       },
       apiKey: ddexKey,
       apiSecret: ddexSecret,
-      appName: 'DDEX Demo',
+      appName: 'DDEX Demo'
     })
-    console.log(`SDK initialized for ${env}`)
+    console.info(`SDK initialized for ${env}`)
     return sdkInstance
   } catch (error) {
     throw new Error(`SDK failed to initialize for ${env}: ${error}`)

packages/ddex/webapp/server/src/trpc.ts

@@ -12,7 +12,7 @@ export function createContext(
   return {
     req: options.req,
     res: options.res,
-    ...customContext,
+    ...customContext
   }
 }
 

packages/ddex/webapp/server/src/userSchema.ts

@@ -1,5 +1,6 @@
 import type { ProfilePicture } from '@audius/sdk'
 import mongoose from 'mongoose'
+
 import { decodeHashedId, isUserAdmin } from './utils'
 
 export interface IUser {
@@ -16,7 +17,7 @@ export interface IUser {
 const profilePictureSchema = new mongoose.Schema({
   '150x150': String,
   '480x480': String,
-  '1000x1000': String,
+  '1000x1000': String
 })
 
 interface IUserMethods {
@@ -38,7 +39,7 @@ const userSchema = new mongoose.Schema<IUser, UserModel, IUserMethods>({
   name: String,
   verified: { type: Boolean, default: false },
   profilePicture: { type: profilePictureSchema, default: null },
-  isAdmin: { type: Boolean, default: false },
+  isAdmin: { type: Boolean, default: false }
 })
 
 userSchema.method('updateRoles', async function updateRoles() {