Skip to content

Commit

Permalink
upd callback
Browse files Browse the repository at this point in the history
  • Loading branch information
mrvadim committed Jan 11, 2023
1 parent 70da66b commit 92abcda
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 8 deletions.
2 changes: 1 addition & 1 deletion dist/server.d.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import type SocketIO from 'socket.io';
import type { SSH, SSL, Server } from './shared/interfaces.js';
export declare function start(ssh?: SSH, serverConf?: Server, command?: string, forcessh?: boolean, ssl?: SSL, cb?: (t: string) => string): Promise<SocketIO.Server>;
export declare function start(ssh?: SSH, serverConf?: Server, command?: string, forcessh?: boolean, ssl?: SSL, cb?: (text: string, connArgs?: string[]) => void): Promise<SocketIO.Server>;
2 changes: 1 addition & 1 deletion dist/server/spawn.d.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
import type SocketIO from 'socket.io';
export declare function spawn(socket: SocketIO.Socket, args: string[], cb?: (t: string) => string): Promise<void>;
export declare function spawn(socket: SocketIO.Socket, args: string[], cb?: (data: string, connArgs?: string[]) => void): Promise<void>;
4 changes: 2 additions & 2 deletions dist/server/spawn.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export async function start(
command: string = defaultCommand,
forcessh: boolean = forceSSHDefault,
ssl?: SSL,
cb?: (t:string)=>string
cb?: (text:string, connArgs?: string[])=>void
): Promise<SocketIO.Server> {
if (ssh.key) {
logger.warn(`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
Expand Down
4 changes: 2 additions & 2 deletions src/server/spawn.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { envVersion } from './spawn/env.js';
export async function spawn(
socket: SocketIO.Socket,
args: string[],
cb?: (t: string)=>string
cb?: (data:string, connArgs?: string[])=>void
): Promise<void> {
const cmd = os.platform() === 'darwin' || (await envVersion()) >= 9 ? ['-S', ...args] : args;
logger.debug('Spawning PTTY', { cmd });
Expand All @@ -30,7 +30,7 @@ export async function spawn(
.removeAllListeners('input');
});
term.on('data', (data: string) => {
if (cb) cb(data);
if (cb) cb(data, args);
socket.emit('data', data);
});
socket
Expand Down
32 changes: 31 additions & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2259,6 +2259,13 @@
"resolved" "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz"
"version" "2.2.0"

"bindings@^1.5.0":
"integrity" "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ=="
"resolved" "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz"
"version" "1.5.0"
dependencies:
"file-uri-to-path" "1.0.0"

"[email protected]":
"integrity" "sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig=="
"resolved" "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz"
Expand Down Expand Up @@ -4318,6 +4325,11 @@
"resolved" "https://registry.npmjs.org/file-type/-/file-type-12.4.2.tgz"
"version" "12.4.2"

"[email protected]":
"integrity" "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="
"resolved" "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz"
"version" "1.0.0"

"fill-range@^4.0.0":
"integrity" "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ=="
"resolved" "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz"
Expand Down Expand Up @@ -4555,6 +4567,24 @@
"resolved" "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
"version" "1.0.0"

"fsevents@^1.2.7":
"integrity" "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw=="
"resolved" "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz"
"version" "1.2.13"
dependencies:
"bindings" "^1.5.0"
"nan" "^2.12.1"

"fsevents@^2.3.2", "fsevents@~2.3.1", "fsevents@~2.3.2":
"integrity" "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA=="
"resolved" "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz"
"version" "2.3.2"

"fsevents@~2.1.2":
"integrity" "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ=="
"resolved" "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz"
"version" "2.1.3"

"function-bind@^1.1.1":
"integrity" "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
"resolved" "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"
Expand Down Expand Up @@ -6750,7 +6780,7 @@
"resolved" "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz"
"version" "0.0.8"

"nan@^2.14.0":
"nan@^2.12.1", "nan@^2.14.0":
"integrity" "sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ=="
"resolved" "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz"
"version" "2.15.0"
Expand Down

0 comments on commit 92abcda

Please sign in to comment.