oorja 2.0.8 → 2.1.0

package/README.md

@@ -9,11 +9,11 @@ cli tool that allows you to share your terminal online conveniently. Check out [
 
 
 <p align="center">
-  <img width="600" src="https://teletype.oorja.io/images/cli-demo.svg">
+  <img width="600" src="https://oorja.io/images/cli-demo.svg">
 </p>
 
 <p align="center">
-  <img src="https://teletype.oorja.io/images/teletype-session.png">
+  <img src="https://oorja.io/images/teletype-session.png">
 </p>
 
 Your stream can be view-only or collaboration enabled (command-line flag).

package/dist/commands/teletype/index.js

@@ -95,9 +95,10 @@ Will also allow participants to write to your terminal!
             text: chalk.bold('Creating space with TeleType app'),
             discardStdin: false,
         }).start();
+        const now = new Date();
         const { roomKey } = await app
             .createRoom({
-            roomName: 'Untitled Space',
+            roomName: `Teletype session - ${os.hostname()} @ ${now.getHours()}:${now.getMinutes().toString().padStart(2, '0')}`,
             apps: {
                 defaultFocus: '39',
                 appList: [

package/dist/lib/config.d.ts

@@ -1,5 +1,5 @@
 import { URL } from 'url';
-export declare const CLI_VERSION = 2.4;
+export declare const CLI_VERSION = 2.5;
 import Conf from 'conf';
 export declare const config: Conf<string>;
 export type env = 'local' | 'prod';

package/dist/lib/config.js

@@ -1,5 +1,5 @@
 import chalk from 'chalk';
-export const CLI_VERSION = 2.4;
+export const CLI_VERSION = 2.5;
 import Conf from 'conf';
 export const config = new Conf({
     projectName: 'oorja',

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

@@ -5,9 +5,12 @@ export declare class ApiClientError extends Error {
 }
 export declare class ConnectClient {
     private config;
-    private client;
+    private baseURL;
+    private headers;
+    private timeout;
     private socket?;
     constructor(env: env, region: string);
+    private _fetch;
     fetchCliManifest: () => Promise<CliManifest>;
     fetchSessionUser: () => Promise<User>;
     createRoom: ({ roomName, apps }: CreateRoomOptions) => Promise<Room>;

package/dist/lib/connect/index.js

@@ -1,8 +1,6 @@
 // backend api client
-import https from 'https';
-import axios, { AxiosError } from 'axios';
 import { Encoder, Decoder } from '@msgpack/msgpack';
-const encoder = new Encoder({ ignoreUndefined: true });
+const encoder = new Encoder();
 const decoder = new Decoder();
 import { defaultParser } from './resources.js';
 import { getConnectConfig } from '../config.js';
@@ -13,28 +11,51 @@ export class ApiClientError extends Error {
 }
 export class ConnectClient {
     config;
-    client;
+    baseURL;
+    headers;
+    timeout;
     socket;
     constructor(env, region) {
         const config = getConnectConfig(env, region);
-        this.client = axios.create({
-            httpsAgent: new https.Agent({
-                minVersion: 'TLSv1.2',
-                maxVersion: 'TLSv1.2',
-            }),
-            baseURL: connectBaseURL(config.host),
-            timeout: 5000,
-            responseType: 'json',
-            headers: {
-                'x-access-token': config.token || '',
-            },
-        });
+        this.baseURL = connectBaseURL(config.host);
+        this.headers = {
+            'x-access-token': config.token || '',
+            'Content-Type': 'application/json',
+        };
+        this.timeout = 5000;
         this.config = config;
     }
+    // Private helper to encapsulate fetch with timeout and consistent error handling.
+    async _fetch(path, options = {}) {
+        const controller = new AbortController();
+        const timeoutId = setTimeout(() => controller.abort(), this.timeout);
+        try {
+            const response = await fetch(`${this.baseURL}${path}`, {
+                ...options,
+                headers: this.headers,
+                signal: controller.signal,
+            });
+            if (!response.ok) {
+                // Throw an object that mimics the AxiosError structure for the handleError function.
+                throw { response };
+            }
+            return response;
+        }
+        catch (error) {
+            if (error.name === 'AbortError') {
+                throw new Error('Request timed out');
+            }
+            throw error; // Re-throw other errors (like the custom {response} or network errors)
+        }
+        finally {
+            clearTimeout(timeoutId);
+        }
+    }
     fetchCliManifest = async () => {
         try {
-            const response = await this.client.get('/cli');
-            return camelcaseKeys(response.data);
+            const response = await this._fetch('/cli');
+            const data = await response.json();
+            return camelcaseKeys(data);
         }
         catch (error) {
             return handleError(error);
@@ -42,8 +63,9 @@ export class ConnectClient {
     };
     fetchSessionUser = async () => {
         try {
-            const response = await this.client.get('/session/user');
-            return defaultParser(response.data.data);
+            const response = await this._fetch('/session/user');
+            const data = await response.json();
+            return defaultParser(data.data);
         }
         catch (error) {
             return handleError(error);
@@ -58,8 +80,12 @@ export class ConnectClient {
             },
         };
         try {
-            const response = await this.client.post('/rooms', body);
-            return defaultParser(response.data.data);
+            const response = await this._fetch('/rooms', {
+                method: 'POST',
+                body: JSON.stringify(body),
+            });
+            const data = await response.json();
+            return defaultParser(data.data);
         }
         catch (error) {
             return handleError(error);
@@ -67,8 +93,9 @@ export class ConnectClient {
     };
     createAnonymousUser = async () => {
         try {
-            const response = await this.client.post('/session/anon');
-            return response.data.access_token;
+            const response = await this._fetch('/session/anon', { method: 'POST' });
+            const data = await response.json();
+            return data.access_token;
         }
         catch (error) {
             return handleError(error);
@@ -76,11 +103,15 @@ export class ConnectClient {
     };
     accessTokenFromRoomParticipantOTP = async (roomId, otp) => {
         try {
-            const response = await this.client.post('/access_tokens/from_room_participant_otp', {
-                room_id: roomId,
-                otp: otp,
+            const response = await this._fetch('/access_tokens/from_room_participant_otp', {
+                method: 'POST',
+                body: JSON.stringify({
+                    room_id: roomId,
+                    otp: otp,
+                }),
             });
-            return response.data.data.token;
+            const data = await response.json();
+            return data.data.token;
         }
         catch (error) {
             return handleError(error);
@@ -88,8 +119,9 @@ export class ConnectClient {
     };
     fetchRoom = async (roomId) => {
         try {
-            const response = await this.client.get(`/rooms/${roomId}`);
-            return defaultParser(response.data.data);
+            const response = await this._fetch(`/rooms/${roomId}`);
+            const data = await response.json();
+            return defaultParser(data.data);
         }
         catch (error) {
             return handleError(error);
@@ -182,7 +214,10 @@ export class ConnectClient {
 }
 const connectBaseURL = (host) => `https://${host}/api/v1`;
 const handleError = (error) => {
-    if (error instanceof AxiosError) {
+    // This function was originally designed for AxiosError.
+    // The custom _fetch method now throws an object with a `response` key
+    // for HTTP errors (`{ response }`), allowing this logic to remain unchanged.
+    if (error?.response) {
         const { response } = error;
         if (response) {
             switch (response.status) {

package/dist/lib/teletype/index.js

@@ -27,6 +27,7 @@ export const teletypeApp = (options) => {
         resizeBestFit(term, userDimensions);
     };
     return new Promise((resolve, reject) => {
+        let sessionCount = 0;
         const channel = options.joinChannel({
             channel: `teletype:${options.roomKey.roomId}`,
             params: {
@@ -44,15 +45,32 @@ export const teletypeApp = (options) => {
                     cols: dimensions.cols,
                     rows: dimensions.rows,
                     cwd: options.process.cwd(),
-                    // @ts-ignore
                     env: options.process.env,
                 });
+                setTimeout(() => {
+                    if (options.shell.includes('bash')) {
+                        stdout.write('Adjusting shell prompt to show streaming indicator\n');
+                        term.write("export PS1='📡 [streaming] '$PS1\n");
+                    }
+                    if (options.shell.includes('zsh')) {
+                        stdout.write('Adjusting shell prompt to show streaming indicator\n');
+                        term.write("PROMPT='📡 [streaming] '$PROMPT\n");
+                    }
+                    if (options.shell.includes('fish')) {
+                        stdout.write('Adjusting shell prompt to show streaming indicator\n');
+                        term.write('functions -c fish_prompt __orig_fish_prompt; ' +
+                            "function fish_prompt; echo -n '📡 [streaming] '; __orig_fish_prompt; end\n");
+                    }
+                }, 100); // wait for shell to be ready
                 // track own dimensions and keep it up to date
                 setInterval(reEvaluateOwnDimensions, 1000);
                 term.onData((d) => {
                     stdout.write(d);
-                    // revisit: is it worth having one letter names, instead of something descriptive
-                    // does it really save bytes?
+                    if (sessionCount < 2) {
+                        // 1 sub for own channel session
+                        // < 2 means no subscribers. no point pushing data.
+                        return;
+                    }
                     channel.push('new_msg', {
                         t: MessageType.OUT,
                         b: true,
@@ -102,8 +120,11 @@ export const teletypeApp = (options) => {
                         }
                 }
             },
-            handleSessionJoin: (s) => { },
+            handleSessionJoin: (s) => {
+                sessionCount++;
+            },
             handleSessionLeave: (s) => {
+                sessionCount -= 1;
                 s && delete userDimensions[s];
                 resizeBestFit(term, userDimensions);
             },

package/oclif.manifest.json

@@ -85,5 +85,5 @@
       ]
     }
   },
-  "version": "2.0.8"
+  "version": "2.1.0"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "oorja",
   "description": "stream terminals to the web and more.",
-  "version": "2.0.8",
+  "version": "2.1.0",
   "keywords": [
     "teletype",
     "terminal",
@@ -45,34 +45,33 @@
     ]
   },
   "dependencies": {
-    "@msgpack/msgpack": "3.0.0-beta3",
-    "@oclif/core": "^4.2.6",
-    "@oclif/plugin-help": "^6.2.24",
-    "axios": "^1.7.9",
+    "@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",
-    "haversine-distance": "^1.2.3",
-    "inquirer": "^12.4.1",
+    "haversine-distance": "^1.2.4",
+    "inquirer": "^12.6.3",
     "node-pty": "^1.0.0",
     "ora": "^8.2.0",
-    "phoenix": "1.7.19",
+    "phoenix": "1.7.21",
     "terminal-size": "^4.0.0"
   },
   "devDependencies": {
     "@oclif/prettier-config": "^0.2.1",
-    "@types/inquirer": "^9.0.7",
+    "@types/inquirer": "^9.0.8",
     "@types/node": "^22.10.2",
     "@types/phoenix": "^1.6.6",
-    "eslint": "^9.17.0",
-    "eslint-config-oclif": "^5.2.2",
-    "eslint-config-oclif-typescript": "^3.1.13",
+    "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.17.25",
-    "prettier": "^3.4.2",
-    "shx": "^0.3.4",
+    "oclif": "^4.19.0",
+    "prettier": "^3.5.3",
+    "shx": "^0.4.0",
     "ts-node": "^10.9.2",
-    "typescript": "^5.7.2"
+    "typescript": "^5.8.3"
   },
   "engines": {
     "node": ">=22.10.0"