rigjs 2.0.0-alpha → 2.0.0-alpha.2

package/lib/build/index.ts

@@ -2,16 +2,20 @@ import fsHelper from '../utils/fsHelper';
 import CICD from '@/classes/cicd/CICD';
 import CICDCmd from '@/classes/cicd/CICDCmd';
 import shell from 'shelljs';
+import path from 'path';
 
 export default async (cmd: any) => {
 	//create cicd object
 	const cicd = CICD.createByDefault(cmd);
 	//construct cmd object
 	const cicdCmd = new CICDCmd(cmd, cicd);
+	console.log(cicd)
 	//build by cicdCmd and cicdConfig
 	console.log(cicdCmd.endpoints);
 	for (let i = 0; i < cicdCmd.endpoints.length; i++) {
 		const ep = cicdCmd.endpoints[i];
-		shell.exec(ep.build);
+		const cmdStr = `cross-env PUBLIC_PATH=${path.join('/',ep.deployDir)} ${ep.build}`;
+		console.log(cmdStr);
+		shell.exec(cmdStr);
 	}
 }

package/lib/classes/cicd/CICD.ts

@@ -1,9 +1,6 @@
 import DirLevel from '@/classes/cicd/DirLevel';
 import Endpoint, { EndpointDict} from '@/classes/cicd/Endpoint';
 import fs from 'fs';
-import {Dir} from 'fs';
-import fsHelper from '@/utils/fsHelper';
-import CICDCmd from '@/classes/cicd/CICDCmd';
 
 const JSON5 = require('json5');
 import qs from 'querystring';
@@ -25,9 +22,14 @@ interface DeployTarget {
 	id: string;
 	type: CloudType;
 	bucket: string;
+	region: string;
 	access_key: string;
 	access_secret: string;
 	root_path: '/';
+	uri_rewrite: {
+		original: string;
+		final?: string;
+	};
 }
 
 /**

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

@@ -0,0 +1,46 @@
+import aliOSS from "ali-oss";
+import fs from "fs";
+class AliOSS {
+  ossClient: aliOSS;
+  constructor(accessKeyId: string, accessKeySecret: string, region: string, bucket: string) {
+    this.ossClient = new aliOSS({
+      region,
+      accessKeyId: accessKeyId,
+      accessKeySecret: accessKeySecret,
+      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])
+      );
+      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

@@ -0,0 +1,126 @@
+import moment from "dayjs";
+import qs from "qs";
+import crypto from "crypto";
+import axios from "axios";
+import * as uuid from "uuid";
+
+type TFlag = "break" | "enhance_break" | null;
+
+class CDN {
+  AccessKeySecret: string;
+  AccessKeyId: string;
+  constructor(AccessKeyId: string, AccessKeySecret: string) {
+    this.AccessKeySecret = AccessKeySecret;
+    this.AccessKeyId = AccessKeyId;
+  }
+  /**
+   * 访问CDN通用接口
+   * @param {接口名称} actionName
+   * @param {各接口定制化参数} paramObj
+   * @returns
+   */
+  private async getCdnData(actionName: string, paramObj: Object) {
+    let config = {
+      Action: actionName,
+      Format: "JSON",
+      Version: "2018-05-10",
+      AccessKeyId: this.AccessKeyId,
+      SignatureMethod: "HMAC-SHA1",
+      Timestamp: moment().toDate().toISOString(),
+      SignatureVersion: "1.0",
+      SignatureNonce: uuid.v1(),
+    };
+    config = Object.assign(config, paramObj);
+    let paramConfig = qs.stringify(config, {
+      sort: (a: number, b: number) => {
+        return a < b ? -1 : 1;
+      },
+      charset: "utf-8",
+    });
+
+    const strSign = `GET&%2F&${encodeURIComponent(paramConfig)}`;
+    console.log(`strSign: ${strSign}`);
+    const hmacSha1 = crypto.createHmac("sha1", this.AccessKeySecret);
+    hmacSha1.update(strSign);
+    const signature = hmacSha1.digest("base64");
+    paramConfig += `&Signature=${signature}`;
+
+    const url = `http://cdn.aliyuncs.com?${paramConfig}`;
+    console.log(url);
+
+    const res = await axios.create().get(url);
+    return res.data;
+  }
+
+  /**
+   * 改写回源URI接口
+   * @param {加速域名} domainName
+   * @param {需要重写的url 数组} sourceUrls
+   * @param {重写目标url 数组} targetUrls
+   * @param {改写操作执行规则 数组 值为null、break或enhance_break} flags
+   * @returns
+   */
+  public async setRWriteUri(
+    domainName: string,
+    sourceUrls: string[],
+    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",
+      });
+    });
+
+    const data = await this.getCdnData("BatchSetCdnDomainConfig", {
+      DomainNames: domainName,
+      Functions: JSON.stringify(Functions),
+    });
+    return data;
+  }
+
+  /**
+   * 刷新节点上的文件内容
+   * @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;
+  }
+
+  /**
+   * 预热源站内容到缓存节点
+   * @param {预热URL,格式为加速域名或预热的文件 多个URL之间使用换行符(\n)或(\r\n)分隔 单条长度最长为1024个字符} objectPath
+   * @returns
+   */
+  async pushCache(objectPath: string) {
+    const data = await this.getCdnData("PushObjectCache", {
+      ObjectPath: objectPath,
+    });
+    return data;
+  }
+}
+
+export default CDN;

package/lib/define/index.ts

@@ -13,7 +13,7 @@ const replaceDefine = (target:string,define?:Define)=>{
 			if (define){
 				const namePieces = dir.split('.');
 				const fileType = namePieces[namePieces.length - 1];
-				if (['js','json','json5','yml','ts'].indexOf(fileType)>=0){
+				if (['js','ts'].indexOf(fileType)>=0){
 					let file = fs.readFileSync(path.join(target, dir)).toString();
 					const replaceArr = Object.keys(define);
 					for (let replace of replaceArr){

package/lib/deploy/index.ts

@@ -1,42 +1,60 @@
 import fs from "fs";
 import path from "path";
-import aliOSS from "ali-oss";
-import fsHelper from "../utils/fsHelper";
 import CICD from "@/classes/cicd/CICD";
 import CICDCmd from "@/classes/cicd/CICDCmd";
-//
-// const 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}`
-//   );
-// };
-//
-// let filesList: string[] = [];
-// const traverseFolder = (url: string) => {
-//   if (fs.existsSync(url)) {
-//     const files = fs.readdirSync(url);
-//     files.forEach((file) => {
-//       const curPath = path.join(url, file);
-//       if (fs.statSync(curPath).isDirectory()) {
-//         traverseFolder(curPath);
-//       } else {
-//         filesList.push(curPath);
-//       }
-//     });
-//   }
-// };
-//
+import AliOSS from "@/classes/cicd/Deploy/AliDeploy";
+import CDN from "@/classes/cicd/Deploy/CDN";
+
+let filesList: string[] = [];
+const traverseFolder = (url: string) => {
+  if (fs.existsSync(url)) {
+    const files = fs.readdirSync(url);
+    files.forEach((file) => {
+      const curPath = path.join(url, file);
+      if (fs.statSync(curPath).isDirectory()) {
+        traverseFolder(curPath);
+      } else {
+        filesList.push(curPath);
+      }
+    });
+  }
+};
+
 export default async (cmd: any) => {
-	try {
-		//create cicd object
-		const cicd = CICD.createByDefault(cmd);
-		//construct cmd object
-		const cicdCmd = new CICDCmd(cmd, cicd);
+  try {
+    //create cicd object
+    const cicd = CICD.createByDefault(cmd);
+    //construct cmd object
+    const cicdCmd = new CICDCmd(cmd, cicd);
+
+    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);
+    for (let i = 0; i < cicdCmd.endpoints.length; i++) {
+      const distPath = path.join(
+        process.cwd(),
+        cicd.source.root_path,
+        cicdCmd.endpoints[i].dir
+      );
+      traverseFolder(distPath);
+      await aliOss.putStreamFiles(
+        filesList,
+        cicdCmd.endpoints[i].deployDir.replace(/\\/g, "/"),
+        cicdCmd.endpoints[i].dir
+      );
 
-	}catch (e) {
-		throw e;
-	}
-}
+    //   await cdn.setRWriteUri(
+    //     cicdCmd.endpoints[i].domain,
+    //     [""],
+    //     [""],
+    //     ["break"]
+    //   );
+      filesList = [];
+    }
+  } catch (e) {
+    throw e;
+  }
+};

package/lib/init/cicd.rig.json5

@@ -1,17 +1,9 @@
 {
-  tree_schema: '',//tree_schema help to indicate every level of directory's meaning
+  tree_schema: '{app}/{env}/{oem}',
   source: {
-    path: 'dist',
+    root_path: 'dist',
   },
-  target: {
-    type: '',
-    bucket: '',
-    access_token: '',
-    root_path: '/',
-  },
-  predefines: {},//relpace special string in your bundle,so you can use the same bundle in different enviroments without building multiple times.
-  endpoints: [],
-  alias: []
+  target: {},
+  endpoints: {},
+  groups: [],
 }
-
-

package/lib/init/index.js

@@ -45,16 +45,39 @@ const load = async () => {
       console.log(chalk.green('rig_helper.js already exists~'));
     } else {
       console.log(chalk.green('create rig_helper.js'));
-      let rigHelper = fs.readFileSync(`${__dirname}/rig_helper.js`);
-      fs.writeFileSync(`${process.cwd()}/rig_helper.js`, rigHelper);
+      let template = `const json5 = require('json5');
+const fs = require('fs');
+const getPkgs = () => {
+\tlet pkgArr = json5.parse(fs.readFileSync('./package.rig.json5'));
+\tlet flatPkgArr = pkgArr.map((item, index) => {
+\t\treturn item.name;
+\t});
+\tconsole.log(flatPkgArr);
+\treturn flatPkgArr;
+}
+
+module.exports = {
+\tgetPkgs
+}
+`
+      fs.writeFileSync(`${process.cwd()}/rig_helper.js`, template);
     }
     if (fs.existsSync(`${process.cwd()}/cicd.rig.json5`)) {
       console.log(chalk.green('cicd.rig.json5 already exists~'));
     } else {
       console.log(chalk.green('create cicd.rig.json5'));
-      let cicdConfig = json5.parse(fs.readFileSync(`${__dirname}/cicd.rig.json5`));
-      cicdConfig.tree_prefix_schema = `${pkg.name}`
-      fs.writeFileSync(`${process.cwd()}/cicd.rig.json5`, json5.stringify(cicdConfig,null,2));
+      let template = `{
+  tree_schema: '{app}/{env}/{oem}',
+  source: {
+    root_path: 'dist',
+  },
+  target: {},
+  endpoints: {},
+  groups: [],
+}
+`;
+      fs.writeFileSync(`${process.cwd()}/cicd.rig.json5`, template);
+
     }
     //检查rigs是否存在
     if (fs.existsSync('./rigs') && fs.lstatSync('./rigs').isDirectory()) {

package/lib/rig/index.ts

@@ -1,7 +1,8 @@
 import {Command} from 'commander';
 
 const program = new Command();
-console.log('Hello rigjs');
+console.log('Hello');
+
 import check from '../check';
 
 program.command('check').action(check.load);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rigjs",
-  "version": "2.0.0-alpha",
+  "version": "2.0.0-alpha.2",
   "description": "A multi-repos dev tool based on yarn and git.Rig is inspired by cocoapods. Not like those monorepo solutions,rig is a tool for organizing multi-repos.",
   "keywords": [
     "modular",
@@ -29,19 +29,25 @@
     "envmake": "cd demo && node ../lib/rig/index.js --env prod_view_zhs",
     "t": "node lib/rig/index.js tag",
     "deliver": "npm publish --registry=https://registry.npmjs.org",
+    "deliver:alpha": "npm publish --registry=https://registry.npmjs.org --tag alpha",
     "build": "esbuild lib/rig/index.ts --platform=node --bundle --minify --outfile=built/index.js --external:shelljs"
   },
   "dependencies": {
     "@types/ali-oss": "^6.16.3",
     "@types/json5": "^2.2.0",
+    "@types/qs": "^6.9.7",
     "@types/shelljs": "^0.8.11",
+    "@types/uuid": "^8.3.4",
     "ali-oss": "^6.17.1",
+    "axios": "^0.26.1",
     "chalk": "^4.1.0",
     "commander": "6.1.0",
+    "dayjs": "^1.11.0",
     "inquirer": "7.3.3",
     "json5": "2.1.3",
     "ora": "^5.1.0",
-    "shelljs": "^0.8.4"
+    "shelljs": "^0.8.4",
+    "uuid": "^8.3.2"
   },
   "devDependencies": {
     "@types/node": "^17.0.21"

package/demo/test.js

@@ -1,18 +0,0 @@
-// const fs = require('fs');
-// let pkgStr = fs.readFileSync('package.json').toString();
-// let pkg = JSON.parse(pkgStr);
-// console.log(pkg);
-// pkg.info = 'test';
-// // fs.('package.json');
-// fs.writeFileSync('package.json', JSON.stringify(pkg,null,2));
-//  pkgStr = fs.readFileSync('package.json').toString();
-//  pkg = JSON.parse(pkgStr);
-// console.log(pkg);
-//
-console.log(/^([a-z]+-){1,3}([0-9]+)(\.([0-9]+)){3}$/.test('a-a-1.2.1.1'));
-//cmd
-// console.log(/^(\.([0-9]+)){3}$/.test('a-a-1.2.1.1'));
-console.log('a-a-1.2.1.1'.split(/(?<=[a-z])-(?=[0-9])/));
-
-//抓取版本
-