Fixed a bug within build command

nomo-app · Nov 28, 2023 · 9c1cb45 · 9c1cb45
1 parent a0bb6f2
commit 9c1cb45
Showing 1 changed file with 48 additions and 27 deletions.
diff --git a/src/build-webon/build-webon.ts b/src/build-webon/build-webon.ts
@@ -3,39 +3,54 @@ import { existsSync, mkdirSync, unlinkSync, renameSync } from "fs";
 import * as path from "path";
 import tar from "tar";
 
-export async function buildWebOn(args: { assetDir: string }) {
-  checkDir(args.assetDir);
-
-  const isOutDir = args.assetDir.endsWith("/out");
-  const outDirPath = isOutDir
-    ? args.assetDir
-    : path.resolve(args.assetDir, "..", "out");
-  console.log("outDirPath: " + outDirPath.toString());
-
-  if (!isOutDir) {
-    console.log("Renaming asset directory to 'out'...");
-    try {
-      renameSync(args.assetDir, path.join(path.dirname(args.assetDir), "out"));
-    } catch (error) {
-      console.error(`Error renaming directory: ${error}`);
-      return;
-    }
-  } else {
-    console.log("Directories are already named correctly, no need to rename.");
+export function renameAssetDir(assetDir: string): void {
+  try {
+    renameSync(assetDir, path.join(path.dirname(assetDir), "out"));
+  } catch (error) {
+    console.error(`Error renaming directory: ${error}`);
+    throw error;
   }
+}
 
+export function createOutDir(outDirPath: string): void {
   if (!existsSync(outDirPath)) {
     console.log("Creating 'out' directory...");
     mkdirSync(outDirPath);
   }
+}
 
+export function checkRequiredFiles(outDirPath: string): string[] {
   const requiredFiles = [
     "index.html",
     "nomo_icon.svg",
     "nomo_manifest.json",
   ].map((file) => path.resolve(outDirPath, file));
 
-  const missingFiles = requiredFiles.filter((file) => !existsSync(file));
+  return requiredFiles.filter((file) => !existsSync(file));
+}
+
+export function deleteExistingTarFile(tarFilePath: string): void {
+  if (existsSync(tarFilePath)) {
+    console.log(`Deleting existing nomo.tar.gz...`);
+    unlinkSync(tarFilePath);
+  }
+}
+
+export async function buildWebOn(args: { assetDir: string }): Promise<void> {
+  const assetDir = args.assetDir;
+  const isOutDir = assetDir.endsWith("/out");
+  const outDirPath = isOutDir ? assetDir : path.resolve(assetDir, "..", "out");
+
+  checkDir(assetDir);
+  renameAssetDir(assetDir);
+
+  if (!isOutDir) {
+    console.log("Directories are already named correctly, no need to rename.");
+  }
+
+  createOutDir(outDirPath);
+
+  const missingFiles = checkRequiredFiles(outDirPath);
 
   if (missingFiles.length > 0) {
     console.error(
@@ -49,24 +64,30 @@ export async function buildWebOn(args: { assetDir: string }) {
   const tarFileName = "nomo.tar.gz";
   const tarFilePath = path.join(outDirPath, tarFileName);
 
-  if (existsSync(tarFilePath)) {
-    console.log(`Deleting existing ${tarFileName}...`);
-    unlinkSync(tarFilePath);
+  deleteExistingTarFile(tarFilePath);
+
+  try {
+    await createTarFile(outDirPath, tarFilePath);
+    console.log("\x1b[32m", "Build and packaging completed!", "\x1b[0m");
+  } catch (error) {
+    console.error(`Error during build: ${error}`);
   }
+}
 
-  console.log(`Creating new ${tarFileName}: ${tarFilePath}`);
+async function createTarFile(
+  outDirPath: string,
+  tarFilePath: string
+): Promise<void> {
+  console.log(`Creating new ${path.basename(tarFilePath)}: ${tarFilePath}`);
 
   await tar.create(
     {
       file: tarFilePath,
       gzip: true,
-
       cwd: path.dirname(outDirPath),
     },
-
     [path.basename(outDirPath)]
   );
-  console.log("\x1b[32m", "Build and packaging completed!", "\x1b[0m");
 }
 
 function checkDir(dir: string): void {