rigjs 2.1.27 → 3.0.0-alpha

package/lib/print/index.ts

@@ -0,0 +1,38 @@
+/**
+ * @ignore
+ * @Description nothing
+ * @author Wang Bo (ralwayne@163.com)
+ * @date 2020/10/20 7:32 PM
+ */
+const ora = require('ora');
+const chalk = require('chalk');
+
+let printer = ora();
+
+const start = (str: string) => {
+	printer.start(chalk.blueBright(str));
+}
+
+const info = (str: string) => {
+	printer.info(chalk.hex('#37BA85')(str));
+}
+
+const error = (str: string) => {
+	printer.fail(chalk.hex('#FF4848')(str));
+}
+
+const warn = (str: string) => {
+	printer.warn(chalk.yellowBright(str));
+}
+
+const succeed = (str: string) => {
+	printer.succeed(chalk.greenBright(str));
+}
+
+export default {
+  start,
+	info,
+	error,
+	warn,
+	succeed,
+}

package/lib/publish/index.ts

@@ -3,33 +3,40 @@ import CICDCmd from '@/classes/cicd/CICDCmd';
 import CDN from '@/classes/cicd/Deploy/CDN';
 
 const delay = async (ms: number) => {
-	await new Promise((resolve) => {
-		setTimeout(resolve, ms);
-	});
+  await new Promise((resolve) => {
+    setTimeout(resolve, ms);
+  });
 };
 
 const setRewriteUri = async (
-	domain: string,
-	original: string,
-	deployDir: string,
-	cdn: CDN
+  domain: string,
+  original: string | string[],
+  deployDir: string | string[],
+  cdn: CDN
 ) => {
-	const rwriteResult = await cdn.setRewriteUri(
-		domain,
-		[original],
-		[deployDir],
-		['enhance_break']
-	);
+  const rwriteResult = await cdn.setRewriteUri(
+    domain,
+    Array.isArray(original) ? original : [original],
+    Array.isArray(deployDir) ? deployDir : [deployDir],
+    ['enhance_break']
+  );
 
   const configId = rwriteResult?.DomainConfigList.DomainConfigModel[0].ConfigId;
-  for (let i = 0; i <= 200; i++) {
+  for (let i = 0; i <= 100; i++) {
     const configInfo = await cdn.describeCdnDomainConfigs(domain, configId);
-    if (configInfo.DomainConfigs.DomainConfig[0].Status === 'success') {
+    const domainConfigs = configInfo.DomainConfigs.DomainConfig;
+    let successCount = 0;
+    for (const domainConfig of domainConfigs) {
+      if (domainConfig.Status === 'success') {
+        successCount++;
+      } else if (domainConfig.Status === 'failed') {
+        throw new Error('cdn rewrite fail');
+      }
+    }
+    if (successCount === domainConfigs.length) {
       break;
-    } else if (configInfo.DomainConfigs.DomainConfig[0].Status === 'failed') {
-      throw new Error('cdn rewrite fail');
     }
-    if (i === 200) {
+    if (i === 100) {
       throw new Error('cdn rewrite timeout 10min');
     }
     await delay(3000);
@@ -39,7 +46,7 @@ const setRewriteUri = async (
 const refreshCache = async (urls: string[], cdn: CDN) => {
   const refreshResult = await cdn.refreshCache(urls.join('\n'));
   console.log('Please Wait For RefreshCache...');
-  for (let i = 0; i <= 200; i++) {
+  for (let i = 0; i <= 100; i++) {
     const desResult = await cdn.describeRefreshTaskById(
       refreshResult.RefreshTaskId
     );
@@ -54,7 +61,7 @@ const refreshCache = async (urls: string[], cdn: CDN) => {
     if (successCount === desResult.Tasks.length) {
       break;
     }
-    if (i === 200) {
+    if (i === 100) {
       throw new Error('refresh cache timeout 10min');
     }
     await delay(3000);
@@ -63,167 +70,170 @@ const refreshCache = async (urls: string[], cdn: CDN) => {
 };
 
 export default async (cmd: any) => {
-	try {
-		//create cicd object
-		const cicd = CICD.createByDefault(cmd);
-		//construct cmd object
-		const cicdCmd = new CICDCmd(cmd, cicd);
+  try {
+    const rewriteConfigs: {
+      [domain: string]: { original: string[]; deployDir: string[] };
+    } = {};
+    const setRewriteConfig = (
+      domain: string,
+      originalItem: string,
+      deployDirItem: string
+    ) => {
+      if (rewriteConfigs[domain]) {
+        rewriteConfigs[domain].original.push(originalItem);
+        rewriteConfigs[domain].deployDir.push(deployDirItem);
+      } else {
+        rewriteConfigs[domain] = {
+          original: [originalItem],
+          deployDir: [deployDirItem],
+        };
+      }
+    };
+    //create cicd object
+    const cicd = CICD.createByDefault(cmd);
+    //construct cmd object
+    const cicdCmd = new CICDCmd(cmd, cicd);
 
-		console.log('Start Publish-----');
-		const target = Array.isArray(cicdCmd.cicd.target)
-			? cicdCmd.cicd.target[0]
-			: cicdCmd.cicd.target;
+    console.log('Start Publish-----');
+    const target = Array.isArray(cicdCmd.cicd.target)
+      ? cicdCmd.cicd.target[0]
+      : cicdCmd.cicd.target;
 
-		const cdn = new CDN(target);
-		const urls: string[] = [];
-		const setRewriteUriPromises: Promise<any>[] = [];
-		if (!cicdCmd.endpoints || cicdCmd.endpoints.length === 0) {
-			throw new Error('Endpoints.length Can Not Be 0!');
-		}
-		for (const endpoint of cicdCmd.endpoints) {
-			if (
-				!endpoint.uri_rewrite &&
-				(!target.uri_rewrite ||
-					!target.uri_rewrite.original ||
-					!target.uri_rewrite.original_regexp)
-			) {
-				let webEntryPath: string;
-				if (cicd.web_type === 'mpa') {
-					webEntryPath = '/';
-				} else if (cicd.web_type === 'history') {
-					webEntryPath = '/';
-				} else {
-					webEntryPath = endpoint.web_entry_path
-						? endpoint.web_entry_path
-						: target.web_entry_path || '/';
-				}
-				for (const domain of endpoint.domains) {
-					if (cicd.web_type === 'mpa') {
-						//mpa匹配非首页
-						setRewriteUriPromises.push(
-							setRewriteUri(
-								domain,
-								'^\\/([\\w-/]*\\w+)(?![^?]*\\.\\w+)',
-								`/${endpoint.deployDir.replace(/\\/g, '/')}/$1.html`,
-								cdn
-							)
-						);
-						//mpa匹配文件
-						setRewriteUriPromises.push(
-							setRewriteUri(
-								domain,
-								`^\\/([^?]*\\.[a-zA-Z0-9]+)($|\\?)`,
-								`/${endpoint.deployDir.replace(/\\/g, '/')}/$1`,
-								cdn
-							)
-						);
-					} else if (cicd.web_type === 'history') {
-						//spa/history匹配非首页
-						setRewriteUriPromises.push(
-							setRewriteUri(
-								domain,
-								'^\\/([\\w-/]*\\w+)(?![^?]*\\.\\w+)',
-								`/${endpoint.deployDir.replace(/\\/g, '/')}/index.html`,
-								cdn
-							)
-						);
-						//spa-history匹配文件
-						setRewriteUriPromises.push(
-							setRewriteUri(
-								domain,
-								`^\\/([^?]*\\.[a-zA-Z0-9]+)($|\\?)`,
-								`/${endpoint.deployDir.replace(/\\/g, '/')}/$1`,
-								cdn
-							)
-						);
-					}else{
-						//spa-hash匹配文件
-						//hash模式支持一个域名支持多个网页应用的入口路径，如/,/app1,/app2,都是不同的网页应用
-						//需要替换webpack中的publicPath为实际OSS的目录
-						setRewriteUriPromises.push(
-							setRewriteUri(
-								domain,
-								`^\\/([^?]*\\.[a-zA-Z0-9]+)($|\\?)`,
-								`/$1`,
-								cdn
-							)
-						);
-					}
-					//首页匹配正则，hash,history,mpa三个模式通用
-					setRewriteUriPromises.push(
-						setRewriteUri(
-							domain,
-							`^(${webEntryPath})($|\\?|#|\\/\\?|\\/$)`,
-							`/${endpoint.deployDir.replace(/\\/g, '/')}/index.html`,
-							cdn
-						)
-					);
-					urls.push(`https://${domain}${webEntryPath}`);
-				}
-			} else {
-				const uriRewrite = endpoint.uri_rewrite
-					? endpoint.uri_rewrite
-					: target.uri_rewrite;
+    const cdn = new CDN(target);
+    const urls: string[] = [];
+    if (!cicdCmd.endpoints || cicdCmd.endpoints.length === 0) {
+      throw new Error('Endpoints.length Can Not Be 0!');
+    }
+    for (const endpoint of cicdCmd.endpoints) {
+      if (
+        !endpoint.uri_rewrite &&
+        (!target.uri_rewrite ||
+          !target.uri_rewrite.original ||
+          !target.uri_rewrite.original_regexp)
+      ) {
+        let webEntryPath: string;
+        if (cicd.web_type === 'mpa') {
+          webEntryPath = '/';
+        } else if (cicd.web_type === 'history') {
+          webEntryPath = '/';
+        } else {
+          webEntryPath = endpoint.web_entry_path
+            ? endpoint.web_entry_path
+            : target.web_entry_path || '/';
+        }
+        for (const domain of endpoint.domains) {
+          if (cicd.web_type === 'mpa') {
+            //mpa匹配非首页
+            setRewriteConfig(
+              domain,
+              '^\\/([\\w-/]*\\w+)(?![^?]*\\.\\w+)',
+              `/${endpoint.deployDir.replace(/\\/g, '/')}/$1.html`
+            );
+            //mpa匹配文件
+            setRewriteConfig(
+              domain,
+              `^\\/([^?]*\\.[a-zA-Z0-9]+)($|\\?)`,
+              `/${endpoint.deployDir.replace(/\\/g, '/')}/$1`
+            );
+          } else if (cicd.web_type === 'history') {
+            //spa/history匹配非首页
+            setRewriteConfig(
+              domain,
+              '^\\/([\\w-/]*\\w+)(?![^?]*\\.\\w+)',
+              `/${endpoint.deployDir.replace(/\\/g, '/')}/index.html`
+            );
+            //spa-history匹配文件
+            setRewriteConfig(
+              domain,
+              `^\\/([^?]*\\.[a-zA-Z0-9]+)($|\\?)`,
+              `/${endpoint.deployDir.replace(/\\/g, '/')}/$1`
+            );
+          } else {
+            //spa-hash匹配文件
+            //hash模式支持一个域名支持多个网页应用的入口路径，如/,/app1,/app2,都是不同的网页应用
+            //需要替换webpack中的publicPath为实际OSS的目录
+            setRewriteConfig(
+              domain,
+              `^\\/([^?]*\\.[a-zA-Z0-9]+)($|\\?)`,
+              `/$1`
+            );
+          }
+          //首页匹配正则，hash,history,mpa三个模式通用
+          setRewriteConfig(
+            domain,
+            `^(${webEntryPath})($|\\?|#|\\/\\?|\\/$)`,
+            `/${endpoint.deployDir.replace(/\\/g, '/')}/index.html`
+          );
+          urls.push(`https://${domain}${webEntryPath}`);
+        }
+      } else {
+        const uriRewrite = endpoint.uri_rewrite
+          ? endpoint.uri_rewrite
+          : target.uri_rewrite;
 
-				if (!uriRewrite) {
-					continue;
-				}
+        if (!uriRewrite) {
+          continue;
+        }
 
-				for (const domain of endpoint.domains) {
-					if (cicd.web_type !== 'hash'){
-						setRewriteUriPromises.push(
-							setRewriteUri(
-								domain,
-								'^\\/([^?]*\\.[a-zA-Z0-9]+)($|\\?)',
-								`/${endpoint.deployDir.replace(/\\/g, '/')}/$1`,
-								cdn
-							)
-						);
-					}else{
-						setRewriteUriPromises.push(
-							setRewriteUri(
-								domain,
-								'^\\/([^?]*\\.[a-zA-Z0-9]+)($|\\?)',
-								`/$1`,
-								cdn
-							)
-						);
-					}
-					setRewriteUriPromises.push(
-						setRewriteUri(
-							domain,
-							`${
-								uriRewrite.original_regexp
-									? uriRewrite.original_regexp
-									: uriRewrite.original
-							}`,
-							`/${endpoint.deployDir.replace(/\\/g, '/')}/index.html`,
-							cdn
-						)
-					);
-					urls.push(`https://${domain}${uriRewrite.original}`);
-				}
-			}
-		}
+        for (const domain of endpoint.domains) {
+          if (cicd.web_type !== 'hash') {
+            setRewriteConfig(
+              domain,
+              '^\\/([^?]*\\.[a-zA-Z0-9]+)($|\\?)',
+              `/${endpoint.deployDir.replace(/\\/g, '/')}/$1`
+            );
+          } else {
+            setRewriteConfig(
+              domain,
+              '^\\/([^?]*\\.[a-zA-Z0-9]+)($|\\?)',
+              `/$1`
+            );
+          }
+          setRewriteConfig(
+            domain,
+            `${
+              uriRewrite.original_regexp
+                ? uriRewrite.original_regexp
+                : uriRewrite.original
+            }`,
+            `/${endpoint.deployDir.replace(/\\/g, '/')}/index.html`
+          );
+          urls.push(`https://${domain}${uriRewrite.original}`);
+        }
+      }
+    }
 
-		// 回源URI改写
-		console.log('Please Wait For Set RWrite URI...');
-		if (setRewriteUriPromises.length > 0) {
-			await Promise.all(setRewriteUriPromises);
-		} else {
-			console.log('Not Have To Set RWrite URI');
-		}
-		console.log('Set RWrite URI Done');
+    // 回源URI改写
+    console.log('Please Wait For Set RWrite URI...');
+    const setRewriteUriPromises: Promise<any>[] = [];
+	console.log('rewriteConfigs: ', rewriteConfigs);
+    Object.keys(rewriteConfigs).forEach((domain) => {
+      const rewriteConfig = rewriteConfigs[domain];
+      setRewriteUriPromises.push(
+        setRewriteUri(
+          domain,
+          rewriteConfig.original,
+          rewriteConfig.deployDir,
+          cdn
+        )
+      );
+    });
+    if (setRewriteUriPromises.length > 0) {
+      await Promise.all(setRewriteUriPromises);
+    } else {
+      console.log('Not Have To Set RWrite URI');
+    }
+    console.log('Set RWrite URI Done');
 
-		//刷新cdn
-		if (urls.length > 0) {
-			await refreshCache(urls, cdn);
-		} else {
-			console.log('Not Have To RefreshCache');
-		}
-		console.log('Publish Done-----');
-	} catch (e: any) {
-		console.error(e.message);
-		process.exit(1);
-	}
+    //刷新cdn
+    if (urls.length > 0) {
+      await refreshCache(urls, cdn);
+    } else {
+      console.log('Not Have To RefreshCache');
+    }
+    console.log('Publish Done-----');
+  } catch (e: any) {
+    console.error(e.message);
+    process.exit(1);
+  }
 };

package/lib/rig/index.ts

@@ -1,30 +1,46 @@
+import semver from 'semver';
+import print from '../print';
+import add from '../add';
+import dev from '../dev';
+import preinstall from '../preinstall';
+import postinstall from '../postinstall';
+import build from '../build';
+import deploy from '../deploy';
+import publish from '../publish';
+
+import sync from '../sync';
+const nodeMin = '14.0.0';
+if (semver.gte(nodeMin,process.version)){
+	print.error('NodeJS version must be at least 14.');
+	process.exit(0);
+}
 import {Command} from 'commander';
 
 const program = new Command();
-console.log('Hello');
 
 import check from '../check';
 
 program.command('check').action(check.load);
 import init from '../init';
 
-program.command('init').action(init.load);
+program.command('init').action(init);
 import install from '../install';
 
-program.command('install').action(install.load);
-program.command('i').action(install.load);
-import preinstall from '../preinstall';
-import postinstall from '../postinstall';
+program.command('install').action(install);
+program.command('i').action(install);
 
-program.command('preinstall').action(preinstall.load);
-program.command('postinstall').action(postinstall.load);
+program.command('preinstall').action(preinstall);
+program.command('postinstall').action(postinstall);
 import tag from '../tag';
 
 program.command('tag').action(tag.load);
 import info from '../info';
 
 program.command('info').action(info.load);
-import build from '../build';
+
+program.command('add').action(add);
+
+program.command('dev').action(dev);
 
 program.command('build')
 	.option('-s, --schema <schema>', 'specify params in tree_schema')
@@ -36,20 +52,20 @@ program.command('build')
 // 	.option('-s, --schema <schema>', 'specify params in tree_schema')
 // 	.option('-p , --params <params>', 'replace words in cicd.rig.json5, only words in ${} are replacable')
 // 	.action(define);
-import deploy from '../deploy';
-
 program.command('deploy')
 	.option('-s, --schema <schema>', 'specify params in tree_schema')
 	.option('-p , --params <params>', 'replace words in cicd.rig.json5, only words in ${} are replacable')
 	.action(deploy);
 
-import publish from '../publish';
-
 program.command('publish')
 	.option('-s, --schema <schema>', 'specify params in tree_schema')
 	.option('-p , --params <params>', 'replace words in cicd.rig.json5, only words in ${} are replacable')
 	.action(publish);
 
+program.command('sync')
+	.option('-f, --force <force>', 'force to overwrite files from package.rig.json5')
+	.action(sync);
+
 import env from '../vue-env';
 
 program.option('--vueenv <vueenv>', 'specify vue env').action(env.load);

package/lib/sync/index.test.ts

@@ -0,0 +1,4 @@
+import path from 'path';
+import url from 'url';
+
+console.log(path.basename(url.parse('https://dafa.com/fafa.txt?a=1').pathname!));

package/lib/sync/index.ts

@@ -0,0 +1,32 @@
+import axios from 'axios';
+import RigConfig from '@/classes/RigConfig';
+import url from 'url';
+import path from 'path';
+import fs from 'fs';
+import print from '../print';
+
+const syncFile = async (shareContent: string, force: boolean = false) => {
+	const filename = path.basename(url.parse(shareContent).pathname!);
+	const shareFilePath = path.join(process.cwd(), filename);
+	if (fs.existsSync(shareFilePath) && !force) {
+		print.info(`${filename} already exists.`);
+		return;
+	}
+	print.info(`Start downloading ${filename}`);
+	const fileStr = (await axios.get(shareContent)).data;
+	fs.writeFileSync(shareFilePath, fileStr);
+};
+export default async (cmd: any) => {
+	const rigConfig = RigConfig.createFromCWD();
+	for (let key in rigConfig.share) {
+		if (Array.isArray(rigConfig.share[key])) {
+			const shareContentArr = rigConfig.share[key] as string[];
+			for (let shareContent of shareContentArr) {
+				await syncFile(shareContent, cmd.force);
+			}
+		} else {
+			const shareContent = rigConfig.share[key] as string;
+			await syncFile(shareContent, cmd.force);
+		}
+	}
+}

package/lib/utils/fsHelper.ts

@@ -5,6 +5,42 @@ const readCICDConfig = () => {
 	const cicdStr = fs.readFileSync(`${process.cwd()}/cicd.rig.json5`);
 	return JSON5.parse(cicdStr);
 }
+/**
+ * 读取rig配置文件
+ * @param {string} path absolute path to config json5.
+ * @returns {any}
+ */
+const readConfig = (path: string = '') => {
+	try {
+		if (path) {
+			const rigJson5Str = fs.readFileSync(path);
+			return JSON5.parse(rigJson5Str);
+		}
+		const rigJson5Str = fs.readFileSync(`${process.cwd()}/package.rig.json5`);
+		return JSON5.parse(rigJson5Str);
+	} catch (e) {
+		throw new Error(`readConfig failed:${e.message}`);
+	}
+}
+
+const writeConfig = (config: any, path: string = '') => {
+	try {
+		if (path) {
+			fs.writeFileSync(path, config.toString());
+		} else {
+			fs.writeFileSync(`${process.cwd()}/package.rig.json5`, config.toString());
+		}
+	} catch (e) {
+		throw new Error(`rig writeConfig failed:${e.message}`);
+	}
+}
+const readPkgStrInRepo = (rigRepoName: string) => {
+	return fs.readFileSync(`${process.cwd()}/rig_dev/${rigRepoName}/package.json`).toString();
+}
+
 export default {
-	readCICDConfig
+	readCICDConfig,
+	readConfig,
+	writeConfig,
+	readPkgStrInRepo
 }

package/lib/utils/objectHelper.ts

@@ -0,0 +1,12 @@
+const sortKeys = (obj: any) => {
+	return Object.keys(obj).sort().reduce(
+		(sortedObj: any, key) => {
+			sortedObj[key] = obj[key];
+			return sortedObj;
+		},
+		{}
+	);
+}
+export default {
+	sortKeys
+}

package/lib/utils/regexHelper.test.ts

@@ -0,0 +1,12 @@
+import regexHelper from '@/utils/regexHelper';
+test('matchGitName', () => {
+	const retGit = 'git@git.domain.com:f2e-common/r-test.git'.match(regexHelper.matchGitName);
+	const retHttp = 'https://git.domain.com/f2e-common/r-test.git'.match(regexHelper.matchGitName);
+	if (retGit) {
+		expect(retGit[2]).toContain('r-test');
+	}
+	if (retHttp) {
+		expect(retHttp[2]).toContain('r-test');
+	}
+});
+

package/lib/utils/{regex.ts → regexHelper.ts}

@@ -4,7 +4,9 @@
  * @author Wang Bo (ralwayne@163.com)
  * @date 2020/10/10 3:57 PM
  */
+// `^\\/([^?]*\\.[a-zA-Z0-9]+)($|\\?)`,
 const gitURL = /(?:git|ssh|https?|git@[-\w.]+):(\/\/)?(.*?)(\.git)(\/?|\#[-\d\w._]+?)$/;
+const matchGitName = /^(git|http).*\/(.*)(\.git)$/;
 const path = /^(\/\w+){0,2}\/?$/;
 /**
  * 文字下划线中划线
@@ -14,5 +16,6 @@ const dynamicDir = /(^\[[\w\-]+\]$)|(^\{[\w\-]+\}$)/
 export default {
 	gitURL,
 	path,
-	dynamicDir
+	dynamicDir,
+	matchGitName
 }