feat(cli/sync): 完成判断冲突=>合并冲突=>推送配置 MVP 闭环

Author: lexmin0412

packages/cli/src/libs/sync.ts

@@ -0,0 +1,40 @@
+import path from "path";
+import os from 'os'
+
+
+/**
+ * GCM 配置目录
+ */
+const GCM_CONFIG_DIR = path.join(os.homedir(), ".gcm")
+/**
+ * 临时工作目录名称
+ */
+export const TEMP_FOLDER_NAME = "sync_temp_workspace";
+/**
+ * 临时工作目录，用于处理配置同步工作
+ */
+export const TEMP_SYNC_DIR = path.join(GCM_CONFIG_DIR, TEMP_FOLDER_NAME);
+/**
+ * 配置仓库名称
+ */
+const GIT_REPO_NAME = "config";
+/**
+ * 配置仓库中用于存放 GCM 配置的目录名称
+ */
+const SUB_FOLDER = "gcm";
+/**
+ * GCM 配置文件名称
+ */
+const GCM_CONFIG_FILE_NAME = "config.json";
+/**
+ * 仓库临时存放目录路径
+ */
+export const REPO_FOLDER_PATH = path.join(TEMP_SYNC_DIR, GIT_REPO_NAME);
+/**
+ * 仓库临时存放目录的 GCM 配置存放目录路径
+ */
+export const CONFIG_FOLDER_PATH = path.join(REPO_FOLDER_PATH, SUB_FOLDER);
+/**
+ * 仓库临时存放目录的 GCM 配置文件存放路径
+ */
+export const GCM_CONFIG_FILE_PATH = path.join(CONFIG_FOLDER_PATH, GCM_CONFIG_FILE_NAME);

packages/cli/src/libs/sync/const.ts

@@ -0,0 +1,42 @@
+import fs from "fs";
+import { getAllUserConfigs } from "@lexmin0412/gcm-api";
+import { GCM_CONFIG_FILE_PATH } from "./const";
+import { cloneConfigRepo, pushConfig, writeConfigIntoLocalRepo } from "./steps";
+import { isEqual } from "./utils";
+import { createServerAndOpenPage } from "./server";
+
+// 获取本地用户配置
+const localUserConfigs = getAllUserConfigs();
+
+/**
+ * 同步配置主函数
+ */
+const sync = async () => {
+	// clone 用户配置仓库
+	await cloneConfigRepo();
+	// 判断本地配置是否与远程配置一致
+	const remoteUserConfigs = JSON.parse(fs.readFileSync(GCM_CONFIG_FILE_PATH, "utf8"));
+	if (!remoteUserConfigs?.length) {
+		// 远程配置不存在，直接写入本地配置
+		writeConfigIntoLocalRepo(localUserConfigs);
+		pushConfig();
+	} else if (isEqual(localUserConfigs, remoteUserConfigs)) {
+		console.log("本地配置与远程配置一致，无需同步");
+	} else {
+		console.log("本地配置与远程配置存在冲突，即将打开浏览器，请前往处理");
+		// 打开冲突处理页面
+		const mergedConfig = await createServerAndOpenPage({
+			localConfig: localUserConfigs,
+			remoteConfig: remoteUserConfigs,
+		})
+		// 写入本地配置
+		writeConfigIntoLocalRepo(mergedConfig);
+		// 推送配置
+		pushConfig();
+		process.exit(0);
+	}
+}
+
+sync()
+
+

packages/cli/src/libs/sync/index.ts

@@ -0,0 +1,102 @@
+import http from "http";
+import fs from "fs";
+import path from "path";
+import puppeteer from "puppeteer";
+import { UserConfig } from "../../types";
+
+export const createServerAndOpenPage = async (options: {
+	localConfig: UserConfig[],
+	remoteConfig: UserConfig[],
+}) => {
+	return new Promise<UserConfig[]>((resolve, reject) => {
+		// 创建HTTP服务器
+		const server = http.createServer((req, res) => {
+			// 处理根路径请求
+			const purePath = req.url?.slice(0, req.url.indexOf("?"));
+			if (!purePath || purePath === "/") {
+				const html = fs.readFileSync(
+					path.join(__dirname, "../../server/index.html")
+				);
+				res.writeHead(200, { "Content-Type": "text/html; charset=utf-8" });
+				return res.end(html);
+			}
+
+			// 处理其他静态文件
+			const filePath = path.join(__dirname, req.url as string);
+			if (fs.existsSync(filePath)) {
+				const content = fs.readFileSync(filePath);
+				res.end(content);
+			} else {
+				res.writeHead(404);
+				res.end("Not found");
+			}
+		});
+
+		const port = 56789;
+		const baseURL = `http://localhost:${port}`;
+		const url = `${baseURL}?ws=ws://localhost:${port}`;
+
+		/**
+		 * 打开冲突处理页面
+		 */
+		const openConflictWebPage = async (cb: (type: 'success', data: any) => void) => {
+			const browser = await puppeteer.launch({
+				headless: false,
+			});
+			const page = await browser.newPage();
+			await page.goto(url, {
+
+			});
+			// 给页面注入全局变量
+			await page.addScriptTag({
+				content: `
+				window.GCM = {
+					localConfig: ${JSON.stringify(options.localConfig)},
+					remoteConfig: ${JSON.stringify(options.remoteConfig)},
+				};
+				document.querySelector('#localConfig').value = JSON.stringify(window.GCM.localConfig, null, 2);
+				document.querySelector('#remoteConfig').value = JSON.stringify(window.GCM.remoteConfig, null, 2);
+			`,
+			});
+			// 监听页面中的点击事件
+			await page.exposeFunction("onClickEvent", (event) => {
+				console.log("点击事件发生:", event);
+				if (event.target === 'submit_btn') {
+
+					// TODO 校验配置
+
+					cb('success', JSON.parse(event.data))
+					browser.close();
+				}
+			});
+
+			// 在页面中注入 JavaScript 代码来监听点击事件
+			await page.evaluate(() => {
+
+				document.addEventListener("click", (event) => {
+					console.log('合并输入框', document.querySelector('#mergedConfig'))
+					console.log('合并输入框的值', document.querySelector('#mergedConfig')?.innerHTML)
+					// 调用 Node.js 中暴露的函数
+					window.onClickEvent({
+						target: event.target.id,
+						data: document.querySelector('#mergedConfig')?.value
+					});
+				});
+			});
+		};
+
+		// 启动服务
+		server.listen(port, async () => {
+			console.log(`Server running at ${baseURL}`);
+			// 获取本地配置内容
+			openConflictWebPage((type, data) => {
+				if (type == 'success') {
+					// TODO 提交配置
+					console.log('提交配置', data)
+					resolve(data);
+				}
+			});
+		});
+
+	})
+};