10 Commits

Author SHA1 Message Date
fcdcd4b929 2.0.6 2019-08-22 00:32:10 +02:00
c2f7e98481 fix(core): update 2019-08-22 00:32:09 +02:00
a2242105a1 2.0.5 2019-08-22 00:04:27 +02:00
44431e7d25 fix(core): update 2019-08-22 00:04:27 +02:00
3999015b23 2.0.4 2019-04-08 15:39:18 +02:00
77ad483a8a fix(core): update 2019-04-08 15:39:17 +02:00
904309564a 2.0.3 2019-04-08 15:13:48 +02:00
d8c03fd9ca fix(core): update 2019-04-08 15:13:47 +02:00
7e5c0fe678 2.0.2 2018-08-07 11:13:03 +02:00
93b44ba888 fix(core): update testing framework 2018-08-07 11:13:03 +02:00
15 changed files with 1276 additions and 390 deletions

22
.gitignore vendored
View File

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

View File

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

View File

@ -1,25 +1,20 @@
# @pushrocks/smartspawn # @pushrocks/smartspawn
smart subprocess handling smart subprocess handling
## Availabililty ## Availabililty and Links
* [npmjs.org (npm package)](https://www.npmjs.com/package/@pushrocks/smartspawn)
[![npm](https://pushrocks.gitlab.io/assets/repo-button-npm.svg)](https://www.npmjs.com/package/smartipc) * [gitlab.com (source)](https://gitlab.com/pushrocks/smartspawn)
[![git](https://pushrocks.gitlab.io/assets/repo-button-git.svg)](https://GitLab.com/pushrocks/smartipc) * [github.com (source mirror)](https://github.com/pushrocks/smartspawn)
[![git](https://pushrocks.gitlab.io/assets/repo-button-mirror.svg)](https://github.com/pushrocks/smartipc) * [docs (typedoc)](https://pushrocks.gitlab.io/smartspawn/)
[![docs](https://pushrocks.gitlab.io/assets/repo-button-docs.svg)](https://pushrocks.gitlab.io/smartipc/)
## Status for master ## Status for master
[![build status](https://gitlab.com/pushrocks/smartspawn/badges/master/build.svg)](https://gitlab.com/pushrocks/smartspawn/commits/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/smartspawn/badges/master/coverage.svg)](https://gitlab.com/pushrocks/smartspawn/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/@pushrocks/smartspawn.svg)](https://www.npmjs.com/package/@pushrocks/smartspawn)
[![npm downloads per month](https://img.shields.io/npm/dm/smartipc.svg)](https://www.npmjs.com/package/smartipc) [![Known Vulnerabilities](https://snyk.io/test/npm/@pushrocks/smartspawn/badge.svg)](https://snyk.io/test/npm/@pushrocks/smartspawn)
[![Dependency Status](https://david-dm.org/pushrocks/smartipc.svg)](https://david-dm.org/pushrocks/smartipc) [![TypeScript](https://img.shields.io/badge/TypeScript->=%203.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
[![bitHound Dependencies](https://www.bithound.io/github/pushrocks/smartipc/badges/dependencies.svg)](https://www.bithound.io/github/pushrocks/smartipc/master/dependencies/npm) [![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
[![bitHound Code](https://www.bithound.io/github/pushrocks/smartipc/badges/code.svg)](https://www.bithound.io/github/pushrocks/smartipc) [![JavaScript Style Guide](https://img.shields.io/badge/code%20style-prettier-ff69b4.svg)](https://prettier.io/)
[![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/)
## Usage ## Usage
@ -49,9 +44,9 @@ myThread.send('someMessageOrObject').then(messageResponse => {
```javascript ```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) > 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)

View File

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

1452
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -1,13 +1,13 @@
{ {
"name": "@pushrocks/smartspawn", "name": "@pushrocks/smartspawn",
"version": "2.0.1", "version": "2.0.6",
"private": false, "private": false,
"description": "smart subprocess handling", "description": "smart subprocess handling",
"main": "dist/index.js", "main": "dist/index.js",
"typings": "dist/index.d.ts", "typings": "dist/index.d.ts",
"scripts": { "scripts": {
"test": "tsrun test/test.ts", "test": "(tstest test/)",
"build": "echo \"Not needed for now\"" "build": "(tsbuild)"
}, },
"repository": { "repository": {
"type": "git", "type": "git",
@ -20,13 +20,28 @@
}, },
"homepage": "https://gitlab.com/pushrocks/smartipc#README", "homepage": "https://gitlab.com/pushrocks/smartipc#README",
"dependencies": { "dependencies": {
"@pushrocks/smartpromise": "^2.0.5", "@pushrocks/smartpromise": "^3.0.2",
"spawn-wrap": "^1.4.2", "spawn-wrap": "^1.4.2",
"threads": "^0.8.1" "threads": "^0.12.1"
}, },
"devDependencies": { "devDependencies": {
"@gitzone/tsrun": "^1.1.9", "@gitzone/tsbuild": "^2.1.11",
"@pushrocks/tapbundle": "^3.0.1", "@gitzone/tsrun": "^1.2.8",
"@types/node": "^10.5.5" "@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"
},
"files": [
"ts/*",
"ts_web/*",
"dist/*",
"dist_web/*",
"dist_ts_web/*",
"assets/*",
"cli.js",
"npmextra.json",
"readme.md"
]
} }

View File

@ -21,7 +21,7 @@ tap.test('should create an instance of ThreadFunction', async () => {
tap.test('should create an instance of Thread', async () => { tap.test('should create an instance of Thread', async () => {
smartspawn.setWorkerBasePath(__dirname); smartspawn.setWorkerBasePath(__dirname);
testThread = new smartspawn.Thread('child.ts'); testThread = new smartspawn.Thread('../testassets/child.ts');
testThread.enableTypeScript(); testThread.enableTypeScript();
const message = await testThread.send('https://google.com'); const message = await testThread.send('https://google.com');
console.log(message); console.log(message);
@ -30,12 +30,12 @@ tap.test('should create an instance of Thread', async () => {
tap.test('should not spawn when nothing is sent', async () => { tap.test('should not spawn when nothing is sent', async () => {
smartspawn.setWorkerBasePath(__dirname); smartspawn.setWorkerBasePath(__dirname);
let testThread = new smartspawn.Thread('child.ts'); let testThread = new smartspawn.Thread('../testassets/child.ts');
}); });
tap.test('should run in a Pool', async () => { tap.test('should run in a Pool', async () => {
let testPool = new smartspawn.Pool(); let testPool = new smartspawn.Pool();
let testThread = new smartspawn.Thread('child.ts'); let testThread = new smartspawn.Thread('../testassets/child.ts');
testThread.assignToPool(testPool); testThread.assignToPool(testPool);
// first run // first run
@ -53,7 +53,7 @@ tap.test('should run in a Pool', async () => {
}); });
tap.test('should once', async () => { tap.test('should once', async () => {
let testThread = new smartspawn.Thread('child.ts'); let testThread = new smartspawn.Thread('../testassets/child.ts');
const message = await testThread.sendOnce('what'); const message = await testThread.sendOnce('what');
expect(message).to.equal('what'); expect(message).to.equal('what');
}); });

View File

@ -3,4 +3,4 @@
// ============== // ==============
import * as plugins from './smartspawn.plugins'; import * as plugins from './smartspawn.plugins';
export class Cluster {} export class Cluster {}

View File

@ -1,6 +1,6 @@
import * as plugins from './smartspawn.plugins'; import * as plugins from './smartspawn.plugins';
import * as paths from './smartspawn.paths'; import * as paths from './smartspawn.paths';
import * as q from 'smartq'; import * as smartpromise from '@pushrocks/smartpromise';
import { Pool } from './smartspawn.classes.pool'; import { Pool } from './smartspawn.classes.pool';
import { startSpawnWrap, endSpawnWrap } from './smartspawn.wrap'; import { startSpawnWrap, endSpawnWrap } from './smartspawn.wrap';
@ -30,7 +30,7 @@ export class Thread {
* spawns it and keeps running * spawns it and keeps running
*/ */
send<T>(message: any): Promise<T> { send<T>(message: any): Promise<T> {
let done = q.defer<T>(); let done = smartpromise.defer<T>();
this._checkSpawn(); this._checkSpawn();
this.thread.send(message); this.thread.send(message);
this.thread.on('message', (message: T) => { this.thread.on('message', (message: T) => {
@ -49,7 +49,7 @@ export class Thread {
* sends a command once and then kills the child process * sends a command once and then kills the child process
*/ */
sendOnce<T>(message): Promise<T> { sendOnce<T>(message): Promise<T> {
let done = q.defer<T>(); let done = smartpromise.defer<T>();
this.send<T>(message).then(message => { this.send<T>(message).then(message => {
done.resolve(message); done.resolve(message);
this.kill(); this.kill();
@ -69,7 +69,7 @@ export class Thread {
this.assignedPool = poolArg; this.assignedPool = poolArg;
} }
enableTypeScript () { enableTypeScript() {
// TODO: // TODO:
} }

View File

@ -1,6 +1,5 @@
import 'typings-global';
import * as plugins from './smartspawn.plugins'; import * as plugins from './smartspawn.plugins';
import * as q from 'smartq'; import * as smartpromise from '@pushrocks/smartpromise';
export interface IThreadFunction { export interface IThreadFunction {
(input, done): void; (input, done): void;
@ -16,7 +15,7 @@ export class ThreadFunction {
* sends a message to the spawned process * sends a message to the spawned process
*/ */
send<T>(message: any): Promise<T> { send<T>(message: any): Promise<T> {
let done = q.defer<T>(); let done = smartpromise.defer<T>();
this.thread this.thread
.send(message) .send(message)
.on('message', (message: T) => { .on('message', (message: T) => {

View File

@ -1,5 +1,5 @@
import * as plugins from './smartspawn.plugins'; import * as plugins from './smartspawn.plugins';
import * as smartq from 'smartq'; import * as smartpromise from '@pushrocks/smartpromise';
import * as childProcess from 'child_process'; import * as childProcess from 'child_process';
import { workerBasePath } from './smartspawn.classes.thread'; import { workerBasePath } from './smartspawn.classes.thread';
@ -20,7 +20,7 @@ export class ThreadSimple {
} }
run() { run() {
let done = smartq.defer<childProcess.ChildProcess>(); let done = smartpromise.defer<childProcess.ChildProcess>();
let forkPath = (() => { let forkPath = (() => {
if (workerBasePath) { if (workerBasePath) {
return plugins.path.join(workerBasePath, this.workerPath); return plugins.path.join(workerBasePath, this.workerPath);

View File

@ -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 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');

View File

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

View File

@ -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"
} }