rigjs 2.0.0-alpha.2 → 2.0.0-alpha.22

package/demo/cicd.rig.json5

@@ -12,26 +12,27 @@
     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: 'ci-test.rys.com',
+      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: '替换了',
       },
-      domain: 'ci-test.rys.com'
+      domain: 'cdn.rys.com'
     },
   },
   groups: [

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/demo/src/App.vue

@@ -2,6 +2,7 @@
   <div id="app">
     <img alt="Vue logo" src="./assets/logo.png">
     <HelloWorld msg="Welcome to Your Vue.js App"/>
+		<span>test_replace:{{ test_replace}}</span>
   </div>
 </template>
 
@@ -10,6 +11,11 @@ import HelloWorld from './components/HelloWorld.vue'
 
 export default {
   name: 'App',
+	data() {
+		return {
+			test_replace: 'NGINX_REPLACE_A'
+		}
+	},
   components: {
     HelloWorld
   }

package/lib/build/index.ts

@@ -1,9 +1,34 @@
 import fsHelper from '../utils/fsHelper';
-import CICD from '@/classes/cicd/CICD';
+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 JSON5 = require('json5');
+
+const replaceDefine = (target: string, defines?: Define) => {
+	const dirs = fs.readdirSync(target);
+	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) {
+				const namePieces = dir.split('.');
+				const fileType = namePieces[namePieces.length - 1];
+				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);
+					}
+					fs.writeFileSync(path.join(target, dir), file);
+				}
+			}
+		}
+	}
+}
 export default async (cmd: any) => {
 	//create cicd object
 	const cicd = CICD.createByDefault(cmd);
@@ -12,10 +37,21 @@ 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];
-		const cmdStr = `cross-env PUBLIC_PATH=${path.join('/',ep.deployDir)} ${ep.build}`;
-		console.log(cmdStr);
-		shell.exec(cmdStr);
+
+		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

@@ -18,7 +18,7 @@ interface DeploySource {
 /**
  * Deploy target
  */
-interface DeployTarget {
+export interface DeployTarget {
 	id: string;
 	type: CloudType;
 	bucket: string;
@@ -28,6 +28,7 @@ interface DeployTarget {
 	root_path: '/';
 	uri_rewrite: {
 		original: string;
+		original_regexp: string;
 		final?: string;
 	};
 }

package/lib/classes/cicd/CICDCmd.ts

@@ -55,6 +55,7 @@ class CICDCmd {
 			const sufDir = this.dirStrArr.slice(this.dirInSchemaStrArr.length, this.dirStrArr.length).join('/');
 			this.endpoints = this.endpoints.map(ep => {
 				ep.deployDir = path.join(ep.deployDir, sufDir);
+				ep.publicPath = ep.deployDir;
 				return ep;
 			});
 		}

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

@@ -1,20 +1,22 @@
-import aliOSS from "ali-oss";
-import fs from "fs";
+import aliOSS from 'ali-oss';
+import fs from 'fs';
+import { DeployTarget } from '../CICD';
+import os from 'os';
 class AliOSS {
   ossClient: aliOSS;
-  constructor(accessKeyId: string, accessKeySecret: string, region: string, bucket: string) {
+  constructor(target: DeployTarget) {
     this.ossClient = new aliOSS({
-      region,
-      accessKeyId: accessKeyId,
-      accessKeySecret: accessKeySecret,
-      bucket,
+      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.clearLine(1);
     process.stdout.cursorTo(0);
     process.stdout.write(
       `progress: ${p.toFixed(2)}%, Upload '${filePath}' To OSS_PATH:${ossPath}`
@@ -24,22 +26,40 @@ class AliOSS {
   public async putStreamFiles(
     filesList: string[],
     ossBasePath: string,
-    dir: string
+    dir: string,
+    rootPath: string
   ) {
     for (let i = 0; i < filesList.length; i++) {
-      const filePath = filesList[i].split("dist\\")[1];
+      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, "");
+        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])
+        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");
+    console.log('\n');
   }
 }
 

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

@@ -1,17 +1,26 @@
-import moment from "dayjs";
-import qs from "qs";
-import crypto from "crypto";
-import axios from "axios";
-import * as uuid from "uuid";
+import moment from 'dayjs';
+import qs from 'qs';
+import crypto from 'crypto';
+import axios from 'axios';
+import * as uuid from 'uuid';
+import { DeployTarget } from '../CICD';
 
-type TFlag = "break" | "enhance_break" | null;
+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;
-  constructor(AccessKeyId: string, AccessKeySecret: string) {
-    this.AccessKeySecret = AccessKeySecret;
-    this.AccessKeyId = AccessKeyId;
+  constructor(target: DeployTarget) {
+    this.AccessKeyId = target.access_key;
+    this.AccessKeySecret = target.access_secret;
   }
   /**
    * 访问CDN通用接口
@@ -22,31 +31,39 @@ class CDN {
   private async getCdnData(actionName: string, paramObj: Object) {
     let config = {
       Action: actionName,
-      Format: "JSON",
-      Version: "2018-05-10",
+      Format: 'JSON',
+      Version: '2018-05-10',
       AccessKeyId: this.AccessKeyId,
-      SignatureMethod: "HMAC-SHA1",
+      SignatureMethod: 'HMAC-SHA1',
       Timestamp: moment().toDate().toISOString(),
-      SignatureVersion: "1.0",
+      SignatureVersion: '1.0',
       SignatureNonce: uuid.v1(),
     };
     config = Object.assign(config, paramObj);
     let paramConfig = qs.stringify(config, {
-      sort: (a: number, b: number) => {
+      sort: (a: any, b: any) => {
         return a < b ? -1 : 1;
       },
-      charset: "utf-8",
+      charset: 'utf-8',
     });
 
     const strSign = `GET&%2F&${encodeURIComponent(paramConfig)}`;
-    console.log(`strSign: ${strSign}`);
-    const hmacSha1 = crypto.createHmac("sha1", this.AccessKeySecret);
+    // console.log(`strSign: ${strSign}\n`);
+    const hmacSha1 = crypto.createHmac('sha1', `${this.AccessKeySecret}&`);
     hmacSha1.update(strSign);
-    const signature = hmacSha1.digest("base64");
-    paramConfig += `&Signature=${signature}`;
+    const signature = hmacSha1.digest('base64');
+    config = Object.assign(config, {
+      Signature: signature,
+    });
+    paramConfig = qs.stringify(config, {
+      sort: (a, b) => {
+        return a < b ? -1 : 1;
+      },
+      charset: 'utf-8',
+      format: 'RFC3986',
+    });
 
     const url = `http://cdn.aliyuncs.com?${paramConfig}`;
-    console.log(url);
 
     const res = await axios.create().get(url);
     return res.data;
@@ -66,35 +83,42 @@ class CDN {
     targetUrls: string[],
     flags: TFlag[]
   ) {
-    if (sourceUrls.length !== targetUrls.length) {
-      throw new Error(`sourceUrls's length not equal targetUrls's length`);
-    }
-    const Functions: Object[] = [];
-    sourceUrls.forEach((item, index) => {
-      Functions.push({
-        functionArgs: [
-          {
-            argName: "source_url",
-            argValue: item,
-          },
-          {
-            argName: "target_url",
-            argValue: targetUrls[index],
-          },
-          {
-            argName: "flag",
-            argValue: flags[index],
-          },
-        ],
-        functionName: "back_to_origin_url_rewrite",
+    try {
+      if (sourceUrls.length !== targetUrls.length) {
+        throw new Error(`sourceUrls's length not equal targetUrls's length`);
+      }
+      const Functions: Object[] = [];
+      sourceUrls.forEach((item, index) => {
+        Functions.push({
+          functionArgs: [
+            {
+              argName: 'source_url',
+              argValue: item,
+            },
+            {
+              argName: 'target_url',
+              argValue: targetUrls[index],
+            },
+            {
+              argName: 'flag',
+              argValue: flags[index],
+            },
+          ],
+          functionName: 'back_to_origin_url_rewrite',
+        });
       });
-    });
 
-    const data = await this.getCdnData("BatchSetCdnDomainConfig", {
-      DomainNames: domainName,
-      Functions: JSON.stringify(Functions),
-    });
-    return data;
+      const data = await this.getCdnData(CDNInterfaceEnum.BatchSetCdnDomainConfig, {
+        DomainNames: domainName,
+        Functions: JSON.stringify(Functions),
+      });
+      return data;
+    } catch (e) {
+      console.error(
+        `Error: ${e.response ? JSON.stringify(e.response.data.Message) : e}`
+      );
+      throw new Error(e.response.data.Message);
+    }
   }
 
   /**
@@ -102,12 +126,21 @@ class CDN {
    * @param {刷新URL, 格式为加速域名或刷新的文件或目录。多个URL之间使用换行符(\n)或(\r\n)分隔} objectPath
    * @param {刷新的类型 File: 文件; Directory: 目录} objectType
    */
-  public async refreshCache(objectPath: string, objectType: string) {
-    const data = await this.getCdnData("RefreshObjectCaches", {
-      ObjectPath: objectPath,
-      ObjectType: objectType ? objectType : undefined,
-    });
-    return data;
+  public async refreshCache(objectPath: string, objectType?: string) {
+    try {
+      let param = {
+        ObjectPath: objectPath,
+      };
+      if (objectType) {
+        param = Object.assign(param, { ObjectType: objectType });
+      }
+      const data = await this.getCdnData(CDNInterfaceEnum.RefreshObjectCaches, param);
+      return data;
+    } catch (e) {
+      console.error('Error:');
+      console.error(e.response.data.Message);
+      throw new Error(e.response.data.Message);
+    }
   }
 
   /**
@@ -116,11 +149,49 @@ class CDN {
    * @returns
    */
   async pushCache(objectPath: string) {
-    const data = await this.getCdnData("PushObjectCache", {
+    const data = await this.getCdnData(CDNInterfaceEnum.PushObjectCache, {
       ObjectPath: objectPath,
     });
     return data;
   }
+
+  /**
+   * 通过任务编号查询刷新预热任务信息
+   * @param {支持同时传入多个任务ID，多个任务ID之间用英文逗号（,）分隔，最多支持同时传入10个任务ID} taskIds
+   * @returns
+   */
+  async describeRefreshTaskById(taskIds: string) {
+    try {
+      const data = await this.getCdnData(CDNInterfaceEnum.DescribeRefreshTaskById, {
+        TaskId: taskIds,
+      });
+      return data;
+    } catch (e) {
+      console.error('Error:');
+      console.error(e.response.data.Message);
+      throw new Error(e.response.data.Message);
+    }
+  }
+
+  /**
+   * 获取加速域名的配置信息
+   * @param {加速域名} domainName
+   * @param {功能配置ID} configId
+   * @returns
+   */
+  async describeCdnDomainConfigs(domainName: string, configId?: string) {
+    try {
+      const data = await this.getCdnData(CDNInterfaceEnum.DescribeCdnDomainConfigs, {
+        DomainName: domainName,
+        ConfigId: configId,
+      });
+      return data;
+    } catch (e) {
+      console.error('Error:');
+      console.error(e.response.data.Message);
+      throw new Error(e.response.data.Message);
+    }
+  }
 }
 
 export default CDN;

package/lib/classes/cicd/Endpoint.ts

@@ -1,4 +1,4 @@
-import {CICDConfig, DefineDict, DirGroup} from './CICD';
+import {CICDConfig, Define, DefineDict, DeployTarget, DirGroup} from './CICD';
 import {mkdirSync} from 'fs';
 import DirLevel from '@/classes/cicd/DirLevel';
 
@@ -6,7 +6,7 @@ interface EndpointInfo {
 	build: string;
 	target: string;
 	domain: string;
-	define: DefineDict;
+	defines: Define;
 }
 
 export interface EndpointDict {
@@ -20,21 +20,25 @@ class Endpoint {
 	target: string;
 	build: string;
 	domain: string;
-	deployDir: string;
-	define: DefineDict;
+	deployDir: string = '';
+
+	publicPath: string = '';
+	defines: Define;
 
 
 	constructor(dir: string, info: EndpointInfo, schema: DirLevel[]) {
 		this.dir = dir;
 		this.deployDir = dir;
+		this.publicPath = dir;
 		this.dirStrArr = dir.split('/').filter(d => d.length > 0);
 		this.dirArr = DirLevel.createDirArr(dir, schema);
 		this.target = info.target;
 		this.build = info.build;
 		this.domain = info.domain;
-		this.define = info.define;
+		this.defines = info.defines;
 	}
 
+
 	static createEndpointArr(cicdConfig: CICDConfig, schema: DirLevel[]) {
 		const endpointDict = cicdConfig.endpoints;
 		return Object.keys(endpointDict).map(dir => {

package/lib/deploy/index.ts

@@ -1,9 +1,9 @@
-import fs from "fs";
-import path from "path";
-import CICD from "@/classes/cicd/CICD";
-import CICDCmd from "@/classes/cicd/CICDCmd";
-import AliOSS from "@/classes/cicd/Deploy/AliDeploy";
-import CDN from "@/classes/cicd/Deploy/CDN";
+import fs from 'fs';
+import path from 'path';
+import CICD from '@/classes/cicd/CICD';
+import CICDCmd from '@/classes/cicd/CICDCmd';
+import AliOSS from '@/classes/cicd/Deploy/AliDeploy';
+import CDN from '@/classes/cicd/Deploy/CDN';
 
 let filesList: string[] = [];
 const traverseFolder = (url: string) => {
@@ -22,17 +22,19 @@ const traverseFolder = (url: string) => {
 
 export default async (cmd: any) => {
   try {
+    console.log('Start Deploy-----');
     //create cicd object
     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]
       : cicdCmd.cicd.target;
 
-    const aliOss = new AliOSS(target.access_key, target.access_secret, target.region, target.bucket);
-    const cdn = new CDN(target.access_key, target.access_secret);
+    const aliOss = new AliOSS(target);
+    console.log('Please Wait for Upload OSS...');
     for (let i = 0; i < cicdCmd.endpoints.length; i++) {
       const distPath = path.join(
         process.cwd(),
@@ -42,18 +44,14 @@ export default async (cmd: any) => {
       traverseFolder(distPath);
       await aliOss.putStreamFiles(
         filesList,
-        cicdCmd.endpoints[i].deployDir.replace(/\\/g, "/"),
-        cicdCmd.endpoints[i].dir
+        cicdCmd.endpoints[i].deployDir.replace(/\\/g, '/'),
+        cicdCmd.endpoints[i].dir,
+        cicd.source.root_path,
       );
-
-    //   await cdn.setRWriteUri(
-    //     cicdCmd.endpoints[i].domain,
-    //     [""],
-    //     [""],
-    //     ["break"]
-    //   );
       filesList = [];
     }
+    console.log('Upload OSS Done');
+    console.log('Deploy Done-----');
   } catch (e) {
     throw e;
   }