@zeppos/zeus-cli 1.0.18 → 1.0.22
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/config/project.js +6 -6
- package/modules/build.js +89 -45
- package/modules/config.js +11 -11
- package/modules/create/index.js +7 -7
- package/modules/create/local-app.js +2 -2
- package/modules/help.js +10 -10
- package/modules/login.js +6 -6
- package/modules/run.js +7 -5
- package/modules/storage.js +2 -2
- package/package.json +1 -1
package/config/project.js
CHANGED
|
@@ -27,16 +27,16 @@ var LocalServerConfig;
|
|
|
27
27
|
})(LocalServerConfig = exports.LocalServerConfig || (exports.LocalServerConfig = {}));
|
|
28
28
|
var loginURL = 'https://user.huami.com/universalLogin/index.html#/login';
|
|
29
29
|
var loginUrl = new URL(loginURL);
|
|
30
|
-
var accountPrefix = "____"
|
|
30
|
+
var accountPrefix = "____".concat(lodash_1["default"].replace(loginUrl.host, /\./g, '_'), "__");
|
|
31
31
|
exports.loginConfig = {
|
|
32
32
|
LOGIN_URL: loginURL,
|
|
33
33
|
PROJECT_NAME: 'zeppos_zeus_cli',
|
|
34
34
|
PLATFORM_APP: 'com.huami.watch.hmwatchmanager',
|
|
35
|
-
PROJECT_REDIRECT_URI: encodeURIComponent("http://"
|
|
35
|
+
PROJECT_REDIRECT_URI: encodeURIComponent("http://".concat(LocalServerConfig.HOSTNAME, ":").concat(LocalServerConfig.PORT, "/"))
|
|
36
36
|
};
|
|
37
37
|
exports.loginStorageKey = {
|
|
38
|
-
accountToken: accountPrefix
|
|
39
|
-
account: accountPrefix
|
|
40
|
-
userid: accountPrefix
|
|
41
|
-
cname: accountPrefix
|
|
38
|
+
accountToken: "".concat(accountPrefix, "token"),
|
|
39
|
+
account: "".concat(accountPrefix, "account"),
|
|
40
|
+
userid: "".concat(accountPrefix, "userid"),
|
|
41
|
+
cname: "".concat(accountPrefix, "cname")
|
|
42
42
|
};
|
package/modules/build.js
CHANGED
|
@@ -85,30 +85,76 @@ var login_1 = require("./login");
|
|
|
85
85
|
var logger = __importStar(require("../utils/logger"));
|
|
86
86
|
var storage_1 = require("./storage");
|
|
87
87
|
var project_1 = require("../config/project");
|
|
88
|
+
var chalk_1 = __importDefault(require("chalk"));
|
|
88
89
|
var BuildMode;
|
|
89
90
|
(function (BuildMode) {
|
|
90
91
|
BuildMode["DEV"] = "development";
|
|
91
92
|
BuildMode["PREVIEW"] = "preview";
|
|
92
93
|
BuildMode["PROD"] = "production";
|
|
93
94
|
})(BuildMode = exports.BuildMode || (exports.BuildMode = {}));
|
|
94
|
-
|
|
95
|
+
var TransformType;
|
|
96
|
+
(function (TransformType) {
|
|
97
|
+
TransformType["Default"] = "";
|
|
98
|
+
TransformType["Js"] = "js";
|
|
99
|
+
TransformType["C"] = "c";
|
|
100
|
+
TransformType["Bin"] = "bin";
|
|
101
|
+
})(TransformType || (TransformType = {}));
|
|
102
|
+
function handleExecCommandInErrorDir(mode) {
|
|
103
|
+
var curCommand = 'dev';
|
|
104
|
+
if (mode === BuildMode.PROD) {
|
|
105
|
+
curCommand = 'build';
|
|
106
|
+
}
|
|
107
|
+
else if (mode === BuildMode.PREVIEW) {
|
|
108
|
+
curCommand = 'preview';
|
|
109
|
+
}
|
|
110
|
+
logger.warn("The command ".concat(chalk_1["default"].yellow("zeus ".concat(curCommand)), " needs to be executed in the root of the project"));
|
|
111
|
+
process.exit(1);
|
|
112
|
+
}
|
|
113
|
+
function chooseBuildPackages(mode) {
|
|
95
114
|
return __awaiter(this, void 0, void 0, function () {
|
|
96
|
-
var appJson, answers;
|
|
115
|
+
var appJson, targets, answers;
|
|
97
116
|
return __generator(this, function (_a) {
|
|
98
117
|
switch (_a.label) {
|
|
99
118
|
case 0:
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
119
|
+
if (!mode) {
|
|
120
|
+
mode = 'development';
|
|
121
|
+
}
|
|
122
|
+
appJson = fs_extra_1["default"].readJSONSync(path.resolve('./app.json'), { throws: false });
|
|
123
|
+
if (!appJson) {
|
|
124
|
+
handleExecCommandInErrorDir(mode);
|
|
125
|
+
}
|
|
126
|
+
targets = Object.keys(lodash_1["default"].get(appJson, 'targets', {}));
|
|
127
|
+
if (!!targets.length) return [3 /*break*/, 1];
|
|
128
|
+
logger.error('please set at least one package');
|
|
129
|
+
process.exit(1);
|
|
130
|
+
return [3 /*break*/, 4];
|
|
109
131
|
case 1:
|
|
132
|
+
if (!(targets.length === 1)) return [3 /*break*/, 2];
|
|
133
|
+
return [2 /*return*/, [targets[0]]];
|
|
134
|
+
case 2: return [4 /*yield*/, inquirer_1["default"].prompt([
|
|
135
|
+
{
|
|
136
|
+
name: 'target',
|
|
137
|
+
type: 'list',
|
|
138
|
+
when: function () { return mode !== BuildMode.PROD; },
|
|
139
|
+
message: 'Which target would you like to build?',
|
|
140
|
+
choices: targets
|
|
141
|
+
},
|
|
142
|
+
{
|
|
143
|
+
name: 'buildTargets',
|
|
144
|
+
type: 'checkbox',
|
|
145
|
+
when: function () { return mode === BuildMode.PROD; },
|
|
146
|
+
choices: targets.map(function (item) { return ({
|
|
147
|
+
name: item,
|
|
148
|
+
value: item,
|
|
149
|
+
checked: true
|
|
150
|
+
}); }),
|
|
151
|
+
message: 'Which targets would you like to build?'
|
|
152
|
+
}
|
|
153
|
+
])];
|
|
154
|
+
case 3:
|
|
110
155
|
answers = _a.sent();
|
|
111
|
-
return [2 /*return*/, [answers.target]];
|
|
156
|
+
return [2 /*return*/, mode !== BuildMode.PROD ? [answers.target] : answers.buildTargets];
|
|
157
|
+
case 4: return [2 /*return*/];
|
|
112
158
|
}
|
|
113
159
|
});
|
|
114
160
|
});
|
|
@@ -118,45 +164,43 @@ var build = function (mode, packages) {
|
|
|
118
164
|
if (mode === void 0) { mode = BuildMode.PROD; }
|
|
119
165
|
if (packages === void 0) { packages = []; }
|
|
120
166
|
return __awaiter(void 0, void 0, void 0, function () {
|
|
121
|
-
var workspace,
|
|
167
|
+
var workspace, choosePackages, buildOptions, buildInfo_1, DistDir_1, error_1;
|
|
122
168
|
return __generator(this, function (_a) {
|
|
123
169
|
switch (_a.label) {
|
|
124
170
|
case 0:
|
|
125
171
|
workspace = path.resolve('./');
|
|
126
|
-
if (
|
|
127
|
-
|
|
128
|
-
return [3 /*break*/, 3];
|
|
172
|
+
if (!!packages.length) return [3 /*break*/, 2];
|
|
173
|
+
return [4 /*yield*/, chooseBuildPackages(mode)];
|
|
129
174
|
case 1:
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
case 2:
|
|
133
|
-
choosedPackages = _a.sent();
|
|
134
|
-
if (!choosedPackages || !choosedPackages.length) {
|
|
175
|
+
choosePackages = _a.sent();
|
|
176
|
+
if (!choosePackages || !choosePackages.length) {
|
|
135
177
|
logger.error('please choose at least one package');
|
|
136
178
|
return [2 /*return*/];
|
|
137
179
|
}
|
|
138
|
-
packages.push.apply(packages,
|
|
139
|
-
_a.label =
|
|
140
|
-
case
|
|
180
|
+
packages.push.apply(packages, choosePackages);
|
|
181
|
+
_a.label = 2;
|
|
182
|
+
case 2:
|
|
141
183
|
buildOptions = {
|
|
142
184
|
path: workspace,
|
|
143
185
|
targets: packages,
|
|
144
186
|
buildMode: mode,
|
|
145
|
-
jsc:
|
|
187
|
+
jsc: TransformType.Default // 不开启 js => c
|
|
146
188
|
};
|
|
147
189
|
if (mode === BuildMode.PROD || mode === BuildMode.PREVIEW) {
|
|
148
|
-
buildOptions
|
|
190
|
+
Object.assign(buildOptions, {
|
|
191
|
+
png2vg: true
|
|
192
|
+
});
|
|
149
193
|
}
|
|
150
|
-
_a.label =
|
|
151
|
-
case
|
|
152
|
-
_a.trys.push([
|
|
153
|
-
if (!(mode === BuildMode.DEV)) return [3 /*break*/,
|
|
194
|
+
_a.label = 3;
|
|
195
|
+
case 3:
|
|
196
|
+
_a.trys.push([3, 8, , 9]);
|
|
197
|
+
if (!(mode === BuildMode.DEV)) return [3 /*break*/, 5];
|
|
154
198
|
return [4 /*yield*/, (0, node_js_1.startWithoutDist)(buildOptions)];
|
|
155
|
-
case
|
|
199
|
+
case 4:
|
|
156
200
|
_a.sent();
|
|
157
201
|
return [2 /*return*/, (0, node_js_1.getZpkBuf)(packages[0])];
|
|
158
|
-
case
|
|
159
|
-
case
|
|
202
|
+
case 5: return [4 /*yield*/, (0, node_js_1.start)(buildOptions)];
|
|
203
|
+
case 6:
|
|
160
204
|
buildInfo_1 = _a.sent();
|
|
161
205
|
if (buildInfo_1) {
|
|
162
206
|
DistDir_1 = path.join(workspace, 'dist');
|
|
@@ -167,12 +211,12 @@ var build = function (mode, packages) {
|
|
|
167
211
|
});
|
|
168
212
|
}
|
|
169
213
|
return [2 /*return*/, buildInfo_1];
|
|
170
|
-
case
|
|
171
|
-
case
|
|
214
|
+
case 7: return [3 /*break*/, 9];
|
|
215
|
+
case 8:
|
|
172
216
|
error_1 = _a.sent();
|
|
173
217
|
logger.error(error_1);
|
|
174
|
-
return [3 /*break*/,
|
|
175
|
-
case
|
|
218
|
+
return [3 /*break*/, 9];
|
|
219
|
+
case 9: return [2 /*return*/];
|
|
176
220
|
}
|
|
177
221
|
});
|
|
178
222
|
});
|
|
@@ -182,8 +226,8 @@ var buildDev = function (packages) {
|
|
|
182
226
|
return (0, exports.build)(BuildMode.DEV, packages);
|
|
183
227
|
};
|
|
184
228
|
exports.buildDev = buildDev;
|
|
185
|
-
var buildProd = function (
|
|
186
|
-
return (0, exports.build)(BuildMode.PROD,
|
|
229
|
+
var buildProd = function () {
|
|
230
|
+
return (0, exports.build)(BuildMode.PROD, []);
|
|
187
231
|
};
|
|
188
232
|
exports.buildProd = buildProd;
|
|
189
233
|
var checkIsWatchFaceProject = function () {
|
|
@@ -193,12 +237,11 @@ var checkIsWatchFaceProject = function () {
|
|
|
193
237
|
return appType === project_1.AppType.WATCHFACE;
|
|
194
238
|
};
|
|
195
239
|
var buildPreview = function (args) { return __awaiter(void 0, void 0, void 0, function () {
|
|
196
|
-
var storage,
|
|
240
|
+
var storage, _a, apptoken, userid, cname, form, buildInfo, isWatchFaceProject;
|
|
197
241
|
return __generator(this, function (_b) {
|
|
198
242
|
switch (_b.label) {
|
|
199
243
|
case 0:
|
|
200
244
|
storage = new storage_1.Storage({ cmd: lodash_1["default"].get(args, '$0') });
|
|
201
|
-
isWatchFaceProject = checkIsWatchFaceProject();
|
|
202
245
|
return [4 /*yield*/, (0, login_1.login)(args)];
|
|
203
246
|
case 1:
|
|
204
247
|
_a = _b.sent(), apptoken = _a.apptoken, userid = _a.userid, cname = _a.cname;
|
|
@@ -207,8 +250,9 @@ var buildPreview = function (args) { return __awaiter(void 0, void 0, void 0, fu
|
|
|
207
250
|
return [4 /*yield*/, (0, exports.build)(BuildMode.PREVIEW)];
|
|
208
251
|
case 2:
|
|
209
252
|
buildInfo = _b.sent();
|
|
253
|
+
isWatchFaceProject = checkIsWatchFaceProject();
|
|
210
254
|
logger.info('getting preview package...');
|
|
211
|
-
form.append('file', fs_1["default"].createReadStream("./dist/"
|
|
255
|
+
form.append('file', fs_1["default"].createReadStream("./dist/".concat(buildInfo)));
|
|
212
256
|
form.append('app_type', isWatchFaceProject ? '1' : '2');
|
|
213
257
|
form.getLength(function (err, length) { return __awaiter(void 0, void 0, void 0, function () {
|
|
214
258
|
var host, previewInfo, _a, protocol, code;
|
|
@@ -221,14 +265,14 @@ var buildPreview = function (args) { return __awaiter(void 0, void 0, void 0, fu
|
|
|
221
265
|
}
|
|
222
266
|
logger.info('generating preview qrcode...');
|
|
223
267
|
host = cname.split(',').filter(function (h) { return h.indexOf('api-mifit') > -1; })[0];
|
|
224
|
-
return [4 /*yield*/, axios_1["default"].post("https://"
|
|
225
|
-
headers: __assign(__assign({}, form.getHeaders()), { 'content-length': ""
|
|
268
|
+
return [4 /*yield*/, axios_1["default"].post("https://".concat(host, "/custom/tools/app-dial/upload?userid=").concat(userid), form, {
|
|
269
|
+
headers: __assign(__assign({}, form.getHeaders()), { 'content-length': "".concat(length), apptoken: apptoken })
|
|
226
270
|
})];
|
|
227
271
|
case 1:
|
|
228
272
|
previewInfo = _b.sent();
|
|
229
273
|
_a = lodash_1["default"].get(previewInfo, 'data', {}), protocol = _a.protocol, code = _a.code;
|
|
230
274
|
if (protocol && code) {
|
|
231
|
-
qrcode_terminal_1["default"].generate(protocol
|
|
275
|
+
qrcode_terminal_1["default"].generate("".concat(protocol, "://").concat(host, "/custom/tools/app-dial/download/").concat(code), { small: true });
|
|
232
276
|
logger.success('please use Zepp APP to scan the qrcode below to preview your app.');
|
|
233
277
|
}
|
|
234
278
|
else {
|
package/modules/config.js
CHANGED
|
@@ -70,22 +70,22 @@ var config = function (args) { return __awaiter(void 0, void 0, void 0, function
|
|
|
70
70
|
_a = lodash_1["default"].get(args, '_', []), space = _a[0], _b = _a[1], method = _b === void 0 ? '' : _b, values = _a.slice(2);
|
|
71
71
|
allowedMethods = ['get', 'set', 'delete', 'list'];
|
|
72
72
|
if (!lodash_1["default"].includes(allowedMethods, method)) {
|
|
73
|
-
logger.error("invalid method: "
|
|
73
|
+
logger.error("invalid method: ".concat(method));
|
|
74
74
|
logger.log(chalk_1["default"].yellow('try to use one of the following:'));
|
|
75
|
-
logger.log("- "
|
|
76
|
-
logger.log("- "
|
|
77
|
-
logger.log("- "
|
|
78
|
-
logger.log("- "
|
|
75
|
+
logger.log("- ".concat(cmd, " ").concat(space, " set <key>=<value> [<key>=<value> ...]"));
|
|
76
|
+
logger.log("- ".concat(cmd, " ").concat(space, " get <key> [<key> ...]"));
|
|
77
|
+
logger.log("- ".concat(cmd, " ").concat(space, " delete <key> [<key> ...]"));
|
|
78
|
+
logger.log("- ".concat(cmd, " ").concat(space, " list [--json]"));
|
|
79
79
|
process.exit(1);
|
|
80
80
|
}
|
|
81
81
|
storage = new storage_1.Storage({ cmd: lodash_1["default"].get(args, '$0') });
|
|
82
82
|
commonHandleNotKeyTips = function (method) {
|
|
83
|
-
logger.error("Please enter the data in the format: "
|
|
83
|
+
logger.error("Please enter the data in the format: ".concat(chalk_1["default"].yellow("zeus config ".concat(method, " <key>"))));
|
|
84
84
|
};
|
|
85
85
|
switch (method) {
|
|
86
86
|
case 'set': {
|
|
87
87
|
if (!values.length) {
|
|
88
|
-
logger.error("Please enter the data in the format: "
|
|
88
|
+
logger.error("Please enter the data in the format: ".concat(chalk_1["default"].yellow('zeus config set <key>=<value>')));
|
|
89
89
|
break;
|
|
90
90
|
}
|
|
91
91
|
values.forEach(function (info) {
|
|
@@ -103,7 +103,7 @@ var config = function (args) { return __awaiter(void 0, void 0, void 0, function
|
|
|
103
103
|
}
|
|
104
104
|
else {
|
|
105
105
|
storage.set(key, value);
|
|
106
|
-
logger.success("config: "
|
|
106
|
+
logger.success("config: ".concat(key, "=").concat(value));
|
|
107
107
|
}
|
|
108
108
|
});
|
|
109
109
|
break;
|
|
@@ -119,7 +119,7 @@ var config = function (args) { return __awaiter(void 0, void 0, void 0, function
|
|
|
119
119
|
logger.error('The <key> does not exist');
|
|
120
120
|
}
|
|
121
121
|
else {
|
|
122
|
-
logger.log(curKey
|
|
122
|
+
logger.log("".concat(curKey, "=").concat(storage.get(curKey)));
|
|
123
123
|
}
|
|
124
124
|
});
|
|
125
125
|
break;
|
|
@@ -136,7 +136,7 @@ var config = function (args) { return __awaiter(void 0, void 0, void 0, function
|
|
|
136
136
|
}
|
|
137
137
|
else {
|
|
138
138
|
storage["delete"](curKey);
|
|
139
|
-
logger.success("config: "
|
|
139
|
+
logger.success("config: ".concat(curKey, " deleted"));
|
|
140
140
|
}
|
|
141
141
|
});
|
|
142
142
|
break;
|
|
@@ -153,7 +153,7 @@ var config = function (args) { return __awaiter(void 0, void 0, void 0, function
|
|
|
153
153
|
}
|
|
154
154
|
else {
|
|
155
155
|
Object.keys(config_1).forEach(function (key) {
|
|
156
|
-
logger.log(key
|
|
156
|
+
logger.log("".concat(key, "=").concat(config_1[key]));
|
|
157
157
|
});
|
|
158
158
|
}
|
|
159
159
|
break;
|
package/modules/create/index.js
CHANGED
|
@@ -108,7 +108,7 @@ var create = function (args) { return __awaiter(void 0, void 0, void 0, function
|
|
|
108
108
|
if (projectName) {
|
|
109
109
|
workDir = (0, path_1.resolve)(cwdPath, projectName);
|
|
110
110
|
if (fs.existsSync(workDir)) {
|
|
111
|
-
logger.error("\""
|
|
111
|
+
logger.error("\"".concat(workDir, "/\" already exists."));
|
|
112
112
|
process.exit(1);
|
|
113
113
|
}
|
|
114
114
|
}
|
|
@@ -129,7 +129,7 @@ var create = function (args) { return __awaiter(void 0, void 0, void 0, function
|
|
|
129
129
|
appTemplateChoices = [];
|
|
130
130
|
if (!lodash_1["default"].isEmpty(localTemplates)) {
|
|
131
131
|
localTemplates.forEach(function (dirName) {
|
|
132
|
-
var dirPath = TEMPLATE_DIR
|
|
132
|
+
var dirPath = "".concat(TEMPLATE_DIR, "/").concat(dirName);
|
|
133
133
|
var dirStat = (0, fs_1.lstatSync)(dirPath);
|
|
134
134
|
if (dirStat.isDirectory()) {
|
|
135
135
|
var chooseItem = {
|
|
@@ -259,11 +259,11 @@ var create = function (args) { return __awaiter(void 0, void 0, void 0, function
|
|
|
259
259
|
case 2:
|
|
260
260
|
_b.sent();
|
|
261
261
|
if (choosePkg.type === project_1.AppSourceType.YEOMAN) {
|
|
262
|
-
logger.info(lodash_1["default"].upperFirst(cmd)
|
|
262
|
+
logger.info("".concat(lodash_1["default"].upperFirst(cmd), " application using yeoman template \"").concat(choosePkg.name, "\"."));
|
|
263
263
|
(0, yeoman_app_1.createYeomanApp)(__assign(__assign({}, answer), { env: env, templateInfo: generagtorMate[choosePkg.name] }));
|
|
264
264
|
}
|
|
265
265
|
else {
|
|
266
|
-
logger.info(lodash_1["default"].upperFirst(cmd)
|
|
266
|
+
logger.info("".concat(lodash_1["default"].upperFirst(cmd), " application using local template \"").concat(choosePkg.name, "\"."));
|
|
267
267
|
(0, local_app_1.createLocalApp)(__assign(__assign({}, answer), { templateInfo: choosePkg }));
|
|
268
268
|
}
|
|
269
269
|
logger.log('\n');
|
|
@@ -277,15 +277,15 @@ var create = function (args) { return __awaiter(void 0, void 0, void 0, function
|
|
|
277
277
|
else {
|
|
278
278
|
var shortFile = file.replace(cwdPath, '');
|
|
279
279
|
if (beforeFiles.includes(file)) {
|
|
280
|
-
logger.log(chalk_1["default"].yellow(" "
|
|
280
|
+
logger.log(chalk_1["default"].yellow(" ".concat(chalk_1["default"].bold('replace'), " ")), shortFile);
|
|
281
281
|
}
|
|
282
282
|
else {
|
|
283
|
-
logger.log(chalk_1["default"].green(" "
|
|
283
|
+
logger.log(chalk_1["default"].green(" ".concat(chalk_1["default"].bold('create'), " ")), shortFile);
|
|
284
284
|
}
|
|
285
285
|
}
|
|
286
286
|
});
|
|
287
287
|
logger.log('\n');
|
|
288
|
-
logger.success("project created successfully by \""
|
|
288
|
+
logger.success("project created successfully by \"".concat(choosePkg.name, "\" template.\n"));
|
|
289
289
|
return [4 /*yield*/, (0, sleep_1.sleep)(300)];
|
|
290
290
|
case 4:
|
|
291
291
|
_b.sent();
|
|
@@ -105,9 +105,9 @@ var createLocalApp = function (args) { return __awaiter(void 0, void 0, void 0,
|
|
|
105
105
|
defaultAssetsPath_1 = (0, path_1.resolve)(workDir, './assets/default');
|
|
106
106
|
buildTargets.forEach(function (type) {
|
|
107
107
|
var _a = device_1.deviceTargets[type], deviceName = _a.deviceName, platforms = _a.platforms, screen = _a.screen;
|
|
108
|
-
var pkgName = screen.width
|
|
108
|
+
var pkgName = "".concat(screen.width, "x").concat(screen.height, "-").concat(lodash_1["default"].kebabCase(lodash_1["default"].toLower(deviceName)));
|
|
109
109
|
lodash_1["default"].set(targets, pkgName, __assign(__assign({}, defaultTarget), { platforms: platforms, designWidth: screen.width }));
|
|
110
|
-
fs_extra_1["default"].copySync(defaultAssetsPath_1, (0, path_1.resolve)(workDir, "./assets/"
|
|
110
|
+
fs_extra_1["default"].copySync(defaultAssetsPath_1, (0, path_1.resolve)(workDir, "./assets/".concat(pkgName)));
|
|
111
111
|
});
|
|
112
112
|
fs_extra_1["default"].removeSync(defaultAssetsPath_1);
|
|
113
113
|
lodash_1["default"].set(appJson, 'targets', targets);
|
package/modules/help.js
CHANGED
|
@@ -68,19 +68,19 @@ var help = function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
|
68
68
|
return __generator(this, function (_a) {
|
|
69
69
|
pkg = fs_extra_1["default"].readJSONSync(path.resolve(__dirname, '../package.json'));
|
|
70
70
|
cmd = lodash_1["default"].get(Object.keys(pkg.bin || {}), '[0]', 'zeus');
|
|
71
|
-
logger.log("Usage: "
|
|
71
|
+
logger.log("Usage: ".concat(cmd, " <command> [args?]"));
|
|
72
72
|
logger.log('');
|
|
73
|
-
logger.log(cmd
|
|
74
|
-
logger.log(cmd
|
|
75
|
-
logger.log(cmd
|
|
76
|
-
logger.log(cmd
|
|
77
|
-
logger.log(cmd
|
|
78
|
-
logger.log(cmd
|
|
79
|
-
logger.log(cmd
|
|
80
|
-
logger.log(cmd
|
|
73
|
+
logger.log("".concat(cmd, " init init a new project in current directory"));
|
|
74
|
+
logger.log("".concat(cmd, " create <foo> add the <foo> project to current directory"));
|
|
75
|
+
logger.log("".concat(cmd, " login login to your account"));
|
|
76
|
+
logger.log("".concat(cmd, " logout Sign out of your account"));
|
|
77
|
+
logger.log("".concat(cmd, " dev run this project in development mode"));
|
|
78
|
+
logger.log("".concat(cmd, " preview preview this project in your device"));
|
|
79
|
+
logger.log("".concat(cmd, " build build this project for production"));
|
|
80
|
+
logger.log("".concat(cmd, " config <term> set or get the config value"));
|
|
81
81
|
logger.log('');
|
|
82
82
|
logger.log('');
|
|
83
|
-
logger.log(cmd
|
|
83
|
+
logger.log("".concat(cmd, "@").concat(pkg.version, " ").concat(path.resolve(__dirname, '../')));
|
|
84
84
|
return [2 /*return*/];
|
|
85
85
|
});
|
|
86
86
|
}); };
|
package/modules/login.js
CHANGED
|
@@ -99,13 +99,13 @@ var loginByLocal = function (account, password) { return __awaiter(void 0, void
|
|
|
99
99
|
token: 'access'
|
|
100
100
|
};
|
|
101
101
|
if (/^[1][0-9]{10}$/.test(account)) {
|
|
102
|
-
data.phoneOrEmail = encodeURIComponent("+86"
|
|
102
|
+
data.phoneOrEmail = encodeURIComponent("+86".concat(account));
|
|
103
103
|
}
|
|
104
104
|
data.name = data.phoneOrEmail.split('@')[0];
|
|
105
|
-
return [4 /*yield*/, postForm(REGIST_URL
|
|
105
|
+
return [4 /*yield*/, postForm("".concat(REGIST_URL, "/registrations/").concat(data.phoneOrEmail, "/tokens"), data)];
|
|
106
106
|
case 1:
|
|
107
107
|
checkInfo = _a.sent();
|
|
108
|
-
return [4 /*yield*/, postForm(LOGIN_URL
|
|
108
|
+
return [4 /*yield*/, postForm("".concat(LOGIN_URL, "/v2/client/login"), {
|
|
109
109
|
app_name: 'com.huami.webapp',
|
|
110
110
|
app_version: '4.3.0',
|
|
111
111
|
code: lodash_1["default"].get(checkInfo, 'data.access', ''),
|
|
@@ -142,7 +142,7 @@ var login = function (args) { return __awaiter(void 0, void 0, void 0, function
|
|
|
142
142
|
{
|
|
143
143
|
name: 'account',
|
|
144
144
|
type: 'input',
|
|
145
|
-
message: "Enter your account (Mobile/E-mail): "
|
|
145
|
+
message: "Enter your account (Mobile/E-mail): ".concat(accountInfo ? "(".concat(accountInfo, ")") : '')
|
|
146
146
|
},
|
|
147
147
|
{
|
|
148
148
|
name: 'password',
|
|
@@ -162,7 +162,7 @@ var login = function (args) { return __awaiter(void 0, void 0, void 0, function
|
|
|
162
162
|
loginInfo_1 = _a.sent();
|
|
163
163
|
token = lodash_1["default"].get(loginInfo_1, 'token_info.app_token');
|
|
164
164
|
if (token) {
|
|
165
|
-
logger.success("logged in with account: "
|
|
165
|
+
logger.success("logged in with account: ".concat(answer.account));
|
|
166
166
|
storage.set(project_1.loginStorageKey.account, answer.account);
|
|
167
167
|
storage.set(project_1.loginStorageKey.accountToken, token);
|
|
168
168
|
}
|
|
@@ -194,7 +194,7 @@ var login = function (args) { return __awaiter(void 0, void 0, void 0, function
|
|
|
194
194
|
});
|
|
195
195
|
server.listen(project_1.LocalServerConfig.PORT, project_1.LocalServerConfig.HOSTNAME);
|
|
196
196
|
// 打开浏览器的登录页面
|
|
197
|
-
return [4 /*yield*/, open(project_1.loginConfig.LOGIN_URL
|
|
197
|
+
return [4 /*yield*/, open("".concat(project_1.loginConfig.LOGIN_URL, "?project_name=").concat(project_1.loginConfig.PROJECT_NAME, "&platform_app=").concat(project_1.loginConfig.PLATFORM_APP, "&project_redirect_uri=").concat(project_1.loginConfig.PROJECT_REDIRECT_URI))];
|
|
198
198
|
case 1:
|
|
199
199
|
// 打开浏览器的登录页面
|
|
200
200
|
_a.sent();
|
package/modules/run.js
CHANGED
|
@@ -63,8 +63,10 @@ var fs_1 = __importDefault(require("fs"));
|
|
|
63
63
|
var lodash_1 = __importDefault(require("lodash"));
|
|
64
64
|
var chalk_1 = __importDefault(require("chalk"));
|
|
65
65
|
var path = __importStar(require("path"));
|
|
66
|
+
// import fsExtra from 'fs-extra'
|
|
66
67
|
var inquirer_1 = __importDefault(require("inquirer"));
|
|
67
68
|
var chokidar_1 = __importDefault(require("chokidar"));
|
|
69
|
+
// import * as compressing from 'compressing'
|
|
68
70
|
var logger = __importStar(require("../utils/logger"));
|
|
69
71
|
var build_1 = require("./build");
|
|
70
72
|
var storage_1 = require("./storage");
|
|
@@ -92,12 +94,12 @@ var run = function (args) { return __awaiter(void 0, void 0, void 0, function ()
|
|
|
92
94
|
{
|
|
93
95
|
name: 'host',
|
|
94
96
|
type: 'input',
|
|
95
|
-
message: "simulator host ("
|
|
97
|
+
message: "simulator host (".concat(DEFAULT_HOST, "):")
|
|
96
98
|
},
|
|
97
99
|
{
|
|
98
100
|
name: 'port',
|
|
99
101
|
type: 'input',
|
|
100
|
-
message: "simulator port ("
|
|
102
|
+
message: "simulator port (".concat(DEFAULT_PORT, "):")
|
|
101
103
|
}
|
|
102
104
|
])];
|
|
103
105
|
case 1:
|
|
@@ -112,7 +114,7 @@ var run = function (args) { return __awaiter(void 0, void 0, void 0, function ()
|
|
|
112
114
|
return [4 /*yield*/, (0, build_1.chooseBuildPackages)()];
|
|
113
115
|
case 3:
|
|
114
116
|
packages = _a.sent();
|
|
115
|
-
simulator = new simulator_1.Simulator("http://"
|
|
117
|
+
simulator = new simulator_1.Simulator("http://".concat(simulatorHost, ":").concat(simulatorPort));
|
|
116
118
|
refreshSimulator = lodash_1["default"].debounce(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
117
119
|
var zpkBuffer, targetDeviceInternalName, projectName;
|
|
118
120
|
return __generator(this, function (_a) {
|
|
@@ -126,7 +128,7 @@ var run = function (args) { return __awaiter(void 0, void 0, void 0, function ()
|
|
|
126
128
|
logger.info('rebuild done');
|
|
127
129
|
logger.info('refrshing simulator...');
|
|
128
130
|
targetDeviceInternalName = getDeviceInternalCodename(packages[0]);
|
|
129
|
-
projectName = process.cwd()
|
|
131
|
+
projectName = path.parse(process.cwd()).base;
|
|
130
132
|
simulator.upload(zpkBuffer, projectName, targetDeviceInternalName);
|
|
131
133
|
}
|
|
132
134
|
else {
|
|
@@ -161,7 +163,7 @@ var run = function (args) { return __awaiter(void 0, void 0, void 0, function ()
|
|
|
161
163
|
// }
|
|
162
164
|
if (!hasStarted) {
|
|
163
165
|
hasStarted = true;
|
|
164
|
-
logger.log(chalk_1["default"].green("["
|
|
166
|
+
logger.log(chalk_1["default"].green("[".concat(args['$0'], "] watching the changes in this project...")));
|
|
165
167
|
}
|
|
166
168
|
return [2 /*return*/];
|
|
167
169
|
}
|
package/modules/storage.js
CHANGED
|
@@ -26,7 +26,7 @@ var Storage = /** @class */ (function () {
|
|
|
26
26
|
this._dataTime = 0;
|
|
27
27
|
var homePath = os_1["default"].homedir();
|
|
28
28
|
var cmdName = 'zeus';
|
|
29
|
-
this._filePath = path_1["default"].resolve(homePath, ".zepp/."
|
|
29
|
+
this._filePath = path_1["default"].resolve(homePath, ".zepp/.".concat(cmdName));
|
|
30
30
|
this._dataTimeout = timeout || 1000 * 60;
|
|
31
31
|
this._dataEditTimeout = editTimeout || 1000;
|
|
32
32
|
this._data = {};
|
|
@@ -49,7 +49,7 @@ var Storage = /** @class */ (function () {
|
|
|
49
49
|
var _this = this;
|
|
50
50
|
var dotenvArray = [];
|
|
51
51
|
Object.keys(this._data).forEach(function (key) {
|
|
52
|
-
dotenvArray.push(key
|
|
52
|
+
dotenvArray.push("".concat(key, "=").concat(_this._data[key]));
|
|
53
53
|
});
|
|
54
54
|
fs_1["default"].writeFileSync(this._filePath, dotenvArray.join('\n'));
|
|
55
55
|
};
|