rigjs 2.1.22 → 2.1.25

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,181 +3,211 @@ 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
- '^\\/([\\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
- setRewriteUriPromises.push(
118
- setRewriteUri(
119
- domain,
120
- '^\\/([^?]*\\.[a-zA-Z0-9]+)($|\\?)',
121
- `/${endpoint.deployDir.replace(/\\/g, '/')}/$1`,
122
- cdn
123
- )
124
- );
125
- //首页匹配正则,hash,history,mpa三个模式通用
126
- setRewriteUriPromises.push(
127
- setRewriteUri(
128
- domain,
129
- `^(${webEntryPath})($|\\?|#|\\/\\?|\\/$)`,
130
- `/${endpoint.deployDir.replace(/\\/g, '/')}/index.html`,
131
- cdn
132
- )
133
- );
134
- urls.push(`https://${domain}${webEntryPath}`);
135
- }
136
- } else {
137
- const uriRewrite = endpoint.uri_rewrite
138
- ? endpoint.uri_rewrite
139
- : 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
+ //mpa匹配文件
107
+ setRewriteUriPromises.push(
108
+ setRewriteUri(
109
+ domain,
110
+ `^\\/([^?]*\\.[a-zA-Z0-9]+)($|\\?)`,
111
+ `/${endpoint.deployDir.replace(/\\/g, '/')}/$1`,
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{
135
+ //spa-hash匹配文件
136
+ //hash模式支持一个域名支持多个网页应用的入口路径,如/,/app1,/app2,都是不同的网页应用
137
+ //需要替换webpack中的publicPath为实际OSS的目录
138
+ setRewriteUriPromises.push(
139
+ setRewriteUri(
140
+ domain,
141
+ `^\\/([^?]*\\.[a-zA-Z0-9]+)($|\\?)`,
142
+ `/$1`,
143
+ cdn
144
+ )
145
+ );
146
+ }
147
+ //首页匹配正则,hash,history,mpa三个模式通用
148
+ setRewriteUriPromises.push(
149
+ setRewriteUri(
150
+ domain,
151
+ `^(${webEntryPath})($|\\?|#|\\/\\?|\\/$)`,
152
+ `/${endpoint.deployDir.replace(/\\/g, '/')}/index.html`,
153
+ cdn
154
+ )
155
+ );
156
+ urls.push(`https://${domain}${webEntryPath}`);
157
+ }
158
+ } else {
159
+ const uriRewrite = endpoint.uri_rewrite
160
+ ? endpoint.uri_rewrite
161
+ : target.uri_rewrite;
140
162
 
141
- if (!uriRewrite) {
142
- continue;
143
- }
163
+ if (!uriRewrite) {
164
+ continue;
165
+ }
144
166
 
145
- for (const domain of endpoint.domains) {
146
- setRewriteUriPromises.push(
147
- setRewriteUri(
148
- domain,
149
- `${
150
- uriRewrite.original_regexp
151
- ? uriRewrite.original_regexp
152
- : uriRewrite.original
153
- }`,
154
- `/${endpoint.deployDir.replace(/\\/g, '/')}/index.html`,
155
- cdn
156
- )
157
- );
158
- urls.push(`https://${domain}${uriRewrite.original}`);
159
- }
160
- }
161
- }
167
+ for (const domain of endpoint.domains) {
168
+ setRewriteUriPromises.push(
169
+ setRewriteUri(
170
+ domain,
171
+ '^\\/([^?]*\\.[a-zA-Z0-9]+)($|\\?)',
172
+ `/${endpoint.deployDir.replace(/\\/g, '/')}/$1`,
173
+ cdn
174
+ )
175
+ );
176
+ setRewriteUriPromises.push(
177
+ setRewriteUri(
178
+ domain,
179
+ `${
180
+ uriRewrite.original_regexp
181
+ ? uriRewrite.original_regexp
182
+ : uriRewrite.original
183
+ }`,
184
+ `/${endpoint.deployDir.replace(/\\/g, '/')}/index.html`,
185
+ cdn
186
+ )
187
+ );
188
+ urls.push(`https://${domain}${uriRewrite.original}`);
189
+ }
190
+ }
191
+ }
162
192
 
163
- // 回源URI改写
164
- console.log('Please Wait For Set RWrite URI...');
165
- if (setRewriteUriPromises.length > 0) {
166
- await Promise.all(setRewriteUriPromises);
167
- } else {
168
- console.log('Not Have To Set RWrite URI');
169
- }
170
- console.log('Set RWrite URI Done');
193
+ // 回源URI改写
194
+ console.log('Please Wait For Set RWrite URI...');
195
+ if (setRewriteUriPromises.length > 0) {
196
+ await Promise.all(setRewriteUriPromises);
197
+ } else {
198
+ console.log('Not Have To Set RWrite URI');
199
+ }
200
+ console.log('Set RWrite URI Done');
171
201
 
172
- //刷新cdn
173
- if (urls.length > 0) {
174
- await refreshCache(urls, cdn);
175
- } else {
176
- console.log('Not Have To RefreshCache');
177
- }
178
- console.log('Publish Done-----');
179
- } catch (e: any) {
180
- console.error(e.message);
181
- process.exit(1);
182
- }
202
+ //刷新cdn
203
+ if (urls.length > 0) {
204
+ await refreshCache(urls, cdn);
205
+ } else {
206
+ console.log('Not Have To RefreshCache');
207
+ }
208
+ console.log('Publish Done-----');
209
+ } catch (e: any) {
210
+ console.error(e.message);
211
+ process.exit(1);
212
+ }
183
213
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "rigjs",
3
- "version": "2.1.22",
3
+ "version": "2.1.25",
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",