@sevenvip666/rop 0.1.2 → 0.1.4

package/dist/bin/index.mjs

@@ -210,7 +210,6 @@ var TauriConfig = /** @class */ (function () {
         this.identifier = identifier;
     }
     TauriConfig.fromBaseConfig = function (tauriDir) {
-        console.log(tauriDir);
         if (existsSync(join(tauriDir, 'tauri.conf.json'))) {
             var contents = readFileSync(join(tauriDir, 'tauri.conf.json')).toString();
             var config = _tryParseJsonConfig(contents);
@@ -559,13 +558,15 @@ function loadJsonWithEnv(_a) {
         config = inputConfig;
     }
     if (!config.platforms || Object.keys(config.platforms).length == 0) {
-        throw new Error('platforms is not null');
+        console.log(colors.red('The platforms property in rop.json cannot be empty.'));
+        return;
     }
     var _autoEnv = getAutoEnvByFramework((_d = config === null || config === void 0 ? void 0 : config.framework) === null || _d === void 0 ? void 0 : _d.name, config.projectPath);
     env = __assign(__assign(__assign({}, env), (_autoEnv !== null && _autoEnv !== void 0 ? _autoEnv : {})), ((_f = (_e = config.framework) === null || _e === void 0 ? void 0 : _e.env) !== null && _f !== void 0 ? _f : {}));
     // 确保配置文件中存在 host 属性
     if (!env.version) {
-        throw new Error('Missing "version" property in the configuration file.');
+        console.log(colors.red('The version property in rop.json cannot be empty.'));
+        return;
     }
     // 递归函数来替换对象中的字符串值
     function replaceEnvInObject(obj) {
@@ -582,8 +583,8 @@ function loadJsonWithEnv(_a) {
     }
     replaceEnvInObject(config);
     var targetInfos = getTargetInfo(config.platforms, platform, _arch);
-    console.log('find target file:');
-    console.log(targetInfos);
+    console.log(colors.cyan("find target file:"));
+    console.log("".concat(JSON.stringify(targetInfos)));
     return { config: config, targetInfos: targetInfos, version: env.version, arch: _arch };
 }
 var loadConfigJSON = function () {
@@ -637,8 +638,13 @@ var RopUploadApi = /** @class */ (function () {
                 switch (_c.label) {
                     case 0:
                         if (!config.accessKey) {
-                            if (!config.token || !config.projectId) {
-                                throw new Error('accessKey, token, projectId cannot be empty at the same time');
+                            if (!config.token) {
+                                console.log(colors.red("Either accessKey or token must be used"));
+                                return [2 /*return*/, false];
+                            }
+                            if (!config.projectId) {
+                                console.log(colors.red("projectId cannot be empty"));
+                                return [2 /*return*/, false];
                             }
                         }
                         if (!((_b = config.branch) !== null && _b !== void 0)) return [3 /*break*/, 1];
@@ -651,22 +657,27 @@ var RopUploadApi = /** @class */ (function () {
                     case 3:
                         branch = _a;
                         if (!branch) {
-                            throw new Error('branch not null');
+                            console.log(colors.red("branch cannot be empty"));
+                            return [2 /*return*/, false];
                         }
                         else {
                             config.branch = branch;
                         }
                         if (!config.platform) {
-                            throw new Error('platform not null');
+                            console.log(colors.red("platform cannot be empty"));
+                            return [2 /*return*/, false];
                         }
                         if (!config.arch) {
-                            throw new Error('arch not null');
+                            console.log(colors.red("arch cannot be empty"));
+                            return [2 /*return*/, false];
                         }
                         if (!config.targetPath) {
-                            throw new Error('target path not null');
+                            console.log(colors.red("target path cannot be empty"));
+                            return [2 /*return*/, false];
                         }
                         if (!fs.existsSync(config.targetPath)) {
-                            throw new Error("target file not found, file path: ".concat(config.targetPath));
+                            console.log(colors.red("target file not found, file path: ".concat(config.targetPath)));
+                            return [2 /*return*/, false];
                         }
                         // 如果更新包不存在的情况使用本身的包
                         if (config.updatePath && !fs.existsSync(config.updatePath)) {
@@ -674,7 +685,8 @@ var RopUploadApi = /** @class */ (function () {
                             config.updateName = config.targetName;
                         }
                         if (!config.version) {
-                            throw new Error('version not null');
+                            console.log(colors.red("version cannot be empty"));
+                            return [2 /*return*/, false];
                         }
                         return [2 /*return*/, config];
                 }
@@ -691,6 +703,9 @@ var RopUploadApi = /** @class */ (function () {
                     case 0: return [4 /*yield*/, this.checkParams(_config)];
                     case 1:
                         config = _c.sent();
+                        if (!config) {
+                            return [2 /*return*/];
+                        }
                         formData = new FormData();
                         fileStream = fs.createReadStream(config.targetPath);
                         multibar = new cliProgress.MultiBar({
@@ -737,7 +752,7 @@ var RopUploadApi = /** @class */ (function () {
                             formData.append('signature', config.signature);
                         }
                         if (config.autoRelease) {
-                            formData.append('autoRelease', config.autoRelease);
+                            formData.append('autoRelease', String(config.autoRelease));
                         }
                         return [4 /*yield*/, fetch$1("".concat(this.baseDomain, "/api/upload"), {
                                 method: 'POST',
@@ -755,6 +770,7 @@ var RopUploadApi = /** @class */ (function () {
                         multibar.stop();
                         fileStream.destroy();
                         updateFileStream === null || updateFileStream === void 0 ? void 0 : updateFileStream.destroy();
+                        console.log(colors.green("Upload success!"));
                         return [2 /*return*/, { success: res.ok, body: body }];
                 }
             });
@@ -863,8 +879,9 @@ var AuthApi = /** @class */ (function () {
     AuthApi.prototype.login = function (req) {
         return __awaiter(this, void 0, void 0, function () {
             var res, resBody, homedir, userFilePath;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0: return [4 /*yield*/, fetch("".concat(this.baseDomain).concat(LOGIN_API), {
                             method: 'POST',
                             headers: {
@@ -873,18 +890,13 @@ var AuthApi = /** @class */ (function () {
                             body: JSON.stringify(req),
                         })];
                     case 1:
-                        res = _a.sent();
+                        res = _b.sent();
                         return [4 /*yield*/, res.json()];
                     case 2:
-                        resBody = _a.sent();
+                        resBody = _b.sent();
                         if (!res.ok || !resBody.data) {
-                            if (!resBody.message || res.status != 400) {
-                                console.log("Login failed: status=".concat(res.status, ", statusText=").concat(res.statusText));
-                            }
-                            else {
-                                console.log(JSON.stringify(resBody));
-                            }
-                            return [2 /*return*/];
+                            console.log(colors.red("Login failed: status:".concat(res.status, ", message:").concat((_a = resBody.message) !== null && _a !== void 0 ? _a : res.statusText)));
+                            return [2 /*return*/, false];
                         }
                         homedir = path.join(os.homedir(), '.rop');
                         if (!fs.existsSync(homedir)) {
@@ -892,7 +904,7 @@ var AuthApi = /** @class */ (function () {
                         }
                         userFilePath = path.join(homedir, 'user');
                         fs.writeFileSync(userFilePath, JSON.stringify(resBody.data, null, 2), 'utf8');
-                        return [2 /*return*/];
+                        return [2 /*return*/, true];
                 }
             });
         });
@@ -906,8 +918,8 @@ var AuthApi = /** @class */ (function () {
                         homedir = path.join(os.homedir(), '.rop');
                         userFilePath = path.join(homedir, 'user');
                         if (!fs.existsSync(userFilePath)) {
-                            console.log('Unauthorized. Please execute the login command');
-                            return [2 /*return*/];
+                            console.log(colors.red("No permission! Please execute [rop login] or use --accessKey"));
+                            return [2 /*return*/, false];
                         }
                         user = JSON.parse(fs.readFileSync(userFilePath, 'utf8'));
                         return [4 /*yield*/, fetch("".concat(this.baseDomain).concat(REFRESH_TOKEN_API), {
@@ -924,17 +936,17 @@ var AuthApi = /** @class */ (function () {
                         resBody = _a.sent();
                         if (!res.ok || !resBody.data) {
                             if (!resBody.message || res.status != 400) {
-                                console.log("Refresh token failed: status=".concat(res.status, ", statusText=").concat(res.statusText));
+                                console.log(colors.red("Refresh token failed: status:".concat(res.status, ", statusText:").concat(res.statusText)));
                             }
                             else {
-                                console.log('Authorization expired please execute the login command');
+                                console.log(colors.red("Authorization expired please execute the login command"));
                                 fs.rmSync(userFilePath);
                             }
-                            throw new Error('Refresh token failed');
+                            return [2 /*return*/, false];
                         }
                         user.auth = resBody.data;
                         fs.writeFileSync(userFilePath, JSON.stringify(user), 'utf8');
-                        return [2 /*return*/];
+                        return [2 /*return*/, true];
                 }
             });
         });
@@ -990,14 +1002,14 @@ var AuthApi = /** @class */ (function () {
     };
     AuthApi.prototype.request = function (req) {
         return __awaiter(this, void 0, void 0, function () {
-            var user, res, resBody, _a;
+            var user, res, resBody, _a, result;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0: return [4 /*yield*/, this.getToken()];
                     case 1:
                         user = _b.sent();
                         if (!user) {
-                            console.log('Unauthorized. Please execute the login command');
+                            console.log(colors.red("No permission! Please execute [rop login]"));
                             return [2 /*return*/, undefined];
                         }
                         return [4 /*yield*/, req(user.auth.accessToken)];
@@ -1006,26 +1018,28 @@ var AuthApi = /** @class */ (function () {
                         return [4 /*yield*/, res.json()];
                     case 3:
                         resBody = _b.sent();
-                        if (!(!res.ok || !resBody.data)) return [3 /*break*/, 10];
+                        if (!(!res.ok || !resBody.data)) return [3 /*break*/, 11];
                         _a = res.status;
                         switch (_a) {
                             case 400: return [3 /*break*/, 4];
                             case 401: return [3 /*break*/, 5];
                         }
-                        return [3 /*break*/, 8];
+                        return [3 /*break*/, 9];
                     case 4:
                         console.log(JSON.stringify(resBody));
-                        return [3 /*break*/, 9];
+                        return [3 /*break*/, 10];
                     case 5: return [4 /*yield*/, this.refreshToken()];
                     case 6:
-                        _b.sent();
+                        result = _b.sent();
+                        if (!result) return [3 /*break*/, 8];
                         return [4 /*yield*/, this.request(req)];
                     case 7: return [2 /*return*/, _b.sent()];
-                    case 8:
-                        console.log("request failed: status=".concat(res.status, ", statusText=").concat(res.statusText));
-                        _b.label = 9;
-                    case 9: return [2 /*return*/, undefined];
-                    case 10: return [2 /*return*/, resBody.data];
+                    case 8: return [3 /*break*/, 10];
+                    case 9:
+                        console.log(colors.red("request failed: status:".concat(res.status, ", statusText:").concat(res.statusText)));
+                        _b.label = 10;
+                    case 10: return [2 /*return*/, undefined];
+                    case 11: return [2 /*return*/, resBody.data];
                 }
             });
         });
@@ -1043,7 +1057,8 @@ var init = function () { return __awaiter(void 0, void 0, void 0, function () {
             case 1:
                 user = _a.sent();
                 if (!user) {
-                    throw new Error('Unauthorized. Please execute the login command');
+                    console.log(colors.red("No permission! Please execute [rop login]"));
+                    return [2 /*return*/];
                 }
                 return [4 /*yield*/, confirm({
                         message: "Link to existing project?",
@@ -1072,7 +1087,8 @@ var init = function () { return __awaiter(void 0, void 0, void 0, function () {
             case 6:
                 project = _a.sent();
                 if (!project) {
-                    throw new Error('project not found');
+                    console.log(colors.yellow("project not found"));
+                    return [2 /*return*/];
                 }
                 projectId = project.id;
                 framework = project.framework;
@@ -1129,7 +1145,8 @@ var init = function () { return __awaiter(void 0, void 0, void 0, function () {
             case 12:
                 project = _a.sent();
                 if (!project) {
-                    throw new Error('project create failed');
+                    console.log(colors.red("project create failed"));
+                    return [2 /*return*/];
                 }
                 projectId = project.id;
                 framework = project.framework;
@@ -1146,9 +1163,11 @@ var init = function () { return __awaiter(void 0, void 0, void 0, function () {
                 return [4 /*yield*/, init.initGitignore()];
             case 16:
                 _a.sent();
-                console.log('Init successful');
-                console.log("updater endpoints : ".concat(defaultHost, "/api/tauri/").concat(projectId, "/current branch/{{target}}/{{arch}}/{{current_version}}"));
-                console.log('Please replace the current branch by yourself');
+                console.log(colors.green("Initialize project successfully!"));
+                if (framework.toLowerCase() === 'tauri') {
+                    console.log(colors.blue("updater endpoints : ".concat(defaultHost, "/api/tauri/").concat(projectId, "/[your branch]/{{target}}/{{arch}}/{{current_version}}")));
+                    console.log('Please replace [your branch] with your own branch');
+                }
                 return [2 /*return*/, {
                         projectId: projectId,
                         accessKey: accessKey,
@@ -1162,7 +1181,7 @@ var init = function () { return __awaiter(void 0, void 0, void 0, function () {
 }); };
 
 var login = function (options) { return __awaiter(void 0, void 0, void 0, function () {
-    var username, password$1, loginReq, auth;
+    var username, password$1, loginReq, auth, result;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
@@ -1179,7 +1198,7 @@ var login = function (options) { return __awaiter(void 0, void 0, void 0, functi
                 return [3 /*break*/, 5];
             case 4:
                 _a.sent();
-                console.log('cancel');
+                console.log(colors.gray('cancel'));
                 return [2 /*return*/];
             case 5: return [3 /*break*/, 1];
             case 6:
@@ -1193,7 +1212,7 @@ var login = function (options) { return __awaiter(void 0, void 0, void 0, functi
                 return [3 /*break*/, 10];
             case 9:
                 _a.sent();
-                console.log('cancel');
+                console.log(colors.gray('cancel'));
                 return [2 /*return*/];
             case 10: return [3 /*break*/, 6];
             case 11:
@@ -1204,8 +1223,10 @@ var login = function (options) { return __awaiter(void 0, void 0, void 0, functi
                 auth = new AuthApi({ baseDomain: defaultHost });
                 return [4 /*yield*/, auth.login(loginReq)];
             case 12:
-                _a.sent();
-                console.log('Login successful. Please use [rop init ]to create a project.');
+                result = _a.sent();
+                if (result) {
+                    console.log(colors.green("Login successful. Please use [rop init] to create a project."));
+                }
                 return [2 /*return*/];
         }
     });
@@ -1223,7 +1244,7 @@ var _upload = function (config) { return __awaiter(void 0, void 0, void 0, funct
                         signature = fs$1.readFileSync(artifact.sig.path, 'utf8');
                     }
                     else {
-                        console.warn('Warn sig file not found');
+                        console.log(colors.cyan('Warn sig file not found'));
                     }
                 }
                 uploadClient = new RopUploadApi({ baseDomain: (_b = config.host) !== null && _b !== void 0 ? _b : defaultHost });
@@ -1239,6 +1260,7 @@ var _upload = function (config) { return __awaiter(void 0, void 0, void 0, funct
                         updatePath: (_d = artifact.update) === null || _d === void 0 ? void 0 : _d.path,
                         updateName: (_e = artifact.update) === null || _e === void 0 ? void 0 : _e.name,
                         signature: signature,
+                        branch: config.branch,
                         autoRelease: autoRelease,
                     })];
             case 1:
@@ -1248,54 +1270,66 @@ var _upload = function (config) { return __awaiter(void 0, void 0, void 0, funct
     });
 }); };
 var upload = function (platform, arch, options) { return __awaiter(void 0, void 0, void 0, function () {
-    var configFilePath, data, projectId, token, jsonConfig, initConfig, authApi, user, targetInfos, config, reset, _i, targetInfos_1, item;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var configFilePath, res, data, projectId, token, jsonConfig, initConfig, authApi, user, targetInfos, config, reset, _i, targetInfos_1, item;
+    var _a;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
             case 0:
                 configFilePath = path.join('.', 'rop.json');
                 if (!!fs$1.existsSync(configFilePath)) return [3 /*break*/, 2];
                 return [4 /*yield*/, init()];
             case 1:
-                _a.sent();
-                _a.label = 2;
+                res = _b.sent();
+                if (!res) {
+                    return [2 /*return*/];
+                }
+                _b.label = 2;
             case 2:
                 data = loadJsonWithEnv({
                     platform: platform,
                     arch: arch,
                 });
+                if (!data) {
+                    return [2 /*return*/];
+                }
                 if (!!options.accessKey) return [3 /*break*/, 7];
                 jsonConfig = loadConfigJSON();
                 if (!!jsonConfig.projectId) return [3 /*break*/, 4];
                 return [4 /*yield*/, init()];
             case 3:
-                initConfig = _a.sent();
-                projectId = initConfig.projectId;
+                initConfig = _b.sent();
+                if (initConfig) {
+                    projectId = initConfig.projectId;
+                }
+                else {
+                    return [2 /*return*/];
+                }
                 return [3 /*break*/, 5];
             case 4:
                 projectId = jsonConfig.projectId;
-                _a.label = 5;
+                _b.label = 5;
             case 5:
                 authApi = new AuthApi({ baseDomain: defaultHost });
                 return [4 /*yield*/, authApi.checkAndRefreshToken()];
             case 6:
-                user = _a.sent();
+                user = _b.sent();
                 if (!user) {
-                    console.log('Unauthorized. Please execute the login command');
+                    console.log(colors.red("No permission! Please execute [rop login]"));
                     return [2 /*return*/];
                 }
                 token = user.auth.accessToken;
-                _a.label = 7;
+                _b.label = 7;
             case 7:
                 targetInfos = data.targetInfos, config = data.config, reset = __rest(data, ["targetInfos", "config"]);
                 _i = 0, targetInfos_1 = targetInfos;
-                _a.label = 8;
+                _b.label = 8;
             case 8:
                 if (!(_i < targetInfos_1.length)) return [3 /*break*/, 11];
                 item = targetInfos_1[_i];
-                return [4 /*yield*/, _upload(__assign(__assign({ accessKey: options.accessKey, projectId: projectId, token: token }, reset), { artifact: item.artifacts, host: config.host, platform: platform, autoRelease: options.release }))];
+                return [4 /*yield*/, _upload(__assign(__assign({ accessKey: options.accessKey, projectId: projectId, token: token }, reset), { artifact: item.artifacts, host: config.host, platform: platform, branch: options.branch, autoRelease: (_a = options.release) !== null && _a !== void 0 ? _a : false }))];
             case 9:
-                _a.sent();
-                _a.label = 10;
+                _b.sent();
+                _b.label = 10;
             case 10:
                 _i++;
                 return [3 /*break*/, 8];
@@ -1332,6 +1366,7 @@ program
     .argument('[string]', 'arch')
     .option('-a, --accessKey <string>', 'accessKey path')
     .option('-r, --release [boolean]', 'auto release')
+    .option('-b, --branch <string>', 'branch')
     .action(upload);
 // 解析命令行参数
 program.parse();