@lsdsoftware/utils 1.1.1 → 2.0.0

package/dist/connect-socket.d.ts

@@ -1,15 +1,12 @@
-/// <reference types="node" />
-/// <reference types="node" />
 import { NetConnectOpts, Socket } from "net";
 import * as rxjs from "rxjs";
 export interface Connection {
+    socket: Socket;
     data$: rxjs.Observable<string | Buffer>;
     error$: rxjs.Observable<Error>;
-    close$: rxjs.Observable<string>;
-    write: Socket['write'];
-    end: Socket['end'];
+    timeout$: rxjs.Observable<void>;
+    close$: rxjs.Observable<boolean>;
 }
 export declare function connectSocket(options: NetConnectOpts & {
-    timeout?: number;
     encoding?: BufferEncoding;
 }): rxjs.Observable<Connection>;

package/dist/connect-socket.js

@@ -1,25 +1,19 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.connectSocket = void 0;
-const net_1 = require("net");
-const rxjs = require("rxjs");
-function connectSocket(options) {
+import { createConnection } from "net";
+import * as rxjs from "rxjs";
+export function connectSocket(options) {
     return rxjs.defer(() => {
-        const sock = (0, net_1.createConnection)(options);
-        if (options.timeout)
-            sock.setTimeout(options.timeout);
+        const sock = createConnection(options);
         if (options.encoding)
             sock.setEncoding(options.encoding);
         return rxjs.race(rxjs.fromEvent(sock, 'error').pipe(rxjs.map(err => { throw err; })), rxjs.fromEvent(sock, 'connect').pipe(rxjs.take(1), rxjs.map(() => makeConnection(sock))));
     });
 }
-exports.connectSocket = connectSocket;
 function makeConnection(sock) {
     return {
-        data$: rxjs.fromEvent(sock, 'data', (data) => data).pipe(rxjs.takeUntil(rxjs.fromEvent(sock, 'end'))),
-        error$: rxjs.fromEvent(sock, 'error', (err) => err),
-        close$: rxjs.merge(rxjs.fromEvent(sock, 'close', (hadError) => hadError ? 'Normal close' : 'Close with error'), rxjs.fromEvent(sock, 'timeout', () => 'Socket timeout')),
-        write: sock.write.bind(sock),
-        end: sock.end.bind(sock)
+        socket: sock,
+        data$: rxjs.fromEvent(sock, 'data').pipe(rxjs.takeUntil(rxjs.fromEvent(sock, 'end'))),
+        error$: rxjs.fromEvent(sock, 'error'),
+        timeout$: rxjs.fromEvent(sock, 'timeout'),
+        close$: rxjs.fromEvent(sock, 'close').pipe(rxjs.take(1)),
     };
 }

package/dist/connect-socket.test.js

@@ -1,18 +1,25 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const connect_socket_1 = require("./connect-socket");
-const rxjs = require("rxjs");
-(0, connect_socket_1.connectSocket)({ host: '127.0.0.1', port: 8080, encoding: 'utf8' }).pipe(rxjs.tap({
-    error(err) {
-        console.error("Socket connect fail", err);
-    }
-}), rxjs.retry({ delay: 10000 }), rxjs.exhaustMap(conn => {
-    console.info("Socket connected");
-    const write = (text) => {
-        console.log('Socket write:', text);
-        conn.write(text);
-    };
-    return rxjs.merge(conn.data$.pipe(rxjs.tap(chunk => console.log('Socket recv:', chunk))), conn.error$.pipe(rxjs.tap(err => console.info('Socket error:', err)))).pipe(rxjs.takeUntil(conn.close$.pipe(rxjs.tap(reason => console.info('Socket close:', reason)))), rxjs.finalize(() => conn.end()), rxjs.ignoreElements(), rxjs.startWith({ write }), rxjs.endWith(null));
-}), rxjs.repeat({ delay: 1000, count: 2 })).subscribe(conn => {
-    conn === null || conn === void 0 ? void 0 : conn.write("GET / HTTP/1.1\n\n");
+import { describe, expect } from "@service-broker/test-utils";
+import assert from "assert";
+import * as rxjs from "rxjs";
+import { connectSocket } from './connect-socket.js';
+describe('connect-socket', ({ test }) => {
+    test('fail', () => rxjs.lastValueFrom(connectSocket({ port: -1 })).then(() => assert(false, '!throw'), err => expect(err.code, 'ERR_SOCKET_BAD_PORT')));
+    test('success', () => rxjs.lastValueFrom(connectSocket({ host: 'lsdsoftware.com', port: 80, encoding: 'utf8', timeout: 100 }).pipe(rxjs.exhaustMap(conn => rxjs.forkJoin({
+        request: rxjs.timer(120).pipe(rxjs.tap(() => {
+            conn.socket.write('GET / HTTP/1.1\nHost: lsdsoftware.com\n\n');
+            conn.socket.end();
+        })),
+        response: conn.data$.pipe(rxjs.takeUntil(conn.close$), rxjs.reduce((acc, chunk) => {
+            assert(typeof chunk == 'string');
+            return acc.concat(chunk);
+        }, '')),
+        errors: conn.error$.pipe(rxjs.takeUntil(conn.close$), rxjs.reduce((acc, err) => acc.concat(err), [])),
+        timeouts: conn.timeout$.pipe(rxjs.takeUntil(conn.close$), rxjs.reduce(acc => acc + 1, 0)),
+        closedWithError: conn.close$
+    })))).then(({ response, errors, timeouts, closedWithError }) => {
+        assert(response.startsWith('HTTP/1.1 301'));
+        expect(errors, []);
+        expect(timeouts, 1);
+        expect(closedWithError, false);
+    }));
 });

package/dist/index.d.ts

@@ -1,5 +1,4 @@
-import { makeLineReader } from "./line-reader";
-import { makeSemaphore } from "./semaphore";
-import { connectSocket } from "./connect-socket";
-import { spawnChild } from "./spawn-child";
-export { makeLineReader, makeSemaphore, connectSocket, spawnChild, };
+export * from './connect-socket.js';
+export * from './line-reader.js';
+export * from './semaphore.js';
+export * from './spawn-child.js';

package/dist/index.js

@@ -1,11 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.spawnChild = exports.connectSocket = exports.makeSemaphore = exports.makeLineReader = void 0;
-const line_reader_1 = require("./line-reader");
-Object.defineProperty(exports, "makeLineReader", { enumerable: true, get: function () { return line_reader_1.makeLineReader; } });
-const semaphore_1 = require("./semaphore");
-Object.defineProperty(exports, "makeSemaphore", { enumerable: true, get: function () { return semaphore_1.makeSemaphore; } });
-const connect_socket_1 = require("./connect-socket");
-Object.defineProperty(exports, "connectSocket", { enumerable: true, get: function () { return connect_socket_1.connectSocket; } });
-const spawn_child_1 = require("./spawn-child");
-Object.defineProperty(exports, "spawnChild", { enumerable: true, get: function () { return spawn_child_1.spawnChild; } });
+export * from './connect-socket.js';
+export * from './line-reader.js';
+export * from './semaphore.js';
+export * from './spawn-child.js';

package/dist/index.test.d.ts

@@ -1 +1,4 @@
-export {};
+import './connect-socket.test.js';
+import './line-reader.test.js';
+import './semaphore.test.js';
+import './spawn-child.test.js';

package/dist/index.test.js

@@ -1,23 +1,4 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const line_reader_test_1 = require("./line-reader.test");
-const semaphore_test_1 = require("./semaphore.test");
-run(Object.assign(Object.assign({}, line_reader_test_1.default), semaphore_test_1.default))
-    .catch(console.error);
-function run(tests) {
-    return __awaiter(this, void 0, void 0, function* () {
-        for (const name in tests) {
-            console.log("Running test", name);
-            yield tests[name]();
-        }
-    });
-}
+import './connect-socket.test.js';
+import './line-reader.test.js';
+import './semaphore.test.js';
+import './spawn-child.test.js';

package/dist/line-reader.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="node" />
 import { Writable } from "stream";
 export declare function makeLineReader(lineCallback: (line: string) => void): Writable;

package/dist/line-reader.js

@@ -1,17 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeLineReader = void 0;
-const stream_1 = require("stream");
-const string_decoder_1 = require("string_decoder");
-function makeLineReader(lineCallback) {
+import { Writable } from "stream";
+import { StringDecoder } from "string_decoder";
+export function makeLineReader(lineCallback) {
     // Buffer for the part of the chunk that doesn't form a complete line.
     let remainder = '';
-    const decoder = new string_decoder_1.StringDecoder();
-    return new stream_1.Writable({
-        //prevent auto-decoding string to Buffer, so processed chunk could be either string or Buffer
-        decodeStrings: false,
+    const decoder = new StringDecoder();
+    return new Writable({
         write(chunk, encoding, callback) {
-            // encoding param here is irrelevant because it applies only to string chunks
             const chunkStr = remainder + decoder.write(chunk);
             const lines = chunkStr.split(/\r?\n/);
             // Keep the last line in remainder if it doesn't end with a newline character.
@@ -29,4 +23,3 @@ function makeLineReader(lineCallback) {
         }
     });
 }
-exports.makeLineReader = makeLineReader;

package/dist/line-reader.test.d.ts

@@ -1,6 +1 @@
-declare const _default: {
-    lineReader1(): Promise<void>;
-    lineReader2(): Promise<void>;
-    lineReader3(): Promise<void>;
-};
-export default _default;
+export {};

package/dist/line-reader.test.js

@@ -1,46 +1,30 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
+import { describe } from "@service-broker/test-utils";
+import assert from "assert";
+import { makeLineReader } from "./line-reader.js";
+describe('line-reader', ({ test }) => {
+    test('one', () => {
+        const lines = [];
+        const splitter = makeLineReader(line => lines.push(line));
+        splitter.write('This is a line\nThis is another line\r\nAnd this is a line as well');
+        splitter.end();
+        assert(lines[0] == "This is a line" &&
+            lines[1] == "This is another line" &&
+            lines[2] == "And this is a line as well");
     });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const line_reader_1 = require("./line-reader");
-const assert = require("assert");
-exports.default = {
-    lineReader1() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const lines = [];
-            const splitter = (0, line_reader_1.makeLineReader)(line => lines.push(line));
-            splitter.write('This is a line\nThis is another line\r\nAnd this is a line as well');
-            splitter.end();
-            assert(lines[0] == "This is a line" &&
-                lines[1] == "This is another line" &&
-                lines[2] == "And this is a line as well");
-        });
-    },
-    lineReader2() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const lines = [];
-            const splitter = (0, line_reader_1.makeLineReader)(line => lines.push(line));
-            splitter.write('\nThis is a line\n');
-            splitter.end();
-            assert(lines[0] == "" &&
-                lines[1] == "This is a line");
-        });
-    },
-    lineReader3() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const lines = [];
-            const splitter = (0, line_reader_1.makeLineReader)(line => lines.push(line));
-            splitter.write('\n\n');
-            splitter.end();
-            assert(lines[0] == "" &&
-                lines[1] == "");
-        });
-    },
-};
+    test('two', () => {
+        const lines = [];
+        const splitter = makeLineReader(line => lines.push(line));
+        splitter.write('\nThis is a line\n');
+        splitter.end();
+        assert(lines[0] == "" &&
+            lines[1] == "This is a line");
+    });
+    test('three', () => {
+        const lines = [];
+        const splitter = makeLineReader(line => lines.push(line));
+        splitter.write('\n\n');
+        splitter.end();
+        assert(lines[0] == "" &&
+            lines[1] == "");
+    });
+});

package/dist/semaphore.js

@@ -1,37 +1,22 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeSemaphore = void 0;
-function makeSemaphore(count) {
+export function makeSemaphore(count) {
     const waiters = [];
     return {
-        runTask(task, onStart) {
-            return __awaiter(this, void 0, void 0, function* () {
-                if (count > 0)
+        async runTask(task, onStart) {
+            if (count > 0)
+                count--;
+            else
+                await new Promise(f => waiters.push(f));
+            try {
+                onStart?.();
+                return await task();
+            }
+            finally {
+                count++;
+                while (count > 0 && waiters.length > 0) {
                     count--;
-                else
-                    yield new Promise(f => waiters.push(f));
-                try {
-                    onStart === null || onStart === void 0 ? void 0 : onStart();
-                    return yield task();
+                    waiters.shift()();
                 }
-                finally {
-                    count++;
-                    while (count > 0 && waiters.length > 0) {
-                        count--;
-                        waiters.shift()();
-                    }
-                }
-            });
+            }
         }
     };
 }
-exports.makeSemaphore = makeSemaphore;

package/dist/semaphore.test.d.ts

@@ -1,6 +1 @@
-declare const _default: {
-    semaphore1(): Promise<void>;
-    semaphore2(): Promise<void>;
-    semaphore3(): Promise<void>;
-};
-export default _default;
+export {};

package/dist/semaphore.test.js

@@ -1,84 +1,68 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
+import { describe } from "@service-broker/test-utils";
+import assert from "assert";
+import { makeSemaphore } from "./semaphore.js";
+describe('semaphore', ({ test }) => {
+    test('one', async () => {
+        const sema = makeSemaphore(1);
+        const output = [];
+        await Promise.all([
+            sema.runTask(async () => {
+                output.push(1);
+                await new Promise(f => setTimeout(f, 100));
+                output.push(2);
+            }),
+            sema.runTask(async () => {
+                output.push(3);
+                await new Promise(f => setTimeout(f, 50));
+                output.push(4);
+            })
+        ]);
+        assert(output.length == 4 &&
+            output[0] == 1 &&
+            output[1] == 2 &&
+            output[2] == 3 &&
+            output[3] == 4);
     });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const semaphore_1 = require("./semaphore");
-const assert = require("assert");
-exports.default = {
-    semaphore1() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const sema = (0, semaphore_1.makeSemaphore)(1);
-            const output = [];
-            yield Promise.all([
-                sema.runTask(() => __awaiter(this, void 0, void 0, function* () {
-                    output.push(1);
-                    yield new Promise(f => setTimeout(f, 100));
-                    output.push(2);
-                })),
-                sema.runTask(() => __awaiter(this, void 0, void 0, function* () {
-                    output.push(3);
-                    yield new Promise(f => setTimeout(f, 50));
-                    output.push(4);
-                }))
-            ]);
-            assert(output.length == 4 &&
-                output[0] == 1 &&
-                output[1] == 2 &&
-                output[2] == 3 &&
-                output[3] == 4);
-        });
-    },
-    semaphore2() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const sema = (0, semaphore_1.makeSemaphore)(2);
-            const output = [];
-            yield Promise.all([
-                sema.runTask(() => __awaiter(this, void 0, void 0, function* () {
-                    output.push(1);
-                    yield new Promise(f => setTimeout(f, 100));
-                    output.push(2);
-                })),
-                sema.runTask(() => __awaiter(this, void 0, void 0, function* () {
-                    output.push(3);
-                    yield new Promise(f => setTimeout(f, 50));
-                    output.push(4);
-                }))
-            ]);
-            assert(output.length == 4 &&
-                output[0] == 1 &&
-                output[1] == 3 &&
-                output[2] == 4 &&
-                output[3] == 2);
-        });
-    },
-    semaphore3() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const sema = (0, semaphore_1.makeSemaphore)(1);
-            const output = [];
-            yield Promise.all([
-                sema.runTask(() => __awaiter(this, void 0, void 0, function* () {
-                    output.push(1);
-                    yield new Promise(f => setTimeout(f, 100));
-                    output.push(2);
-                }), () => {
-                    throw new Error("Canceled");
-                }).then(() => assert(false), err => assert(err.message == "Canceled")),
-                sema.runTask(() => __awaiter(this, void 0, void 0, function* () {
-                    output.push(3);
-                    yield new Promise(f => setTimeout(f, 50));
-                    output.push(4);
-                }))
-            ]);
-            assert(output.length == 2 &&
-                output[0] == 3 &&
-                output[1] == 4);
-        });
-    },
-};
+    test('two', async () => {
+        const sema = makeSemaphore(2);
+        const output = [];
+        await Promise.all([
+            sema.runTask(async () => {
+                output.push(1);
+                await new Promise(f => setTimeout(f, 100));
+                output.push(2);
+            }),
+            sema.runTask(async () => {
+                output.push(3);
+                await new Promise(f => setTimeout(f, 50));
+                output.push(4);
+            })
+        ]);
+        assert(output.length == 4 &&
+            output[0] == 1 &&
+            output[1] == 3 &&
+            output[2] == 4 &&
+            output[3] == 2);
+    });
+    test('three', async () => {
+        const sema = makeSemaphore(1);
+        const output = [];
+        await Promise.all([
+            sema.runTask(async () => {
+                output.push(1);
+                await new Promise(f => setTimeout(f, 100));
+                output.push(2);
+            }, () => {
+                throw new Error("Canceled");
+            }).then(() => assert(false), err => assert(err.message == "Canceled")),
+            sema.runTask(async () => {
+                output.push(3);
+                await new Promise(f => setTimeout(f, 50));
+                output.push(4);
+            })
+        ]);
+        assert(output.length == 2 &&
+            output[0] == 3 &&
+            output[1] == 4);
+    });
+});

package/dist/spawn-child.d.ts

@@ -1,15 +1,9 @@
-/// <reference types="node" />
-/// <reference types="node" />
-/// <reference types="node" />
-import { ChildProcessWithoutNullStreams, SpawnOptionsWithoutStdio } from "child_process";
+import { ChildProcess } from "child_process";
 import * as rxjs from "rxjs";
-export interface Child {
-    pid: number;
-    stdout$: rxjs.Observable<string | Buffer>;
-    stderr$: rxjs.Observable<string | Buffer>;
+export declare function spawnChild<T extends ChildProcess>(spawn: () => T): rxjs.Observable<{
+    process: T;
+    stdout$: rxjs.Observable<string | Buffer<ArrayBufferLike>>;
+    stderr$: rxjs.Observable<string | Buffer<ArrayBufferLike>>;
     error$: rxjs.Observable<Error>;
     close$: rxjs.Observable<number | NodeJS.Signals>;
-    stdin: ChildProcessWithoutNullStreams['stdin'];
-    kill: ChildProcessWithoutNullStreams['kill'];
-}
-export declare function spawnChild(command: string, args?: string[], options?: SpawnOptionsWithoutStdio): rxjs.Observable<Child>;
+}>;

package/dist/spawn-child.js

@@ -1,23 +1,15 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.spawnChild = void 0;
-const child_process_1 = require("child_process");
-const rxjs = require("rxjs");
-function spawnChild(command, args, options) {
-    return rxjs.defer(() => {
-        const childProc = (0, child_process_1.spawn)(command, args, options);
-        return rxjs.race(rxjs.fromEvent(childProc, 'error', (err) => err).pipe(rxjs.map(err => { throw err; })), rxjs.fromEvent(childProc, 'spawn').pipe(rxjs.take(1), rxjs.map(() => makeChild(childProc))));
-    });
-}
-exports.spawnChild = spawnChild;
-function makeChild(childProc) {
-    return {
-        pid: childProc.pid,
-        stdout$: rxjs.fromEvent(childProc.stdout, 'data', (data) => data),
-        stderr$: rxjs.fromEvent(childProc.stderr, 'data', (data) => data),
-        error$: rxjs.fromEvent(childProc, 'error', (err) => err),
-        close$: rxjs.fromEvent(childProc, 'close', (code, signal) => signal || code),
-        stdin: childProc.stdin,
-        kill: childProc.kill.bind(childProc)
-    };
+import * as rxjs from "rxjs";
+export function spawnChild(spawn) {
+    const child = spawn();
+    return rxjs.race(rxjs.fromEvent(child, 'error', (err) => err).pipe(rxjs.map(err => { throw err; })), rxjs.fromEvent(child, 'spawn').pipe(rxjs.take(1), rxjs.map(() => ({
+        process: child,
+        stdout$: child.stdout
+            ? rxjs.fromEvent(child.stdout, 'data')
+            : rxjs.EMPTY,
+        stderr$: child.stderr
+            ? rxjs.fromEvent(child.stderr, 'data')
+            : rxjs.EMPTY,
+        error$: rxjs.fromEvent(child, 'error'),
+        close$: rxjs.fromEvent(child, 'close', (code, signal) => signal || code).pipe(rxjs.take(1)),
+    }))));
 }

package/dist/spawn-child.test.js

@@ -1,20 +1,17 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const rxjs = require("rxjs");
-const spawn_child_1 = require("./spawn-child");
-(0, spawn_child_1.spawnChild)('cat').pipe(rxjs.tap({
-    error(err) {
-        console.error("Child spawn fail", err);
-    }
-}), rxjs.retry({ delay: 10000 }), rxjs.exhaustMap(child => {
-    console.info("Child spawned", child.pid);
-    const write = (text) => {
-        console.log("Child write:", text);
-        child.stdin.write(text);
-    };
-    return rxjs.merge(child.stdout$.pipe(rxjs.tap(data => console.log("Child stdout:", data.toString()))), child.stderr$.pipe(rxjs.tap(data => console.log("Child stderr:", data.toString()))), child.error$.pipe(rxjs.tap(err => console.info("Child error:", err)))).pipe(rxjs.takeUntil(child.close$.pipe(rxjs.tap(code => console.log("Child close:", code)))), rxjs.finalize(() => child.kill()), rxjs.ignoreElements(), rxjs.startWith({ write }), rxjs.endWith(null));
-}), rxjs.repeat({ delay: 1000, count: 2 }), rxjs.switchMap(child => rxjs.iif(() => child != null, rxjs.fromEvent(process.stdin, 'data', (data) => data).pipe(rxjs.tap(data => child.write(data.toString().trim()))), rxjs.EMPTY))).subscribe({
-    complete() {
-        process.stdin.pause();
-    }
+import { describe, expect } from "@service-broker/test-utils";
+import assert from "assert";
+import { spawn } from "child_process";
+import * as rxjs from "rxjs";
+import { spawnChild } from "./spawn-child.js";
+describe('spawn-child', ({ test }) => {
+    test('fail', () => rxjs.lastValueFrom(spawnChild(() => spawn('bad-cmd'))).then(() => assert(false, '!throw'), err => expect(err.code, 'ENOENT')));
+    test('success', () => rxjs.lastValueFrom(spawnChild(() => spawn('echo Hello, world && echo Bye, world >&2 && exit 42', { shell: true })).pipe(rxjs.exhaustMap(child => rxjs.forkJoin({
+        stdout: child.stdout$.pipe(rxjs.takeUntil(child.close$), rxjs.reduce((acc, chunk) => acc.concat(chunk), '')),
+        stderr: child.stderr$.pipe(rxjs.takeUntil(child.close$), rxjs.reduce((acc, chunk) => acc.concat(chunk), '')),
+        exitCode: child.close$
+    })))).then(({ stdout, stderr, exitCode }) => {
+        expect(stdout, 'Hello, world\n');
+        expect(stderr, 'Bye, world\n');
+        expect(exitCode, 42);
+    }));
 });

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@lsdsoftware/utils",
-  "version": "1.1.1",
+  "type": "module",
+  "version": "2.0.0",
   "description": "Useful JavaScript utilities",
   "main": "dist/index.js",
   "files": [
@@ -21,8 +22,9 @@
   },
   "homepage": "https://github.com/lsdsoftware/utils#readme",
   "devDependencies": {
-    "@types/node": "^20.11.20",
-    "typescript": "^5.3.3"
+    "@service-broker/test-utils": "^1.1.2",
+    "@types/node": "^25.2.3",
+    "typescript": "^5.9.3"
   },
   "dependencies": {
     "rxjs": "^7.8.2"