@sevenvip666/rop 0.1.6 → 0.1.8

package/dist/bin/index.mjs

@@ -15,6 +15,7 @@ import JSON5 from 'json5';
 import yaml from 'js-yaml';
 import { confirm, select, input, password } from '@inquirer/prompts';
 import * as os from 'node:os';
+import os__default from 'node:os';
 
 /******************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -1059,7 +1060,7 @@ var AuthApi = /** @class */ (function () {
 }());
 
 var init = function () { return __awaiter(void 0, void 0, void 0, function () {
-    var host, authApi, user, needLink, projectId, framework, accessKey, projectName_1, project, projectName, body_1, project, init;
+    var host, authApi, user, chooseTeam, teamSign, loginRes, homedir, teamSignFile, needLink, projectId, framework, accessKey, projectName_1, currentFolderName, project, projectName, currentFolderName, body_1, project, init;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
@@ -1073,30 +1074,76 @@ var init = function () { return __awaiter(void 0, void 0, void 0, function () {
                     process.exit(1);
                 }
                 return [4 /*yield*/, confirm({
-                        message: "Link to existing project?",
+                        message: "Do you want to choose a team?",
                     })];
             case 2:
-                needLink = _a.sent();
-                accessKey = undefined;
-                if (!needLink) return [3 /*break*/, 7];
-                _a.label = 3;
+                chooseTeam = _a.sent();
+                if (!chooseTeam) return [3 /*break*/, 5];
+                return [4 /*yield*/, authApi.request(function (token) { return __awaiter(void 0, void 0, void 0, function () {
+                        return __generator(this, function (_a) {
+                            return [2 /*return*/, fetch("".concat(host, "/api/user"), {
+                                    method: 'GET',
+                                    headers: {
+                                        Authorization: "Bearer ".concat(token),
+                                    },
+                                })];
+                        });
+                    }); })];
             case 3:
-                if (!!projectName_1) return [3 /*break*/, 5];
-                return [4 /*yield*/, input({ message: "What\u2019s the name of your existing project?" })];
+                loginRes = _a.sent();
+                if (!loginRes) {
+                    console.log(colors.red("No permission! Please execute [rop login]"));
+                    process.exit(1);
+                }
+                if ((loginRes === null || loginRes === void 0 ? void 0 : loginRes.teams.length) <= 0) {
+                    console.log(colors.yellow("You are not currently in a team, Unable to choose"));
+                    process.exit(1);
+                }
+                return [4 /*yield*/, select({
+                        message: "Please Select ".concat(colors.cyan('team')),
+                        choices: loginRes === null || loginRes === void 0 ? void 0 : loginRes.teams.map(function (item) { return ({ name: item.name, value: item.sign }); }),
+                    })];
             case 4:
+                teamSign = _a.sent();
+                homedir = path.join(os__default.homedir(), '.rop');
+                teamSignFile = path.join(homedir, 'team_sign');
+                fs.writeFileSync(teamSignFile, teamSign, 'utf8');
+                _a.label = 5;
+            case 5: return [4 /*yield*/, confirm({
+                    message: "Link to existing project?",
+                })];
+            case 6:
+                needLink = _a.sent();
+                accessKey = undefined;
+                if (!needLink) return [3 /*break*/, 11];
+                currentFolderName = getCurrentFolderName();
+                _a.label = 7;
+            case 7:
+                if (!!projectName_1) return [3 /*break*/, 9];
+                return [4 /*yield*/, input({
+                        message: "What\u2019s the name of your existing project?",
+                        default: currentFolderName,
+                    })];
+            case 8:
                 projectName_1 = _a.sent();
-                return [3 /*break*/, 3];
-            case 5: return [4 /*yield*/, authApi.request(function (token) { return __awaiter(void 0, void 0, void 0, function () {
+                return [3 /*break*/, 7];
+            case 9: return [4 /*yield*/, authApi.request(function (token) { return __awaiter(void 0, void 0, void 0, function () {
+                    var headers;
                     return __generator(this, function (_a) {
+                        headers = {
+                            Authorization: "Bearer ".concat(token),
+                        };
+                        if (teamSign) {
+                            // @ts-ignore
+                            headers['Team-sign'] = teamSign;
+                        }
                         return [2 /*return*/, fetch("".concat(host, "/api/project/").concat(projectName_1), {
                                 method: 'GET',
-                                headers: {
-                                    Authorization: "Bearer ".concat(token),
-                                },
+                                headers: headers,
                             })];
                     });
                 }); })];
-            case 6:
+            case 10:
                 project = _a.sent();
                 if (!project) {
                     console.log(colors.yellow("project not found"));
@@ -1104,17 +1151,18 @@ var init = function () { return __awaiter(void 0, void 0, void 0, function () {
                 }
                 projectId = project.id;
                 framework = project.framework;
-                return [3 /*break*/, 13];
-            case 7:
+                return [3 /*break*/, 17];
+            case 11:
                 projectName = void 0;
-                _a.label = 8;
-            case 8:
-                if (!!projectName) return [3 /*break*/, 10];
-                return [4 /*yield*/, input({ message: "What\u2019s your project\u2019s name?" })];
-            case 9:
+                currentFolderName = getCurrentFolderName();
+                _a.label = 12;
+            case 12:
+                if (!!projectName) return [3 /*break*/, 14];
+                return [4 /*yield*/, input({ message: "What\u2019s your project\u2019s name?", default: currentFolderName })];
+            case 13:
                 projectName = _a.sent();
-                return [3 /*break*/, 8];
-            case 10: return [4 /*yield*/, select({
+                return [3 /*break*/, 12];
+            case 14: return [4 /*yield*/, select({
                     message: "Please Select ".concat(colors.cyan('framework')),
                     choices: [
                         {
@@ -1135,26 +1183,30 @@ var init = function () { return __awaiter(void 0, void 0, void 0, function () {
                         },
                     ],
                 })];
-            case 11:
+            case 15:
                 framework = _a.sent();
                 body_1 = {
                     name: projectName,
                     framework: framework,
                 };
                 return [4 /*yield*/, authApi.request(function (token) { return __awaiter(void 0, void 0, void 0, function () {
+                        var headers;
                         return __generator(this, function (_a) {
+                            headers = {
+                                Authorization: "Bearer ".concat(token),
+                            };
+                            if (teamSign) {
+                                // @ts-ignore
+                                headers['Team-sign'] = teamSign;
+                            }
                             return [2 /*return*/, fetch("".concat(host, "/api/project"), {
                                     method: 'POST',
-                                    headers: {
-                                        Accept: 'application/json',
-                                        'Content-Type': 'application/json;charset=utf-8',
-                                        Authorization: "Bearer ".concat(token),
-                                    },
+                                    headers: __assign({ Accept: 'application/json', 'Content-Type': 'application/json;charset=utf-8' }, headers),
                                     body: JSON.stringify(body_1),
                                 })];
                         });
                     }); })];
-            case 12:
+            case 16:
                 project = _a.sent();
                 if (!project) {
                     console.log(colors.red("project create failed"));
@@ -1163,31 +1215,48 @@ var init = function () { return __awaiter(void 0, void 0, void 0, function () {
                 projectId = project.id;
                 framework = project.framework;
                 accessKey = project.accessKeys[0].accessKey;
-                _a.label = 13;
-            case 13:
+                _a.label = 17;
+            case 17:
                 init = new InitApi();
                 return [4 /*yield*/, init.initProjectConfigJson(framework)];
-            case 14:
-                if (!_a.sent()) return [3 /*break*/, 17];
+            case 18:
+                if (!_a.sent()) return [3 /*break*/, 21];
                 return [4 /*yield*/, init.initRopConfig(projectId, accessKey)];
-            case 15:
+            case 19:
                 _a.sent();
                 return [4 /*yield*/, init.initGitignore()];
-            case 16:
+            case 20:
                 _a.sent();
                 console.log(colors.green("Initialize project successfully!"));
                 if (framework.toLowerCase() === 'tauri') {
                     console.log(colors.blue("updater endpoints : ".concat(host, "/api/tauri/").concat(projectId, "/[your branch]/{{target}}/{{arch}}/{{current_version}}")));
                     console.log('Please replace [your branch] with your own branch');
                 }
-                _a.label = 17;
-            case 17: return [2 /*return*/, {
+                _a.label = 21;
+            case 21: return [2 /*return*/, {
                     projectId: projectId,
                     accessKey: accessKey,
                 }];
         }
     });
 }); };
+var getTeamSign = function () { return __awaiter(void 0, void 0, void 0, function () {
+    var homedir, teamSignFilePath;
+    return __generator(this, function (_a) {
+        homedir = path.join(os__default.homedir(), '.rop');
+        teamSignFilePath = path.join(homedir, 'team_sign');
+        if (fs.existsSync(teamSignFilePath)) {
+            return [2 /*return*/, fs.readFileSync(teamSignFilePath, 'utf8')];
+        }
+        else {
+            return [2 /*return*/, undefined];
+        }
+    });
+}); };
+function getCurrentFolderName() {
+    var __dirname = path.resolve();
+    return path.basename(__dirname);
+}
 
 var login = function (options) { return __awaiter(void 0, void 0, void 0, function () {
     var username, password$1, loginReq, auth, result;
@@ -1245,13 +1314,13 @@ var login = function (options) { return __awaiter(void 0, void 0, void 0, functi
 }); };
 
 var upload = function (platform, arch, options) { return __awaiter(void 0, void 0, void 0, function () {
-    var host, projectId, token, jsonConfig, initConfig, authApi, user, configFilePath, data, targetInfos, reset, _i, targetInfos_1, item;
+    var host, projectId, token, teamSign, jsonConfig, initConfig, authApi, user, configFilePath, data, targetInfos, reset, _i, targetInfos_1, item;
     var _a;
     return __generator(this, function (_b) {
         switch (_b.label) {
             case 0:
                 host = getHost();
-                if (!!options.accessKey) return [3 /*break*/, 5];
+                if (!!options.accessKey) return [3 /*break*/, 6];
                 jsonConfig = loadConfigJSON();
                 if (!!jsonConfig.projectId) return [3 /*break*/, 2];
                 return [4 /*yield*/, init()];
@@ -1277,8 +1346,11 @@ var upload = function (platform, arch, options) { return __awaiter(void 0, void
                     process.exit(1);
                 }
                 token = user.auth.accessToken;
-                _b.label = 5;
+                return [4 /*yield*/, getTeamSign()];
             case 5:
+                teamSign = _b.sent();
+                _b.label = 6;
+            case 6:
                 configFilePath = path.join('.', 'rop.json');
                 if (!fs$1.existsSync(configFilePath)) {
                     console.log(colors.red('rop.json not found'));
@@ -1293,28 +1365,28 @@ var upload = function (platform, arch, options) { return __awaiter(void 0, void
                 }
                 targetInfos = data.targetInfos, data.config, reset = __rest(data, ["targetInfos", "config"]);
                 _i = 0, targetInfos_1 = targetInfos;
-                _b.label = 6;
-            case 6:
-                if (!(_i < targetInfos_1.length)) return [3 /*break*/, 9];
-                item = targetInfos_1[_i];
-                return [4 /*yield*/, _upload(__assign(__assign({ accessKey: options.accessKey, projectId: projectId, token: token }, reset), { artifact: item.artifacts, host: host, platform: platform, branch: options.branch, autoRelease: (_a = options.release) !== null && _a !== void 0 ? _a : false }))];
+                _b.label = 7;
             case 7:
-                _b.sent();
-                _b.label = 8;
+                if (!(_i < targetInfos_1.length)) return [3 /*break*/, 10];
+                item = targetInfos_1[_i];
+                return [4 /*yield*/, _upload(__assign(__assign({ accessKey: options.accessKey, projectId: projectId, token: token, teamSign: teamSign }, reset), { artifact: item.artifacts, host: host, platform: platform, branch: options.branch, autoRelease: (_a = options.release) !== null && _a !== void 0 ? _a : false }))];
             case 8:
+                _b.sent();
+                _b.label = 9;
+            case 9:
                 _i++;
-                return [3 /*break*/, 6];
-            case 9: return [2 /*return*/];
+                return [3 /*break*/, 7];
+            case 10: return [2 /*return*/];
         }
     });
 }); };
 var _upload = function (config) { return __awaiter(void 0, void 0, void 0, function () {
-    var accessKey, projectId, token, artifact, arch, version, platform, autoRelease, signature, uploadClient;
+    var accessKey, projectId, token, teamSign, artifact, arch, version, platform, autoRelease, signature, uploadClient;
     var _a, _b, _c, _d, _e;
     return __generator(this, function (_f) {
         switch (_f.label) {
             case 0:
-                accessKey = config.accessKey, projectId = config.projectId, token = config.token, artifact = config.artifact, arch = config.arch, version = config.version, platform = config.platform, config.host, autoRelease = config.autoRelease;
+                accessKey = config.accessKey, projectId = config.projectId, token = config.token, teamSign = config.teamSign, artifact = config.artifact, arch = config.arch, version = config.version, platform = config.platform, config.host, autoRelease = config.autoRelease;
                 if ((_a = artifact.sig) === null || _a === void 0 ? void 0 : _a.path) {
                     if (fs$1.existsSync(artifact.sig.path)) {
                         signature = fs$1.readFileSync(artifact.sig.path, 'utf8');
@@ -1328,6 +1400,7 @@ var _upload = function (config) { return __awaiter(void 0, void 0, void 0, funct
                         accessKey: accessKey,
                         projectId: projectId,
                         token: token,
+                        teamSign: teamSign,
                         arch: arch,
                         platform: platform,
                         version: version,

package/dist/types/types.d.ts

@@ -21,6 +21,7 @@ export interface UploadDto {
     platform: Platform;
     accessKey?: string;
     token?: string;
+    teamSign?: string;
     projectId?: string;
     branch?: string;
     version?: string;
@@ -68,6 +69,7 @@ export type LoginReq = {
 };
 export type LoginRes = {
     auth: RefreshTokenType;
+    user: UserInfoType;
 };
 export type RefreshTokenType = {
     accessToken: string;
@@ -92,4 +94,17 @@ export type AccessKeyType = {
     enabled: boolean;
     projectId: string;
 };
+export type UserInfoType = {
+    username: string;
+    accountId: string;
+    teams: TeamType[];
+};
+export type TeamType = {
+    key: string;
+    name: string;
+    description: string;
+    role: string;
+    accountId: string;
+    sign: string;
+};
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sevenvip666/rop",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "files": [
     "dist"
   ],