bdy 1.20.2-stage → 1.20.3-master

package/distTs/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bdy",
   "preferGlobal": false,
-  "version": "1.20.2-stage",
+  "version": "1.20.3-master",
   "type": "commonjs",
   "license": "MIT",
   "scripts": {

package/distTs/src/api/client.js

@@ -241,72 +241,6 @@ class ApiClient {
             parseResponseBody: true,
         });
     }
-    async getVtSuites(workspace, project) {
-        return await this.request({
-            method: 'GET',
-            path: `/workspaces/${encodeURIComponent(workspace)}/projects/${encodeURIComponent(project)}/visual-tests/suites`,
-            parseResponseBody: true,
-        });
-    }
-    async getCrawlSuites(workspace, project) {
-        return await this.request({
-            method: 'GET',
-            path: `/workspaces/${encodeURIComponent(workspace)}/projects/${encodeURIComponent(project)}/crawl/suites`,
-            parseResponseBody: true,
-        });
-    }
-    async getUtSuites(workspace, project) {
-        return await this.request({
-            method: 'GET',
-            path: `/workspaces/${encodeURIComponent(workspace)}/projects/${encodeURIComponent(project)}/unit-tests/suites`,
-            parseResponseBody: true,
-        });
-    }
-    async createVtSuite(workspace, project, body) {
-        return await this.request({
-            method: 'POST',
-            path: `/workspaces/${encodeURIComponent(workspace)}/projects/${encodeURIComponent(project)}/visual-tests/suites`,
-            body,
-            parseResponseBody: true,
-        });
-    }
-    async createCrawlSuite(workspace, project, body) {
-        return await this.request({
-            method: 'POST',
-            path: `/workspaces/${encodeURIComponent(workspace)}/projects/${encodeURIComponent(project)}/crawl/suites`,
-            body,
-            parseResponseBody: true,
-        });
-    }
-    async createUtSuite(workspace, project, body) {
-        return await this.request({
-            method: 'POST',
-            path: `/workspaces/${encodeURIComponent(workspace)}/projects/${encodeURIComponent(project)}/unit-tests/suites`,
-            body,
-            parseResponseBody: true,
-        });
-    }
-    async getVtSuiteToken(workspace, project, suiteId) {
-        return await this.request({
-            method: 'GET',
-            path: `/workspaces/${encodeURIComponent(workspace)}/projects/${encodeURIComponent(project)}/visual-tests/suites/${encodeURIComponent(suiteId)}/token`,
-            parseResponseBody: true,
-        });
-    }
-    async getCrawlSuiteToken(workspace, project, suiteId) {
-        return await this.request({
-            method: 'GET',
-            path: `/workspaces/${encodeURIComponent(workspace)}/projects/${encodeURIComponent(project)}/crawl/suites/${encodeURIComponent(suiteId)}/token`,
-            parseResponseBody: true,
-        });
-    }
-    async getUtSuiteToken(workspace, project, suiteId) {
-        return await this.request({
-            method: 'GET',
-            path: `/workspaces/${encodeURIComponent(workspace)}/projects/${encodeURIComponent(project)}/unit-tests/suites/${encodeURIComponent(suiteId)}/token`,
-            parseResponseBody: true,
-        });
-    }
     async getInvokerEmails() {
         return await this.request({
             method: 'GET',
@@ -754,23 +688,6 @@ class ApiClient {
             parseResponseBody: true,
         });
     }
-    async resolveIdentifiers(workspace, params) {
-        let query = '';
-        Object.entries(params).forEach(([key, value]) => {
-            if (value === undefined)
-                return;
-            if (!query)
-                query += '?';
-            else
-                query += '&';
-            query += encodeURIComponent(key) + '=' + encodeURIComponent(value);
-        });
-        return await this.request({
-            method: 'GET',
-            path: `/workspaces/${encodeURIComponent(workspace)}/identifiers${query}`,
-            parseResponseBody: true,
-        });
-    }
     async getPipelineByIdentifier(workspace, project, identifier) {
         return await this.getResourceByIdentifier(workspace, {
             project,

package/distTs/src/command/login.js

@@ -77,6 +77,12 @@ async function oauthServer(api, clientId, clientSecret) {
         };
         const s = node_http_1.default.createServer(async (req, res) => {
             res.setHeader('access-control-allow-origin', '*');
+            res.setHeader('access-control-allow-private-network', 'true');
+            if (req.method === 'OPTIONS') {
+                res.writeHead(204);
+                res.end();
+                return;
+            }
             const url = new URL(req.url || '', `http://${OAUTH_CLIENT_APP_HOST}`);
             const urlCode = url.searchParams.get('code');
             const urlState = url.searchParams.get('state');

package/distTs/src/command/whoami.js

@@ -30,18 +30,6 @@ commandWhoami.action(async () => {
     if (localProject) {
         output_1.default.normal(`Project: ${localProject}`);
     }
-    const vtSuite = cfg_2.default.getVtSuite();
-    const utSuite = cfg_2.default.getUtSuite();
-    const crawlSuite = cfg_2.default.getCrawlSuite();
-    if (vtSuite) {
-        output_1.default.normal(`Visual test suite: ${vtSuite}`);
-    }
-    if (utSuite) {
-        output_1.default.normal(`Unit test suite: ${utSuite}`);
-    }
-    if (crawlSuite) {
-        output_1.default.normal(`Crawl suite: ${crawlSuite}`);
-    }
     output_1.default.exitNormal();
 });
 exports.default = commandWhoami;

package/distTs/src/index.js

@@ -11,8 +11,9 @@ const pre_1 = __importDefault(require("./command/pre"));
 const stream_1 = __importDefault(require("stream"));
 const utils_1 = require("./utils");
 const texts_1 = require("./texts");
-const crawl_1 = __importDefault(require("./command/crawl"));
-const tests_1 = __importDefault(require("./command/tests"));
+const vt_1 = __importDefault(require("./command/vt"));
+const scrape_1 = __importDefault(require("./command/scrape"));
+const ut_1 = __importDefault(require("./command/ut"));
 const tunnel_1 = __importDefault(require("./command/tunnel"));
 const pipeline_1 = __importDefault(require("./command/pipeline"));
 const sandbox_1 = __importDefault(require("./command/sandbox"));
@@ -40,8 +41,9 @@ program.addCommand(tunnel_1.default);
 if (!(0, utils_1.isDocker)())
     program.addCommand(agent_1.default);
 program.addCommand(version_1.default);
-program.addCommand(crawl_1.default);
-program.addCommand(tests_1.default);
+program.addCommand(vt_1.default);
+program.addCommand(scrape_1.default);
+program.addCommand(ut_1.default);
 program.addCommand(pipeline_1.default);
 program.addCommand(artifact_1.default);
 program.addCommand(sandbox_1.default);

package/distTs/src/input.js

@@ -433,14 +433,29 @@ class Input {
     }
     static restApiBaseUrlFromToken(token) {
         // bdy_sb_us_aHR0cHM6Ly9hcGkuc2Q1LmNvbQ_f92ml8f1p27nzo45806vczm6c78d0
+        // bdy_oa_us_bbxif8yup45555vo4cey4qvgfexrrk
         const s = (token || '').split('_');
         if (s.length > 1) {
-            const base = s[s.length - 2];
-            try {
-                return Buffer.from(base, 'base64').toString('utf8');
+            if (s.length === 5) {
+                const base = s[s.length - 2];
+                try {
+                    return Buffer.from(base, 'base64').toString('utf8');
+                }
+                catch {
+                    // do nothing
+                }
             }
-            catch {
-                // do nothing
+            else if (s.length === 4) {
+                const region = s[2];
+                if (region === utils_1.REST_API_REGION.US) {
+                    return utils_1.REST_API_ENDPOINT.US;
+                }
+                else if (region === utils_1.REST_API_REGION.EU) {
+                    return utils_1.REST_API_ENDPOINT.EU;
+                }
+                else if (region === utils_1.REST_API_REGION.AS) {
+                    return utils_1.REST_API_ENDPOINT.AS;
+                }
             }
         }
         return null;
@@ -761,84 +776,6 @@ class Input {
             host: d.host,
         };
     }
-    static async resolveSuiteId(client, workspace, project, identifier, type) {
-        const paramKey = type === 'vt' ? 'visual_test_suite'
-            : type === 'crawl' ? 'crawl_suite'
-                : 'unit_test_suite';
-        const responseKey = type === 'vt' ? 'visual_test_suite_id'
-            : type === 'crawl' ? 'crawl_suite_id'
-                : 'unit_test_suite_id';
-        try {
-            const result = await client.resolveIdentifiers(workspace, {
-                project,
-                [paramKey]: identifier,
-            });
-            return result?.[responseKey] ? String(result[responseKey]) : null;
-        }
-        catch {
-            return null;
-        }
-    }
-    static async vtSuiteToken() {
-        const envToken = process.env.BUDDY_VT_TOKEN;
-        if (envToken)
-            return envToken;
-        const ProjectCfg = require('./project/cfg').default;
-        const suiteIdentifier = ProjectCfg.getVtSuite();
-        if (suiteIdentifier && (cfg_1.default.getApiToken() || process.env.BUDDY_TOKEN)) {
-            const workspace = Input.restApiWorkspace('', true);
-            const project = Input.restApiProject('', true);
-            if (workspace && project) {
-                const client = Input.restApiTokenClient();
-                const suiteId = await Input.resolveSuiteId(client, workspace, project, suiteIdentifier, 'vt');
-                if (!suiteId)
-                    return '';
-                const result = await client.getVtSuiteToken(workspace, project, suiteId);
-                return String(result?.token || '');
-            }
-        }
-        return '';
-    }
-    static async crawlSuiteToken() {
-        const envToken = process.env.BUDDY_CRAWL_TOKEN;
-        if (envToken)
-            return envToken;
-        const ProjectCfg = require('./project/cfg').default;
-        const suiteIdentifier = ProjectCfg.getCrawlSuite();
-        if (suiteIdentifier && (cfg_1.default.getApiToken() || process.env.BUDDY_TOKEN)) {
-            const workspace = Input.restApiWorkspace('', true);
-            const project = Input.restApiProject('', true);
-            if (workspace && project) {
-                const client = Input.restApiTokenClient();
-                const suiteId = await Input.resolveSuiteId(client, workspace, project, suiteIdentifier, 'crawl');
-                if (!suiteId)
-                    return '';
-                const result = await client.getCrawlSuiteToken(workspace, project, suiteId);
-                return String(result?.token || '');
-            }
-        }
-        return '';
-    }
-    static async utSuiteToken() {
-        const envToken = process.env.BUDDY_UT_TOKEN;
-        if (envToken)
-            return envToken;
-        const ProjectCfg = require('./project/cfg').default;
-        const suiteIdentifier = ProjectCfg.getUtSuite();
-        if (suiteIdentifier && (cfg_1.default.getApiToken() || process.env.BUDDY_TOKEN)) {
-            const workspace = Input.restApiWorkspace('', true);
-            const project = Input.restApiProject('', true);
-            if (workspace && project) {
-                const client = Input.restApiTokenClient();
-                const suiteId = await Input.resolveSuiteId(client, workspace, project, suiteIdentifier, 'ut');
-                if (!suiteId)
-                    return '';
-                const result = await client.getUtSuiteToken(workspace, project, suiteId);
-                return String(result?.token || '');
-            }
-        }
-        return '';
-    }
     static keyCert(keyPath, certPath) {
         let key;
         let cert;

package/distTs/src/project/cfg.js

@@ -24,9 +24,6 @@ class ProjectCfg {
     get(path) {
         let workspace = '';
         let project = '';
-        let vtSuite = '';
-        let crawlSuite = '';
-        let utSuite = '';
         try {
             const str = node_fs_1.default.readFileSync(getFullPath(path), 'utf8');
             const json = JSON.parse(str);
@@ -34,12 +31,6 @@ class ProjectCfg {
                 workspace = json.workspace;
             if (json.project)
                 project = json.project;
-            if (json.vtSuite)
-                vtSuite = json.vtSuite;
-            if (json.crawlSuite)
-                crawlSuite = json.crawlSuite;
-            if (json.utSuite)
-                utSuite = json.utSuite;
         }
         catch {
             // do nothing
@@ -47,26 +38,8 @@ class ProjectCfg {
         return {
             workspace,
             project,
-            vtSuite,
-            crawlSuite,
-            utSuite,
         };
     }
-    setSuite(path, type, suiteIdentifier) {
-        const fullPath = getFullPath(path);
-        let json = {};
-        try {
-            const str = node_fs_1.default.readFileSync(fullPath, 'utf8');
-            json = JSON.parse(str);
-        }
-        catch {
-            // do nothing
-        }
-        const key = type === 'vt' ? 'vtSuite' : type === 'crawl' ? 'crawlSuite' : 'utSuite';
-        json[key] = suiteIdentifier;
-        node_fs_1.default.mkdirSync((0, node_path_1.dirname)(fullPath), { recursive: true });
-        node_fs_1.default.writeFileSync(fullPath, JSON.stringify(json), 'utf8');
-    }
     getWorkspace() {
         const c = this.get((0, utils_1.getWorkingDir)());
         return c.workspace;
@@ -75,17 +48,5 @@ class ProjectCfg {
         const c = this.get((0, utils_1.getWorkingDir)());
         return c.project;
     }
-    getVtSuite() {
-        const c = this.get((0, utils_1.getWorkingDir)());
-        return c.vtSuite;
-    }
-    getCrawlSuite() {
-        const c = this.get((0, utils_1.getWorkingDir)());
-        return c.crawlSuite;
-    }
-    getUtSuite() {
-        const c = this.get((0, utils_1.getWorkingDir)());
-        return c.utSuite;
-    }
 }
 exports.default = new ProjectCfg();