rigjs 2.0.0-alpha.15 → 2.0.0-alpha.18

package/demo/cicd.rig.json5

@@ -12,7 +12,7 @@
     access_secret: '${as}',
     root_path: '/',
     uri_rewrite: {
-      original: 'view-fp',
+      original: '/view-fp',
     }
   },
   endpoints: {

package/lib/build/index.ts

@@ -44,9 +44,11 @@ export default async (cmd: any) => {
 		ep.build = ep.build.replace(regexPublicPath, ep.publicPath);
 		try {
 			//替换define中的$public_path
-			ep.defines = JSON5.parse(JSON5.stringify(ep.defines).replace(regexPublicPath, ep.publicPath));
+			Object.keys(ep.defines).forEach(key=>{
+				ep.defines[key] = ep.defines[key].replace(regexPublicPath, ep.publicPath);
+			})
 		} catch (e) {
-			console.log('JSON5 error:', e.message);
+			console.log('JSON5 error:', ep.defines,e.message);
 		}
 		console.log('exec build:', ep, ep.build, ep.defines);
 		shell.exec(ep.build);

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/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);
 
     const target = Array.isArray(cicdCmd.cicd.target)
       ? cicdCmd.cicd.target[0]

package/lib/publish/index.ts

@@ -1,8 +1,5 @@
-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';
 import CDN from '@/classes/cicd/Deploy/CDN';
 
 const setRWriteUri = async (
@@ -15,11 +12,10 @@ const setRWriteUri = async (
     domain,
     [original],
     [deployDir],
-    ['enhance_break']
+    [null]
   );
 
   const configId = rwriteResult?.DomainConfigList.DomainConfigModel[0].ConfigId;
-  console.log('Please Wait For Set RWrite URI...');
   while (true) {
     const configInfo = await cdn.describeCdnDomainConfigs(domain, configId);
     if (configInfo.DomainConfigs.DomainConfig[0].Status === 'success') {
@@ -29,7 +25,6 @@ const setRWriteUri = async (
       throw new Error('cdn rewrite fail');
     }
   }
-  console.log('Set RWrite URI Done');
 };
 
 const refreshCache = async (urls: string[], cdn: CDN) => {
@@ -67,17 +62,25 @@ export default async (cmd: any) => {
 
   const cdn = new CDN(target);
   const urls: string[] = [];
+  const setRWriteUriPromises: Promise<any>[] = [];
   for (const endpoint of cicdCmd.endpoints) {
     // 目前只支持set一个original
-    await setRWriteUri(
-      endpoint.domain,
-      `/${target.uri_rewrite.original}`,
-      `/${endpoint.deployDir.replace(/\\/g, '/')}/index.html`,
-      cdn
+    setRWriteUriPromises.push(
+      setRWriteUri(
+        endpoint.domain,
+        `${target.uri_rewrite.original}`,
+        `/${endpoint.deployDir.replace(/\\/g, '/')}/index.html`,
+        cdn
+      )
     );
     urls.push(`https://${endpoint.domain}/${target.uri_rewrite.original}`);
   }
 
+  // 回源URI改写
+  console.log('Please Wait For Set RWrite URI...');
+  await Promise.all(setRWriteUriPromises);
+  console.log('Set RWrite URI Done');
+
   //刷新cdn
   await refreshCache(urls, cdn);
   console.log('Publish Done-----');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rigjs",
-  "version": "2.0.0-alpha.15",
+  "version": "2.0.0-alpha.18",
   "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",