From 1bd6ac136ca1c3ec36ccd832074c789220640541 Mon Sep 17 00:00:00 2001
From: Haoyu Xu <i@halyul.dev>
Date: Thu, 10 Oct 2024 15:44:06 +0800
Subject: [PATCH] fix(aklive2d): updated cf upload

---
 config.yaml      | 4 +++-
 libs/cf_pages.js | 9 +++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/config.yaml b/config.yaml
index 32df678..7f0469b 100644
--- a/config.yaml
+++ b/config.yaml
@@ -1,4 +1,6 @@
-akassets_url: https://akassets.halyul.dev
+akassets: 
+  project_name: akassets
+  url: https://akassets.halyul.dev
 folder:
   auto_update_data: ./data/auto_update
   operator_data: ./data/operator/
diff --git a/libs/cf_pages.js b/libs/cf_pages.js
index 8c4abb7..adab933 100644
--- a/libs/cf_pages.js
+++ b/libs/cf_pages.js
@@ -14,7 +14,7 @@ export default class CFPages {
     async upload() {
         const tree = await this.#generateDirTree(this.#uploadPath);
         writeSync(JSON.stringify(tree, null), path.join(this.#uploadPath, 'index.json'));
-        const wrangler = spawnSync('pnpm', ['wrangler', 'pages', 'deploy', this.#uploadPath]);
+        const wrangler = spawnSync('pnpm', ['wrangler', 'pages', 'deploy', this.#uploadPath, "--project-name", __config.akassets.project_name]);
 
         console.log('error', wrangler.error);
         console.log('stdout ', wrangler.stdout.toString());
@@ -22,7 +22,7 @@ export default class CFPages {
     }
 
     async download() {
-        const indexFile = `${__config.akassets_url}/index.json`
+        const indexFile = `${__config.akassets.url}/index.json`
         const resp = await fetch(indexFile);
         const data = await resp.json();
         if (!exists(this.#downloadPath)) mkdir(this.#downloadPath);
@@ -86,7 +86,7 @@ export default class CFPages {
             }
         } else {
             return [{
-                url: `${__config.akassets_url}/${baseUrl + data.name.replace('#', '%23')}`,
+                url: `${__config.akassets.url}/${baseUrl + data.name.replace('#', '%23')}`,
                 target: path.join(baseDir, data.name),
                 hash: data.hash
             }]
@@ -108,7 +108,8 @@ export default class CFPages {
             const filePath = path.join(dir, file);
             const dirType = fileTypeSync(filePath);
             if (dirType === 'dir') {
-                tree.children.push(await this.#generateDirTree(filePath))
+                const children = await this.#generateDirTree(filePath);
+                if (children) tree.children.push(children);
             } else {
                 tree.children.push({
                     name: file,