@serverless-devs/s 2.0.97-beta.9 → 2.0.98
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.
- package/lib/clean/index.js +33 -28
- package/lib/cli/cli-manager.js +3 -9
- package/lib/cli/index.js +54 -49
- package/lib/component/index.js +44 -39
- package/lib/config/add/index.js +34 -29
- package/lib/config/delete/index.js +45 -40
- package/lib/config/get/index.js +45 -40
- package/lib/config/index.js +34 -29
- package/lib/core/command/command-manager.js +2 -5
- package/lib/core/component/index.js +6 -6
- package/lib/error/index.js +35 -43
- package/lib/index.js +88 -83
- package/lib/init/index.js +71 -66
- package/lib/init/init-manager.js +3 -3
- package/lib/set/analysis/index.js +33 -28
- package/lib/set/index.js +34 -29
- package/lib/set/locale/index.js +48 -43
- package/lib/set/registry/index.js +47 -42
- package/lib/set/workspace/index.js +34 -29
- package/lib/specification/parse.js +2 -6
- package/lib/update-notifier/index.js +6 -6
- package/lib/utils/common.js +74 -37
- package/lib/utils/core.js +2 -2
- package/package.json +2 -2
- package/readme.md +1 -1
- package/Makefile +0 -23
package/lib/utils/common.js
CHANGED
|
@@ -66,50 +66,87 @@ var lodash_1 = __importDefault(require("lodash"));
|
|
|
66
66
|
var os_1 = __importDefault(require("os"));
|
|
67
67
|
var error_1 = require("../error");
|
|
68
68
|
var core_1 = __importStar(require("./core"));
|
|
69
|
-
var colors = core_1.default.colors, yaml = core_1.default.jsyaml, makeUnderLine = core_1.default.makeUnderLine, isDebugMode = core_1.default.isDebugMode, getMAC = core_1.default.getMAC;
|
|
69
|
+
var colors = core_1.default.colors, yaml = core_1.default.jsyaml, makeUnderLine = core_1.default.makeUnderLine, got = core_1.default.got, Logger = core_1.default.Logger, isDebugMode = core_1.default.isDebugMode, getMAC = core_1.default.getMAC, getYamlContent = core_1.default.getYamlContent, isDocker = core_1.default.isDocker, isCiCdEnv = core_1.default.isCiCdEnv;
|
|
70
70
|
var pkg = require('../../package.json');
|
|
71
71
|
var handler_set_config_1 = require("./handler-set-config");
|
|
72
72
|
exports.red = colors.hex('#fd5750');
|
|
73
73
|
exports.yellow = colors.hex('#F3F99D');
|
|
74
74
|
exports.bgRed = colors.hex('#000').bgHex('#fd5750');
|
|
75
|
-
var
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
return getMAC().replace(/:/g, '');
|
|
80
|
-
}
|
|
81
|
-
catch (error) {
|
|
82
|
-
return 'unknown';
|
|
83
|
-
}
|
|
84
|
-
};
|
|
85
|
-
var analysis = (0, handler_set_config_1.getConfig)('analysis');
|
|
86
|
-
if (analysis !== 'disable') {
|
|
87
|
-
configOption.traceId = "".concat(getPid()).concat(Date.now());
|
|
88
|
-
}
|
|
89
|
-
var isDebug = isDebugMode ? isDebugMode() : undefined;
|
|
90
|
-
if (isDebug) {
|
|
91
|
-
console.log(error);
|
|
92
|
-
return configOption;
|
|
93
|
-
}
|
|
94
|
-
var message = error.message ? error.message : '';
|
|
95
|
-
var jsonMsg;
|
|
96
|
-
try {
|
|
97
|
-
jsonMsg = JSON.parse(message);
|
|
75
|
+
var _AiRequest = function (category, message) {
|
|
76
|
+
if (isDocker() || isCiCdEnv()) {
|
|
77
|
+
// 在CICD环境中不处理
|
|
78
|
+
return;
|
|
98
79
|
}
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
80
|
+
return got("http://qaapis.devsapp.cn/apis/v1/search?category=".concat(category, "&code=TypeError&s=").concat(message), {
|
|
81
|
+
timeout: 2000,
|
|
82
|
+
json: true,
|
|
83
|
+
}).then(function (list) {
|
|
84
|
+
var shorturl = lodash_1.default.get(list.body, 'shorturl');
|
|
85
|
+
if (shorturl) {
|
|
86
|
+
console.log("AI Tips:\nYou can try to solve the problem through: ".concat(colors.underline(shorturl), "\n"));
|
|
105
87
|
}
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
console.log("".concat((0, exports.bgRed)('ERROR:'), "\n").concat(message, "\n"));
|
|
110
|
-
}
|
|
111
|
-
return configOption;
|
|
88
|
+
}).catch(function () {
|
|
89
|
+
// exception
|
|
90
|
+
});
|
|
112
91
|
};
|
|
92
|
+
var getErrorMessage = function (error, prefix) { return __awaiter(void 0, void 0, void 0, function () {
|
|
93
|
+
var configOption, getPid, analysis, isDebug, message, jsonMsg, messageStr, tipsStr, templateFile, content, category, error_2;
|
|
94
|
+
return __generator(this, function (_a) {
|
|
95
|
+
switch (_a.label) {
|
|
96
|
+
case 0:
|
|
97
|
+
configOption = { traceId: '', catchableError: false };
|
|
98
|
+
getPid = function () {
|
|
99
|
+
try {
|
|
100
|
+
return getMAC().replace(/:/g, '');
|
|
101
|
+
}
|
|
102
|
+
catch (error) {
|
|
103
|
+
return 'unknown';
|
|
104
|
+
}
|
|
105
|
+
};
|
|
106
|
+
analysis = (0, handler_set_config_1.getConfig)('analysis');
|
|
107
|
+
if (analysis !== 'disable') {
|
|
108
|
+
configOption.traceId = "".concat(getPid()).concat(Date.now());
|
|
109
|
+
}
|
|
110
|
+
isDebug = isDebugMode ? isDebugMode() : undefined;
|
|
111
|
+
if (isDebug) {
|
|
112
|
+
console.log(error);
|
|
113
|
+
return [2 /*return*/, configOption];
|
|
114
|
+
}
|
|
115
|
+
message = error.message ? error.message : '';
|
|
116
|
+
try {
|
|
117
|
+
jsonMsg = JSON.parse(message);
|
|
118
|
+
}
|
|
119
|
+
catch (error) { }
|
|
120
|
+
if (!(jsonMsg && jsonMsg.tips)) return [3 /*break*/, 1];
|
|
121
|
+
messageStr = jsonMsg.message ? "Message: ".concat(jsonMsg.message, "\n") : '';
|
|
122
|
+
tipsStr = jsonMsg.tips ? "* ".concat(makeUnderLine(jsonMsg.tips.replace(/\n/, "\n* "))) : '';
|
|
123
|
+
Logger.log("\n".concat(colors.hex('#000').bgYellow('WARNING:'), "\n======================\n").concat(tipsStr, "\n"), 'yellow');
|
|
124
|
+
console.log(colors.grey(messageStr));
|
|
125
|
+
configOption.catchableError = true;
|
|
126
|
+
return [3 /*break*/, 6];
|
|
127
|
+
case 1:
|
|
128
|
+
console.log((0, exports.red)("\u2716 ".concat(prefix, "\n")));
|
|
129
|
+
console.log("".concat((0, exports.bgRed)('ERROR:'), "\n").concat(message, "\n"));
|
|
130
|
+
if (!(analysis !== 'disable')) return [3 /*break*/, 6];
|
|
131
|
+
_a.label = 2;
|
|
132
|
+
case 2:
|
|
133
|
+
_a.trys.push([2, 5, , 6]);
|
|
134
|
+
templateFile = checkAndReturnTemplateFile();
|
|
135
|
+
return [4 /*yield*/, getYamlContent(templateFile)];
|
|
136
|
+
case 3:
|
|
137
|
+
content = _a.sent();
|
|
138
|
+
category = lodash_1.default.get(lodash_1.default.first(lodash_1.default.values(lodash_1.default.get(content, 'services'))), 'component') || 'serverless-devs';
|
|
139
|
+
return [4 /*yield*/, _AiRequest(category, message)];
|
|
140
|
+
case 4:
|
|
141
|
+
_a.sent();
|
|
142
|
+
return [3 /*break*/, 6];
|
|
143
|
+
case 5:
|
|
144
|
+
error_2 = _a.sent();
|
|
145
|
+
return [3 /*break*/, 6];
|
|
146
|
+
case 6: return [2 /*return*/, configOption];
|
|
147
|
+
}
|
|
148
|
+
});
|
|
149
|
+
}); };
|
|
113
150
|
exports.getErrorMessage = getErrorMessage;
|
|
114
151
|
function getVersion() {
|
|
115
152
|
var coreVersion = (0, core_1.getCoreVersion)();
|
|
@@ -346,4 +383,4 @@ exports.default = {
|
|
|
346
383
|
replaceFun: replaceFun,
|
|
347
384
|
getTemplatekey: getTemplatekey,
|
|
348
385
|
};
|
|
349
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/utils/common.ts"],"names":[],"mappings":"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"}
|
|
386
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/utils/common.ts"],"names":[],"mappings":"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"}
|
package/lib/utils/core.js
CHANGED
|
@@ -19,8 +19,8 @@ function getCore() {
|
|
|
19
19
|
return require('@serverless-devs/core');
|
|
20
20
|
}
|
|
21
21
|
function getCoreVersion() {
|
|
22
|
-
return fs_1.default.existsSync(
|
|
22
|
+
return fs_1.default.existsSync(corePackagePath) ? require(corePackagePath).version : undefined;
|
|
23
23
|
}
|
|
24
24
|
exports.getCoreVersion = getCoreVersion;
|
|
25
25
|
exports.default = getCore();
|
|
26
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
26
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29yZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlscy9jb3JlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLDhDQUF3QjtBQUN4QiwwQ0FBb0I7QUFDcEIsSUFBTSxNQUFNLEdBQUcsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDO0FBQ2pDLElBQU0sSUFBSSxHQUFHLE9BQU8sQ0FBQyx1QkFBdUIsQ0FBQyxDQUFDO0FBRTlDLElBQU0sUUFBUSxHQUFHLGNBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFdBQVcsRUFBRSxFQUFFLE9BQU8sRUFBRSxNQUFNLENBQUMsQ0FBQztBQUNoRSxJQUFNLGVBQWUsR0FBRyxjQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsRUFBRSxjQUFjLENBQUMsQ0FBQztBQUU1RCxTQUFTLE9BQU87SUFDZCxJQUFJLFlBQUUsQ0FBQyxVQUFVLENBQUMsZUFBZSxDQUFDLEVBQUU7UUFDbEMsSUFBTSxnQkFBZ0IsR0FBRyxPQUFPLENBQUMsb0NBQW9DLENBQUMsQ0FBQyxPQUFPLENBQUM7UUFDL0UsSUFBTSxnQkFBZ0IsR0FBRyxjQUFjLEVBQUUsQ0FBQztRQUMxQyxPQUFPLE1BQU0sQ0FBQyxFQUFFLENBQUMsZ0JBQWdCLEVBQUUsZ0JBQWdCLENBQUMsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsdUJBQXVCLENBQUMsQ0FBQztLQUM3RztJQUNELE9BQU8sT0FBTyxDQUFDLHVCQUF1QixDQUFDLENBQUM7QUFDMUMsQ0FBQztBQUVELFNBQWdCLGNBQWM7SUFDNUIsT0FBTyxZQUFFLENBQUMsVUFBVSxDQUFDLGVBQWUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsZUFBZSxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUM7QUFDdkYsQ0FBQztBQUZELHdDQUVDO0FBRUQsa0JBQWUsT0FBTyxFQUFFLENBQUMifQ==
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@serverless-devs/s",
|
|
3
|
-
"version": "2.0.
|
|
3
|
+
"version": "2.0.98",
|
|
4
4
|
"description": "Serverless devs tool, serverless developer tool, supports Alibaba cloud, AWS, azure, baidu cloud, Huawei cloud, Google cloud and Tencent cloud.",
|
|
5
5
|
"homepage": "https://www.serverless-devs.com",
|
|
6
6
|
"keywords": [
|
|
@@ -93,6 +93,6 @@
|
|
|
93
93
|
]
|
|
94
94
|
},
|
|
95
95
|
"dependencies": {
|
|
96
|
-
"@serverless-devs/core": "
|
|
96
|
+
"@serverless-devs/core": "latest"
|
|
97
97
|
}
|
|
98
98
|
}
|
package/readme.md
CHANGED
|
@@ -99,4 +99,4 @@ Serverless Devs 遵循 [MIT License](./LICENSE) 开源许可。
|
|
|
99
99
|
|
|
100
100
|
-----------
|
|
101
101
|
|
|
102
|
-
> Serverless Devs 开发者工具遵循 [Serverless Devs Model](./spec/readme.md),更多模型/规范信息可以参考 [Serverless Registry Model](./spec/zh/0.0.1/serverless_registry_model/readme.md),[Serverless User Model](./spec/zh/0.0.1/serverless_user_model/readme.md) 以及 [Serverless Package Model](./spec/zh/0.0.1/serverless_pacakge_model/readme.md)
|
|
102
|
+
> Serverless Devs 开发者工具遵循 [Serverless Devs Model](./spec/readme.md),更多模型/规范信息可以参考 [Serverless Registry Model](./spec/zh/0.0.1/serverless_registry_model/readme.md),[Serverless User Model](./spec/zh/0.0.1/serverless_user_model/readme.md) 以及 [Serverless Package Model](./spec/zh/0.0.1/serverless_pacakge_model/readme.md)。
|
package/Makefile
DELETED
|
@@ -1,23 +0,0 @@
|
|
|
1
|
-
.PHONY: push
|
|
2
|
-
|
|
3
|
-
CURRENT_BRANCH_NAME := $(shell git symbolic-ref --short HEAD)
|
|
4
|
-
|
|
5
|
-
add:
|
|
6
|
-
git add .
|
|
7
|
-
|
|
8
|
-
commit: add
|
|
9
|
-
git-cz
|
|
10
|
-
|
|
11
|
-
rebase-main: commit
|
|
12
|
-
git pull --rebase origin main
|
|
13
|
-
|
|
14
|
-
push:
|
|
15
|
-
git push --force-with-lease origin $(CURRENT_BRANCH_NAME)
|
|
16
|
-
|
|
17
|
-
release-dev:
|
|
18
|
-
gh release create 2.0.97-beta.9 --notes "release 2.0.97-beta.9" --target develop --title "Release 2.0.97-beta.9"
|
|
19
|
-
|
|
20
|
-
roll-back-dev:
|
|
21
|
-
git reset --soft HEAD~1
|
|
22
|
-
git restore --staged publish.yaml
|
|
23
|
-
git restore publish.yaml
|