oorja 2.1.7 → 2.2.0

package/dist/lib/oorja/index.js

@@ -1,15 +1,17 @@
-import { determineENV, getoorjaConfig, INVALID_ROOM_LINK_MESSAGE, setENVAccessToken, } from '../config.js';
+import { getoorjaConfig, INVALID_STREAM_KEY_MESSAGE } from '../config.js';
 import { teletypeApp } from '../teletype/index.js';
 import { ConnectClient } from '../connect/index.js';
-import { URL, URLSearchParams } from 'url';
 import { importKey, createRoomKey, exportKey } from '../encryption.js';
-import { loginByRoomOTP, preflight, promptAuth, resumeSession, validateCliVersion } from './preflight.js';
+import { promptAuth, validateCliVersion } from './preflight.js';
 import { getRegion } from './client.js';
 import ora from 'ora';
-import { printExitMessage } from '../utils.js';
+import { Future, printExitMessage } from '../utils.js';
+import { Unauthorized } from '../connect/errors.js';
+import { exit } from '../exit.js';
+import chalk from 'chalk';
 export class InvalidRoomLink extends Error {
 }
-class OORJA {
+export class OORJA {
     config;
     connectClient;
     user;
@@ -30,11 +32,10 @@ class OORJA {
     linkForRoom = (roomKey) => {
         return `${oorjaURL(this.config)}/rooms?id=${roomKey.roomId}#${exportKey(roomKey.key)}`;
     };
-    getRoomKey(roomLink) {
-        const url = parseRoomURL(roomLink);
+    getRoomKey(streamKey) {
         return {
-            key: importKey(url.hash),
-            roomId: getRoomId(url),
+            key: importKey(streamKey.encryptionSecret),
+            roomId: streamKey.roomId,
         };
     }
     teletype = (options) => {
@@ -45,67 +46,150 @@ class OORJA {
         });
     };
 }
-const parseRoomURL = (roomLink) => {
-    const url = new URL(roomLink);
-    if (!url.hash || !getRoomId(url)) {
-        printExitMessage(INVALID_ROOM_LINK_MESSAGE);
-        process.exit(3);
+export const parseStreamKey = (streamKey) => {
+    if (!streamKey.startsWith('sk-')) {
+        printExitMessage(INVALID_STREAM_KEY_MESSAGE);
+        exit(3);
     }
-    return url;
-};
-const getRoomId = (roomURL) => {
-    const params = new URLSearchParams(roomURL.search);
-    return params.get('id') || undefined;
+    const parts = streamKey.split(':');
+    if (parts.length !== 2) {
+        printExitMessage(INVALID_STREAM_KEY_MESSAGE);
+        exit(3);
+    }
+    const [token, rest] = parts;
+    const [roomId, encryptionSecret] = rest.split('#');
+    if (!roomId || !encryptionSecret) {
+        printExitMessage(INVALID_STREAM_KEY_MESSAGE);
+        exit(3);
+    }
+    return {
+        roomId,
+        token,
+        encryptionSecret,
+    };
 };
 const oorjaURL = (config) => {
     const { host } = config;
     return `https://${host}`;
 };
 const linkForTokenGen = (config) => `${oorjaURL(config)}/access_token`;
-const init = async (env, options = {}) => {
-    const config = getoorjaConfig(env);
-    const spinner = ora({
-        text: 'Connecting...',
-        discardStdin: true,
-    }).start();
-    const region = await getRegion();
-    let connectClient = new ConnectClient(env, region);
-    await validateCliVersion(connectClient);
-    let user = await resumeSession(env, connectClient, options.roomId);
-    spinner.succeed('Online');
-    if (!user) {
-        let token = '';
-        if (options.roomId) {
-            token = await loginByRoomOTP(connectClient, options.roomId);
+export class App {
+    config;
+    connectionCheckFailed = false;
+    connectionCheckFuture;
+    connectClient = null;
+    constructor(config) {
+        this.config = config;
+        this.establishConnection();
+        this.connectionCheckFuture = new Future();
+    }
+    init = async (streamKey) => {
+        let spinner = ora({
+            text: 'Checking connectivity..',
+            discardStdin: true,
+        }).start();
+        await this.connectionCheckFuture.promise;
+        if (this.connectionCheckFailed) {
+            spinner.fail('There seems to be a connection issue. Check your connection or try again later. Does https://connect.oorja.io  load for you?');
+            exit(56);
+            return Promise.reject();
         }
-        else {
-            token = await promptAuth(connectClient, linkForTokenGen(config));
-            if (!token) {
-                printExitMessage('Token not provided :(');
-                process.exit(12);
+        spinner.succeed('Online');
+        const oorjaConfig = getoorjaConfig(this.config.getEnv());
+        let user = undefined;
+        try {
+            if (!streamKey) {
+                user = await this.tryResumeSession();
+                if (!user) {
+                    const token = await promptAuth(this.connectClient, linkForTokenGen(oorjaConfig));
+                    if (!token) {
+                        printExitMessage('Token not provided :(');
+                        exit(12);
+                    }
+                    this.config.setAccessToken(token);
+                    this.connectClient.setAccessToken(token);
+                    spinner = ora({
+                        text: 'Authenticating',
+                        discardStdin: false,
+                    }).start();
+                    user = await this.connectClient?.fetchSessionUser();
+                }
+            }
+            else {
+                spinner = ora({
+                    text: 'Authenticating',
+                    discardStdin: false,
+                }).start();
+                this.connectClient.setAccessToken(streamKey.token);
+                user = await this.connectClient?.fetchSessionUser(true);
             }
         }
-        setENVAccessToken(env, token);
-    }
-    await connectClient.destroy();
-    connectClient = new ConnectClient(env, region);
-    user = await preflight(env, connectClient);
-    return new OORJA(config, connectClient, user);
-};
-let currentEnv;
-let oorja = null;
-export const getApp = async (options = {}) => {
-    const { roomLink } = options;
-    const roomURL = roomLink ? parseRoomURL(roomLink) : undefined;
-    const env = determineENV(roomURL);
-    if (oorja) {
-        if (env !== currentEnv) {
-            return Promise.reject('Attempt to run different env in same session');
+        catch (e) {
+            this.config.setAccessToken('');
+            if (e instanceof Unauthorized) {
+                spinner.fail();
+                printExitMessage('Your access token failed authentication, resetting...');
+                exit(33);
+                return Promise.reject();
+            }
+            else {
+                spinner.fail();
+                printExitMessage('Something went wrong :(');
+            }
+            throw e;
         }
-        return Promise.resolve(oorja);
-    }
-    const app = await init(env, { roomId: roomURL ? getRoomId(roomURL) : undefined });
-    currentEnv = env;
-    oorja = app;
-    return app;
-};
+        spinner.succeed(`Authenticated ✅: Welcome ${user.name}`);
+        if (user.profileType === 'anon') {
+            // don't persist tokens for anonymous users
+            this.config.setAccessToken('');
+            console.log(chalk.yellowBright("You're an anonymous user. CLI will not remember the auth-token"));
+        }
+        await this.socketConnect();
+        return new OORJA(oorjaConfig, this.connectClient, user);
+    };
+    establishConnection = async () => {
+        try {
+            const region = await getRegion();
+            const connectClient = new ConnectClient(this.config.getEnv(), region, this.config.getAccessToken());
+            await validateCliVersion(connectClient);
+            this.connectClient = connectClient;
+        }
+        catch (e) {
+            this.connectionCheckFailed = true;
+        }
+        finally {
+            this.connectionCheckFuture.resolve();
+        }
+    };
+    tryResumeSession = async () => {
+        const personalAccessToken = this.config.getAccessToken();
+        if (!personalAccessToken)
+            return;
+        try {
+            return await this.connectClient.fetchSessionUser();
+        }
+        catch (e) {
+            if (e instanceof Unauthorized) {
+                this.config.setAccessToken(''); // reset
+                return;
+            }
+            throw e;
+        }
+    };
+    socketConnect = async () => {
+        const spinner = ora({
+            text: 'Connecting..',
+            discardStdin: false,
+        }).start();
+        return this.connectClient.establishSocket()
+            .then(() => {
+            spinner.succeed('Connected').clear();
+            return;
+        })
+            .catch((e) => {
+            spinner.fail('Socket connection failure..');
+            exit(61);
+            return Promise.reject(e);
+        });
+    };
+}

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

@@ -1,9 +1,3 @@
-import { env } from '../config.js';
 import { ConnectClient } from '../connect/index.js';
-import { User } from '../connect/types.js';
-export declare const promptRoomParticipantOTP: () => Promise<string>;
 export declare const promptAuth: (connectClient: ConnectClient, generateTokenLink: string) => Promise<string>;
-export declare const loginByRoomOTP: (connectClient: ConnectClient, roomId: string) => Promise<string>;
 export declare const validateCliVersion: (connectClient: ConnectClient) => Promise<void>;
-export declare const resumeSession: (env: env, connectClient: ConnectClient, roomId?: string) => Promise<User | null>;
-export declare const preflight: (env: env, connectClient: ConnectClient) => Promise<User>;

package/dist/lib/oorja/preflight.js

@@ -1,9 +1,8 @@
 import chalk from 'chalk';
 import inquirer from 'inquirer';
-import ora from 'ora';
-import { setENVAccessToken, CLI_VERSION, getENVAccessToken } from '../config.js';
-import { BadRequest, Unauthorized } from '../connect/errors.js';
+import { CLI_VERSION } from '../config.js';
 import { printExitMessage } from '../utils.js';
+import { exit } from '../exit.js';
 const promptToken = () => inquirer
     .prompt([
     {
@@ -13,16 +12,6 @@ const promptToken = () => inquirer
     },
 ])
     .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";
 export const promptAuth = async (connectClient, generateTokenLink) => {
     const ANON = 'Proceed as an anonymous user';
     const SIGN_IN = 'Sign-in with oorja';
@@ -45,88 +34,10 @@ export const promptAuth = async (connectClient, generateTokenLink) => {
     }
     throw Error('Unexpected input');
 };
-export const loginByRoomOTP = async (connectClient, roomId) => {
-    const otp = await promptRoomParticipantOTP();
-    if (!otp) {
-        console.log('OTP not provided :(');
-        printExitMessage(OTP_HELP_MESSAGE);
-        process.exit(213);
-    }
-    try {
-        return await connectClient.accessTokenFromRoomParticipantOTP(roomId, otp);
-    }
-    catch (e) {
-        if (e instanceof BadRequest) {
-            console.log(chalk.redBright('Invalid otp. It may have expired.'));
-            printExitMessage(OTP_HELP_MESSAGE);
-            process.exit();
-        }
-        throw e;
-    }
-};
 export const validateCliVersion = async (connectClient) => {
     const manifest = await connectClient.fetchCliManifest();
     if (manifest.cliVersion > CLI_VERSION) {
         printExitMessage(chalk.redBright('Your oorja cli is outdated. Please run: npm update -g oorja'));
-        process.exit(1);
-    }
-};
-export const resumeSession = async (env, connectClient, roomId) => {
-    const token = getENVAccessToken(env);
-    if (!token)
-        return null;
-    // try to validate authorization with existing token
-    try {
-        const user = await connectClient.fetchSessionUser();
-        if (roomId) {
-            await connectClient.fetchRoom(roomId);
-        }
-        return user;
-    }
-    catch (e) {
-        if (e instanceof Unauthorized) {
-            setENVAccessToken(env, '');
-            return null;
-        }
-        throw e;
-    }
-};
-export const preflight = async (env, connectClient) => {
-    const spinner = ora({
-        text: 'Authenticating',
-        discardStdin: false,
-    }).start();
-    try {
-        const user = await connectClient.fetchSessionUser();
-        spinner.succeed(`Authenticated: Welcome ${user.name}`);
-        if (user.profileType === 'anon') {
-            // don't persist tokens for anonymous users
-            setENVAccessToken(env, '');
-            console.log(chalk.yellowBright("You're an anonymous user. CLI will not remember the auth-token"));
-        }
-        spinner.start('Connecting..');
-        return connectClient
-            .establishSocket()
-            .then(() => {
-            spinner.succeed('Connected').clear();
-            return user;
-        })
-            .catch((e) => {
-            spinner.fail('Socket connection failure..');
-            throw e;
-        });
-    }
-    catch (e) {
-        setENVAccessToken(env, '');
-        if (e instanceof Unauthorized) {
-            spinner.fail();
-            printExitMessage('Your access token failed authentication, resetting...');
-            process.exit(33);
-        }
-        else {
-            spinner.fail();
-            printExitMessage('Something went wrong :(');
-        }
-        throw e;
+        exit(1);
     }
 };

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

@@ -7,6 +7,12 @@ export type TeletypeOptions = {
     shell: string;
     multiplex: boolean;
     process: NodeJS.Process;
-    joinChannel: (options: JoinChannelOptions<any>) => Channel;
+    joinChannel: (options: JoinChannelOptions<TeletypeChannelParams, unknown>) => Channel;
+};
+type TeletypeChannelParams = {
+    username: string;
+    hostname: string;
+    multiplexed: boolean;
 };
 export declare const teletypeApp: (options: TeletypeOptions) => Promise<unknown>;
+export {};

package/dist/lib/teletype/index.js

@@ -5,6 +5,7 @@ import chalk from 'chalk';
 import { Unauthorized } from '../connect/errors.js';
 import { encrypt, decrypt } from '../encryption.js';
 import { Future, printExitMessage } from '../utils.js';
+import { exit } from '../exit.js';
 var MessageType;
 (function (MessageType) {
     MessageType["IN"] = "i";
@@ -98,7 +99,7 @@ export const teletypeApp = (options) => {
             },
             onClose: () => {
                 printExitMessage(chalk.redBright('connection closed, terminated stream.'));
-                process.exit(3);
+                exit(3);
             },
             onError: (err) => {
                 if (err instanceof Unauthorized) {
@@ -107,7 +108,7 @@ export const teletypeApp = (options) => {
                 else {
                     printExitMessage(chalk.redBright('connection error, terminated stream.'));
                 }
-                process.exit(4);
+                exit(4);
             },
             onMessage: ({ from: { session }, t, d }) => {
                 switch (t) {
@@ -118,6 +119,12 @@ export const teletypeApp = (options) => {
                     case MessageType.IN:
                         const data = decrypt(d, options.roomKey);
                         const userId = session.split(':')[0];
+                        const userType = session.split(':')[2];
+                        if (userType === 'task') {
+                            printExitMessage(chalk.redBright(`unexpected input from user: ${userId} with task-token, terminating stream for safety. Please report this issue`));
+                            exit(5);
+                            return;
+                        }
                         if (options.multiplex) {
                             term.write(data);
                             return;
@@ -127,7 +134,7 @@ export const teletypeApp = (options) => {
                         }
                         else {
                             printExitMessage(chalk.redBright(`unexpected input from user: ${userId}, terminating stream for safety. Please report this issue`));
-                            process.exit(5);
+                            exit(5);
                         }
                 }
             },

package/dist/lib/utils.d.ts

@@ -1,5 +1,5 @@
 export declare const printExitMessage: (printMessage: string) => void;
-export declare const promptRoomLink: () => Promise<any>;
+export declare const promptStreamKey: () => Promise<string>;
 export declare class Future<T> {
     promise: Promise<T>;
     resolve?: (arg: T) => void;

package/dist/lib/utils.js

@@ -3,15 +3,15 @@ import { writeSync } from 'fs';
 export const printExitMessage = (printMessage) => {
     writeSync(process.stdout.fd, printMessage);
 };
-export const promptRoomLink = async () => {
-    const { spaceLink } = await inquirer.prompt([
+export const promptStreamKey = async () => {
+    const { streamKey } = await inquirer.prompt([
         {
             type: 'input',
-            name: 'spaceLink',
-            message: 'Enter the space secret link (copy URL from address bar in your browser):',
+            name: 'streamKey',
+            message: 'Enter the stream-key (copy from teletype app within the space):',
         },
     ]);
-    return spaceLink;
+    return streamKey;
 };
 export class Future {
     promise;

package/oclif.manifest.json

@@ -25,15 +25,15 @@
         "tty"
       ],
       "args": {
-        "space": {
-          "name": "space"
+        "streamKey": {
+          "name": "streamKey"
         }
       },
       "description": "Launch a terminal streaming session in oorja.",
       "examples": [
-        "\u001b[94m$ teletype\u001b[39m\nWill prompt to choose streaming destination - existing space or create a new one.\n\n",
-        "\u001b[94m$ teletype 'https://oorja.io/spaces?id=foo#key'\u001b[39m\nWill stream to the space specified by secret link, you must have joined the space before streaming.\n\n",
-        "\u001b[94m$ teletype -m\u001b[39m\nWill also allow participants to write to your terminal!\n\n"
+        "\u001b[94m$ teletype\u001b[39m\nWill prompt to choose streaming destination - either enter a stream key for an existing space or create a new space.\n\n",
+        "\u001b[94m$ teletype 'sk-xxxx:space-id#encryption-secret'\u001b[39m\nWill stream to the space using the secret stream-key. NOTE: stream-keys are personal (generated for you in the teletype app at oorja.io), do not accept them from other people, nor should\nyou share your stream-keys with others.\n\n",
+        "\u001b[94m$ teletype -m\u001b[39m\nWill also allow participants to write to your terminal! Collaboration mode must be explicitly enabled.\n\n"
       ],
       "flags": {
         "help": {
@@ -47,7 +47,7 @@
           "char": "s",
           "description": "shell to use. e.g. bash, fish",
           "name": "shell",
-          "default": "/usr/bin/zsh",
+          "default": "bash",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
@@ -85,5 +85,5 @@
       ]
     }
   },
-  "version": "2.1.7"
+  "version": "2.2.0"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "oorja",
   "description": "stream terminals to the web and more.",
-  "version": "2.1.7",
+  "version": "2.2.0",
   "keywords": [
     "teletype",
     "terminal",
@@ -38,40 +38,34 @@
   "oclif": {
     "bin": "oorja",
     "commands": "./dist/commands",
-    "dirname": "oorja",
-    "plugins": [
-      "@oclif/plugin-help",
-      "conf-cli"
-    ]
+    "dirname": "oorja"
   },
   "dependencies": {
-    "@msgpack/msgpack": "2.8.0",
-    "@oclif/core": "^4.4.0",
-    "@oclif/plugin-help": "^6.2.29",
-    "camelcase-keys": "^9.1.3",
-    "chalk": "^5.4.1",
-    "conf-cli": "0.1.9",
+    "@msgpack/msgpack": "3.1.2",
+    "@oclif/core": "^4.5.3",
+    "@oclif/plugin-help": "^6.2.32",
+    "camelcase-keys": "^10.0.0",
+    "chalk": "^5.6.2",
     "haversine-distance": "^1.2.4",
-    "inquirer": "^12.6.3",
+    "inquirer": "^12.9.4",
     "node-pty": "^1.0.0",
     "ora": "^8.2.0",
-    "phoenix": "1.7.21",
+    "phoenix": "1.8.1",
     "terminal-size": "^4.0.0"
   },
   "devDependencies": {
     "@oclif/prettier-config": "^0.2.1",
-    "@types/inquirer": "^9.0.8",
+    "@types/inquirer": "^9.0.9",
     "@types/node": "^22.10.2",
     "@types/phoenix": "^1.6.6",
-    "eslint": "^9.29.0",
-    "eslint-config-oclif": "^6.0.72",
-    "eslint-config-oclif-typescript": "^3.1.14",
-    "eslint-config-prettier": "^9.1.0",
-    "oclif": "^4.19.0",
-    "prettier": "^3.5.3",
+    "eslint": "^9.35.0",
+    "eslint-config-oclif": "^6.0.102",
+    "eslint-config-prettier": "^10.1.8",
+    "oclif": "^4.22.18",
+    "prettier": "^3.6.2",
     "shx": "^0.4.0",
     "ts-node": "^10.9.2",
-    "typescript": "^5.8.3"
+    "typescript": "^5.9.2"
   },
   "engines": {
     "node": ">=22.10.0"