2.0.8

.gitignore

@@ -1,4 +1,22 @@
-node_modules/
+.nogit/
+
+# artifacts
 coverage/
-pages/
 public/
+pages/
+
+# installs
+node_modules/
+
+# caches
+.yarn/
+.cache/
+.rpt2_cache
+
+# builds
+dist/
+dist_web/
+dist_serve/
+dist_ts_web/
+
+# custom

.gitlab-ci.yml

@@ -1,5 +1,7 @@
-# gitzone standard
-image: hosttoday/ht-docker-node:npmci
+# gitzone ci_default
+image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+variables:
+  GIT_STRATEGY: clone
 
 cache:
   paths:
@@ -26,6 +28,7 @@ mirror:
 snyk:
   stage: security
   script:
+    - npmci npm prepare
     - npmci command npm install -g snyk
     - npmci command npm install --ignore-scripts
     - npmci command snyk test
@@ -36,35 +39,26 @@ snyk:
 # ====================
 # test stage
 # ====================
-testLEGACY:
-  stage: test
-  script:
-  - npmci node install legacy
-  - npmci npm install
-  - npmci npm test
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-  - docker
-  - notpriv
-  allow_failure: true
 
 testLTS:
   stage: test
   script:
+  - npmci npm prepare
   - npmci node install lts
   - npmci npm install
   - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
   - docker
-  - notpriv
-    
-testSTABLE:
+  - priv
+
+testBuild:
   stage: test
   script:
-  - npmci node install stable
+  - npmci npm prepare
+  - npmci node install lts
   - npmci npm install
-  - npmci npm test
+  - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
   - docker
@@ -73,7 +67,7 @@ testSTABLE:
 release:
   stage: release
   script:
-  - npmci node install stable
+  - npmci node install lts
   - npmci npm publish
   only:
   - tags
@@ -86,19 +80,11 @@ release:
 # ====================
 codequality:
   stage: metadata
-  image: docker:stable
   allow_failure: true
-  services:
-    - docker:stable-dind
   script:
-    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
-    - docker run
-        --env SOURCE_CODE="$PWD"
-        --volume "$PWD":/code
-        --volume /var/run/docker.sock:/var/run/docker.sock
-        "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code
-  artifacts:
-    paths: [codeclimate.json]
+    - npmci command npm install -g tslint typescript
+    - npmci npm install
+    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
   tags:
   - docker
   - priv
@@ -114,12 +100,15 @@ trigger:
   - notpriv
 
 pages:
-  image: hosttoday/ht-docker-node:npmci
+  image: hosttoday/ht-docker-dbase:npmci
+  services:
+   - docker:18-dind
   stage: metadata
   script:
-    - npmci command npm install -g typedoc typescript
+    - npmci command npm install -g @gitzone/tsdoc
+    - npmci npm prepare
     - npmci npm install
-    - npmci command typedoc --module "commonjs" --target "ES2016" --out public/ ts/
+    - npmci command tsdoc
   tags:
     - docker
     - notpriv
@@ -130,13 +119,3 @@ pages:
     paths:
     - public
   allow_failure: true
-
-windowsCompatibility:
-  image: stefanscherer/node-windows:10-build-tools
-  stage: metadata
-  script:
-  - npm install & npm test
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-  - windows
-  allow_failure: true

README.md

@@ -1,25 +1,20 @@
 # @pushrocks/smartspawn
-
 smart subprocess handling
 
-## Availabililty
-
-[![npm](https://pushrocks.gitlab.io/assets/repo-button-npm.svg)](https://www.npmjs.com/package/smartipc)
-[![git](https://pushrocks.gitlab.io/assets/repo-button-git.svg)](https://GitLab.com/pushrocks/smartipc)
-[![git](https://pushrocks.gitlab.io/assets/repo-button-mirror.svg)](https://github.com/pushrocks/smartipc)
-[![docs](https://pushrocks.gitlab.io/assets/repo-button-docs.svg)](https://pushrocks.gitlab.io/smartipc/)
+## Availabililty and Links
+* [npmjs.org (npm package)](https://www.npmjs.com/package/@pushrocks/smartspawn)
+* [gitlab.com (source)](https://gitlab.com/pushrocks/smartspawn)
+* [github.com (source mirror)](https://github.com/pushrocks/smartspawn)
+* [docs (typedoc)](https://pushrocks.gitlab.io/smartspawn/)
 
 ## Status for master
-
-[![build status](https://GitLab.com/pushrocks/smartipc/badges/master/build.svg)](https://GitLab.com/pushrocks/smartipc/commits/master)
-[![coverage report](https://GitLab.com/pushrocks/smartipc/badges/master/coverage.svg)](https://GitLab.com/pushrocks/smartipc/commits/master)
-[![npm downloads per month](https://img.shields.io/npm/dm/smartipc.svg)](https://www.npmjs.com/package/smartipc)
-[![Dependency Status](https://david-dm.org/pushrocks/smartipc.svg)](https://david-dm.org/pushrocks/smartipc)
-[![bitHound Dependencies](https://www.bithound.io/github/pushrocks/smartipc/badges/dependencies.svg)](https://www.bithound.io/github/pushrocks/smartipc/master/dependencies/npm)
-[![bitHound Code](https://www.bithound.io/github/pushrocks/smartipc/badges/code.svg)](https://www.bithound.io/github/pushrocks/smartipc)
-[![TypeScript](https://img.shields.io/badge/TypeScript-2.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
-[![node](https://img.shields.io/badge/node->=%206.x.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
-[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/)
+[![build status](https://gitlab.com/pushrocks/smartspawn/badges/master/build.svg)](https://gitlab.com/pushrocks/smartspawn/commits/master)
+[![coverage report](https://gitlab.com/pushrocks/smartspawn/badges/master/coverage.svg)](https://gitlab.com/pushrocks/smartspawn/commits/master)
+[![npm downloads per month](https://img.shields.io/npm/dm/@pushrocks/smartspawn.svg)](https://www.npmjs.com/package/@pushrocks/smartspawn)
+[![Known Vulnerabilities](https://snyk.io/test/npm/@pushrocks/smartspawn/badge.svg)](https://snyk.io/test/npm/@pushrocks/smartspawn)
+[![TypeScript](https://img.shields.io/badge/TypeScript->=%203.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
+[![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
+[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-prettier-ff69b4.svg)](https://prettier.io/)
 
 ## Usage
 
@@ -49,9 +44,9 @@ myThread.send('someMessageOrObject').then(messageResponse => {
 ```javascript
 ```
 
-For further information read the linked docs at the top of this README.
+For further information read the linked docs at the top of this readme.
 
 > MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
-> | By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy.html)
+| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)
 
-[![repo-footer](https://pushrocks.gitlab.io/assets/repo-footer.svg)](https://push.rocks)
+[![repo-footer](https://lossless.gitlab.io/publicrelations/repofooter.svg)](https://maintainedby.lossless.com)

npmextra.json

@@ -7,5 +7,15 @@
   "npmci": {
     "npmGlobalTools": [],
     "npmAccessLevel": "public"
+  },
+  "gitzone": {
+    "module": {
+      "githost": "gitlab.com",
+      "gitscope": "pushrocks",
+      "gitrepo": "smartspawn",
+      "shortDescription": "smart subprocess handling",
+      "npmPackagename": "@pushrocks/smartspawn",
+      "license": "MIT"
+    }
   }
 }

package.json

@@ -1,12 +1,13 @@
 {
   "name": "@pushrocks/smartspawn",
-  "version": "2.0.0",
+  "version": "2.0.8",
+  "private": false,
   "description": "smart subprocess handling",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "scripts": {
-    "test": "tsrun test/test.ts",
-    "build": "echo \"Not needed for now\""
+    "test": "(tstest test/)",
+    "build": "(tsbuild --web)"
   },
   "repository": {
     "type": "git",
@@ -19,14 +20,29 @@
   },
   "homepage": "https://gitlab.com/pushrocks/smartipc#README",
   "dependencies": {
-    "@pushrocks/smartpromise": "^2.0.5",
+    "@pushrocks/smartpromise": "^3.0.2",
     "spawn-wrap": "^1.4.2",
-    "threads": "^0.8.1"
+    "threads": "1.0.0-beta.4",
+    "tiny-worker": "^2.2.0"
   },
   "devDependencies": {
-    "@gitzone/tsrun": "^1.1.9",
-    "@pushrocks/tapbundle": "^3.0.1",
-    "@types/node": "^10.5.5"
+    "@gitzone/tsbuild": "^2.1.11",
+    "@gitzone/tsrun": "^1.2.8",
+    "@gitzone/tstest": "^1.0.24",
+    "@pushrocks/tapbundle": "^3.0.11",
+    "@types/node": "^12.7.2",
+    "tslint": "^5.19.0",
+    "tslint-config-prettier": "^1.18.0"
   },
-  "private": true
+  "files": [
+    "ts/*",
+    "ts_web/*",
+    "dist/*",
+    "dist_web/*",
+    "dist_ts_web/*",
+    "assets/*",
+    "cli.js",
+    "npmextra.json",
+    "readme.md"
+  ]
 }

test/test.ts

@@ -2,60 +2,6 @@ import { expect, tap } from '@pushrocks/tapbundle';
 
 import * as smartspawn from '../ts/index';
 
-let testThreadFunction: smartspawn.ThreadFunction;
-let testThread: smartspawn.Thread;
-let testPool: smartspawn.Pool;
-
-/**
- * create a normal ThreadFunction
- */
-tap.test('should create an instance of ThreadFunction', async () => {
-  testThreadFunction = new smartspawn.ThreadFunction((input, done) => {
-    let url = require('url');
-    done(url.parse(input));
-  });
-  const message = await testThreadFunction.send('https://google.com');
-  console.log(message);
-  testThreadFunction.kill();
-});
-
-tap.test('should create an instance of Thread', async () => {
-  smartspawn.setWorkerBasePath(__dirname);
-  testThread = new smartspawn.Thread('child.ts');
-  testThread.enableTypeScript();
-  const message = await testThread.send('https://google.com');
-  console.log(message);
-  testThread.kill();
-});
-
-tap.test('should not spawn when nothing is sent', async () => {
-  smartspawn.setWorkerBasePath(__dirname);
-  let testThread = new smartspawn.Thread('child.ts');
-});
-
-tap.test('should run in a Pool', async () => {
-  let testPool = new smartspawn.Pool();
-  let testThread = new smartspawn.Thread('child.ts');
-  testThread.assignToPool(testPool);
-
-  // first run
-  let message = await testThread.send('what');
-  expect(message).to.equal('what');
-  console.log(message);
-
-  // second run
-  message = await testThread.send('another');
-  expect(message).to.equal('another');
-  console.log(message);
-
-  // kill all
-  testThread.assignedPool.pool.killAll();
-});
-
-tap.test('should once', async () => {
-  let testThread = new smartspawn.Thread('child.ts');
-  const message = await testThread.sendOnce('what');
-  expect(message).to.equal('what');
-});
+tap.test('should create a simple test function', async () => {});
 
 tap.start();

ts/index.ts

@@ -1,5 +1,4 @@
-export * from './smartspawn.classes.thread';
-export * from './smartspawn.classes.threadfunction';
 export * from './smartspawn.classes.threadsimple';
-export * from './smartspawn.classes.pool';
 export * from './smartspawn.wrap';
+
+export * from 'threads';

ts/smartspawn.classes.cluster.ts

@@ -1,6 +0,0 @@
-// ==============
-// This file handles clustering of nodejs programs
-// ==============
-import * as plugins from './smartspawn.plugins';
-
-export class Cluster {}

ts/smartspawn.classes.pool.ts

@@ -1,13 +0,0 @@
-import * as plugins from './smartspawn.plugins';
-
-export class Pool {
-  pool;
-
-  // the constructor for pool
-  constructor() {
-    this.pool = new plugins.threads.Pool();
-  }
-  run(workerPathArg: string) {
-    return this.pool.run(workerPathArg);
-  }
-}

ts/smartspawn.classes.thread.ts

@@ -1,85 +0,0 @@
-import * as plugins from './smartspawn.plugins';
-import * as paths from './smartspawn.paths';
-import * as q from 'smartq';
-
-import { Pool } from './smartspawn.classes.pool';
-import { startSpawnWrap, endSpawnWrap } from './smartspawn.wrap';
-
-export let workerBasePath: string = null;
-
-export const setWorkerBasePath = (basePathArg: string) => {
-  workerBasePath = basePathArg;
-  plugins.threads.config.set({
-    basepath: {
-      node: workerBasePath
-    }
-  });
-};
-
-export class Thread {
-  thread;
-  workerPath: string;
-  running: boolean = false;
-  assignedPool: Pool = null;
-  constructor(filePathArg: string) {
-    this.workerPath = filePathArg;
-  }
-
-  /**
-   * sends a message to the spawned process
-   * spawns it and keeps running
-   */
-  send<T>(message: any): Promise<T> {
-    let done = q.defer<T>();
-    this._checkSpawn();
-    this.thread.send(message);
-    this.thread.on('message', (message: T) => {
-      done.resolve(message);
-    });
-    this.thread.on('done', (job, message: T) => {
-      done.resolve(message);
-    });
-    this.thread.on('error', err => {
-      done.reject(err);
-    });
-    return done.promise;
-  }
-
-  /**
-   * sends a command once and then kills the child process
-   */
-  sendOnce<T>(message): Promise<T> {
-    let done = q.defer<T>();
-    this.send<T>(message).then(message => {
-      done.resolve(message);
-      this.kill();
-    });
-    return done.promise;
-  }
-
-  /**
-   * kills the thread
-   */
-  kill() {
-    this.thread.kill();
-    this.running = false;
-  }
-
-  assignToPool(poolArg: Pool) {
-    this.assignedPool = poolArg;
-  }
-
-  enableTypeScript () {
-    // TODO:
-  }
-
-  private _checkSpawn() {
-    if (!this.running && !this.assignedPool) {
-      this.running = true;
-      this.thread = plugins.threads.spawn(this.workerPath);
-    } else if (!this.running && this.assignedPool) {
-      this.running = true;
-      this.thread = this.assignedPool.run(this.workerPath);
-    }
-  }
-}

ts/smartspawn.classes.threadfunction.ts

@@ -1,34 +0,0 @@
-import 'typings-global';
-import * as plugins from './smartspawn.plugins';
-import * as q from 'smartq';
-
-export interface IThreadFunction {
-  (input, done): void;
-}
-
-export class ThreadFunction {
-  thread;
-  constructor(functionArg: IThreadFunction) {
-    this.thread = plugins.threads.spawn(functionArg);
-  }
-
-  /**
-   * sends a message to the spawned process
-   */
-  send<T>(message: any): Promise<T> {
-    let done = q.defer<T>();
-    this.thread
-      .send(message)
-      .on('message', (message: T) => {
-        done.resolve(message);
-      })
-      .on('error', err => {
-        done.reject(err);
-      });
-    return done.promise;
-  }
-
-  kill() {
-    this.thread.kill();
-  }
-}

ts/smartspawn.classes.threadsimple.ts

@@ -1,14 +1,12 @@
 import * as plugins from './smartspawn.plugins';
-import * as smartq from 'smartq';
+import * as smartpromise from '@pushrocks/smartpromise';
 import * as childProcess from 'child_process';
 
-import { workerBasePath } from './smartspawn.classes.thread';
-
 export class ThreadSimple {
-  workerPath: string;
-  threadChildProcess: childProcess.ChildProcess;
-  forkOptions: childProcess.ForkOptions;
-  argvArgs: string[];
+  public workerPath: string;
+  public threadChildProcess: childProcess.ChildProcess;
+  public forkOptions: childProcess.ForkOptions;
+  public argvArgs: string[];
   constructor(
     filePathArg: string,
     argvArgs: string[] = [],
@@ -19,17 +17,13 @@ export class ThreadSimple {
     this.argvArgs = argvArgs;
   }
 
-  run() {
-    let done = smartq.defer<childProcess.ChildProcess>();
-    let forkPath = (() => {
-      if (workerBasePath) {
-        return plugins.path.join(workerBasePath, this.workerPath);
-      } else {
-        return this.workerPath;
-      }
-    })();
+  public async start() {
+    const forkPath = this.workerPath;
     this.threadChildProcess = childProcess.fork(forkPath, this.argvArgs, this.forkOptions);
-    done.resolve(this.threadChildProcess);
-    return done.promise;
+    return this.threadChildProcess;
+  }
+
+  public async stop() {
+    this.threadChildProcess.kill();
   }
 }

ts/smartspawn.paths.ts

@@ -1,4 +1,4 @@
-import * as plugins from './smartspawn.plugins'
+import * as plugins from './smartspawn.plugins';
 
 export const packageBase = plugins.path.join(__dirname, '../');
-export const typescriptwrapJs = plugins.path.join(packageBase, 'assets/typescriptwrap.js');
+export const typescriptwrapJs = plugins.path.join(packageBase, 'assets/typescriptwrap.js');

ts/smartspawn.plugins.ts

@@ -1,5 +1,5 @@
 import * as path from 'path';
-let threads = require('threads');
+const threads = require('threads');
 import * as smartpromise from '@pushrocks/smartpromise';
 
 export { path, smartpromise, threads };

ts/smartspawn.wrap.ts

@@ -3,8 +3,8 @@ import * as spawnWrap from 'spawn-wrap';
 let unwrap: any = null;
 
 export const startSpawnWrap = (filePath: string, cliArgs: string[] = [], envArgs: any = {}) => {
-  let spawnArray = [filePath];
-  for (let cliArg of cliArgs) {
+  const spawnArray = [filePath];
+  for (const cliArg of cliArgs) {
     spawnArray.push(cliArg);
   }
   unwrap = spawnWrap(spawnArray, envArgs);

tslint.json

@@ -1,3 +1,17 @@
 {
-    "extends": "tslint-config-standard"
+  "extends": ["tslint:latest", "tslint-config-prettier"],
+  "rules": {
+    "semicolon": [true, "always"],
+    "no-console": false,
+    "ordered-imports": false,
+    "object-literal-sort-keys": false,
+    "member-ordering": {
+      "options":{
+        "order": [
+          "static-method"
+        ]
+      }
+    }
+  },
+  "defaultSeverity": "warning"
 }