rigjs 2.0.0-alpha.7 → 2.0.1

package/demo/cicd.rig.json5

@@ -12,21 +12,22 @@
     access_secret: '${as}',
     root_path: '/',
     uri_rewrite: {
-      original: 'view-fp',
+      original: '/',
     }
   },
   endpoints: {
     'ykp/test/oem1': {
-      build: 'yarn build:oem1',
+      build: 'cross-env PUBLIC_PATH=$public_path npx vue-cli-service build --mode oem1',
       defines: {
         NGINX_REPLACE_B: 'http://',
         NGINX_REPLACE_A: '替换了',
+        RIG_REPLACE_PUBLIC: '$public_path',
       },
       domain: 'cdn.rys.com',
     },
     'ykp/test/oem2': {
       // build: 'yarn build:test:oem2',
-      build: 'yarn build:oem2',
+      build: 'cross-env PUBLIC_PATH=$public_path npx vue-cli-service build --mode oem2',
       defines: {
         NGINX_REPLACE_B: 'http://',
         NGINX_REPLACE_A: '替换了',

package/demo/package.json

@@ -13,7 +13,9 @@
   },
   "dependencies": {
     "core-js": "^3.8.3",
-    "vue": "^2.6.14"
+    "vue": "^2.6.14",
+    "rig-test-1": "git+ssh://git@github.com:FlashHand/rig-test-1.git#1.0.1",
+    "rig-test-2": "git+ssh://git@github.com:FlashHand/rig-test-2.git#1.0.1"
   },
   "devDependencies": {
     "@babel/core": "^7.12.16",

package/demo/package.rig.json5

@@ -1,7 +1,12 @@
 [
-//  {
-//    name: "your project name",
-//    source: "git ssh url",
-//    version: "semver version(like 1.0.0)",
-//  },
+  {
+    name: "rig-test-1",
+    source: "git@github.com:FlashHand/rig-test-1.git",
+    version: "1.0.1",
+  },
+  {
+    name: "rig-test-2",
+    source: "git@github.com:FlashHand/rig-test-2.git",
+    version: "1.0.1",
+  },
 ]

package/lib/build/index.ts

@@ -1,26 +1,28 @@
-import fsHelper from '../utils/fsHelper';
 import CICD, {Define} from '@/classes/cicd/CICD';
 import CICDCmd from '@/classes/cicd/CICDCmd';
 import shell from 'shelljs';
 import path from 'path';
 import fs from 'fs';
-const replaceDefine = (target:string,defines?:Define)=>{
+
+const JSON5 = require('json5');
+
+const replaceDefine = (target: string, defines?: Define) => {
 	const dirs = fs.readdirSync(target);
-	for (let dir of dirs){
+	for (let dir of dirs) {
 		const stat = fs.statSync(path.join(target, dir));
-		if (stat.isDirectory()){
-			replaceDefine(path.join(target, dir),defines);
-		}else{
-			if (defines){
+		if (stat.isDirectory()) {
+			replaceDefine(path.join(target, dir), defines);
+		} else {
+			if (defines) {
 				const namePieces = dir.split('.');
 				const fileType = namePieces[namePieces.length - 1];
-				if (['js','ts'].indexOf(fileType)>=0){
+				if (['js', 'ts','html'].indexOf(fileType) >= 0) {
 					let file = fs.readFileSync(path.join(target, dir)).toString();
 					const replaceArr = Object.keys(defines);
-					for (let replace of replaceArr){
-						file = file.replace(new RegExp(replace,'g'),defines[replace] as string);
+					for (let replace of replaceArr) {
+						file = file.replace(new RegExp(replace, 'g'), defines[replace] as string);
 					}
-					fs.writeFileSync(path.join(target, dir),file);
+					fs.writeFileSync(path.join(target, dir), file);
 				}
 			}
 		}
@@ -34,10 +36,20 @@ export default async (cmd: any) => {
 	console.log(cicd)
 	//build by cicdCmd and cicdConfig
 	console.log(cicdCmd.endpoints);
-
+	const regexPublicPath = new RegExp('\\$public_path', 'g');
 	for (let i = 0; i < cicdCmd.endpoints.length; i++) {
 		const ep = cicdCmd.endpoints[i];
-		ep.build = ep.build.replace('${public_path}', ep.publicPath);
+
+		ep.build = ep.build.replace(regexPublicPath, ep.publicPath);
+		try {
+			//替换define中的$public_path
+			Object.keys(ep.defines).forEach(key=>{
+				ep.defines[key] = ep.defines[key].replace(regexPublicPath, ep.publicPath);
+			})
+		} catch (e) {
+			console.log('JSON5 error:', ep.defines,e.message);
+		}
+		console.log('exec build:', ep, ep.build, ep.defines);
 		shell.exec(ep.build);
 		replaceDefine(path.join(cicd.source.root_path, ep.dir), ep.defines);
 	}

package/lib/classes/cicd/CICD.ts

@@ -28,6 +28,7 @@ export interface DeployTarget {
 	root_path: '/';
 	uri_rewrite: {
 		original: string;
+		original_regexp: string;
 		final?: string;
 	};
 }

package/lib/classes/cicd/Deploy/AliDeploy.ts

@@ -1,50 +1,78 @@
-import aliOSS from "ali-oss";
-import fs from "fs";
-import { DeployTarget } from "../CICD";
+import aliOSS from 'ali-oss';
+import fs from 'fs';
+import {DeployTarget} from '../CICD';
+import os from 'os';
+import {cat} from 'shelljs';
+
 class AliOSS {
-  ossClient: aliOSS;
-  constructor(target: DeployTarget) {
-    this.ossClient = new aliOSS({
-      region: target.region,
-      accessKeyId: target.access_key,
-      accessKeySecret: target.access_secret,
-      bucket: target.bucket,
-      timeout: 600000,
-    });
-  }
-
-  private async progress(p: number, filePath: string, ossPath: string) {
-    // 上传进度。
-    process.stdout.clearLine(1);
-    process.stdout.cursorTo(0);
-    process.stdout.write(
-      `progress: ${p.toFixed(2)}%, Upload '${filePath}' To OSS_PATH:${ossPath}`
-    );
-  }
-
-  public async putStreamFiles(
-    filesList: string[],
-    ossBasePath: string,
-    dir: string
-  ) {
-    for (let i = 0; i < filesList.length; i++) {
-      const filePath = filesList[i].split("dist\\")[1];
-      const ossPath =
-        ossBasePath + filePath.replace(/\\/g, "/").replace(dir, "");
-      const fileResult = await this.ossClient.putStream(
-        ossPath,
-        fs.createReadStream(filesList[i])
+	ossClient: aliOSS;
+
+	constructor(target: DeployTarget) {
+		this.ossClient = new aliOSS({
+			region: target.region,
+			accessKeyId: target.access_key,
+			accessKeySecret: target.access_secret,
+			bucket: target.bucket,
+			timeout: 600000,
+		});
+	}
+
+	private async progress(p: number, filePath: string, ossPath: string) {
+		// 上传进度。
+		try {
+			process.stdout.clearLine(1);
+			process.stdout.cursorTo(0);
+		} catch (e) {
+
+		}
+		try{
+      process.stdout.write(
+        `progress: ${p.toFixed(2)}%, Upload '${filePath}' To OSS_PATH:${ossPath}`
       );
-      if (fileResult.res.status !== 200) {
-        throw new Error('Upload OSS Error')
-      }
-      // if (fileResult.res.status === 200) {
-      //   const p = ((i + 1) * 100) / filesList.length;
-      //   this.progress(p, filesList[i], ossPath);
-      // }
+    }catch (e) {
+      
     }
-    console.log("\n");
-  }
+
+	}
+
+	public async putStreamFiles(
+		filesList: string[],
+		ossBasePath: string,
+		dir: string,
+		rootPath: string
+	) {
+		for (let i = 0; i < filesList.length; i++) {
+			let filePath = '';
+			if (os.platform() === 'win32') {
+				filePath = filesList[i].split(`${rootPath}\\`)[1];
+			} else {
+				filePath = filesList[i].split(`${rootPath}/`)[1];
+			}
+			const ossPath =
+				ossBasePath + filePath.replace(/\\/g, '/').replace(dir, '');
+
+			//@ts-ignore
+			let options: aliOSS.PutStreamOptions = {
+				contentLength: fs.statSync(filesList[i]).size,
+			};
+			if (filesList[i].includes('index.html')) {
+				options = Object.assign({headers: {'Cache-Control': 'max-age=0'}});
+			}
+			const fileResult = await this.ossClient.putStream(
+				ossPath,
+				fs.createReadStream(filesList[i]),
+				options
+			);
+			if (fileResult.res.status !== 200) {
+				throw new Error('Upload OSS Error');
+			}
+			if (fileResult.res.status === 200) {
+				const p = ((i + 1) * 100) / filesList.length;
+				this.progress(p, filesList[i], ossPath);
+			}
+		}
+		console.log('\n');
+	}
 }
 
 export default AliOSS;

package/lib/classes/cicd/Deploy/CDN.ts

@@ -7,6 +7,14 @@ import { DeployTarget } from '../CICD';
 
 type TFlag = 'break' | 'enhance_break' | null;
 
+enum CDNInterfaceEnum {
+  BatchSetCdnDomainConfig = 'BatchSetCdnDomainConfig', //批量修改域名信息
+  RefreshObjectCaches = 'RefreshObjectCaches', //刷新节点上的文件内容
+  PushObjectCache = 'PushObjectCache', //预热CDN节点
+  DescribeRefreshTaskById = 'DescribeRefreshTaskById', //通过任务编号查询刷新预热任务信息
+  DescribeCdnDomainConfigs = 'DescribeCdnDomainConfigs', // 获取加速域名的配置信息
+}
+
 class CDN {
   AccessKeySecret: string;
   AccessKeyId: string;
@@ -100,7 +108,7 @@ class CDN {
         });
       });
 
-      const data = await this.getCdnData('BatchSetCdnDomainConfig', {
+      const data = await this.getCdnData(CDNInterfaceEnum.BatchSetCdnDomainConfig, {
         DomainNames: domainName,
         Functions: JSON.stringify(Functions),
       });
@@ -126,7 +134,7 @@ class CDN {
       if (objectType) {
         param = Object.assign(param, { ObjectType: objectType });
       }
-      const data = await this.getCdnData('RefreshObjectCaches', param);
+      const data = await this.getCdnData(CDNInterfaceEnum.RefreshObjectCaches, param);
       return data;
     } catch (e) {
       console.error('Error:');
@@ -141,7 +149,7 @@ class CDN {
    * @returns
    */
   async pushCache(objectPath: string) {
-    const data = await this.getCdnData('PushObjectCache', {
+    const data = await this.getCdnData(CDNInterfaceEnum.PushObjectCache, {
       ObjectPath: objectPath,
     });
     return data;
@@ -154,7 +162,7 @@ class CDN {
    */
   async describeRefreshTaskById(taskIds: string) {
     try {
-      const data = await this.getCdnData('DescribeRefreshTaskById', {
+      const data = await this.getCdnData(CDNInterfaceEnum.DescribeRefreshTaskById, {
         TaskId: taskIds,
       });
       return data;
@@ -166,14 +174,14 @@ class CDN {
   }
 
   /**
-   * 刷新CDN节点
+   * 获取加速域名的配置信息
    * @param {加速域名} domainName
    * @param {功能配置ID} configId
    * @returns
    */
   async describeCdnDomainConfigs(domainName: string, configId?: string) {
     try {
-      const data = await this.getCdnData('DescribeCdnDomainConfigs', {
+      const data = await this.getCdnData(CDNInterfaceEnum.DescribeCdnDomainConfigs, {
         DomainName: domainName,
         ConfigId: configId,
       });

package/lib/classes/cicd/Endpoint.ts

@@ -7,6 +7,10 @@ interface EndpointInfo {
 	target: string;
 	domain: string;
 	defines: Define;
+	uri_rewrite: {
+		original: string,
+		original_regexp: string;
+	}
 }
 
 export interface EndpointDict {
@@ -24,6 +28,10 @@ class Endpoint {
 
 	publicPath: string = '';
 	defines: Define;
+	uri_rewrite: {
+		original: string,
+		original_regexp: string;
+	} | undefined ;
 
 
 	constructor(dir: string, info: EndpointInfo, schema: DirLevel[]) {
@@ -36,6 +44,7 @@ class Endpoint {
 		this.build = info.build;
 		this.domain = info.domain;
 		this.defines = info.defines;
+		this.uri_rewrite = info.uri_rewrite;
 	}
 
 

package/lib/deploy/index.ts

@@ -27,6 +27,7 @@ export default async (cmd: any) => {
     const cicd = CICD.createByDefault(cmd);
     //construct cmd object
     const cicdCmd = new CICDCmd(cmd, cicd);
+    console.log('cicdCmd:', cicdCmd.endpoints);
 
     const target = Array.isArray(cicdCmd.cicd.target)
       ? cicdCmd.cicd.target[0]
@@ -44,7 +45,8 @@ export default async (cmd: any) => {
       await aliOss.putStreamFiles(
         filesList,
         cicdCmd.endpoints[i].deployDir.replace(/\\/g, '/'),
-        cicdCmd.endpoints[i].dir
+        cicdCmd.endpoints[i].dir,
+        cicd.source.root_path,
       );
       filesList = [];
     }

package/lib/preinstall/index.js

@@ -8,126 +8,178 @@ const shell = require('shelljs');
 const fs = require('fs');
 const json5 = require('json5');
 const print = require('../print');
-let semverReg = /^([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+[0-9A-Za-z-]+)?$/;
+const path = require('path');
+// let semverReg = /^([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+[0-9A-Za-z-]+)?$/;
 let gitUrlReg = /(?:git|ssh|https?|git@[-\w.]+):(\/\/)?(.*?)(\.git)(\/?|\#[-\d\w._]+?)$/;
 const validateName = (name) => {
-  if (name) {
-    return true;
-  } else {
-    print.error(`name value(${name}) invalidate！`);
-    return false;
-  }
+	if (name) {
+		return true;
+	} else {
+		print.error(`name value(${name}) invalidate！`);
+		return false;
+	}
 }
 const validateSource = (source) => {
-  let isValidate;
-  try {
-    isValidate = gitUrlReg.test(source);
-  } catch (e) {
-    isValidate = false;
-    print.error(e.message);
-  }
-  if (!isValidate) {
-    print.error(`source value(${source}) invalidate！`);
-  }
-  return isValidate;
+	let isValidate;
+	try {
+		isValidate = gitUrlReg.test(source);
+	} catch (e) {
+		isValidate = false;
+		print.error(e.message);
+	}
+	if (!isValidate) {
+		print.error(`source value(${source}) invalidate！`);
+	}
+	return isValidate;
 }
 const validateVersion = (version) => {
-  let isValidate;
-  try {
-    isValidate = semverReg.test(version);
-  } catch (e) {
-    isValidate = false;
-    print.error(e.message);
-  }
-  if (!isValidate) {
-    print.error(`version value(${version}) invalidate！`);
-  }
-  return isValidate;
+	let isValidate;
+	try {
+		isValidate = version.length > 0;
+	} catch (e) {
+		isValidate = false;
+		print.error(e.message);
+	}
+	if (!isValidate) {
+		print.error(`version value(${version}) invalidate！`);
+	}
+	return isValidate;
 }
 const validate = (rigJson5) => {
-  let isValidate = true;
-  try {
-    for (let dep of rigJson5) {
-      if (!(validateName(dep.name) && validateSource(dep.source) && validateVersion(dep.version))) {
-        isValidate = false;
-        print.error(`!INVALID CONFIG!:${JSON.stringify(dep)}`);
-        break;
-      }
-    }
-  } catch (e) {
-    print.error(e.message);
-    isValidate = false;
-  }
-  if (!isValidate) {
-    print.info(`Visit https://github.com/FlashHand/rig for documentation`);
-  }
-  return isValidate;
+	let isValidate = true;
+	try {
+		for (let dep of rigJson5) {
+			if (!(validateName(dep.name) && validateSource(dep.source) && validateVersion(dep.version))) {
+				isValidate = false;
+				print.error(`!INVALID CONFIG!:${JSON.stringify(dep)}`);
+				break;
+			}
+		}
+	} catch (e) {
+		print.error(e.message);
+		isValidate = false;
+	}
+	if (!isValidate) {
+		print.info(`Visit https://github.com/FlashHand/rig for documentation`);
+	}
+	return isValidate;
 }
 const clone = (target, dep) => {
-  print.info(`cloning ${dep.name}`);
-  let cloneProcess = shell.exec(`git clone ${dep.source} ${target}/${dep.name}`,
-    {silent: true}
-  );
-  if (cloneProcess.stderr && !fs.existsSync(`${target}/${dep.name}`)) {
-    print.error(`clone failed:${dep.source}`);
-    print.error(cloneProcess.stderr);
-    process.exit(1);
-  }
+	print.info(`cloning ${dep.name}`);
+	let cloneProcess = shell.exec(`git clone ${dep.source} ${target}/${dep.name}`,
+		{silent: true}
+	);
+	if (cloneProcess.stderr && !fs.existsSync(`${target}/${dep.name}`)) {
+		print.error(`clone failed:${dep.source}`);
+		print.error(cloneProcess.stderr);
+		process.exit(1);
+	}
+}
+const checkDepsValid = (rigJson5) => {
+	// git show origin/master:package.json
+// ➜  projects git show tags/2.0.1:package.json
+	for (let rig of rigJson5) {
+		try {
+			const cmd = `git fetch  ${rig.source} --tag ${rig.version} -n && git show FETCH_HEAD:package.json`;
+			console.log(cmd);
+			let showPackageProcess = shell.exec(cmd,
+				{silent: true}
+			);
+			let pkgStr = showPackageProcess.stdout.trim();
+			const pkg = JSON.parse(pkgStr);
+			console.log(pkgStr);
+			//获取rig依赖
+			if (pkg.rig){
+				const rigConfig = pkg.rig;
+				//遍历rig依赖
+				Object.keys(rigConfig).forEach(key => {
+					//获取该rig依赖的要求的版本范围
+					let max='';
+					let min = '';
+					if (Array.isArray(rigConfig[key]) ) {
+						//使用数组的情况
+						if (rigConfig[key].length === 2){
+							console.log('array\'s length must equal to 2!');
+							process.exit(1);
+						}else{
+							min = rigConfig[key][0]
+							max = rigConfig[key][1];
+						}
+					} else {
+						//使用字典的情况
+						min = rigConfig[key]['min'];
+						max = rigConfig[key]['max'];
+					}
+					//从rigJson5获取该依赖的版本号
+					const dep = rigJson5.find(r => r.name === key);
+					if (dep){
+
+					}else{
+						console.log(`${key}[${min},${max}] is required`);
+						process.exit(1);
+					}
+				})
+			}
+		} catch (e) {
+			console.log(e);
+		}
+	}
 }
 //加载命令控制器
 const load = async (cmd) => {
-  print.info('start rig preinstall');
-  try {
-    //读取package.rig.json5
-    let rigJson5Str = fs.readFileSync('package.rig.json5');
-    let rigJson5 = json5.parse(rigJson5Str);
-    if (!validate(rigJson5)) process.exit(1);
-    //重置rigs
-    if (!(fs.existsSync('./rigs') && fs.lstatSync('./rigs').isDirectory())) {
-      print.info('create folder rigs');
-      fs.mkdirSync('rigs');
-      fs.writeFileSync('rigs/.gitkeep', '')
-    }
-    shell.chmod('777', 'rigs');
-    let target = 'rigs';
-    let pkgJson = JSON.parse(fs.readFileSync('package.json').toString());
-    let dependencies = pkgJson['dependencies'];
-    /**
-     * 核心原则
-     * 1. install 不应该覆盖或删除已经clone到rigs下的模块，由开发者自己选择要不要删
-     * 2. rigs下的模块更新，由开发者自己git操作解决。
-     */
-    for (let dep of rigJson5) {
-      if (dep.dev) {
-        //不去覆盖已下载的库
-        if (fs.existsSync(`${target}/${dep.name}`)) {
-          print.info(`${dep.name} already exists.`);
-        } else {
-          clone(target, dep);
-        }
-      } else {
-        //不是开发中状态,不处理，不去删除已下载的模块
-        //预安装时在node_modules中要先清除json5里的库
-        if (fs.existsSync(`node_modules/${dep.name}`)) {
-          shell.rm('-rf', `node_modules/${dep.name}`);
-        }
-        if (fs.existsSync(`node_modules/.yarn-integrity`)) {
-          shell.rm('-rf', `node_modules/.yarn-integrity`);
-        }
-      }
-      dependencies[dep.name] = `git+ssh://${dep.source}#${dep.version}`
-    }
-    //覆盖package.json
-    pkgJson.dependencies = dependencies;
-    fs.writeFileSync('package.json', JSON.stringify(pkgJson, null, 2));
-    //收尾
-    print.succeed(`preinstall SUCCEED! Will do "yarn install"`);
-    //远程链接设置完成，开发库设置完成，准备执行yarn install
-  } catch (e) {
-    print.error(e.message);
-  }
+	print.info('start rig preinstall');
+	try {
+		//读取package.rig.json5
+		let rigJson5Str = fs.readFileSync(path.join(process.cwd(), 'package.rig.json5'));
+		let rigJson5 = json5.parse(rigJson5Str);
+		if (!validate(rigJson5)) process.exit(1);
+		checkDepsValid(rigJson5);
+		//重置rigs
+		if (!(fs.existsSync('./rigs') && fs.lstatSync('./rigs').isDirectory())) {
+			print.info('create folder rigs');
+			fs.mkdirSync('rigs');
+			fs.writeFileSync('rigs/.gitkeep', '')
+		}
+		shell.chmod('777', 'rigs');
+		let target = 'rigs';
+		let pkgJson = JSON.parse(fs.readFileSync('package.json').toString());
+		let dependencies = pkgJson['dependencies'];
+		/**
+		 * 核心原则
+		 * 1. install 不应该覆盖或删除已经clone到rigs下的模块，由开发者自己选择要不要删
+		 * 2. rigs下的模块更新，由开发者自己git操作解决。
+		 */
+		for (let dep of rigJson5) {
+			if (dep.dev) {
+				//不去覆盖已下载的库
+				if (fs.existsSync(`${target}/${dep.name}`)) {
+					print.info(`${dep.name} already exists.`);
+				} else {
+					clone(target, dep);
+				}
+			} else {
+				//不是开发中状态,不处理，不去删除已下载的模块
+				//预安装时在node_modules中要先清除json5里的库
+				if (fs.existsSync(`node_modules/${dep.name}`)) {
+					shell.rm('-rf', `node_modules/${dep.name}`);
+				}
+				if (fs.existsSync(`node_modules/.yarn-integrity`)) {
+					shell.rm('-rf', `node_modules/.yarn-integrity`);
+				}
+			}
+			dependencies[dep.name] = `git+ssh://${dep.source}#${dep.version}`
+		}
+		//覆盖package.json
+		pkgJson.dependencies = dependencies;
+		fs.writeFileSync('package.json', JSON.stringify(pkgJson, null, 2));
+		//收尾
+		print.succeed(`preinstall SUCCEED! Will do "yarn install"`);
+		//远程链接设置完成，开发库设置完成，准备执行yarn install
+	} catch (e) {
+		print.error(e.message);
+	}
 }
 module.exports = {
-  name: 'install',
-  load
+	name: 'install',
+	load
 }