@cloudbase/framework-plugin-low-code 1.7.14 → 1.7.15

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.
Files changed (4) hide show
  1. package/lib/index.d.ts +1 -0
  2. package/lib/index.d.ts.map +1 -1
  3. package/lib/index.js +56 -9
  4. package/package.json +3 -3
package/lib/index.d.ts CHANGED
@@ -107,6 +107,7 @@ declare class LowCodePlugin extends Plugin {
107
107
  deploy(): Promise<void>;
108
108
  _getHostingInfoTask(envId: any, loose?: boolean): Promise<any[]>;
109
109
  _getHostingInfo(envId: any, loose?: boolean): any;
110
+ _checkBillingResource(envId: any): Promise<boolean>;
110
111
  _checkIsVersion(version: any): boolean;
111
112
  _postPersistentDependiences(): Promise<void>;
112
113
  _debugInfo(): Promise<void>;
package/lib/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
package/lib/index.js CHANGED
@@ -254,15 +254,16 @@ class LowCodePlugin extends framework_core_1.Plugin {
254
254
  : lowcode_builder_1.WebpackModeType.NONE;
255
255
  let miniAppDir = '';
256
256
  let webAppDir = '';
257
- try {
258
- const { envId } = this.api;
259
- let [website] = yield this._getHostingInfoTask(envId, true);
260
- this._website = website;
261
- }
262
- catch (e) {
263
- this.api.logger.error('获取静态托管失败: ', e);
264
- throw e;
265
- }
257
+ const { envId } = this.api;
258
+ const [hostingRes, isExpPackage] = yield Promise.all([
259
+ this._getHostingInfoTask(envId, true).catch((e) => {
260
+ this.api.logger.error('获取静态托管失败: ', e);
261
+ throw e;
262
+ }),
263
+ this._checkBillingResource(envId),
264
+ ]);
265
+ const [website] = hostingRes;
266
+ this._website = website;
266
267
  const domain = ((_b = this._website) === null || _b === void 0 ? void 0 : _b.cdnDomain) || ((_c = this._resolvedInputs.mainAppSerializeData.extra) === null || _c === void 0 ? void 0 : _c.domain);
267
268
  if ((0, lowcode_builder_1.buildAsWebByBuildType)(buildTypeList)) {
268
269
  let { appConfig = {} } = this._resolvedInputs.mainAppSerializeData.extra;
@@ -322,6 +323,7 @@ class LowCodePlugin extends framework_core_1.Plugin {
322
323
  resourceAppId: this._resolvedInputs.mpAppId,
323
324
  domain,
324
325
  endpointType: runtimeEndpointType,
326
+ enableExpiredTag: isExpPackage,
325
327
  }, (err, result) => __awaiter(this, void 0, void 0, function* () {
326
328
  if (!err) {
327
329
  try {
@@ -496,6 +498,51 @@ class LowCodePlugin extends framework_core_1.Plugin {
496
498
  }
497
499
  });
498
500
  }
501
+ _checkBillingResource(envId) {
502
+ return __awaiter(this, void 0, void 0, function* () {
503
+ try {
504
+ const { Resources = [] } = yield this.api.cloudbaseManager.commonService('tcb', '2018-06-08').call({
505
+ Action: 'DescribeCommonBillingResources',
506
+ Param: {
507
+ EnvId: envId,
508
+ ProductCode: 'p_lcap',
509
+ SubProductCode: 'sp_lcap_base',
510
+ StatusList: ['normal'],
511
+ },
512
+ });
513
+ const list = Resources.sort((a, b) => {
514
+ let atimesnap;
515
+ let btimesnap;
516
+ try {
517
+ atimesnap = new Date(a.BillTime).getTime();
518
+ }
519
+ catch (e) {
520
+ atimesnap = Infinity;
521
+ }
522
+ try {
523
+ btimesnap = new Date(b.BillTime).getTime();
524
+ }
525
+ catch (e) {
526
+ btimesnap = Infinity;
527
+ }
528
+ return atimesnap - btimesnap > 0 ? -1 : 1;
529
+ });
530
+ if (list[0]) {
531
+ const { SubBillingItemCode = [] } = list[0];
532
+ const exp = SubBillingItemCode.find((item) => {
533
+ return item.Code === 'sv_lcap_generic_experience' && item.Num && Number(item.Num) > 0;
534
+ });
535
+ if (exp) {
536
+ return true;
537
+ }
538
+ }
539
+ }
540
+ catch (e) {
541
+ this.api.logger.error('查询校验套餐失败: ', e);
542
+ }
543
+ return false;
544
+ });
545
+ }
499
546
  _checkIsVersion(version) {
500
547
  return version === 'latest' || String(version).startsWith('2');
501
548
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@cloudbase/framework-plugin-low-code",
3
- "version": "1.7.14",
3
+ "version": "1.7.15",
4
4
  "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
5
5
  "author": "yhsunshining@gmail.com",
6
6
  "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -35,11 +35,11 @@
35
35
  "url": "https://github.com/TencentCloudBase/cloudbase-framework/issues"
36
36
  },
37
37
  "dependencies": {
38
- "@cloudbase/cals": "^1.0.20",
38
+ "@cloudbase/cals": "^1.0.21",
39
39
  "@cloudbase/framework-core": "^1.8.16",
40
40
  "@cloudbase/framework-plugin-auth": "^1.8.16",
41
41
  "@cloudbase/framework-plugin-website": "^1.8.17",
42
- "@cloudbase/lowcode-builder": "^1.8.30",
42
+ "@cloudbase/lowcode-builder": "^1.8.33",
43
43
  "@cloudbase/lowcode-deployer": "^1.3.1",
44
44
  "@formily/react-schema-renderer": "1.1.7",
45
45
  "archiver": "^4.0.1",