@ying-tunnel/cli 1.0.1 → 1.1.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @ying-tunnel/cli
 
+## 1.1.0
+
+### Minor Changes
+
+- remove cac and use commander
+
 ## 1.0.1
 
 ### Patch Changes

package/LICENSE.md

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 Jack Deng
+Copyright (c) 2024 Jack Ying
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -6,10 +6,18 @@
 npm i @ying-tunnel/cli -g
 ```
 
+```bash
+pnpm i @ying-tunnel/cli -g
+```
+
 ### 使用示例
 
 ```bash
-ying-tunnel <要连接的服务ip或域名> <要连接的服务端口> <对应的token配置>
+ying-tunnel -v
+```
+
+```bash
+ying-tunnel <要连接的服务ip或域名> <要连接的服务端口> <对应的key>
 ```
 
 ```bash

package/dist/connect-tunnel.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.connectTunnel = connectTunnel;
+const lib_1 = require("@ying-tunnel/lib");
+function connectTunnel(host, port, key) {
+    const tunnelClient = new lib_1.TunnelClient({ host, port: Number(port), key });
+    const tcpProxyClient = new lib_1.TCPProxyClient();
+    tunnelClient.on('message', unpackData => {
+        switch (unpackData.header.type) {
+            case lib_1.TunnelPackageType.TCPRequestStart:
+                const host = unpackData.header.localHost.split(':');
+                tcpProxyClient.createConnection(host[0], Number(host[1]), unpackData.header.sign);
+                break;
+            case lib_1.TunnelPackageType.TCPRequestStream:
+                tcpProxyClient.write(unpackData.header.sign, unpackData.bodyBuffer);
+                break;
+            case lib_1.TunnelPackageType.TCPRequestClose:
+                tcpProxyClient.destroy(unpackData.header.sign);
+                break;
+        }
+    });
+    tcpProxyClient.on('data', (sign, chunk) => {
+        tunnelClient.sendMessage(lib_1.TunnelPackage.pack({
+            type: lib_1.TunnelPackageType.TCPResponseStream,
+            sign
+        }, chunk));
+    });
+    tcpProxyClient.on('close', sign => {
+        tunnelClient.sendMessage(lib_1.TunnelPackage.pack({
+            type: lib_1.TunnelPackageType.TCPResponseClose,
+            sign
+        }));
+    });
+}

package/dist/get-package-json.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getPackageJson = getPackageJson;
+const node_fs_1 = require("node:fs");
+const node_path_1 = require("node:path");
+function getPackageJson() {
+    const data = (0, node_fs_1.readFileSync)((0, node_path_1.join)(__dirname, '../package.json'));
+    return JSON.parse(data.toString());
+}

package/dist/main.js

@@ -1,43 +1,19 @@
+#!/usr/bin/env node
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const cac_1 = __importDefault(require("cac"));
-const lib_1 = require("@ying-tunnel/lib");
-const cli = (0, cac_1.default)();
-cli.command("<host> <port> <token>", "link to tcp socket.").action(init);
-cli.help();
-cli.parse();
-function init(host, port, token) {
-    const proxyClient = new lib_1.ProxyClient();
-    const tunnelClient = new lib_1.TunnelClient({ host, port: Number(port), token });
-    tunnelClient.on("message", (unpackData) => {
-        switch (unpackData.header.type) {
-            case lib_1.TunnelPackageType.TCPRequestStart:
-                const host = unpackData.header.localHost.split(":");
-                proxyClient.start(host[0], Number(host[1]), unpackData.header.sign);
-                break;
-            case lib_1.TunnelPackageType.TCPRequestStream:
-                proxyClient.stream(unpackData.header.sign, unpackData.bodyBuffer);
-                break;
-            case lib_1.TunnelPackageType.TCPRequestClose:
-                proxyClient.destroy(unpackData.header.sign);
-                break;
-        }
-    });
-    proxyClient.on("data", (sign, chunk) => {
-        console.log(`proxyClient: 请求${sign}数据`, chunk.length);
-        tunnelClient.sendMessage(lib_1.TunnelPackage.pack({
-            type: lib_1.TunnelPackageType.TCPResponseStream,
-            sign,
-        }, chunk));
-    });
-    proxyClient.on("close", (sign) => {
-        console.log(`proxyClient: 请求${sign}关闭`);
-        tunnelClient.sendMessage(lib_1.TunnelPackage.pack({
-            type: lib_1.TunnelPackageType.TCPResponseClose,
-            sign,
-        }));
-    });
-}
+const commander_1 = require("commander");
+const connect_tunnel_1 = require("./connect-tunnel");
+const get_package_json_1 = require("./get-package-json");
+const pkg = (0, get_package_json_1.getPackageJson)();
+commander_1.program
+    .name('ying-tunnel')
+    .version(`${pkg.version}`, '-v --version')
+    .description('CLI program for connecting to tunnel server.')
+    .helpOption(true);
+commander_1.program
+    .command('connect', { isDefault: true })
+    .argument('<host>', 'The server IP or domain name to connect to')
+    .argument('<port>', 'The server port to connect to')
+    .argument('<key>', 'corresponding key')
+    .action(connect_tunnel_1.connectTunnel);
+commander_1.program.parse(process.argv);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ying-tunnel/cli",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "ying-tunnel 内网穿透工具的连接客户端",
   "keywords": [
     "内网穿透",
@@ -9,30 +9,29 @@
     "nodejs"
   ],
   "author": {
-    "name": "JackDeng666",
-    "email": "1556393081@qq.com",
-    "url": "https://jackdeng666.github.io/"
+    "name": "jackying007",
+    "email": "yingjack007@gmail.com",
+    "url": "https://jackying007.github.io/"
   },
   "license": "MIT",
+  "files": [
+    "dist",
+    "package.json",
+    "CHANGELOG.md",
+    "README.md"
+  ],
   "bin": {
-    "ying-tunnel": "./bin/index.js"
+    "ying-tunnel": "./dist/main.js"
   },
   "publishConfig": {
     "access": "public"
   },
-  "nodemonConfig": {
-    "watch": [
-      "src"
-    ],
-    "ext": "ts",
-    "exec": "ts-node src/main.ts 127.0.0.1 4948 OxFhMdko9XkAJM37l8RC2"
-  },
   "dependencies": {
-    "cac": "^6.7.14",
-    "@ying-tunnel/lib": "^1.0.1"
+    "commander": "^15.0.0",
+    "@ying-tunnel/lib": "1.0.1"
   },
   "scripts": {
-    "dev": "nodemon",
+    "dev": "tsx watch --clear-screen=false src/main.ts 127.0.0.1 4948 OxFhMdko9XkAJM37l8RC2",
     "build": "tsc"
   }
 }

package/bin/index.js

@@ -1,2 +0,0 @@
-#!/usr/bin/env node
-require("../dist/main.js");