oorja 1.11.4 → 2.0.1

package/dist/lib/teletype/auxiliary.d.ts

@@ -1,5 +1,5 @@
-import { IPty } from "node-pty";
-import { Hash } from "../surya/types.js";
+import { IPty } from 'node-pty';
+import { Hash } from '../connect/types.js';
 export declare const initScreen: (username: string, hostname: string, shell: string, multiplexed: boolean) => void;
 export type dimensions = {
     rows: number;

package/dist/lib/teletype/auxiliary.js

@@ -1,14 +1,14 @@
-import chalk from "chalk";
-import termSize from "terminal-size";
+import chalk from 'chalk';
+import termSize from 'terminal-size';
 export const initScreen = (username, hostname, shell, multiplexed) => {
-    console.log(chalk.bold(chalk.blueBright("TeleType")));
+    console.log(chalk.bold(chalk.blueBright('TeleType')));
     if (multiplexed) {
-        console.log(chalk.yellowBright("You have allowed room participants to write to your shell"));
+        console.log(chalk.yellowBright('You have allowed room participants to write to your shell'));
     }
     console.log(chalk.blue(`${chalk.bold(`${username}@${hostname}`)} Spawning streaming shell: ${chalk.bold(`${shell}`)}`));
     console.log(`Note: Your shell size may adjust for optimum viewing experience for all participants.\n
 This session is end-to-end encrypted.
-To terminate stream run ${chalk.yellowBright("exit")} or press ${chalk.yellowBright("ctrl-d")} \n`);
+To terminate stream run ${chalk.yellowBright('exit')} or press ${chalk.yellowBright('ctrl-d')} \n`);
 };
 export const getDimensions = () => {
     const { rows, columns } = termSize();

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

@@ -1,7 +1,6 @@
-/// <reference types="node" resolution-mode="require"/>
-import { RoomKey } from "../surya/types.js";
-import { JoinChannelOptions } from "../surya/index.js";
-import { Channel } from "../surya/vendor/phoenix/index.js";
+import { RoomKey } from '../connect/types.js';
+import { JoinChannelOptions } from '../connect/index.js';
+import { Channel } from 'phoenix';
 export type TeletypeOptions = {
     userId: string;
     roomKey: RoomKey;

package/dist/lib/teletype/index.js

@@ -1,16 +1,16 @@
-import { spawn } from "node-pty";
-import * as os from "os";
-import { getDimensions, initScreen, areDimensionEqual, resizeBestFit, } from "./auxiliary.js";
-import chalk from "chalk";
-import { Unauthorized } from "../surya/errors.js";
-import { encrypt, decrypt } from "../encryption.js";
+import { spawn } from 'node-pty';
+import * as os from 'os';
+import { getDimensions, initScreen, areDimensionEqual, resizeBestFit } from './auxiliary.js';
+import chalk from 'chalk';
+import { Unauthorized } from '../connect/errors.js';
+import { encrypt, decrypt } from '../encryption.js';
 var MessageType;
 (function (MessageType) {
     MessageType["IN"] = "i";
     MessageType["OUT"] = "o";
     MessageType["DIMENSIONS"] = "d";
 })(MessageType || (MessageType = {}));
-const SELF = "self";
+const SELF = 'self';
 export const teletypeApp = (options) => {
     const username = os.userInfo().username;
     const hostname = os.hostname();
@@ -40,7 +40,7 @@ export const teletypeApp = (options) => {
                 const stdout = options.process.stdout;
                 const dimensions = userDimensions[SELF];
                 term = spawn(options.shell, [], {
-                    name: "xterm-256color",
+                    name: 'xterm-256color',
                     cols: dimensions.cols,
                     rows: dimensions.rows,
                     cwd: options.process.cwd(),
@@ -53,22 +53,22 @@ export const teletypeApp = (options) => {
                     stdout.write(d);
                     // revisit: is it worth having one letter names, instead of something descriptive
                     // does it really save bytes?
-                    channel.push("new_msg", {
+                    channel.push('new_msg', {
                         t: MessageType.OUT,
                         b: true,
                         d: encrypt(d, options.roomKey),
                     });
                 });
                 term.onExit(() => {
-                    console.log(chalk.blueBright("terminated shell stream to oorja. byee!"));
+                    console.log(chalk.blueBright('terminated shell stream to oorja. byee!'));
                     resolve(null);
                 });
-                stdin.setEncoding("utf8");
+                stdin.setEncoding('utf8');
                 stdin.setRawMode(true);
-                stdin.on("data", (d) => term.write(d.toString("utf8")));
+                stdin.on('data', (d) => term.write(d.toString('utf8')));
             },
             onClose: () => {
-                console.log(chalk.redBright("connection closed, terminated stream."));
+                console.log(chalk.redBright('connection closed, terminated stream.'));
                 process.exit(3);
             },
             onError: (err) => {
@@ -76,7 +76,7 @@ export const teletypeApp = (options) => {
                     console.log(chalk.redBright(err.message));
                 }
                 else {
-                    console.log(chalk.redBright("connection error, terminated stream."));
+                    console.log(chalk.redBright('connection error, terminated stream.'));
                 }
                 process.exit(4);
             },
@@ -88,7 +88,7 @@ export const teletypeApp = (options) => {
                         break;
                     case MessageType.IN:
                         const data = decrypt(d, options.roomKey);
-                        const userId = session.split(":")[0];
+                        const userId = session.split(':')[0];
                         if (options.multiplex) {
                             term.write(data);
                             return;
@@ -104,7 +104,7 @@ export const teletypeApp = (options) => {
             },
             handleSessionJoin: (s) => { },
             handleSessionLeave: (s) => {
-                delete userDimensions[s];
+                s && delete userDimensions[s];
                 resizeBestFit(term, userDimensions);
             },
         });

package/dist/lib/utils.js

@@ -1,11 +1,11 @@
 import inquirer from 'inquirer';
 export const promptRoomLink = async () => {
-    const { roomLink } = await inquirer.prompt([
+    const { spaceLink } = await inquirer.prompt([
         {
             type: 'input',
-            name: 'roomLink',
-            message: 'Enter the room secret link (copy URL from address bar in your browser):',
-        }
+            name: 'spaceLink',
+            message: 'Enter the space secret link (copy URL from address bar in your browser):',
+        },
     ]);
-    return roomLink;
+    return spaceLink;
 };

package/oclif.manifest.json

@@ -25,15 +25,15 @@
         "tty"
       ],
       "args": {
-        "room": {
-          "name": "room"
+        "space": {
+          "name": "space"
         }
       },
       "description": "Launch a terminal streaming session in oorja.",
       "examples": [
-        "$ teletype\nWill prompt to choose streaming destination - existing room or create a new one.\n\n",
-        "$ teletype 'https://oorja.io/rooms?id=foo#key'\nWill stream to the room specified by secret link, you must have joined the room before streaming.\n\n",
-        "$ teletype -m\nWill also allow room participants to write to your terminal!\n\n"
+        "\u001b[94m$ teletype\u001b[39m\nWill prompt to choose streaming destination - existing space or create a new one.\n\n",
+        "\u001b[94m$ teletype 'https://oorja.io/spaces?id=foo#key'\u001b[39m\nWill stream to the space specified by secret link, you must have joined the space before streaming.\n\n",
+        "\u001b[94m$ teletype -m\u001b[39m\nWill also allow participants to write to your terminal!\n\n"
       ],
       "flags": {
         "help": {
@@ -54,15 +54,15 @@
         },
         "multiplex": {
           "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",
+          "description": "Allows users to WRITE TO YOUR SHELL i.e enables collaboration mode. Make sure you trust space participants. Off by default",
           "name": "multiplex",
           "allowNo": false,
           "type": "boolean"
         },
-        "new_room": {
+        "new_space": {
           "char": "n",
-          "description": "Create new room",
-          "name": "new_room",
+          "description": "Create new space",
+          "name": "new_space",
           "allowNo": false,
           "type": "boolean"
         }
@@ -75,6 +75,7 @@
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": false,
+      "order": 1,
       "isESM": true,
       "relativePath": [
         "dist",
@@ -84,5 +85,5 @@
       ]
     }
   },
-  "version": "1.11.4"
+  "version": "2.0.1"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "oorja",
   "description": "stream terminals to the web and more.",
-  "version": "1.11.4",
+  "version": "2.0.1",
   "keywords": [
     "teletype",
     "terminal",
@@ -32,7 +32,8 @@
     "prepack": "yarn build && oclif manifest && oclif readme",
     "postpack": "shx rm -f oclif.manifest.json",
     "prepare": "yarn build",
-    "version": "oclif readme && git add README.md"
+    "version": "oclif readme && git add README.md",
+    "format": "prettier --write ."
   },
   "oclif": {
     "bin": "oorja",
@@ -44,33 +45,36 @@
     ]
   },
   "dependencies": {
-    "@msgpack/msgpack": "^3.0.0-beta2",
-    "@oclif/core": "^3.26.4",
-    "@oclif/plugin-help": "^6.0.21",
-    "axios": "^1.6.8",
+    "@msgpack/msgpack": "^2.8.0",
+    "@oclif/core": "^4.2.0",
+    "@oclif/plugin-help": "^6.2.20",
+    "axios": "^1.7.9",
     "camelcase-keys": "^9.1.3",
-    "chalk": "^5.3.0",
+    "chalk": "^5.4.1",
     "conf-cli": "0.1.9",
-    "inquirer": "^9.2.20",
+    "haversine-distance": "^1.2.3",
+    "inquirer": "^12.3.0",
     "node-pty": "^1.0.0",
-    "ora": "^8.0.1",
-    "terminal-size": "^4.0.0",
-    "ws": "^8.16.0"
+    "ora": "^8.1.1",
+    "phoenix": "1.7.18",
+    "terminal-size": "^4.0.0"
   },
   "devDependencies": {
     "@oclif/prettier-config": "^0.2.1",
     "@types/inquirer": "^9.0.7",
-    "@types/node": "^18",
-    "eslint": "^8",
-    "eslint-config-oclif": "^5.1.3",
-    "eslint-config-oclif-typescript": "^3.1.6",
+    "@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-config-prettier": "^9.1.0",
-    "oclif": "^4.9.0",
+    "oclif": "^4.17.4",
+    "prettier": "^3.4.2",
     "shx": "^0.3.4",
     "ts-node": "^10.9.2",
-    "typescript": "^5.4.5"
+    "typescript": "^5.7.2"
   },
   "engines": {
-    "node": ">=18.18.0"
+    "node": ">=22.10.0"
   }
 }

package/dist/lib/surya/vendor/phoenix/ajax.d.ts

@@ -1,8 +0,0 @@
-export default class Ajax {
-    static request(method: any, endPoint: any, accept: any, body: any, timeout: any, ontimeout: any, callback: any): any;
-    static xdomainRequest(req: any, method: any, endPoint: any, body: any, timeout: any, ontimeout: any, callback: any): any;
-    static xhrRequest(req: any, method: any, endPoint: any, accept: any, body: any, timeout: any, ontimeout: any, callback: any): any;
-    static parseJSON(resp: any): any;
-    static serialize(obj: any, parentKey: any): any;
-    static appendParams(url: any, params: any): any;
-}

package/dist/lib/surya/vendor/phoenix/ajax.js

@@ -1,82 +0,0 @@
-// @ts-nocheck
-import { global, XHR_STATES } from "./constants.js";
-export default class Ajax {
-    static request(method, endPoint, accept, body, timeout, ontimeout, callback) {
-        if (global.XDomainRequest) {
-            let req = new global.XDomainRequest(); // IE8, IE9
-            return this.xdomainRequest(req, method, endPoint, body, timeout, ontimeout, callback);
-        }
-        else {
-            let req = new global.XMLHttpRequest(); // IE7+, Firefox, Chrome, Opera, Safari
-            return this.xhrRequest(req, method, endPoint, accept, body, timeout, ontimeout, callback);
-        }
-    }
-    static xdomainRequest(req, method, endPoint, body, timeout, ontimeout, callback) {
-        req.timeout = timeout;
-        req.open(method, endPoint);
-        req.onload = () => {
-            let response = this.parseJSON(req.responseText);
-            callback && callback(response);
-        };
-        if (ontimeout) {
-            req.ontimeout = ontimeout;
-        }
-        // Work around bug in IE9 that requires an attached onprogress handler
-        req.onprogress = () => { };
-        req.send(body);
-        return req;
-    }
-    static xhrRequest(req, method, endPoint, accept, body, timeout, ontimeout, callback) {
-        req.open(method, endPoint, true);
-        req.timeout = timeout;
-        req.setRequestHeader("Content-Type", accept);
-        req.onerror = () => callback && callback(null);
-        req.onreadystatechange = () => {
-            if (req.readyState === XHR_STATES.complete && callback) {
-                let response = this.parseJSON(req.responseText);
-                callback(response);
-            }
-        };
-        if (ontimeout) {
-            req.ontimeout = ontimeout;
-        }
-        req.send(body);
-        return req;
-    }
-    static parseJSON(resp) {
-        if (!resp || resp === "") {
-            return null;
-        }
-        try {
-            return JSON.parse(resp);
-        }
-        catch (e) {
-            console && console.log("failed to parse JSON response", resp);
-            return null;
-        }
-    }
-    static serialize(obj, parentKey) {
-        let queryStr = [];
-        for (var key in obj) {
-            if (!Object.prototype.hasOwnProperty.call(obj, key)) {
-                continue;
-            }
-            let paramKey = parentKey ? `${parentKey}[${key}]` : key;
-            let paramVal = obj[key];
-            if (typeof paramVal === "object") {
-                queryStr.push(this.serialize(paramVal, paramKey));
-            }
-            else {
-                queryStr.push(encodeURIComponent(paramKey) + "=" + encodeURIComponent(paramVal));
-            }
-        }
-        return queryStr.join("&");
-    }
-    static appendParams(url, params) {
-        if (Object.keys(params).length === 0) {
-            return url;
-        }
-        let prefix = url.match(/\?/) ? "&" : "?";
-        return `${url}${prefix}${this.serialize(params)}`;
-    }
-}

package/dist/lib/surya/vendor/phoenix/channel.d.ts

@@ -1,154 +0,0 @@
-import Push from "./push.js";
-/**
- *
- * @param {string} topic
- * @param {(Object|function)} params
- * @param {Socket} socket
- */
-export default class Channel {
-    constructor(topic: any, params: any, socket: any);
-    /**
-     * Join the channel
-     * @param {integer} timeout
-     * @returns {Push}
-     */
-    join(timeout?: any): any;
-    /**
-     * Hook into channel close
-     * @param {Function} callback
-     */
-    onClose(callback: any): void;
-    /**
-     * Hook into channel errors
-     * @param {Function} callback
-     */
-    onError(callback: any): number;
-    /**
-     * Subscribes on channel events
-     *
-     * Subscription returns a ref counter, which can be used later to
-     * unsubscribe the exact event listener
-     *
-     * @example
-     * const ref1 = channel.on("event", do_stuff)
-     * const ref2 = channel.on("event", do_other_stuff)
-     * channel.off("event", ref1)
-     * // Since unsubscription, do_stuff won't fire,
-     * // while do_other_stuff will keep firing on the "event"
-     *
-     * @param {string} event
-     * @param {Function} callback
-     * @returns {integer} ref
-     */
-    on(event: any, callback: any): number;
-    /**
-     * Unsubscribes off of channel events
-     *
-     * Use the ref returned from a channel.on() to unsubscribe one
-     * handler, or pass nothing for the ref to unsubscribe all
-     * handlers for the given event.
-     *
-     * @example
-     * // Unsubscribe the do_stuff handler
-     * const ref1 = channel.on("event", do_stuff)
-     * channel.off("event", ref1)
-     *
-     * // Unsubscribe all handlers from event
-     * channel.off("event")
-     *
-     * @param {string} event
-     * @param {integer} ref
-     */
-    off(event: any, ref: any): void;
-    /**
-     * @private
-     */
-    canPush(): any;
-    /**
-     * Sends a message `event` to phoenix with the payload `payload`.
-     * Phoenix receives this in the `handle_in(event, payload, socket)`
-     * function. if phoenix replies or it times out (default 10000ms),
-     * then optionally the reply can be received.
-     *
-     * @example
-     * channel.push("event")
-     *   .receive("ok", payload => console.log("phoenix replied:", payload))
-     *   .receive("error", err => console.log("phoenix errored", err))
-     *   .receive("timeout", () => console.log("timed out pushing"))
-     * @param {string} event
-     * @param {Object} payload
-     * @param {number} [timeout]
-     * @returns {Push}
-     */
-    push(event: any, payload: any, timeout?: any): Push;
-    /** Leaves the channel
-     *
-     * Unsubscribes from server events, and
-     * instructs channel to terminate on server
-     *
-     * Triggers onClose() hooks
-     *
-     * To receive leave acknowledgements, use the `receive`
-     * hook to bind to the server ack, ie:
-     *
-     * @example
-     * channel.leave().receive("ok", () => alert("left!") )
-     *
-     * @param {integer} timeout
-     * @returns {Push}
-     */
-    leave(timeout?: any): Push;
-    /**
-     * Overridable message hook
-     *
-     * Receives all events for specialized message handling
-     * before dispatching to the channel callbacks.
-     *
-     * Must return the payload, modified or unmodified
-     * @param {string} event
-     * @param {Object} payload
-     * @param {integer} ref
-     * @returns {Object}
-     */
-    onMessage(_event: any, payload: any, _ref: any): any;
-    /**
-     * @private
-     */
-    isMember(topic: any, event: any, payload: any, joinRef: any): boolean;
-    /**
-     * @private
-     */
-    joinRef(): any;
-    /**
-     * @private
-     */
-    rejoin(timeout?: any): void;
-    /**
-     * @private
-     */
-    trigger(event: any, payload: any, ref: any, joinRef: any): void;
-    /**
-     * @private
-     */
-    replyEventName(ref: any): string;
-    /**
-     * @private
-     */
-    isClosed(): boolean;
-    /**
-     * @private
-     */
-    isErrored(): boolean;
-    /**
-     * @private
-     */
-    isJoined(): boolean;
-    /**
-     * @private
-     */
-    isJoining(): boolean;
-    /**
-     * @private
-     */
-    isLeaving(): boolean;
-}