oorja 2.1.2 → 2.1.4

package/dist/lib/teletype/index.js

@@ -4,6 +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';
 var MessageType;
 (function (MessageType) {
     MessageType["IN"] = "i";
@@ -28,6 +29,8 @@ export const teletypeApp = (options) => {
     };
     return new Promise((resolve, reject) => {
         let sessionCount = 0;
+        let ptyReady = false;
+        const ptyFuture = new Future();
         const channel = options.joinChannel({
             channel: `teletype:${options.roomKey.roomId}`,
             params: {
@@ -47,28 +50,32 @@ export const teletypeApp = (options) => {
                     cwd: options.process.cwd(),
                     env: options.process.env,
                 });
-                setTimeout(() => {
+                ptyFuture.promise.then(() => {
                     if (options.shell.endsWith('bash')) {
                         stdout.write('Adjusting shell prompt to show streaming indicator\n');
                         term.write("export PS1='📡 [streaming] '$PS1\n");
                     }
                     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');
                         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);
+                    if (!ptyReady) {
+                        ptyReady = true;
+                        setTimeout(() => {
+                            ptyFuture.resolve(true);
+                        }, 100);
+                    }
                     if (sessionCount < 2) {
                         // 1 sub for own channel session
                         // < 2 means no subscribers. no point pushing data.

package/dist/lib/utils.d.ts

@@ -1 +1,8 @@
 export declare const promptRoomLink: () => Promise<any>;
+export declare class Future<T> {
+    promise: Promise<T>;
+    resolve?: (arg: T) => void;
+    reject?: (e: any) => void;
+    onFinally?: () => void;
+    constructor(futureBase?: (resolve: (arg: T) => void, reject: (e: any) => void) => void, onFinally?: () => void);
+}

package/dist/lib/utils.js

@@ -9,3 +9,20 @@ export const promptRoomLink = async () => {
     ]);
     return spaceLink;
 };
+export class Future {
+    promise;
+    resolve;
+    reject;
+    onFinally;
+    constructor(futureBase, onFinally) {
+        this.onFinally = onFinally;
+        // eslint-disable-next-line no-async-promise-executor
+        this.promise = new Promise(async (resolve, reject) => {
+            this.resolve = resolve;
+            this.reject = reject;
+            if (futureBase) {
+                await futureBase(resolve, reject);
+            }
+        }).finally(() => this.onFinally?.());
+    }
+}

package/oclif.manifest.json

@@ -85,5 +85,5 @@
       ]
     }
   },
-  "version": "2.1.2"
+  "version": "2.1.4"
 }

package/package.json

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