[engine] feature/712 브랜치에서 작업한 내용을 main 브랜치에 반영

packages/analysis-engine/src/index.ts

@@ -53,7 +53,9 @@ export class AnalysisEngine {
     if (this.isDebugMode) console.log("baseBranchName: ", this.baseBranchName);
 
     const commitRaws = getCommitRaws(this.gitLog);
-    if (this.isDebugMode) console.log("commitRaws: ", commitRaws);
+    if (this.isDebugMode){
+      console.log("commitRaws: ", commitRaws);
+    }
 
     const commitDict = buildCommitDict(commitRaws);
     if (this.isDebugMode) console.log("commitDict: ", commitDict);

packages/vscode/.eslintrc.json

@@ -12,7 +12,8 @@
       }
     ],
     "simple-import-sort/exports": "error",
-    "no-duplicate-imports": "error"
+    "no-duplicate-imports": "error",
+    "import/no-commonjs": "off"
   },
   "overrides": [
     {

packages/vscode/src/extension.ts

@@ -7,12 +7,13 @@
 import { deleteGithubToken, getGithubToken, setGithubToken } from "./setting-repository";
 import { mapClusterNodesFrom } from "./utils/csm.mapper";
 import {
+  fetchGitLogInParallel,
   findGit,
   getBranches,
   getCurrentBranchName,
   getDefaultBranchName,
   getGitConfig,
   getGitLog,
   getRepo,
 } from "./utils/git.util";
 import WebviewLoader from "./webview-loader";
@@ -59,6 +60,8 @@
 
       const fetchBranches = async () => await getBranches(gitPath, currentWorkspacePath);
 
+      const gitLog = await fetchGitLogInParallel(gitPath, currentWorkspacePath);
+
       const fetchCurrentBranch = async () => {
         let branchName;
         try {
@@ -75,8 +78,9 @@
       };
 
       const initialBaseBranchName = await fetchCurrentBranch();
+
+
       const fetchClusterNodes = async (baseBranchName = initialBaseBranchName) => {
-        const gitLog = await getGitLog(gitPath, currentWorkspacePath);
         const gitConfig = await getGitConfig(gitPath, currentWorkspacePath, "origin");
 
         const { owner, repo: initialRepo } = getRepo(gitConfig);

packages/vscode/src/utils/git.util.ts

@@ -1,7 +1,11 @@
 import { COMMIT_SEPARATOR, GIT_LOG_SEPARATOR } from "@githru-vscode-ext/analysis-engine";
 import * as cp from "child_process";
 import * as fs from "fs";
+import os from 'os';
 import * as path from "path";
+import { Worker } from 'worker_threads';
+
+
 
 export interface GitExecutable {
   readonly path: string;
@@ -112,7 +116,7 @@
     if (await isExecutable(file)) {
       try {
         return await getGitExecutable(file);
       } catch (_) {}
     }
   }
   return Promise.reject<GitExecutable>();
@@ -148,7 +152,7 @@
   for (let i = 0; i < paths.length; i++) {
     try {
       return await getGitExecutable(paths[i]);
     } catch (_) {}
   }
   throw new Error("None of the provided paths are a Git executable");
 }
@@ -170,6 +174,7 @@
         "%B", // commit message  (subject and body)
       ].join(GIT_LOG_SEPARATOR) +
       GIT_LOG_SEPARATOR;
+
     const args = [
       "--no-pager",
       "log",
@@ -198,6 +203,80 @@
   });
 }
 
+export async function getLogCount(gitPath: string, currentWorkspacePath: string): Promise<number> {
+    const BASE_10 = 10;
+    return new Promise((resolve, reject) => {
+        const args = [
+        "rev-list",
+        "--count",
+        "--all",
+        ];
+
+    resolveSpawnOutput(
+        cp.spawn(gitPath, args, {
+            cwd: currentWorkspacePath,
+            env: Object.assign({}, process.env),
+        })
+        ).then(([status, stdout, stderr]) => {
+        const { code, error } = status;
+
+        if (code === 0 && !error) {
+            const commitCount = parseInt(stdout.toString().trim(), BASE_10); // Buffer를 문자열로 변환 후 숫자로 변환
+            resolve(commitCount); // 숫자를 반환
+        } else {
+            reject(stderr);
+        }
+        });
+    });
+}
+
+
+export async function fetchGitLogInParallel(gitPath: string, currentWorkspacePath: string): Promise<string> {
+  const numCores = os.cpus().length;
+
+  const totalCnt = await getLogCount(gitPath, currentWorkspacePath);
+  let numberOfThreads = 1;
+
+  const taskThreshold = 1000;
+  const coreCountThreshold = 4;
+
+if (totalCnt > taskThreshold) {
+  if (numCores < coreCountThreshold) numberOfThreads = 2;
+  else numberOfThreads = 3;
+}
+
+  const chunkSize = Math.ceil(totalCnt/ numberOfThreads);
+  const promises: Promise<string>[] = [];
+
+  for (let i = 0; i < numberOfThreads; i++) {
+    const skipCount = i * chunkSize;
+    const limitCount = chunkSize;
+
+    console.log('__dirname:', __dirname);
+    const worker = new Worker(path.resolve(__dirname, './worker.js'), {
+      workerData: {
+        gitPath,
+        currentWorkspacePath,
+        skipCount,
+        limitCount,
+        COMMIT_SEPARATOR, 
+        GIT_LOG_SEPARATOR 
+      },
+    });
+
+    promises.push(
+      new Promise((resolve, reject) => {
+        worker.on('message', resolve);
+        worker.on('error', reject);
+      })
+    );
+  }
+
+  return Promise.all(promises).then((logs) => logs.join('\n'));
+}
+
+
+
 export async function getGitConfig(
   gitPath: string,
   currentWorkspacePath: string,

packages/vscode/src/utils/git.worker.ts

@@ -0,0 +1,60 @@
+import * as cp from 'child_process';
+import { parentPort, workerData } from 'worker_threads';
+
+import { resolveSpawnOutput } from './git.util'
+
+const { gitPath, currentWorkspacePath, skipCount, limitCount,COMMIT_SEPARATOR,GIT_LOG_SEPARATOR } = workerData;
+
+
+
+
+async function getPartialGitLog() {
+    const gitLogFormat =
+      COMMIT_SEPARATOR +
+      [
+        "%H", // commit hash (id)
+        "%P", // parent hashes
+        "%D", // ref names (branches, tags)
+        "%an", // author name
+        "%ae", // author email
+        "%ad", // author date
+        "%cn",
+        "%ce",
+        "%cd", // committer name, committer email and committer date
+        "%B", // commit message  (subject and body)
+      ].join(GIT_LOG_SEPARATOR) +
+      GIT_LOG_SEPARATOR;
+
+    const args = [
+        '--no-pager',
+        'log',
+        '--all',
+        '--parents',
+        '--numstat',
+        '--date-order',
+        `--pretty=format:${gitLogFormat}`,
+        '--decorate',
+        '-c',
+        `--skip=${skipCount}`,
+        `-n ${limitCount}`,
+    ];
+
+    resolveSpawnOutput(
+        cp.spawn(gitPath, args, {
+            cwd: currentWorkspacePath,
+            env: Object.assign({}, process.env),
+        })
+        ).then(([status, stdout, stderr]) => {
+        const { code, error } = status;
+
+        if (code === 0 && !error && parentPort !== null) {
+            parentPort.postMessage(stdout.toString());
+        } else {
+            if (parentPort !== null) parentPort.postMessage(stderr);
+        }
+        }).catch(error => {
+            console.error('Spawn Error:', error);
+        });
+}
+
+getPartialGitLog();

packages/vscode/src/webview-loader.ts

@@ -37,13 +37,12 @@ export default class WebviewLoader implements vscode.Disposable {
         const { command, payload } = message;
 
         if (command === "fetchAnalyzedData" || command === "refresh") {
-          const baseBranchName = (payload && JSON.parse(payload)) ?? (await fetchCurrentBranch());
           try {
             const baseBranchName = (payload && JSON.parse(payload)) ?? (await fetchCurrentBranch());
             const storedAnalyzedData = context.workspaceState.get<ClusterNode[]>(
               `${ANALYZE_DATA_KEY}_${baseBranchName}`
             );
-            let analyzedData = storedAnalyzedData;
+            analyzedData = storedAnalyzedData;
             if (!storedAnalyzedData) {
               console.log("No cache Data");
               console.log("baseBranchName : ", baseBranchName);

packages/vscode/webpack.config.js

@@ -12,11 +12,14 @@ const extensionConfig = {
     target: "node", // vscode extensions run in a Node.js-context 📖 -> https://webpack.js.org/configuration/node/
     mode: "none", // this leaves the source code as close as possible to the original (when packaging we set this to 'production')
 
-    entry: "./src/extension.ts", // the entry point of this extension, 📖 -> https://webpack.js.org/configuration/entry-context/
+    entry: {
+        extension: "./src/extension.ts", // the entry point of this extension, 📖 -> https://webpack.js.org/configuration/entry-context/
+        worker: "./src/utils/git.worker.ts"
+    },
     output: {
         // the bundle is stored in the 'dist' folder (check package.json), 📖 -> https://webpack.js.org/configuration/output/
         path: path.resolve(__dirname, "dist"),
-        filename: "extension.js",
+        filename: "[name].js",
         libraryTarget: "commonjs2",
     },
     externals: {