oorja 2.1.3 → 2.1.5

package/dist/commands/teletype/index.js

@@ -5,7 +5,7 @@ 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';
+import { printExitMessage, promptRoomLink } from '../../lib/utils.js';
 const DEFAULT_SHELL = os.platform() === 'win32' ? 'powershell.exe' : process.env.SHELL || 'bash';
 export default class TeleTypeCommand extends Command {
     static order = 1;
@@ -81,7 +81,7 @@ Will also allow participants to write to your terminal!
     async streamToLink(options) {
         const roomLink = options.roomLink || (await promptRoomLink());
         if (!roomLink) {
-            console.log(chalk.redBright('Space link not provided :('));
+            printExitMessage(chalk.redBright('Space link not provided :('));
             process.exit();
         }
         const app = await getApp({ roomLink });
@@ -111,7 +111,7 @@ Will also allow participants to write to your terminal!
             },
         })
             .catch((e) => {
-            console.log('Failed to create space.');
+            printExitMessage('Failed to create space.');
             process.exit(9);
         });
         spinner.succeed(chalk.bold('Space created')).clear();

package/dist/lib/config.js

@@ -1,6 +1,7 @@
 import chalk from 'chalk';
 export const CLI_VERSION = 2.5;
 import Conf from 'conf';
+import { printExitMessage } from './utils.js';
 export const config = new Conf({
     projectName: 'oorja',
     schema: {
@@ -41,7 +42,7 @@ export const determineENV = (roomURL) => {
         case 'localhost:3000':
             return 'local';
         default:
-            console.error(INVALID_ROOM_LINK_MESSAGE);
+            printExitMessage(INVALID_ROOM_LINK_MESSAGE);
             process.exit(1);
     }
 };

package/dist/lib/connect/index.js

@@ -7,6 +7,7 @@ import { getConnectConfig } from '../config.js';
 import { Unauthorized, BadRequest } from './errors.js';
 import { Socket, Presence } from 'phoenix';
 import camelcaseKeys from 'camelcase-keys';
+import { printExitMessage } from '../utils.js';
 export class ApiClientError extends Error {
 }
 export class ConnectClient {
@@ -157,7 +158,7 @@ export class ConnectClient {
                     reject();
                     return;
                 }
-                console.error('connection error');
+                printExitMessage('connection error');
                 process.exit(2);
             });
             // @ts-ignore
@@ -195,6 +196,7 @@ export class ConnectClient {
                     onError(new Unauthorized('unauthorized: user needs to join the room before a stream can be started.'));
                 return;
             }
+            printExitMessage('error on channel');
             process.exit(3);
         });
         return chan;

package/dist/lib/oorja/client.js

@@ -1,4 +1,5 @@
 import haversine from 'haversine-distance';
+import { printExitMessage } from '../utils.js';
 export class OorjaClientError extends Error {
 }
 const _maybeError = (response) => {
@@ -27,7 +28,7 @@ export const getRegion = async () => {
         method: 'GET',
     });
     if (response.status !== 200) {
-        console.error('There seems to be an issue with the network');
+        printExitMessage('There seems to be an issue with the network');
         process.exit(1);
     }
     const settings = (await response.json());
@@ -46,7 +47,7 @@ export const getRegion = async () => {
         return minDistance.name;
     }
     catch {
-        console.error('error determining region');
+        printExitMessage('error determining region');
         process.exit(1);
     }
 };

package/dist/lib/oorja/index.js

@@ -6,6 +6,7 @@ import { importKey, createRoomKey, exportKey } from '../encryption.js';
 import { loginByRoomOTP, preflight, promptAuth, resumeSession, validateCliVersion } from './preflight.js';
 import { getRegion } from './client.js';
 import ora from 'ora';
+import { printExitMessage } from '../utils.js';
 export class InvalidRoomLink extends Error {
 }
 class OORJA {
@@ -47,7 +48,7 @@ class OORJA {
 const parseRoomURL = (roomLink) => {
     const url = new URL(roomLink);
     if (!url.hash || !getRoomId(url)) {
-        console.log(INVALID_ROOM_LINK_MESSAGE);
+        printExitMessage(INVALID_ROOM_LINK_MESSAGE);
         process.exit(3);
     }
     return url;
@@ -80,7 +81,7 @@ const init = async (env, options = {}) => {
         else {
             token = await promptAuth(connectClient, linkForTokenGen(config));
             if (!token) {
-                console.log('Token not provided :(');
+                printExitMessage('Token not provided :(');
                 process.exit(12);
             }
         }

package/dist/lib/oorja/preflight.js

@@ -3,6 +3,7 @@ import inquirer from 'inquirer';
 import ora from 'ora';
 import { setENVAccessToken, CLI_VERSION, getENVAccessToken } from '../config.js';
 import { BadRequest, Unauthorized } from '../connect/errors.js';
+import { printExitMessage } from '../utils.js';
 const promptToken = () => inquirer
     .prompt([
     {
@@ -48,7 +49,7 @@ export const loginByRoomOTP = async (connectClient, roomId) => {
     const otp = await promptRoomParticipantOTP();
     if (!otp) {
         console.log('OTP not provided :(');
-        console.log(OTP_HELP_MESSAGE);
+        printExitMessage(OTP_HELP_MESSAGE);
         process.exit(213);
     }
     try {
@@ -57,7 +58,7 @@ export const loginByRoomOTP = async (connectClient, roomId) => {
     catch (e) {
         if (e instanceof BadRequest) {
             console.log(chalk.redBright('Invalid otp. It may have expired.'));
-            console.log(OTP_HELP_MESSAGE);
+            printExitMessage(OTP_HELP_MESSAGE);
             process.exit();
         }
         throw e;
@@ -66,7 +67,7 @@ export const loginByRoomOTP = async (connectClient, roomId) => {
 export const validateCliVersion = async (connectClient) => {
     const manifest = await connectClient.fetchCliManifest();
     if (manifest.cliVersion > CLI_VERSION) {
-        console.log(chalk.redBright('Your oorja cli is outdated. Please run: npm update -g oorja'));
+        printExitMessage(chalk.redBright('Your oorja cli is outdated. Please run: npm update -g oorja'));
         process.exit(1);
     }
 };
@@ -118,11 +119,13 @@ export const preflight = async (env, connectClient) => {
     catch (e) {
         setENVAccessToken(env, '');
         if (e instanceof Unauthorized) {
-            spinner.fail('Your access token failed authentication, resetting...');
+            spinner.fail();
+            printExitMessage('Your access token failed authentication, resetting...');
             process.exit(33);
         }
         else {
-            spinner.fail('Something went wrong :(');
+            spinner.fail();
+            printExitMessage('Something went wrong :(');
         }
         throw e;
     }

package/dist/lib/teletype/index.js

@@ -4,7 +4,7 @@ import { getDimensions, initScreen, areDimensionEqual, resizeBestFit } from './a
 import chalk from 'chalk';
 import { Unauthorized } from '../connect/errors.js';
 import { encrypt, decrypt } from '../encryption.js';
-import { Future } from '../utils.js';
+import { Future, printExitMessage } from '../utils.js';
 var MessageType;
 (function (MessageType) {
     MessageType["IN"] = "i";
@@ -57,10 +57,8 @@ export const teletypeApp = (options) => {
                     }
                     if (options.shell.endsWith('zsh')) {
                         stdout.write('Adjusting shell prompt to show streaming indicator\n');
-                        const zshFunc = ' _streaming_prompt_precmd() { if [[ "$PROMPT" != *\'📡 [streaming] \'* ]]; then PROMPT="📡 [streaming] $PROMPT"; fi; }\n';
-                        const zshHook = ' precmd_functions+=(_streaming_prompt_precmd)\n';
-                        term.write(zshFunc);
-                        term.write(zshHook);
+                        // FIXME: this doesnt work on macos (or its probably due to some conflict with powerlevel10k)
+                        term.write("PROMPT='📡 [streaming] '$PROMPT\n");
                     }
                     if (options.shell.endsWith('fish')) {
                         stdout.write('Adjusting shell prompt to show streaming indicator\n');
@@ -71,11 +69,13 @@ export const teletypeApp = (options) => {
                 // track own dimensions and keep it up to date
                 setInterval(reEvaluateOwnDimensions, 1000);
                 term.onData((d) => {
+                    stdout.write(d);
                     if (!ptyReady) {
                         ptyReady = true;
-                        ptyFuture.resolve(true);
+                        setTimeout(() => {
+                            ptyFuture.resolve(true);
+                        }, 100);
                     }
-                    stdout.write(d);
                     if (sessionCount < 2) {
                         // 1 sub for own channel session
                         // < 2 means no subscribers. no point pushing data.
@@ -96,15 +96,15 @@ export const teletypeApp = (options) => {
                 stdin.on('data', (d) => term.write(d.toString('utf8')));
             },
             onClose: () => {
-                console.log(chalk.redBright('connection closed, terminated stream.'));
+                printExitMessage(chalk.redBright('connection closed, terminated stream.'));
                 process.exit(3);
             },
             onError: (err) => {
                 if (err instanceof Unauthorized) {
-                    console.log(chalk.redBright(err.message));
+                    printExitMessage(chalk.redBright(err.message));
                 }
                 else {
-                    console.log(chalk.redBright('connection error, terminated stream.'));
+                    printExitMessage(chalk.redBright('connection error, terminated stream.'));
                 }
                 process.exit(4);
             },
@@ -125,7 +125,7 @@ export const teletypeApp = (options) => {
                             term.write(data);
                         }
                         else {
-                            console.log(chalk.redBright(`unexpected input from user: ${userId}, terminating stream for safety. Please report this issue`));
+                            printExitMessage(chalk.redBright(`unexpected input from user: ${userId}, terminating stream for safety. Please report this issue`));
                             process.exit(5);
                         }
                 }

package/dist/lib/utils.d.ts

@@ -1,3 +1,4 @@
+export declare const printExitMessage: (printMessage: string) => void;
 export declare const promptRoomLink: () => Promise<any>;
 export declare class Future<T> {
     promise: Promise<T>;

package/dist/lib/utils.js

@@ -1,4 +1,8 @@
 import inquirer from 'inquirer';
+import { writeSync } from 'fs';
+export const printExitMessage = (printMessage) => {
+    writeSync(process.stdout.fd, printMessage);
+};
 export const promptRoomLink = async () => {
     const { spaceLink } = await inquirer.prompt([
         {

package/oclif.manifest.json

@@ -85,5 +85,5 @@
       ]
     }
   },
-  "version": "2.1.3"
+  "version": "2.1.5"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "oorja",
   "description": "stream terminals to the web and more.",
-  "version": "2.1.3",
+  "version": "2.1.5",
   "keywords": [
     "teletype",
     "terminal",