diff options
| author | Rebecca Turner <me@re-becca.org> | 2018-03-23 02:49:01 +0300 |
|---|---|---|
| committer | Rebecca Turner <me@re-becca.org> | 2018-03-23 12:08:57 +0300 |
| commit | 40aabb94e3f24a9feabb9c490403e10ec9dc254f (patch) | |
| tree | 5133ff05a3d2a59d157866c6b09e609393688136 | |
| parent | f721eec599df4bdf046d248e0f50822d436654b4 (diff) | |
libcipm@1.6.1
Fixes bugs on docker and with some `prepare` scripts.
Fixes a bug where script hooks wouldn't be called.
Fixes a bug where `npm ci` and `--prefix` weren't compatible.
Credit: @isaacseymour
Credit: @umarov
Credit: @mikeshirov
Credit: @billjanitsch
Fixes: #19258
47 files changed, 51 insertions, 2904 deletions
diff --git a/node_modules/libcipm/CHANGELOG.md b/node_modules/libcipm/CHANGELOG.md index 65a699f40..22b04467e 100644 --- a/node_modules/libcipm/CHANGELOG.md +++ b/node_modules/libcipm/CHANGELOG.md @@ -2,6 +2,19 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +<a name="1.6.1"></a> +## [1.6.1](https://github.com/zkat/cipm/compare/v1.6.0...v1.6.1) (2018-03-13) + + +### Bug Fixes + +* **bin:** Set non-zero exit code on error ([#41](https://github.com/zkat/cipm/issues/41)) ([54d0106](https://github.com/zkat/cipm/commit/54d0106)) +* **lifecycle:** defer to lifecycle’s internal logic as to whether or not to execute a run-script ([#42](https://github.com/zkat/cipm/issues/42)) ([7f27a52](https://github.com/zkat/cipm/commit/7f27a52)), closes [npm/npm#19258](https://github.com/npm/npm/issues/19258) +* **prefix:** don't reference prefix before computing it ([#40](https://github.com/zkat/cipm/issues/40)) ([08ed1cc](https://github.com/zkat/cipm/commit/08ed1cc)) +* **prefix:** Resolve to promise when passing --prefix to npm ci ([#43](https://github.com/zkat/cipm/issues/43)) ([401d466](https://github.com/zkat/cipm/commit/401d466)) + + + <a name="1.6.0"></a> # [1.6.0](https://github.com/zkat/cipm/compare/v1.5.1...v1.6.0) (2018-03-01) diff --git a/node_modules/libcipm/index.js b/node_modules/libcipm/index.js index 23d060c21..11aee4028 100644 --- a/node_modules/libcipm/index.js +++ b/node_modules/libcipm/index.js @@ -48,14 +48,13 @@ class Installer { } run () { - const prefix = this.prefix return this.timedStage('prepare') .then(() => this.timedStage('extractTree', this.tree)) .then(() => this.timedStage('updateJson', this.tree)) .then(pkgJsons => this.timedStage('buildTree', this.tree, pkgJsons)) .then(() => this.timedStage('garbageCollect', this.tree)) - .then(() => this.timedStage('runScript', 'prepublish', this.pkg, prefix)) - .then(() => this.timedStage('runScript', 'prepare', this.pkg, prefix)) + .then(() => this.timedStage('runScript', 'prepublish', this.pkg, this.prefix)) + .then(() => this.timedStage('runScript', 'prepare', this.pkg, this.prefix)) .then(() => this.timedStage('teardown')) .then(() => { this.runTime = Date.now() - this.startTime @@ -91,7 +90,7 @@ class Installer { // There's some Special™ logic around the `--prefix` config when it // comes from a config file or env vs when it comes from the CLI : process.argv.some(arg => arg.match(/^\s*--prefix\s*/i)) - ? this.config.get('prefix') + ? BB.resolve(this.config.get('prefix')) : getPrefix(process.cwd()) ) .then(prefix => { @@ -328,9 +327,7 @@ class Installer { runScript (stage, pkg, pkgPath) { const start = Date.now() - if ( - !this.config.get('ignore-scripts') && pkg.scripts && pkg.scripts[stage] - ) { + if (!this.config.get('ignore-scripts')) { // TODO(mikesherov): remove pkg._id when npm-lifecycle no longer relies on it pkg._id = pkg.name + '@' + pkg.version const opts = this.config.toLifecycle() diff --git a/node_modules/libcipm/node_modules/lock-verify/README.md b/node_modules/libcipm/node_modules/lock-verify/README.md index e9466f0a6..01f0633c0 100644 --- a/node_modules/libcipm/node_modules/lock-verify/README.md +++ b/node_modules/libcipm/node_modules/lock-verify/README.md @@ -4,28 +4,6 @@ Report if your package.json is out of sync with your package-lock.json. ## USAGE -Call it with no arguments to verify the current project's lock file. Errors -are printed out to stdout and the status code set to 1. - -``` -$ npx lock-verify -Invalid: lock file's example@2.1.0 does not satisfy example@^1.1.0 -Errors found -$ -``` - - -Call it with a path to a project to verify that project's lock file. If there -are no errors, it prints nothing and the status code is 0. - - -``` -$ npx lock-verify /path/to/my/project -$ -``` - -## OR AS A LIBRARY - ``` const lockVerify = require('lock-verify') lockVerify(moduleDir).then(result => { diff --git a/node_modules/libcipm/node_modules/lock-verify/package.json b/node_modules/libcipm/node_modules/lock-verify/package.json index ee25a3071..9290d5519 100644 --- a/node_modules/libcipm/node_modules/lock-verify/package.json +++ b/node_modules/libcipm/node_modules/lock-verify/package.json @@ -1,13 +1,13 @@ { "_from": "lock-verify@^2.0.0", - "_id": "lock-verify@2.0.0", + "_id": "lock-verify@2.0.1", "_inBundle": false, - "_integrity": "sha512-ZK+fx1rQBBvyRp12tPgKaMrKlxv+72hO+QCAvdW8BGwKx/Jn3wVD7GooG2ftF80W29hfj+R1o0tTI8m6/pl1Mw==", + "_integrity": "sha512-y6aTtefBUKCVfAZcWf9pyfxQJutjvPuoARNKphNY6j8HkFrONOISWpre/bsV3KrEbbh6gyKmOvu3j0fMZfKbZg==", "_location": "/libcipm/lock-verify", "_phantomChildren": { - "hosted-git-info": "2.5.0", - "osenv": "0.1.4", - "semver": "5.4.1", + "hosted-git-info": "2.6.0", + "osenv": "0.1.5", + "semver": "5.5.0", "validate-npm-package-name": "3.0.0" }, "_requested": { @@ -23,10 +23,10 @@ "_requiredBy": [ "/libcipm" ], - "_resolved": "https://registry.npmjs.org/lock-verify/-/lock-verify-2.0.0.tgz", - "_shasum": "0c957bd542aeae19272408b066b0cad819410452", + "_resolved": "https://registry.npmjs.org/lock-verify/-/lock-verify-2.0.1.tgz", + "_shasum": "6d671eea60b459c6048b3b26b62959208be67682", "_spec": "lock-verify@^2.0.0", - "_where": "/Users/zkat/Documents/code/npm/node_modules/libcipm", + "_where": "/Users/rebecca/code/npm/node_modules/libcipm", "author": { "name": "Rebecca Turner", "email": "me@re-becca.org", @@ -60,5 +60,5 @@ "scripts": { "test": "echo \"Error: no test specified\" && exit 1" }, - "version": "2.0.0" + "version": "2.0.1" } diff --git a/node_modules/libcipm/node_modules/worker-farm/.travis.yml b/node_modules/libcipm/node_modules/worker-farm/.travis.yml deleted file mode 100644 index 1c9e2b559..000000000 --- a/node_modules/libcipm/node_modules/worker-farm/.travis.yml +++ /dev/null @@ -1,12 +0,0 @@ -language: node_js -node_js: - - 4 - - 6 - - 8 - - 9 -branches: - only: - - master -notifications: - email: - - rod@vagg.org diff --git a/node_modules/libcipm/node_modules/worker-farm/LICENSE.md b/node_modules/libcipm/node_modules/worker-farm/LICENSE.md deleted file mode 100644 index 274c9b460..000000000 --- a/node_modules/libcipm/node_modules/worker-farm/LICENSE.md +++ /dev/null @@ -1,13 +0,0 @@ -The MIT License (MIT) -===================== - -Copyright (c) 2014 LevelUP contributors ---------------------------------------- - -*LevelUP contributors listed at <https://github.com/rvagg/node-levelup#contributors>* - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/node_modules/libcipm/node_modules/worker-farm/README.md b/node_modules/libcipm/node_modules/worker-farm/README.md deleted file mode 100644 index 87ee4b61b..000000000 --- a/node_modules/libcipm/node_modules/worker-farm/README.md +++ /dev/null @@ -1,144 +0,0 @@ -# Worker Farm [](http://travis-ci.org/rvagg/node-worker-farm) - -[](https://nodei.co/npm/worker-farm/) [](https://nodei.co/npm/worker-farm/) - - -Distribute processing tasks to child processes with an über-simple API and baked-in durability & custom concurrency options. *Available in npm as <strong>worker-farm</strong>*. - -## Example - -Given a file, *child.js*: - -```js -module.exports = function (inp, callback) { - callback(null, inp + ' BAR (' + process.pid + ')') -} -``` - -And a main file: - -```js -var workerFarm = require('worker-farm') - , workers = workerFarm(require.resolve('./child')) - , ret = 0 - -for (var i = 0; i < 10; i++) { - workers('#' + i + ' FOO', function (err, outp) { - console.log(outp) - if (++ret == 10) - workerFarm.end(workers) - }) -} -``` - -We'll get an output something like the following: - -``` -#1 FOO BAR (8546) -#0 FOO BAR (8545) -#8 FOO BAR (8545) -#9 FOO BAR (8546) -#2 FOO BAR (8548) -#4 FOO BAR (8551) -#3 FOO BAR (8549) -#6 FOO BAR (8555) -#5 FOO BAR (8553) -#7 FOO BAR (8557) -``` - -This example is contained in the *[examples/basic](https://github.com/rvagg/node-worker-farm/tree/master/examples/basic/)* directory. - -### Example #1: Estimating π using child workers - -You will also find a more complex example in *[examples/pi](https://github.com/rvagg/node-worker-farm/tree/master/examples/pi/)* that estimates the value of **π** by using a Monte Carlo *area-under-the-curve* method and compares the speed of doing it all in-process vs using child workers to complete separate portions. - -Running `node examples/pi` will give you something like: - -``` -Doing it the slow (single-process) way... -π ≈ 3.1416269360000006 (0.0000342824102075312 away from actual!) -took 8341 milliseconds -Doing it the fast (multi-process) way... -π ≈ 3.1416233600000036 (0.00003070641021052367 away from actual!) -took 1985 milliseconds -``` - -## Durability - -An important feature of Worker Farm is **call durability**. If a child process dies for any reason during the execution of call(s), those calls will be re-queued and taken care of by other child processes. In this way, when you ask for something to be done, unless there is something *seriously* wrong with what you're doing, you should get a result on your callback function. - -## My use-case - -There are other libraries for managing worker processes available but my use-case was fairly specific: I need to make heavy use of the [node-java](https://github.com/nearinfinity/node-java) library to interact with JVM code. Unfortunately, because the JVM garbage collector is so difficult to interact with, it's prone to killing your Node process when the GC kicks under heavy load. For safety I needed a durable way to make calls so that (1) it wouldn't kill my main process and (2) any calls that weren't successful would be resubmitted for processing. - -Worker Farm allows me to spin up multiple JVMs to be controlled by Node, and have a single, uncomplicated API that acts the same way as an in-process API and the calls will be taken care of by a child process even if an error kills a child process while it is working as the call will simply be passed to a new child process. - -**But**, don't think that Worker Farm is specific to that use-case, it's designed to be very generic and simple to adapt to anything requiring the use of child Node processes. - -## API - -Worker Farm exports a main function and an `end()` method. The main function sets up a "farm" of coordinated child-process workers and it can be used to instantiate multiple farms, all operating independently. - -### workerFarm([options, ]pathToModule[, exportedMethods]) - -In its most basic form, you call `workerFarm()` with the path to a module file to be invoked by the child process. You should use an **absolute path** to the module file, the best way to obtain the path is with `require.resolve('./path/to/module')`, this function can be used in exactly the same way as `require('./path/to/module')` but it returns an absolute path. - -#### `exportedMethods` - -If your module exports a single function on `module.exports` then you should omit the final parameter. However, if you are exporting multiple functions on `module.exports` then you should list them in an Array of Strings: - -```js -var workers = workerFarm(require.resolve('./mod'), [ 'doSomething', 'doSomethingElse' ]) -workers.doSomething(function () {}) -workers.doSomethingElse(function () {}) -``` - -Listing the available methods will instruct Worker Farm what API to provide you with on the returned object. If you don't list a `exportedMethods` Array then you'll get a single callable function to use; but if you list the available methods then you'll get an object with callable functions by those names. - -**It is assumed that each function you call on your child module will take a `callback` function as the last argument.** - -#### `options` - -If you don't provide an `options` object then the following defaults will be used: - -```js -{ - maxCallsPerWorker : Infinity - , maxConcurrentWorkers : require('os').cpus().length - , maxConcurrentCallsPerWorker : 10 - , maxConcurrentCalls : Infinity - , maxCallTime : Infinity - , maxRetries : Infinity - , autoStart : false -} -``` - - * **<code>maxCallsPerWorker</code>** allows you to control the lifespan of your child processes. A positive number will indicate that you only want each child to accept that many calls before it is terminated. This may be useful if you need to control memory leaks or similar in child processes. - - * **<code>maxConcurrentWorkers</code>** will set the number of child processes to maintain concurrently. By default it is set to the number of CPUs available on the current system, but it can be any reasonable number, including `1`. - - * **<code>maxConcurrentCallsPerWorker</code>** allows you to control the *concurrency* of individual child processes. Calls are placed into a queue and farmed out to child processes according to the number of calls they are allowed to handle concurrently. It is arbitrarily set to 10 by default so that calls are shared relatively evenly across workers, however if your calls predictably take a similar amount of time then you could set it to `Infinity` and Worker Farm won't queue any calls but spread them evenly across child processes and let them go at it. If your calls aren't I/O bound then it won't matter what value you use here as the individual workers won't be able to execute more than a single call at a time. - - * **<code>maxConcurrentCalls</code>** allows you to control the maximum number of calls in the queue—either actively being processed or waiting for a worker to be processed. `Infinity` indicates no limit but if you have conditions that may endlessly queue jobs and you need to set a limit then provide a `>0` value and any calls that push the limit will return on their callback with a `MaxConcurrentCallsError` error (check `err.type == 'MaxConcurrentCallsError'`). - - * **<code>maxCallTime</code>** *(use with caution, understand what this does before you use it!)* when `!== Infinity`, will cap a time, in milliseconds, that *any single call* can take to execute in a worker. If this time limit is exceeded by just a single call then the worker running that call will be killed and any calls running on that worker will have their callbacks returned with a `TimeoutError` (check `err.type == 'TimeoutError'`). If you are running with `maxConcurrentCallsPerWorker` value greater than `1` then **all calls currently executing** will fail and will be automatically resubmitted uless you've changed the `maxRetries` option. Use this if you have jobs that may potentially end in infinite loops that you can't programatically end with your child code. Preferably run this with a `maxConcurrentCallsPerWorker` so you don't interrupt other calls when you have a timeout. This timeout operates on a per-call basis but will interrupt a whole worker. - - * **<code>maxRetries</code>** allows you to control the max number of call requeues after worker termination (unexpected or timeout). By default this option is set to `Infinity` which means that each call of each terminated worker will always be auto requeued. When the number of retries exceeds `maxRetries` value, the job callback will be executed with a `ProcessTerminatedError`. Note that if you are running with finite `maxCallTime` and `maxConcurrentCallsPerWorkers` greater than `1` then any `TimeoutError` will increase the retries counter *for each* concurrent call of the terminated worker. - - * **<code>autoStart</code>** when set to `true` will start the workers as early as possible. Use this when your workers have to do expensive initialization. That way they'll be ready when the first request comes through. - -### workerFarm.end(farm) - -Child processes stay alive waiting for jobs indefinitely and your farm manager will stay alive managing its workers, so if you need it to stop then you have to do so explicitly. If you send your farm API to `workerFarm.end()` then it'll cleanly end your worker processes. Note though that it's a *soft* ending so it'll wait for child processes to finish what they are working on before asking them to die. - -Any calls that are queued and not yet being handled by a child process will be discarded. `end()` only waits for those currently in progress. - -Once you end a farm, it won't handle any more calls, so don't even try! - -## Related - -* [farm-cli](https://github.com/Kikobeats/farm-cli) – Launch a farm of workers from CLI. - -## License - -Worker Farm is Copyright (c) 2014 Rod Vagg [@rvagg](https://twitter.com/rvagg) and licensed under the MIT license. All rights not explicitly granted in the MIT license are reserved. See the included LICENSE.md file for more details. diff --git a/node_modules/libcipm/node_modules/worker-farm/examples/basic/child.js b/node_modules/libcipm/node_modules/worker-farm/examples/basic/child.js deleted file mode 100644 index 41e124b06..000000000 --- a/node_modules/libcipm/node_modules/worker-farm/examples/basic/child.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict' - -module.exports = function (inp, callback) { - callback(null, inp + ' BAR (' + process.pid + ')') -}
\ No newline at end of file diff --git a/node_modules/libcipm/node_modules/worker-farm/examples/basic/index.js b/node_modules/libcipm/node_modules/worker-farm/examples/basic/index.js deleted file mode 100644 index 3c9a1086e..000000000 --- a/node_modules/libcipm/node_modules/worker-farm/examples/basic/index.js +++ /dev/null @@ -1,13 +0,0 @@ -'use strict' - -let workerFarm = require('../../') - , workers = workerFarm(require.resolve('./child')) - , ret = 0 - -for (let i = 0; i < 10; i++) { - workers('#' + i + ' FOO', function (err, outp) { - console.log(outp) - if (++ret == 10) - workerFarm.end(workers) - }) -}
\ No newline at end of file diff --git a/node_modules/libcipm/node_modules/worker-farm/examples/pi/calc.js b/node_modules/libcipm/node_modules/worker-farm/examples/pi/calc.js deleted file mode 100644 index 42c77c2bd..000000000 --- a/node_modules/libcipm/node_modules/worker-farm/examples/pi/calc.js +++ /dev/null @@ -1,22 +0,0 @@ -'use strict' - -/* A simple π estimation function using a Monte Carlo method - * For 0 to `points`, take 2 random numbers < 1, square and add them to - * find the area under that point in a 1x1 square. If that area is <= 1 - * then it's *within* a quarter-circle, otherwise it's outside. - * Take the number of points <= 1 and multiply it by 4 and you have an - * estimate! - * Do this across multiple processes and average the results to - * increase accuracy. - */ - -module.exports = function (points, callback) { - let inside = 0 - , i = points - - while (i--) - if (Math.pow(Math.random(), 2) + Math.pow(Math.random(), 2) <= 1) - inside++ - - callback(null, (inside / points) * 4) -}
\ No newline at end of file diff --git a/node_modules/libcipm/node_modules/worker-farm/examples/pi/index.js b/node_modules/libcipm/node_modules/worker-farm/examples/pi/index.js deleted file mode 100644 index b7b26839e..000000000 --- a/node_modules/libcipm/node_modules/worker-farm/examples/pi/index.js +++ /dev/null @@ -1,41 +0,0 @@ -'use strict' - -const CHILDREN = 500 - , POINTS_PER_CHILD = 1000000 - , FARM_OPTIONS = { - maxConcurrentWorkers : require('os').cpus().length - , maxCallsPerWorker : Infinity - , maxConcurrentCallsPerWorker : 1 - } - -let workerFarm = require('../../') - , calcDirect = require('./calc') - , calcWorker = workerFarm(FARM_OPTIONS, require.resolve('./calc')) - - , ret - , start - - , tally = function (finish, err, avg) { - ret.push(avg) - if (ret.length == CHILDREN) { - let pi = ret.reduce(function (a, b) { return a + b }) / ret.length - , end = +new Date() - console.log('π ≈', pi, '\t(' + Math.abs(pi - Math.PI), 'away from actual!)') - console.log('took', end - start, 'milliseconds') - if (finish) - finish() - } - } - - , calc = function (method, callback) { - ret = [] - start = +new Date() - for (let i = 0; i < CHILDREN; i++) - method(POINTS_PER_CHILD, tally.bind(null, callback)) - } - -console.log('Doing it the slow (single-process) way...') -calc(calcDirect, function () { - console.log('Doing it the fast (multi-process) way...') - calc(calcWorker, process.exit) -}) diff --git a/node_modules/libcipm/node_modules/worker-farm/index.d.ts b/node_modules/libcipm/node_modules/worker-farm/index.d.ts deleted file mode 100644 index 682c21f41..000000000 --- a/node_modules/libcipm/node_modules/worker-farm/index.d.ts +++ /dev/null @@ -1,44 +0,0 @@ -interface Workers { - (callback: WorkerCallback): void; - (arg1: any, callback: WorkerCallback): void; - (arg1: any, arg2: any, callback: WorkerCallback): void; - (arg1: any, arg2: any, arg3: any, callback: WorkerCallback): void; - (arg1: any, arg2: any, arg3: any, arg4: any, callback: WorkerCallback): void; -} - -type WorkerCallback = - | WorkerCallback0 - | WorkerCallback1 - | WorkerCallback2 - | WorkerCallback3 - | WorkerCallback4; - -type WorkerCallback0 = () => void; -type WorkerCallback1 = (arg1: any) => void; -type WorkerCallback2 = (arg1: any, arg2: any) => void; -type WorkerCallback3 = (arg1: any, arg2: any, arg3: any) => void; -type WorkerCallback4 = (arg1: any, arg2: any, arg3: any, arg4: any) => void; - -interface FarmOptions { - maxCallsPerWorker?: number - maxConcurrentWorkers?: number - maxConcurrentCallsPerWorker?: number - maxConcurrentCalls?: number - maxCallTime?: number - maxRetries?: number - autoStart?: boolean -} - -interface WorkerFarm { - (name: string): Workers; - (name: string, exportedMethods: string[]): Workers; - (options: FarmOptions, name: string): Workers; - (options: FarmOptions, name: string, exportedMethods: string[]): Workers; - - end: (workers: Workers) => void; -} - -declare module "worker-farm" { - const workerFarm: WorkerFarm; - export = workerFarm; -} diff --git a/node_modules/libcipm/node_modules/worker-farm/lib/child/index.js b/node_modules/libcipm/node_modules/worker-farm/lib/child/index.js deleted file mode 100644 index f91e08433..000000000 --- a/node_modules/libcipm/node_modules/worker-farm/lib/child/index.js +++ /dev/null @@ -1,52 +0,0 @@ -'use strict' - -let $module - -/* - let contextProto = this.context; - while (contextProto = Object.getPrototypeOf(contextProto)) { - completionGroups.push(Object.getOwnPropertyNames(contextProto)); - } -*/ - - -function handle (data) { - let idx = data.idx - , child = data.child - , method = data.method - , args = data.args - , callback = function () { - let _args = Array.prototype.slice.call(arguments) - if (_args[0] instanceof Error) { - let e = _args[0] - _args[0] = { - '$error' : '$error' - , 'type' : e.constructor.name - , 'message' : e.message - , 'stack' : e.stack - } - Object.keys(e).forEach(function(key) { - _args[0][key] = e[key] - }) - } - process.send({ idx: idx, child: child, args: _args }) - } - , exec - - if (method == null && typeof $module == 'function') - exec = $module - else if (typeof $module[method] == 'function') - exec = $module[method] - - if (!exec) - return console.error('NO SUCH METHOD:', method) - - exec.apply(null, args.concat([ callback ])) -} - - -process.on('message', function (data) { - if (!$module) return $module = require(data.module) - if (data == 'die') return process.exit(0) - handle(data) -}) diff --git a/node_modules/libcipm/node_modules/worker-farm/lib/farm.js b/node_modules/libcipm/node_modules/worker-farm/lib/farm.js deleted file mode 100644 index c77c95d2c..000000000 --- a/node_modules/libcipm/node_modules/worker-farm/lib/farm.js +++ /dev/null @@ -1,339 +0,0 @@ -'use strict' - -const DEFAULT_OPTIONS = { - maxCallsPerWorker : Infinity - , maxConcurrentWorkers : (require('os').cpus() || { length: 1 }).length - , maxConcurrentCallsPerWorker : 10 - , maxConcurrentCalls : Infinity - , maxCallTime : Infinity // exceed this and the whole worker is terminated - , maxRetries : Infinity - , forcedKillTime : 100 - , autoStart : false - } - -const extend = require('xtend') - , fork = require('./fork') - , TimeoutError = require('errno').create('TimeoutError') - , ProcessTerminatedError = require('errno').create('ProcessTerminatedError') - , MaxConcurrentCallsError = require('errno').create('MaxConcurrentCallsError') - - -function Farm (options, path) { - this.options = extend(DEFAULT_OPTIONS, options) - this.path = path - this.activeCalls = 0 -} - - -// make a handle to pass back in the form of an external API -Farm.prototype.mkhandle = function (method) { - return function () { - let args = Array.prototype.slice.call(arguments) - if (this.activeCalls >= this.options.maxConcurrentCalls) { - let err = new MaxConcurrentCallsError('Too many concurrent calls (' + this.activeCalls + ')') - if (typeof args[args.length - 1] == 'function') - return process.nextTick(args[args.length - 1].bind(null, err)) - throw err - } - this.addCall({ - method : method - , callback : args.pop() - , args : args - , retries : 0 - }) - }.bind(this) -} - - -// a constructor of sorts -Farm.prototype.setup = function (methods) { - let iface - if (!methods) { // single-function export - iface = this.mkhandle() - } else { // multiple functions on the export - iface = {} - methods.forEach(function (m) { - iface[m] = this.mkhandle(m) - }.bind(this)) - } - - this.searchStart = -1 - this.childId = -1 - this.children = {} - this.activeChildren = 0 - this.callQueue = [] - - if (this.options.autoStart) { - while (this.activeChildren < this.options.maxConcurrentWorkers) - this.startChild() - } - - return iface -} - - -// when a child exits, check if there are any outstanding jobs and requeue them -Farm.prototype.onExit = function (childId) { - // delay this to give any sends a chance to finish - setTimeout(function () { - let doQueue = false - if (this.children[childId] && this.children[childId].activeCalls) { - this.children[childId].calls.forEach(function (call, i) { - if (!call) return - else if (call.retries >= this.options.maxRetries) { - this.receive({ - idx : i - , child : childId - , args : [ new ProcessTerminatedError('cancel after ' + call.retries + ' retries!') ] - }) - } else { - call.retries++ - this.callQueue.unshift(call) - doQueue = true - } - }.bind(this)) - } - this.stopChild(childId) - doQueue && this.processQueue() - }.bind(this), 10) -} - - -// start a new worker -Farm.prototype.startChild = function () { - this.childId++ - - let forked = fork(this.path) - , id = this.childId - , c = { - send : forked.send - , child : forked.child - , calls : [] - , activeCalls : 0 - , exitCode : null - } - - forked.child.on('message', this.receive.bind(this)) - forked.child.once('exit', function (code) { - c.exitCode = code - this.onExit(id) - }.bind(this)) - - this.activeChildren++ - this.children[id] = c -} - - -// stop a worker, identified by id -Farm.prototype.stopChild = function (childId) { - let child = this.children[childId] - if (child) { - child.send('die') - setTimeout(function () { - if (child.exitCode === null) - child.child.kill('SIGKILL') - }, this.options.forcedKillTime).unref() - ;delete this.children[childId] - this.activeChildren-- - } -} - - -// called from a child process, the data contains information needed to -// look up the child and the original call so we can invoke the callback -Farm.prototype.receive = function (data) { - let idx = data.idx - , childId = data.child - , args = data.args - , child = this.children[childId] - , call - - if (!child) { - return console.error( - 'Worker Farm: Received message for unknown child. ' - + 'This is likely as a result of premature child death, ' - + 'the operation will have been re-queued.' - ) - } - - call = child.calls[idx] - if (!call) { - return console.error( - 'Worker Farm: Received message for unknown index for existing child. ' - + 'This should not happen!' - ) - } - - if (this.options.maxCallTime !== Infinity) - clearTimeout(call.timer) - - if (args[0] && args[0].$error == '$error') { - let e = args[0] - switch (e.type) { - case 'TypeError': args[0] = new TypeError(e.message); break - case 'RangeError': args[0] = new RangeError(e.message); break - case 'EvalError': args[0] = new EvalError(e.message); break - case 'ReferenceError': args[0] = new ReferenceError(e.message); break - case 'SyntaxError': args[0] = new SyntaxError(e.message); break - case 'URIError': args[0] = new URIError(e.message); break - default: args[0] = new Error(e.message) - } - args[0].type = e.type - args[0].stack = e.stack - - // Copy any custom properties to pass it on. - Object.keys(e).forEach(function(key) { - args[0][key] = e[key]; - }); - } - - process.nextTick(function () { - call.callback.apply(null, args) - }) - - ;delete child.calls[idx] - child.activeCalls-- - this.activeCalls-- - - if (child.calls.length >= this.options.maxCallsPerWorker - && !Object.keys(child.calls).length) { - // this child has finished its run, kill it - this.stopChild(childId) - } - - // allow any outstanding calls to be processed - this.processQueue() -} - - -Farm.prototype.childTimeout = function (childId) { - let child = this.children[childId] - , i - - if (!child) - return - - for (i in child.calls) { - this.receive({ - idx : i - , child : childId - , args : [ new TimeoutError('worker call timed out!') ] - }) - } - this.stopChild(childId) -} - - -// send a call to a worker, identified by id -Farm.prototype.send = function (childId, call) { - let child = this.children[childId] - , idx = child.calls.length - - child.calls.push(call) - child.activeCalls++ - this.activeCalls++ - - child.send({ - idx : idx - , child : childId - , method : call.method - , args : call.args - }) - - if (this.options.maxCallTime !== Infinity) { - call.timer = - setTimeout(this.childTimeout.bind(this, childId), this.options.maxCallTime) - } -} - - -// a list of active worker ids, in order, but the starting offset is -// shifted each time this method is called, so we work our way through -// all workers when handing out jobs -Farm.prototype.childKeys = function () { - let cka = Object.keys(this.children) - , cks - - if (this.searchStart >= cka.length - 1) - this.searchStart = 0 - else - this.searchStart++ - - cks = cka.splice(0, this.searchStart) - - return cka.concat(cks) -} - - -// Calls are added to a queue, this processes the queue and is called -// whenever there might be a chance to send more calls to the workers. -// The various options all impact on when we're able to send calls, -// they may need to be kept in a queue until a worker is ready. -Farm.prototype.processQueue = function () { - let cka, i = 0, childId - - if (!this.callQueue.length) - return this.ending && this.end() - - if (this.activeChildren < this.options.maxConcurrentWorkers) - this.startChild() - - for (cka = this.childKeys(); i < cka.length; i++) { - childId = +cka[i] - if (this.children[childId].activeCalls < this.options.maxConcurrentCallsPerWorker - && this.children[childId].calls.length < this.options.maxCallsPerWorker) { - - this.send(childId, this.callQueue.shift()) - if (!this.callQueue.length) - return this.ending && this.end() - } /*else { - console.log( - , this.children[childId].activeCalls < this.options.maxConcurrentCallsPerWorker - , this.children[childId].calls.length < this.options.maxCallsPerWorker - , this.children[childId].calls.length , this.options.maxCallsPerWorker) - }*/ - } - - if (this.ending) - this.end() -} - - -// add a new call to the call queue, then trigger a process of the queue -Farm.prototype.addCall = function (call) { - if (this.ending) - return this.end() // don't add anything new to the queue - this.callQueue.push(call) - this.processQueue() -} - - -// kills child workers when they're all done -Farm.prototype.end = function (callback) { - let complete = true - if (this.ending === false) - return - if (callback) - this.ending = callback - else if (this.ending == null) - this.ending = true - Object.keys(this.children).forEach(function (child) { - if (!this.children[child]) - return - if (!this.children[child].activeCalls) - this.stopChild(child) - else - complete = false - }.bind(this)) - - if (complete && typeof this.ending == 'function') { - process.nextTick(function () { - this.ending() - this.ending = false - }.bind(this)) - } -} - - -module.exports = Farm -module.exports.TimeoutError = TimeoutError diff --git a/node_modules/libcipm/node_modules/worker-farm/lib/fork.js b/node_modules/libcipm/node_modules/worker-farm/lib/fork.js deleted file mode 100644 index 46cf79b73..000000000 --- a/node_modules/libcipm/node_modules/worker-farm/lib/fork.js +++ /dev/null @@ -1,32 +0,0 @@ -'use strict' - -const childProcess = require('child_process') - , childModule = require.resolve('./child/index') - - -function fork (forkModule) { - // suppress --debug / --inspect flags while preserving others (like --harmony) - let filteredArgs = process.execArgv.filter(function (v) { - return !(/^--(debug|inspect)/).test(v) - }) - , child = childProcess.fork(childModule, process.argv, { - execArgv: filteredArgs - , env: process.env - , cwd: process.cwd() - }) - - child.on('error', function() { - // this *should* be picked up by onExit and the operation requeued - }) - - child.send({ module: forkModule }) - - // return a send() function for this child - return { - send : child.send.bind(child) - , child : child - } -} - - -module.exports = fork diff --git a/node_modules/libcipm/node_modules/worker-farm/lib/index.js b/node_modules/libcipm/node_modules/worker-farm/lib/index.js deleted file mode 100644 index 4df0902f8..000000000 --- a/node_modules/libcipm/node_modules/worker-farm/lib/index.js +++ /dev/null @@ -1,34 +0,0 @@ -'use strict' - -const Farm = require('./farm') - -let farms = [] // keep record of farms so we can end() them if required - - -function farm (options, path, methods) { - if (typeof options == 'string') { - methods = path - path = options - options = {} - } - - let f = new Farm(options, path) - , api = f.setup(methods) - - farms.push({ farm: f, api: api }) - - // return the public API - return api -} - - -function end (api, callback) { - for (let i = 0; i < farms.length; i++) - if (farms[i] && farms[i].api === api) - return farms[i].farm.end(callback) - process.nextTick(callback.bind(null, 'Worker farm not found!')) -} - - -module.exports = farm -module.exports.end = end
\ No newline at end of file diff --git a/node_modules/libcipm/node_modules/worker-farm/node_modules/.bin/errno b/node_modules/libcipm/node_modules/worker-farm/node_modules/.bin/errno deleted file mode 120000 index 5a98e539c..000000000 --- a/node_modules/libcipm/node_modules/worker-farm/node_modules/.bin/errno +++ /dev/null @@ -1 +0,0 @@ -../errno/cli.js
\ No newline at end of file diff --git a/node_modules/libcipm/node_modules/worker-farm/node_modules/errno/.travis.yml b/node_modules/libcipm/node_modules/worker-farm/node_modules/errno/.travis.yml deleted file mode 100644 index f996821c5..000000000 --- a/node_modules/libcipm/node_modules/worker-farm/node_modules/errno/.travis.yml +++ /dev/null @@ -1,11 +0,0 @@ -sudo: false - -language: node_js - -node_js: - - 9 - - 8 - - 7 - - 6 - - 5 - - 4 diff --git a/node_modules/libcipm/node_modules/worker-farm/node_modules/errno/README.md b/node_modules/libcipm/node_modules/worker-farm/node_modules/errno/README.md deleted file mode 100644 index a4d0fb542..000000000 --- a/node_modules/libcipm/node_modules/worker-farm/node_modules/errno/README.md +++ /dev/null @@ -1,145 +0,0 @@ -# node-errno - -> Better [libuv](https://github.com/libuv/libuv)/[Node.js](https://nodejs.org)/[io.js](https://iojs.org) error handling & reporting. Available in npm as *errno*. - -[](https://www.npmjs.com/package/errno) -[](http://travis-ci.org/rvagg/node-errno) -[](https://www.npmjs.com/package/errno) - -* [errno exposed](#errnoexposed) -* [Custom errors](#customerrors) - -<a name="errnoexposed"></a> -## errno exposed - -Ever find yourself needing more details about Node.js errors? Me too, so *node-errno* contains the errno mappings direct from libuv so you can use them in your code. - -**By errno:** - -```js -require('errno').errno[3] -// → { -// "errno": 3, -// "code": "EACCES", -// "description": "permission denied" -// } -``` - -**By code:** - -```js -require('errno').code.ENOTEMPTY -// → { -// "errno": 53, -// "code": "ENOTEMPTY", -// "description": "directory not empty" -// } -``` - -**Make your errors more descriptive:** - -```js -var errno = require('errno') - -function errmsg(err) { - var str = 'Error: ' - // if it's a libuv error then get the description from errno - if (errno.errno[err.errno]) - str += errno.errno[err.errno].description - else - str += err.message - - // if it's a `fs` error then it'll have a 'path' property - if (err.path) - str += ' [' + err.path + ']' - - return str -} - -var fs = require('fs') - -fs.readFile('thisisnotarealfile.txt', function (err, data) { - if (err) - console.log(errmsg(err)) -}) -``` - -**Use as a command line tool:** - -``` -~ $ errno 53 -{ - "errno": 53, - "code": "ENOTEMPTY", - "description": "directory not empty" -} -~ $ errno EROFS -{ - "errno": 56, - "code": "EROFS", - "description": "read-only file system" -} -~ $ errno foo -No such errno/code: "foo" -``` - -Supply no arguments for the full list. Error codes are processed case-insensitive. - -You will need to install with `npm install errno -g` if you want the `errno` command to be available without supplying a full path to the node_modules installation. - -<a name="customerrors"></a> -## Custom errors - -Use `errno.custom.createError()` to create custom `Error` objects to throw around in your Node.js library. Create error hierarchies so `instanceof` becomes a useful tool in tracking errors. Call-stack is correctly captured at the time you create an instance of the error object, plus a `cause` property will make available the original error object if you pass one in to the constructor. - -```js -var create = require('errno').custom.createError -var MyError = create('MyError') // inherits from Error -var SpecificError = create('SpecificError', MyError) // inherits from MyError -var OtherError = create('OtherError', MyError) - -// use them! -if (condition) throw new SpecificError('Eeek! Something bad happened') - -if (err) return callback(new OtherError(err)) -``` - -Also available is a `errno.custom.FilesystemError` with in-built access to errno properties: - -```js -fs.readFile('foo', function (err, data) { - if (err) return callback(new errno.custom.FilesystemError(err)) - // do something else -}) -``` - -The resulting error object passed through the callback will have the following properties: `code`, `errno`, `path` and `message` will contain a descriptive human-readable message. - -## Contributors - -* [bahamas10](https://github.com/bahamas10) (Dave Eddy) - Added CLI -* [ralphtheninja](https://github.com/ralphtheninja) (Lars-Magnus Skog) - -## Copyright & Licence - -*Copyright (c) 2012-2015 [Rod Vagg](https://github.com/rvagg) ([@rvagg](https://twitter.com/rvagg))* - -Made available under the MIT licence: - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is furnished -to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/node_modules/libcipm/node_modules/worker-farm/node_modules/errno/build.js b/node_modules/libcipm/node_modules/worker-farm/node_modules/errno/build.js deleted file mode 100755 index fce89260c..000000000 --- a/node_modules/libcipm/node_modules/worker-farm/node_modules/errno/build.js +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env node - -var request = require('request') - , fs = require('fs') - - , uvheadloc = 'https://raw.github.com/joyent/libuv/master/include/uv.h' - , defreg = /^\s*XX\(\s*([\-\d]+),\s*([A-Z]+),\s*"([^"]*)"\s*\)\s*\\?$/ - - -request(uvheadloc, function (err, response) { - if (err) - throw err - - var data, out - - data = response.body - .split('\n') - .map(function (line) { return line.match(defreg) }) - .filter(function (match) { return match }) - .map(function (match) { return { - errno: parseInt(match[1], 10) - , code: match[2] - , description: match[3] - }}) - - out = 'var all = module.exports.all = ' + JSON.stringify(data, 0, 1) + '\n\n' - - out += '\nmodule.exports.errno = {\n ' - + data.map(function (e, i) { - return '\'' + e.errno + '\': all[' + i + ']' - }).join('\n , ') - + '\n}\n\n' - - out += '\nmodule.exports.code = {\n ' - + data.map(function (e, i) { - return '\'' + e.code + '\': all[' + i + ']' - }).join('\n , ') - + '\n}\n\n' - - out += '\nmodule.exports.custom = require("./custom")(module.exports)\n' - - fs.writeFile('errno.js', out) -})
\ No newline at end of file diff --git a/node_modules/libcipm/node_modules/worker-farm/node_modules/errno/cli.js b/node_modules/libcipm/node_modules/worker-farm/node_modules/errno/cli.js deleted file mode 100755 index 61d179bbe..000000000 --- a/node_modules/libcipm/node_modules/worker-farm/node_modules/errno/cli.js +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env node - -var errno = require('./') - , arg = process.argv[2] - , data, code - -if (arg === undefined) { - console.log(JSON.stringify(errno.code, null, 2)) - process.exit(0) -} - -if ((code = +arg) == arg) - data = errno.errno[code] -else - data = errno.code[arg] || errno.code[arg.toUpperCase()] - -if (data) - console.log(JSON.stringify(data, null, 2)) -else { - console.error('No such errno/code: "' + arg + '"') - process.exit(1) -} diff --git a/node_modules/libcipm/node_modules/worker-farm/node_modules/errno/custom.js b/node_modules/libcipm/node_modules/worker-farm/node_modules/errno/custom.js deleted file mode 100644 index ca8c1d8dc..000000000 --- a/node_modules/libcipm/node_modules/worker-farm/node_modules/errno/custom.js +++ /dev/null @@ -1,57 +0,0 @@ -var prr = require('prr') - -function init (type, message, cause) { - if (!!message && typeof message != 'string') { - message = message.message || message.name - } - prr(this, { - type : type - , name : type - // can be passed just a 'cause' - , cause : typeof message != 'string' ? message : cause - , message : message - }, 'ewr') -} - -// generic prototype, not intended to be actually used - helpful for `instanceof` -function CustomError (message, cause) { - Error.call(this) - if (Error.captureStackTrace) - Error.captureStackTrace(this, this.constructor) - init.call(this, 'CustomError', message, cause) -} - -CustomError.prototype = new Error() - -function createError (errno, type, proto) { - var err = function (message, cause) { - init.call(this, type, message, cause) - //TODO: the specificity here is stupid, errno should be available everywhere - if (type == 'FilesystemError') { - this.code = this.cause.code - this.path = this.cause.path - this.errno = this.cause.errno - this.message = - (errno.errno[this.cause.errno] - ? errno.errno[this.cause.errno].description - : this.cause.message) - + (this.cause.path ? ' [' + this.cause.path + ']' : '') - } - Error.call(this) - if (Error.captureStackTrace) - Error.captureStackTrace(this, err) - } - err.prototype = !!proto ? new proto() : new CustomError() - return err -} - -module.exports = function (errno) { - var ce = function (type, proto) { - return createError(errno, type, proto) - } - return { - CustomError : CustomError - , FilesystemError : ce('FilesystemError') - , createError : ce - } -} diff --git a/node_modules/libcipm/node_modules/worker-farm/node_modules/errno/errno.js b/node_modules/libcipm/node_modules/worker-farm/node_modules/errno/errno.js deleted file mode 100644 index efb79d41b..000000000 --- a/node_modules/libcipm/node_modules/worker-farm/node_modules/errno/errno.js +++ /dev/null @@ -1,313 +0,0 @@ -var all = module.exports.all = [ - { - errno: -2, - code: 'ENOENT', - description: 'no such file or directory' - }, - { - errno: -1, - code: 'UNKNOWN', - description: 'unknown error' - }, - { - errno: 0, - code: 'OK', - description: 'success' - }, - { - errno: 1, - code: 'EOF', - description: 'end of file' - }, - { - errno: 2, - code: 'EADDRINFO', - description: 'getaddrinfo error' - }, - { - errno: 3, - code: 'EACCES', - description: 'permission denied' - }, - { - errno: 4, - code: 'EAGAIN', - description: 'resource temporarily unavailable' - }, - { - errno: 5, - code: 'EADDRINUSE', - description: 'address already in use' - }, - { - errno: 6, - code: 'EADDRNOTAVAIL', - description: 'address not available' - }, - { - errno: 7, - code: 'EAFNOSUPPORT', - description: 'address family not supported' - }, - { - errno: 8, - code: 'EALREADY', - description: 'connection already in progress' - }, - { - errno: 9, - code: 'EBADF', - description: 'bad file descriptor' - }, - { - errno: 10, - code: 'EBUSY', - description: 'resource busy or locked' - }, - { - errno: 11, - code: 'ECONNABORTED', - description: 'software caused connection abort' - }, - { - errno: 12, - code: 'ECONNREFUSED', - description: 'connection refused' - }, - { - errno: 13, - code: 'ECONNRESET', - description: 'connection reset by peer' - }, - { - errno: 14, - code: 'EDESTADDRREQ', - description: 'destination address required' - }, - { - errno: 15, - code: 'EFAULT', - description: 'bad address in system call argument' - }, - { - errno: 16, - code: 'EHOSTUNREACH', - description: 'host is unreachable' - }, - { - errno: 17, - code: 'EINTR', - description: 'interrupted system call' - }, - { - errno: 18, - code: 'EINVAL', - description: 'invalid argument' - }, - { - errno: 19, - code: 'EISCONN', - description: 'socket is already connected' - }, - { - errno: 20, - code: 'EMFILE', - description: 'too many open files' - }, - { - errno: 21, - code: 'EMSGSIZE', - description: 'message too long' - }, - { - errno: 22, - code: 'ENETDOWN', - description: 'network is down' - }, - { - errno: 23, - code: 'ENETUNREACH', - description: 'network is unreachable' - }, - { - errno: 24, - code: 'ENFILE', - description: 'file table overflow' - }, - { - errno: 25, - code: 'ENOBUFS', - description: 'no buffer space available' - }, - { - errno: 26, - code: 'ENOMEM', - description: 'not enough memory' - }, - { - errno: 27, - code: 'ENOTDIR', - description: 'not a directory' - }, - { - errno: 28, - code: 'EISDIR', - description: 'illegal operation on a directory' - }, - { - errno: 29, - code: 'ENONET', - description: 'machine is not on the network' - }, - { - errno: 31, - code: 'ENOTCONN', - description: 'socket is not connected' - }, - { - errno: 32, - code: 'ENOTSOCK', - description: 'socket operation on non-socket' - }, - { - errno: 33, - code: 'ENOTSUP', - description: 'operation not supported on socket' - }, - { - errno: 34, - code: 'ENOENT', - description: 'no such file or directory' - }, - { - errno: 35, - code: 'ENOSYS', - description: 'function not implemented' - }, - { - errno: 36, - code: 'EPIPE', - description: 'broken pipe' - }, - { - errno: 37, - code: 'EPROTO', - description: 'protocol error' - }, - { - errno: 38, - code: 'EPROTONOSUPPORT', - description: 'protocol not supported' - }, - { - errno: 39, - code: 'EPROTOTYPE', - description: 'protocol wrong type for socket' - }, - { - errno: 40, - code: 'ETIMEDOUT', - description: 'connection timed out' - }, - { - errno: 41, - code: 'ECHARSET', - description: 'invalid Unicode character' - }, - { - errno: 42, - code: 'EAIFAMNOSUPPORT', - description: 'address family for hostname not supported' - }, - { - errno: 44, - code: 'EAISERVICE', - description: 'servname not supported for ai_socktype' - }, - { - errno: 45, - code: 'EAISOCKTYPE', - description: 'ai_socktype not supported' - }, - { - errno: 46, - code: 'ESHUTDOWN', - description: 'cannot send after transport endpoint shutdown' - }, - { - errno: 47, - code: 'EEXIST', - description: 'file already exists' - }, - { - errno: 48, - code: 'ESRCH', - description: 'no such process' - }, - { - errno: 49, - code: 'ENAMETOOLONG', - description: 'name too long' - }, - { - errno: 50, - code: 'EPERM', - description: 'operation not permitted' - }, - { - errno: 51, - code: 'ELOOP', - description: 'too many symbolic links encountered' - }, - { - errno: 52, - code: 'EXDEV', - description: 'cross-device link not permitted' - }, - { - errno: 53, - code: 'ENOTEMPTY', - description: 'directory not empty' - }, - { - errno: 54, - code: 'ENOSPC', - description: 'no space left on device' - }, - { - errno: 55, - code: 'EIO', - description: 'i/o error' - }, - { - errno: 56, - code: 'EROFS', - description: 'read-only file system' - }, - { - errno: 57, - code: 'ENODEV', - description: 'no such device' - }, - { - errno: 58, - code: 'ESPIPE', - description: 'invalid seek' - }, - { - errno: 59, - code: 'ECANCELED', - description: 'operation canceled' - } -] - -module.exports.errno = {} -module.exports.code = {} - -all.forEach(function (error) { - module.exports.errno[error.errno] = error - module.exports.code[error.code] = error -}) - -module.exports.custom = require('./custom')(module.exports) -module.exports.create = module.exports.custom.createError diff --git a/node_modules/libcipm/node_modules/worker-farm/node_modules/errno/node_modules/prr/.npmignore b/node_modules/libcipm/node_modules/worker-farm/node_modules/errno/node_modules/prr/.npmignore deleted file mode 100644 index b512c09d4..000000000 --- a/node_modules/libcipm/node_modules/worker-farm/node_modules/errno/node_modules/prr/.npmignore +++ /dev/null @@ -1 +0,0 @@ -node_modules
\ No newline at end of file diff --git a/node_modules/libcipm/node_modules/worker-farm/node_modules/errno/node_modules/prr/.travis.yml b/node_modules/libcipm/node_modules/worker-farm/node_modules/errno/node_modules/prr/.travis.yml deleted file mode 100644 index 33dcbc3a8..000000000 --- a/node_modules/libcipm/node_modules/worker-farm/node_modules/errno/node_modules/prr/.travis.yml +++ /dev/null @@ -1,10 +0,0 @@ -language: node_js -node_js: - - 0.8 - - "0.10" -branches: - only: - - master -notifications: - email: - - rod@vagg.org
\ No newline at end of file diff --git a/node_modules/libcipm/node_modules/worker-farm/node_modules/errno/node_modules/prr/LICENSE.md b/node_modules/libcipm/node_modules/worker-farm/node_modules/errno/node_modules/prr/LICENSE.md deleted file mode 100644 index 29b95e39a..000000000 --- a/node_modules/libcipm/node_modules/worker-farm/node_modules/errno/node_modules/prr/LICENSE.md +++ /dev/null @@ -1,11 +0,0 @@ -The MIT License (MIT) -===================== - -Copyright (c) 2014 Rod Vagg ---------------------------- - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/node_modules/libcipm/node_modules/worker-farm/node_modules/errno/node_modules/prr/README.md b/node_modules/libcipm/node_modules/worker-farm/node_modules/errno/node_modules/prr/README.md deleted file mode 100644 index b93404823..000000000 --- a/node_modules/libcipm/node_modules/worker-farm/node_modules/errno/node_modules/prr/README.md +++ /dev/null @@ -1,47 +0,0 @@ -# prr [](http://travis-ci.org/rvagg/prr) - -An sensible alternative to `Object.defineProperty()`. Available in npm and Ender as **prr**. - -## Usage - -Set the property `'foo'` (`obj.foo`) to have the value `'bar'` with default options (`'enumerable'`, `'configurable'` and `'writable'` are all `false`): - -```js -prr(obj, 'foo', 'bar') -``` - -Adjust the default options: - -```js -prr(obj, 'foo', 'bar', { enumerable: true, writable: true }) -``` - -Do the same operation for multiple properties: - -```js -prr(obj, { one: 'one', two: 'two' }) -// or with options: -prr(obj, { one: 'one', two: 'two' }, { enumerable: true, writable: true }) -``` - -### Simplify! - -But obviously, having to write out the full options object makes it nearly as bad as the original `Object.defineProperty()` so we can simplify. - -As an alternative method we can use an options string where each character represents a option: `'e'=='enumerable'`, `'c'=='configurable'` and `'w'=='writable'`: - -```js -prr(obj, 'foo', 'bar', 'ew') // enumerable and writable but not configurable -// muliple properties: -prr(obj, { one: 'one', two: 'two' }, 'ewc') // configurable too -``` - -## Where can I use it? - -Anywhere! For pre-ES5 environments *prr* will simply fall-back to an `object[property] = value` so you can get close to what you want. - -*prr* is Ender-compatible so you can include it in your Ender build and `$.prr(...)` or `var prr = require('prr'); prr(...)`. - -## Licence - -prr is Copyright (c) 2013 Rod Vagg [@rvagg](https://twitter.com/rvagg) and licensed under the MIT licence. All rights not explicitly granted in the MIT license are reserved. See the included LICENSE.md file for more details. diff --git a/node_modules/libcipm/node_modules/worker-farm/node_modules/errno/node_modules/prr/package.json b/node_modules/libcipm/node_modules/worker-farm/node_modules/errno/node_modules/prr/package.json deleted file mode 100644 index ea188043a..000000000 --- a/node_modules/libcipm/node_modules/worker-farm/node_modules/errno/node_modules/prr/package.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "_from": "prr@~1.0.1", - "_id": "prr@1.0.1", - "_inBundle": false, - "_integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=", - "_location": "/libcipm/worker-farm/errno/prr", - "_phantomChildren": {}, - "_requested": { - "type": "range", - "registry": true, - "raw": "prr@~1.0.1", - "name": "prr", - "escapedName": "prr", - "rawSpec": "~1.0.1", - "saveSpec": null, - "fetchSpec": "~1.0.1" - }, - "_requiredBy": [ - "/libcipm/worker-farm/errno" - ], - "_resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", - "_shasum": "d3fc114ba06995a45ec6893f484ceb1d78f5f476", - "_spec": "prr@~1.0.1", - "_where": "/Users/zkat/Documents/code/npm/node_modules/libcipm/node_modules/worker-farm/node_modules/errno", - "author": { - "name": "Rod Vagg", - "email": "rod@vagg.org", - "url": "https://github.com/rvagg" - }, - "bugs": { - "url": "https://github.com/rvagg/prr/issues" - }, - "bundleDependencies": false, - "dependencies": {}, - "deprecated": false, - "description": "A better Object.defineProperty()", - "devDependencies": { - "tap": "*" - }, - "homepage": "https://github.com/rvagg/prr", - "keywords": [ - "property", - "properties", - "defineProperty", - "ender" - ], - "license": "MIT", - "main": "./prr.js", - "name": "prr", - "repository": { - "type": "git", - "url": "git+https://github.com/rvagg/prr.git" - }, - "scripts": { - "test": "node ./test.js" - }, - "version": "1.0.1" -} diff --git a/node_modules/libcipm/node_modules/worker-farm/node_modules/errno/node_modules/prr/prr.js b/node_modules/libcipm/node_modules/worker-farm/node_modules/errno/node_modules/prr/prr.js deleted file mode 100644 index 94f58628b..000000000 --- a/node_modules/libcipm/node_modules/worker-farm/node_modules/errno/node_modules/prr/prr.js +++ /dev/null @@ -1,63 +0,0 @@ -/*! - * prr - * (c) 2013 Rod Vagg <rod@vagg.org> - * https://github.com/rvagg/prr - * License: MIT - */ - -(function (name, context, definition) { - if (typeof module != 'undefined' && module.exports) - module.exports = definition() - else - context[name] = definition() -})('prr', this, function() { - - var setProperty = typeof Object.defineProperty == 'function' - ? function (obj, key, options) { - Object.defineProperty(obj, key, options) - return obj - } - : function (obj, key, options) { // < es5 - obj[key] = options.value - return obj - } - - , makeOptions = function (value, options) { - var oo = typeof options == 'object' - , os = !oo && typeof options == 'string' - , op = function (p) { - return oo - ? !!options[p] - : os - ? options.indexOf(p[0]) > -1 - : false - } - - return { - enumerable : op('enumerable') - , configurable : op('configurable') - , writable : op('writable') - , value : value - } - } - - , prr = function (obj, key, value, options) { - var k - - options = makeOptions(value, options) - - if (typeof key == 'object') { - for (k in key) { - if (Object.hasOwnProperty.call(key, k)) { - options.value = key[k] - setProperty(obj, k, options) - } - } - return obj - } - - return setProperty(obj, key, options) - } - - return prr -})
\ No newline at end of file diff --git a/node_modules/libcipm/node_modules/worker-farm/node_modules/errno/node_modules/prr/test.js b/node_modules/libcipm/node_modules/worker-farm/node_modules/errno/node_modules/prr/test.js deleted file mode 100644 index 5222e3073..000000000 --- a/node_modules/libcipm/node_modules/worker-farm/node_modules/errno/node_modules/prr/test.js +++ /dev/null @@ -1,169 +0,0 @@ -const test = require('tap').test - , prr = require('./') - -test('test prr(o, key, value) form', function (t) { - t.plan(2) - - var o = {} - prr(o, 'foo', 'bar') - t.equal(o.foo, 'bar', 'correct value') - t.deepEqual( - Object.getOwnPropertyDescriptor(o, 'foo') - , { - enumerable : false - , configurable : false - , writable : false - , value : 'bar' - } - , 'correct property descriptor' - ) - t.end() -}) - -test('test prr(o, { key: value }) form', function (t) { - t.plan(2) - - var o = {} - prr(o, { foo: 'bar' }) - - t.equal(o.foo, 'bar', 'correct value') - t.deepEqual( - Object.getOwnPropertyDescriptor(o, 'foo') - , { - enumerable : false - , configurable : false - , writable : false - , value : 'bar' - } - , 'correct property descriptor' - ) - t.end() -}) - -test('test multiple key:value pairs', function (t) { - var o = { foo: 'bar' } - - prr(o, { one: 'ONE', two: 'TWO', obj: { o: 'o' }}) - - t.deepEqual(o, { foo: 'bar' }, 'properties are not enumerable') - t.equal(o.one, 'ONE', 'correctly set property') - t.equal(o.two, 'TWO', 'correctly set property') - t.deepEqual(o.obj, { o: 'o' }, 'correctly set property') - - ;[ 'one', 'two', 'obj' ].forEach(function (p) { - t.deepEqual( - Object.getOwnPropertyDescriptor(o, p) - , { - enumerable : false - , configurable : false - , writable : false - , value : p == 'obj' ? { o: 'o' } : p.toUpperCase() - } - , 'correct property descriptor' - ) - }) - - t.end() -}) - -test('test descriptor options', function (t) { - var o = {} - - prr(o, 'foo', 'bar', { - enumerable : true - , configurable : false - }) - t.equal(o.foo, 'bar', 'correct value') - t.deepEqual( - Object.getOwnPropertyDescriptor(o, 'foo') - , { - enumerable : true - , configurable : false - , writable : false - , value : 'bar' - } - , 'correct property descriptor' - ) - - prr(o, 'foo2', 'bar2', { - enumerable : true - , configurable : true - , writable : false - }) - t.equal(o.foo2, 'bar2', 'correct value') - t.deepEqual( - Object.getOwnPropertyDescriptor(o, 'foo2') - , { - enumerable : true - , configurable : true - , writable : false - , value : 'bar2' - } - , 'correct property descriptor' - ) - - prr(o, 'foo3', 'bar3', { - enumerable : true - , configurable : true - , writable : true - }) - t.equal(o.foo3, 'bar3', 'correct value') - t.deepEqual( - Object.getOwnPropertyDescriptor(o, 'foo3') - , { - enumerable : true - , configurable : true - , writable : true - , value : 'bar3' - } - , 'correct property descriptor' - ) - - t.end() -}) - - -test('test descriptor options, string form', function (t) { - var o = {} - - prr(o, 'foo', 'bar', 'e') - t.equal(o.foo, 'bar', 'correct value') - t.deepEqual( - Object.getOwnPropertyDescriptor(o, 'foo') - , { - enumerable : true - , configurable : false - , writable : false - , value : 'bar' - } - , 'correct property descriptor' - ) - - prr(o, 'foo2', 'bar2', 'ec') - t.equal(o.foo2, 'bar2', 'correct value') - t.deepEqual( - Object.getOwnPropertyDescriptor(o, 'foo2') - , { - enumerable : true - , configurable : true - , writable : false - , value : 'bar2' - } - , 'correct property descriptor' - ) - - prr(o, 'foo3', 'bar3', 'ecw') - t.equal(o.foo3, 'bar3', 'correct value') - t.deepEqual( - Object.getOwnPropertyDescriptor(o, 'foo3') - , { - enumerable : true - , configurable : true - , writable : true - , value : 'bar3' - } - , 'correct property descriptor' - ) - - t.end() -}) diff --git a/node_modules/libcipm/node_modules/worker-farm/node_modules/errno/package.json b/node_modules/libcipm/node_modules/worker-farm/node_modules/errno/package.json deleted file mode 100644 index cdccb6388..000000000 --- a/node_modules/libcipm/node_modules/worker-farm/node_modules/errno/package.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "_from": "errno@~0.1.7", - "_id": "errno@0.1.7", - "_inBundle": false, - "_integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==", - "_location": "/libcipm/worker-farm/errno", - "_phantomChildren": {}, - "_requested": { - "type": "range", - "registry": true, - "raw": "errno@~0.1.7", - "name": "errno", - "escapedName": "errno", - "rawSpec": "~0.1.7", - "saveSpec": null, - "fetchSpec": "~0.1.7" - }, - "_requiredBy": [ - "/libcipm/worker-farm" - ], - "_resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz", - "_shasum": "4684d71779ad39af177e3f007996f7c67c852618", - "_spec": "errno@~0.1.7", - "_where": "/Users/zkat/Documents/code/npm/node_modules/libcipm/node_modules/worker-farm", - "authors": [ - "Rod Vagg @rvagg <rod@vagg.org> (https://github.com/rvagg)" - ], - "bin": { - "errno": "./cli.js" - }, - "bugs": { - "url": "https://github.com/rvagg/node-errno/issues" - }, - "bundleDependencies": false, - "dependencies": { - "prr": "~1.0.1" - }, - "deprecated": false, - "description": "libuv errno details exposed", - "devDependencies": { - "error-stack-parser": "^2.0.1", - "inherits": "^2.0.3", - "tape": "~4.8.0" - }, - "homepage": "https://github.com/rvagg/node-errno#readme", - "keywords": [ - "errors", - "errno", - "libuv" - ], - "license": "MIT", - "main": "errno.js", - "name": "errno", - "repository": { - "type": "git", - "url": "git+https://github.com/rvagg/node-errno.git" - }, - "scripts": { - "test": "node --use_strict test.js" - }, - "version": "0.1.7" -} diff --git a/node_modules/libcipm/node_modules/worker-farm/node_modules/errno/test.js b/node_modules/libcipm/node_modules/worker-farm/node_modules/errno/test.js deleted file mode 100644 index 1c046357b..000000000 --- a/node_modules/libcipm/node_modules/worker-farm/node_modules/errno/test.js +++ /dev/null @@ -1,88 +0,0 @@ -var test = require('tape') - , inherits = require('inherits') - , ErrorStackParser = require('error-stack-parser') - , errno = require('./') - -test('sanity checks', function (t) { - t.ok(errno.all, 'errno.all not found') - t.ok(errno.errno, 'errno.errno not found') - t.ok(errno.code, 'errno.code not found') - - t.equal(errno.all.length, 60, 'found ' + errno.all.length + ', expected 60') - t.equal(errno.errno['-1'], errno.all[1], 'errno -1 not second element') - - t.equal(errno.code['UNKNOWN'], errno.all[1], 'code UNKNOWN not second element') - - t.equal(errno.errno[1], errno.all[3], 'errno 1 not fourth element') - - t.equal(errno.code['EOF'], errno.all[3], 'code EOF not fourth element') - t.end() -}) - -test('custom errors', function (t) { - const Cust = errno.create('FooNotBarError') - const cust = new Cust('foo is not bar') - - t.equal(cust.name, 'FooNotBarError', 'correct custom name') - t.equal(cust.type, 'FooNotBarError', 'correct custom type') - t.equal(cust.message, 'foo is not bar', 'correct custom message') - t.notOk(cust.cause, 'no cause') - t.end() -}) - -test('callstack', function (t) { - const MyError = errno.create('MyError') - - function lastFunction (ErrorType, cb) { - process.nextTick(cb, new ErrorType('oh noes!')) - } - - function secondLastFunction (ErrorType, cb) { - lastFunction(ErrorType, cb) - } - - function testFrames (t) { - return function (err) { - const stack = ErrorStackParser.parse(err) - t.same(stack[0].functionName, 'lastFunction', 'last stack frame ok') - t.same(stack[1].functionName, 'secondLastFunction', 'second last stack frame ok') - t.end() - } - } - - t.test('custom error, default prototype', function (t) { - secondLastFunction(MyError, testFrames(t)) - }) - - t.test('custom error, custom prototype', function (t) { - const MyError2 = errno.create('MyError2', MyError) - secondLastFunction(MyError2, testFrames(t)) - }) - - t.test('custom error, using inheritance', function (t) { - const CustomError = errno.custom.CustomError - - function MyError3 (message, cause) { - CustomError.call(this, message, cause) - } - - inherits(MyError3, CustomError) - - secondLastFunction(MyError3, testFrames(t)) - }) -}) - -test('error without message', function (t) { - const Cust = errno.create('WriteError') - const cust = new Cust({ - code: 22, - message: '', - name: 'QuotaExceededError' - }) - - t.equal(cust.name, 'WriteError', 'correct custom name') - t.equal(cust.type, 'WriteError', 'correct custom type') - t.equal(cust.message, 'QuotaExceededError', 'message is the name') - t.notOk(cust.cause, 'no cause') - t.end() -}) diff --git a/node_modules/libcipm/node_modules/worker-farm/node_modules/xtend/.npmignore b/node_modules/libcipm/node_modules/worker-farm/node_modules/xtend/.npmignore deleted file mode 100644 index 3c3629e64..000000000 --- a/node_modules/libcipm/node_modules/worker-farm/node_modules/xtend/.npmignore +++ /dev/null @@ -1 +0,0 @@ -node_modules diff --git a/node_modules/libcipm/node_modules/worker-farm/node_modules/xtend/LICENCE b/node_modules/libcipm/node_modules/worker-farm/node_modules/xtend/LICENCE deleted file mode 100644 index 1a14b437e..000000000 --- a/node_modules/libcipm/node_modules/worker-farm/node_modules/xtend/LICENCE +++ /dev/null @@ -1,19 +0,0 @@ -Copyright (c) 2012-2014 Raynos. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/node_modules/libcipm/node_modules/worker-farm/node_modules/xtend/Makefile b/node_modules/libcipm/node_modules/worker-farm/node_modules/xtend/Makefile deleted file mode 100644 index d583fcf49..000000000 --- a/node_modules/libcipm/node_modules/worker-farm/node_modules/xtend/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -browser: - node ./support/compile - -.PHONY: browser
\ No newline at end of file diff --git a/node_modules/libcipm/node_modules/worker-farm/node_modules/xtend/README.md b/node_modules/libcipm/node_modules/worker-farm/node_modules/xtend/README.md deleted file mode 100644 index 093cb2978..000000000 --- a/node_modules/libcipm/node_modules/worker-farm/node_modules/xtend/README.md +++ /dev/null @@ -1,32 +0,0 @@ -# xtend - -[![browser support][3]][4] - -[](http://github.com/badges/stability-badges) - -Extend like a boss - -xtend is a basic utility library which allows you to extend an object by appending all of the properties from each object in a list. When there are identical properties, the right-most property takes precedence. - -## Examples - -```js -var extend = require("xtend") - -// extend returns a new object. Does not mutate arguments -var combination = extend({ - a: "a", - b: 'c' -}, { - b: "b" -}) -// { a: "a", b: "b" } -``` - -## Stability status: Locked - -## MIT Licenced - - - [3]: http://ci.testling.com/Raynos/xtend.png - [4]: http://ci.testling.com/Raynos/xtend diff --git a/node_modules/libcipm/node_modules/worker-farm/node_modules/xtend/immutable.js b/node_modules/libcipm/node_modules/worker-farm/node_modules/xtend/immutable.js deleted file mode 100644 index 94889c9de..000000000 --- a/node_modules/libcipm/node_modules/worker-farm/node_modules/xtend/immutable.js +++ /dev/null @@ -1,19 +0,0 @@ -module.exports = extend - -var hasOwnProperty = Object.prototype.hasOwnProperty; - -function extend() { - var target = {} - - for (var i = 0; i < arguments.length; i++) { - var source = arguments[i] - - for (var key in source) { - if (hasOwnProperty.call(source, key)) { - target[key] = source[key] - } - } - } - - return target -} diff --git a/node_modules/libcipm/node_modules/worker-farm/node_modules/xtend/mutable.js b/node_modules/libcipm/node_modules/worker-farm/node_modules/xtend/mutable.js deleted file mode 100644 index 72debede6..000000000 --- a/node_modules/libcipm/node_modules/worker-farm/node_modules/xtend/mutable.js +++ /dev/null @@ -1,17 +0,0 @@ -module.exports = extend - -var hasOwnProperty = Object.prototype.hasOwnProperty; - -function extend(target) { - for (var i = 1; i < arguments.length; i++) { - var source = arguments[i] - - for (var key in source) { - if (hasOwnProperty.call(source, key)) { - target[key] = source[key] - } - } - } - - return target -} diff --git a/node_modules/libcipm/node_modules/worker-farm/node_modules/xtend/package.json b/node_modules/libcipm/node_modules/worker-farm/node_modules/xtend/package.json deleted file mode 100644 index 71b59f039..000000000 --- a/node_modules/libcipm/node_modules/worker-farm/node_modules/xtend/package.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "_from": "xtend@~4.0.1", - "_id": "xtend@4.0.1", - "_inBundle": false, - "_integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=", - "_location": "/libcipm/worker-farm/xtend", - "_phantomChildren": {}, - "_requested": { - "type": "range", - "registry": true, - "raw": "xtend@~4.0.1", - "name": "xtend", - "escapedName": "xtend", - "rawSpec": "~4.0.1", - "saveSpec": null, - "fetchSpec": "~4.0.1" - }, - "_requiredBy": [ - "/libcipm/worker-farm" - ], - "_resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", - "_shasum": "a5c6d532be656e23db820efb943a1f04998d63af", - "_spec": "xtend@~4.0.1", - "_where": "/Users/zkat/Documents/code/npm/node_modules/libcipm/node_modules/worker-farm", - "author": { - "name": "Raynos", - "email": "raynos2@gmail.com" - }, - "bugs": { - "url": "https://github.com/Raynos/xtend/issues", - "email": "raynos2@gmail.com" - }, - "bundleDependencies": false, - "contributors": [ - { - "name": "Jake Verbaten" - }, - { - "name": "Matt Esch" - } - ], - "dependencies": {}, - "deprecated": false, - "description": "extend like a boss", - "devDependencies": { - "tape": "~1.1.0" - }, - "engines": { - "node": ">=0.4" - }, - "homepage": "https://github.com/Raynos/xtend", - "keywords": [ - "extend", - "merge", - "options", - "opts", - "object", - "array" - ], - "license": "MIT", - "main": "immutable", - "name": "xtend", - "repository": { - "type": "git", - "url": "git://github.com/Raynos/xtend.git" - }, - "scripts": { - "test": "node test" - }, - "testling": { - "files": "test.js", - "browsers": [ - "ie/7..latest", - "firefox/16..latest", - "firefox/nightly", - "chrome/22..latest", - "chrome/canary", - "opera/12..latest", - "opera/next", - "safari/5.1..latest", - "ipad/6.0..latest", - "iphone/6.0..latest" - ] - }, - "version": "4.0.1" -} diff --git a/node_modules/libcipm/node_modules/worker-farm/node_modules/xtend/test.js b/node_modules/libcipm/node_modules/worker-farm/node_modules/xtend/test.js deleted file mode 100644 index 093a2b061..000000000 --- a/node_modules/libcipm/node_modules/worker-farm/node_modules/xtend/test.js +++ /dev/null @@ -1,83 +0,0 @@ -var test = require("tape") -var extend = require("./") -var mutableExtend = require("./mutable") - -test("merge", function(assert) { - var a = { a: "foo" } - var b = { b: "bar" } - - assert.deepEqual(extend(a, b), { a: "foo", b: "bar" }) - assert.end() -}) - -test("replace", function(assert) { - var a = { a: "foo" } - var b = { a: "bar" } - - assert.deepEqual(extend(a, b), { a: "bar" }) - assert.end() -}) - -test("undefined", function(assert) { - var a = { a: undefined } - var b = { b: "foo" } - - assert.deepEqual(extend(a, b), { a: undefined, b: "foo" }) - assert.deepEqual(extend(b, a), { a: undefined, b: "foo" }) - assert.end() -}) - -test("handle 0", function(assert) { - var a = { a: "default" } - var b = { a: 0 } - - assert.deepEqual(extend(a, b), { a: 0 }) - assert.deepEqual(extend(b, a), { a: "default" }) - assert.end() -}) - -test("is immutable", function (assert) { - var record = {} - - extend(record, { foo: "bar" }) - assert.equal(record.foo, undefined) - assert.end() -}) - -test("null as argument", function (assert) { - var a = { foo: "bar" } - var b = null - var c = void 0 - - assert.deepEqual(extend(b, a, c), { foo: "bar" }) - assert.end() -}) - -test("mutable", function (assert) { - var a = { foo: "bar" } - - mutableExtend(a, { bar: "baz" }) - - assert.equal(a.bar, "baz") - assert.end() -}) - -test("null prototype", function(assert) { - var a = { a: "foo" } - var b = Object.create(null) - b.b = "bar"; - - assert.deepEqual(extend(a, b), { a: "foo", b: "bar" }) - assert.end() -}) - -test("null prototype mutable", function (assert) { - var a = { foo: "bar" } - var b = Object.create(null) - b.bar = "baz"; - - mutableExtend(a, b) - - assert.equal(a.bar, "baz") - assert.end() -}) diff --git a/node_modules/libcipm/node_modules/worker-farm/package.json b/node_modules/libcipm/node_modules/worker-farm/package.json deleted file mode 100644 index 1bbd3d004..000000000 --- a/node_modules/libcipm/node_modules/worker-farm/package.json +++ /dev/null @@ -1,60 +0,0 @@ -{ - "_from": "worker-farm@^1.5.4", - "_id": "worker-farm@1.5.4", - "_inBundle": false, - "_integrity": "sha512-ITyClEvcfv0ozqJl1vmWFWhvI+OIrkbInYqkEPE50wFPXj8J9Gd3FYf8+CkZJXJJsQBYe+2DvmoK9Zhx5w8W+w==", - "_location": "/libcipm/worker-farm", - "_phantomChildren": {}, - "_requested": { - "type": "range", - "registry": true, - "raw": "worker-farm@^1.5.4", - "name": "worker-farm", - "escapedName": "worker-farm", - "rawSpec": "^1.5.4", - "saveSpec": null, - "fetchSpec": "^1.5.4" - }, - "_requiredBy": [ - "/libcipm" - ], - "_resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.5.4.tgz", - "_shasum": "4debbe46b40edefcc717ebde74a90b1ae1e909a1", - "_spec": "worker-farm@^1.5.4", - "_where": "/Users/zkat/Documents/code/npm/node_modules/libcipm", - "authors": [ - "Rod Vagg @rvagg <rod@vagg.org> (https://github.com/rvagg)" - ], - "bugs": { - "url": "https://github.com/rvagg/node-worker-farm/issues" - }, - "bundleDependencies": false, - "dependencies": { - "errno": "~0.1.7", - "xtend": "~4.0.1" - }, - "deprecated": false, - "description": "Distribute processing tasks to child processes with an über-simple API and baked-in durability & custom concurrency options.", - "devDependencies": { - "tape": "~4.9.0" - }, - "homepage": "https://github.com/rvagg/node-worker-farm", - "keywords": [ - "worker", - "child", - "processing", - "farm" - ], - "license": "MIT", - "main": "./lib/index.js", - "name": "worker-farm", - "repository": { - "type": "git", - "url": "git+https://github.com/rvagg/node-worker-farm.git" - }, - "scripts": { - "test": "node ./tests/" - }, - "types": "./index.d.ts", - "version": "1.5.4" -} diff --git a/node_modules/libcipm/node_modules/worker-farm/tests/child.js b/node_modules/libcipm/node_modules/worker-farm/tests/child.js deleted file mode 100644 index 85e8f5789..000000000 --- a/node_modules/libcipm/node_modules/worker-farm/tests/child.js +++ /dev/null @@ -1,85 +0,0 @@ -'use strict' - -const fs = require('fs') -const started = Date.now() - - -module.exports = function (timeout, callback) { - callback = callback.bind(null, null, process.pid, Math.random(), timeout) - if (timeout) - return setTimeout(callback, timeout) - callback() -} - - -module.exports.args = function (callback) { - console.log(process.argv) - console.log(process.execArgv) - callback() -} - - -module.exports.run0 = function (callback) { - module.exports(0, callback) -} - - -module.exports.killable = function (id, callback) { - if (Math.random() < 0.5) - return process.exit(-1) - callback(null, id, process.pid) -} - - -module.exports.err = function (type, message, data, callback) { - if (typeof data == 'function') { - callback = data - data = null - } else { - let err = new Error(message) - Object.keys(data).forEach(function(key) { - err[key] = data[key] - }) - callback(err) - return - } - - if (type == 'TypeError') - return callback(new TypeError(message)) - callback(new Error(message)) -} - - -module.exports.block = function () { - while (true); -} - - -// use provided file path to save retries count among terminated workers -module.exports.stubborn = function (path, callback) { - function isOutdated(path) { - return ((new Date).getTime() - fs.statSync(path).mtime.getTime()) > 2000 - } - - // file may not be properly deleted, check if modified no earler than two seconds ago - if (!fs.existsSync(path) || isOutdated(path)) { - fs.writeFileSync(path, '1') - process.exit(-1) - } - - let retry = parseInt(fs.readFileSync(path, 'utf8')) - if (Number.isNaN(retry)) - return callback(new Error('file contents is not a number')) - - if (retry > 4) { - callback(null, 12) - } else { - fs.writeFileSync(path, String(retry + 1)) - process.exit(-1) - } -} - - -module.exports.uptime = function (callback) { - callback(null, Date.now() - started) -} diff --git a/node_modules/libcipm/node_modules/worker-farm/tests/debug.js b/node_modules/libcipm/node_modules/worker-farm/tests/debug.js deleted file mode 100644 index 6ffd44648..000000000 --- a/node_modules/libcipm/node_modules/worker-farm/tests/debug.js +++ /dev/null @@ -1,11 +0,0 @@ -'use strict' - -const workerFarm = require('../') - , workers = workerFarm(require.resolve('./child'), ['args']) - - -workers.args(function() { - workerFarm.end(workers) - console.log('FINISHED') - process.exit(0) -}) diff --git a/node_modules/libcipm/node_modules/worker-farm/tests/index.js b/node_modules/libcipm/node_modules/worker-farm/tests/index.js deleted file mode 100644 index 32d200ff7..000000000 --- a/node_modules/libcipm/node_modules/worker-farm/tests/index.js +++ /dev/null @@ -1,541 +0,0 @@ -'use strict' - -const tape = require('tape') - , child_process = require('child_process') - , workerFarm = require('../') - , childPath = require.resolve('./child') - , fs = require('fs') - -function uniq (ar) { - let a = [], i, j - o: for (i = 0; i < ar.length; ++i) { - for (j = 0; j < a.length; ++j) if (a[j] == ar[i]) continue o - a[a.length] = ar[i] - } - return a -} - - -// a child where module.exports = function ... -tape('simple, exports=function test', function (t) { - t.plan(4) - - let child = workerFarm(childPath) - child(0, function (err, pid, rnd) { - t.ok(pid > process.pid, 'pid makes sense') - t.ok(pid < process.pid + 500, 'pid makes sense') - t.ok(rnd >= 0 && rnd < 1, 'rnd result makes sense') - }) - - workerFarm.end(child, function () { - t.ok(true, 'workerFarm ended') - }) -}) - - -// a child where we have module.exports.fn = function ... -tape('simple, exports.fn test', function (t) { - t.plan(4) - - let child = workerFarm(childPath, [ 'run0' ]) - child.run0(function (err, pid, rnd) { - t.ok(pid > process.pid, 'pid makes sense') - t.ok(pid < process.pid + 500, 'pid makes sense') - t.ok(rnd >= 0 && rnd < 1, 'rnd result makes sense') - }) - - workerFarm.end(child, function () { - t.ok(true, 'workerFarm ended') - }) -}) - - -// use the returned pids to check that we're using a single child process -// when maxConcurrentWorkers = 1 -tape('single worker', function (t) { - t.plan(2) - - let child = workerFarm({ maxConcurrentWorkers: 1 }, childPath) - , pids = [] - , i = 10 - - while (i--) { - child(0, function (err, pid) { - pids.push(pid) - if (pids.length == 10) { - t.equal(1, uniq(pids).length, 'only a single process (by pid)') - } else if (pids.length > 10) - t.fail('too many callbacks!') - }) - } - - workerFarm.end(child, function () { - t.ok(true, 'workerFarm ended') - }) -}) - - -// use the returned pids to check that we're using two child processes -// when maxConcurrentWorkers = 2 -tape('two workers', function (t) { - t.plan(2) - - let child = workerFarm({ maxConcurrentWorkers: 2 }, childPath) - , pids = [] - , i = 10 - - while (i--) { - child(0, function (err, pid) { - pids.push(pid) - if (pids.length == 10) { - t.equal(2, uniq(pids).length, 'only two child processes (by pid)') - } else if (pids.length > 10) - t.fail('too many callbacks!') - }) - } - - workerFarm.end(child, function () { - t.ok(true, 'workerFarm ended') - }) -}) - - -// use the returned pids to check that we're using a child process per -// call when maxConcurrentWorkers = 10 -tape('many workers', function (t) { - t.plan(2) - - let child = workerFarm({ maxConcurrentWorkers: 10 }, childPath) - , pids = [] - , i = 10 - - while (i--) { - child(1, function (err, pid) { - pids.push(pid) - if (pids.length == 10) { - t.equal(10, uniq(pids).length, 'pids are all the same (by pid)') - } else if (pids.length > 10) - t.fail('too many callbacks!') - }) - } - - workerFarm.end(child, function () { - t.ok(true, 'workerFarm ended') - }) -}) - - -tape('auto start workers', function (t) { - let child = workerFarm({ maxConcurrentWorkers: 3, autoStart: true }, childPath, ['uptime']) - , pids = [] - , count = 5 - , i = count - , delay = 250 - - t.plan(count + 1) - - setTimeout(function() { - while (i--) - child.uptime(function (err, uptime) { - t.ok(uptime > 10, 'child has been up before the request (' + uptime + 'ms)') - }) - - workerFarm.end(child, function () { - t.ok(true, 'workerFarm ended') - }) - }, delay) -}) - - -// use the returned pids to check that we're using a child process per -// call when we set maxCallsPerWorker = 1 even when we have maxConcurrentWorkers = 1 -tape('single call per worker', function (t) { - t.plan(2) - - let child = workerFarm({ - maxConcurrentWorkers: 1 - , maxConcurrentCallsPerWorker: Infinity - , maxCallsPerWorker: 1 - , autoStart: true - }, childPath) - , pids = [] - , count = 25 - , i = count - - while (i--) { - child(0, function (err, pid) { - pids.push(pid) - if (pids.length == count) { - t.equal(count, uniq(pids).length, 'one process for each call (by pid)') - workerFarm.end(child, function () { - t.ok(true, 'workerFarm ended') - }) - } else if (pids.length > count) - t.fail('too many callbacks!') - }) - } -}) - - -// use the returned pids to check that we're using a child process per -// two-calls when we set maxCallsPerWorker = 2 even when we have maxConcurrentWorkers = 1 -tape('two calls per worker', function (t) { - t.plan(2) - - let child = workerFarm({ - maxConcurrentWorkers: 1 - , maxConcurrentCallsPerWorker: Infinity - , maxCallsPerWorker: 2 - , autoStart: true - }, childPath) - , pids = [] - , count = 20 - , i = count - - while (i--) { - child(0, function (err, pid) { - pids.push(pid) - if (pids.length == count) { - t.equal(count / 2, uniq(pids).length, 'one process for each call (by pid)') - workerFarm.end(child, function () { - t.ok(true, 'workerFarm ended') - }) - } else if (pids.length > count) - t.fail('too many callbacks!') - }) - } -}) - - -// use timing to confirm that one worker will process calls sequentially -tape('many concurrent calls', function (t) { - t.plan(2) - - let child = workerFarm({ - maxConcurrentWorkers: 1 - , maxConcurrentCallsPerWorker: Infinity - , maxCallsPerWorker: Infinity - , autoStart: true - }, childPath) - , defer = 200 - , count = 200 - , i = count - , cbc = 0 - - setTimeout(function () { - let start = Date.now() - - while (i--) { - child(defer, function () { - if (++cbc == count) { - let time = Date.now() - start - // upper-limit not tied to `count` at all - t.ok(time > defer && time < (defer * 2.5), 'processed tasks concurrently (' + time + 'ms)') - workerFarm.end(child, function () { - t.ok(true, 'workerFarm ended') - }) - } else if (cbc > count) - t.fail('too many callbacks!') - }) - } - }, 250) -}) - - -// use timing to confirm that one child processes calls sequentially with -// maxConcurrentCallsPerWorker = 1 -tape('single concurrent call', function (t) { - t.plan(2) - - let child = workerFarm({ - maxConcurrentWorkers: 1 - , maxConcurrentCallsPerWorker: 1 - , maxCallsPerWorker: Infinity - , autoStart: true - }, childPath) - , defer = 20 - , count = 100 - , i = count - , cbc = 0 - - setTimeout(function () { - let start = Date.now() - - while (i--) { - child(defer, function () { - if (++cbc == count) { - let time = Date.now() - start - // upper-limit tied closely to `count`, 1.3 is generous but accounts for all the timers - // coming back at the same time and the IPC overhead - t.ok(time > (defer * count) && time < (defer * count * 1.3), 'processed tasks sequentially (' + time + ')') - workerFarm.end(child, function () { - t.ok(true, 'workerFarm ended') - }) - } else if (cbc > count) - t.fail('too many callbacks!') - }) - } - }, 250) -}) - - -// use timing to confirm that one child processes *only* 5 calls concurrently -tape('multiple concurrent calls', function (t) { - t.plan(2) - - let callsPerWorker = 5 - , child = workerFarm({ - maxConcurrentWorkers: 1 - , maxConcurrentCallsPerWorker: callsPerWorker - , maxCallsPerWorker: Infinity - , autoStart: true - }, childPath) - , defer = 100 - , count = 100 - , i = count - , cbc = 0 - - setTimeout(function () { - let start = Date.now() - - while (i--) { - child(defer, function () { - if (++cbc == count) { - let time = Date.now() - start - // (defer * (count / callsPerWorker + 1)) - if precise it'd be count/callsPerWorker - // but accounting for IPC and other overhead, we need to give it a bit of extra time, - // hence the +1 - t.ok(time > (defer * 1.5) && time < (defer * (count / callsPerWorker + 1)), 'processed tasks concurrently (' + time + 'ms)') - workerFarm.end(child, function () { - t.ok(true, 'workerFarm ended') - }) - } else if (cbc > count) - t.fail('too many callbacks!') - }) - } - }, 250) -}) - - -// call a method that will die with a probability of 0.5 but expect that -// we'll get results for each of our calls anyway -tape('durability', function (t) { - t.plan(3) - - let child = workerFarm({ maxConcurrentWorkers: 2 }, childPath, [ 'killable' ]) - , ids = [] - , pids = [] - , count = 20 - , i = count - - while (i--) { - child.killable(i, function (err, id, pid) { - ids.push(id) - pids.push(pid) - if (ids.length == count) { - t.ok(uniq(pids).length > 2, 'processed by many (' + uniq(pids).length + ') workers, but got there in the end!') - t.ok(uniq(ids).length == count, 'received a single result for each unique call') - workerFarm.end(child, function () { - t.ok(true, 'workerFarm ended') - }) - } else if (ids.length > count) - t.fail('too many callbacks!') - }) - } -}) - - -// a callback provided to .end() can and will be called (uses "simple, exports=function test" to create a child) -tape('simple, end callback', function (t) { - t.plan(4) - - let child = workerFarm(childPath) - child(0, function (err, pid, rnd) { - t.ok(pid > process.pid, 'pid makes sense ' + pid + ' vs ' + process.pid) - t.ok(pid < process.pid + 500, 'pid makes sense ' + pid + ' vs ' + process.pid) - t.ok(rnd >= 0 && rnd < 1, 'rnd result makes sense') - }) - - workerFarm.end(child, function() { - t.pass('an .end() callback was successfully called') - }) -}) - - -tape('call timeout test', function (t) { - t.plan(3 + 3 + 4 + 4 + 4 + 3 + 1) - - let child = workerFarm({ maxCallTime: 250, maxConcurrentWorkers: 1 }, childPath) - - // should come back ok - child(50, function (err, pid, rnd) { - t.ok(pid > process.pid, 'pid makes sense ' + pid + ' vs ' + process.pid) - t.ok(pid < process.pid + 500, 'pid makes sense ' + pid + ' vs ' + process.pid) - t.ok(rnd > 0 && rnd < 1, 'rnd result makes sense ' + rnd) - }) - - // should come back ok - child(50, function (err, pid, rnd) { - t.ok(pid > process.pid, 'pid makes sense ' + pid + ' vs ' + process.pid) - t.ok(pid < process.pid + 500, 'pid makes sense ' + pid + ' vs ' + process.pid) - t.ok(rnd > 0 && rnd < 1, 'rnd result makes sense ' + rnd) - }) - - // should die - child(500, function (err, pid, rnd) { - t.ok(err, 'got an error') - t.equal(err.type, 'TimeoutError', 'correct error type') - t.ok(pid === undefined, 'no pid') - t.ok(rnd === undefined, 'no rnd') - }) - - // should die - child(1000, function (err, pid, rnd) { - t.ok(err, 'got an error') - t.equal(err.type, 'TimeoutError', 'correct error type') - t.ok(pid === undefined, 'no pid') - t.ok(rnd === undefined, 'no rnd') - }) - - // should die even though it is only a 100ms task, it'll get caught up - // in a dying worker - setTimeout(function () { - child(100, function (err, pid, rnd) { - t.ok(err, 'got an error') - t.equal(err.type, 'TimeoutError', 'correct error type') - t.ok(pid === undefined, 'no pid') - t.ok(rnd === undefined, 'no rnd') - }) - }, 200) - - // should be ok, new worker - setTimeout(function () { - child(50, function (err, pid, rnd) { - t.ok(pid > process.pid, 'pid makes sense ' + pid + ' vs ' + process.pid) - t.ok(pid < process.pid + 500, 'pid makes sense ' + pid + ' vs ' + process.pid) - t.ok(rnd > 0 && rnd < 1, 'rnd result makes sense ' + rnd) - }) - workerFarm.end(child, function () { - t.ok(true, 'workerFarm ended') - }) - }, 400) -}) - - -tape('test error passing', function (t) { - t.plan(10) - - let child = workerFarm(childPath, [ 'err' ]) - child.err('Error', 'this is an Error', function (err) { - t.ok(err instanceof Error, 'is an Error object') - t.equal('Error', err.type, 'correct type') - t.equal('this is an Error', err.message, 'correct message') - }) - child.err('TypeError', 'this is a TypeError', function (err) { - t.ok(err instanceof Error, 'is a TypeError object') - t.equal('TypeError', err.type, 'correct type') - t.equal('this is a TypeError', err.message, 'correct message') - }) - child.err('Error', 'this is an Error with custom props', {foo: 'bar', 'baz': 1}, function (err) { - t.ok(err instanceof Error, 'is an Error object') - t.equal(err.foo, 'bar', 'passes data') - t.equal(err.baz, 1, 'passes data') - }) - - workerFarm.end(child, function () { - t.ok(true, 'workerFarm ended') - }) -}) - - -tape('test maxConcurrentCalls', function (t) { - t.plan(10) - - let child = workerFarm({ maxConcurrentCalls: 5 }, childPath) - - child(50, function (err) { t.notOk(err, 'no error') }) - child(50, function (err) { t.notOk(err, 'no error') }) - child(50, function (err) { t.notOk(err, 'no error') }) - child(50, function (err) { t.notOk(err, 'no error') }) - child(50, function (err) { t.notOk(err, 'no error') }) - child(50, function (err) { - t.ok(err) - t.equal(err.type, 'MaxConcurrentCallsError', 'correct error type') - }) - child(50, function (err) { - t.ok(err) - t.equal(err.type, 'MaxConcurrentCallsError', 'correct error type') - }) - - workerFarm.end(child, function () { - t.ok(true, 'workerFarm ended') - }) -}) - - -// this test should not keep the process running! if the test process -// doesn't die then the problem is here -tape('test timeout kill', function (t) { - t.plan(3) - - let child = workerFarm({ maxCallTime: 250, maxConcurrentWorkers: 1 }, childPath, [ 'block' ]) - child.block(function (err) { - t.ok(err, 'got an error') - t.equal(err.type, 'TimeoutError', 'correct error type') - }) - - workerFarm.end(child, function () { - t.ok(true, 'workerFarm ended') - }) -}) - - -tape('test max retries after process terminate', function (t) { - t.plan(7) - - // temporary file is used to store the number of retries among terminating workers - let filepath1 = '.retries1' - let child1 = workerFarm({ maxConcurrentWorkers: 1, maxRetries: 5}, childPath, [ 'stubborn' ]) - child1.stubborn(filepath1, function (err, result) { - t.notOk(err, 'no error') - t.equal(result, 12, 'correct result') - }) - - workerFarm.end(child1, function () { - fs.unlinkSync(filepath1) - t.ok(true, 'workerFarm ended') - }) - - let filepath2 = '.retries2' - let child2 = workerFarm({ maxConcurrentWorkers: 1, maxRetries: 3}, childPath, [ 'stubborn' ]) - child2.stubborn(filepath2, function (err, result) { - t.ok(err, 'got an error') - t.equal(err.type, 'ProcessTerminatedError', 'correct error type') - t.equal(err.message, 'cancel after 3 retries!', 'correct message and number of retries') - }) - - workerFarm.end(child2, function () { - fs.unlinkSync(filepath2) - t.ok(true, 'workerFarm ended') - }) -}) - - -tape('ensure --debug/--inspect not propagated to children', function (t) { - t.plan(3) - - let script = __dirname + '/debug.js' - , debugArg = process.version.replace(/^v(\d+)\..*$/, '$1') >= 8 ? '--inspect' : '--debug=8881' - , child = child_process.spawn(process.execPath, [ debugArg, script ]) - , stdout = '' - - child.stdout.on('data', function (data) { - stdout += data.toString() - }) - - child.on('close', function (code) { - t.equal(code, 0, 'exited without error (' + code + ')') - t.ok(stdout.indexOf('FINISHED') > -1, 'process finished') - t.ok(stdout.indexOf('--debug') === -1, 'child does not receive debug flag') - }) -}) diff --git a/node_modules/libcipm/package.json b/node_modules/libcipm/package.json index e6ef0aaf8..9bc576455 100644 --- a/node_modules/libcipm/package.json +++ b/node_modules/libcipm/package.json @@ -1,33 +1,33 @@ { - "_from": "libcipm@latest", - "_id": "libcipm@1.6.0", + "_from": "libcipm@1.6.1", + "_id": "libcipm@1.6.1", "_inBundle": false, - "_integrity": "sha512-HpV3ibmHSAOiDVYIDOM2uDlfkkmglivsavGn6RwJDne+PjXeNQyHAwXddikfsPqxc0OP6GsHJwrwaxhCHZs8Dg==", + "_integrity": "sha512-11lxi+tniD0IckpExZSW9NKjc/T+c/p+3FXsLpeBONfU3aooS/vt0SznyaVgKw0L9CK5rDmVknuyOjGWqnTnIw==", "_location": "/libcipm", "_phantomChildren": { - "hosted-git-info": "2.5.0", + "hosted-git-info": "2.6.0", "osenv": "0.1.5", "semver": "5.5.0", "validate-npm-package-name": "3.0.0" }, "_requested": { - "type": "tag", + "type": "version", "registry": true, - "raw": "libcipm@latest", + "raw": "libcipm@1.6.1", "name": "libcipm", "escapedName": "libcipm", - "rawSpec": "latest", + "rawSpec": "1.6.1", "saveSpec": null, - "fetchSpec": "latest" + "fetchSpec": "1.6.1" }, "_requiredBy": [ "#USER", "/" ], - "_resolved": "https://registry.npmjs.org/libcipm/-/libcipm-1.6.0.tgz", - "_shasum": "3ca7cff31f148615a6aac2b14759de14a5688134", - "_spec": "libcipm@latest", - "_where": "/Users/zkat/Documents/code/npm", + "_resolved": "https://registry.npmjs.org/libcipm/-/libcipm-1.6.1.tgz", + "_shasum": "156c0efd3f091aa3cf53592a32d0f026d3605eff", + "_spec": "libcipm@1.6.1", + "_where": "/Users/rebecca/code/npm", "author": { "name": "Kat Marchán", "email": "kzm@sykosomatic.org" @@ -100,5 +100,5 @@ "update-coc": "weallbehave -o . && git add CODE_OF_CONDUCT.md && git commit -m 'docs(coc): updated CODE_OF_CONDUCT.md'", "update-contrib": "weallcontribute -o . && git add CONTRIBUTING.md && git commit -m 'docs(contributing): updated CONTRIBUTING.md'" }, - "version": "1.6.0" + "version": "1.6.1" } diff --git a/package-lock.json b/package-lock.json index c2e3732f3..4bfabb695 100644 --- a/package-lock.json +++ b/package-lock.json @@ -693,31 +693,31 @@ "integrity": "sha1-hN3Es3Bnm6i9TNz6TAa0PVcREUc=" }, "libcipm": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/libcipm/-/libcipm-1.6.0.tgz", - "integrity": "sha512-HpV3ibmHSAOiDVYIDOM2uDlfkkmglivsavGn6RwJDne+PjXeNQyHAwXddikfsPqxc0OP6GsHJwrwaxhCHZs8Dg==", + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/libcipm/-/libcipm-1.6.1.tgz", + "integrity": "sha512-11lxi+tniD0IckpExZSW9NKjc/T+c/p+3FXsLpeBONfU3aooS/vt0SznyaVgKw0L9CK5rDmVknuyOjGWqnTnIw==", "requires": { "bin-links": "1.1.0", "bluebird": "3.5.1", "find-npm-prefix": "1.0.2", "graceful-fs": "4.1.11", - "lock-verify": "2.0.0", + "lock-verify": "^2.0.0", "npm-lifecycle": "2.0.1", - "npm-logical-tree": "1.2.1", + "npm-logical-tree": "^1.2.1", "npm-package-arg": "6.0.0", "pacote": "7.6.1", - "protoduck": "5.0.0", + "protoduck": "^5.0.0", "read-package-json": "2.0.13", "rimraf": "2.6.2", "worker-farm": "1.5.4" }, "dependencies": { "lock-verify": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/lock-verify/-/lock-verify-2.0.0.tgz", - "integrity": "sha512-ZK+fx1rQBBvyRp12tPgKaMrKlxv+72hO+QCAvdW8BGwKx/Jn3wVD7GooG2ftF80W29hfj+R1o0tTI8m6/pl1Mw==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/lock-verify/-/lock-verify-2.0.1.tgz", + "integrity": "sha512-y6aTtefBUKCVfAZcWf9pyfxQJutjvPuoARNKphNY6j8HkFrONOISWpre/bsV3KrEbbh6gyKmOvu3j0fMZfKbZg==", "requires": { - "npm-package-arg": "5.1.2", + "npm-package-arg": "^5.1.2", "semver": "5.5.0" }, "dependencies": { @@ -744,7 +744,7 @@ "resolved": "https://registry.npmjs.org/protoduck/-/protoduck-5.0.0.tgz", "integrity": "sha512-agsGWD8/RZrS4ga6v82Fxb0RHIS2RZnbsSue6A9/MBRhB/jcqOANAMNrqM9900b8duj+Gx+T/JMy5IowDoO/hQ==", "requires": { - "genfun": "4.0.1" + "genfun": "^4.0.1" }, "dependencies": { "genfun": { @@ -753,37 +753,6 @@ "integrity": "sha1-7RAEHy5KfxsKOEZtF6XD4n3x38E=" } } - }, - "worker-farm": { - "version": "1.5.4", - "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.5.4.tgz", - "integrity": "sha512-ITyClEvcfv0ozqJl1vmWFWhvI+OIrkbInYqkEPE50wFPXj8J9Gd3FYf8+CkZJXJJsQBYe+2DvmoK9Zhx5w8W+w==", - "requires": { - "errno": "0.1.7", - "xtend": "4.0.1" - }, - "dependencies": { - "errno": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz", - "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==", - "requires": { - "prr": "1.0.1" - }, - "dependencies": { - "prr": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", - "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=" - } - } - }, - "xtend": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", - "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=" - } - } } } }, diff --git a/package.json b/package.json index 82ab4e500..c08328fdb 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "is-cidr": "~1.0.0", "json-parse-better-errors": "^1.0.1", "lazy-property": "~1.0.0", - "libcipm": "^1.6.0", + "libcipm": "^1.6.1", "libnpx": "^10.0.1", "lockfile": "~1.0.3", "lodash._baseuniq": "~4.6.0", |