oorja 1.11.4 → 2.0.1

package/README.md

@@ -19,7 +19,6 @@ cli tool that allows you to share your terminal online conveniently. Check out [
 Your stream can be view-only or collaboration enabled (command-line flag).
 
 
-
 <!-- toc -->
 * [Install and stream!](#install-and-stream)
 * [Commands](#commands)
@@ -27,7 +26,7 @@ Your stream can be view-only or collaboration enabled (command-line flag).
 
 # Install and stream!
 
-- You'll need Node 18.18.0 >. CLI is available via npm. <br />
+- You'll need Node 22.10.0 >. CLI is available via npm. <br />
   <a href="https://nodejs.org/en/download/" target="_blank">
   You can setup node/npm from here.
   </a> 
@@ -50,24 +49,20 @@ Any participant in the room can stream their terminal(s) i.e there can be multip
 For options: `teletype -h` 
 
 **Note**
-This is the cli companion for [oorja.io](https://oorja.io) which is a privacy focussed collaboration tool with more features like voice, notes, and chat - [privacy policy](https://oorja.io/privacy_policy).
-TLDR: Nothing stored on servers. Your data is end-to-end encrypted, synced between browsers (and cli) 🍻. No prying eyes. 
+This is the cli companion for [oorja.io](https://oorja.io) which is a privacy focussed collaboration tool with more features like voice, notes, and chat - [privacy policy](https://oorja.io/privacy-policy).
+TLDR: Your data is end-to-end encrypted, no prying eyes 🍻.
 
 Like it ? [follow or tweet, tell your colleagues](https://twitter.com/oorja_app) 👩🏻‍💻
 
-Love it ? [please subscribe](https://oorja.io/pricing) 🖖
-
-Feel free to open [issues](https://github.com/akshaykmr/TeleType/issues) for bugs, improvements, app-discussions, and anything else really.
+Open [issues](https://github.com/akshaykmr/TeleType/issues).
 
 More ways to [contact](https://oorja.io/contact).
 
 
 # Commands
-<!-- commands-disabled-->
+<!-- commands-disabled -->
 * [`oorja help [COMMAND]`](#oorja-help-command)
-* [`oorja teletype [ROOM]`](#oorja-teletype-room)
-* [`oorja tty [ROOM]`](#oorja-tty-room)
-* [`oorja conf [KEY] [VALUE]`](#oorja-conf-key-value)
+* [`oorja teletype [SPACE]`](#oorja-teletype-space)
 * [`oorja signout`](#oorja-signout)
 
 ## `oorja help [COMMAND]`
@@ -88,22 +83,19 @@ DESCRIPTION
   Display help for oorja.
 ```
 
-_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v6.0.21/src/commands/help.ts)_
-
-
-## `oorja teletype [ROOM]`
+## `oorja teletype [SPACE_URL]`
 
 Launch a terminal streaming session in oorja.
 
 ```
 USAGE
-  $ oorja teletype [ROOM] [-h] [-s <value>] [-m] [-n]
+  $ oorja teletype [SPACE_URL] [-h] [-s <value>] [-m] [-n]
 
 FLAGS
   -h, --help           Show CLI help.
-  -m, --multiplex      Allows room users to WRITE TO YOUR SHELL i.e enables collaboration mode. Make sure you trust room
+  -m, --multiplex      Allows users to WRITE TO YOUR SHELL i.e enables collaboration mode. Make sure you trust space
                        participants. Off by default
-  -n, --new_room       Create new room
+  -n, --new_space      Create new space
   -s, --shell=<value>  [default: /usr/bin/zsh] shell to use. e.g. bash, fish
 
 DESCRIPTION
@@ -114,17 +106,15 @@ ALIASES
 
 EXAMPLES
   $ teletype
-  Will prompt to choose streaming destination - existing room or create a new one.
+  Will prompt to choose streaming destination - existing space or create a new one.
 
-  $ teletype 'https://oorja.io/rooms?id=foo#key'
-  Will stream to the room specified by secret link, you must have joined the room before streaming.
+  $ teletype 'https://oorja.io/spaces?id=foo#key'
+  Will stream to the space specified by secret link, you must have joined the space before streaming.
 
   $ teletype -m
-  Will also allow room participants to write to your terminal!
+  Will also allow participants to write to your terminal!
 ```
 
-_See code: [src/commands/teletype/index.ts](https://github.com/akshaykmr/teletype/blob/v1.11.2/src/commands/teletype/index.ts)_
-
 ## `oorja signout`
 
 Sign-out of oorja. Clears saved auth-token
@@ -137,32 +127,4 @@ DESCRIPTION
   Sign-out of oorja. Clears saved auth-token
 ```
 
-_See code: [src/commands/signout.ts](https://github.com/akshaykmr/teletype/blob/v1.11.2/src/commands/signout.ts)_
-
-## `oorja conf [KEY] [VALUE]`
-
-manage configuration (for setting access tokens and env vars)
-
-```
-USAGE
-  $ oorja conf [KEY] [VALUE] [-h] [-k <value>] [-v <value>] [-d] [-p <value>] [-n <value>] [-d <value>]
-
-ARGUMENTS
-  KEY    key of the config
-  VALUE  value of the config
-
-FLAGS
-  -d, --cwd=<value>      config file location
-  -d, --delete           delete?
-  -h, --help             show CLI help
-  -k, --key=<value>      key of the config
-  -n, --name=<value>     config file name
-  -p, --project=<value>  project name
-  -v, --value=<value>    value of the config
-
-DESCRIPTION
-  manage configuration
-```
-
-_See code: [conf-cli](https://github.com/natzcam/conf-cli/blob/v0.1.9/src/commands/conf.ts)_
 <!-- commandsstop-disabled -->

package/dist/commands/signout.d.ts

@@ -1,4 +1,4 @@
-import { Command } from "@oclif/core";
+import { Command } from '@oclif/core';
 export declare class SignOut extends Command {
     static description: string;
     run(): Promise<void>;

package/dist/commands/signout.js

@@ -1,10 +1,10 @@
-import { Command } from "@oclif/core";
-import { determineENV, setENVAccessToken } from "../lib/config.js";
+import { Command } from '@oclif/core';
+import { determineENV, setENVAccessToken } from '../lib/config.js';
 export class SignOut extends Command {
     static description = `Sign-out of oorja. Clears saved auth-token`;
     async run() {
         const env = determineENV();
-        setENVAccessToken(env, "");
-        console.log("Sign-out complete");
+        setENVAccessToken(env, '');
+        console.log('Sign-out complete');
     }
 }

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

@@ -1,16 +1,17 @@
-import { Command } from "@oclif/core";
+import { Command } from '@oclif/core';
 export default class TeleTypeCommand extends Command {
+    static order: number;
     static aliases: string[];
     static description: string;
     static examples: string[];
     static flags: {
-        help: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<void>;
-        shell: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
-        multiplex: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
-        new_room: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
+        help: import("@oclif/core/interfaces").BooleanFlag<void>;
+        shell: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        multiplex: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        new_space: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     static args: {
-        room: import("@oclif/core/lib/interfaces/parser.js").Arg<string | undefined, Record<string, unknown>>;
+        space: import("@oclif/core/interfaces").Arg<string | undefined, Record<string, unknown>>;
     };
     run(): Promise<void>;
     private streamToLink;

package/dist/commands/teletype/index.js

@@ -1,74 +1,75 @@
 import inquirer from 'inquirer';
-import { Command, Flags, Args } from "@oclif/core";
-import ora from "ora";
-import * as os from "os";
-import chalk from "chalk";
-import { ROOM_LINK_SAMPLE } from "../../lib/config.js";
-import { getApp } from "../../lib/oorja/index.js";
-import { promptRoomLink } from "../../lib/utils.js";
-const DEFAULT_SHELL = os.platform() === "win32" ? "powershell.exe" : process.env.SHELL || "bash";
+import { Command, Flags, Args } from '@oclif/core';
+import ora from 'ora';
+import * as os from 'os';
+import chalk from 'chalk';
+import { ROOM_LINK_SAMPLE } from '../../lib/config.js';
+import { getApp } from '../../lib/oorja/index.js';
+import { promptRoomLink } from '../../lib/utils.js';
+const DEFAULT_SHELL = os.platform() === 'win32' ? 'powershell.exe' : process.env.SHELL || 'bash';
 export default class TeleTypeCommand extends Command {
-    static aliases = ["tty"];
+    static order = 1;
+    static aliases = ['tty'];
     static description = `Launch a terminal streaming session in oorja.`;
     static examples = [
-        `${chalk.blueBright("$ teletype")}
-Will prompt to choose streaming destination - existing room or create a new one.
+        `${chalk.blueBright('$ teletype')}
+Will prompt to choose streaming destination - existing space or create a new one.
 
 `,
         `${chalk.blueBright(`$ teletype '${ROOM_LINK_SAMPLE}'`)}
-Will stream to the room specified by secret link, you must have joined the room before streaming.
+Will stream to the space specified by secret link, you must have joined the space before streaming.
 
 `,
-        `${chalk.blueBright("$ teletype -m")}
-Will also allow room participants to write to your terminal!
+        `${chalk.blueBright('$ teletype -m')}
+Will also allow participants to write to your terminal!
 
 `,
     ];
     static flags = {
-        help: Flags.help({ char: "h" }),
+        help: Flags.help({ char: 'h' }),
         shell: Flags.string({
-            char: "s",
-            description: "shell to use. e.g. bash, fish",
+            char: 's',
+            description: 'shell to use. e.g. bash, fish',
             default: DEFAULT_SHELL,
         }),
         multiplex: Flags.boolean({
-            char: "m",
-            description: "Allows room users to WRITE TO YOUR SHELL i.e enables collaboration mode. Make sure you trust room participants. Off by default",
+            char: 'm',
+            description: 'Allows users to WRITE TO YOUR SHELL i.e enables collaboration mode. Make sure you trust space participants. Off by default',
             default: false,
         }),
-        new_room: Flags.boolean({
-            char: "n",
-            description: "Create new room",
+        new_space: Flags.boolean({
+            char: 'n',
+            description: 'Create new space',
             default: false,
         }),
     };
     static args = {
-        room: Args.string({})
+        space: Args.string({}),
     };
     async run() {
-        const { args, flags: { shell, multiplex, new_room }, } = await this.parse(TeleTypeCommand);
-        if (args.room) {
-            await this.streamToLink({ shell, multiplex, roomLink: args.room });
+        const { args, flags: { shell, multiplex, new_space }, } = await this.parse(TeleTypeCommand);
+        if (args.space) {
+            await this.streamToLink({ shell, multiplex, roomLink: args.space });
             process.exit(0);
         }
-        if (new_room) {
+        if (new_space) {
             await this.createRoomAndStream({ shell, multiplex });
             process.exit(0);
         }
-        console.log("(use -h for description and options) \n");
+        console.log('(use -h for description and options) \n');
         // room not known, prompt
-        const ROOM = "To an existing room (you have the room link)";
-        const NEW = "New room";
+        const SPACE = 'To an existing space (you have the link)';
+        const NEW = 'New space';
         const { answer } = await inquirer.prompt([
             {
                 type: 'list',
                 name: 'answer',
                 message: 'Choose streaming destination',
-                choices: [NEW, ROOM],
-            }
+                choices: [NEW, SPACE],
+            },
         ]);
         switch (answer) {
-            case ROOM:
+            case SPACE:
                 await this.streamToLink({ shell, multiplex });
                 break;
             case NEW:
@@ -80,7 +81,7 @@ Will also allow room participants to write to your terminal!
     async streamToLink(options) {
         const roomLink = options.roomLink || (await promptRoomLink());
         if (!roomLink) {
-            console.log(chalk.redBright("Room link not provided :("));
+            console.log(chalk.redBright('Space link not provided :('));
             process.exit();
         }
         const app = await getApp({ roomLink });
@@ -88,35 +89,36 @@ Will also allow room participants to write to your terminal!
         this.clearstdin();
         await app.teletype({ roomKey, ...options, process });
     }
-    async createRoomAndStream({ shell, multiplex, }) {
+    async createRoomAndStream({ shell, multiplex }) {
         const app = await getApp();
         const spinner = ora({
-            text: chalk.bold("Creating room with TeleType app"),
+            text: chalk.bold('Creating space with TeleType app'),
             discardStdin: false,
         }).start();
         const { roomKey } = await app
             .createRoom({
-            roomName: "-",
+            roomName: 'Untitled Space',
             apps: {
-                defaultFocus: "39",
+                defaultFocus: '39',
                 appList: [
-                    { appId: "39", config: {} },
-                    { appId: "31", config: {} },
-                    { appId: "40", config: {} },
-                    { appId: "90", config: {} },
-                    { appId: "100", config: {} },
-                    { appId: "102", config: {} },
+                    { appId: '31', config: {} },
+                    { appId: '100', config: {} },
+                    { appId: '40', config: {} },
+                    { appId: '90', config: {} },
+                    { appId: '39', config: {} },
+                    { appId: '102', config: {} },
+                    { appId: '103', config: {} },
                 ],
             },
         })
             .catch((e) => {
-            console.log("Failed to create room.");
+            console.log('Failed to create space.');
             process.exit(9);
         });
-        spinner.succeed(chalk.bold("Room created")).clear();
+        spinner.succeed(chalk.bold('Space created')).clear();
         const link = app.linkForRoom(roomKey);
         console.log(`\n${chalk.bold(chalk.blueBright(link))}\n`);
-        console.log(chalk.bold("^^ You'll be streaming here, share this link with your friends."));
+        console.log(chalk.bold("^^ You'll be streaming here ^^"));
         this.clearstdin();
         return await app.teletype({ roomKey, shell, multiplex, process });
     }

package/dist/lib/config.d.ts

@@ -1,22 +1,19 @@
-/// <reference types="node" resolution-mode="require"/>
-import { URL } from "url";
-export declare const CLI_VERSION = 1.91;
-import Conf from "conf";
+import { URL } from 'url';
+export declare const CLI_VERSION = 2;
+import Conf from 'conf';
 export declare const config: Conf<string>;
-export type env = "staging" | "local" | "prod" | "prod-teletype";
-export type SuryaConfig = {
+export type env = 'local' | 'prod';
+export type ConnectConfig = {
     host: string;
-    enableTLS: boolean;
     token: string;
 };
-export declare const getSuryaConfig: (env: env) => SuryaConfig;
-export declare const ROOM_LINK_SAMPLE = "https://oorja.io/rooms?id=foo#key";
+export declare const getConnectConfig: (env: env, region: string) => ConnectConfig;
+export declare const ROOM_LINK_SAMPLE = "https://oorja.io/spaces?id=foo#key";
 export declare const INVALID_ROOM_LINK_MESSAGE: string;
 export declare const determineENV: (roomURL?: URL) => env;
 export declare const getENVAccessToken: (env: env) => string;
 export declare const setENVAccessToken: (env: env, token: string) => void;
 export type oorjaConfig = {
     host: string;
-    enableTLS: boolean;
 };
 export declare const getoorjaConfig: (env: env) => oorjaConfig;

package/dist/lib/config.js

@@ -1,65 +1,52 @@
-import chalk from "chalk";
-export const CLI_VERSION = 1.91;
-import Conf from "conf";
+import chalk from 'chalk';
+export const CLI_VERSION = 2.0;
+import Conf from 'conf';
 export const config = new Conf({
-    projectName: "oorja",
+    projectName: 'oorja',
     schema: {
-        "env": {
-            type: 'string'
+        env: {
+            type: 'string',
         },
-        "staging-access-token": {
-            type: 'string'
+        'staging-access-token': {
+            type: 'string',
         },
-        "local-access-token": {
-            type: 'string'
+        'prod-access-token': {
+            type: 'string',
         },
-        "prod-access-token": {
-            type: 'string'
-        },
-        "prod-teletype-access-token": {
-            type: 'string'
-        },
-    }
+    },
 });
-export const getSuryaConfig = (env) => {
+export const getConnectConfig = (env, region) => {
     const getHost = (env) => {
         switch (env) {
-            case "local":
-                return "localhost:4000";
-            case "staging":
-                return "surya-staging.oorja.io";
-            case "prod":
-            case "prod-teletype":
-                return "surya.oorja.io";
+            case 'local':
+                return 'connect-staging.oorja.io';
+            case 'prod':
+                return region ? `${region}.connect.oorja.io` : 'connect.oorja.io';
         }
     };
     return {
         host: getHost(env),
         token: getENVAccessToken(env),
-        enableTLS: env !== "local",
     };
 };
-export const ROOM_LINK_SAMPLE = "https://oorja.io/rooms?id=foo#key";
-export const INVALID_ROOM_LINK_MESSAGE = `${chalk.redBright("invalid url ")}🤔. It should look like: ${chalk.blue(ROOM_LINK_SAMPLE)}`;
+export const ROOM_LINK_SAMPLE = 'https://oorja.io/spaces?id=foo#key';
+export const INVALID_ROOM_LINK_MESSAGE = `${chalk.redBright('invalid url ')}🤔. It should look like: ${chalk.blue(ROOM_LINK_SAMPLE)}`;
 export const determineENV = (roomURL) => {
     if (!roomURL)
-        return config.get("env") || "prod-teletype";
+        return config.get('env') || 'prod';
     switch (roomURL.host) {
-        case "oorja.io":
-            return "prod";
-        case "teletype.oorja.io":
-            return "prod-teletype";
-        case "staging.oorja.io":
-            return "staging";
-        case "localhost:3000":
-            return "local";
+        case 'oorja.io':
+        case 'teletype.oorja.io':
+            return 'prod';
+        case 'localhost:3000':
+            return 'local';
         default:
             console.error(INVALID_ROOM_LINK_MESSAGE);
             process.exit(1);
     }
 };
 export const getENVAccessToken = (env) => {
-    return config.get(`${env}-access-token`) || "";
+    return config.get(`${env}-access-token`) || '';
 };
 export const setENVAccessToken = (env, token) => {
     config.set(`${env}-access-token`, token);
@@ -67,21 +54,14 @@ export const setENVAccessToken = (env, token) => {
 export const getoorjaConfig = (env) => {
     let host;
     switch (env) {
-        case "local":
-            host = "localhost:3000";
-            break;
-        case "staging":
-            host = "staging.oorja.io";
-            break;
-        case "prod":
-            host = "oorja.io";
+        case 'local':
+            host = 'localhost:3000';
             break;
-        case "prod-teletype":
-            host = "teletype.oorja.io";
+        case 'prod':
+            host = 'oorja.io';
             break;
     }
     return {
         host,
-        enableTLS: env !== "local",
     };
 };

package/dist/lib/{surya → connect}/index.d.ts

@@ -1,13 +1,13 @@
-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 {
+import { User, RoomApps, Room, CliManifest } from './types.js';
+import { env } from '../config.js';
+import { Channel } from 'phoenix';
+export declare class ApiClientError extends Error {
 }
-export declare class SuryaClient {
+export declare class ConnectClient {
     private config;
     private client;
     private socket?;
-    constructor(env: env);
+    constructor(env: env, region: string);
     fetchCliManifest: () => Promise<CliManifest>;
     fetchSessionUser: () => Promise<User>;
     createRoom: ({ roomName, apps }: CreateRoomOptions) => Promise<Room>;
@@ -29,6 +29,6 @@ export type JoinChannelOptions<T> = {
     onError?: (reason: any) => void;
     onClose?: (payload: any, ref: any, joinRef: any) => void;
     onMessage: (payload: any) => void;
-    handleSessionJoin: (session: string) => void;
-    handleSessionLeave: (session: string) => void;
+    handleSessionJoin: (session: string | undefined, _ignore: any, metas: any) => void;
+    handleSessionLeave: (session: string | undefined) => void;
 };