fix: deploy cors issue

Author: winverse

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

@@ -29,6 +29,7 @@ interface Service {
 @singleton()
 export class BookBuildService implements Service {
   constructor(
+    private readonly mongo: MongoService,
     private readonly utils: UtilsService,
     private readonly mq: MqService,
     private readonly bookService: BookService,
@@ -57,6 +58,17 @@ export class BookBuildService implements Service {
       throw new ConfilctError('Not owner of book')
     }
 
+    // create deploy code
+    const deployCode = this.utils.randomString(10).toLocaleLowerCase()
+    await this.mongo.book.update({
+      where: {
+        id: book.id,
+      },
+      data: {
+        deploy_code: deployCode,
+      },
+    })
+
     // create folder
     const dest = path.resolve(process.cwd(), 'books', book.id)
 
@@ -93,7 +105,6 @@ export class BookBuildService implements Service {
     const pages = await this.pageService.getPages(book.url_slug, writer.id)
 
     // create meta.json
-
     await this.writeMetaJson({
       pages: pages || [],
       baseDest: pagesDir,
@@ -104,7 +115,7 @@ export class BookBuildService implements Service {
       `${dest}/next.config.mjs`,
       nextConfigTempate({
         bucketUrl: ENV.bookBucketUrl,
-        username: writer.username,
+        deployCode: deployCode,
         urlSlug: book.url_slug,
       }),
     )
@@ -198,16 +209,13 @@ export class BookBuildService implements Service {
   }
   private insertKey = (pages: Page[]) => {
     return pages.map((page) => ({
-      key: `${page.title}_${customRandom(urlAlphabet, 10, random)().toLocaleLowerCase()}`.replace(
-        /[^a-zA-Z0-9-]/g,
-        '_',
-      ),
+      key: `${this.utils.escapeForUrl(page.title)}-${page.code}`.toLocaleLowerCase(),
       ...page,
     }))
   }
 }
 
-type MetaJsonSerpator = { id: string; type: 'separator'; title: string }
+type MetaJsonSerpator = { id?: string; type: 'separator' | 'page'; title?: string }
 type MetaJsonValue = string | MetaJsonSerpator
 type MetaJson = Record<string, MetaJsonValue>
 

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

@@ -11,6 +11,7 @@ import { UnauthorizedError } from '@errors/UnauthorizedError.mjs'
 import { ConfilctError } from '@errors/ConfilctError.mjs'
 import { DeployResult } from '@graphql/generated.js'
 import { UtilsService } from '@lib/utils/UtilsService.mjs'
+import { MongoService } from '@lib/mongo/MongoService.mjs'
 
 interface Service {
   deploy: (bookId: string, signedWriterId?: string) => Promise<DeployResult>
@@ -19,6 +20,7 @@ interface Service {
 @singleton()
 export class BookDeployService implements Service {
   constructor(
+    private readonly mongo: MongoService,
     private readonly awsS3: AwsS3Service,
     private readonly utils: UtilsService,
     private readonly writerService: WriterService,
@@ -65,29 +67,14 @@ export class BookDeployService implements Service {
     // upload to S3
     const baseUrl = `${book.url_slug}`.replace('/', '')
 
-    let existsDeployedBook = null
-    try {
-      existsDeployedBook = await this.awsS3.getObject({
-        bucketName: ENV.bookBucketName,
-        key: `${baseUrl}/index.html`,
-      })
-    } catch (_) {}
-
-    if (existsDeployedBook && existsDeployedBook['$metadata'].httpStatusCode === 200) {
-      await this.awsS3.deleteFolder({
-        bucketName: ENV.bookBucketName,
-        key: `${baseUrl}/`,
-      })
-    }
-
     const promises = targetFiles.map(async (filePath) => {
       const body = fs.readFileSync(filePath)
       let relativePath = filePath.replace(output, '')
       const ext = path.extname(relativePath)
       if (ext === '.html' && !relativePath.includes('index.html')) {
         relativePath = relativePath.replace('.html', '')
       }
-      const key = `${baseUrl}${relativePath}`
+      const key = `${baseUrl}/${book.deploy_code}${relativePath}`
       const contentType = mime.getType(filePath)
       await this.awsS3.uploadFile({
         bucketName: ENV.bookBucketName,
@@ -100,9 +87,16 @@ export class BookDeployService implements Service {
 
     try {
       await Promise.all(promises)
-      const published_url = `https://books.velog.io/${baseUrl}/index.html`
-
-      console.log(`Deployed URL: , ${published_url}`)
+      const published_url = `https://books.velog.io/${baseUrl}/${book.deploy_code}`
+
+      await this.mongo.book.update({
+        where: {
+          id: book.id,
+        },
+        data: {
+          published_url,
+        },
+      })
 
       return {
         published_url,

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

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

packages/database/prisma/velog-book-mongo/schema.prisma

@@ -38,6 +38,7 @@ model Book {
   released_at   DateTime? @db.Timestamp
   url_slug      String    @unique // example $@{username}/${escapeUrl(title).toLowerCase()}
   published_url String    @default("") @db.String
+  deploy_code   String?   @default("") @db.String
 
   created_at DateTime @default(now())
   updated_at DateTime @default(now())