oorja 1.6.6 → 1.7.0

package/README.md

@@ -87,11 +87,11 @@ EXAMPLES
   will prompt to choose streaming destination - existing room or create a new one.
 
 
-  $ teletype 'https://oorja.io/rooms?id=foo'
+  $ teletype 'https://oorja.io/rooms/foo#key'
   will stream to the room specified by secret link, you must have joined the room before streaming.
 
 
-  $ teletype -m 'https://oorja.io/rooms?id=foo'
+  $ teletype -m 'https://oorja.io/rooms/foo#key'
   Will also allow room participants to write to your terminal!
 ```
 

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

@@ -7,6 +7,7 @@ export default class TeleTypeCommand extends Command {
         help: import("@oclif/parser/lib/flags").IBooleanFlag<void>;
         shell: flags.IOptionFlag<string>;
         multiplex: import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
+        new_room: import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
     };
     static args: {
         name: string;

package/lib/commands/teletype/index.js

@@ -11,11 +11,15 @@ const utils_1 = require("../../lib/utils");
 const DEFAULT_SHELL = os.platform() === "win32" ? "powershell.exe" : process.env.SHELL || "bash";
 class TeleTypeCommand extends command_1.Command {
     async run() {
-        const { args, flags: { shell, multiplex }, } = this.parse(TeleTypeCommand);
+        const { args, flags: { shell, multiplex, new_room }, } = this.parse(TeleTypeCommand);
         if (args.room) {
             await this.streamToLink({ shell, multiplex, roomLink: args.room });
             process.exit(0);
         }
+        if (new_room) {
+            await this.createRoomAndStream({ shell, multiplex });
+            process.exit(0);
+        }
         console.log("(use -h for description and options) \n");
         // room not known, prompt
         const ROOM = "To an existing room (you have the room link)";
@@ -110,5 +114,10 @@ TeleTypeCommand.flags = {
         description: "Allows room users to WRITE TO YOUR SHELL i.e enables collaboration mode. Make sure you trust room participants. Off by default",
         default: false,
     }),
+    new_room: command_1.flags.boolean({
+        char: "n",
+        description: "Create new room",
+        default: false,
+    }),
 };
 TeleTypeCommand.args = [{ name: "room" }];

package/lib/lib/config.d.ts

@@ -1,5 +1,5 @@
 import { URL } from "url";
-export declare const CLI_VERSION = 1.6;
+export declare const CLI_VERSION = 1.7;
 export declare const config: any;
 export type env = "staging" | "local" | "prod" | "prod-teletype";
 export type SuryaConfig = {
@@ -8,7 +8,7 @@ export type SuryaConfig = {
     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 ROOM_LINK_SAMPLE = "https://oorja.io/rooms/foo#key";
 export declare const INVALID_ROOM_LINK_MESSAGE: string;
 export declare const determineENV: (roomURL?: URL) => env;
 export declare const getENVAccessToken: (env: env) => string;

package/lib/lib/config.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getoorjaConfig = exports.setENVAccessToken = exports.getENVAccessToken = exports.determineENV = exports.INVALID_ROOM_LINK_MESSAGE = exports.ROOM_LINK_SAMPLE = exports.getSuryaConfig = exports.config = exports.CLI_VERSION = void 0;
 const chalk = require("chalk");
-exports.CLI_VERSION = 1.6;
+exports.CLI_VERSION = 1.7;
 const Conf = require("conf");
 exports.config = new Conf({
     projectName: "oorja",
@@ -26,7 +26,7 @@ const getSuryaConfig = (env) => {
     };
 };
 exports.getSuryaConfig = getSuryaConfig;
-exports.ROOM_LINK_SAMPLE = "https://oorja.io/rooms?id=foo#key";
+exports.ROOM_LINK_SAMPLE = "https://oorja.io/rooms/foo#key";
 exports.INVALID_ROOM_LINK_MESSAGE = `${chalk.redBright("invalid url ")}🤔. It should look like: ${chalk.blue(exports.ROOM_LINK_SAMPLE)}`;
 const determineENV = (roomURL) => {
     if (!roomURL)

package/lib/lib/oorja/index.js

@@ -25,7 +25,7 @@ class OORJA {
             };
         };
         this.linkForRoom = (roomKey) => {
-            return `${oorjaURL(this.config)}/rooms?id=${roomKey.roomId}#${(0, encryption_1.exportKey)(roomKey.key)}`;
+            return `${oorjaURL(this.config)}/rooms/${roomKey.roomId}#${(0, encryption_1.exportKey)(roomKey.key)}`;
         };
         this.teletype = (options) => {
             return (0, teletype_1.teletypeApp)(Object.assign({ userId: this.user.id, joinChannel: this.suryaClient.joinChannel }, options));
@@ -35,21 +35,24 @@ class OORJA {
         const url = parseRoomURL(roomLink);
         return {
             key: (0, encryption_1.importKey)(url.hash),
-            roomId: url.searchParams.get("id"),
+            roomId: url.pathname.split("/")[2],
         };
     }
 }
 const parseRoomURL = (roomLink) => {
     const url = new url_1.URL(roomLink);
-    if (!url.searchParams.get("id") || !url.hash) {
+    if (!url.hash || !getRoomId(url)) {
         console.log(config_1.INVALID_ROOM_LINK_MESSAGE);
         process.exit(3);
     }
     return url;
 };
 const getRoomId = (roomURL) => {
-    const id = roomURL.searchParams.get("id");
-    return id || undefined;
+    const fragments = roomURL.pathname.split("/");
+    if (fragments.length !== 3 || fragments[1] !== "rooms" || !fragments["2"]) {
+        return undefined;
+    }
+    return fragments["2"];
 };
 const oorjaURL = (config) => {
     const { host, enableTLS } = config;

package/oclif.manifest.json

@@ -1 +1 @@
-{"version":"1.6.6","commands":{"signout":{"id":"signout","description":"Sign-out of oorja. Clears saved auth-token","pluginName":"oorja","pluginType":"core","aliases":[],"flags":{},"args":[]},"teletype":{"id":"teletype","description":"Launch a terminal streaming session in oorja.","pluginName":"oorja","pluginType":"core","aliases":["tty"],"examples":["\u001b[94m$ teletype\u001b[39m\nWill prompt to choose streaming destination - existing room or create a new one.\n\n","\u001b[94m$ teletype 'https://oorja.io/rooms?id=foo#key'\u001b[39m\nWill stream to the room specified by secret link, you must have joined the room before streaming.\n\n","\u001b[94m$ teletype -m\u001b[39m\nWill also allow room participants to write to your terminal!\n\n"],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"shell":{"name":"shell","type":"option","char":"s","description":"shell to use. e.g. bash, fish","default":"/usr/bin/zsh"},"multiplex":{"name":"multiplex","type":"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","allowNo":false}},"args":[{"name":"room"}]}}}
+{"version":"1.7.0","commands":{"signout":{"id":"signout","description":"Sign-out of oorja. Clears saved auth-token","pluginName":"oorja","pluginType":"core","aliases":[],"flags":{},"args":[]},"teletype":{"id":"teletype","description":"Launch a terminal streaming session in oorja.","pluginName":"oorja","pluginType":"core","aliases":["tty"],"examples":["\u001b[94m$ teletype\u001b[39m\nWill prompt to choose streaming destination - existing room or create a new one.\n\n","\u001b[94m$ teletype 'https://oorja.io/rooms/foo#key'\u001b[39m\nWill stream to the room specified by secret link, you must have joined the room before streaming.\n\n","\u001b[94m$ teletype -m\u001b[39m\nWill also allow room participants to write to your terminal!\n\n"],"flags":{"help":{"name":"help","type":"boolean","char":"h","description":"show CLI help","allowNo":false},"shell":{"name":"shell","type":"option","char":"s","description":"shell to use. e.g. bash, fish","default":"/usr/bin/zsh"},"multiplex":{"name":"multiplex","type":"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","allowNo":false},"new_room":{"name":"new_room","type":"boolean","char":"n","description":"Create new room","allowNo":false}},"args":[{"name":"room"}]}}}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "oorja",
   "description": "stream terminals to the web and more.",
-  "version": "1.6.6",
+  "version": "1.7.0",
   "author": "Akshay Kumar @akshaykmr",
   "bin": {
     "oorja": "./bin/run",