@onivoro/server-process 1.5.0 → 1.10.0

package/index.js

@@ -1,20 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.PSql = exports.listen = exports.exit = exports.execRx = exports.execRxAsLines = exports.execRxAsJson = exports.execPromise = exports.Docker = void 0;
-var docker_1 = require("./lib/docker");
-Object.defineProperty(exports, "Docker", { enumerable: true, get: function () { return docker_1.Docker; } });
-var exec_promise_1 = require("./lib/exec-promise");
-Object.defineProperty(exports, "execPromise", { enumerable: true, get: function () { return exec_promise_1.execPromise; } });
-var exec_rx_as_json_1 = require("./lib/exec-rx-as-json");
-Object.defineProperty(exports, "execRxAsJson", { enumerable: true, get: function () { return exec_rx_as_json_1.execRxAsJson; } });
-var exec_rx_as_lines_1 = require("./lib/exec-rx-as-lines");
-Object.defineProperty(exports, "execRxAsLines", { enumerable: true, get: function () { return exec_rx_as_lines_1.execRxAsLines; } });
-var exec_rx_1 = require("./lib/exec-rx");
-Object.defineProperty(exports, "execRx", { enumerable: true, get: function () { return exec_rx_1.execRx; } });
-var exit_1 = require("./lib/exit");
-Object.defineProperty(exports, "exit", { enumerable: true, get: function () { return exit_1.exit; } });
-var listen_1 = require("./lib/listen");
-Object.defineProperty(exports, "listen", { enumerable: true, get: function () { return listen_1.listen; } });
-var psql_1 = require("./lib/psql");
-Object.defineProperty(exports, "PSql", { enumerable: true, get: function () { return psql_1.PSql; } });
-//# sourceMappingURL=index.js.map
+export { Docker } from './lib/docker';
+export { execPromise } from './lib/exec-promise';
+export { execRxAsJson } from './lib/exec-rx-as-json';
+export { execRxAsLines } from './lib/exec-rx-as-lines';
+export { execRx } from './lib/exec-rx';
+export { exit } from './lib/exit';
+export { listen } from './lib/listen';
+export { PSql } from './lib/psql';

package/lib/docker.js

@@ -1,15 +1,10 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Docker = void 0;
-const exec_rx_1 = require("./exec-rx");
-class Docker {
+import { execRx } from "./exec-rx";
+export class Docker {
     constructor(containerName, binaryName) {
         this.containerName = containerName;
         this.binaryName = binaryName;
     }
     execRx(cmd, options, emitStdErr = true) {
-        return (0, exec_rx_1.execRx)(`docker exec ${this.containerName} ${this.binaryName} ${cmd}`, options, emitStdErr);
+        return execRx(`docker exec ${this.containerName} ${this.binaryName} ${cmd}`, options, emitStdErr);
     }
 }
-exports.Docker = Docker;
-//# sourceMappingURL=docker.js.map

package/lib/exec-promise.js

@@ -1,10 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.execPromise = void 0;
-const child_process_1 = require("child_process");
-function execPromise(cmd, options) {
+import { exec } from "child_process";
+export function execPromise(cmd, options) {
     return new Promise((resolve, reject) => {
-        (0, child_process_1.exec)(cmd, options, (err, stdout) => {
+        exec(cmd, options, (err, stdout) => {
             if (err) {
                 reject(err);
             }
@@ -14,5 +11,3 @@ function execPromise(cmd, options) {
         });
     });
 }
-exports.execPromise = execPromise;
-//# sourceMappingURL=exec-promise.js.map

package/lib/exec-rx-as-json.js

@@ -1,10 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.execRxAsJson = void 0;
-const operators_1 = require("rxjs/operators");
-const exec_rx_1 = require("./exec-rx");
-const execRxAsJson = (cmd, options, emitStdErr = true) => {
-    return (0, exec_rx_1.execRx)(cmd, options, emitStdErr).pipe((0, operators_1.map)((s) => JSON.parse(s)));
+import { map } from 'rxjs/operators';
+import { execRx } from './exec-rx';
+export const execRxAsJson = (cmd, options, emitStdErr = true) => {
+    return execRx(cmd, options, emitStdErr).pipe(map((s) => JSON.parse(s)));
 };
-exports.execRxAsJson = execRxAsJson;
-//# sourceMappingURL=exec-rx-as-json.js.map

package/lib/exec-rx-as-lines.js

@@ -1,11 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.execRxAsLines = void 0;
-const rxjs_1 = require("rxjs");
-const operators_1 = require("rxjs/operators");
-const exec_rx_1 = require("./exec-rx");
-const execRxAsLines = (cmd, options, emitStdErr = true) => {
-    return (0, exec_rx_1.execRx)(cmd, options, emitStdErr).pipe((0, operators_1.concatMap)((s) => (0, rxjs_1.from)(s.split('\n'))));
+import { from } from 'rxjs';
+import { concatMap } from 'rxjs/operators';
+import { execRx } from './exec-rx';
+export const execRxAsLines = (cmd, options, emitStdErr = true) => {
+    return execRx(cmd, options, emitStdErr).pipe(concatMap((s) => from(s.split('\n'))));
 };
-exports.execRxAsLines = execRxAsLines;
-//# sourceMappingURL=exec-rx-as-lines.js.map

package/lib/exec-rx.js

@@ -1,11 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.execRx = void 0;
-const child_process_1 = require("child_process");
-const rxjs_1 = require("rxjs");
-function execRx(cmd, options, emitStdErr = true) {
-    return new rxjs_1.Observable((observer) => {
-        (0, child_process_1.exec)(cmd, options, (err, stdout, stderr) => {
+import { exec } from "child_process";
+import { Observable } from "rxjs";
+export function execRx(cmd, options, emitStdErr = true) {
+    return new Observable((observer) => {
+        exec(cmd, options, (err, stdout, stderr) => {
             if (err) {
                 observer.error(err);
             }
@@ -16,5 +13,3 @@ function execRx(cmd, options, emitStdErr = true) {
         });
     });
 }
-exports.execRx = execRx;
-//# sourceMappingURL=exec-rx.js.map

package/lib/exec-rx.spec.js

@@ -0,0 +1,19 @@
+import { execRx } from './exec-rx';
+import { of } from 'rxjs';
+import { catchError } from 'rxjs/operators';
+describe(execRx.name, () => {
+    describe('GIVEN command succeeds', () => {
+        it('returns the stdout', (done) => {
+            execRx(`cat ${__filename}`).subscribe((d) => {
+                expect(d).toEqual(expect.stringContaining('execRx worx!'));
+                done();
+            }, fail);
+        });
+    });
+    describe('GIVEN command fails', () => {
+        it('emits error', (done) => {
+            execRx(`cat ${__filename + 'blah'}`).pipe(catchError(() => of(done())))
+                .subscribe();
+        });
+    });
+});

package/lib/exit.js

@@ -1,6 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.exit = void 0;
-const exit = (code) => process.exit.bind(process, code);
-exports.exit = exit;
-//# sourceMappingURL=exit.js.map
+export const exit = (code) => process.exit.bind(process, code);

package/lib/listen.js

@@ -1,13 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.listen = exports.stdout = exports.stdin = void 0;
-const rxjs_1 = require("rxjs");
-exports.stdin = new rxjs_1.Subject();
-exports.stdout = new rxjs_1.Subject();
-const listen = (p = process) => {
-    p.stdin.on('data', d => exports.stdin.next(d));
-    p.stdin.on('close', () => exports.stdin.complete());
-    return { stdout: exports.stdout, stdin: exports.stdin };
+import { Subject } from 'rxjs';
+const stdin = new Subject();
+const stdout = new Subject();
+export const listen = () => {
+    process.stdin.on('data', d => stdin.next(d));
+    process.stdin.on('close', () => stdin.complete());
+    return { stdout, stdin };
 };
-exports.listen = listen;
-//# sourceMappingURL=listen.js.map

package/lib/psql.js

@@ -1,21 +1,16 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.PSql = void 0;
-const docker_1 = require("./docker");
-const exec_rx_1 = require("./exec-rx");
+import { Docker } from "./docker";
+import { execRx } from "./exec-rx";
 const binaryName = 'psql';
-class PSql {
+export class PSql {
     constructor(containerName) {
         this.containerName = containerName;
-        this.container = new docker_1.Docker(this.containerName, binaryName);
+        this.container = new Docker(this.containerName, binaryName);
     }
     execRx(cmd, db, username) {
         const dbOptions = db ? ['-d', db] : [];
         const commonArgs = ['-qtAX', '-U', username, ...dbOptions, '-c'].join(' ') + cmd;
         return this.containerName
             ? this.container.execRx(commonArgs)
-            : (0, exec_rx_1.execRx)([binaryName, commonArgs].join(' '));
+            : execRx([binaryName, commonArgs].join(' '));
     }
 }
-exports.PSql = PSql;
-//# sourceMappingURL=psql.js.map

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@onivoro/server-process",
-  "version": "1.5.0",
+  "version": "1.10.0",
+  "type": "module",
   "repository": {
     "url": "https://github.com/onivoro/server-process.git"
   },
@@ -10,13 +11,13 @@
     "release": "rm -rf dist && npm run build && npm version minor && cp package.json dist && cd dist && npm publish --access public"
   },
   "devDependencies": {
-    "@types/jest": "^27.0.2",
-    "@types/node": "^16.11.7",
-    "jest": "^27.3.1",
-    "ts-jest": "^27.0.7",
-    "typescript": "^4.4.4"
+    "@types/jest": "^26.0.14",
+    "@types/node": "^14.11.2",
+    "jest": "^26.4.2",
+    "ts-jest": "^26.4.1",
+    "typescript": "^4.0.3"
   },
   "dependencies": {
-    "rxjs": "^7.4.0"
+    "rxjs": "^6.6.3"
   }
 }

package/index.d.ts

@@ -1,8 +0,0 @@
-export { Docker } from './lib/docker';
-export { execPromise } from './lib/exec-promise';
-export { execRxAsJson } from './lib/exec-rx-as-json';
-export { execRxAsLines } from './lib/exec-rx-as-lines';
-export { execRx } from './lib/exec-rx';
-export { exit } from './lib/exit';
-export { listen } from './lib/listen';
-export { PSql } from './lib/psql';

package/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,uCAAsC;AAA7B,gGAAA,MAAM,OAAA;AACf,mDAAiD;AAAxC,2GAAA,WAAW,OAAA;AACpB,yDAAqD;AAA5C,+GAAA,YAAY,OAAA;AACrB,2DAAuD;AAA9C,iHAAA,aAAa,OAAA;AACtB,yCAAuC;AAA9B,iGAAA,MAAM,OAAA;AACf,mCAAkC;AAAzB,4FAAA,IAAI,OAAA;AACb,uCAAsC;AAA7B,gGAAA,MAAM,OAAA;AACf,mCAAkC;AAAzB,4FAAA,IAAI,OAAA"}

package/lib/docker.d.ts

@@ -1,9 +0,0 @@
-/// <reference types="node" />
-import { ExecOptions } from "child_process";
-import { ObjectEncodingOptions } from "fs";
-export declare class Docker {
-    readonly containerName: string;
-    readonly binaryName: string;
-    constructor(containerName: string, binaryName: string);
-    execRx(cmd: string, options?: ObjectEncodingOptions & ExecOptions, emitStdErr?: boolean): import("rxjs").Observable<any>;
-}

package/lib/docker.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../src/lib/docker.ts"],"names":[],"mappings":";;;AAEA,uCAAmC;AAEnC,MAAa,MAAM;IACjB,YACkB,aAAqB,EACrB,UAAkB;QADlB,kBAAa,GAAb,aAAa,CAAQ;QACrB,eAAU,GAAV,UAAU,CAAQ;IAChC,CAAC;IAEL,MAAM,CAAC,GAAW,EAAE,OAA6C,EAAE,UAAU,GAAC,IAAI;QAChF,OAAO,IAAA,gBAAM,EAAC,eAAe,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,UAAU,IAAI,GAAG,EAAE,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;IACpG,CAAC;CACF;AATD,wBASC"}

package/lib/exec-promise.d.ts

@@ -1,4 +0,0 @@
-/// <reference types="node" />
-import { ExecOptions } from "child_process";
-import { ObjectEncodingOptions } from 'fs';
-export declare function execPromise(cmd: string, options?: ObjectEncodingOptions & ExecOptions): Promise<any>;

package/lib/exec-promise.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"exec-promise.js","sourceRoot":"","sources":["../../src/lib/exec-promise.ts"],"names":[],"mappings":";;;AAAA,iDAAkD;AAGlD,SAAgB,WAAW,CAAC,GAAW,EAAE,OAA6C;IAClF,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACnC,IAAA,oBAAI,EAAC,GAAG,EAAE,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE;YAC/B,IAAI,GAAG,EAAE;gBACL,MAAM,CAAC,GAAG,CAAC,CAAC;aACf;iBAAM;gBACH,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;aAC9B;QACL,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC;AAVD,kCAUC"}

package/lib/exec-rx-as-json.d.ts

@@ -1,2 +0,0 @@
-import { ExecOptions } from 'child_process';
-export declare const execRxAsJson: (cmd: string, options?: ExecOptions, emitStdErr?: boolean) => import("rxjs").Observable<any>;

package/lib/exec-rx-as-json.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"exec-rx-as-json.js","sourceRoot":"","sources":["../../src/lib/exec-rx-as-json.ts"],"names":[],"mappings":";;;AACA,8CAAqC;AACrC,uCAAmC;AAE5B,MAAM,YAAY,GAAG,CAAC,GAAW,EAAE,OAAqB,EAAE,UAAU,GAAG,IAAI,EAAE,EAAE;IACpF,OAAO,IAAA,gBAAM,EAAC,GAAG,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC,IAAI,CAC1C,IAAA,eAAG,EAAC,CAAC,CAAS,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAClC,CAAA;AACH,CAAC,CAAC;AAJW,QAAA,YAAY,gBAIvB"}

package/lib/exec-rx-as-lines.d.ts

@@ -1,2 +0,0 @@
-import { ExecOptions } from 'child_process';
-export declare const execRxAsLines: (cmd: string, options?: ExecOptions, emitStdErr?: boolean) => import("rxjs").Observable<string>;

package/lib/exec-rx-as-lines.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"exec-rx-as-lines.js","sourceRoot":"","sources":["../../src/lib/exec-rx-as-lines.ts"],"names":[],"mappings":";;;AACA,+BAA4B;AAC5B,8CAA2C;AAC3C,uCAAmC;AAE5B,MAAM,aAAa,GAAG,CAAC,GAAW,EAAE,OAAqB,EAAE,UAAU,GAAG,IAAI,EAAE,EAAE;IACrF,OAAO,IAAA,gBAAM,EAAC,GAAG,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC,IAAI,CAC1C,IAAA,qBAAS,EAAC,CAAC,CAAS,EAAE,EAAE,CAAC,IAAA,WAAI,EAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAC9C,CAAA;AACH,CAAC,CAAC;AAJW,QAAA,aAAa,iBAIxB"}

package/lib/exec-rx.d.ts

@@ -1,5 +0,0 @@
-/// <reference types="node" />
-import { ExecOptions } from "child_process";
-import { ObjectEncodingOptions as ObjectEncodingOptions } from 'fs';
-import { Observable } from "rxjs";
-export declare function execRx(cmd: string, options?: ObjectEncodingOptions & ExecOptions, emitStdErr?: boolean): Observable<any>;

package/lib/exec-rx.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"exec-rx.js","sourceRoot":"","sources":["../../src/lib/exec-rx.ts"],"names":[],"mappings":";;;AAAA,iDAAkD;AAElD,+BAAkC;AAElC,SAAgB,MAAM,CAAC,GAAW,EAAE,OAA6C,EAAE,UAAU,GAAC,IAAI;IAC9F,OAAO,IAAI,iBAAU,CAAC,CAAC,QAAQ,EAAE,EAAE;QAC/B,IAAA,oBAAI,EAAC,GAAG,EAAE,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE;YACvC,IAAI,GAAG,EAAE;gBACL,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;aACvB;iBAAM;gBACH,QAAQ,CAAC,IAAI,CAAC,GAAG,MAAM,GAAG,UAAU,IAAI,IAAI,MAAM,EAAE,EAAE,CAAC,CAAC;gBACxD,QAAQ,CAAC,QAAQ,EAAE,CAAC;aACvB;QACL,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC;AAXD,wBAWC"}

package/lib/exit.d.ts

@@ -1 +0,0 @@
-export declare const exit: (code: number) => any;

package/lib/exit.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"exit.js","sourceRoot":"","sources":["../../src/lib/exit.ts"],"names":[],"mappings":";;;AAAO,MAAM,IAAI,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;AAA1D,QAAA,IAAI,QAAsD"}

package/lib/listen.d.ts

@@ -1,8 +0,0 @@
-/// <reference types="node" />
-import { Subject } from 'rxjs';
-export declare const stdin: Subject<unknown>;
-export declare const stdout: Subject<unknown>;
-export declare const listen: (p?: NodeJS.Process) => {
-    stdout: Subject<unknown>;
-    stdin: Subject<unknown>;
-};

package/lib/listen.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"listen.js","sourceRoot":"","sources":["../../src/lib/listen.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAElB,QAAA,KAAK,GAAG,IAAI,cAAO,EAAE,CAAC;AACtB,QAAA,MAAM,GAAG,IAAI,cAAO,EAAE,CAAC;AAE7B,MAAM,MAAM,GAAG,CAAC,CAAC,GAAG,OAAO,EAAE,EAAE;IAElC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,aAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IACvC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,aAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;IAE5C,OAAO,EAAE,MAAM,EAAN,cAAM,EAAE,KAAK,EAAL,aAAK,EAAE,CAAC;AAC7B,CAAC,CAAA;AANY,QAAA,MAAM,UAMlB"}

package/lib/psql.d.ts

@@ -1,6 +0,0 @@
-export declare class PSql {
-    readonly containerName: string;
-    private container;
-    constructor(containerName: string);
-    execRx(cmd: string, db: string, username: string): import("rxjs").Observable<any>;
-}

package/lib/psql.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"psql.js","sourceRoot":"","sources":["../../src/lib/psql.ts"],"names":[],"mappings":";;;AAAA,qCAAkC;AAClC,uCAAmC;AAEnC,MAAM,UAAU,GAAG,MAAM,CAAC;AAE1B,MAAa,IAAI;IAEf,YAA4B,aAAqB;QAArB,kBAAa,GAAb,aAAa,CAAQ;QADzC,cAAS,GAAG,IAAI,eAAM,CAAC,IAAI,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;IACV,CAAC;IAEtD,MAAM,CAAC,GAAW,EAAE,EAAU,EAAE,QAAgB;QAC9C,MAAM,SAAS,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACvC,MAAM,UAAU,GAAG,CAAC,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,SAAS,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;QACjF,OAAO,IAAI,CAAC,aAAa;YACvB,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,UAAU,CAAC;YACnC,CAAC,CAAC,IAAA,gBAAM,EAAC,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IACjD,CAAC;CACF;AAXD,oBAWC"}