@zeppos/zeus-cli 1.1.1 → 1.1.2
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/api/index.js +79 -112
- package/bin/cli.js +74 -22
- package/bin/post-command.js +8 -0
- package/config/device.js +0 -1
- package/config/project.js +8 -11
- package/font-icon.js +12 -0
- package/index.js +5 -1
- package/modules/bridge.js +61 -43
- package/modules/build.js +87 -73
- package/modules/config.js +15 -14
- package/modules/create/index.js +15 -14
- package/modules/create/local-app.js +2 -3
- package/modules/create/yeoman-app.js +1 -1
- package/modules/help.js +7 -4
- package/modules/login.js +97 -130
- package/modules/run.js +31 -9
- package/modules/simulator.js +6 -2
- package/modules/status.js +48 -18
- package/modules/storage.js +4 -77
- package/modules/websocket.js +7 -10
- package/package.json +7 -2
- package/utils/common.js +5 -12
- package/utils/hm-analytics.js +54 -0
- package/utils/logger.js +1 -13
- package/utils/pre-check.js +169 -0
- package/utils/hm_analytics.js +0 -35
package/modules/storage.js
CHANGED
|
@@ -14,78 +14,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
14
14
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
15
15
|
};
|
|
16
16
|
exports.__esModule = true;
|
|
17
|
-
exports.globalStorage = exports.instanceStorage =
|
|
17
|
+
exports.globalStorage = exports.instanceStorage = void 0;
|
|
18
18
|
var dotenv_1 = __importDefault(require("dotenv"));
|
|
19
19
|
var fs_1 = __importDefault(require("fs"));
|
|
20
20
|
var os_1 = __importDefault(require("os"));
|
|
21
21
|
var path_1 = __importDefault(require("path"));
|
|
22
22
|
var fs_extra_1 = __importDefault(require("fs-extra"));
|
|
23
|
-
var
|
|
24
|
-
var Storage = /** @class */ (function () {
|
|
25
|
-
function Storage(_a) {
|
|
26
|
-
var cmd = _a.cmd, _b = _a.timeout, timeout = _b === void 0 ? 1000 * 60 : _b, _c = _a.editTimeout, editTimeout = _c === void 0 ? 1000 : _c;
|
|
27
|
-
this._dataTime = 0;
|
|
28
|
-
var homePath = os_1["default"].homedir();
|
|
29
|
-
var cmdName = 'zeus';
|
|
30
|
-
this._filePath = path_1["default"].resolve(homePath, ".zepp/.".concat(cmdName));
|
|
31
|
-
this._dataTimeout = timeout;
|
|
32
|
-
this._dataEditTimeout = editTimeout;
|
|
33
|
-
this._data = {};
|
|
34
|
-
fs_extra_1["default"].ensureFileSync(this._filePath);
|
|
35
|
-
this._load();
|
|
36
|
-
}
|
|
37
|
-
Storage.prototype._getData = function () {
|
|
38
|
-
var now = new Date().getTime();
|
|
39
|
-
if (now - this._dataTime > this._dataTimeout) {
|
|
40
|
-
this._load(now);
|
|
41
|
-
}
|
|
42
|
-
return this._data;
|
|
43
|
-
};
|
|
44
|
-
Storage.prototype._load = function (time) {
|
|
45
|
-
var now = time || new Date().getTime();
|
|
46
|
-
this._data = dotenv_1["default"].parse(fs_1["default"].readFileSync(this._filePath));
|
|
47
|
-
this._dataTime = now;
|
|
48
|
-
};
|
|
49
|
-
Storage.prototype._save = function () {
|
|
50
|
-
var _this = this;
|
|
51
|
-
var dotenvArray = [];
|
|
52
|
-
Object.keys(this._data).forEach(function (key) {
|
|
53
|
-
dotenvArray.push("".concat(key, "=").concat(_this._data[key]));
|
|
54
|
-
});
|
|
55
|
-
fs_1["default"].writeFileSync(this._filePath, dotenvArray.join('\n'));
|
|
56
|
-
};
|
|
57
|
-
Storage.prototype.getAll = function () {
|
|
58
|
-
return __assign({}, this._getData());
|
|
59
|
-
};
|
|
60
|
-
Storage.prototype.get = function (key) {
|
|
61
|
-
return this._getData()[key] || '';
|
|
62
|
-
};
|
|
63
|
-
Storage.prototype.set = function (key, value) {
|
|
64
|
-
var now = new Date().getTime();
|
|
65
|
-
if (now - this._dataTime > this._dataEditTimeout) {
|
|
66
|
-
this._load(now);
|
|
67
|
-
}
|
|
68
|
-
this._data[key] = value;
|
|
69
|
-
this._save();
|
|
70
|
-
};
|
|
71
|
-
Storage.prototype.has = function (key) {
|
|
72
|
-
return this._getData().hasOwnProperty(key);
|
|
73
|
-
};
|
|
74
|
-
Storage.prototype["delete"] = function (key) {
|
|
75
|
-
var now = new Date().getTime();
|
|
76
|
-
if (now - this._dataTime > this._dataEditTimeout) {
|
|
77
|
-
this._load(now);
|
|
78
|
-
}
|
|
79
|
-
delete this._data[key];
|
|
80
|
-
this._save();
|
|
81
|
-
};
|
|
82
|
-
return Storage;
|
|
83
|
-
}());
|
|
84
|
-
exports.Storage = Storage;
|
|
85
|
-
var instanceStorage = /** @class */ (function () {
|
|
86
|
-
// 仅允许通过 instanceStorage.initInstance 获取全局唯一实例
|
|
23
|
+
var instanceStorage = (function () {
|
|
87
24
|
function instanceStorage(path) {
|
|
88
|
-
// 如果不存在此文件,则创建,用于存储全局变量
|
|
89
25
|
fs_extra_1["default"].ensureFileSync(path);
|
|
90
26
|
this._storageFilePath = path;
|
|
91
27
|
instanceStorage._storageFilePathStatic = path;
|
|
@@ -98,7 +34,6 @@ var instanceStorage = /** @class */ (function () {
|
|
|
98
34
|
return instanceStorage.instance;
|
|
99
35
|
};
|
|
100
36
|
instanceStorage.prototype._syncStorageEnvToJson = function () {
|
|
101
|
-
// 将storageFilePath文件中键值对形式的环境变量,格式化为json并同步到_storageJsonFormatData变量,用于更新
|
|
102
37
|
this._storageJsonData = dotenv_1["default"].parse(fs_1["default"].readFileSync(this._storageFilePath));
|
|
103
38
|
};
|
|
104
39
|
instanceStorage.prototype._syncJsonDataToStorageEnv = function () {
|
|
@@ -124,27 +59,20 @@ var instanceStorage = /** @class */ (function () {
|
|
|
124
59
|
return this._storageJsonData[key] || '';
|
|
125
60
|
};
|
|
126
61
|
instanceStorage.prototype.has = function (key) {
|
|
127
|
-
// return this._storageJsonData.hasOwnProperty(key)
|
|
128
62
|
return !!this._storageJsonData[key];
|
|
129
63
|
};
|
|
130
64
|
instanceStorage.prototype.set = function (obj) {
|
|
131
|
-
// const keys = Object.keys(obj)
|
|
132
|
-
// if (keys.length) {
|
|
133
|
-
// keys.forEach(K => {
|
|
134
|
-
// this._storageJsonData[K] = obj[K]
|
|
135
|
-
// })
|
|
136
|
-
// this._syncJsonDataToStorageEnv()
|
|
137
|
-
// }
|
|
138
65
|
this._storageJsonData = __assign(__assign({}, this._storageJsonData), obj);
|
|
139
66
|
this._syncJsonDataToStorageEnv();
|
|
140
67
|
};
|
|
141
68
|
instanceStorage.prototype.deleteStorage = function (key) {
|
|
142
69
|
var _this = this;
|
|
70
|
+
var loginStorageKey = require('../config/project').loginStorageKey;
|
|
143
71
|
if (!key) {
|
|
144
72
|
this._storageJsonData = {};
|
|
145
73
|
}
|
|
146
74
|
else if (key === '____login') {
|
|
147
|
-
var ____loginKey_1 = Object.values(
|
|
75
|
+
var ____loginKey_1 = Object.values(loginStorageKey).join(',');
|
|
148
76
|
Object.keys(this._storageJsonData).forEach(function (itemK) {
|
|
149
77
|
if (____loginKey_1.includes(itemK)) {
|
|
150
78
|
delete _this._storageJsonData[itemK];
|
|
@@ -164,4 +92,3 @@ var instanceStorage = /** @class */ (function () {
|
|
|
164
92
|
}());
|
|
165
93
|
exports.instanceStorage = instanceStorage;
|
|
166
94
|
exports.globalStorage = instanceStorage.initInstance();
|
|
167
|
-
// console.log(instanceStorage.getStorage())
|
package/modules/websocket.js
CHANGED
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
|
@@ -25,17 +29,14 @@ exports.__esModule = true;
|
|
|
25
29
|
var logger = __importStar(require("../utils/logger"));
|
|
26
30
|
var ws_1 = __importDefault(require("ws"));
|
|
27
31
|
var common_1 = require("../utils/common");
|
|
28
|
-
var WebSocketClass =
|
|
32
|
+
var WebSocketClass = (function () {
|
|
29
33
|
function WebSocketClass(_a) {
|
|
30
|
-
var _this = this;
|
|
31
34
|
var url = _a.url, connectCb = _a.connectCb, disconnectCb = _a.disconnectCb;
|
|
35
|
+
var _this = this;
|
|
32
36
|
this.msgEventIDs = {};
|
|
33
37
|
this.handleListenMsgEventReturn = function (data) {
|
|
34
38
|
var message = data.toString('utf8');
|
|
35
|
-
// mark 调试时有用
|
|
36
|
-
// console.log('receivedMessage', message)
|
|
37
39
|
var me = _this;
|
|
38
|
-
// TODO: 优化判断字符串是纯字符串还是可转换成对象
|
|
39
40
|
if (message.includes('{')) {
|
|
40
41
|
message = JSON.parse(message);
|
|
41
42
|
}
|
|
@@ -58,12 +59,10 @@ var WebSocketClass = /** @class */ (function () {
|
|
|
58
59
|
}
|
|
59
60
|
};
|
|
60
61
|
this.socket = new ws_1["default"](url);
|
|
61
|
-
// 连接成功时触发
|
|
62
62
|
this.socket.on('open', function () {
|
|
63
63
|
connectCb();
|
|
64
64
|
_this.listenEvent();
|
|
65
65
|
});
|
|
66
|
-
// 断开连接时触发
|
|
67
66
|
this.socket.on('close', function () {
|
|
68
67
|
disconnectCb();
|
|
69
68
|
});
|
|
@@ -71,7 +70,6 @@ var WebSocketClass = /** @class */ (function () {
|
|
|
71
70
|
logger.error(error);
|
|
72
71
|
});
|
|
73
72
|
}
|
|
74
|
-
// Listen for messages
|
|
75
73
|
WebSocketClass.prototype.listenEvent = function () {
|
|
76
74
|
var _this = this;
|
|
77
75
|
this.socket.on('message', function (data) {
|
|
@@ -93,7 +91,6 @@ var WebSocketClass = /** @class */ (function () {
|
|
|
93
91
|
};
|
|
94
92
|
msg = JSON.stringify(msgParams);
|
|
95
93
|
}
|
|
96
|
-
// console.log('sendMessage', msg)
|
|
97
94
|
this.socket.send(msg, { binary: false });
|
|
98
95
|
};
|
|
99
96
|
WebSocketClass.prototype.createMsgEventID = function (method) {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zeppos/zeus-cli",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.2",
|
|
4
4
|
"description": "zeus mini-program tools",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"author": "zepp",
|
|
@@ -20,6 +20,8 @@
|
|
|
20
20
|
"@types/fs-extra": "^9.0.12",
|
|
21
21
|
"@types/inquirer": "^8.1.0",
|
|
22
22
|
"@types/lodash": "^4.14.172",
|
|
23
|
+
"@types/node": "^17.0.31",
|
|
24
|
+
"@types/parse-gitignore": "^1.0.0",
|
|
23
25
|
"@types/qrcode-terminal": "^0.12.0",
|
|
24
26
|
"@types/qs": "^6.9.7",
|
|
25
27
|
"@types/rimraf": "^3.0.2",
|
|
@@ -39,7 +41,7 @@
|
|
|
39
41
|
"webpack": "^5.52.0"
|
|
40
42
|
},
|
|
41
43
|
"dependencies": {
|
|
42
|
-
"@zeppos/zpm": "^2.
|
|
44
|
+
"@zeppos/zpm": "^2.3.9",
|
|
43
45
|
"axios": "^0.23.0",
|
|
44
46
|
"chalk": "^4.1.2",
|
|
45
47
|
"chokidar": "^3.5.2",
|
|
@@ -53,11 +55,14 @@
|
|
|
53
55
|
"lodash": "^4.17.21",
|
|
54
56
|
"npm-keyword": "^6.1.0",
|
|
55
57
|
"open": "^8.4.0",
|
|
58
|
+
"package-json": "^7.0.0",
|
|
59
|
+
"parse-gitignore": "^1.0.1",
|
|
56
60
|
"qrcode-terminal": "^0.12.0",
|
|
57
61
|
"qs": "^6.10.1",
|
|
58
62
|
"rd": "^2.0.1",
|
|
59
63
|
"shelljs": "^0.8.4",
|
|
60
64
|
"socket.io-client": "^4.3.0",
|
|
65
|
+
"stoppable": "^1.1.0",
|
|
61
66
|
"update-notifier": "^5.1.0",
|
|
62
67
|
"uuid": "^8.3.2",
|
|
63
68
|
"vorpal": "^1.12.0",
|
package/utils/common.js
CHANGED
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
|
@@ -33,8 +37,6 @@ function uint8ToArray(source) {
|
|
|
33
37
|
return Array.prototype.slice.call(source);
|
|
34
38
|
}
|
|
35
39
|
exports.uint8ToArray = uint8ToArray;
|
|
36
|
-
// 处理已连接设备
|
|
37
|
-
// 客户端变更推送接口文档:https://huami.feishu.cn/wiki/wikcnzt1OjVa1qazCYBPrTITEoh#bFt0xQ
|
|
38
40
|
function getOptionalConnectDevice(connectDeviceArr) {
|
|
39
41
|
var result = {};
|
|
40
42
|
connectDeviceArr.map(function (item) {
|
|
@@ -48,10 +50,7 @@ function getOptionalConnectDevice(connectDeviceArr) {
|
|
|
48
50
|
exports.getOptionalConnectDevice = getOptionalConnectDevice;
|
|
49
51
|
function handleListenMsgEvent(msgEventName, data) {
|
|
50
52
|
var _a, _b, _c;
|
|
51
|
-
// mark 调试时有用
|
|
52
|
-
// console.log(msgEventName,data)
|
|
53
53
|
switch (msgEventName) {
|
|
54
|
-
// 客户端变更推送
|
|
55
54
|
case 'sysEventPush':
|
|
56
55
|
if (typeof data === 'string') {
|
|
57
56
|
logger.info(data);
|
|
@@ -61,7 +60,6 @@ function handleListenMsgEvent(msgEventName, data) {
|
|
|
61
60
|
project_1.____inner_global_variable.bridgeOptionalDevice = JSON.stringify(connectedDevice);
|
|
62
61
|
}
|
|
63
62
|
break;
|
|
64
|
-
// 处理连接设备的返回
|
|
65
63
|
case 'connectClient':
|
|
66
64
|
var _d = data.result, result = _d === void 0 ? '' : _d, _e = data.error, error = _e === void 0 ? {} : _e;
|
|
67
65
|
if (result && result === 'success') {
|
|
@@ -73,7 +71,6 @@ function handleListenMsgEvent(msgEventName, data) {
|
|
|
73
71
|
logger.error("".concat(code, ": ").concat(message));
|
|
74
72
|
}
|
|
75
73
|
break;
|
|
76
|
-
// 监听sysSettingPush消息的返回,如uninstall删除设备(实际走的sysMessagePush)
|
|
77
74
|
case 'sysSettingPush':
|
|
78
75
|
if (typeof data === 'string') {
|
|
79
76
|
logger.info(data);
|
|
@@ -82,7 +79,6 @@ function handleListenMsgEvent(msgEventName, data) {
|
|
|
82
79
|
logger.info(data.params.content);
|
|
83
80
|
}
|
|
84
81
|
break;
|
|
85
|
-
// 监听sysMessagePush消息的返回
|
|
86
82
|
case 'sysMessagePush':
|
|
87
83
|
if (typeof data === 'string') {
|
|
88
84
|
logger.info(data);
|
|
@@ -91,7 +87,6 @@ function handleListenMsgEvent(msgEventName, data) {
|
|
|
91
87
|
logger.info(data.params.content);
|
|
92
88
|
}
|
|
93
89
|
break;
|
|
94
|
-
// 监听logPush消息的返回
|
|
95
90
|
case 'logPush':
|
|
96
91
|
if (typeof data === 'string') {
|
|
97
92
|
logger.info(data);
|
|
@@ -107,7 +102,6 @@ function handleListenMsgEvent(msgEventName, data) {
|
|
|
107
102
|
}
|
|
108
103
|
}
|
|
109
104
|
exports.handleListenMsgEvent = handleListenMsgEvent;
|
|
110
|
-
// 从 app.json 获取信息
|
|
111
105
|
var getDeviceInfoFromAppJson = function (curTarget) {
|
|
112
106
|
var _curTarget = curTarget ? curTarget : storage_1.globalStorage.get(project_1.buildStorageKey.targetDeviceToBuild);
|
|
113
107
|
var appJsonFilePath = path.resolve('./app.json');
|
|
@@ -119,7 +113,6 @@ var getDeviceInfoFromAppJson = function (curTarget) {
|
|
|
119
113
|
var deviceSourceArr = platforms.map(function (item) {
|
|
120
114
|
return item.deviceSource;
|
|
121
115
|
});
|
|
122
|
-
// TODO: deviceSource 区分国内和海外,但是用的时候只取国内的?
|
|
123
116
|
var _b = appJsonContent.app, appId = _b.appId, appName = _b.appName, appType = _b.appType;
|
|
124
117
|
return {
|
|
125
118
|
deviceSource: deviceSource,
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
exports.__esModule = true;
|
|
6
|
+
exports.HM_Analytics = void 0;
|
|
7
|
+
var os_1 = __importDefault(require("os"));
|
|
8
|
+
var uuid_1 = require("uuid");
|
|
9
|
+
var axios_1 = __importDefault(require("axios"));
|
|
10
|
+
var storage_1 = require("../modules/storage");
|
|
11
|
+
var project_1 = require("../config/project");
|
|
12
|
+
var getAnalyticsID = function () {
|
|
13
|
+
var _a;
|
|
14
|
+
var _b = storage_1.instanceStorage.getStorage(), _c = project_1.analyticsKey.id, _d = _b[_c], analyticsId = _d === void 0 ? '' : _d;
|
|
15
|
+
if (!analyticsId) {
|
|
16
|
+
var newAnalyticsId = (0, uuid_1.v4)();
|
|
17
|
+
storage_1.globalStorage.set((_a = {},
|
|
18
|
+
_a[project_1.analyticsKey.id] = newAnalyticsId,
|
|
19
|
+
_a));
|
|
20
|
+
return newAnalyticsId;
|
|
21
|
+
}
|
|
22
|
+
return analyticsId;
|
|
23
|
+
};
|
|
24
|
+
var analytics_app_id = 'eb38cc404a5211d59d8b4653cd00c51c';
|
|
25
|
+
var HM_Analytics = function (event_id, options) {
|
|
26
|
+
var eventPackage = {
|
|
27
|
+
ltp: 'devops',
|
|
28
|
+
c: {
|
|
29
|
+
uid: getAnalyticsID()
|
|
30
|
+
},
|
|
31
|
+
e: [
|
|
32
|
+
{
|
|
33
|
+
ei: event_id,
|
|
34
|
+
ep: Object.assign({
|
|
35
|
+
platform: os_1["default"].platform(),
|
|
36
|
+
release: os_1["default"].release(),
|
|
37
|
+
arch: os_1["default"].arch(),
|
|
38
|
+
node: process.version
|
|
39
|
+
}, options),
|
|
40
|
+
et: new Date().getTime(),
|
|
41
|
+
etp: 'cnt'
|
|
42
|
+
},
|
|
43
|
+
]
|
|
44
|
+
};
|
|
45
|
+
var eventPackageStr = Buffer.from(JSON.stringify(eventPackage)).toString('base64');
|
|
46
|
+
axios_1["default"].post("".concat(project_1.analyticsHost, "/api/v5/server/collect"), eventPackageStr, {
|
|
47
|
+
headers: {
|
|
48
|
+
appid: analytics_app_id
|
|
49
|
+
},
|
|
50
|
+
timeout: 300
|
|
51
|
+
})["catch"](function (_error) {
|
|
52
|
+
});
|
|
53
|
+
};
|
|
54
|
+
exports.HM_Analytics = HM_Analytics;
|
package/utils/logger.js
CHANGED
|
@@ -3,16 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
exports.__esModule = true;
|
|
6
|
-
exports.success = exports.warn = exports.error = exports.
|
|
6
|
+
exports.success = exports.warn = exports.error = exports.info = exports.log = void 0;
|
|
7
7
|
var chalk_1 = __importDefault(require("chalk"));
|
|
8
|
-
var debug = function () {
|
|
9
|
-
var args = [];
|
|
10
|
-
for (var _i = 0; _i < arguments.length; _i++) {
|
|
11
|
-
args[_i] = arguments[_i];
|
|
12
|
-
}
|
|
13
|
-
console.log.apply(console, args);
|
|
14
|
-
};
|
|
15
|
-
exports.debug = debug;
|
|
16
8
|
var log = function () {
|
|
17
9
|
var args = [];
|
|
18
10
|
for (var _i = 0; _i < arguments.length; _i++) {
|
|
@@ -25,10 +17,6 @@ var info = function (msg) {
|
|
|
25
17
|
console.log(chalk_1["default"].blue('info '), msg);
|
|
26
18
|
};
|
|
27
19
|
exports.info = info;
|
|
28
|
-
var notice = function (msg) {
|
|
29
|
-
console.log(chalk_1["default"].blue('notice '), msg);
|
|
30
|
-
};
|
|
31
|
-
exports.notice = notice;
|
|
32
20
|
var error = function (msg) {
|
|
33
21
|
console.log(chalk_1["default"].red('error '), msg);
|
|
34
22
|
};
|
|
@@ -0,0 +1,169 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
25
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
26
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
27
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
28
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
29
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
30
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
31
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
32
|
+
});
|
|
33
|
+
};
|
|
34
|
+
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
35
|
+
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
|
|
36
|
+
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
37
|
+
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
38
|
+
function step(op) {
|
|
39
|
+
if (f) throw new TypeError("Generator is already executing.");
|
|
40
|
+
while (_) try {
|
|
41
|
+
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
42
|
+
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
43
|
+
switch (op[0]) {
|
|
44
|
+
case 0: case 1: t = op; break;
|
|
45
|
+
case 4: _.label++; return { value: op[1], done: false };
|
|
46
|
+
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
47
|
+
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
48
|
+
default:
|
|
49
|
+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
50
|
+
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
51
|
+
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
52
|
+
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
53
|
+
if (t[2]) _.ops.pop();
|
|
54
|
+
_.trys.pop(); continue;
|
|
55
|
+
}
|
|
56
|
+
op = body.call(thisArg, _);
|
|
57
|
+
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
58
|
+
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
59
|
+
}
|
|
60
|
+
};
|
|
61
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
62
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
63
|
+
};
|
|
64
|
+
exports.__esModule = true;
|
|
65
|
+
exports.initVariable = exports.checkVersion = void 0;
|
|
66
|
+
var chalk_1 = __importDefault(require("chalk"));
|
|
67
|
+
var package_json_1 = __importDefault(require("package-json"));
|
|
68
|
+
var logger = __importStar(require("./logger"));
|
|
69
|
+
var font_icon_1 = require("../font-icon");
|
|
70
|
+
var storage_1 = require("../modules/storage");
|
|
71
|
+
var login_1 = require("../modules/login");
|
|
72
|
+
var project_1 = require("../config/project");
|
|
73
|
+
var _a = require('../package.json'), userVersion = _a.version, userName = _a.name, bin = _a.bin;
|
|
74
|
+
var versionCheckTimeKey = '____inner_version_check_time';
|
|
75
|
+
var versionKey = '____inner_version';
|
|
76
|
+
var _b = storage_1.instanceStorage.getStorage(), _c = versionCheckTimeKey, userVersionCheckTime = _b[_c], _d = versionKey, originVersion = _b[_d], _e = project_1.loginStorageKey.accountToken, _f = _b[_e], apptoken = _f === void 0 ? '' : _f, _g = project_1.loginStorageKey.userid, _h = _b[_g], userid = _h === void 0 ? '' : _h, _j = project_1.loginStorageKey.cname, _k = _b[_j], cname = _k === void 0 ? '' : _k, _l = _b.account_env, _accountEnv = _l === void 0 ? 'production' : _l;
|
|
77
|
+
var versionToCode = function (version) {
|
|
78
|
+
if (!version)
|
|
79
|
+
return 0;
|
|
80
|
+
var p = version.split('.').map(function (val) { return Number(val); });
|
|
81
|
+
return p[0] * 10000 + p[1] * 100;
|
|
82
|
+
};
|
|
83
|
+
var checkOriginVersion = function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
84
|
+
var versions, versionList, error_1;
|
|
85
|
+
var _a;
|
|
86
|
+
return __generator(this, function (_b) {
|
|
87
|
+
switch (_b.label) {
|
|
88
|
+
case 0:
|
|
89
|
+
_b.trys.push([0, 2, , 3]);
|
|
90
|
+
return [4, (0, package_json_1["default"])(userName, { allVersions: true, registryUrl: 'https://registry.npmjs.org/' })];
|
|
91
|
+
case 1:
|
|
92
|
+
versions = (_b.sent()).versions;
|
|
93
|
+
versionList = Object.keys(versions).filter(function (val) { return !val.includes('beta'); });
|
|
94
|
+
originVersion = versionList[versionList.length - 1];
|
|
95
|
+
userVersionCheckTime = "".concat(+new Date());
|
|
96
|
+
storage_1.globalStorage.set((_a = {},
|
|
97
|
+
_a[versionCheckTimeKey] = userVersionCheckTime,
|
|
98
|
+
_a[versionKey] = originVersion,
|
|
99
|
+
_a));
|
|
100
|
+
return [3, 3];
|
|
101
|
+
case 2:
|
|
102
|
+
error_1 = _b.sent();
|
|
103
|
+
console.log('');
|
|
104
|
+
return [3, 3];
|
|
105
|
+
case 3: return [2];
|
|
106
|
+
}
|
|
107
|
+
});
|
|
108
|
+
}); };
|
|
109
|
+
var checkVersion = function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
110
|
+
var originVersionCode, userVersionCode;
|
|
111
|
+
return __generator(this, function (_a) {
|
|
112
|
+
switch (_a.label) {
|
|
113
|
+
case 0:
|
|
114
|
+
if (!(!originVersion || !userVersionCheckTime || (+new Date() - Number(userVersionCheckTime) > 24 * 60 * 60 * 1000))) return [3, 2];
|
|
115
|
+
return [4, checkOriginVersion()];
|
|
116
|
+
case 1:
|
|
117
|
+
_a.sent();
|
|
118
|
+
_a.label = 2;
|
|
119
|
+
case 2:
|
|
120
|
+
originVersionCode = versionToCode(originVersion);
|
|
121
|
+
userVersionCode = versionToCode(userVersion);
|
|
122
|
+
if (originVersionCode - userVersionCode >= 100) {
|
|
123
|
+
logger.log(chalk_1["default"].hex('#DB8C41')(font_icon_1.updateVersion));
|
|
124
|
+
}
|
|
125
|
+
return [2];
|
|
126
|
+
}
|
|
127
|
+
});
|
|
128
|
+
}); };
|
|
129
|
+
exports.checkVersion = checkVersion;
|
|
130
|
+
var initVariable = function (args) { return __awaiter(void 0, void 0, void 0, function () {
|
|
131
|
+
var _argv, command, __env;
|
|
132
|
+
return __generator(this, function (_a) {
|
|
133
|
+
switch (_a.label) {
|
|
134
|
+
case 0:
|
|
135
|
+
_argv = (args === null || args === void 0 ? void 0 : args.argv) || { _: [], $0: 'zeus' };
|
|
136
|
+
command = _argv._[0];
|
|
137
|
+
if (!['bridge', 'preview'].includes(command)) return [3, 2];
|
|
138
|
+
if (!(!apptoken || !userid || !cname)) return [3, 2];
|
|
139
|
+
return [4, (0, login_1.login)().then(function (res) {
|
|
140
|
+
apptoken = res.appToken;
|
|
141
|
+
cname = res.cname;
|
|
142
|
+
userid = res.userId;
|
|
143
|
+
})["catch"](function (err) {
|
|
144
|
+
console.log('catch', err === null || err === void 0 ? void 0 : err.message);
|
|
145
|
+
})];
|
|
146
|
+
case 1:
|
|
147
|
+
_a.sent();
|
|
148
|
+
_a.label = 2;
|
|
149
|
+
case 2:
|
|
150
|
+
__env = {
|
|
151
|
+
_loginAppToken: apptoken,
|
|
152
|
+
_loginUserId: userid,
|
|
153
|
+
_loginCname: cname,
|
|
154
|
+
_cliLocalVersion: userVersion,
|
|
155
|
+
_cliOriginVersion: originVersion,
|
|
156
|
+
_cliName: _argv.$0,
|
|
157
|
+
_accountEnv: _accountEnv,
|
|
158
|
+
_npmName: userName,
|
|
159
|
+
_subRegionalHost: ''
|
|
160
|
+
};
|
|
161
|
+
if (cname) {
|
|
162
|
+
__env._subRegionalHost = cname.split(',').filter(function (h) { return h.indexOf('api-mifit') > -1; })[0];
|
|
163
|
+
}
|
|
164
|
+
Object.assign(process.env, __env);
|
|
165
|
+
return [2, __env];
|
|
166
|
+
}
|
|
167
|
+
});
|
|
168
|
+
}); };
|
|
169
|
+
exports.initVariable = initVariable;
|
package/utils/hm_analytics.js
DELETED
|
@@ -1,35 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
|
-
exports.__esModule = true;
|
|
6
|
-
exports.HM_Analytics = void 0;
|
|
7
|
-
var uuid_1 = require("uuid");
|
|
8
|
-
var axios_1 = __importDefault(require("axios"));
|
|
9
|
-
var project_1 = require("../config/project");
|
|
10
|
-
var analytics_app_id = 'eb38cc404a5211d59d8b4653cd00c51c';
|
|
11
|
-
var HM_Analytics = function (event_id, options) {
|
|
12
|
-
var eventPackage = {
|
|
13
|
-
ltp: "devops",
|
|
14
|
-
c: {
|
|
15
|
-
uid: (0, uuid_1.v4)()
|
|
16
|
-
},
|
|
17
|
-
e: [
|
|
18
|
-
{
|
|
19
|
-
ei: event_id,
|
|
20
|
-
ep: options,
|
|
21
|
-
et: new Date().getTime(),
|
|
22
|
-
etp: "cnt"
|
|
23
|
-
},
|
|
24
|
-
]
|
|
25
|
-
};
|
|
26
|
-
var eventPackageStr = Buffer.from(JSON.stringify(eventPackage)).toString('base64');
|
|
27
|
-
axios_1["default"].post("".concat(project_1.analyticsHost, "/api/v5/server/collect"), eventPackageStr, {
|
|
28
|
-
headers: {
|
|
29
|
-
appid: analytics_app_id
|
|
30
|
-
}
|
|
31
|
-
})["catch"](function (error) {
|
|
32
|
-
// console.log(error.message)
|
|
33
|
-
});
|
|
34
|
-
};
|
|
35
|
-
exports.HM_Analytics = HM_Analytics;
|