rigjs 2.1.21 → 2.1.24

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -3,201 +3,191 @@ import CICDCmd from '@/classes/cicd/CICDCmd';
3
3
  import CDN from '@/classes/cicd/Deploy/CDN';
4
4
 
5
5
  const delay = async (ms: number) => {
6
- await new Promise((resolve) => {
7
- setTimeout(resolve, ms);
8
- });
6
+ await new Promise((resolve) => {
7
+ setTimeout(resolve, ms);
8
+ });
9
9
  };
10
10
 
11
11
  const setRewriteUri = async (
12
- domain: string,
13
- original: string,
14
- deployDir: string,
15
- cdn: CDN
12
+ domain: string,
13
+ original: string,
14
+ deployDir: string,
15
+ cdn: CDN
16
16
  ) => {
17
- const rwriteResult = await cdn.setRewriteUri(
18
- domain,
19
- [original],
20
- [deployDir],
21
- ['enhance_break']
22
- );
17
+ const rwriteResult = await cdn.setRewriteUri(
18
+ domain,
19
+ [original],
20
+ [deployDir],
21
+ ['enhance_break']
22
+ );
23
23
 
24
- const configId = rwriteResult?.DomainConfigList.DomainConfigModel[0].ConfigId;
25
- while (true) {
26
- const configInfo = await cdn.describeCdnDomainConfigs(domain, configId);
27
- if (configInfo.DomainConfigs.DomainConfig[0].Status === 'success') {
28
- break;
29
- }
30
- if (configInfo.DomainConfigs.DomainConfig[0].Status === 'failed') {
31
- throw new Error('cdn rewrite fail');
32
- }
33
- await delay(3000);
34
- }
24
+ const configId = rwriteResult?.DomainConfigList.DomainConfigModel[0].ConfigId;
25
+ while (true) {
26
+ const configInfo = await cdn.describeCdnDomainConfigs(domain, configId);
27
+ if (configInfo.DomainConfigs.DomainConfig[0].Status === 'success') {
28
+ break;
29
+ }
30
+ if (configInfo.DomainConfigs.DomainConfig[0].Status === 'failed') {
31
+ throw new Error('cdn rewrite fail');
32
+ }
33
+ await delay(3000);
34
+ }
35
35
  };
36
36
 
37
37
  const refreshCache = async (urls: string[], cdn: CDN) => {
38
- const refreshResult = await cdn.refreshCache(urls.join('\n'));
39
- console.log('Please Wait For RefreshCache...');
40
- while (true) {
41
- const desResult = await cdn.describeRefreshTaskById(
42
- refreshResult.RefreshTaskId
43
- );
44
- let successCount = 0;
45
- for (const item of desResult.Tasks) {
46
- if (item.Status === 'Complete') {
47
- successCount++;
48
- } else if (item.Status === 'Failed') {
49
- throw new Error('RefreshCache Failed');
50
- }
51
- }
52
- if (successCount === desResult.Tasks.length) {
53
- break;
54
- }
55
- await delay(3000);
56
- }
57
- console.log('RefreshCache Done');
38
+ const refreshResult = await cdn.refreshCache(urls.join('\n'));
39
+ console.log('Please Wait For RefreshCache...');
40
+ while (true) {
41
+ const desResult = await cdn.describeRefreshTaskById(
42
+ refreshResult.RefreshTaskId
43
+ );
44
+ let successCount = 0;
45
+ for (const item of desResult.Tasks) {
46
+ if (item.Status === 'Complete') {
47
+ successCount++;
48
+ } else if (item.Status === 'Failed') {
49
+ throw new Error('RefreshCache Failed');
50
+ }
51
+ }
52
+ if (successCount === desResult.Tasks.length) {
53
+ break;
54
+ }
55
+ await delay(3000);
56
+ }
57
+ console.log('RefreshCache Done');
58
58
  };
59
59
 
60
60
  export default async (cmd: any) => {
61
- try {
62
- //create cicd object
63
- const cicd = CICD.createByDefault(cmd);
64
- //construct cmd object
65
- const cicdCmd = new CICDCmd(cmd, cicd);
61
+ try {
62
+ //create cicd object
63
+ const cicd = CICD.createByDefault(cmd);
64
+ //construct cmd object
65
+ const cicdCmd = new CICDCmd(cmd, cicd);
66
66
 
67
- console.log('Start Publish-----');
68
- const target = Array.isArray(cicdCmd.cicd.target)
69
- ? cicdCmd.cicd.target[0]
70
- : cicdCmd.cicd.target;
67
+ console.log('Start Publish-----');
68
+ const target = Array.isArray(cicdCmd.cicd.target)
69
+ ? cicdCmd.cicd.target[0]
70
+ : cicdCmd.cicd.target;
71
71
 
72
- const cdn = new CDN(target);
73
- const urls: string[] = [];
74
- const setRewriteUriPromises: Promise<any>[] = [];
75
- if (!cicdCmd.endpoints || cicdCmd.endpoints.length === 0) {
76
- throw new Error('Endpoints.length Can Not Be 0!');
77
- }
78
- for (const endpoint of cicdCmd.endpoints) {
79
- if (
80
- !endpoint.uri_rewrite &&
81
- (!target.uri_rewrite ||
82
- !target.uri_rewrite.original ||
83
- !target.uri_rewrite.original_regexp)
84
- ) {
85
- let webEntryPath: string;
86
- if (cicd.web_type === 'mpa') {
87
- webEntryPath = '/';
88
- } else if (cicd.web_type === 'history'){
89
- webEntryPath = '/';
90
- } else {
91
- webEntryPath = endpoint.web_entry_path
92
- ? endpoint.web_entry_path
93
- : target.web_entry_path || '/';
94
- }
95
- for (const domain of endpoint.domains) {
96
- if (cicd.web_type === 'mpa') {
97
- //mpa匹配文件
98
- setRewriteUriPromises.push(
99
- setRewriteUri(
100
- domain,
101
- '^\\/([^?]*\\.[a-zA-Z0-9]+)($|\\?)',
102
- `/${endpoint.deployDir.replace(/\\/g, '/')}/$1`,
103
- cdn
104
- )
105
- );
106
- //mpa匹配非首页
107
- setRewriteUriPromises.push(
108
- setRewriteUri(
109
- domain,
110
- '^\\/([\\w-/]*\\w+)(?![^?]*\\.\\w+)',
111
- `/${endpoint.deployDir.replace(/\\/g, '/')}/$1.html`,
112
- cdn
113
- )
114
- );
115
- } else if (cicd.web_type === 'history'){
116
- //spa/history匹配非首页
117
- setRewriteUriPromises.push(
118
- setRewriteUri(
119
- domain,
120
- '^\\/([\\w-/]*\\w+)(?![^?]*\\.\\w+)',
121
- `/${endpoint.deployDir.replace(/\\/g, '/')}/index.html`,
122
- cdn
123
- )
124
- );
125
- //spa/history匹配文件
126
- setRewriteUriPromises.push(
127
- setRewriteUri(
128
- domain,
129
- '^\\/([^?]*\\.[a-zA-Z0-9]+)($|\\?)',
130
- `/${endpoint.deployDir.replace(/\\/g, '/')}/$1`,
131
- cdn
132
- )
133
- );
134
- }else if (cicd.web_type === 'hash') {
135
- //hash模式匹配文件
136
- setRewriteUriPromises.push(
137
- setRewriteUri(
138
- domain,
139
- '^\\/([^?]*\\.[a-zA-Z0-9]+)($|\\?)',
140
- `/$1`,
141
- cdn
142
- )
143
- );
144
- }
145
- //首页匹配正则,hash,history,mpa三个模式通用
146
- setRewriteUriPromises.push(
147
- setRewriteUri(
148
- domain,
149
- `^(${webEntryPath})($|\\?|#|\\/\\?|\\/$)`,
150
- `/${endpoint.deployDir.replace(/\\/g, '/')}/index.html`,
151
- cdn
152
- )
153
- );
154
- urls.push(`https://${domain}${webEntryPath}`);
155
- }
156
- } else {
157
- const uriRewrite = endpoint.uri_rewrite
158
- ? endpoint.uri_rewrite
159
- : target.uri_rewrite;
72
+ const cdn = new CDN(target);
73
+ const urls: string[] = [];
74
+ const setRewriteUriPromises: Promise<any>[] = [];
75
+ if (!cicdCmd.endpoints || cicdCmd.endpoints.length === 0) {
76
+ throw new Error('Endpoints.length Can Not Be 0!');
77
+ }
78
+ for (const endpoint of cicdCmd.endpoints) {
79
+ if (
80
+ !endpoint.uri_rewrite &&
81
+ (!target.uri_rewrite ||
82
+ !target.uri_rewrite.original ||
83
+ !target.uri_rewrite.original_regexp)
84
+ ) {
85
+ let webEntryPath: string;
86
+ if (cicd.web_type === 'mpa') {
87
+ webEntryPath = '/';
88
+ } else if (cicd.web_type === 'history') {
89
+ webEntryPath = '/';
90
+ } else {
91
+ webEntryPath = endpoint.web_entry_path
92
+ ? endpoint.web_entry_path
93
+ : target.web_entry_path || '/';
94
+ }
95
+ for (const domain of endpoint.domains) {
96
+ if (cicd.web_type === 'mpa') {
97
+ //mpa匹配非首页
98
+ setRewriteUriPromises.push(
99
+ setRewriteUri(
100
+ domain,
101
+ '^\\/([\\w-/]*\\w+)(?![^?]*\\.\\w+)',
102
+ `/${endpoint.deployDir.replace(/\\/g, '/')}/$1.html`,
103
+ cdn
104
+ )
105
+ );
106
+ } else if (cicd.web_type === 'history') {
107
+ //spa/history匹配非首页
108
+ setRewriteUriPromises.push(
109
+ setRewriteUri(
110
+ domain,
111
+ '^\\/([\\w-/]*\\w+)(?![^?]*\\.\\w+)',
112
+ `/${endpoint.deployDir.replace(/\\/g, '/')}/index.html`,
113
+ cdn
114
+ )
115
+ );
116
+ }
117
+ //匹配文件,3个模式通用
118
+ const divide = webEntryPath === '/' ? '' : '/';
119
+ setRewriteUriPromises.push(
120
+ setRewriteUri(
121
+ domain,
122
+ `^${webEntryPath}${divide}([^?]*\\.[a-zA-Z0-9]+)($|\\?)`,
123
+ `/${endpoint.deployDir.replace(/\\/g, '/')}/$1`,
124
+ cdn
125
+ )
126
+ );
127
+ //首页匹配正则,hash,history,mpa三个模式通用
128
+ setRewriteUriPromises.push(
129
+ setRewriteUri(
130
+ domain,
131
+ `^(${webEntryPath})($|\\?|#|\\/\\?|\\/$)`,
132
+ `/${endpoint.deployDir.replace(/\\/g, '/')}/index.html`,
133
+ cdn
134
+ )
135
+ );
136
+ urls.push(`https://${domain}${webEntryPath}`);
137
+ }
138
+ } else {
139
+ const uriRewrite = endpoint.uri_rewrite
140
+ ? endpoint.uri_rewrite
141
+ : target.uri_rewrite;
160
142
 
161
- if (!uriRewrite) {
162
- continue;
163
- }
143
+ if (!uriRewrite) {
144
+ continue;
145
+ }
164
146
 
165
- for (const domain of endpoint.domains) {
166
- setRewriteUriPromises.push(
167
- setRewriteUri(
168
- domain,
169
- `${
170
- uriRewrite.original_regexp
171
- ? uriRewrite.original_regexp
172
- : uriRewrite.original
173
- }`,
174
- `/${endpoint.deployDir.replace(/\\/g, '/')}/index.html`,
175
- cdn
176
- )
177
- );
178
- urls.push(`https://${domain}${uriRewrite.original}`);
179
- }
180
- }
181
- }
147
+ for (const domain of endpoint.domains) {
148
+ setRewriteUriPromises.push(
149
+ setRewriteUri(
150
+ domain,
151
+ '^\\/([^?]*\\.[a-zA-Z0-9]+)($|\\?)',
152
+ `/${endpoint.deployDir.replace(/\\/g, '/')}/$1`,
153
+ cdn
154
+ )
155
+ );
156
+ setRewriteUriPromises.push(
157
+ setRewriteUri(
158
+ domain,
159
+ `${
160
+ uriRewrite.original_regexp
161
+ ? uriRewrite.original_regexp
162
+ : uriRewrite.original
163
+ }`,
164
+ `/${endpoint.deployDir.replace(/\\/g, '/')}/index.html`,
165
+ cdn
166
+ )
167
+ );
168
+ urls.push(`https://${domain}${uriRewrite.original}`);
169
+ }
170
+ }
171
+ }
182
172
 
183
- // 回源URI改写
184
- console.log('Please Wait For Set RWrite URI...');
185
- if (setRewriteUriPromises.length > 0) {
186
- await Promise.all(setRewriteUriPromises);
187
- } else {
188
- console.log('Not Have To Set RWrite URI');
189
- }
190
- console.log('Set RWrite URI Done');
173
+ // 回源URI改写
174
+ console.log('Please Wait For Set RWrite URI...');
175
+ if (setRewriteUriPromises.length > 0) {
176
+ await Promise.all(setRewriteUriPromises);
177
+ } else {
178
+ console.log('Not Have To Set RWrite URI');
179
+ }
180
+ console.log('Set RWrite URI Done');
191
181
 
192
- //刷新cdn
193
- if (urls.length > 0) {
194
- await refreshCache(urls, cdn);
195
- } else {
196
- console.log('Not Have To RefreshCache');
197
- }
198
- console.log('Publish Done-----');
199
- } catch (e: any) {
200
- console.error(e.message);
201
- process.exit(1);
202
- }
182
+ //刷新cdn
183
+ if (urls.length > 0) {
184
+ await refreshCache(urls, cdn);
185
+ } else {
186
+ console.log('Not Have To RefreshCache');
187
+ }
188
+ console.log('Publish Done-----');
189
+ } catch (e: any) {
190
+ console.error(e.message);
191
+ process.exit(1);
192
+ }
203
193
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "rigjs",
3
- "version": "2.1.21",
3
+ "version": "2.1.24",
4
4
  "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.",
5
5
  "keywords": [
6
6
  "modular",