updated electron due to a security update
This commit is contained in:
+2
-2
@@ -6,10 +6,10 @@ case `uname` in
|
||||
esac
|
||||
|
||||
if [ -x "$basedir/node" ]; then
|
||||
"$basedir/node" "$basedir/../rc/index.js" "$@"
|
||||
"$basedir/node" "$basedir/../rc/cli.js" "$@"
|
||||
ret=$?
|
||||
else
|
||||
node "$basedir/../rc/index.js" "$@"
|
||||
node "$basedir/../rc/cli.js" "$@"
|
||||
ret=$?
|
||||
fi
|
||||
exit $ret
|
||||
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
@IF EXIST "%~dp0\node.exe" (
|
||||
"%~dp0\node.exe" "%~dp0\..\rc\index.js" %*
|
||||
"%~dp0\node.exe" "%~dp0\..\rc\cli.js" %*
|
||||
) ELSE (
|
||||
@SETLOCAL
|
||||
@SET PATHEXT=%PATHEXT:;.JS;=;%
|
||||
node "%~dp0\..\rc\index.js" %*
|
||||
node "%~dp0\..\rc\cli.js" %*
|
||||
)
|
||||
+3
-3
@@ -5,12 +5,12 @@
|
||||
This package contains type definitions for Node.js (http://nodejs.org/).
|
||||
|
||||
# Details
|
||||
Files were exported from https://www.github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/node/v7
|
||||
Files were exported from https://www.github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/node/v8
|
||||
|
||||
Additional Details
|
||||
* Last updated: Fri, 05 Jan 2018 01:29:19 GMT
|
||||
* Last updated: Wed, 17 Jan 2018 22:17:28 GMT
|
||||
* Dependencies: none
|
||||
* Global values: Buffer, NodeJS, SlowBuffer, Symbol, __dirname, __filename, clearImmediate, clearInterval, clearTimeout, console, exports, global, module, process, require, setImmediate, setInterval, setTimeout
|
||||
|
||||
# Credits
|
||||
These definitions were written by Microsoft TypeScript <http://typescriptlang.org>, DefinitelyTyped <https://github.com/DefinitelyTyped/DefinitelyTyped>, Parambir Singh <https://github.com/parambirs>, Christian Vaagland Tellnes <https://github.com/tellnes>, Wilco Bakker <https://github.com/WilcoBakker>, Sebastian Silbermann <https://github.com/eps1lon>.
|
||||
These definitions were written by Microsoft TypeScript <http://typescriptlang.org>, DefinitelyTyped <https://github.com/DefinitelyTyped/DefinitelyTyped>, Parambir Singh <https://github.com/parambirs>, Christian Vaagland Tellnes <https://github.com/tellnes>, Wilco Bakker <https://github.com/WilcoBakker>, Nicolas Voigt <https://github.com/octo-sniffle>, Chigozirim C. <https://github.com/smac89>, Flarna <https://github.com/Flarna>, Mariusz Wiktorczyk <https://github.com/mwiktorczyk>, wwwy3y3 <https://github.com/wwwy3y3>, Deividas Bakanas <https://github.com/DeividasBakanas>, Kelvin Jin <https://github.com/kjin>, Alvis HT Tang <https://github.com/alvis>, Oliver Joseph Ash <https://github.com/OliverJAsh>, Sebastian Silbermann <https://github.com/eps1lon>, Hannes Magnusson <https://github.com/Hannes-Magnusson-CK>, Alberto Schiabel <https://github.com/jkomyno>.
|
||||
|
||||
+3408
-730
File diff suppressed because it is too large
Load Diff
+55
-11
@@ -1,27 +1,27 @@
|
||||
{
|
||||
"_from": "@types/node@^7.0.18",
|
||||
"_id": "@types/node@7.0.52",
|
||||
"_from": "@types/node@^8.0.24",
|
||||
"_id": "@types/node@8.5.9",
|
||||
"_inBundle": false,
|
||||
"_integrity": "sha512-jjpyQsKGsOF/wUElNjfPULk+d8PKvJOIXk3IUeBYYmNCy5dMWfrI+JiixYNw8ppKOlcRwWTXFl0B+i5oGrf95Q==",
|
||||
"_integrity": "sha512-s+c3AjymyAccTI4hcgNFK4mToH8l+hyPDhu4LIkn71lRy56FLijGu00fyLgldjM/846Pmk9N4KFUs2P8GDs0pA==",
|
||||
"_location": "/@types/node",
|
||||
"_phantomChildren": {},
|
||||
"_requested": {
|
||||
"type": "range",
|
||||
"registry": true,
|
||||
"raw": "@types/node@^7.0.18",
|
||||
"raw": "@types/node@^8.0.24",
|
||||
"name": "@types/node",
|
||||
"escapedName": "@types%2fnode",
|
||||
"scope": "@types",
|
||||
"rawSpec": "^7.0.18",
|
||||
"rawSpec": "^8.0.24",
|
||||
"saveSpec": null,
|
||||
"fetchSpec": "^7.0.18"
|
||||
"fetchSpec": "^8.0.24"
|
||||
},
|
||||
"_requiredBy": [
|
||||
"/electron"
|
||||
],
|
||||
"_resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.52.tgz",
|
||||
"_shasum": "8990d3350375542b0c21a83cd0331e6a8fc86716",
|
||||
"_spec": "@types/node@^7.0.18",
|
||||
"_resolved": "https://registry.npmjs.org/@types/node/-/node-8.5.9.tgz",
|
||||
"_shasum": "7155cfb4ae405bca4dd8df1a214c339e939109bf",
|
||||
"_spec": "@types/node@^8.0.24",
|
||||
"_where": "C:\\Users\\Katy\\documentit\\node_modules\\electron",
|
||||
"bundleDependencies": false,
|
||||
"contributors": [
|
||||
@@ -45,9 +45,53 @@
|
||||
"name": "Wilco Bakker",
|
||||
"url": "https://github.com/WilcoBakker"
|
||||
},
|
||||
{
|
||||
"name": "Nicolas Voigt",
|
||||
"url": "https://github.com/octo-sniffle"
|
||||
},
|
||||
{
|
||||
"name": "Chigozirim C.",
|
||||
"url": "https://github.com/smac89"
|
||||
},
|
||||
{
|
||||
"name": "Flarna",
|
||||
"url": "https://github.com/Flarna"
|
||||
},
|
||||
{
|
||||
"name": "Mariusz Wiktorczyk",
|
||||
"url": "https://github.com/mwiktorczyk"
|
||||
},
|
||||
{
|
||||
"name": "wwwy3y3",
|
||||
"url": "https://github.com/wwwy3y3"
|
||||
},
|
||||
{
|
||||
"name": "Deividas Bakanas",
|
||||
"url": "https://github.com/DeividasBakanas"
|
||||
},
|
||||
{
|
||||
"name": "Kelvin Jin",
|
||||
"url": "https://github.com/kjin"
|
||||
},
|
||||
{
|
||||
"name": "Alvis HT Tang",
|
||||
"url": "https://github.com/alvis"
|
||||
},
|
||||
{
|
||||
"name": "Oliver Joseph Ash",
|
||||
"url": "https://github.com/OliverJAsh"
|
||||
},
|
||||
{
|
||||
"name": "Sebastian Silbermann",
|
||||
"url": "https://github.com/eps1lon"
|
||||
},
|
||||
{
|
||||
"name": "Hannes Magnusson",
|
||||
"url": "https://github.com/Hannes-Magnusson-CK"
|
||||
},
|
||||
{
|
||||
"name": "Alberto Schiabel",
|
||||
"url": "https://github.com/jkomyno"
|
||||
}
|
||||
],
|
||||
"dependencies": {},
|
||||
@@ -62,6 +106,6 @@
|
||||
},
|
||||
"scripts": {},
|
||||
"typeScriptVersion": "2.0",
|
||||
"typesPublisherContentHash": "2e151fe36bb3ba9e7d088aefece77c2a7007ba552d3a23f8b06d542daeb5e99a",
|
||||
"version": "7.0.52"
|
||||
"typesPublisherContentHash": "6609190e866fb6835d0ff0ca871ebad022c9b8dfe3bccc8bccd1fca32ae7ab7e",
|
||||
"version": "8.5.9"
|
||||
}
|
||||
|
||||
+428
-1
@@ -9206,6 +9206,184 @@ OTHER DEALINGS IN THE SOFTWARE.
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="product">
|
||||
<span class="title">FreeType</span>
|
||||
<a class="show" href="#">show license</a>
|
||||
<span class="homepage"><a href="http://www.freetype.org/">homepage</a></span>
|
||||
<div class="licence">
|
||||
<pre> The FreeType Project LICENSE
|
||||
----------------------------
|
||||
|
||||
2006-Jan-27
|
||||
|
||||
Copyright 1996-2002, 2006 by
|
||||
David Turner, Robert Wilhelm, and Werner Lemberg
|
||||
|
||||
|
||||
|
||||
Introduction
|
||||
============
|
||||
|
||||
The FreeType Project is distributed in several archive packages;
|
||||
some of them may contain, in addition to the FreeType font engine,
|
||||
various tools and contributions which rely on, or relate to, the
|
||||
FreeType Project.
|
||||
|
||||
This license applies to all files found in such packages, and
|
||||
which do not fall under their own explicit license. The license
|
||||
affects thus the FreeType font engine, the test programs,
|
||||
documentation and makefiles, at the very least.
|
||||
|
||||
This license was inspired by the BSD, Artistic, and IJG
|
||||
(Independent JPEG Group) licenses, which all encourage inclusion
|
||||
and use of free software in commercial and freeware products
|
||||
alike. As a consequence, its main points are that:
|
||||
|
||||
o We don't promise that this software works. However, we will be
|
||||
interested in any kind of bug reports. (`as is' distribution)
|
||||
|
||||
o You can use this software for whatever you want, in parts or
|
||||
full form, without having to pay us. (`royalty-free' usage)
|
||||
|
||||
o You may not pretend that you wrote this software. If you use
|
||||
it, or only parts of it, in a program, you must acknowledge
|
||||
somewhere in your documentation that you have used the
|
||||
FreeType code. (`credits')
|
||||
|
||||
We specifically permit and encourage the inclusion of this
|
||||
software, with or without modifications, in commercial products.
|
||||
We disclaim all warranties covering The FreeType Project and
|
||||
assume no liability related to The FreeType Project.
|
||||
|
||||
|
||||
Finally, many people asked us for a preferred form for a
|
||||
credit/disclaimer to use in compliance with this license. We thus
|
||||
encourage you to use the following text:
|
||||
|
||||
"""
|
||||
Portions of this software are copyright © <year> The FreeType
|
||||
Project (www.freetype.org). All rights reserved.
|
||||
"""
|
||||
|
||||
Please replace <year> with the value from the FreeType version you
|
||||
actually use.
|
||||
|
||||
|
||||
Legal Terms
|
||||
===========
|
||||
|
||||
0. Definitions
|
||||
--------------
|
||||
|
||||
Throughout this license, the terms `package', `FreeType Project',
|
||||
and `FreeType archive' refer to the set of files originally
|
||||
distributed by the authors (David Turner, Robert Wilhelm, and
|
||||
Werner Lemberg) as the `FreeType Project', be they named as alpha,
|
||||
beta or final release.
|
||||
|
||||
`You' refers to the licensee, or person using the project, where
|
||||
`using' is a generic term including compiling the project's source
|
||||
code as well as linking it to form a `program' or `executable'.
|
||||
This program is referred to as `a program using the FreeType
|
||||
engine'.
|
||||
|
||||
This license applies to all files distributed in the original
|
||||
FreeType Project, including all source code, binaries and
|
||||
documentation, unless otherwise stated in the file in its
|
||||
original, unmodified form as distributed in the original archive.
|
||||
If you are unsure whether or not a particular file is covered by
|
||||
this license, you must contact us to verify this.
|
||||
|
||||
The FreeType Project is copyright (C) 1996-2000 by David Turner,
|
||||
Robert Wilhelm, and Werner Lemberg. All rights reserved except as
|
||||
specified below.
|
||||
|
||||
1. No Warranty
|
||||
--------------
|
||||
|
||||
THE FREETYPE PROJECT IS PROVIDED `AS IS' WITHOUT WARRANTY OF ANY
|
||||
KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
PURPOSE. IN NO EVENT WILL ANY OF THE AUTHORS OR COPYRIGHT HOLDERS
|
||||
BE LIABLE FOR ANY DAMAGES CAUSED BY THE USE OR THE INABILITY TO
|
||||
USE, OF THE FREETYPE PROJECT.
|
||||
|
||||
2. Redistribution
|
||||
-----------------
|
||||
|
||||
This license grants a worldwide, royalty-free, perpetual and
|
||||
irrevocable right and license to use, execute, perform, compile,
|
||||
display, copy, create derivative works of, distribute and
|
||||
sublicense the FreeType Project (in both source and object code
|
||||
forms) and derivative works thereof for any purpose; and to
|
||||
authorize others to exercise some or all of the rights granted
|
||||
herein, subject to the following conditions:
|
||||
|
||||
o Redistribution of source code must retain this license file
|
||||
(`FTL.TXT') unaltered; any additions, deletions or changes to
|
||||
the original files must be clearly indicated in accompanying
|
||||
documentation. The copyright notices of the unaltered,
|
||||
original files must be preserved in all copies of source
|
||||
files.
|
||||
|
||||
o Redistribution in binary form must provide a disclaimer that
|
||||
states that the software is based in part of the work of the
|
||||
FreeType Team, in the distribution documentation. We also
|
||||
encourage you to put an URL to the FreeType web page in your
|
||||
documentation, though this isn't mandatory.
|
||||
|
||||
These conditions apply to any software derived from or based on
|
||||
the FreeType Project, not just the unmodified files. If you use
|
||||
our work, you must acknowledge us. However, no fee need be paid
|
||||
to us.
|
||||
|
||||
3. Advertising
|
||||
--------------
|
||||
|
||||
Neither the FreeType authors and contributors nor you shall use
|
||||
the name of the other for commercial, advertising, or promotional
|
||||
purposes without specific prior written permission.
|
||||
|
||||
We suggest, but do not require, that you use one or more of the
|
||||
following phrases to refer to this software in your documentation
|
||||
or advertising materials: `FreeType Project', `FreeType Engine',
|
||||
`FreeType library', or `FreeType Distribution'.
|
||||
|
||||
As you have not signed this license, you are not required to
|
||||
accept it. However, as the FreeType Project is copyrighted
|
||||
material, only this license, or another one contracted with the
|
||||
authors, grants you the right to use, distribute, and modify it.
|
||||
Therefore, by using, distributing, or modifying the FreeType
|
||||
Project, you indicate that you understand and accept all the terms
|
||||
of this license.
|
||||
|
||||
4. Contacts
|
||||
-----------
|
||||
|
||||
There are two mailing lists related to FreeType:
|
||||
|
||||
o freetype@nongnu.org
|
||||
|
||||
Discusses general use and applications of FreeType, as well as
|
||||
future and wanted additions to the library and distribution.
|
||||
If you are looking for support, start in this list if you
|
||||
haven't found anything to help you in the documentation.
|
||||
|
||||
o freetype-devel@nongnu.org
|
||||
|
||||
Discusses bugs, as well as engine internals, design issues,
|
||||
specific licenses, porting, etc.
|
||||
|
||||
Our home page can be found at
|
||||
|
||||
http://www.freetype.org
|
||||
|
||||
|
||||
--- end of FTL.TXT ---
|
||||
</pre>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="product">
|
||||
<span class="title">GifPlayer Animated GIF Library</span>
|
||||
<a class="show" href="#">show license</a>
|
||||
@@ -21536,7 +21714,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
===
|
||||
|
||||
Some of the benchmark data in util/zippy/testdata is licensed differently:
|
||||
Some of the benchmark data in testdata/ is licensed differently:
|
||||
|
||||
- fireworks.jpeg is Copyright 2013 Steinar H. Gunderson, and
|
||||
is licensed under the Creative Commons Attribution 3.0 license
|
||||
@@ -26260,6 +26438,44 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="product">
|
||||
<span class="title">gestures</span>
|
||||
<a class="show" href="#">show license</a>
|
||||
<span class="homepage"><a href="https://chromium.googlesource.com/chromiumos/platform/gestures">homepage</a></span>
|
||||
<div class="licence">
|
||||
<pre>gestures/LICENSE
|
||||
|
||||
// Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
|
||||
//
|
||||
// Redistribution and use in source and binary forms, with or without
|
||||
// modification, are permitted provided that the following conditions are
|
||||
// met:
|
||||
//
|
||||
// * Redistributions of source code must retain the above copyright
|
||||
// notice, this list of conditions and the following disclaimer.
|
||||
// * Redistributions in binary form must reproduce the above
|
||||
// copyright notice, this list of conditions and the following disclaimer
|
||||
// in the documentation and/or other materials provided with the
|
||||
// distribution.
|
||||
// * Neither the name of Google Inc. nor the names of its
|
||||
// contributors may be used to endorse or promote products derived from
|
||||
// this software without specific prior written permission.
|
||||
//
|
||||
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
</pre>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="product">
|
||||
<span class="title">google-glog's symbolization library</span>
|
||||
<a class="show" href="#">show license</a>
|
||||
@@ -28299,6 +28515,217 @@ May 26, 2016
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="product">
|
||||
<span class="title">libprotobuf-mutator</span>
|
||||
<a class="show" href="#">show license</a>
|
||||
<span class="homepage"><a href="https://github.com/google/libprotobuf-mutator">homepage</a></span>
|
||||
<div class="licence">
|
||||
<pre>
|
||||
Apache License
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
|
||||
1. Definitions.
|
||||
|
||||
"License" shall mean the terms and conditions for use, reproduction,
|
||||
and distribution as defined by Sections 1 through 9 of this document.
|
||||
|
||||
"Licensor" shall mean the copyright owner or entity authorized by
|
||||
the copyright owner that is granting the License.
|
||||
|
||||
"Legal Entity" shall mean the union of the acting entity and all
|
||||
other entities that control, are controlled by, or are under common
|
||||
control with that entity. For the purposes of this definition,
|
||||
"control" means (i) the power, direct or indirect, to cause the
|
||||
direction or management of such entity, whether by contract or
|
||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||
|
||||
"You" (or "Your") shall mean an individual or Legal Entity
|
||||
exercising permissions granted by this License.
|
||||
|
||||
"Source" form shall mean the preferred form for making modifications,
|
||||
including but not limited to software source code, documentation
|
||||
source, and configuration files.
|
||||
|
||||
"Object" form shall mean any form resulting from mechanical
|
||||
transformation or translation of a Source form, including but
|
||||
not limited to compiled object code, generated documentation,
|
||||
and conversions to other media types.
|
||||
|
||||
"Work" shall mean the work of authorship, whether in Source or
|
||||
Object form, made available under the License, as indicated by a
|
||||
copyright notice that is included in or attached to the work
|
||||
(an example is provided in the Appendix below).
|
||||
|
||||
"Derivative Works" shall mean any work, whether in Source or Object
|
||||
form, that is based on (or derived from) the Work and for which the
|
||||
editorial revisions, annotations, elaborations, or other modifications
|
||||
represent, as a whole, an original work of authorship. For the purposes
|
||||
of this License, Derivative Works shall not include works that remain
|
||||
separable from, or merely link (or bind by name) to the interfaces of,
|
||||
the Work and Derivative Works thereof.
|
||||
|
||||
"Contribution" shall mean any work of authorship, including
|
||||
the original version of the Work and any modifications or additions
|
||||
to that Work or Derivative Works thereof, that is intentionally
|
||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||
or by an individual or Legal Entity authorized to submit on behalf of
|
||||
the copyright owner. For the purposes of this definition, "submitted"
|
||||
means any form of electronic, verbal, or written communication sent
|
||||
to the Licensor or its representatives, including but not limited to
|
||||
communication on electronic mailing lists, source code control systems,
|
||||
and issue tracking systems that are managed by, or on behalf of, the
|
||||
Licensor for the purpose of discussing and improving the Work, but
|
||||
excluding communication that is conspicuously marked or otherwise
|
||||
designated in writing by the copyright owner as "Not a Contribution."
|
||||
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||
on behalf of whom a Contribution has been received by Licensor and
|
||||
subsequently incorporated within the Work.
|
||||
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
copyright license to reproduce, prepare Derivative Works of,
|
||||
publicly display, publicly perform, sublicense, and distribute the
|
||||
Work and such Derivative Works in Source or Object form.
|
||||
|
||||
3. Grant of Patent License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
(except as stated in this section) patent license to make, have made,
|
||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||
where such license applies only to those patent claims licensable
|
||||
by such Contributor that are necessarily infringed by their
|
||||
Contribution(s) alone or by combination of their Contribution(s)
|
||||
with the Work to which such Contribution(s) was submitted. If You
|
||||
institute patent litigation against any entity (including a
|
||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||
or a Contribution incorporated within the Work constitutes direct
|
||||
or contributory patent infringement, then any patent licenses
|
||||
granted to You under this License for that Work shall terminate
|
||||
as of the date such litigation is filed.
|
||||
|
||||
4. Redistribution. You may reproduce and distribute copies of the
|
||||
Work or Derivative Works thereof in any medium, with or without
|
||||
modifications, and in Source or Object form, provided that You
|
||||
meet the following conditions:
|
||||
|
||||
(a) You must give any other recipients of the Work or
|
||||
Derivative Works a copy of this License; and
|
||||
|
||||
(b) You must cause any modified files to carry prominent notices
|
||||
stating that You changed the files; and
|
||||
|
||||
(c) You must retain, in the Source form of any Derivative Works
|
||||
that You distribute, all copyright, patent, trademark, and
|
||||
attribution notices from the Source form of the Work,
|
||||
excluding those notices that do not pertain to any part of
|
||||
the Derivative Works; and
|
||||
|
||||
(d) If the Work includes a "NOTICE" text file as part of its
|
||||
distribution, then any Derivative Works that You distribute must
|
||||
include a readable copy of the attribution notices contained
|
||||
within such NOTICE file, excluding those notices that do not
|
||||
pertain to any part of the Derivative Works, in at least one
|
||||
of the following places: within a NOTICE text file distributed
|
||||
as part of the Derivative Works; within the Source form or
|
||||
documentation, if provided along with the Derivative Works; or,
|
||||
within a display generated by the Derivative Works, if and
|
||||
wherever such third-party notices normally appear. The contents
|
||||
of the NOTICE file are for informational purposes only and
|
||||
do not modify the License. You may add Your own attribution
|
||||
notices within Derivative Works that You distribute, alongside
|
||||
or as an addendum to the NOTICE text from the Work, provided
|
||||
that such additional attribution notices cannot be construed
|
||||
as modifying the License.
|
||||
|
||||
You may add Your own copyright statement to Your modifications and
|
||||
may provide additional or different license terms and conditions
|
||||
for use, reproduction, or distribution of Your modifications, or
|
||||
for any such Derivative Works as a whole, provided Your use,
|
||||
reproduction, and distribution of the Work otherwise complies with
|
||||
the conditions stated in this License.
|
||||
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||
any Contribution intentionally submitted for inclusion in the Work
|
||||
by You to the Licensor shall be under the terms and conditions of
|
||||
this License, without any additional terms or conditions.
|
||||
Notwithstanding the above, nothing herein shall supersede or modify
|
||||
the terms of any separate license agreement you may have executed
|
||||
with Licensor regarding such Contributions.
|
||||
|
||||
6. Trademarks. This License does not grant permission to use the trade
|
||||
names, trademarks, service marks, or product names of the Licensor,
|
||||
except as required for reasonable and customary use in describing the
|
||||
origin of the Work and reproducing the content of the NOTICE file.
|
||||
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||
agreed to in writing, Licensor provides the Work (and each
|
||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
implied, including, without limitation, any warranties or conditions
|
||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||
appropriateness of using or redistributing the Work and assume any
|
||||
risks associated with Your exercise of permissions under this License.
|
||||
|
||||
8. Limitation of Liability. In no event and under no legal theory,
|
||||
whether in tort (including negligence), contract, or otherwise,
|
||||
unless required by applicable law (such as deliberate and grossly
|
||||
negligent acts) or agreed to in writing, shall any Contributor be
|
||||
liable to You for damages, including any direct, indirect, special,
|
||||
incidental, or consequential damages of any character arising as a
|
||||
result of this License or out of the use or inability to use the
|
||||
Work (including but not limited to damages for loss of goodwill,
|
||||
work stoppage, computer failure or malfunction, or any and all
|
||||
other commercial damages or losses), even if such Contributor
|
||||
has been advised of the possibility of such damages.
|
||||
|
||||
9. Accepting Warranty or Additional Liability. While redistributing
|
||||
the Work or Derivative Works thereof, You may choose to offer,
|
||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||
or other liability obligations and/or rights consistent with this
|
||||
License. However, in accepting such obligations, You may act only
|
||||
on Your own behalf and on Your sole responsibility, not on behalf
|
||||
of any other Contributor, and only if You agree to indemnify,
|
||||
defend, and hold each Contributor harmless for any liability
|
||||
incurred by, or claims asserted against, such Contributor by reason
|
||||
of your accepting any such warranty or additional liability.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
APPENDIX: How to apply the Apache License to your work.
|
||||
|
||||
To apply the Apache License to your work, attach the following
|
||||
boilerplate notice, with the fields enclosed by brackets "[]"
|
||||
replaced with your own identifying information. (Don't include
|
||||
the brackets!) The text should be enclosed in the appropriate
|
||||
comment syntax for the file format. We also recommend that a
|
||||
file or class name and description of purpose be included on the
|
||||
same "printed page" as the copyright notice for easier
|
||||
identification within third-party archives.
|
||||
|
||||
Copyright [yyyy] [name of copyright owner]
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
</pre>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="product">
|
||||
<span class="title">libsecret</span>
|
||||
<a class="show" href="#">show license</a>
|
||||
|
||||
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
+2989
-4134
File diff suppressed because it is too large
Load Diff
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
+1
-1
@@ -1 +1 @@
|
||||
v1.7.10
|
||||
v1.8.1
|
||||
BIN
Binary file not shown.
+314
-21
@@ -1,4 +1,4 @@
|
||||
// Type definitions for Electron 1.7.10
|
||||
// Type definitions for Electron 1.8.1
|
||||
// Project: http://electron.atom.io/
|
||||
// Definitions by: The Electron Team <https://github.com/electron/electron>
|
||||
// Definitions: https://github.com/electron/electron-typescript-definitions
|
||||
@@ -157,6 +157,46 @@ declare namespace Electron {
|
||||
hasVisibleWindows: boolean) => void): this;
|
||||
removeListener(event: 'activate', listener: (event: Event,
|
||||
hasVisibleWindows: boolean) => void): this;
|
||||
/**
|
||||
* Emitted during Handoff after an activity from this device was successfully
|
||||
* resumed on another one.
|
||||
*/
|
||||
on(event: 'activity-was-continued', listener: (event: Event,
|
||||
/**
|
||||
* A string identifying the activity. Maps to .
|
||||
*/
|
||||
type: string,
|
||||
/**
|
||||
* Contains app-specific state stored by the activity.
|
||||
*/
|
||||
userInfo: any) => void): this;
|
||||
once(event: 'activity-was-continued', listener: (event: Event,
|
||||
/**
|
||||
* A string identifying the activity. Maps to .
|
||||
*/
|
||||
type: string,
|
||||
/**
|
||||
* Contains app-specific state stored by the activity.
|
||||
*/
|
||||
userInfo: any) => void): this;
|
||||
addListener(event: 'activity-was-continued', listener: (event: Event,
|
||||
/**
|
||||
* A string identifying the activity. Maps to .
|
||||
*/
|
||||
type: string,
|
||||
/**
|
||||
* Contains app-specific state stored by the activity.
|
||||
*/
|
||||
userInfo: any) => void): this;
|
||||
removeListener(event: 'activity-was-continued', listener: (event: Event,
|
||||
/**
|
||||
* A string identifying the activity. Maps to .
|
||||
*/
|
||||
type: string,
|
||||
/**
|
||||
* Contains app-specific state stored by the activity.
|
||||
*/
|
||||
userInfo: any) => void): this;
|
||||
/**
|
||||
* Emitted before the application starts closing its windows. Calling
|
||||
* event.preventDefault() will prevent the default behaviour, which is terminating
|
||||
@@ -286,6 +326,46 @@ declare namespace Electron {
|
||||
* Contains app-specific state stored by the activity on another device.
|
||||
*/
|
||||
userInfo: any) => void): this;
|
||||
/**
|
||||
* Emitted during Handoff when an activity from a different device fails to be
|
||||
* resumed.
|
||||
*/
|
||||
on(event: 'continue-activity-error', listener: (event: Event,
|
||||
/**
|
||||
* A string identifying the activity. Maps to .
|
||||
*/
|
||||
type: string,
|
||||
/**
|
||||
* A string with the error's localized description.
|
||||
*/
|
||||
error: string) => void): this;
|
||||
once(event: 'continue-activity-error', listener: (event: Event,
|
||||
/**
|
||||
* A string identifying the activity. Maps to .
|
||||
*/
|
||||
type: string,
|
||||
/**
|
||||
* A string with the error's localized description.
|
||||
*/
|
||||
error: string) => void): this;
|
||||
addListener(event: 'continue-activity-error', listener: (event: Event,
|
||||
/**
|
||||
* A string identifying the activity. Maps to .
|
||||
*/
|
||||
type: string,
|
||||
/**
|
||||
* A string with the error's localized description.
|
||||
*/
|
||||
error: string) => void): this;
|
||||
removeListener(event: 'continue-activity-error', listener: (event: Event,
|
||||
/**
|
||||
* A string identifying the activity. Maps to .
|
||||
*/
|
||||
type: string,
|
||||
/**
|
||||
* A string with the error's localized description.
|
||||
*/
|
||||
error: string) => void): this;
|
||||
/**
|
||||
* Emitted when the gpu process crashes or is killed.
|
||||
*/
|
||||
@@ -410,6 +490,49 @@ declare namespace Electron {
|
||||
url: string,
|
||||
certificateList: Certificate[],
|
||||
callback: (certificate?: Certificate) => void) => void): this;
|
||||
/**
|
||||
* Emitted when Handoff is about to be resumed on another device. If you need to
|
||||
* update the state to be transferred, you should call event.preventDefault()
|
||||
* immediatelly, construct a new userInfo dictionary and call
|
||||
* app.updateCurrentActiviy() in a timely manner. Otherwise the operation will fail
|
||||
* and continue-activity-error will be called.
|
||||
*/
|
||||
on(event: 'update-activity-state', listener: (event: Event,
|
||||
/**
|
||||
* A string identifying the activity. Maps to .
|
||||
*/
|
||||
type: string,
|
||||
/**
|
||||
* Contains app-specific state stored by the activity.
|
||||
*/
|
||||
userInfo: any) => void): this;
|
||||
once(event: 'update-activity-state', listener: (event: Event,
|
||||
/**
|
||||
* A string identifying the activity. Maps to .
|
||||
*/
|
||||
type: string,
|
||||
/**
|
||||
* Contains app-specific state stored by the activity.
|
||||
*/
|
||||
userInfo: any) => void): this;
|
||||
addListener(event: 'update-activity-state', listener: (event: Event,
|
||||
/**
|
||||
* A string identifying the activity. Maps to .
|
||||
*/
|
||||
type: string,
|
||||
/**
|
||||
* Contains app-specific state stored by the activity.
|
||||
*/
|
||||
userInfo: any) => void): this;
|
||||
removeListener(event: 'update-activity-state', listener: (event: Event,
|
||||
/**
|
||||
* A string identifying the activity. Maps to .
|
||||
*/
|
||||
type: string,
|
||||
/**
|
||||
* Contains app-specific state stored by the activity.
|
||||
*/
|
||||
userInfo: any) => void): this;
|
||||
/**
|
||||
* Emitted when a new webContents is created.
|
||||
*/
|
||||
@@ -421,6 +544,31 @@ declare namespace Electron {
|
||||
webContents: WebContents) => void): this;
|
||||
removeListener(event: 'web-contents-created', listener: (event: Event,
|
||||
webContents: WebContents) => void): this;
|
||||
/**
|
||||
* Emitted during Handoff before an activity from a different device wants to be
|
||||
* resumed. You should call event.preventDefault() if you want to handle this
|
||||
* event.
|
||||
*/
|
||||
on(event: 'will-continue-activity', listener: (event: Event,
|
||||
/**
|
||||
* A string identifying the activity. Maps to .
|
||||
*/
|
||||
type: string) => void): this;
|
||||
once(event: 'will-continue-activity', listener: (event: Event,
|
||||
/**
|
||||
* A string identifying the activity. Maps to .
|
||||
*/
|
||||
type: string) => void): this;
|
||||
addListener(event: 'will-continue-activity', listener: (event: Event,
|
||||
/**
|
||||
* A string identifying the activity. Maps to .
|
||||
*/
|
||||
type: string) => void): this;
|
||||
removeListener(event: 'will-continue-activity', listener: (event: Event,
|
||||
/**
|
||||
* A string identifying the activity. Maps to .
|
||||
*/
|
||||
type: string) => void): this;
|
||||
/**
|
||||
* Emitted when the application has finished basic startup. On Windows and Linux,
|
||||
* the will-finish-launching event is the same as the ready event; on macOS, this
|
||||
@@ -501,13 +649,13 @@ declare namespace Electron {
|
||||
* Fetches a path's associated icon. On Windows, there a 2 kinds of icons: On Linux
|
||||
* and macOS, icons depend on the application associated with file mime type.
|
||||
*/
|
||||
getFileIcon(path: string, options: FileIconOptions, callback: (error: Error, icon: NativeImage) => void): void;
|
||||
getFileIcon(path: string, callback: (error: Error, icon: NativeImage) => void): void;
|
||||
/**
|
||||
* Fetches a path's associated icon. On Windows, there a 2 kinds of icons: On Linux
|
||||
* and macOS, icons depend on the application associated with file mime type.
|
||||
*/
|
||||
getFileIcon(path: string, callback: (error: Error, icon: NativeImage) => void): void;
|
||||
getGpuFeatureStatus(): GPUFeatureStatus;
|
||||
getFileIcon(path: string, options: FileIconOptions, callback: (error: Error, icon: NativeImage) => void): void;
|
||||
getGPUFeatureStatus(): GPUFeatureStatus;
|
||||
getJumpListSettings(): JumpListSettings;
|
||||
/**
|
||||
* Note: When distributing your packaged app, you have to also ship the locales
|
||||
@@ -544,6 +692,10 @@ declare namespace Electron {
|
||||
* net_error_list.
|
||||
*/
|
||||
importCertificate(options: ImportCertificateOptions, callback: (result: number) => void): void;
|
||||
/**
|
||||
* Invalidates the current Handoff user activity.
|
||||
*/
|
||||
invalidateCurrentActivity(type: string): void;
|
||||
isAccessibilitySupportEnabled(): boolean;
|
||||
/**
|
||||
* This method checks if the current executable is the default handler for a
|
||||
@@ -555,6 +707,7 @@ declare namespace Electron {
|
||||
* the Windows Registry and LSCopyDefaultHandlerForURLScheme internally.
|
||||
*/
|
||||
isDefaultProtocolClient(protocol: string, path?: string, args?: string[]): boolean;
|
||||
isInApplicationsFolder(): boolean;
|
||||
isReady(): boolean;
|
||||
isUnityRunning(): boolean;
|
||||
/**
|
||||
@@ -578,6 +731,16 @@ declare namespace Electron {
|
||||
* instance starts:
|
||||
*/
|
||||
makeSingleInstance(callback: (argv: string[], workingDirectory: string) => void): boolean;
|
||||
/**
|
||||
* No confirmation dialog will be presented by default, if you wish to allow the
|
||||
* user to confirm the operation you may do so using the dialog API. NOTE: This
|
||||
* method throws errors if anything other than the user causes the move to fail.
|
||||
* For instance if the user cancels the authorization dialog this method returns
|
||||
* false. If we fail to perform the copy then this method will throw an error.
|
||||
* The message in the error should be informative and tell you exactly what went
|
||||
* wrong
|
||||
*/
|
||||
moveToApplicationsFolder(): boolean;
|
||||
/**
|
||||
* Try to close all windows. The before-quit event will be emitted first. If all
|
||||
* windows are successfully closed, the will-quit event will be emitted and by
|
||||
@@ -615,6 +778,15 @@ declare namespace Electron {
|
||||
* .plist file. See the Apple docs for more details.
|
||||
*/
|
||||
setAboutPanelOptions(options: AboutPanelOptionsOptions): void;
|
||||
/**
|
||||
* Manually enables Chrome's accessibility support, allowing to expose
|
||||
* accessibility switch to users in application settings.
|
||||
* https://www.chromium.org/developers/design-documents/accessibility for more
|
||||
* details. Disabled by default. Note: Rendering accessibility tree can
|
||||
* significantly affect the performance of your app. It should not be enabled by
|
||||
* default.
|
||||
*/
|
||||
setAccessibilitySupportEnabled(enabled: boolean): void;
|
||||
/**
|
||||
* Changes the Application User Model ID to id.
|
||||
*/
|
||||
@@ -694,6 +866,11 @@ declare namespace Electron {
|
||||
* them.
|
||||
*/
|
||||
show(): void;
|
||||
/**
|
||||
* Updates the current activity if its type matches type, merging the entries from
|
||||
* userInfo into its current userInfo dictionary.
|
||||
*/
|
||||
updateCurrentActivity(type: string, userInfo: any): void;
|
||||
commandLine: CommandLine;
|
||||
dock: Dock;
|
||||
}
|
||||
@@ -831,7 +1008,11 @@ declare namespace Electron {
|
||||
* cancel the close. Usually you would want to use the beforeunload handler to
|
||||
* decide whether the window should be closed, which will also be called when the
|
||||
* window is reloaded. In Electron, returning any value other than undefined would
|
||||
* cancel the close. For example:
|
||||
* cancel the close. For example: Note: There is a subtle difference between the
|
||||
* behaviors of window.onbeforeunload = handler and
|
||||
* window.addEventListener('beforeunload', handler). It is recommended to always
|
||||
* set the event.returnValue explicitly, instead of just returning a value, as the
|
||||
* former works more consistently within Electron.
|
||||
*/
|
||||
on(event: 'close', listener: (event: Event) => void): this;
|
||||
once(event: 'close', listener: (event: Event) => void): this;
|
||||
@@ -1184,6 +1365,7 @@ declare namespace Electron {
|
||||
*/
|
||||
isMovable(): boolean;
|
||||
isResizable(): boolean;
|
||||
isSimpleFullScreen(): boolean;
|
||||
isVisible(): boolean;
|
||||
/**
|
||||
* Note: This API always returns false on Windows.
|
||||
@@ -1203,11 +1385,21 @@ declare namespace Electron {
|
||||
* being displayed already.
|
||||
*/
|
||||
maximize(): void;
|
||||
/**
|
||||
* Merges all windows into one window with multiple tabs when native tabs are
|
||||
* enabled and there is more than one open window.
|
||||
*/
|
||||
mergeAllWindows(): void;
|
||||
/**
|
||||
* Minimizes the window. On some platforms the minimized window will be shown in
|
||||
* the Dock.
|
||||
*/
|
||||
minimize(): void;
|
||||
/**
|
||||
* Moves the current tab into a new window if native tabs are enabled and there is
|
||||
* more than one tab in the current window.
|
||||
*/
|
||||
moveTabToNewWindow(): void;
|
||||
/**
|
||||
* Uses Quick Look to preview a file at a given path.
|
||||
*/
|
||||
@@ -1220,6 +1412,16 @@ declare namespace Electron {
|
||||
* Restores the window from minimized state to its previous state.
|
||||
*/
|
||||
restore(): void;
|
||||
/**
|
||||
* Selects the next tab when native tabs are enabled and there are other tabs in
|
||||
* the window.
|
||||
*/
|
||||
selectNextTab(): void;
|
||||
/**
|
||||
* Selects the previous tab when native tabs are enabled and there are other tabs
|
||||
* in the window.
|
||||
*/
|
||||
selectPreviousTab(): void;
|
||||
/**
|
||||
* Sets whether the window should show always on top of other windows. After
|
||||
* setting this, the window is still a normal window, not a toolbox window which
|
||||
@@ -1316,7 +1518,7 @@ declare namespace Electron {
|
||||
* window will be passed to the window below this window, but if this window has
|
||||
* focus, it will still receive keyboard events.
|
||||
*/
|
||||
setIgnoreMouseEvents(ignore: boolean): void;
|
||||
setIgnoreMouseEvents(ignore: boolean, options?: IgnoreMouseEventsOptions): void;
|
||||
/**
|
||||
* Enters or leaves the kiosk mode.
|
||||
*/
|
||||
@@ -1393,6 +1595,11 @@ declare namespace Electron {
|
||||
* HTML-rendered toolbar. For example:
|
||||
*/
|
||||
setSheetOffset(offsetY: number, offsetX?: number): void;
|
||||
/**
|
||||
* Enters or leaves simple fullscreen mode. Simple fullscreen mode emulates the
|
||||
* native fullscreen behavior found in versions of Mac OS X prior to Lion (10.7).
|
||||
*/
|
||||
setSimpleFullScreen(flag: boolean): void;
|
||||
/**
|
||||
* Resizes the window to width and height.
|
||||
*/
|
||||
@@ -1456,6 +1663,11 @@ declare namespace Electron {
|
||||
* Shows the window but doesn't focus on it.
|
||||
*/
|
||||
showInactive(): void;
|
||||
/**
|
||||
* Toggles the visibility of the tab bar if native tabs are enabled and there is
|
||||
* only one tab in the current window.
|
||||
*/
|
||||
toggleTabBar(): void;
|
||||
/**
|
||||
* Unhooks all of the window messages.
|
||||
*/
|
||||
@@ -1689,7 +1901,7 @@ declare namespace Electron {
|
||||
* An object representing the HTTP response message.
|
||||
*/
|
||||
response: IncomingMessage) => void): this;
|
||||
constructor(options: 'method' | 'url' | 'session' | 'partition' | 'protocol' | 'host' | 'hostname' | 'port' | 'path' | 'redirect');
|
||||
constructor(options: any | string);
|
||||
/**
|
||||
* Cancels an ongoing HTTP transaction. If the request has already emitted the
|
||||
* close event, the abort operation will have no effect. Otherwise an ongoing event
|
||||
@@ -2624,7 +2836,7 @@ declare namespace Electron {
|
||||
/**
|
||||
* Removes all listeners, or those of the specified channel.
|
||||
*/
|
||||
removeAllListeners(channel?: string): this;
|
||||
removeAllListeners(channel: string): this;
|
||||
/**
|
||||
* Removes the specified listener from the listener array for the specified
|
||||
* channel.
|
||||
@@ -2795,6 +3007,7 @@ declare namespace Electron {
|
||||
* Closes the context menu in the browserWindow.
|
||||
*/
|
||||
closePopup(browserWindow?: BrowserWindow): void;
|
||||
getMenuItemById(id: string): MenuItem;
|
||||
/**
|
||||
* Inserts the menuItem to the pos position of the menu.
|
||||
*/
|
||||
@@ -3380,7 +3593,7 @@ declare namespace Electron {
|
||||
* options, you have to ensure the Session with the partition has never been used
|
||||
* before. There is no way to change the options of an existing Session object.
|
||||
*/
|
||||
static fromPartition(partition: string, options: FromPartitionOptions): Session;
|
||||
static fromPartition(partition: string, options?: FromPartitionOptions): Session;
|
||||
/**
|
||||
* A Session object, the default session object of the app.
|
||||
*/
|
||||
@@ -4404,10 +4617,26 @@ declare namespace Electron {
|
||||
* Emitted when a page's theme color changes. This is usually due to encountering a
|
||||
* meta tag:
|
||||
*/
|
||||
on(event: 'did-change-theme-color', listener: Function): this;
|
||||
once(event: 'did-change-theme-color', listener: Function): this;
|
||||
addListener(event: 'did-change-theme-color', listener: Function): this;
|
||||
removeListener(event: 'did-change-theme-color', listener: Function): this;
|
||||
on(event: 'did-change-theme-color', listener: (event: Event,
|
||||
/**
|
||||
* Theme color is in format of '#rrggbb'. It is `null` when no theme color is set.
|
||||
*/
|
||||
color: string | null) => void): this;
|
||||
once(event: 'did-change-theme-color', listener: (event: Event,
|
||||
/**
|
||||
* Theme color is in format of '#rrggbb'. It is `null` when no theme color is set.
|
||||
*/
|
||||
color: string | null) => void): this;
|
||||
addListener(event: 'did-change-theme-color', listener: (event: Event,
|
||||
/**
|
||||
* Theme color is in format of '#rrggbb'. It is `null` when no theme color is set.
|
||||
*/
|
||||
color: string | null) => void): this;
|
||||
removeListener(event: 'did-change-theme-color', listener: (event: Event,
|
||||
/**
|
||||
* Theme color is in format of '#rrggbb'. It is `null` when no theme color is set.
|
||||
*/
|
||||
color: string | null) => void): this;
|
||||
/**
|
||||
* This event is like did-finish-load but emitted when the load failed or was
|
||||
* cancelled, e.g. window.stop() is invoked. The full list of error codes and their
|
||||
@@ -5101,7 +5330,7 @@ declare namespace Electron {
|
||||
* webContents.print({silent: false, printBackground: false, deviceName: ''}). Use
|
||||
* page-break-before: always; CSS style to force to print to a new page.
|
||||
*/
|
||||
print(options?: PrintOptions): void;
|
||||
print(options?: PrintOptions, callback?: Function): void;
|
||||
/**
|
||||
* Prints window's web page as PDF with Chromium's preview printing custom
|
||||
* settings. The callback will be called with callback(error, data) on completion.
|
||||
@@ -5341,11 +5570,22 @@ declare namespace Electron {
|
||||
|
||||
// Docs: http://electron.atom.io/docs/api/web-request
|
||||
|
||||
/**
|
||||
* The listener will be called with listener(details) when a server initiated
|
||||
* redirect is about to occur.
|
||||
*/
|
||||
onBeforeRedirect(listener: (details: OnBeforeRedirectDetails) => void): void;
|
||||
/**
|
||||
* The listener will be called with listener(details) when a server initiated
|
||||
* redirect is about to occur.
|
||||
*/
|
||||
onBeforeRedirect(filter: OnBeforeRedirectFilter, listener: (details: OnBeforeRedirectDetails) => void): void;
|
||||
/**
|
||||
* The listener will be called with listener(details, callback) when a request is
|
||||
* about to occur. The uploadData is an array of UploadData objects. The callback
|
||||
* has to be called with an response object.
|
||||
*/
|
||||
onBeforeRequest(listener: (details: OnBeforeRequestDetails, callback: (response: Response) => void) => void): void;
|
||||
/**
|
||||
* The listener will be called with listener(details, callback) when a request is
|
||||
* about to occur. The uploadData is an array of UploadData objects. The callback
|
||||
@@ -5359,10 +5599,25 @@ declare namespace Electron {
|
||||
* has to be called with an response object.
|
||||
*/
|
||||
onBeforeSendHeaders(filter: OnBeforeSendHeadersFilter, listener: Function): void;
|
||||
/**
|
||||
* The listener will be called with listener(details, callback) before sending an
|
||||
* HTTP request, once the request headers are available. This may occur after a TCP
|
||||
* connection is made to the server, but before any http data is sent. The callback
|
||||
* has to be called with an response object.
|
||||
*/
|
||||
onBeforeSendHeaders(listener: Function): void;
|
||||
/**
|
||||
* The listener will be called with listener(details) when a request is completed.
|
||||
*/
|
||||
onCompleted(filter: OnCompletedFilter, listener: (details: OnCompletedDetails) => void): void;
|
||||
/**
|
||||
* The listener will be called with listener(details) when a request is completed.
|
||||
*/
|
||||
onCompleted(listener: (details: OnCompletedDetails) => void): void;
|
||||
/**
|
||||
* The listener will be called with listener(details) when an error occurs.
|
||||
*/
|
||||
onErrorOccurred(listener: (details: OnErrorOccurredDetails) => void): void;
|
||||
/**
|
||||
* The listener will be called with listener(details) when an error occurs.
|
||||
*/
|
||||
@@ -5373,6 +5628,18 @@ declare namespace Electron {
|
||||
* response object.
|
||||
*/
|
||||
onHeadersReceived(filter: OnHeadersReceivedFilter, listener: Function): void;
|
||||
/**
|
||||
* The listener will be called with listener(details, callback) when HTTP response
|
||||
* headers of a request have been received. The callback has to be called with an
|
||||
* response object.
|
||||
*/
|
||||
onHeadersReceived(listener: Function): void;
|
||||
/**
|
||||
* The listener will be called with listener(details) when first byte of the
|
||||
* response body is received. For HTTP requests, this means that the status line
|
||||
* and response headers are available.
|
||||
*/
|
||||
onResponseStarted(listener: (details: OnResponseStartedDetails) => void): void;
|
||||
/**
|
||||
* The listener will be called with listener(details) when first byte of the
|
||||
* response body is received. For HTTP requests, this means that the status line
|
||||
@@ -5385,6 +5652,12 @@ declare namespace Electron {
|
||||
* response are visible by the time this listener is fired.
|
||||
*/
|
||||
onSendHeaders(filter: OnSendHeadersFilter, listener: (details: OnSendHeadersDetails) => void): void;
|
||||
/**
|
||||
* The listener will be called with listener(details) just before a request is
|
||||
* going to be sent to the server, modifications of previous onBeforeSendHeaders
|
||||
* response are visible by the time this listener is fired.
|
||||
*/
|
||||
onSendHeaders(listener: (details: OnSendHeadersDetails) => void): void;
|
||||
}
|
||||
|
||||
interface WebviewTag extends HTMLElement {
|
||||
@@ -5575,10 +5848,6 @@ declare namespace Electron {
|
||||
*/
|
||||
addEventListener(event: 'devtools-focused', listener: (event: Event) => void, useCapture?: boolean): this;
|
||||
removeEventListener(event: 'devtools-focused', listener: (event: Event) => void): this;
|
||||
addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
|
||||
addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
|
||||
removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
|
||||
removeEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
|
||||
canGoBack(): boolean;
|
||||
canGoForward(): boolean;
|
||||
canGoToOffset(offset: number): boolean;
|
||||
@@ -5617,7 +5886,7 @@ declare namespace Electron {
|
||||
* context in the page. HTML APIs like requestFullScreen, which require user
|
||||
* action, can take advantage of this option for automation.
|
||||
*/
|
||||
executeJavaScript(code: string, userGesture: boolean, callback?: (result: any) => void): void;
|
||||
executeJavaScript(code: string, userGesture?: boolean, callback?: (result: any) => void): void;
|
||||
/**
|
||||
* Starts a request to find all matches for the text in the web page and returns an
|
||||
* Integer representing the request id used for the request. The result of the
|
||||
@@ -6066,6 +6335,10 @@ declare namespace Electron {
|
||||
* is true.
|
||||
*/
|
||||
fullscreenable?: boolean;
|
||||
/**
|
||||
* Use pre-Lion fullscreen on macOS. Default is false.
|
||||
*/
|
||||
simpleFullscreen?: boolean;
|
||||
/**
|
||||
* Whether to show the window in taskbar. Default is false.
|
||||
*/
|
||||
@@ -6360,6 +6633,11 @@ declare namespace Electron {
|
||||
* names and values must be less than 64 characters long.
|
||||
*/
|
||||
extra?: Extra;
|
||||
/**
|
||||
* Directory to store the crashreports temporarily (only used when the crash
|
||||
* reporter is started via process.crashReporter.start)
|
||||
*/
|
||||
crashesDirectory?: string;
|
||||
}
|
||||
|
||||
interface CreateFromBufferOptions {
|
||||
@@ -6644,6 +6922,15 @@ declare namespace Electron {
|
||||
name: string;
|
||||
}
|
||||
|
||||
interface IgnoreMouseEventsOptions {
|
||||
/**
|
||||
* If true, forwards mouse move messages to Chromium, enabling mouse related events
|
||||
* such as mouseleave. Only used when ignore is true. If ignore is false,
|
||||
* forwarding is always disabled regardless of this value.
|
||||
*/
|
||||
forward?: boolean;
|
||||
}
|
||||
|
||||
interface ImportCertificateOptions {
|
||||
/**
|
||||
* Path for the pkcs12 file.
|
||||
@@ -6988,9 +7275,10 @@ declare namespace Electron {
|
||||
}
|
||||
|
||||
interface OnBeforeRedirectDetails {
|
||||
id: string;
|
||||
id: number;
|
||||
url: string;
|
||||
method: string;
|
||||
webContentsId?: number;
|
||||
resourceType: string;
|
||||
timestamp: number;
|
||||
redirectURL: string;
|
||||
@@ -7015,6 +7303,7 @@ declare namespace Electron {
|
||||
id: number;
|
||||
url: string;
|
||||
method: string;
|
||||
webContentsId?: number;
|
||||
resourceType: string;
|
||||
timestamp: number;
|
||||
uploadData: UploadData[];
|
||||
@@ -7040,6 +7329,7 @@ declare namespace Electron {
|
||||
id: number;
|
||||
url: string;
|
||||
method: string;
|
||||
webContentsId?: number;
|
||||
resourceType: string;
|
||||
timestamp: number;
|
||||
responseHeaders: ResponseHeaders;
|
||||
@@ -7060,6 +7350,7 @@ declare namespace Electron {
|
||||
id: number;
|
||||
url: string;
|
||||
method: string;
|
||||
webContentsId?: number;
|
||||
resourceType: string;
|
||||
timestamp: number;
|
||||
fromCache: boolean;
|
||||
@@ -7089,6 +7380,7 @@ declare namespace Electron {
|
||||
id: number;
|
||||
url: string;
|
||||
method: string;
|
||||
webContentsId?: number;
|
||||
resourceType: string;
|
||||
timestamp: number;
|
||||
responseHeaders: ResponseHeaders;
|
||||
@@ -7112,6 +7404,7 @@ declare namespace Electron {
|
||||
id: number;
|
||||
url: string;
|
||||
method: string;
|
||||
webContentsId?: number;
|
||||
resourceType: string;
|
||||
timestamp: number;
|
||||
requestHeaders: RequestHeaders;
|
||||
@@ -7608,7 +7901,7 @@ declare namespace Electron {
|
||||
}
|
||||
|
||||
interface TouchBarConstructorOptions {
|
||||
items: Array<TouchBarButton | TouchBarColorPicker | TouchBarGroup | TouchBarLabel | TouchBarPopover | TouchBarScrubber | TouchBarSegmentedControl | TouchBarSlider | TouchBarSpacer>;
|
||||
items: TouchBarButton | TouchBarColorPicker | TouchBarGroup | TouchBarLabel | TouchBarPopover | TouchBarScrubber | TouchBarSegmentedControl | TouchBarSlider | TouchBarSpacer;
|
||||
escapeItem?: TouchBarButton | TouchBarColorPicker | TouchBarGroup | TouchBarLabel | TouchBarPopover | TouchBarScrubber | TouchBarSegmentedControl | TouchBarSlider | TouchBarSpacer;
|
||||
}
|
||||
|
||||
|
||||
+14
-14
@@ -1,27 +1,27 @@
|
||||
{
|
||||
"_from": "electron",
|
||||
"_id": "electron@1.7.10",
|
||||
"_from": "electron@1.8.1",
|
||||
"_id": "electron@1.8.1",
|
||||
"_inBundle": false,
|
||||
"_integrity": "sha1-Oj6D2WX9f6/kc76N349HJWG2JT0=",
|
||||
"_integrity": "sha1-GbbznyAT4gSpGmC8MIbcekoH7Yg=",
|
||||
"_location": "/electron",
|
||||
"_phantomChildren": {},
|
||||
"_requested": {
|
||||
"type": "tag",
|
||||
"type": "version",
|
||||
"registry": true,
|
||||
"raw": "electron",
|
||||
"raw": "electron@1.8.1",
|
||||
"name": "electron",
|
||||
"escapedName": "electron",
|
||||
"rawSpec": "",
|
||||
"rawSpec": "1.8.1",
|
||||
"saveSpec": null,
|
||||
"fetchSpec": "latest"
|
||||
"fetchSpec": "1.8.1"
|
||||
},
|
||||
"_requiredBy": [
|
||||
"#DEV:/",
|
||||
"#USER"
|
||||
"#USER",
|
||||
"/"
|
||||
],
|
||||
"_resolved": "https://registry.npmjs.org/electron/-/electron-1.7.10.tgz",
|
||||
"_shasum": "3a3e83d965fd7fafe473be8ddf8f472561b6253d",
|
||||
"_spec": "electron",
|
||||
"_resolved": "https://registry.npmjs.org/electron/-/electron-1.8.1.tgz",
|
||||
"_shasum": "19b6f39f2013e204a91a60bc3086dc7a4a07ed88",
|
||||
"_spec": "electron@1.8.1",
|
||||
"_where": "C:\\Users\\Katy\\documentit",
|
||||
"author": {
|
||||
"name": "Electron Community"
|
||||
@@ -34,7 +34,7 @@
|
||||
},
|
||||
"bundleDependencies": false,
|
||||
"dependencies": {
|
||||
"@types/node": "^7.0.18",
|
||||
"@types/node": "^8.0.24",
|
||||
"electron-download": "^3.0.1",
|
||||
"extract-zip": "^1.0.3"
|
||||
},
|
||||
@@ -66,5 +66,5 @@
|
||||
"test": "standard"
|
||||
},
|
||||
"types": "electron.d.ts",
|
||||
"version": "1.7.10"
|
||||
"version": "1.8.1"
|
||||
}
|
||||
|
||||
+77
-1
@@ -59,7 +59,7 @@ so that sources **earlier** in this list override later ones.
|
||||
|
||||
## Configuration File Formats
|
||||
|
||||
Configuration files (e.g. `.appnamerc`) may be in either [json](http://json.org/example) or [ini](http://en.wikipedia.org/wiki/INI_file) format. The example configurations below are equivalent:
|
||||
Configuration files (e.g. `.appnamerc`) may be in either [json](http://json.org/example) or [ini](http://en.wikipedia.org/wiki/INI_file) format. **No** file extension (`.json` or `.ini`) should be used. The example configurations below are equivalent:
|
||||
|
||||
|
||||
#### Formatted as `ini`
|
||||
@@ -115,6 +115,82 @@ Comments are stripped from JSON config via [strip-json-comments](https://github.
|
||||
> Since ini, and env variables do not have a standard for types, your application needs be prepared for strings.
|
||||
|
||||
|
||||
## Simple example demonstrating precedence
|
||||
Assume you have an application like this (notice the hard-coded defaults passed to rc):
|
||||
```
|
||||
const conf = require('rc')('myapp', {
|
||||
port: 12345,
|
||||
mode: 'test'
|
||||
});
|
||||
|
||||
console.log(JSON.stringify(conf, null, 2));
|
||||
```
|
||||
You also have a file `config.json`, with these contents:
|
||||
```
|
||||
{
|
||||
"port": 9000,
|
||||
"foo": "from config json",
|
||||
"something": "else"
|
||||
}
|
||||
```
|
||||
And a file `.myapprc` in the same folder, with these contents:
|
||||
```
|
||||
{
|
||||
"port": "3001",
|
||||
"foo": "bar"
|
||||
}
|
||||
```
|
||||
Here is the expected output from various commands:
|
||||
|
||||
`node .`
|
||||
```
|
||||
{
|
||||
"port": "3001",
|
||||
"mode": "test",
|
||||
"foo": "bar",
|
||||
"_": [],
|
||||
"configs": [
|
||||
"/Users/stephen/repos/conftest/.myapprc"
|
||||
],
|
||||
"config": "/Users/stephen/repos/conftest/.myapprc"
|
||||
}
|
||||
```
|
||||
*Default `mode` from hard-coded object is retained, but port is overridden by `.myapprc` file (automatically found based on appname match), and `foo` is added.*
|
||||
|
||||
|
||||
`node . --foo baz`
|
||||
```
|
||||
{
|
||||
"port": "3001",
|
||||
"mode": "test",
|
||||
"foo": "baz",
|
||||
"_": [],
|
||||
"configs": [
|
||||
"/Users/stephen/repos/conftest/.myapprc"
|
||||
],
|
||||
"config": "/Users/stephen/repos/conftest/.myapprc"
|
||||
}
|
||||
```
|
||||
*Same result as above but `foo` is overridden because command-line arguments take precedence over `.myapprc` file.*
|
||||
|
||||
`node . --foo barbar --config config.json`
|
||||
```
|
||||
{
|
||||
"port": 9000,
|
||||
"mode": "test",
|
||||
"foo": "barbar",
|
||||
"something": "else",
|
||||
"_": [],
|
||||
"config": "config.json",
|
||||
"configs": [
|
||||
"/Users/stephen/repos/conftest/.myapprc",
|
||||
"config.json"
|
||||
]
|
||||
}
|
||||
```
|
||||
*Now the `port` comes from the `config.json` file specified (overriding the value from `.myapprc`), and `foo` value is overriden by command-line despite also being specified in the `config.json` file.*
|
||||
|
||||
|
||||
|
||||
## Advanced Usage
|
||||
|
||||
|
||||
-7
@@ -1,4 +1,3 @@
|
||||
#! /usr/bin/env node
|
||||
var cc = require('./lib/utils')
|
||||
var join = require('path').join
|
||||
var deepExtend = require('deep-extend')
|
||||
@@ -52,9 +51,3 @@ module.exports = function (name, defaults, argv, parse) {
|
||||
configFiles.length ? {configs: configFiles, config: configFiles[configFiles.length - 1]} : undefined,
|
||||
]))
|
||||
}
|
||||
|
||||
if(!module.parent) {
|
||||
console.log(
|
||||
JSON.stringify(module.exports(process.argv[2]), false, 2)
|
||||
)
|
||||
}
|
||||
|
||||
+6
-6
@@ -1,8 +1,8 @@
|
||||
{
|
||||
"_from": "rc@^1.1.2",
|
||||
"_id": "rc@1.2.2",
|
||||
"_id": "rc@1.2.4",
|
||||
"_inBundle": false,
|
||||
"_integrity": "sha1-2M6ctX6NZNnHut2YdsfDTL48cHc=",
|
||||
"_integrity": "sha1-oPYGyq4qO4YrvQ74VILAElsxX6M=",
|
||||
"_location": "/rc",
|
||||
"_phantomChildren": {},
|
||||
"_requested": {
|
||||
@@ -18,8 +18,8 @@
|
||||
"_requiredBy": [
|
||||
"/electron-download"
|
||||
],
|
||||
"_resolved": "https://registry.npmjs.org/rc/-/rc-1.2.2.tgz",
|
||||
"_shasum": "d8ce9cb57e8d64d9c7badd9876c7c34cbe3c7077",
|
||||
"_resolved": "https://registry.npmjs.org/rc/-/rc-1.2.4.tgz",
|
||||
"_shasum": "a0f606caae2a3b862bbd0ef85482c0125b315fa3",
|
||||
"_spec": "rc@^1.1.2",
|
||||
"_where": "C:\\Users\\Katy\\documentit\\node_modules\\electron-download",
|
||||
"author": {
|
||||
@@ -28,7 +28,7 @@
|
||||
"url": "dominictarr.com"
|
||||
},
|
||||
"bin": {
|
||||
"rc": "./index.js"
|
||||
"rc": "./cli.js"
|
||||
},
|
||||
"browser": "browser.js",
|
||||
"bugs": {
|
||||
@@ -60,5 +60,5 @@
|
||||
"scripts": {
|
||||
"test": "set -e; node test/test.js; node test/ini.js; node test/nested-env-vars.js"
|
||||
},
|
||||
"version": "1.2.2"
|
||||
"version": "1.2.4"
|
||||
}
|
||||
|
||||
+3
-2
@@ -7,16 +7,16 @@
|
||||
"mocha": true
|
||||
},
|
||||
"extends": ["eslint:recommended"],
|
||||
"installedESLint": true,
|
||||
"rules": {
|
||||
"array-bracket-spacing": ["warn", "never"],
|
||||
"arrow-body-style": ["warn", "as-needed"],
|
||||
"arrow-parens": ["warn", "as-needed"],
|
||||
"arrow-spacing": "warn",
|
||||
"brace-style": "warn",
|
||||
"brace-style": ["warn", "1tbs"],
|
||||
"camelcase": "warn",
|
||||
"comma-spacing": ["warn", {"after": true}],
|
||||
"dot-notation": "warn",
|
||||
"eqeqeq": ["warn", "smart"],
|
||||
"indent": ["warn", 2, {
|
||||
"SwitchCase": 1,
|
||||
"FunctionDeclaration": {"parameters": 1},
|
||||
@@ -33,6 +33,7 @@
|
||||
"no-trailing-spaces": "warn",
|
||||
"no-undef": "error",
|
||||
"no-unused-vars": ["warn", {"args": "none"}],
|
||||
"one-var": ["warn", "never"],
|
||||
"padded-blocks": ["warn", "never"],
|
||||
"object-curly-spacing": ["warn", "never"],
|
||||
"quotes": ["warn", "single"],
|
||||
|
||||
-28
@@ -1,28 +0,0 @@
|
||||
# 3.0.1 (2016-11-28)
|
||||
|
||||
* split uuid versions into separate files
|
||||
|
||||
# 3.0.0 (2016-11-17)
|
||||
|
||||
* remove .parse and .unparse
|
||||
|
||||
# 2.0.0
|
||||
|
||||
* Removed uuid.BufferClass
|
||||
|
||||
# 1.4.0
|
||||
|
||||
* Improved module context detection
|
||||
* Removed public RNG functions
|
||||
|
||||
# 1.3.2
|
||||
|
||||
* Improve tests and handling of v1() options (Issue #24)
|
||||
* Expose RNG option to allow for perf testing with different generators
|
||||
|
||||
# 1.3.0
|
||||
|
||||
* Support for version 1 ids, thanks to [@ctavan](https://github.com/ctavan)!
|
||||
* Support for node.js crypto API
|
||||
* De-emphasizing performance in favor of a) cryptographic quality PRNGs where available and b) more manageable code
|
||||
|
||||
+116
-50
@@ -1,14 +1,21 @@
|
||||
<!--
|
||||
-- This file is auto-generated from README_js.md. Changes should be made there.
|
||||
-->
|
||||
|
||||
# uuid [](http://travis-ci.org/kelektiv/node-uuid) #
|
||||
|
||||
Simple, fast generation of [RFC4122](http://www.ietf.org/rfc/rfc4122.txt) UUIDS.
|
||||
|
||||
Features:
|
||||
|
||||
* Support for version 1, 4 and 5 UUIDs
|
||||
* Support for version 1, 3, 4 and 5 UUIDs
|
||||
* Cross-platform
|
||||
* Uses cryptographically-strong random number APIs (when available)
|
||||
* Zero-dependency, small footprint (... but not [this small](https://gist.github.com/982883))
|
||||
|
||||
[**Deprecation warning**: The use of `require('uuid')` is deprecated and will not be
|
||||
supported after version 3.x of this module. Instead, use `require('uuid/[v1|v3|v4|v5]')` as shown in the examples below.]
|
||||
|
||||
## Quickstart - CommonJS (Recommended)
|
||||
|
||||
```shell
|
||||
@@ -21,14 +28,36 @@ Version 1 (timestamp):
|
||||
|
||||
```javascript
|
||||
const uuidv1 = require('uuid/v1');
|
||||
uuidv1(); // -> '6c84fb90-12c4-11e1-840d-7b25c5ee775a'
|
||||
uuidv1(); // ⇨ 'f64f2940-fae4-11e7-8c5f-ef356f279131'
|
||||
|
||||
```
|
||||
|
||||
Version 3 (namespace):
|
||||
|
||||
```javascript
|
||||
const uuidv3 = require('uuid/v3');
|
||||
|
||||
// ... using predefined DNS namespace (for domain names)
|
||||
uuidv3('hello.example.com', uuidv3.DNS); // ⇨ '9125a8dc-52ee-365b-a5aa-81b0b3681cf6'
|
||||
|
||||
// ... using predefined URL namespace (for, well, URLs)
|
||||
uuidv3('http://example.com/hello', uuidv3.URL); // ⇨ 'c6235813-3ba4-3801-ae84-e0a6ebb7d138'
|
||||
|
||||
// ... using a custom namespace
|
||||
//
|
||||
// Note: Custom namespaces should be a UUID string specific to your application!
|
||||
// E.g. the one here was generated using this modules `uuid` CLI.
|
||||
const MY_NAMESPACE = '1b671a64-40d5-491e-99b0-da01ff1f3341';
|
||||
uuidv3('Hello, World!', MY_NAMESPACE); // ⇨ 'e8b5a51d-11c8-3310-a6ab-367563f20686'
|
||||
|
||||
```
|
||||
|
||||
Version 4 (random):
|
||||
|
||||
```javascript
|
||||
const uuidv4 = require('uuid/v4');
|
||||
uuidv4(); // -> '110ec58a-a0f2-4ac4-8393-c866d813b8d1'
|
||||
uuidv4(); // ⇨ '416ac246-e7ac-49ff-93b4-f7e94d997e6b'
|
||||
|
||||
```
|
||||
|
||||
Version 5 (namespace):
|
||||
@@ -37,14 +66,18 @@ Version 5 (namespace):
|
||||
const uuidv5 = require('uuid/v5');
|
||||
|
||||
// ... using predefined DNS namespace (for domain names)
|
||||
uuidv5('hello.example.com', uuidv5.DNS)); // -> 'fdda765f-fc57-5604-a269-52a7df8164ec'
|
||||
uuidv5('hello.example.com', uuidv5.DNS); // ⇨ 'fdda765f-fc57-5604-a269-52a7df8164ec'
|
||||
|
||||
// ... using predefined URL namespace (for, well, URLs)
|
||||
uuidv5('http://example.com/hello', uuidv5.URL); // -> '3bbcee75-cecc-5b56-8031-b6641c1ed1f1'
|
||||
uuidv5('http://example.com/hello', uuidv5.URL); // ⇨ '3bbcee75-cecc-5b56-8031-b6641c1ed1f1'
|
||||
|
||||
// ... using a custom namespace
|
||||
const MY_NAMESPACE = '<UUID string you previously generated elsewhere>';
|
||||
uuidv5('Hello, World!', MY_NAMESPACE); // -> '90123e1c-7512-523e-bb28-76fab9f2f73d'
|
||||
//
|
||||
// Note: Custom namespaces should be a UUID string specific to your application!
|
||||
// E.g. the one here was generated using this modules `uuid` CLI.
|
||||
const MY_NAMESPACE = '1b671a64-40d5-491e-99b0-da01ff1f3341';
|
||||
uuidv5('Hello, World!', MY_NAMESPACE); // ⇨ '630eb68f-e0fa-5ecc-887a-7c7a62614681'
|
||||
|
||||
```
|
||||
|
||||
## Quickstart - Browser-ready Versions
|
||||
@@ -60,6 +93,15 @@ uuidv1(); // -> v1 UUID
|
||||
</script>
|
||||
```
|
||||
|
||||
For version 3 uuids:
|
||||
|
||||
```html
|
||||
<script src="http://wzrd.in/standalone/uuid%2Fv3@latest"></script>
|
||||
<script>
|
||||
uuidv3('http://example.com/hello', uuidv3.URL); // -> v3 UUID
|
||||
</script>
|
||||
```
|
||||
|
||||
For version 4 uuids:
|
||||
|
||||
```html
|
||||
@@ -85,7 +127,7 @@ uuidv5('http://example.com/hello', uuidv5.URL); // -> v5 UUID
|
||||
```javascript
|
||||
const uuidv1 = require('uuid/v1');
|
||||
|
||||
// Allowed arguments
|
||||
// Incantations
|
||||
uuidv1();
|
||||
uuidv1(options);
|
||||
uuidv1(options, buffer, offset);
|
||||
@@ -97,7 +139,7 @@ Generate and return a RFC4122 v1 (timestamp-based) UUID.
|
||||
|
||||
* `node` - (Array) Node id as Array of 6 bytes (per 4.1.6). Default: Randomly generated ID. See note 1.
|
||||
* `clockseq` - (Number between 0 - 0x3fff) RFC clock sequence. Default: An internally maintained clockseq is used.
|
||||
* `msecs` - (Number | Date) Time in milliseconds since unix Epoch. Default: The current time is used.
|
||||
* `msecs` - (Number) Time in milliseconds since unix Epoch. Default: The current time is used.
|
||||
* `nsecs` - (Number between 0-9999) additional time, in 100-nanosecond units. Ignored if `msecs` is unspecified. Default: internal uuid counter is used, as per 4.2.1.2.
|
||||
|
||||
* `buffer` - (Array | Buffer) Array or buffer where UUID bytes are to be written.
|
||||
@@ -110,21 +152,51 @@ Note: The <node> id is generated guaranteed to stay constant for the lifetime of
|
||||
Example: Generate string UUID with fully-specified options
|
||||
|
||||
```javascript
|
||||
uuidv1({
|
||||
const v1options = {
|
||||
node: [0x01, 0x23, 0x45, 0x67, 0x89, 0xab],
|
||||
clockseq: 0x1234,
|
||||
msecs: new Date('2011-11-01').getTime(),
|
||||
nsecs: 5678
|
||||
}); // -> "710b962e-041c-11e1-9234-0123456789ab"
|
||||
};
|
||||
uuidv1(v1options); // ⇨ '710b962e-041c-11e1-9234-0123456789ab'
|
||||
|
||||
```
|
||||
|
||||
Example: In-place generation of two binary IDs
|
||||
|
||||
```javascript
|
||||
// Generate two ids in an array
|
||||
const arr = new Array(32); // -> []
|
||||
uuidv1(null, arr, 0); // -> [02 a2 ce 90 14 32 11 e1 85 58 0b 48 8e 4f c1 15]
|
||||
uuidv1(null, arr, 16); // -> [02 a2 ce 90 14 32 11 e1 85 58 0b 48 8e 4f c1 15 02 a3 1c b0 14 32 11 e1 85 58 0b 48 8e 4f c1 15]
|
||||
const arr = new Array();
|
||||
uuidv1(null, arr, 0); // ⇨ [ 246, 87, 141, 176, 250, 228, 17, 231, 146, 52, 239, 53, 111, 39, 145, 49 ]
|
||||
uuidv1(null, arr, 16); // ⇨ [ 246, 87, 141, 176, 250, 228, 17, 231, 146, 52, 239, 53, 111, 39, 145, 49, 246, 87, 180, 192, 250, 228, 17, 231, 146, 52, 239, 53, 111, 39, 145, 49 ]
|
||||
|
||||
```
|
||||
|
||||
### Version 3
|
||||
|
||||
```javascript
|
||||
const uuidv3 = require('uuid/v3');
|
||||
|
||||
// Incantations
|
||||
uuidv3(name, namespace);
|
||||
uuidv3(name, namespace, buffer);
|
||||
uuidv3(name, namespace, buffer, offset);
|
||||
```
|
||||
|
||||
Generate and return a RFC4122 v3 UUID.
|
||||
|
||||
* `name` - (String | Array[]) "name" to create UUID with
|
||||
* `namespace` - (String | Array[]) "namespace" UUID either as a String or Array[16] of byte values
|
||||
* `buffer` - (Array | Buffer) Array or buffer where UUID bytes are to be written.
|
||||
* `offset` - (Number) Starting index in `buffer` at which to begin writing. Default = 0
|
||||
|
||||
Returns `buffer`, if specified, otherwise the string form of the UUID
|
||||
|
||||
Example:
|
||||
|
||||
```javascript
|
||||
uuidv3('hello world', MY_NAMESPACE); // ⇨ '042ffd34-d989-321c-ad06-f60826172424'
|
||||
|
||||
```
|
||||
|
||||
### Version 4
|
||||
@@ -132,7 +204,7 @@ uuidv1(null, arr, 16); // -> [02 a2 ce 90 14 32 11 e1 85 58 0b 48 8e 4f c1 15 0
|
||||
```javascript
|
||||
const uuidv4 = require('uuid/v4')
|
||||
|
||||
// Allowed arguments
|
||||
// Incantations
|
||||
uuidv4();
|
||||
uuidv4(options);
|
||||
uuidv4(options, buffer, offset);
|
||||
@@ -148,38 +220,40 @@ Generate and return a RFC4122 v4 UUID.
|
||||
|
||||
Returns `buffer`, if specified, otherwise the string form of the UUID
|
||||
|
||||
Example: Generate string UUID with fully-specified options
|
||||
Example: Generate string UUID with predefined `random` values
|
||||
|
||||
```javascript
|
||||
uuid.v4({
|
||||
const v4options = {
|
||||
random: [
|
||||
0x10, 0x91, 0x56, 0xbe, 0xc4, 0xfb, 0xc1, 0xea,
|
||||
0x71, 0xb4, 0xef, 0xe1, 0x67, 0x1c, 0x58, 0x36
|
||||
]
|
||||
});
|
||||
// -> "109156be-c4fb-41ea-b1b4-efe1671c5836"
|
||||
};
|
||||
uuidv4(v4options); // ⇨ '109156be-c4fb-41ea-b1b4-efe1671c5836'
|
||||
|
||||
```
|
||||
|
||||
Example: Generate two IDs in a single buffer
|
||||
|
||||
```javascript
|
||||
const buffer = new Array(32); // (or 'new Buffer' in node.js)
|
||||
uuid.v4(null, buffer, 0);
|
||||
uuid.v4(null, buffer, 16);
|
||||
const buffer = new Array();
|
||||
uuidv4(null, buffer, 0); // ⇨ [ 175, 10, 162, 184, 217, 255, 77, 139, 161, 80, 41, 200, 70, 238, 196, 250 ]
|
||||
uuidv4(null, buffer, 16); // ⇨ [ 175, 10, 162, 184, 217, 255, 77, 139, 161, 80, 41, 200, 70, 238, 196, 250, 75, 162, 105, 153, 48, 238, 77, 58, 169, 56, 158, 207, 106, 160, 47, 239 ]
|
||||
|
||||
```
|
||||
|
||||
### Version 5
|
||||
|
||||
```javascript
|
||||
const uuidv5 = require('uuid/v4');
|
||||
const uuidv5 = require('uuid/v5');
|
||||
|
||||
// Allowed arguments
|
||||
// Incantations
|
||||
uuidv5(name, namespace);
|
||||
uuidv5(name, namespace, buffer);
|
||||
uuidv5(name, namespace, buffer, offset);
|
||||
```
|
||||
|
||||
Generate and return a RFC4122 v4 UUID.
|
||||
Generate and return a RFC4122 v5 UUID.
|
||||
|
||||
* `name` - (String | Array[]) "name" to create UUID with
|
||||
* `namespace` - (String | Array[]) "namespace" UUID either as a String or Array[16] of byte values
|
||||
@@ -191,37 +265,29 @@ Returns `buffer`, if specified, otherwise the string form of the UUID
|
||||
Example:
|
||||
|
||||
```javascript
|
||||
// Generate a unique namespace (typically you would do this once, outside of
|
||||
// your project, then bake this value into your code)
|
||||
const uuidv4 = require('uuid/v4');
|
||||
const MY_NAMESPACE = uuidv4(); //
|
||||
uuidv5('hello world', MY_NAMESPACE); // ⇨ '9f282611-e0fd-5650-8953-89c8e342da0b'
|
||||
|
||||
// Generate a couple namespace uuids
|
||||
const uuidv5 = require('uuid/v5');
|
||||
uuidv5('hello', MY_NAMESPACE);
|
||||
uuidv5('world', MY_NAMESPACE);
|
||||
```
|
||||
|
||||
## Command Line
|
||||
|
||||
UUIDs can be generated from the command line with the `uuid` command.
|
||||
|
||||
```shell
|
||||
$ uuid
|
||||
ddeb27fb-d9a0-4624-be4d-4615062daed4
|
||||
|
||||
$ uuid v1
|
||||
02d37060-d446-11e7-a9fa-7bdae751ebe1
|
||||
```
|
||||
|
||||
Type `uuid --help` for usage details
|
||||
|
||||
## Testing
|
||||
|
||||
```shell
|
||||
npm test
|
||||
```
|
||||
|
||||
## Deprecated / Browser-ready API
|
||||
|
||||
The API below is available for legacy purposes and is not expected to be available post-3.X
|
||||
|
||||
```javascript
|
||||
const uuid = require('uuid');
|
||||
|
||||
uuid.v1(...); // alias of uuid/v1
|
||||
uuid.v4(...); // alias of uuid/v4
|
||||
uuid(...); // alias of uuid/v4
|
||||
|
||||
// uuid.v5() is not supported in this API
|
||||
```
|
||||
|
||||
## Legacy node-uuid package
|
||||
|
||||
The code for the legacy node-uuid package is available in the `node-uuid` branch.
|
||||
----
|
||||
Markdown generated from [README_js.md](README_js.md) by [](https://github.com/broofa/runmd)
|
||||
+15
@@ -5,6 +5,7 @@ function usage() {
|
||||
console.log('Usage:');
|
||||
console.log(' uuid');
|
||||
console.log(' uuid v1');
|
||||
console.log(' uuid v3 <name> <namespace uuid>');
|
||||
console.log(' uuid v4');
|
||||
console.log(' uuid v5 <name> <namespace uuid>');
|
||||
console.log(' uuid --help');
|
||||
@@ -25,6 +26,20 @@ switch (version) {
|
||||
console.log(uuidV1());
|
||||
break;
|
||||
|
||||
case 'v3':
|
||||
var uuidV3 = require('../v3');
|
||||
|
||||
var name = args.shift();
|
||||
var namespace = args.shift();
|
||||
assert(name != null, 'v3 name not specified');
|
||||
assert(namespace != null, 'v3 namespace not specified');
|
||||
|
||||
if (namespace == 'URL') namespace = uuidV3.URL;
|
||||
if (namespace == 'DNS') namespace = uuidV3.DNS;
|
||||
|
||||
console.log(uuidV3(name, namespace));
|
||||
break;
|
||||
|
||||
case 'v4':
|
||||
var uuidV4 = require('../v4');
|
||||
console.log(uuidV4());
|
||||
|
||||
+10
-11
@@ -2,25 +2,26 @@
|
||||
// browser this is a little complicated due to unknown quality of Math.random()
|
||||
// and inconsistent support for the `crypto` API. We do the best we can via
|
||||
// feature-detection
|
||||
var rng;
|
||||
|
||||
var crypto = global.crypto || global.msCrypto; // for IE 11
|
||||
if (crypto && crypto.getRandomValues) {
|
||||
// getRandomValues needs to be invoked in a context where "this" is a Crypto implementation.
|
||||
var getRandomValues = (typeof(crypto) != 'undefined' && crypto.getRandomValues.bind(crypto)) ||
|
||||
(typeof(msCrypto) != 'undefined' && msCrypto.getRandomValues.bind(msCrypto));
|
||||
if (getRandomValues) {
|
||||
// WHATWG crypto RNG - http://wiki.whatwg.org/wiki/Crypto
|
||||
var rnds8 = new Uint8Array(16); // eslint-disable-line no-undef
|
||||
rng = function whatwgRNG() {
|
||||
crypto.getRandomValues(rnds8);
|
||||
|
||||
module.exports = function whatwgRNG() {
|
||||
getRandomValues(rnds8);
|
||||
return rnds8;
|
||||
};
|
||||
}
|
||||
|
||||
if (!rng) {
|
||||
} else {
|
||||
// Math.random()-based (RNG)
|
||||
//
|
||||
// If all else fails, use Math.random(). It's fast, but is of unspecified
|
||||
// quality.
|
||||
var rnds = new Array(16);
|
||||
rng = function() {
|
||||
|
||||
module.exports = function mathRNG() {
|
||||
for (var i = 0, r; i < 16; i++) {
|
||||
if ((i & 0x03) === 0) r = Math.random() * 0x100000000;
|
||||
rnds[i] = r >>> ((i & 0x03) << 3) & 0xff;
|
||||
@@ -29,5 +30,3 @@ if (!rng) {
|
||||
return rnds;
|
||||
};
|
||||
}
|
||||
|
||||
module.exports = rng;
|
||||
|
||||
+4
-6
@@ -1,10 +1,8 @@
|
||||
// Unique ID creation requires a high quality random # generator. In node.js
|
||||
// this is pretty straight-forward - we use the crypto API.
|
||||
|
||||
var rb = require('crypto').randomBytes;
|
||||
var crypto = require('crypto');
|
||||
|
||||
function rng() {
|
||||
return rb(16);
|
||||
}
|
||||
|
||||
module.exports = rng;
|
||||
module.exports = function nodeRNG() {
|
||||
return crypto.randomBytes(16);
|
||||
};
|
||||
|
||||
+5
-1
@@ -54,7 +54,11 @@ function sha1(bytes) {
|
||||
W[t] = ROTL(W[t - 3] ^ W[t - 8] ^ W[t - 14] ^ W[t - 16], 1);
|
||||
}
|
||||
|
||||
var a = H[0], b = H[1], c = H[2], d = H[3], e = H[4];
|
||||
var a = H[0];
|
||||
var b = H[1];
|
||||
var c = H[2];
|
||||
var d = H[3];
|
||||
var e = H[4];
|
||||
|
||||
for (var t=0; t<80; t++) {
|
||||
var s = Math.floor(t/20);
|
||||
|
||||
+12
-8
@@ -3,16 +3,20 @@
|
||||
var crypto = require('crypto');
|
||||
|
||||
function sha1(bytes) {
|
||||
// support modern Buffer API
|
||||
if (typeof Buffer.from === 'function') {
|
||||
if (Array.isArray(bytes)) bytes = Buffer.from(bytes);
|
||||
else if (typeof bytes === 'string') bytes = Buffer.from(bytes, 'utf8');
|
||||
// Modern Buffer API
|
||||
if (Array.isArray(bytes)) {
|
||||
bytes = Buffer.from(bytes);
|
||||
} else if (typeof bytes === 'string') {
|
||||
bytes = Buffer.from(bytes, 'utf8');
|
||||
}
|
||||
} else {
|
||||
// Pre-v4 Buffer API
|
||||
if (Array.isArray(bytes)) {
|
||||
bytes = new Buffer(bytes);
|
||||
} else if (typeof bytes === 'string') {
|
||||
bytes = new Buffer(bytes, 'utf8');
|
||||
}
|
||||
|
||||
// support pre-v4 Buffer API
|
||||
else {
|
||||
if (Array.isArray(bytes)) bytes = new Buffer(bytes);
|
||||
else if (typeof bytes === 'string') bytes = new Buffer(bytes, 'utf8');
|
||||
}
|
||||
|
||||
return crypto.createHash('sha1').update(bytes).digest();
|
||||
|
||||
+15
-7
@@ -1,8 +1,8 @@
|
||||
{
|
||||
"_from": "uuid@^3.1.0",
|
||||
"_id": "uuid@3.1.0",
|
||||
"_id": "uuid@3.2.1",
|
||||
"_inBundle": false,
|
||||
"_integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==",
|
||||
"_integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA==",
|
||||
"_location": "/uuid",
|
||||
"_phantomChildren": {},
|
||||
"_requested": {
|
||||
@@ -18,8 +18,8 @@
|
||||
"_requiredBy": [
|
||||
"/request"
|
||||
],
|
||||
"_resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
|
||||
"_shasum": "3dd3d3e790abc24d7b0d3a034ffababe28ebbc04",
|
||||
"_resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz",
|
||||
"_shasum": "12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14",
|
||||
"_spec": "uuid@^3.1.0",
|
||||
"_where": "C:\\Users\\Katy\\documentit\\node_modules\\request",
|
||||
"bin": {
|
||||
@@ -27,7 +27,8 @@
|
||||
},
|
||||
"browser": {
|
||||
"./lib/rng.js": "./lib/rng-browser.js",
|
||||
"./lib/sha1.js": "./lib/sha1-browser.js"
|
||||
"./lib/sha1.js": "./lib/sha1-browser.js",
|
||||
"./lib/md5.js": "./lib/md5-browser.js"
|
||||
},
|
||||
"bugs": {
|
||||
"url": "https://github.com/kelektiv/node-uuid/issues"
|
||||
@@ -55,10 +56,14 @@
|
||||
"email": "shtylman@gmail.com"
|
||||
}
|
||||
],
|
||||
"dependencies": {},
|
||||
"deprecated": false,
|
||||
"description": "RFC4122 (v1, v4, and v5) UUIDs",
|
||||
"devDependencies": {
|
||||
"mocha": "3.1.2"
|
||||
"eslint": "4.5.0",
|
||||
"mocha": "3.1.2",
|
||||
"runmd": "1.0.1",
|
||||
"standard-version": "4.2.0"
|
||||
},
|
||||
"homepage": "https://github.com/kelektiv/node-uuid#readme",
|
||||
"keywords": [
|
||||
@@ -73,7 +78,10 @@
|
||||
"url": "git+https://github.com/kelektiv/node-uuid.git"
|
||||
},
|
||||
"scripts": {
|
||||
"md": "runmd --watch --output=README.md README_js.md",
|
||||
"prepare": "runmd --output=README.md README_js.md",
|
||||
"release": "standard-version",
|
||||
"test": "mocha test/test.js"
|
||||
},
|
||||
"version": "3.1.0"
|
||||
"version": "3.2.1"
|
||||
}
|
||||
|
||||
+23
-14
@@ -6,20 +6,12 @@ var bytesToUuid = require('./lib/bytesToUuid');
|
||||
// Inspired by https://github.com/LiosK/UUID.js
|
||||
// and http://docs.python.org/library/uuid.html
|
||||
|
||||
// random #'s we need to init node and clockseq
|
||||
var _seedBytes = rng();
|
||||
|
||||
// Per 4.5, create and 48-bit node id, (47 random bits + multicast bit = 1)
|
||||
var _nodeId = [
|
||||
_seedBytes[0] | 0x01,
|
||||
_seedBytes[1], _seedBytes[2], _seedBytes[3], _seedBytes[4], _seedBytes[5]
|
||||
];
|
||||
|
||||
// Per 4.2.2, randomize (14 bit) clockseq
|
||||
var _clockseq = (_seedBytes[6] << 8 | _seedBytes[7]) & 0x3fff;
|
||||
var _nodeId;
|
||||
var _clockseq;
|
||||
|
||||
// Previous uuid creation time
|
||||
var _lastMSecs = 0, _lastNSecs = 0;
|
||||
var _lastMSecs = 0;
|
||||
var _lastNSecs = 0;
|
||||
|
||||
// See https://github.com/broofa/node-uuid for API details
|
||||
function v1(options, buf, offset) {
|
||||
@@ -27,9 +19,27 @@ function v1(options, buf, offset) {
|
||||
var b = buf || [];
|
||||
|
||||
options = options || {};
|
||||
|
||||
var node = options.node || _nodeId;
|
||||
var clockseq = options.clockseq !== undefined ? options.clockseq : _clockseq;
|
||||
|
||||
// node and clockseq need to be initialized to random values if they're not
|
||||
// specified. We do this lazily to minimize issues related to insufficient
|
||||
// system entropy. See #189
|
||||
if (node == null || clockseq == null) {
|
||||
var seedBytes = rng();
|
||||
if (node == null) {
|
||||
// Per 4.5, create and 48-bit node id, (47 random bits + multicast bit = 1)
|
||||
node = _nodeId = [
|
||||
seedBytes[0] | 0x01,
|
||||
seedBytes[1], seedBytes[2], seedBytes[3], seedBytes[4], seedBytes[5]
|
||||
];
|
||||
}
|
||||
if (clockseq == null) {
|
||||
// Per 4.2.2, randomize (14 bit) clockseq
|
||||
clockseq = _clockseq = (seedBytes[6] << 8 | seedBytes[7]) & 0x3fff;
|
||||
}
|
||||
}
|
||||
|
||||
// UUID timestamps are 100 nano-second units since the Gregorian epoch,
|
||||
// (1582-10-15 00:00). JSNumbers aren't precise enough for this, so
|
||||
// time is handled internally as 'msecs' (integer milliseconds) and 'nsecs'
|
||||
@@ -89,7 +99,6 @@ function v1(options, buf, offset) {
|
||||
b[i++] = clockseq & 0xff;
|
||||
|
||||
// `node`
|
||||
var node = options.node || _nodeId;
|
||||
for (var n = 0; n < 6; ++n) {
|
||||
b[i + n] = node[n];
|
||||
}
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@ function v4(options, buf, offset) {
|
||||
var i = buf && offset || 0;
|
||||
|
||||
if (typeof(options) == 'string') {
|
||||
buf = options == 'binary' ? new Array(16) : null;
|
||||
buf = options === 'binary' ? new Array(16) : null;
|
||||
options = null;
|
||||
}
|
||||
options = options || {};
|
||||
|
||||
+3
-42
@@ -1,42 +1,3 @@
|
||||
var sha1 = require('./lib/sha1-browser');
|
||||
var bytesToUuid = require('./lib/bytesToUuid');
|
||||
|
||||
function uuidToBytes(uuid) {
|
||||
// Note: We assume we're being passed a valid uuid string
|
||||
var bytes = [];
|
||||
uuid.replace(/[a-fA-F0-9]{2}/g, function(hex) {
|
||||
bytes.push(parseInt(hex, 16));
|
||||
});
|
||||
|
||||
return bytes;
|
||||
}
|
||||
|
||||
function stringToBytes(str) {
|
||||
str = unescape(encodeURIComponent(str)); // UTF8 escape
|
||||
var bytes = new Array(str.length);
|
||||
for (var i = 0; i < str.length; i++) {
|
||||
bytes[i] = str.charCodeAt(i);
|
||||
}
|
||||
return bytes;
|
||||
}
|
||||
|
||||
function v5(name, namespace, buf, offset) {
|
||||
if (typeof(name) == 'string') name = stringToBytes(name);
|
||||
if (typeof(namespace) == 'string') namespace = uuidToBytes(namespace);
|
||||
|
||||
if (!Array.isArray(name)) throw TypeError('name must be an array of bytes');
|
||||
if (!Array.isArray(namespace) || namespace.length != 16) throw TypeError('namespace must be uuid string or an Array of 16 byte values');
|
||||
|
||||
// Per 4.3
|
||||
var bytes = sha1(namespace.concat(name));
|
||||
bytes[6] = (bytes[6] & 0x0f) | 0x50;
|
||||
bytes[8] = (bytes[8] & 0x3f) | 0x80;
|
||||
|
||||
return buf || bytesToUuid(bytes);
|
||||
}
|
||||
|
||||
// Pre-defined namespaces, per Appendix C
|
||||
v5.DNS = '6ba7b810-9dad-11d1-80b4-00c04fd430c8';
|
||||
v5.URL = '6ba7b811-9dad-11d1-80b4-00c04fd430c8';
|
||||
|
||||
module.exports = v5;
|
||||
var v35 = require('./lib/v35.js');
|
||||
var sha1 = require('./lib/sha1');
|
||||
module.exports = v35('v5', 0x50, sha1);
|
||||
|
||||
Generated
+15
-15
@@ -5,9 +5,9 @@
|
||||
"requires": true,
|
||||
"dependencies": {
|
||||
"@types/node": {
|
||||
"version": "7.0.52",
|
||||
"resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.52.tgz",
|
||||
"integrity": "sha512-jjpyQsKGsOF/wUElNjfPULk+d8PKvJOIXk3IUeBYYmNCy5dMWfrI+JiixYNw8ppKOlcRwWTXFl0B+i5oGrf95Q=="
|
||||
"version": "8.5.9",
|
||||
"resolved": "https://registry.npmjs.org/@types/node/-/node-8.5.9.tgz",
|
||||
"integrity": "sha512-s+c3AjymyAccTI4hcgNFK4mToH8l+hyPDhu4LIkn71lRy56FLijGu00fyLgldjM/846Pmk9N4KFUs2P8GDs0pA=="
|
||||
},
|
||||
"acorn": {
|
||||
"version": "5.3.0",
|
||||
@@ -443,11 +443,11 @@
|
||||
}
|
||||
},
|
||||
"electron": {
|
||||
"version": "1.7.10",
|
||||
"resolved": "https://registry.npmjs.org/electron/-/electron-1.7.10.tgz",
|
||||
"integrity": "sha1-Oj6D2WX9f6/kc76N349HJWG2JT0=",
|
||||
"version": "1.8.1",
|
||||
"resolved": "https://registry.npmjs.org/electron/-/electron-1.8.1.tgz",
|
||||
"integrity": "sha1-GbbznyAT4gSpGmC8MIbcekoH7Yg=",
|
||||
"requires": {
|
||||
"@types/node": "7.0.52",
|
||||
"@types/node": "8.5.9",
|
||||
"electron-download": "3.3.0",
|
||||
"extract-zip": "1.6.6"
|
||||
}
|
||||
@@ -463,7 +463,7 @@
|
||||
"minimist": "1.2.0",
|
||||
"nugget": "2.0.1",
|
||||
"path-exists": "2.1.0",
|
||||
"rc": "1.2.2",
|
||||
"rc": "1.2.4",
|
||||
"semver": "5.4.1",
|
||||
"sumchecker": "1.3.1"
|
||||
}
|
||||
@@ -1429,9 +1429,9 @@
|
||||
"integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A=="
|
||||
},
|
||||
"rc": {
|
||||
"version": "1.2.2",
|
||||
"resolved": "https://registry.npmjs.org/rc/-/rc-1.2.2.tgz",
|
||||
"integrity": "sha1-2M6ctX6NZNnHut2YdsfDTL48cHc=",
|
||||
"version": "1.2.4",
|
||||
"resolved": "https://registry.npmjs.org/rc/-/rc-1.2.4.tgz",
|
||||
"integrity": "sha1-oPYGyq4qO4YrvQ74VILAElsxX6M=",
|
||||
"requires": {
|
||||
"deep-extend": "0.4.2",
|
||||
"ini": "1.3.5",
|
||||
@@ -1512,7 +1512,7 @@
|
||||
"stringstream": "0.0.5",
|
||||
"tough-cookie": "2.3.3",
|
||||
"tunnel-agent": "0.6.0",
|
||||
"uuid": "3.1.0"
|
||||
"uuid": "3.2.1"
|
||||
}
|
||||
},
|
||||
"require-uncached": {
|
||||
@@ -1852,9 +1852,9 @@
|
||||
"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
|
||||
},
|
||||
"uuid": {
|
||||
"version": "3.1.0",
|
||||
"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
|
||||
"integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g=="
|
||||
"version": "3.2.1",
|
||||
"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz",
|
||||
"integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA=="
|
||||
},
|
||||
"validate-npm-package-license": {
|
||||
"version": "3.0.1",
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
"description": "tool for documenting online harassment",
|
||||
"main": "main.js",
|
||||
"dependencies": {
|
||||
"electron": "^1.7.10",
|
||||
"electron": "^1.8.1",
|
||||
"eslint": "^4.15.0"
|
||||
},
|
||||
"devDependencies": {},
|
||||
|
||||
Reference in New Issue
Block a user