@zeppos/zeus-cli 1.1.8 → 1.1.9
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/bin/{cli.js → main.js} +9 -7
- package/bin/post-command.js +3 -5
- package/index.js +0 -3
- package/modules/bridge.js +11 -13
- package/modules/build.js +67 -215
- package/modules/create.js +193 -0
- package/modules/help.js +16 -16
- package/modules/run.js +23 -83
- package/package.json +41 -51
- package/{api → private-modules/zeppos-app-utils/dist/api}/index.js +64 -98
- package/{config → private-modules/zeppos-app-utils/dist/config}/device.js +25 -0
- package/private-modules/zeppos-app-utils/dist/config/index.js +18 -0
- package/private-modules/zeppos-app-utils/dist/config/project.js +104 -0
- package/{utils → private-modules/zeppos-app-utils/dist}/hm-analytics.js +6 -6
- package/private-modules/zeppos-app-utils/dist/index.js +38 -0
- package/private-modules/zeppos-app-utils/dist/logger/index.js +54 -0
- package/private-modules/zeppos-app-utils/dist/logger/my-logger.js +69 -0
- package/private-modules/zeppos-app-utils/dist/modules/build.js +315 -0
- package/{modules → private-modules/zeppos-app-utils/dist/modules}/config.js +32 -57
- package/private-modules/zeppos-app-utils/dist/modules/create/index.js +216 -0
- package/{modules → private-modules/zeppos-app-utils/dist/modules}/create/local-app.js +7 -7
- package/{modules → private-modules/zeppos-app-utils/dist/modules}/create/yeoman-app.js +2 -2
- package/private-modules/zeppos-app-utils/dist/modules/index.js +21 -0
- package/{modules → private-modules/zeppos-app-utils/dist/modules}/login.js +17 -41
- package/{modules → private-modules/zeppos-app-utils/dist/modules}/status.js +33 -42
- package/{public → private-modules/zeppos-app-utils/dist/public}/scripts/png2vglite.py +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/scripts/requirements.txt +0 -0
- package/{public/template/package.json → private-modules/zeppos-app-utils/dist/public/template/_package.json} +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/empty/app-side/i18n/en-US.po +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/empty/app-side/index.js +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/empty/app.js +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/empty/app.json +1 -1
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/empty/assets/default/icon.png +0 -0
- package/{public/template/empty/pages → private-modules/zeppos-app-utils/dist/public/template/empty/page}/i18n/en-US.po +0 -0
- package/{public/template/empty/pages → private-modules/zeppos-app-utils/dist/public/template/empty/page}/index.js +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/empty/setting/i18n/en-US.po +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/empty/setting/index.js +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/empty/watchface/index.js +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/hello-world/app-side/index.js +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/hello-world/app.js +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/hello-world/app.json +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/hello-world/assets/gtr3/icon.png +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/hello-world/assets/gtr3/image/logo.png +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/hello-world/assets/gtr3-pro/icon.png +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/hello-world/assets/gtr3-pro/image/logo.png +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/hello-world/assets/gts3/icon.png +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/hello-world/assets/gts3/image/logo.png +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/hello-world/page/gtr3/home/index.page.js +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/hello-world/page/gtr3/home/index.page.json +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/hello-world/page/gtr3/home/index.style.js +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/hello-world/page/gtr3-pro/home/index.page.js +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/hello-world/page/gtr3-pro/home/index.page.json +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/hello-world/page/gtr3-pro/home/index.style.js +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/hello-world/page/gts3/home/index.page.js +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/hello-world/page/gts3/home/index.page.json +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/hello-world/page/gts3/home/index.style.js +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/hello-world/page/i18n/en-US.po +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/hello-world/setting/i18n/en-US.po +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/hello-world/setting/index.js +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/hello-world/utils/index.js +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/jsconfig.json +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/app.js +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/app.json +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/assets/gtr-3-pro/images/bg/bg.png +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/assets/gtr-3-pro/images/bigNum/0.png +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/assets/gtr-3-pro/images/bigNum/1.png +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/assets/gtr-3-pro/images/bigNum/2.png +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/assets/gtr-3-pro/images/bigNum/3.png +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/assets/gtr-3-pro/images/bigNum/4.png +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/assets/gtr-3-pro/images/bigNum/5.png +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/assets/gtr-3-pro/images/bigNum/6.png +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/assets/gtr-3-pro/images/bigNum/7.png +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/assets/gtr-3-pro/images/bigNum/8.png +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/assets/gtr-3-pro/images/bigNum/9.png +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/assets/gtr-3-pro/images/bigNum/sp.png +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/assets/gtr-3-pro/images/btn/back.png +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/assets/gtr-3-pro/images/btn/lv.png +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/assets/gtr-3-pro/images/btn/red.png +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/assets/gtr-3-pro/images/point/bg.png +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/assets/gtr-3-pro/images/point/bottom.png +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/assets/gtr-3-pro/images/point/center.png +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/assets/gtr-3-pro/images/point/h.png +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/assets/gtr-3-pro/images/point/left.png +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/assets/gtr-3-pro/images/point/m.png +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/assets/gtr-3-pro/images/point/right.png +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/assets/gtr-3-pro/images/point/s.png +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/assets/gtr-3-pro/images/preview.png +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/assets/gtr-3-pro/images/second/second.png +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/assets/gtr-3-pro/images/smallNum/0.png +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/assets/gtr-3-pro/images/smallNum/1.png +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/assets/gtr-3-pro/images/smallNum/2.png +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/assets/gtr-3-pro/images/smallNum/3.png +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/assets/gtr-3-pro/images/smallNum/4.png +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/assets/gtr-3-pro/images/smallNum/5.png +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/assets/gtr-3-pro/images/smallNum/6.png +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/assets/gtr-3-pro/images/smallNum/7.png +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/assets/gtr-3-pro/images/smallNum/8.png +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/assets/gtr-3-pro/images/smallNum/9.png +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/assets/gtr-3-pro/images/smallNum/d.png +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/assets/gtr-3-pro/images/smallNum/n.png +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/assets/gtr-3-pro/images/week_ch/1.png +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/assets/gtr-3-pro/images/week_ch/2.png +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/assets/gtr-3-pro/images/week_ch/3.png +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/assets/gtr-3-pro/images/week_ch/4.png +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/assets/gtr-3-pro/images/week_ch/5.png +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/assets/gtr-3-pro/images/week_ch/6.png +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/assets/gtr-3-pro/images/week_ch/7.png +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/assets/gtr-3-pro/images/week_en/1.png +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/assets/gtr-3-pro/images/week_en/2.png +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/assets/gtr-3-pro/images/week_en/3.png +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/assets/gtr-3-pro/images/week_en/4.png +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/assets/gtr-3-pro/images/week_en/5.png +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/assets/gtr-3-pro/images/week_en/6.png +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/assets/gtr-3-pro/images/week_en/7.png +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/shared/buffer.js +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/shared/device-polyfill.js +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/shared/global.js +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/shared/js-module.js +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/shared/logger.js +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/shared/setTimeout.js +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/watchface/gtr-3-pro/index.js +0 -0
- package/{public → private-modules/zeppos-app-utils/dist/public}/template/timer/watchface/round/index.js +0 -0
- package/private-modules/zeppos-app-utils/dist/simulator.js +58 -0
- package/{modules/storage.js → private-modules/zeppos-app-utils/dist/storage/index.js} +2 -1
- package/private-modules/zeppos-app-utils/dist/tools/index.js +135 -0
- package/private-modules/zeppos-app-utils/dist/websocket.js +165 -0
- package/private-modules/zeppos-app-utils/package.json +51 -0
- package/utils/pre-check.js +9 -35
- package/config/project.js +0 -48
- package/font-icon.js +0 -27
- package/modules/create/index.js +0 -358
- package/modules/simulator.js +0 -82
- package/modules/websocket.js +0 -112
- package/utils/common.js +0 -138
- package/utils/logger.js +0 -31
- package/utils/md5.js +0 -11
- package/utils/sleep.js +0 -8
package/bin/{cli.js → main.js}
RENAMED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
"use strict";
|
|
3
|
+
require("module-alias/register");
|
|
3
4
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
4
5
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
5
6
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -46,7 +47,8 @@ var hideBin = require('yargs/helpers').hideBin;
|
|
|
46
47
|
var argv = hideBin(process.argv);
|
|
47
48
|
var pre_check_1 = require("../utils/pre-check");
|
|
48
49
|
var index_1 = require("../index");
|
|
49
|
-
var
|
|
50
|
+
var zeppos_app_utils_1 = require("zeppos-app-utils");
|
|
51
|
+
var login = zeppos_app_utils_1.modules.login, logout = zeppos_app_utils_1.modules.logout, status = zeppos_app_utils_1.modules.status, modulesConfig = zeppos_app_utils_1.modules.config;
|
|
50
52
|
var context = {};
|
|
51
53
|
var proxy = function (args) { return __awaiter(void 0, void 0, void 0, function () {
|
|
52
54
|
var res;
|
|
@@ -63,8 +65,8 @@ var proxy = function (args) { return __awaiter(void 0, void 0, void 0, function
|
|
|
63
65
|
}
|
|
64
66
|
});
|
|
65
67
|
}); };
|
|
66
|
-
(0,
|
|
67
|
-
yargs_1["default"].usage(
|
|
68
|
+
(0, zeppos_app_utils_1.HM_Analytics)('ZEPP_CLI_V');
|
|
69
|
+
yargs_1["default"].usage("Usage: ".concat(process.env.CMD_NAME, " <command> [args?]"))
|
|
68
70
|
.demandCommand(1, 'A command is required. Pass --help to see all available commands and options.')
|
|
69
71
|
.recommendCommands()
|
|
70
72
|
.help()
|
|
@@ -73,13 +75,13 @@ yargs_1["default"].usage('Usage: $0 <command> [args?]')
|
|
|
73
75
|
.group(['help', 'version'], "Base Options")
|
|
74
76
|
.command('init', 'Init a new project in current directory.', proxy, index_1.create)
|
|
75
77
|
.command('create <projectName>', 'Named the <projectName> project and add to the current directory.', proxy, index_1.create)
|
|
76
|
-
.command('login', 'Login to your account.', proxy,
|
|
77
|
-
.command('logout', 'Sign out of your account.', proxy,
|
|
78
|
+
.command('login', 'Login to your account.', proxy, login)
|
|
79
|
+
.command('logout', 'Sign out of your account.', proxy, logout)
|
|
78
80
|
.command('dev', 'Run this project in development mode.', proxy, index_1.run)
|
|
79
81
|
.command('preview', 'Preview this project in your device.', proxy, index_1.buildPreview)
|
|
80
82
|
.command('build', 'Build this project for production.', proxy, index_1.buildProd)
|
|
81
|
-
.command('status', 'View information such as login and emulator connection status.', proxy,
|
|
83
|
+
.command('status', 'View information such as login and emulator connection status.', proxy, status)
|
|
82
84
|
.command('bridge', "Connect the online App or Simulator for development and debugging.", proxy, index_1.bridge)
|
|
83
|
-
.command('config', "Operation config value.\n e.g.\n set <key>=<value> [<key>=<value> ...]\n get <key> [<key> ...]\n delete <key> [<key> ...]\n list [--json]", proxy,
|
|
85
|
+
.command('config', "Operation config value.\n e.g.\n set <key>=<value> [<key>=<value> ...]\n get <key> [<key> ...]\n delete <key> [<key> ...]\n list [--json]", proxy, modulesConfig)
|
|
84
86
|
.epilogue('For more information, see https://docs.zepp.com/')
|
|
85
87
|
.parse(argv, context);
|
package/bin/post-command.js
CHANGED
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
exports.__esModule = true;
|
|
3
|
-
var
|
|
3
|
+
var zeppos_app_utils_1 = require("zeppos-app-utils");
|
|
4
4
|
var bin = require('../package.json').bin;
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
process.env.CMD_NAME = cmdName;
|
|
8
|
-
process.env.ACCOUNT_ENV = account_env;
|
|
5
|
+
process.env.CMD_NAME = Object.keys(bin || {})[0] || 'zeus';
|
|
6
|
+
process.env.ACCOUNT_ENV = zeppos_app_utils_1.globalStorage.get('account_env') || 'production';
|
package/index.js
CHANGED
|
@@ -18,7 +18,4 @@ __exportStar(require("./modules/help"), exports);
|
|
|
18
18
|
__exportStar(require("./modules/run"), exports);
|
|
19
19
|
__exportStar(require("./modules/build"), exports);
|
|
20
20
|
__exportStar(require("./modules/create"), exports);
|
|
21
|
-
__exportStar(require("./modules/login"), exports);
|
|
22
|
-
__exportStar(require("./modules/config"), exports);
|
|
23
|
-
__exportStar(require("./modules/status"), exports);
|
|
24
21
|
__exportStar(require("./modules/bridge"), exports);
|
package/modules/bridge.js
CHANGED
|
@@ -64,13 +64,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
64
64
|
exports.__esModule = true;
|
|
65
65
|
exports.bridge = void 0;
|
|
66
66
|
var chalk_1 = __importDefault(require("chalk"));
|
|
67
|
+
var path = __importStar(require("path"));
|
|
67
68
|
var fs_1 = require("fs");
|
|
68
|
-
var
|
|
69
|
-
var index_1 = require("../api/index");
|
|
70
|
-
var websocket_1 = __importDefault(require("./websocket"));
|
|
69
|
+
var zeppos_app_utils_1 = require("zeppos-app-utils");
|
|
71
70
|
var build_1 = require("./build");
|
|
72
|
-
var
|
|
73
|
-
var login_1 = require("./login");
|
|
71
|
+
var zeppos_app_utils_2 = require("zeppos-app-utils");
|
|
74
72
|
var client;
|
|
75
73
|
var hasConnectDevice = false;
|
|
76
74
|
var choiredDevice;
|
|
@@ -170,7 +168,7 @@ var connectWSCB = function () {
|
|
|
170
168
|
}
|
|
171
169
|
else {
|
|
172
170
|
vorpal.log(chalk_1["default"].blue('Uninstalling...'));
|
|
173
|
-
_a = (0,
|
|
171
|
+
_a = (0, zeppos_app_utils_2.getInfoFromAppJson)(path.resolve('./app.json')).app, appid = _a.appId, appName = _a.appName, appType = _a.appType;
|
|
174
172
|
client.sendMessage({ type: 'delete', appid: appid, appName: appName, appType: appType }, { method: 'sysSettingPush' });
|
|
175
173
|
}
|
|
176
174
|
}
|
|
@@ -208,7 +206,7 @@ var connectWSCB = function () {
|
|
|
208
206
|
};
|
|
209
207
|
var disConnectWSCB = function () {
|
|
210
208
|
hasConnectDevice = false;
|
|
211
|
-
logger.log('Disconnected');
|
|
209
|
+
zeppos_app_utils_1.logger.log('Disconnected');
|
|
212
210
|
process.exit(1);
|
|
213
211
|
};
|
|
214
212
|
var bridge = function (args) { return __awaiter(void 0, void 0, void 0, function () {
|
|
@@ -217,21 +215,21 @@ var bridge = function (args) { return __awaiter(void 0, void 0, void 0, function
|
|
|
217
215
|
switch (_a.label) {
|
|
218
216
|
case 0:
|
|
219
217
|
_a.trys.push([0, 2, , 6]);
|
|
220
|
-
return [4,
|
|
218
|
+
return [4, zeppos_app_utils_1.api.getConnectDevServerWebSocketCode()];
|
|
221
219
|
case 1:
|
|
222
220
|
bridgeWebSocketURL = _a.sent();
|
|
223
|
-
client = new
|
|
221
|
+
client = new zeppos_app_utils_1.WebSocketClass({
|
|
224
222
|
url: "".concat(bridgeWebSocketURL, "?type=development&name=CLI"),
|
|
225
223
|
connectWSCB: connectWSCB,
|
|
226
224
|
disConnectWSCB: disConnectWSCB
|
|
227
225
|
});
|
|
228
|
-
logger.log(" - Enter 'help' to view the command.");
|
|
226
|
+
zeppos_app_utils_1.logger.log(" - Enter 'help' to view the command.");
|
|
229
227
|
return [3, 6];
|
|
230
228
|
case 2:
|
|
231
229
|
error_1 = _a.sent();
|
|
232
230
|
if (!((error_1 === null || error_1 === void 0 ? void 0 : error_1.message) === '401')) return [3, 4];
|
|
233
|
-
logger.warn("Login information is invalid. Please login again, or end this service and login again with the command 'zeus login'.");
|
|
234
|
-
return [4,
|
|
231
|
+
zeppos_app_utils_1.logger.warn("Login information is invalid. Please login again, or end this service and login again with the command 'zeus login'.");
|
|
232
|
+
return [4, zeppos_app_utils_1.modules.login().then(function (res) { return __awaiter(void 0, void 0, void 0, function () {
|
|
235
233
|
return __generator(this, function (_a) {
|
|
236
234
|
switch (_a.label) {
|
|
237
235
|
case 0:
|
|
@@ -248,7 +246,7 @@ var bridge = function (args) { return __awaiter(void 0, void 0, void 0, function
|
|
|
248
246
|
_a.sent();
|
|
249
247
|
return [3, 5];
|
|
250
248
|
case 4:
|
|
251
|
-
logger.error(error_1 === null || error_1 === void 0 ? void 0 : error_1.message);
|
|
249
|
+
zeppos_app_utils_1.logger.error(error_1 === null || error_1 === void 0 ? void 0 : error_1.message);
|
|
252
250
|
_a.label = 5;
|
|
253
251
|
case 5: return [3, 6];
|
|
254
252
|
case 6: return [2];
|
package/modules/build.js
CHANGED
|
@@ -62,23 +62,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
62
62
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
63
63
|
};
|
|
64
64
|
exports.__esModule = true;
|
|
65
|
-
exports.buildPreview = exports.buildProd = exports.
|
|
66
|
-
var node_js_1 = require("@zeppos/zpm/lib/node.js");
|
|
67
|
-
var fs_1 = __importDefault(require("fs"));
|
|
68
|
-
var rd = __importStar(require("rd"));
|
|
65
|
+
exports.buildPreview = exports.buildProd = exports.chooseBuildPackages = exports.BuildMode = void 0;
|
|
69
66
|
var path = __importStar(require("path"));
|
|
70
|
-
var lodash_1 = require("lodash");
|
|
71
67
|
var fs_extra_1 = __importDefault(require("fs-extra"));
|
|
72
|
-
var
|
|
68
|
+
var lodash_1 = require("lodash");
|
|
69
|
+
var dayjs_1 = __importDefault(require("dayjs"));
|
|
73
70
|
var qrcode_terminal_1 = __importDefault(require("qrcode-terminal"));
|
|
74
71
|
var inquirer_1 = __importDefault(require("inquirer"));
|
|
75
|
-
var
|
|
76
|
-
var
|
|
77
|
-
var hm_analytics_1 = require("../utils/hm-analytics");
|
|
78
|
-
var api_1 = require("../api");
|
|
79
|
-
var storage_1 = require("./storage");
|
|
80
|
-
var common_1 = require("../utils/common");
|
|
81
|
-
var login_1 = require("./login");
|
|
72
|
+
var zeppos_app_utils_1 = require("zeppos-app-utils");
|
|
73
|
+
var AppType = zeppos_app_utils_1.config.AppType;
|
|
82
74
|
var appJsonContent = fs_extra_1["default"].readJSONSync(path.resolve('./app.json'), { throws: false });
|
|
83
75
|
var BuildMode;
|
|
84
76
|
(function (BuildMode) {
|
|
@@ -86,36 +78,29 @@ var BuildMode;
|
|
|
86
78
|
BuildMode["PREVIEW"] = "preview";
|
|
87
79
|
BuildMode["PROD"] = "production";
|
|
88
80
|
})(BuildMode = exports.BuildMode || (exports.BuildMode = {}));
|
|
89
|
-
var
|
|
90
|
-
(function (TransformType) {
|
|
91
|
-
TransformType["Default"] = "";
|
|
92
|
-
TransformType["Js"] = "js";
|
|
93
|
-
TransformType["C"] = "c";
|
|
94
|
-
TransformType["Bin"] = "bin";
|
|
95
|
-
})(TransformType || (TransformType = {}));
|
|
96
|
-
function handleExecCommandInErrorDir(mode) {
|
|
97
|
-
logger.warn("This command needs to be executed in the root of the project.");
|
|
98
|
-
process.exit(1);
|
|
99
|
-
}
|
|
100
|
-
function chooseBuildPackages(mode) {
|
|
81
|
+
var chooseBuildPackages = function (mode, args) {
|
|
101
82
|
if (mode === void 0) { mode = 'development'; }
|
|
102
|
-
return __awaiter(
|
|
103
|
-
var targets, _a, promptTarget_1, answers;
|
|
83
|
+
return __awaiter(void 0, void 0, void 0, function () {
|
|
84
|
+
var targets, returnRes, _a, promptTarget_1, answers;
|
|
104
85
|
return __generator(this, function (_b) {
|
|
105
86
|
switch (_b.label) {
|
|
106
87
|
case 0:
|
|
107
88
|
if (!appJsonContent) {
|
|
108
|
-
|
|
89
|
+
zeppos_app_utils_1.logger.warn("This command needs to be executed in the root of the project.");
|
|
90
|
+
process.exit(1);
|
|
109
91
|
}
|
|
110
92
|
targets = Object.keys((0, lodash_1.get)(appJsonContent, 'targets', {}));
|
|
93
|
+
returnRes = [];
|
|
111
94
|
if (!!targets.length) return [3, 1];
|
|
112
|
-
logger.error('Please set at least one package.');
|
|
95
|
+
zeppos_app_utils_1.logger.error('Please set at least one package.');
|
|
113
96
|
process.exit(1);
|
|
114
97
|
return [3, 4];
|
|
115
98
|
case 1:
|
|
116
99
|
if (!(targets.length === 1)) return [3, 2];
|
|
117
|
-
|
|
100
|
+
returnRes = [targets[0]];
|
|
101
|
+
return [3, 4];
|
|
118
102
|
case 2:
|
|
103
|
+
process.env._targetDeviceToBuild = (args === null || args === void 0 ? void 0 : args.target) || '';
|
|
119
104
|
_a = process.env._targetDeviceToBuild, promptTarget_1 = _a === void 0 ? '' : _a;
|
|
120
105
|
return [4, inquirer_1["default"].prompt([
|
|
121
106
|
{
|
|
@@ -152,218 +137,85 @@ function chooseBuildPackages(mode) {
|
|
|
152
137
|
])];
|
|
153
138
|
case 3:
|
|
154
139
|
answers = _b.sent();
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
});
|
|
159
|
-
});
|
|
160
|
-
}
|
|
161
|
-
exports.chooseBuildPackages = chooseBuildPackages;
|
|
162
|
-
var build = function (mode, buildConfigOption) {
|
|
163
|
-
if (mode === void 0) { mode = BuildMode.PROD; }
|
|
164
|
-
return __awaiter(void 0, void 0, void 0, function () {
|
|
165
|
-
var workspace, packages, choosePackages, buildOptions, _a, js2c, _b, js2bin, _c, png2vg, _d, prune, curOpt, productName_1, DistDir_1, appId, name_1, newName_1, error_1;
|
|
166
|
-
return __generator(this, function (_e) {
|
|
167
|
-
switch (_e.label) {
|
|
168
|
-
case 0:
|
|
169
|
-
workspace = path.resolve('./');
|
|
170
|
-
process.env._targetDeviceToBuild = (buildConfigOption === null || buildConfigOption === void 0 ? void 0 : buildConfigOption.target) || '';
|
|
171
|
-
packages = [];
|
|
172
|
-
return [4, chooseBuildPackages(mode)];
|
|
173
|
-
case 1:
|
|
174
|
-
choosePackages = _e.sent();
|
|
175
|
-
if (!choosePackages || !choosePackages.length) {
|
|
176
|
-
logger.error('please choose at least one package.');
|
|
177
|
-
return [2];
|
|
178
|
-
}
|
|
179
|
-
packages.push.apply(packages, choosePackages);
|
|
140
|
+
returnRes = typeof answers.target === 'string' ? [answers.target] : answers.target;
|
|
141
|
+
_b.label = 4;
|
|
142
|
+
case 4:
|
|
180
143
|
if (!process.env._targetDeviceToBuild) {
|
|
181
|
-
process.env._targetDeviceToBuild =
|
|
182
|
-
}
|
|
183
|
-
buildOptions = {
|
|
184
|
-
path: workspace,
|
|
185
|
-
targets: packages,
|
|
186
|
-
buildMode: mode,
|
|
187
|
-
jsc: TransformType.Default
|
|
188
|
-
};
|
|
189
|
-
if (mode === BuildMode.PROD || mode === BuildMode.PREVIEW) {
|
|
190
|
-
_a = buildConfigOption || {}, js2c = _a.js2c, _b = _a.js2bin, js2bin = _b === void 0 ? true : _b, _c = _a.png2vg, png2vg = _c === void 0 ? true : _c, _d = _a.prune, prune = _d === void 0 ? true : _d;
|
|
191
|
-
js2c = !!((js2c === 'true') || (js2c === true));
|
|
192
|
-
js2bin = !!((js2bin === 'true') || (js2bin === true));
|
|
193
|
-
png2vg = !!((png2vg === 'true') || (png2vg === true));
|
|
194
|
-
prune = !!((prune === 'true') || (prune === true));
|
|
195
|
-
js2c && Object.assign(buildOptions, { jsc: TransformType.C });
|
|
196
|
-
js2bin && Object.assign(buildOptions, { jsc: TransformType.Bin });
|
|
197
|
-
Object.assign(buildOptions, {
|
|
198
|
-
png2vg: png2vg,
|
|
199
|
-
prune: prune
|
|
200
|
-
});
|
|
201
|
-
}
|
|
202
|
-
_e.label = 2;
|
|
203
|
-
case 2:
|
|
204
|
-
_e.trys.push([2, 7, , 8]);
|
|
205
|
-
curOpt = (buildConfigOption ? buildConfigOption._ : [''])[0];
|
|
206
|
-
if (!(mode !== BuildMode.DEV || (mode === BuildMode.DEV && curOpt === 'install'))) return [3, 4];
|
|
207
|
-
return [4, (0, node_js_1.start)(buildOptions)];
|
|
208
|
-
case 3:
|
|
209
|
-
productName_1 = _e.sent();
|
|
210
|
-
if (productName_1) {
|
|
211
|
-
DistDir_1 = path.join(workspace, 'dist');
|
|
212
|
-
appId = (0, lodash_1.get)(appJsonContent, 'app.appId');
|
|
213
|
-
name_1 = productName_1.replace(/[\s]/g, '_').split('.zab');
|
|
214
|
-
newName_1 = "".concat(appId, "-").concat(name_1[0], ".zab");
|
|
215
|
-
rd.eachFileSync(DistDir_1, function (file) {
|
|
216
|
-
var oldName = path.join(DistDir_1, productName_1);
|
|
217
|
-
if (file !== oldName) {
|
|
218
|
-
fs_extra_1["default"].removeSync(file);
|
|
219
|
-
}
|
|
220
|
-
else {
|
|
221
|
-
fs_1["default"].renameSync(oldName, path.join(DistDir_1, newName_1));
|
|
222
|
-
}
|
|
223
|
-
});
|
|
224
|
-
productName_1 = newName_1;
|
|
144
|
+
process.env._targetDeviceToBuild = returnRes[0];
|
|
225
145
|
}
|
|
226
|
-
return [2,
|
|
227
|
-
case 4:
|
|
228
|
-
if (!(mode === BuildMode.DEV)) return [3, 6];
|
|
229
|
-
return [4, (0, node_js_1.startWithoutDist)(buildOptions)];
|
|
230
|
-
case 5:
|
|
231
|
-
_e.sent();
|
|
232
|
-
return [2, (0, node_js_1.getZpkBuf)(packages[0])];
|
|
233
|
-
case 6: return [3, 8];
|
|
234
|
-
case 7:
|
|
235
|
-
error_1 = _e.sent();
|
|
236
|
-
logger.error(error_1);
|
|
237
|
-
return [3, 8];
|
|
238
|
-
case 8: return [2];
|
|
146
|
+
return [2, returnRes];
|
|
239
147
|
}
|
|
240
148
|
});
|
|
241
149
|
});
|
|
242
150
|
};
|
|
243
|
-
exports.
|
|
244
|
-
var buildDev = function (args) {
|
|
245
|
-
(0, hm_analytics_1.HM_Analytics)('ZEPP_CLI_DEV_C');
|
|
246
|
-
return (0, exports.build)(BuildMode.DEV, args);
|
|
247
|
-
};
|
|
248
|
-
exports.buildDev = buildDev;
|
|
151
|
+
exports.chooseBuildPackages = chooseBuildPackages;
|
|
249
152
|
var buildProd = function (args) { return __awaiter(void 0, void 0, void 0, function () {
|
|
250
|
-
var buildInfo;
|
|
153
|
+
var packages, appId, buildInfo;
|
|
251
154
|
return __generator(this, function (_a) {
|
|
252
155
|
switch (_a.label) {
|
|
253
|
-
case 0: return [4, (0, exports.
|
|
156
|
+
case 0: return [4, (0, exports.chooseBuildPackages)(BuildMode.PROD, args)];
|
|
254
157
|
case 1:
|
|
158
|
+
packages = _a.sent();
|
|
159
|
+
appId = (0, lodash_1.get)(appJsonContent, 'app.appId');
|
|
160
|
+
return [4, zeppos_app_utils_1.modules.build(path.resolve('./'), BuildMode.PROD, args, packages, appId)];
|
|
161
|
+
case 2:
|
|
255
162
|
buildInfo = _a.sent();
|
|
256
163
|
if (buildInfo) {
|
|
257
|
-
(0,
|
|
164
|
+
(0, zeppos_app_utils_1.HM_Analytics)('ZEPP_CLI_BUILD_C', { res: '1' });
|
|
258
165
|
}
|
|
259
166
|
else {
|
|
260
|
-
(0,
|
|
167
|
+
(0, zeppos_app_utils_1.HM_Analytics)('ZEPP_CLI_BUILD_C', { res: '0' });
|
|
261
168
|
}
|
|
262
169
|
return [2, buildInfo];
|
|
263
170
|
}
|
|
264
171
|
});
|
|
265
172
|
}); };
|
|
266
173
|
exports.buildProd = buildProd;
|
|
267
|
-
var buildPreview = function (args,
|
|
268
|
-
var _a, curCommand, curBridgeTarget, buildMode,
|
|
174
|
+
var buildPreview = function (args, callback) { return __awaiter(void 0, void 0, void 0, function () {
|
|
175
|
+
var _a, curCommand, curBridgeTarget, buildMode, appType, appId, packages, buildInfo;
|
|
269
176
|
return __generator(this, function (_b) {
|
|
270
177
|
switch (_b.label) {
|
|
271
178
|
case 0:
|
|
272
179
|
_a = args._, curCommand = _a[0], curBridgeTarget = _a[1];
|
|
273
180
|
buildMode = (curBridgeTarget && curBridgeTarget === 'simulator') ? BuildMode.DEV : BuildMode.PREVIEW;
|
|
274
|
-
logger.info('building...');
|
|
275
|
-
|
|
181
|
+
zeppos_app_utils_1.logger.info('building...');
|
|
182
|
+
appType = (0, lodash_1.get)(appJsonContent, 'app.appType');
|
|
183
|
+
appId = (0, lodash_1.get)(appJsonContent, 'app.appId');
|
|
184
|
+
return [4, (0, exports.chooseBuildPackages)(buildMode, args)];
|
|
276
185
|
case 1:
|
|
186
|
+
packages = _b.sent();
|
|
187
|
+
return [4, zeppos_app_utils_1.modules.build(path.resolve('./'), buildMode, args, packages, appId)];
|
|
188
|
+
case 2:
|
|
277
189
|
buildInfo = _b.sent();
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
return [
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
if (!((error_2 === null || error_2 === void 0 ? void 0 : error_2.message) === '401')) return [3, 5];
|
|
308
|
-
logger.warn("Login information is invalid. Please login again, or end this service and login again with the command 'zeus login'.");
|
|
309
|
-
return [4, (0, login_1.login)().then(function (res) { return __awaiter(void 0, void 0, void 0, function () {
|
|
310
|
-
return __generator(this, function (_a) {
|
|
311
|
-
args._loginAppToken = res.appToken;
|
|
312
|
-
process.env._loginAppToken = res.appToken;
|
|
313
|
-
return [2, (0, exports.buildPreview)(args, cb)];
|
|
314
|
-
});
|
|
315
|
-
}); })];
|
|
316
|
-
case 4:
|
|
317
|
-
_b.sent();
|
|
318
|
-
return [3, 6];
|
|
319
|
-
case 5:
|
|
320
|
-
logger.error(error_2 === null || error_2 === void 0 ? void 0 : error_2.message);
|
|
321
|
-
return [2];
|
|
322
|
-
case 6: return [3, 7];
|
|
323
|
-
case 7:
|
|
324
|
-
if (!(curCommand === 'preview')) return [3, 8];
|
|
325
|
-
url = "".concat(protocol, "://").concat(_subRegionalHost, "/custom/tools/app-dial/download/").concat(code);
|
|
326
|
-
if (protocol && code) {
|
|
327
|
-
logger.info('Generating preview qrcode...');
|
|
328
|
-
logger.success("Please use Zepp APP to scan the following qrcode to preview your ".concat(isWatchFaceProject ? 'WatchFace' : 'application', " within two hours."));
|
|
329
|
-
qrcode_terminal_1["default"].generate(url, { small: true });
|
|
330
|
-
storage_1.globalStorage.set({ ____preview_url: url });
|
|
331
|
-
}
|
|
332
|
-
else {
|
|
333
|
-
logger.error('Generating preview qrcode failed, please check your network.');
|
|
334
|
-
}
|
|
335
|
-
return [3, 10];
|
|
336
|
-
case 8:
|
|
337
|
-
if (!(curCommand === 'install')) return [3, 10];
|
|
338
|
-
_a = (0, common_1.getDeviceInfoFromAppJson)(), deviceSource = _a.deviceSource, appId = _a.appId, appName = _a.appName, appType_1 = _a.appType, deviceSourceArr = _a.deviceSourceArr, targetDeviceInternalName = _a.targetDeviceInternalName;
|
|
339
|
-
return [4, (0, api_1.downloadPackage)(code, deviceSource, appType_1)];
|
|
340
|
-
case 9:
|
|
341
|
-
packageInfo = _b.sent();
|
|
342
|
-
url = packageInfo;
|
|
343
|
-
preview = '';
|
|
344
|
-
if (isWatchFaceProject) {
|
|
345
|
-
downloadPackageReturn = (0, lodash_1.get)(packageInfo, 'data', {});
|
|
346
|
-
url = downloadPackageReturn.url;
|
|
347
|
-
preview = downloadPackageReturn.preview;
|
|
348
|
-
}
|
|
349
|
-
if (cb) {
|
|
350
|
-
cb({
|
|
351
|
-
appType: appType_1,
|
|
352
|
-
url: url,
|
|
353
|
-
preview: preview,
|
|
354
|
-
appid: appId,
|
|
355
|
-
name: appName,
|
|
356
|
-
"debugger": true,
|
|
357
|
-
updatedTime: Math.round(new Date().getTime() / 1000),
|
|
358
|
-
devices: deviceSourceArr,
|
|
359
|
-
target: targetDeviceInternalName
|
|
360
|
-
});
|
|
361
|
-
}
|
|
362
|
-
_b.label = 10;
|
|
363
|
-
case 10: return [2];
|
|
364
|
-
}
|
|
365
|
-
});
|
|
366
|
-
}); });
|
|
190
|
+
zeppos_app_utils_1.logger.info('getting package...');
|
|
191
|
+
return [4, zeppos_app_utils_1.modules.previewBuild(path.resolve('./'), args, "./dist/".concat(buildInfo), appType, curCommand).then(function (res) { return __awaiter(void 0, void 0, void 0, function () {
|
|
192
|
+
return __generator(this, function (_a) {
|
|
193
|
+
switch (_a.label) {
|
|
194
|
+
case 0:
|
|
195
|
+
if (!(res.type === 'preview')) return [3, 1];
|
|
196
|
+
zeppos_app_utils_1.logger.info('Generating preview QR code...');
|
|
197
|
+
zeppos_app_utils_1.logger.success("Please use Zepp APP to scan the following QR code to preview your ".concat(appType === AppType.WATCHFACE ? 'WatchFace' : 'application', "."));
|
|
198
|
+
zeppos_app_utils_1.logger.success("The QR code will expire on ".concat((0, dayjs_1["default"])().add(2, 'hour').format('YYYY-MM-DD HH:mm:ss'), "."));
|
|
199
|
+
qrcode_terminal_1["default"].generate(res.url, { small: true });
|
|
200
|
+
callback && callback(res);
|
|
201
|
+
return [3, 4];
|
|
202
|
+
case 1:
|
|
203
|
+
if (!(res === 'reTry')) return [3, 3];
|
|
204
|
+
return [4, (0, exports.buildPreview)(args)];
|
|
205
|
+
case 2:
|
|
206
|
+
_a.sent();
|
|
207
|
+
return [3, 4];
|
|
208
|
+
case 3:
|
|
209
|
+
callback && callback(res);
|
|
210
|
+
_a.label = 4;
|
|
211
|
+
case 4: return [2];
|
|
212
|
+
}
|
|
213
|
+
});
|
|
214
|
+
}); })["catch"](function () {
|
|
215
|
+
zeppos_app_utils_1.logger.error('Generating preview qrcode failed, please check your network.');
|
|
216
|
+
})];
|
|
217
|
+
case 3:
|
|
218
|
+
_b.sent();
|
|
367
219
|
return [2];
|
|
368
220
|
}
|
|
369
221
|
});
|