jointhis.proxy 0.2.2 → 0.2.5

package/README.md

@@ -11,7 +11,7 @@ pnpm build > /dev/null && node ./dist/cli.js
 ## Install
 
 ```bash
-$ npm install --global jointhis.proxy
+pnpm i -g jointhis.proxy@latest
 ```
 
 ## CLI

package/dist/cli.d.ts

@@ -1,2 +1,3 @@
 #!/usr/bin/env node
-export declare const version = "0.2.1";
+export declare const version = "0.2.4";
+export declare var rtun: any;

package/dist/cli.js

@@ -7,15 +7,35 @@ import UI from './ui.js';
 import fs from 'node:fs';
 import { Spawn } from 'ink-spawn';
 import { exec } from 'node:child_process';
-export const version = `0.2.1`;
+export const version = `0.2.4`;
+export var rtun;
 // Get backend executable
-fs.open('./rtun-linux-amd64', 'r', (err, fd) => {
-    if (err) {
-        exec('wget https://github.com/snsinfu/reverse-tunnel/releases/download/v1.3.2/rtun-linux-amd64').on('exit', function () {
-            exec('chmod +x ./rtun-linux-amd64');
-        });
-    }
-});
+if (process.platform == 'linux') {
+    fs.open('./rtun-linux-amd64', 'r', (err, fd) => {
+        if (err) {
+            exec('wget https://github.com/snsinfu/reverse-tunnel/releases/download/v1.3.2/rtun-linux-amd64').on('exit', function () {
+                exec('chmod +x ./rtun-linux-amd64');
+            });
+        }
+    });
+    rtun = './rtun-linux-amd64';
+}
+else if (process.platform == 'win32') {
+    console.log('Windows support is experimental.');
+    fs.open('./rtun-windows-amd64.exe', 'r', (err, fd) => {
+        if (err) {
+            exec('curl -O https://github.com/snsinfu/reverse-tunnel/releases/download/v1.3.2/rtun-windows-amd64.exe');
+        }
+    });
+    rtun = './rtun-windows-amd64.exe';
+}
+else if (process.platform == 'darwin') {
+    console.log('Mac support is not yet implemented.');
+    process.exit(1);
+}
+else {
+    console.error('Unsupported Operating System.');
+}
 const cli = meow(`
 	Usage
 	  $ jointhis.proxy
@@ -97,8 +117,10 @@ if (cli.flags.udp ||
             console.log('Unable to write configuration file.');
             process.exit(1);
         }
+        else {
+            render(React.createElement(Spawn, { maxOutputLines: 4, runningText: "", command: rtun, args: ['-f ./rtun.yml'], shell: true }));
+        }
     });
-    render(React.createElement(Spawn, { maxOutputLines: 4, runningText: "", command: "./rtun-linux-amd64", args: ['-f ./rtun.yml'], shell: true }));
 }
 else {
     // Start automated guide-through

package/dist/main.js

@@ -6,11 +6,13 @@ import SelectInput from 'ink-select-input';
 import { Box } from 'ink';
 import fs from 'node:fs';
 import { Spawn } from 'ink-spawn';
+import { rtun } from './cli.js';
 export default function Main({ view }) {
     const [key, Setkey] = useState('');
     const [sub, Setsub] = useState('');
     const [service, Setservice] = useState('');
     const [fetchSuccess, Setsuccess] = useState(false);
+    const [downloaded, Setdownloaded] = useState(false);
     const services = [
         {
             label: 'MC',
@@ -27,7 +29,7 @@ export default function Main({ view }) {
     ];
     const handleSelect = (item) => {
         Setservice(item.value);
-        getConfig(key, item.value);
+        getConfig(key, item.value, Setdownloaded);
     };
     switch (view) {
         case '1': {
@@ -39,8 +41,12 @@ export default function Main({ view }) {
                     React.createElement(Text, null, "Select a service:"),
                     React.createElement(SelectInput, { onSelect: handleSelect, items: services }),
                     React.createElement(Text, null, "For custom, use the CLI flags.")),
+                React.createElement(Step, { canProceed: downloaded },
+                    React.createElement(Text, null, downloaded
+                        ? 'Press enter to continue.'
+                        : 'Please wait until everything is set up.')),
                 React.createElement(Step, { name: "last" },
-                    React.createElement(Spawn, { maxOutputLines: 4, runningText: "", command: "./rtun-linux-amd64", args: ['-f ./rtun.yml'], shell: true }),
+                    React.createElement(Spawn, { maxOutputLines: 4, runningText: "", command: rtun, args: ['-f ./rtun.yml'], shell: true }),
                     React.createElement(Box, { marginTop: 1 },
                         React.createElement(Text, { dimColor: true }, "Press enter to quit")))));
         }
@@ -52,7 +58,7 @@ export default function Main({ view }) {
         }
     }
 }
-async function getConfig(token, service) {
+async function getConfig(token, service, Setdownloaded) {
     var tcp;
     var udp;
     if (service == '1') {
@@ -84,5 +90,8 @@ async function getConfig(token, service) {
             console.log('Unable to write configuration file.');
             process.exit(1);
         }
+        else if (!err) {
+            Setdownloaded(true);
+        }
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "jointhis.proxy",
-	"version": "0.2.2",
+	"version": "0.2.5",
 	"license": "MIT",
 	"bin": "dist/cli.js",
 	"type": "module",