add: urlSlug for s3 bucket

Author: winverse

apps/book-server/scripts/createMock.mts

@@ -24,7 +24,18 @@ class Seeder {
     })
   }
 
-  async createBook(writer: Writer) {
+  private escapeForUrl(text: string): string {
+    return text
+      .replace(
+        /[^0-9a-zA-Zㄱ-힣.\u3000-\u303f\u3040-\u309f\u30a0-\u30ff\uff00-\uff9f\u4e00-\u9faf\u3400-\u4dbf -]/g,
+        '',
+      )
+      .trim()
+      .replace(/ /g, '-')
+      .replace(/--+/g, '-')
+      .replace(/\.+$/, '')
+  }
+  public async createBook(writer: Writer) {
     const mockPages = getMockPages(100).map((page) => ({
       writer_id: writer.id,
       ...page,
@@ -42,7 +53,7 @@ class Seeder {
         is_temp: false,
         is_private: false,
         is_published: true,
-        url_slug: urlSlug,
+        url_slug: this.escapeForUrl(urlSlug),
         pages: {
           createMany: {
             data: mockPages,

apps/book-server/src/graphql/resolvers/bookResolvers.mts

@@ -21,13 +21,13 @@ const bookResolvers: Resolvers = {
     },
   },
   Mutation: {
-    deploy: async (_, { input }) => {
+    deploy: async (_, { input }, ctx) => {
       const bookDeployService = container.resolve(BookDeployService)
-      return await bookDeployService.deploy(input.book_id)
+      return await bookDeployService.deploy(input.book_id, ctx.writer?.id)
     },
-    build: async (_, { input }) => {
+    build: async (_, { input }, ctx) => {
       const bookBuildService = container.resolve(BookBuildService)
-      return await bookBuildService.build(input.book_id)
+      return await bookBuildService.build(input.book_id, ctx.writer?.id)
     },
   },
   Subscription: {

apps/book-server/src/services/BookBuildService/index.mts

@@ -13,11 +13,12 @@ import { MqService } from '@lib/mq/MqService.mjs'
 import { nextConfigTempate } from '@templates/nextConfigTemplate.js'
 import { WriterService } from '../WriterService/index.mjs'
 import { ENV } from '@env'
+import { UnauthorizedError } from '@errors/UnauthorizedError.mjs'
 
 const exec = promisify(execCb)
 
 interface Service {
-  build(bookId: string): Promise<void>
+  build(bookId: string, signedWriterId?: string): Promise<void>
 }
 
 @injectable()
@@ -29,17 +30,17 @@ export class BookBuildService implements Service {
     private readonly pageService: PageService,
     private readonly writerService: WriterService,
   ) {}
-  public async build(bookId: string): Promise<void> {
+  public async build(bookId: string, signedWriterId?: string): Promise<void> {
     // TODO: ADD authentication
-    // if (!signedUserId) {
-    //   throw new UnauthorizedError('Not logged in')
-    // }
+    if (!signedWriterId) {
+      throw new UnauthorizedError('Not logged in')
+    }
 
-    // const writer = await this.writerService.findById(signedUserId)
+    const writer = await this.writerService.findById(signedWriterId)
 
-    // if (!writer) {
-    //   throw new NotFoundError('Not found writer')
-    // }
+    if (!writer) {
+      throw new NotFoundError('Not found writer')
+    }
 
     const book = await this.mongo.book.findUnique({
       where: { id: bookId },
@@ -49,9 +50,9 @@ export class BookBuildService implements Service {
       throw new NotFoundError('Book not found')
     }
 
-    // if (book.writer_id !== writer.id) {
-    //   throw new ConfilctError('Not owner of book')
-    // }
+    if (book.writer_id !== writer.id) {
+      throw new ConfilctError('Not owner of book')
+    }
 
     // create folder
     const dest = path.resolve(process.cwd(), 'books', bookId)
@@ -94,7 +95,8 @@ export class BookBuildService implements Service {
       `${dest}/next.config.mjs`,
       nextConfigTempate({
         bucketUrl: ENV.bookBucketUrl,
-        bookId,
+        penName: writer.pen_name,
+        urlSlug: book.url_slug,
       }),
     )
     fs.writeFileSync(`${dest}/theme.config.tsx`, themeConfigTemplate({ title: book.title }))

apps/book-server/src/services/BookDeployService/index.mts

@@ -7,11 +7,12 @@ import { WriterService } from '../WriterService/index.mjs'
 import { AwsS3Service } from '@lib/awsS3/AwsS3Service.mjs'
 import mime from 'mime'
 import { ENV } from '@env'
+import { UnauthorizedError } from '@errors/UnauthorizedError.mjs'
+import { ConfilctError } from '@errors/ConfilctError.mjs'
 
 interface Service {
-  deploy: (bookId: string) => Promise<void>
+  deploy: (bookId: string, signedWriterId?: string) => Promise<void>
 }
-
 @injectable()
 @singleton()
 export class BookDeployService implements Service {
@@ -20,27 +21,26 @@ export class BookDeployService implements Service {
     private readonly writerService: WriterService,
     private readonly bookService: BookService,
   ) {}
-  async deploy(bookId: string): Promise<void> {
-    // TODO: add authentification
-    // if (!signedUserId) {
-    //   throw new UnauthorizedError('Not logged in')
-    // }
+  async deploy(bookId: string, signedWriterId?: string): Promise<void> {
+    if (!signedWriterId) {
+      throw new UnauthorizedError('Not logged in')
+    }
 
-    // const writer = await this.writerService.findById(signedUserId)
+    const writer = await this.writerService.findById(signedWriterId)
 
-    // if (!writer) {
-    //   throw new NotFoundError('Not found writer')
-    // }
+    if (!writer) {
+      throw new NotFoundError('Not found writer')
+    }
 
     const book = await this.bookService.findById(bookId)
 
     if (!book) {
       throw new NotFoundError('Not found book')
     }
 
-    // if (book.writer_id !== writer.id) {
-    //   throw new ConfilctError('Not owner of book')
-    // }
+    if (book.writer_id !== writer.id) {
+      throw new ConfilctError('Not owner of book')
+    }
 
     const output = path.resolve(process.cwd(), 'books', bookId, 'out')
 
@@ -70,7 +70,7 @@ export class BookDeployService implements Service {
       const contentType = mime.getType(filePath)
       await this.awsS3.uploadFile({
         bucketName: ENV.bookBucketName,
-        key: `${bookId}${relativePath}`,
+        key: `@${writer.pen_name}/${book.url_slug}${relativePath}`,
         body: body,
         ContentType: contentType ?? 'application/octet-stream',
         ACL: 'public-read',
@@ -80,7 +80,9 @@ export class BookDeployService implements Service {
     try {
       await Promise.all(promises)
 
-      console.log(`Deployed URL: , ${ENV.bookBucketUrl}/${bookId}/index.html`)
+      console.log(
+        `Deployed URL: , https://books.velog.io/@${writer.pen_name}/${book.url_slug}/index.html`,
+      )
     } catch (error) {
       console.error(error)
     }

apps/book-server/src/templates/nextConfigTemplate.ts

@@ -1,9 +1,10 @@
 type Props = {
   bucketUrl: string
-  bookId: string
+  penName: string
+  urlSlug: string
 }
 
-export const nextConfigTempate = ({ bucketUrl, bookId }: Props) => {
+export const nextConfigTempate = ({ bucketUrl, penName, urlSlug }: Props) => {
   return `
   import nextra from 'nextra'
 
@@ -22,8 +23,8 @@ export const nextConfigTempate = ({ bucketUrl, bookId }: Props) => {
     images: {
       unoptimized: true,
     },
-    assetPrefix: process.env.NODE_ENV === 'production' ? '${bucketUrl}/${bookId}' : undefined,
-    basePath: '/${bookId}',
+    assetPrefix: process.env.NODE_ENV === 'production' ? '${bucketUrl}/@${penName}/${urlSlug}' : undefined,
+    basePath: '/@${penName}/${urlSlug}',
     trailingSlash: false
   }
   

packages/library/src/awsS3/AwsS3Service.mts

@@ -25,7 +25,7 @@ export class AwsS3Service implements Service {
       const data = await this.client.send(command)
       return data.Buckets ?? []
     } catch (error: any) {
-      console.error('get buckets error')
+      console.error('get buckets error', error)
       const { requestId, cfId, extendedRequestId } = error.$metadata
       console.log({ requestId, cfId, extendedRequestId })
       return []