oorja 1.9.1 → 1.11.3

package/dist/lib/oorja/index.js

@@ -1,58 +1,57 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getApp = exports.InvalidRoomLink = void 0;
-const config_1 = require("../config");
-const teletype_1 = require("../teletype");
-const surya_1 = require("../surya");
-const url_1 = require("url");
-const encryption_1 = require("../encryption");
-const preflight_1 = require("./preflight");
-class InvalidRoomLink extends Error {
+import { determineENV, getoorjaConfig, INVALID_ROOM_LINK_MESSAGE, setENVAccessToken, } from "../config.js";
+import { teletypeApp } from "../teletype/index.js";
+import { SuryaClient } from "../surya/index.js";
+import { URL, URLSearchParams } from "url";
+import { importKey, createRoomKey, exportKey } from "../encryption.js";
+import { loginByRoomOTP, preflight, promptAuth, resumeSession, validateCliVersion, } from "./preflight.js";
+export class InvalidRoomLink extends Error {
 }
-exports.InvalidRoomLink = InvalidRoomLink;
 class OORJA {
+    config;
+    suryaClient;
+    user;
     // should capture domain related commands and queries
     constructor(config, suryaClient, user) {
         this.config = config;
         this.suryaClient = suryaClient;
         this.user = user;
-        this.createRoom = async (options) => {
-            const room = await this.suryaClient.createRoom(options);
-            const roomKey = (0, encryption_1.createRoomKey)(room.id);
-            return {
-                room,
-                roomKey,
-            };
-        };
-        this.linkForRoom = (roomKey) => {
-            return `${oorjaURL(this.config)}/rooms?id=${roomKey.roomId}#${(0, encryption_1.exportKey)(roomKey.key)}`;
-        };
-        this.teletype = (options) => {
-            return (0, teletype_1.teletypeApp)({
-                userId: this.user.id,
-                joinChannel: this.suryaClient.joinChannel,
-                ...options,
-            });
-        };
     }
+    createRoom = async (options) => {
+        const room = await this.suryaClient.createRoom(options);
+        const roomKey = createRoomKey(room.id);
+        return {
+            room,
+            roomKey,
+        };
+    };
+    linkForRoom = (roomKey) => {
+        return `${oorjaURL(this.config)}/rooms?id=${roomKey.roomId}#${exportKey(roomKey.key)}`;
+    };
     getRoomKey(roomLink) {
         const url = parseRoomURL(roomLink);
         return {
-            key: (0, encryption_1.importKey)(url.hash),
+            key: importKey(url.hash),
             roomId: getRoomId(url),
         };
     }
+    teletype = (options) => {
+        return teletypeApp({
+            userId: this.user.id,
+            joinChannel: this.suryaClient.joinChannel,
+            ...options,
+        });
+    };
 }
 const parseRoomURL = (roomLink) => {
-    const url = new url_1.URL(roomLink);
+    const url = new URL(roomLink);
     if (!url.hash || !getRoomId(url)) {
-        console.log(config_1.INVALID_ROOM_LINK_MESSAGE);
+        console.log(INVALID_ROOM_LINK_MESSAGE);
         process.exit(3);
     }
     return url;
 };
 const getRoomId = (roomURL) => {
-    const params = new url_1.URLSearchParams(roomURL.search);
+    const params = new URLSearchParams(roomURL.search);
     return params.get("id") || undefined;
 };
 const oorjaURL = (config) => {
@@ -61,35 +60,35 @@ const oorjaURL = (config) => {
 };
 const linkForTokenGen = (config) => `${oorjaURL(config)}/access_token`;
 const init = async (env, options = {}) => {
-    const config = (0, config_1.getoorjaConfig)(env);
-    let suryaClient = new surya_1.SuryaClient(env);
-    await (0, preflight_1.validateCliVersion)(suryaClient);
-    let user = await (0, preflight_1.resumeSession)(env, suryaClient, options.roomId);
+    const config = getoorjaConfig(env);
+    let suryaClient = new SuryaClient(env);
+    await validateCliVersion(suryaClient);
+    let user = await resumeSession(env, suryaClient, options.roomId);
     if (!user) {
         let token = "";
         if (options.roomId) {
-            token = await (0, preflight_1.loginByRoomOTP)(suryaClient, options.roomId);
+            token = await loginByRoomOTP(suryaClient, options.roomId);
         }
         else {
-            token = await (0, preflight_1.promptAuth)(suryaClient, linkForTokenGen(config));
+            token = await promptAuth(suryaClient, linkForTokenGen(config));
             if (!token) {
                 console.log("Token not provided :(");
                 process.exit(12);
             }
         }
-        (0, config_1.setENVAccessToken)(env, token);
+        setENVAccessToken(env, token);
     }
     await suryaClient.destroy();
-    suryaClient = new surya_1.SuryaClient(env);
-    user = await (0, preflight_1.preflight)(env, suryaClient);
+    suryaClient = new SuryaClient(env);
+    user = await preflight(env, suryaClient);
     return new OORJA(config, suryaClient, user);
 };
 let currentEnv;
 let oorja;
-const getApp = async (options = {}) => {
+export const getApp = async (options = {}) => {
     const { roomLink } = options;
     const roomURL = roomLink ? parseRoomURL(roomLink) : undefined;
-    const env = (0, config_1.determineENV)(undefined);
+    const env = determineENV(undefined);
     if (oorja) {
         if (env !== currentEnv) {
             return Promise.reject("Attempt to run different env in same session");
@@ -98,4 +97,3 @@ const getApp = async (options = {}) => {
     }
     return await init(env, { roomId: roomURL ? getRoomId(roomURL) : undefined });
 };
-exports.getApp = getApp;

package/dist/lib/oorja/preflight.d.ts

@@ -1,6 +1,6 @@
-import { env } from "../config";
-import { SuryaClient } from "../surya";
-import { User } from "../surya/types";
+import { env } from "../config.js";
+import { SuryaClient } from "../surya/index.js";
+import { User } from "../surya/types.js";
 export declare const promptRoomParticipantOTP: () => Promise<string>;
 export declare const promptAuth: (suryaClient: SuryaClient, generateTokenLink: string) => Promise<string>;
 export declare const loginByRoomOTP: (suryaClient: SuryaClient, roomId: string) => Promise<string>;

package/dist/lib/oorja/preflight.js

@@ -1,29 +1,35 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.preflight = exports.resumeSession = exports.validateCliVersion = exports.loginByRoomOTP = exports.promptAuth = exports.promptRoomParticipantOTP = void 0;
-const chalk = require("chalk");
-const { Input, Select } = require("enquirer");
-const ora = require("ora");
-const config_1 = require("../config");
-const errors_1 = require("../surya/errors");
-const promptToken = () => new Input({
-    name: "Access Token",
-    message: "Please enter your access token for authentication:",
-}).run();
-const promptRoomParticipantOTP = () => new Input({
-    name: "OTP prompt",
-    message: "Please enter your OTP for authentication:",
-}).run();
-exports.promptRoomParticipantOTP = promptRoomParticipantOTP;
+import chalk from "chalk";
+import inquirer from 'inquirer';
+import ora from "ora";
+import { setENVAccessToken, CLI_VERSION, getENVAccessToken, } from "../config.js";
+import { BadRequest, Unauthorized } from "../surya/errors.js";
+const promptToken = () => inquirer.prompt([
+    {
+        type: 'input',
+        name: 'accessToken',
+        message: 'Please enter your access token for authentication:',
+    }
+]).then(answers => answers.accessToken);
+export const promptRoomParticipantOTP = () => inquirer.prompt([
+    {
+        type: 'input',
+        name: 'otp',
+        message: 'Please enter your OTP for authentication (switch to teletype app in the room and click on blue "Generate OTP" button):',
+    }
+]).then(answers => answers.otp);
 const OTP_HELP_MESSAGE = "You can generate OTP from the room, it's in the instruction steps";
-const promptAuth = async (suryaClient, generateTokenLink) => {
+export const promptAuth = async (suryaClient, generateTokenLink) => {
     const ANON = "Proceed as an anonymous user";
     const SIGN_IN = "Sign-in with oorja";
     console.log(`\n${chalk.bold("PRO-TIP:")} If you sign-in, you can control your shell from the web-ui as well, without enabling collaboration mode for the other participants\n`);
-    const answer = await new Select({
-        message: "You need an access-token for authentication.\n ",
-        choices: [ANON, SIGN_IN],
-    }).run();
+    const { answer } = await inquirer.prompt([
+        {
+            type: 'list',
+            name: 'answer',
+            message: 'You need an access-token for authentication.\n ',
+            choices: [ANON, SIGN_IN],
+        }
+    ]);
     switch (answer) {
         case ANON:
             console.log("Creating anonymous user...");
@@ -34,9 +40,8 @@ const promptAuth = async (suryaClient, generateTokenLink) => {
     }
     throw Error("Unexpected input");
 };
-exports.promptAuth = promptAuth;
-const loginByRoomOTP = async (suryaClient, roomId) => {
-    const otp = await (0, exports.promptRoomParticipantOTP)();
+export const loginByRoomOTP = async (suryaClient, roomId) => {
+    const otp = await promptRoomParticipantOTP();
     if (!otp) {
         console.log("OTP not provided :(");
         console.log(OTP_HELP_MESSAGE);
@@ -46,7 +51,7 @@ const loginByRoomOTP = async (suryaClient, roomId) => {
         return await suryaClient.accessTokenFromRoomParticipantOTP(roomId, otp);
     }
     catch (e) {
-        if (e instanceof errors_1.BadRequest) {
+        if (e instanceof BadRequest) {
             console.log(chalk.redBright("Invalid otp. It may have expired."));
             console.log(OTP_HELP_MESSAGE);
             process.exit();
@@ -54,17 +59,15 @@ const loginByRoomOTP = async (suryaClient, roomId) => {
         throw e;
     }
 };
-exports.loginByRoomOTP = loginByRoomOTP;
-const validateCliVersion = async (suryaClient) => {
+export const validateCliVersion = async (suryaClient) => {
     const manifest = await suryaClient.fetchCliManifest();
-    if (manifest.cliVersion > config_1.CLI_VERSION) {
+    if (manifest.cliVersion > CLI_VERSION) {
         console.log(chalk.redBright("Your oorja cli is outdated. Please run: npm update -g oorja"));
         process.exit(1);
     }
 };
-exports.validateCliVersion = validateCliVersion;
-const resumeSession = async (env, suryaClient, roomId) => {
-    const token = (0, config_1.getENVAccessToken)(env);
+export const resumeSession = async (env, suryaClient, roomId) => {
+    const token = getENVAccessToken(env);
     if (!token)
         return null;
     // try to validate authorization with existing token
@@ -76,15 +79,14 @@ const resumeSession = async (env, suryaClient, roomId) => {
         return user;
     }
     catch (e) {
-        if (e instanceof errors_1.Unauthorized) {
-            (0, config_1.setENVAccessToken)(env, "");
+        if (e instanceof Unauthorized) {
+            setENVAccessToken(env, "");
             return null;
         }
         throw e;
     }
 };
-exports.resumeSession = resumeSession;
-const preflight = async (env, suryaClient) => {
+export const preflight = async (env, suryaClient) => {
     const spinner = ora({
         text: "Authenticating",
         discardStdin: false,
@@ -94,7 +96,7 @@ const preflight = async (env, suryaClient) => {
         spinner.succeed(`Authenticated: Welcome ${user.name}`);
         if (user.profileType === "anon") {
             // don't persist tokens for anonymous users
-            (0, config_1.setENVAccessToken)(env, "");
+            setENVAccessToken(env, "");
             console.log(chalk.yellowBright("You're an anonymous user. CLI will not remember the auth-token"));
         }
         spinner.start("Connecting..");
@@ -110,8 +112,8 @@ const preflight = async (env, suryaClient) => {
         });
     }
     catch (e) {
-        (0, config_1.setENVAccessToken)(env, "");
-        if (e instanceof errors_1.Unauthorized) {
+        setENVAccessToken(env, "");
+        if (e instanceof Unauthorized) {
             spinner.fail("Your access token failed authentication, resetting...");
             process.exit(33);
         }
@@ -121,4 +123,3 @@ const preflight = async (env, suryaClient) => {
         throw e;
     }
 };
-exports.preflight = preflight;

package/dist/lib/surya/errors.js

@@ -1,12 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BadRequest = exports.Unauthorized = exports.ClientError = void 0;
-class ClientError extends Error {
+export class ClientError extends Error {
 }
-exports.ClientError = ClientError;
-class Unauthorized extends ClientError {
+export class Unauthorized extends ClientError {
 }
-exports.Unauthorized = Unauthorized;
-class BadRequest extends ClientError {
+export class BadRequest extends ClientError {
 }
-exports.BadRequest = BadRequest;

package/dist/lib/surya/index.d.ts

@@ -1,6 +1,6 @@
-import { User, RoomApps, Room, CliManifest } from "./types";
-import { env } from "../config";
-import { Channel } from "./vendor/phoenix";
+import { User, RoomApps, Room, CliManifest } from "./types.js";
+import { env } from "../config.js";
+import { Channel } from "./vendor/phoenix/index.js";
 export declare class SuryaError extends Error {
 }
 export declare class SuryaClient {