fix(core): update

This commit is contained in:
Philipp Kunz 2019-04-08 15:39:17 +02:00
parent 904309564a
commit 77ad483a8a
5 changed files with 311 additions and 314 deletions

598
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -20,15 +20,15 @@
}, },
"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/tsbuild": "^2.1.8", "@gitzone/tsbuild": "^2.1.8",
"@gitzone/tsrun": "^1.1.9", "@gitzone/tsrun": "^1.2.1",
"@gitzone/tstest": "^1.0.12", "@gitzone/tstest": "^1.0.18",
"@pushrocks/tapbundle": "^3.0.1", "@pushrocks/tapbundle": "^3.0.7",
"@types/node": "^10.5.5" "@types/node": "^11.13.0"
} }
} }

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();

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