rigjs 2.0.0-alpha.9 → 2.0.3

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,11 +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);
-		console.log('exec build:', ep.build);
+
+		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;
@@ -69,7 +77,7 @@ class CDN {
    * @param {改写操作执行规则 数组 值为null、break或enhance_break} flags
    * @returns
    */
-  public async setRWriteUri(
+  public async setRewriteUri(
     domainName: string,
     sourceUrls: string[],
     targetUrls: 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

@@ -1,31 +1,47 @@
-import {CICDConfig, Define, DefineDict, DeployTarget, DirGroup} from './CICD';
-import {mkdirSync} from 'fs';
+import { CICDConfig, Define, DefineDict, DeployTarget, DirGroup } from './CICD';
+import { mkdirSync } from 'fs';
 import DirLevel from '@/classes/cicd/DirLevel';
 
 interface EndpointInfo {
-	build: string;
-	target: string;
-	domain: string;
-	defines: Define;
+  build: string;
+  target: string;
+  domain: string;
+  defines: Define;
+  uri_rewrite: {
+    original: string;
+    original_regexp: string;
+    final?: string;
+  };
 }
 
 export interface EndpointDict {
-	[dir: string]: EndpointInfo;
+  [dir: string]: EndpointInfo;
 }
 
 class Endpoint {
-	dir: string;
-	dirStrArr: string[];
-	dirArr: DirLevel[];
-	target: string;
-	build: string;
-	domain: string;
-	deployDir: string = '';
+  dir: string;
+  dirStrArr: string[];
+  dirArr: DirLevel[];
+  target: string;
+  build: string;
+  domain: string;
+  deployDir: string = '';
 
 	publicPath: string = '';
 	defines: Define;
+	uri_rewrite: {
+		original: string,
+		original_regexp: string;
+		final?: string;
+	} | undefined ;
 
-
+  static createEndpointArr(cicdConfig: CICDConfig, schema: DirLevel[]) {
+    const endpointDict = cicdConfig.endpoints;
+    return Object.keys(endpointDict).map((dir) => {
+      const info = endpointDict[dir];
+      return new Endpoint(dir, info, schema);
+    });
+  }
 	constructor(dir: string, info: EndpointInfo, schema: DirLevel[]) {
 		this.dir = dir;
 		this.deployDir = dir;
@@ -36,56 +52,47 @@ class Endpoint {
 		this.build = info.build;
 		this.domain = info.domain;
 		this.defines = info.defines;
+		this.uri_rewrite = info.uri_rewrite;
 	}
 
-
-	static createEndpointArr(cicdConfig: CICDConfig, schema: DirLevel[]) {
-		const endpointDict = cicdConfig.endpoints;
-		return Object.keys(endpointDict).map(dir => {
-			const info = endpointDict[dir];
-			return new Endpoint(dir, info, schema);
-		});
-	}
-
-	matchCmd(dirSchemaStrArr: string[], groups: DirGroup[]) {
-		if (this.dirStrArr.length < dirSchemaStrArr.length) {
-			return false;
-		}
-		for (let i = 0; i < dirSchemaStrArr.length; i++) {
-			const cmdDir = dirSchemaStrArr[i];
-			const dir = this.dirStrArr[i];
-			const dirLevel = this.dirArr[i];
-			//check if dir is wildcard
-			if (cmdDir !== '%') {
-				//not wildcard
-				//check if dir is group alias
-				if (cmdDir.indexOf('%') === 0) {
-					//dir is group
-					//find group
-					const group = groups.find(g => g.name === cmdDir);
-					if (group) {
-						//group found
-						//check if group includes this dir
-						if (group.includes.indexOf(dir) < 0) {
-							//not include
-							return false;
-						}
-					} else {
-						return false;
-					}
-
-				} else {
-					//cmdDir is not group
-					if (cmdDir !== dir) {
-						return false;
-					}
-				}
-			} else {
-				if (!dirLevel.dynamic) return false;
-			}
-		}
-		return true;
-	}
+  matchCmd(dirSchemaStrArr: string[], groups: DirGroup[]) {
+    if (this.dirStrArr.length < dirSchemaStrArr.length) {
+      return false;
+    }
+    for (let i = 0; i < dirSchemaStrArr.length; i++) {
+      const cmdDir = dirSchemaStrArr[i];
+      const dir = this.dirStrArr[i];
+      const dirLevel = this.dirArr[i];
+      //check if dir is wildcard
+      if (cmdDir !== '%') {
+        //not wildcard
+        //check if dir is group alias
+        if (cmdDir.indexOf('%') === 0) {
+          //dir is group
+          //find group
+          const group = groups.find((g) => g.name === cmdDir);
+          if (group) {
+            //group found
+            //check if group includes this dir
+            if (group.includes.indexOf(dir) < 0) {
+              //not include
+              return false;
+            }
+          } else {
+            return false;
+          }
+        } else {
+          //cmdDir is not group
+          if (cmdDir !== dir) {
+            return false;
+          }
+        }
+      } else {
+        if (!dirLevel.dynamic) return false;
+      }
+    }
+    return true;
+  }
 }
 
 export default Endpoint;

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 = [];
     }